summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-08-13 03:00:43 +0000
committerNorbert Preining <norbert@preining.info>2021-08-13 03:00:43 +0000
commit07801f7ec3e3482aba8553fd75f9f190ac3f9f0a (patch)
treedb15f085c41deb0b13cea839d7a807fe4365cb0b
parenta19bf62ec5fa04167fc9480e22cd235ec53b3e41 (diff)
CTAN sync 202108130300
-rw-r--r--FILES.byname599
-rw-r--r--FILES.byname.gzbin2333278 -> 2333254 bytes
-rw-r--r--FILES.last07days661
-rw-r--r--language/japanese/jlreq/README-ja.md5
-rw-r--r--language/japanese/jlreq/README.md3
-rw-r--r--language/japanese/jlreq/jlreq-helpers.sty131
-rw-r--r--language/japanese/jlreq/jlreq-ja.pdfbin368170 -> 368625 bytes
-rw-r--r--language/japanese/jlreq/jlreq-trimmarks-ja.md2
-rw-r--r--language/japanese/jlreq/jlreq-trimmarks.md4
-rw-r--r--language/japanese/jlreq/jlreq-trimmarks.sty180
-rw-r--r--language/japanese/jlreq/jlreq.cls1119
-rw-r--r--language/japanese/jlreq/jlreq.pdfbin118627 -> 118695 bytes
-rw-r--r--macros/latex/contrib/fancyvrb/Changes2
-rw-r--r--macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdfbin123306 -> 138429 bytes
-rw-r--r--macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex23
-rw-r--r--macros/latex/contrib/fancyvrb/latex/fancyvrb.sty24
-rw-r--r--macros/latex/contrib/geradwp/README.md98
-rw-r--r--macros/latex/contrib/geradwp/geradwp-fr.pdfbin0 -> 503393 bytes
-rw-r--r--macros/latex/contrib/geradwp/geradwp.dtx2092
-rw-r--r--macros/latex/contrib/geradwp/geradwp.ins63
-rw-r--r--macros/latex/contrib/geradwp/geradwp.pdfbin0 -> 460925 bytes
-rw-r--r--macros/latex/contrib/thesis-ekf/README4
-rw-r--r--macros/latex/contrib/thesis-ekf/eszterhazy-logo-de.eps1642
-rw-r--r--macros/latex/contrib/thesis-ekf/eszterhazy-logo-de.pdfbin12084 -> 22963 bytes
-rw-r--r--macros/latex/contrib/thesis-ekf/eszterhazy-logo-en.eps1545
-rw-r--r--macros/latex/contrib/thesis-ekf/eszterhazy-logo-en.pdfbin11653 -> 21649 bytes
-rw-r--r--macros/latex/contrib/thesis-ekf/eszterhazy-logo-hu.eps1524
-rw-r--r--macros/latex/contrib/thesis-ekf/eszterhazy-logo-hu.pdfbin11513 -> 21798 bytes
-rw-r--r--macros/latex/contrib/thesis-ekf/thesis-ekf.dtx10
-rw-r--r--macros/latex/contrib/thesis-ekf/thesis-ekf.ins4
-rw-r--r--macros/latex/contrib/thesis-ekf/thesis-ekf.pdfbin312369 -> 327250 bytes
-rw-r--r--support/TeX4ht/source/ChangeLog8
-rw-r--r--support/TeX4ht/source/tex4ht-4ht.tex21
-rw-r--r--support/TeX4ht/source/tex4ht-ooffice.tex35
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb127
-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.xzbin2328968 -> 2329604 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
-rw-r--r--usergrps/gutenberg/VERSION2
-rw-r--r--usergrps/gutenberg/lettre/lettre40.pdfbin4426135 -> 4426172 bytes
-rw-r--r--usergrps/gutenberg/lettre/lettre44.pdfbin0 -> 1003887 bytes
-rw-r--r--web/pwebmac/README.md12
-rw-r--r--web/pwebmac/index.md6
-rwxr-xr-xweb/pwebmac/makeall2
-rw-r--r--web/pwebmac/pwebmac.tex46
-rw-r--r--web/pwebmac/webman.ch171
50 files changed, 7030 insertions, 3171 deletions
diff --git a/FILES.byname b/FILES.byname
index 4f8f9b936e..c6d88a7f2a 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -5100,7 +5100,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
-2021/08/11 | 94375 | FILES.last07days
+2021/08/12 | 92711 | 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
@@ -173010,7 +173010,7 @@
2021/06/20 | 1615285 | install/language/chinese/ctex.tds.zip
2016/11/23 | 413896 | install/language/chinese/zhmcjk.tds.zip
2017/03/09 | 168862 | install/language/hebrew/cjhebrew.tds.zip
-2021/07/29 | 10949624 | install/language/japanese/jlreq.tds.zip
+2021/08/12 | 10950230 | install/language/japanese/jlreq.tds.zip
2021/06/27 | 1829497 | install/language/japanese/platex.tds.zip
2021/05/31 | 907477 | install/language/japanese/uplatex.tds.zip
2013/05/18 | 7628531 | install/language/vietnamese/vntex.tds.zip
@@ -182408,22 +182408,22 @@
2021/03/13 | 1138379 | language/japanese/jlreq-deluxe.zip
2020/12/29 | 5662 | language/japanese/jlreq/jfm-jlreq-jidori.lua
2021/07/22 | 49222 | language/japanese/jlreq/jfm-jlreq.lua
-2021/07/29 | 280501 | language/japanese/jlreq/jlreq.cls
-2021/07/29 | 23412 | language/japanese/jlreq/jlreq-helpers.sty
-2021/07/29 | 368170 | language/japanese/jlreq/jlreq-ja.pdf
-2021/07/29 | 118627 | language/japanese/jlreq/jlreq.pdf
-2021/07/22 | 7742 | language/japanese/jlreq/jlreq-trimmarks-ja.md
-2021/07/22 | 6436 | language/japanese/jlreq/jlreq-trimmarks.md
-2021/07/22 | 44975 | language/japanese/jlreq/jlreq-trimmarks.sty
+2021/08/11 | 282366 | language/japanese/jlreq/jlreq.cls
+2021/08/11 | 20084 | language/japanese/jlreq/jlreq-helpers.sty
+2021/08/11 | 368625 | language/japanese/jlreq/jlreq-ja.pdf
+2021/08/12 | 118695 | language/japanese/jlreq/jlreq.pdf
+2021/08/11 | 7808 | language/japanese/jlreq/jlreq-trimmarks-ja.md
+2021/08/12 | 6497 | language/japanese/jlreq/jlreq-trimmarks.md
+2021/08/11 | 46020 | language/japanese/jlreq/jlreq-trimmarks.sty
2021/03/19 | 1348 | language/japanese/jlreq/LICENSE
2019/04/01 | 11487 | language/japanese/jlreq/luajfm2pl.lua
2021/03/18 | 9170 | language/japanese/jlreq/Makefile
2021/03/17 | 5652 | language/japanese/jlreq/make_variant_jfm.lua
-2021/07/29 | 44533 | language/japanese/jlreq/README-ja.md
-2021/07/29 | 5901 | language/japanese/jlreq/README.md
+2021/08/11 | 44612 | language/japanese/jlreq/README-ja.md
+2021/08/12 | 5960 | language/japanese/jlreq/README.md
2019/04/01 | 3094 | language/japanese/jlreq/README-template.html
2020/03/27 | 3315 | language/japanese/jlreq/README-template.tex
-2021/07/29 | 595444 | language/japanese/jlreq.zip
+2021/08/12 | 595815 | language/japanese/jlreq.zip
1995/08/05 | 7067 | language/japanese/jtex/00NEWS
1995/07/26 | 1558 | language/japanese/jtex/00README
1995/06/21 | 1825 | language/japanese/jtex/jlatex2e-add1.tar.gz
@@ -199507,15 +199507,15 @@
2010/12/16 | 32810 | macros/latex/contrib/fancytooltips/tip.pdf
2010/12/16 | 586 | macros/latex/contrib/fancytooltips/tip.tex
2012/09/26 | 1590569 | macros/latex/contrib/fancytooltips.zip
-2021/01/20 | 1491 | macros/latex/contrib/fancyvrb/Changes
-2021/01/20 | 123306 | macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf
-2021/01/20 | 40369 | macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex
+2021/08/12 | 1604 | macros/latex/contrib/fancyvrb/Changes
+2021/08/12 | 138429 | macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf
+2021/08/12 | 40703 | macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex
2020/06/07 | 4642 | macros/latex/contrib/fancyvrb/latex/fancyvrb-ex.sty
-2021/01/20 | 43232 | macros/latex/contrib/fancyvrb/latex/fancyvrb.sty
+2021/08/12 | 43658 | macros/latex/contrib/fancyvrb/latex/fancyvrb.sty
2020/06/07 | 5109 | macros/latex/contrib/fancyvrb/latex/hbaw.sty
2020/08/03 | 5281 | macros/latex/contrib/fancyvrb/latex/hcolor.sty
2021/01/20 | 1798 | macros/latex/contrib/fancyvrb/README
-2021/01/20 | 147391 | macros/latex/contrib/fancyvrb.zip
+2021/08/12 | 161446 | macros/latex/contrib/fancyvrb.zip
2018/12/18 | 29200 | macros/latex/contrib/fascicules/fascicules.dtx
2018/12/18 | 1592 | macros/latex/contrib/fascicules/fascicules.ins
2018/12/19 | 181208 | macros/latex/contrib/fascicules/fascicules.pdf
@@ -200970,6 +200970,12 @@
2020/01/02 | 440535 | macros/latex/contrib/geometry/geometry.pdf
2020/01/02 | 2481 | macros/latex/contrib/geometry/README.md
2020/01/02 | 978656 | macros/latex/contrib/geometry.zip
+2021/08/11 | 75653 | macros/latex/contrib/geradwp/geradwp.dtx
+2021/08/11 | 503393 | macros/latex/contrib/geradwp/geradwp-fr.pdf
+2021/05/03 | 2167 | macros/latex/contrib/geradwp/geradwp.ins
+2021/08/11 | 460925 | macros/latex/contrib/geradwp/geradwp.pdf
+2021/08/11 | 3104 | macros/latex/contrib/geradwp/README.md
+2021/08/12 | 980833 | macros/latex/contrib/geradwp.zip
1993/11/28 | 17982 | macros/latex/contrib/germkorr/COPYING
2009/07/27 | 172344 | macros/latex/contrib/germkorr/germkorr.pdf
2009/07/26 | 5730 | macros/latex/contrib/germkorr/germkorr.sty
@@ -214555,17 +214561,17 @@
2013/05/22 | 7418 | macros/latex/contrib/theoremref/theoremref-doc.tex
2013/05/22 | 8987 | macros/latex/contrib/theoremref/theoremref.sty
2013/05/22 | 340054 | macros/latex/contrib/theoremref.zip
-2019/03/28 | 39488 | macros/latex/contrib/thesis-ekf/eszterhazy-logo-de.eps
-2019/03/28 | 12084 | macros/latex/contrib/thesis-ekf/eszterhazy-logo-de.pdf
-2019/03/26 | 38411 | macros/latex/contrib/thesis-ekf/eszterhazy-logo-en.eps
-2019/03/26 | 11653 | macros/latex/contrib/thesis-ekf/eszterhazy-logo-en.pdf
-2019/03/26 | 37646 | macros/latex/contrib/thesis-ekf/eszterhazy-logo-hu.eps
-2019/03/26 | 11513 | macros/latex/contrib/thesis-ekf/eszterhazy-logo-hu.pdf
-2020/01/05 | 1591 | macros/latex/contrib/thesis-ekf/README
-2020/12/22 | 34131 | macros/latex/contrib/thesis-ekf/thesis-ekf.dtx
-2020/01/05 | 1416 | macros/latex/contrib/thesis-ekf/thesis-ekf.ins
-2020/12/22 | 312369 | macros/latex/contrib/thesis-ekf/thesis-ekf.pdf
-2020/12/22 | 392523 | macros/latex/contrib/thesis-ekf.zip
+2021/08/12 | 69173 | macros/latex/contrib/thesis-ekf/eszterhazy-logo-de.eps
+2021/08/12 | 22963 | macros/latex/contrib/thesis-ekf/eszterhazy-logo-de.pdf
+2021/08/11 | 64873 | macros/latex/contrib/thesis-ekf/eszterhazy-logo-en.eps
+2021/08/11 | 21649 | macros/latex/contrib/thesis-ekf/eszterhazy-logo-en.pdf
+2021/08/11 | 64937 | macros/latex/contrib/thesis-ekf/eszterhazy-logo-hu.eps
+2021/08/11 | 21798 | macros/latex/contrib/thesis-ekf/eszterhazy-logo-hu.pdf
+2021/08/12 | 1602 | macros/latex/contrib/thesis-ekf/README
+2021/08/12 | 34178 | macros/latex/contrib/thesis-ekf/thesis-ekf.dtx
+2021/08/12 | 1416 | macros/latex/contrib/thesis-ekf/thesis-ekf.ins
+2021/08/12 | 327250 | macros/latex/contrib/thesis-ekf/thesis-ekf.pdf
+2021/08/12 | 461274 | macros/latex/contrib/thesis-ekf.zip
2020/03/13 | 19051 | macros/latex/contrib/thesis-gwu/figures/data.png
2020/03/13 | 12276 | macros/latex/contrib/thesis-gwu/figures/file_extensions.png
2020/03/13 | 16895 | macros/latex/contrib/thesis-gwu/figures/orbital_mechanics.png
@@ -267293,8 +267299,8 @@
2020/04/22 | 787504 | systems/texlive/tlnet/archive/bearwear.doc.r54826.tar.xz
2020/04/22 | 2376 | systems/texlive/tlnet/archive/bearwear.r54826.tar.xz
2020/04/22 | 5992 | systems/texlive/tlnet/archive/bearwear.source.r54826.tar.xz
-2021/08/10 | 702196 | systems/texlive/tlnet/archive/beaulivre.doc.r60206.tar.xz
-2021/08/10 | 3784 | systems/texlive/tlnet/archive/beaulivre.r60206.tar.xz
+2021/08/12 | 703616 | systems/texlive/tlnet/archive/beaulivre.doc.r60223.tar.xz
+2021/08/12 | 3804 | systems/texlive/tlnet/archive/beaulivre.r60223.tar.xz
2021/07/18 | 882584 | systems/texlive/tlnet/archive/beebe.r59956.tar.xz
2019/02/28 | 709916 | systems/texlive/tlnet/archive/begingreek.doc.r36294.tar.xz
2019/02/28 | 1664 | systems/texlive/tlnet/archive/begingreek.r36294.tar.xz
@@ -268523,8 +268529,8 @@
2019/02/28 | 2020 | systems/texlive/tlnet/archive/colorinfo.r15878.tar.xz
2019/02/28 | 25984 | systems/texlive/tlnet/archive/coloring.doc.r41042.tar.xz
2019/02/28 | 1480 | systems/texlive/tlnet/archive/coloring.r41042.tar.xz
-2021/08/10 | 105992 | systems/texlive/tlnet/archive/colorist.doc.r60206.tar.xz
-2021/08/10 | 9856 | systems/texlive/tlnet/archive/colorist.r60206.tar.xz
+2021/08/12 | 106004 | systems/texlive/tlnet/archive/colorist.doc.r60223.tar.xz
+2021/08/12 | 9908 | systems/texlive/tlnet/archive/colorist.r60223.tar.xz
2019/02/28 | 27632 | systems/texlive/tlnet/archive/colorprofiles.doc.r49086.tar.xz
2019/02/28 | 87972 | systems/texlive/tlnet/archive/colorprofiles.r49086.tar.xz
2019/02/28 | 1884 | systems/texlive/tlnet/archive/colorsep.r13293.tar.xz
@@ -269824,9 +269830,9 @@
2021/07/19 | 313228 | systems/texlive/tlnet/archive/easing.doc.r59975.tar.xz
2021/07/19 | 2220 | systems/texlive/tlnet/archive/easing.r59975.tar.xz
2021/07/19 | 7876 | systems/texlive/tlnet/archive/easing.source.r59975.tar.xz
-2021/08/11 | 605240 | systems/texlive/tlnet/archive/easybook.doc.r60212.tar.xz
-2021/08/11 | 17080 | systems/texlive/tlnet/archive/easybook.r60212.tar.xz
-2021/08/11 | 17128 | systems/texlive/tlnet/archive/easybook.source.r60212.tar.xz
+2021/08/12 | 605192 | systems/texlive/tlnet/archive/easybook.doc.r60221.tar.xz
+2021/08/12 | 17080 | systems/texlive/tlnet/archive/easybook.r60221.tar.xz
+2021/08/12 | 17128 | systems/texlive/tlnet/archive/easybook.source.r60221.tar.xz
2019/02/28 | 4540 | systems/texlive/tlnet/archive/easy.doc.r19440.tar.xz
2020/09/08 | 175976 | systems/texlive/tlnet/archive/easyfig.doc.r56291.tar.xz
2020/09/08 | 1936 | systems/texlive/tlnet/archive/easyfig.r56291.tar.xz
@@ -269949,8 +269955,8 @@
2019/02/28 | 4224 | systems/texlive/tlnet/archive/eiad-ltx.source.r15878.tar.xz
2019/02/28 | 25636 | systems/texlive/tlnet/archive/eiad.r15878.tar.xz
2019/02/28 | 6960 | systems/texlive/tlnet/archive/eijkhout.r15878.tar.xz
-2021/08/10 | 560044 | systems/texlive/tlnet/archive/einfart.doc.r60206.tar.xz
-2021/08/10 | 3912 | systems/texlive/tlnet/archive/einfart.r60206.tar.xz
+2021/08/12 | 562032 | systems/texlive/tlnet/archive/einfart.doc.r60223.tar.xz
+2021/08/12 | 3920 | systems/texlive/tlnet/archive/einfart.r60223.tar.xz
2020/10/23 | 362512 | systems/texlive/tlnet/archive/ejpecp.doc.r56728.tar.xz
2020/10/23 | 5228 | systems/texlive/tlnet/archive/ejpecp.r56728.tar.xz
2020/10/23 | 6904 | systems/texlive/tlnet/archive/ejpecp.source.r56728.tar.xz
@@ -272646,8 +272652,8 @@
2020/11/08 | 344060 | systems/texlive/tlnet/archive/leaflet.doc.r56878.tar.xz
2020/11/08 | 5652 | systems/texlive/tlnet/archive/leaflet.r56878.tar.xz
2020/11/08 | 13844 | systems/texlive/tlnet/archive/leaflet.source.r56878.tar.xz
-2021/08/10 | 590356 | systems/texlive/tlnet/archive/lebhart.doc.r60206.tar.xz
-2021/08/10 | 3796 | systems/texlive/tlnet/archive/lebhart.r60206.tar.xz
+2021/08/12 | 591752 | systems/texlive/tlnet/archive/lebhart.doc.r60223.tar.xz
+2021/08/12 | 3816 | systems/texlive/tlnet/archive/lebhart.r60223.tar.xz
2019/02/28 | 1126000 | systems/texlive/tlnet/archive/lecturer.doc.r23916.tar.xz
2019/02/28 | 18668 | systems/texlive/tlnet/archive/lecturer.r23916.tar.xz
2020/02/03 | 2080 | systems/texlive/tlnet/archive/lectures.doc.r53642.tar.xz
@@ -273779,8 +273785,8 @@
2019/02/28 | 435560 | systems/texlive/tlnet/archive/minifp.doc.r32559.tar.xz
2019/02/28 | 10000 | systems/texlive/tlnet/archive/minifp.r32559.tar.xz
2019/02/28 | 43836 | systems/texlive/tlnet/archive/minifp.source.r32559.tar.xz
-2021/08/10 | 108744 | systems/texlive/tlnet/archive/minimalist.doc.r60206.tar.xz
-2021/08/10 | 7188 | systems/texlive/tlnet/archive/minimalist.r60206.tar.xz
+2021/08/12 | 109108 | systems/texlive/tlnet/archive/minimalist.doc.r60223.tar.xz
+2021/08/12 | 7200 | systems/texlive/tlnet/archive/minimalist.r60223.tar.xz
2021/06/10 | 265976 | systems/texlive/tlnet/archive/minim.doc.r59536.tar.xz
2021/06/10 | 27364 | systems/texlive/tlnet/archive/minim-hatching.doc.r59531.tar.xz
2021/06/10 | 2240 | systems/texlive/tlnet/archive/minim-hatching.r59531.tar.xz
@@ -275448,9 +275454,9 @@
2019/02/28 | 2324 | systems/texlive/tlnet/archive/progressbar.r33822.tar.xz
2019/02/28 | 80808 | systems/texlive/tlnet/archive/progress.doc.r19519.tar.xz
2019/02/28 | 4192 | systems/texlive/tlnet/archive/progress.r19519.tar.xz
-2021/08/10 | 649048 | systems/texlive/tlnet/archive/projlib.doc.r60203.tar.xz
-2021/08/10 | 12048 | systems/texlive/tlnet/archive/projlib.r60203.tar.xz
-2021/08/10 | 35168 | systems/texlive/tlnet/archive/projlib.source.r60203.tar.xz
+2021/08/12 | 651324 | systems/texlive/tlnet/archive/projlib.doc.r60222.tar.xz
+2021/08/12 | 11856 | systems/texlive/tlnet/archive/projlib.r60222.tar.xz
+2021/08/12 | 35176 | systems/texlive/tlnet/archive/projlib.source.r60222.tar.xz
2019/05/23 | 372132 | systems/texlive/tlnet/archive/proof-at-the-end.doc.r51194.tar.xz
2019/05/23 | 4440 | systems/texlive/tlnet/archive/proof-at-the-end.r51194.tar.xz
2019/05/23 | 12500 | systems/texlive/tlnet/archive/proof-at-the-end.source.r51194.tar.xz
@@ -276622,8 +276628,8 @@
2019/02/28 | 4412 | systems/texlive/tlnet/archive/simplewick.source.r15878.tar.xz
2019/02/28 | 942836 | systems/texlive/tlnet/archive/simplified-latex.doc.r20620.tar.xz
2019/02/28 | 380 | systems/texlive/tlnet/archive/simplified-latex.r20620.tar.xz
-2021/08/10 | 657860 | systems/texlive/tlnet/archive/simplivre.doc.r60206.tar.xz
-2021/08/10 | 3888 | systems/texlive/tlnet/archive/simplivre.r60206.tar.xz
+2021/08/12 | 659964 | systems/texlive/tlnet/archive/simplivre.doc.r60223.tar.xz
+2021/08/12 | 3892 | systems/texlive/tlnet/archive/simplivre.r60223.tar.xz
2019/02/28 | 136908 | systems/texlive/tlnet/archive/simurgh.doc.r31719.tar.xz
2019/02/28 | 246476 | systems/texlive/tlnet/archive/simurgh.r31719.tar.xz
2021/06/24 | 323456 | systems/texlive/tlnet/archive/sistyle.doc.r59682.tar.xz
@@ -277506,7 +277512,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
-2021/08/11 | 399180 | systems/texlive/tlnet/archive/texlive-scripts.doc.r60208.tar.xz
+2021/08/12 | 399236 | systems/texlive/tlnet/archive/texlive-scripts.doc.r60219.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
@@ -277530,7 +277536,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
-2021/08/11 | 108280 | systems/texlive/tlnet/archive/texlive-scripts.r60208.tar.xz
+2021/08/12 | 108304 | systems/texlive/tlnet/archive/texlive-scripts.r60219.tar.xz
2021/02/25 | 572 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r57908.tar.xz
2021/04/12 | 36308 | systems/texlive/tlnet/archive/texlive-scripts.win32.r58829.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
@@ -277950,9 +277956,9 @@
2019/02/28 | 416 | systems/texlive/tlnet/archive/tipa-de.r22005.tar.xz
2019/02/28 | 2343456 | systems/texlive/tlnet/archive/tipa.doc.r29349.tar.xz
2019/02/28 | 2876104 | systems/texlive/tlnet/archive/tipa.r29349.tar.xz
-2021/04/28 | 439696 | systems/texlive/tlnet/archive/tipauni.doc.r59009.tar.xz
-2021/04/28 | 5032 | systems/texlive/tlnet/archive/tipauni.r59009.tar.xz
-2021/04/28 | 10100 | systems/texlive/tlnet/archive/tipauni.source.r59009.tar.xz
+2021/08/12 | 456832 | systems/texlive/tlnet/archive/tipauni.doc.r60220.tar.xz
+2021/08/12 | 5700 | systems/texlive/tlnet/archive/tipauni.r60220.tar.xz
+2021/08/12 | 12520 | systems/texlive/tlnet/archive/tipauni.source.r60220.tar.xz
2019/02/28 | 381176 | systems/texlive/tlnet/archive/tipfr.doc.r38646.tar.xz
2019/02/28 | 5880 | systems/texlive/tlnet/archive/tipfr.r38646.tar.xz
2021/07/23 | 135332 | systems/texlive/tlnet/archive/tiscreen.doc.r60020.tar.xz
@@ -279249,16 +279255,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
2021/05/02 | 105152 | systems/texlive/tlnet/install-tl
-2021/08/11 | 6811531 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/08/11 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/08/11 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/08/12 | 6811147 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/08/12 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/08/12 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat
-2021/08/11 | 20808770 | systems/texlive/tlnet/install-tl-windows.exe
-2021/08/11 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/08/11 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/08/11 | 25585304 | systems/texlive/tlnet/install-tl.zip
-2021/08/11 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/08/11 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/08/12 | 20810050 | systems/texlive/tlnet/install-tl-windows.exe
+2021/08/12 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/08/12 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/08/12 | 25585327 | systems/texlive/tlnet/install-tl.zip
+2021/08/12 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/08/12 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2021/04/01 | 1229 | systems/texlive/tlnet/README.md
2021/04/01 | 0 | systems/texlive/tlnet/TEXLIVE_2021
2021/07/03 | 7181 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -279268,7 +279274,7 @@
2021/07/03 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2021/07/02 | 49348 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2021/08/10 | 6837 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2021/08/11 | 6957 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2020/04/15 | 223687 | 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
@@ -279310,12 +279316,12 @@
2021/05/16 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/05/16 | 5402 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2021/05/16 | 27555 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2021/08/11 | 17352820 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2021/08/11 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/08/12 | 17352662 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/08/12 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2021/05/16 | 86511 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2021/08/11 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/08/11 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/08/11 | 2329272 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/08/12 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/08/12 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/08/12 | 2328968 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/05/16 | 58801 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2021/05/16 | 42084 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2021/05/16 | 16103 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -284188,7 +284194,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
-2021/08/11 | 592457 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/08/12 | 592457 | 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
@@ -285536,9 +285542,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2021/08/07 | 39000 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2021/08/07 | 43393 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/08/11 | 234540 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/08/11 | 1326499 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/08/11 | 1232198 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/08/12 | 234589 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/08/12 | 1325686 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/08/12 | 1233091 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2021/08/07 | 13446 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2021/08/07 | 14327 | 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
@@ -285738,189 +285744,189 @@
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
-2021/08/11 | 592861 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/08/11 | 51114 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/08/11 | 56475 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/08/11 | 975018 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/08/11 | 1077990 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2021/08/11 | 29037 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/08/11 | 31351 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/08/11 | 29841 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/08/11 | 34664 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/08/11 | 50152 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/08/11 | 57547 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/08/11 | 83540 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/08/11 | 95401 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/08/11 | 67819 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/08/11 | 75791 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/08/11 | 27197 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2021/08/11 | 30823 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/08/11 | 330788 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/08/11 | 392792 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/08/11 | 32673 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/08/11 | 36629 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2021/08/11 | 51309 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/08/11 | 56685 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/08/11 | 241810 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/08/11 | 263958 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/08/11 | 180012 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/08/11 | 195636 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/08/11 | 54632 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/08/11 | 61812 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2021/08/11 | 21226 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/08/11 | 23365 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/08/11 | 461813 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/08/11 | 45906 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/08/11 | 51201 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/08/11 | 284580 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/08/11 | 325043 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2021/08/11 | 41195 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2021/08/11 | 45311 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2021/08/11 | 119820 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/08/11 | 133864 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/08/11 | 1291300 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/08/11 | 1421867 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/08/11 | 100624 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2021/08/11 | 112982 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/08/11 | 43028 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/08/11 | 48251 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/08/11 | 25020 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/08/11 | 28179 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/08/11 | 56317 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/08/11 | 62786 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/08/11 | 136817 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/08/11 | 154426 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/08/11 | 73197 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/08/11 | 77951 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/08/11 | 71669 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/08/11 | 80449 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/08/11 | 258881 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2021/08/11 | 295202 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2021/08/11 | 22049 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2021/08/11 | 24994 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/08/11 | 97338 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/08/11 | 112088 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/08/11 | 64426 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/08/11 | 73146 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/08/11 | 96633 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2021/08/11 | 115351 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/08/11 | 38142 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/08/11 | 43002 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/08/11 | 483654 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/08/11 | 566530 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/08/11 | 147373 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/08/11 | 159580 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/08/11 | 94798 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/08/11 | 109031 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/08/11 | 16357 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2021/08/11 | 17980 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/08/11 | 28390 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/08/11 | 30058 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/08/11 | 629401 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/08/11 | 681253 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/08/11 | 531852 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/08/11 | 596931 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/08/11 | 476919 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/08/11 | 510588 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/08/11 | 94311 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2021/08/11 | 103399 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/08/11 | 1713894 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/08/11 | 2009903 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/08/11 | 67618 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/08/11 | 74210 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2021/08/11 | 27357 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/08/11 | 31619 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/08/11 | 7721 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/08/11 | 8768 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/08/11 | 196872 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/08/11 | 215249 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/08/11 | 250265 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/08/11 | 284024 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/08/11 | 98380 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/08/11 | 103203 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/08/11 | 60638 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/08/11 | 68024 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/08/11 | 124280 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2021/08/11 | 136817 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/08/11 | 178353 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/08/11 | 196741 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/08/11 | 199733 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/08/11 | 180119 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/08/11 | 67484 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/08/11 | 76826 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/08/11 | 31230 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/08/11 | 35085 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/08/11 | 37806 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/08/11 | 42711 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/08/11 | 42892 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/08/11 | 46906 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/08/11 | 45970 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/08/11 | 52523 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/08/11 | 194383 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2021/08/11 | 206605 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/08/11 | 35691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2021/08/11 | 40228 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/08/11 | 744118 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/08/11 | 815244 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/08/11 | 198171 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/08/11 | 202794 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/08/11 | 208047 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/08/11 | 243425 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/08/11 | 78774 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/08/11 | 87776 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/08/11 | 1169719 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/08/11 | 1301191 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/08/11 | 20138 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/08/11 | 23901 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/08/11 | 31539 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/08/11 | 37241 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/08/11 | 64185 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/08/11 | 72207 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/08/11 | 50395 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/08/11 | 57730 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/08/11 | 1340930 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/08/11 | 1464203 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/08/11 | 42386 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2021/08/11 | 51749 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/08/11 | 56514 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/08/11 | 60039 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/08/11 | 25291 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/08/11 | 27390 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/08/11 | 16414 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/08/11 | 18176 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/08/11 | 63778 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/08/11 | 69914 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2021/08/11 | 154807 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/08/11 | 169242 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2021/08/11 | 57012 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/08/11 | 65785 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/08/11 | 98261 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/08/11 | 105222 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/08/11 | 2672608 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/08/11 | 2796726 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/08/11 | 56357 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/08/11 | 62228 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/08/11 | 33545 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/08/11 | 37359 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/08/11 | 27728 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/08/11 | 33631 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/08/11 | 65619 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2021/08/11 | 70649 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/08/11 | 312110 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/08/11 | 345740 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/08/11 | 55500 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/08/11 | 57139 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/08/11 | 589840 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2021/08/11 | 624652 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/08/11 | 39128 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/08/11 | 43424 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/08/11 | 234617 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/08/11 | 1327150 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/08/11 | 1232738 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/08/11 | 13465 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/08/11 | 14348 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/08/12 | 592861 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/08/12 | 51110 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/08/12 | 56474 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/08/12 | 975017 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/08/12 | 1077991 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/08/12 | 29035 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/08/12 | 31351 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/08/12 | 29841 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/08/12 | 34664 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/08/12 | 50150 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/08/12 | 57547 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/08/12 | 83540 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/08/12 | 95401 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/08/12 | 67820 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/08/12 | 75792 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/08/12 | 27198 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/08/12 | 30824 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/08/12 | 330788 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/08/12 | 392792 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/08/12 | 32674 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/08/12 | 36629 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/08/12 | 51309 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/08/12 | 56684 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/08/12 | 241811 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/08/12 | 263959 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/08/12 | 180011 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/08/12 | 195636 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/08/12 | 54631 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/08/12 | 61811 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/08/12 | 21225 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/08/12 | 23363 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/08/12 | 461814 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/08/12 | 45905 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/08/12 | 51201 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/08/12 | 284580 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/08/12 | 325043 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/08/12 | 41194 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/08/12 | 45310 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/08/12 | 119821 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/08/12 | 133864 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/08/12 | 1291299 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/08/12 | 1421867 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/08/12 | 100625 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/08/12 | 112983 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/08/12 | 43029 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/08/12 | 48253 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/08/12 | 25020 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/08/12 | 28180 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/08/12 | 56318 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/08/12 | 62786 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/08/12 | 136816 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/08/12 | 154426 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/08/12 | 73196 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/08/12 | 77952 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/08/12 | 71669 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/08/12 | 80450 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/08/12 | 258881 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/08/12 | 295204 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/08/12 | 22049 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/08/12 | 24994 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/08/12 | 97338 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/08/12 | 112087 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/08/12 | 64427 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/08/12 | 73147 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/08/12 | 96632 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/08/12 | 115352 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/08/12 | 38142 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/08/12 | 43002 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/08/12 | 483654 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/08/12 | 566530 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/08/12 | 147372 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/08/12 | 159580 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/08/12 | 94798 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/08/12 | 109031 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/08/12 | 16356 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/08/12 | 17981 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/08/12 | 28391 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/08/12 | 30059 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/08/12 | 629401 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/08/12 | 681251 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/08/12 | 531851 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/08/12 | 596930 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/08/12 | 476921 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/08/12 | 510588 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/08/12 | 94309 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/08/12 | 103397 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/08/12 | 1713893 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/08/12 | 2009905 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/08/12 | 67618 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/08/12 | 74211 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/08/12 | 27358 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/08/12 | 31620 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/08/12 | 7722 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/08/12 | 8769 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/08/12 | 196872 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/08/12 | 215249 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/08/12 | 250265 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/08/12 | 284024 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/08/12 | 98379 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/08/12 | 103203 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/08/12 | 60638 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/08/12 | 68024 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/08/12 | 124281 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/08/12 | 136820 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/08/12 | 178354 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/08/12 | 196742 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/08/12 | 199733 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/08/12 | 180120 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/08/12 | 67484 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/08/12 | 76826 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/08/12 | 31231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/08/12 | 35084 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/08/12 | 37805 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/08/12 | 42711 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/08/12 | 42891 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/08/12 | 46906 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/08/12 | 45972 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/08/12 | 52523 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/08/12 | 194382 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/08/12 | 206605 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/08/12 | 35692 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/08/12 | 40229 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/08/12 | 744118 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/08/12 | 815242 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/08/12 | 198170 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/08/12 | 202797 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/08/12 | 208050 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/08/12 | 243426 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/08/12 | 78775 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/08/12 | 87778 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/08/12 | 1169716 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/08/12 | 1301192 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/08/12 | 20137 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/08/12 | 23902 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/08/12 | 31539 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/08/12 | 37241 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/08/12 | 64184 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/08/12 | 72206 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/08/12 | 50395 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/08/12 | 57728 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/08/12 | 1340928 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/08/12 | 1464204 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/08/12 | 42388 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/08/12 | 51748 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/08/12 | 56514 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/08/12 | 60039 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/08/12 | 25291 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/08/12 | 27391 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/08/12 | 16413 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/08/12 | 18176 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/08/12 | 63777 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/08/12 | 69915 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/08/12 | 154806 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/08/12 | 169242 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/08/12 | 57013 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/08/12 | 65786 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/08/12 | 98261 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/08/12 | 105219 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/08/12 | 2672609 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/08/12 | 2796727 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/08/12 | 56356 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/08/12 | 62229 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/08/12 | 33545 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/08/12 | 37360 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/08/12 | 27729 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/08/12 | 33632 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/08/12 | 65620 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/08/12 | 70648 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/08/12 | 312110 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/08/12 | 345738 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/08/12 | 55498 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/08/12 | 57139 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/08/12 | 589842 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/08/12 | 624652 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/08/12 | 39129 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/08/12 | 43425 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/08/12 | 234583 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/08/12 | 1326556 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/08/12 | 1233823 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/08/12 | 13464 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/08/12 | 14348 | 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
-2021/08/11 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/08/12 | 1153 | 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
@@ -286296,7 +286302,7 @@
2020/10/20 | 342254 | 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
-2021/08/11 | 932 | systems/win32/miktex/tm/packages/pr.ini
+2021/08/12 | 932 | 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
@@ -287861,7 +287867,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2021/08/12 | 186 | timestamp
+2021/08/13 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2021/08/04 | 917 | usergrps/dante/dtk/doc/beispiel.bib
@@ -287896,13 +287902,14 @@
2010/11/02 | 2046238 | usergrps/gutenberg/lettre/lettre37.pdf
2012/05/29 | 7206211 | usergrps/gutenberg/lettre/lettre38.pdf
2018/08/26 | 1084374 | usergrps/gutenberg/lettre/lettre39.pdf
-2020/11/20 | 4426135 | usergrps/gutenberg/lettre/lettre40.pdf
+2020/11/20 | 4426172 | usergrps/gutenberg/lettre/lettre40.pdf
2020/12/18 | 2820538 | usergrps/gutenberg/lettre/lettre41.pdf
2021/03/15 | 1126968 | usergrps/gutenberg/lettre/lettre42.pdf
2021/04/10 | 581070 | usergrps/gutenberg/lettre/lettre43.pdf
+2021/08/12 | 1003887 | usergrps/gutenberg/lettre/lettre44.pdf
2021/03/07 | 1751233 | usergrps/gutenberg/plaquette.pdf
-2021/03/15 | 1243 | usergrps/gutenberg/README
-2021/05/03 | 11 | usergrps/gutenberg/VERSION
+2021/05/03 | 1243 | usergrps/gutenberg/README
+2021/08/12 | 11 | usergrps/gutenberg/VERSION
1995/01/29 | 803 | usergrps/ntg/maps/descript.ion
1995/01/29 | 2667 | usergrps/ntg/maps/maps01/00read.me
1995/01/23 | 198 | usergrps/ntg/maps/maps01/descript.ion
@@ -289193,40 +289200,40 @@
1999/06/04 | 27445 | usergrps/uktug/baskervi/baskrep.cls
1999/05/12 | 7702 | usergrps/uktug/baskervi/epstopdf
1997/10/01 | 444 | usergrps/uktug/baskervi/README
-2021/08/11 | 9387 | usergrps/usergrps/bg.html
-2021/08/11 | 9084 | usergrps/usergrps/br.html
-2021/08/11 | 9349 | usergrps/usergrps/cn.html
-2021/08/11 | 9503 | usergrps/usergrps/cz.html
-2021/08/11 | 9637 | usergrps/usergrps/de.html
-2021/08/11 | 9141 | usergrps/usergrps/dk.html
-2021/08/11 | 8920 | usergrps/usergrps/ee.html
-2021/08/11 | 9145 | usergrps/usergrps/esc.html
-2021/08/11 | 9290 | usergrps/usergrps/es.html
-2021/08/11 | 9430 | usergrps/usergrps/fr.html
-2021/08/11 | 9273 | usergrps/usergrps/gb.html
-2021/08/11 | 9166 | usergrps/usergrps/gr.html
-2021/08/11 | 9570 | usergrps/usergrps/hu.html
-2021/08/11 | 9066 | usergrps/usergrps/ie.html
-2021/08/11 | 6322 | usergrps/usergrps/index.html
-2021/08/11 | 9041 | usergrps/usergrps/is.html
-2021/08/11 | 9293 | usergrps/usergrps/it.html
-2021/08/11 | 9010 | usergrps/usergrps/kh.html
-2021/08/11 | 9410 | usergrps/usergrps/kr.html
-2021/08/11 | 9895 | usergrps/usergrps/labels.pdf
+2021/08/12 | 9387 | usergrps/usergrps/bg.html
+2021/08/12 | 9084 | usergrps/usergrps/br.html
+2021/08/12 | 9349 | usergrps/usergrps/cn.html
+2021/08/12 | 9503 | usergrps/usergrps/cz.html
+2021/08/12 | 9637 | usergrps/usergrps/de.html
+2021/08/12 | 9141 | usergrps/usergrps/dk.html
+2021/08/12 | 8920 | usergrps/usergrps/ee.html
+2021/08/12 | 9145 | usergrps/usergrps/esc.html
+2021/08/12 | 9290 | usergrps/usergrps/es.html
+2021/08/12 | 9430 | usergrps/usergrps/fr.html
+2021/08/12 | 9273 | usergrps/usergrps/gb.html
+2021/08/12 | 9166 | usergrps/usergrps/gr.html
+2021/08/12 | 9570 | usergrps/usergrps/hu.html
+2021/08/12 | 9066 | usergrps/usergrps/ie.html
+2021/08/12 | 6322 | usergrps/usergrps/index.html
+2021/08/12 | 9041 | usergrps/usergrps/is.html
+2021/08/12 | 9293 | usergrps/usergrps/it.html
+2021/08/12 | 9010 | usergrps/usergrps/kh.html
+2021/08/12 | 9410 | usergrps/usergrps/kr.html
+2021/08/12 | 9897 | usergrps/usergrps/labels.pdf
2021/08/11 | 2266 | usergrps/usergrps/labels.tex
-2021/08/11 | 8950 | usergrps/usergrps/lt.html
-2021/08/11 | 34178 | usergrps/usergrps/lugs.html
-2021/08/11 | 49880 | usergrps/usergrps/lugs.pdf
+2021/08/12 | 8950 | usergrps/usergrps/lt.html
+2021/08/12 | 34178 | usergrps/usergrps/lugs.html
+2021/08/12 | 49882 | usergrps/usergrps/lugs.pdf
2021/08/11 | 22038 | usergrps/usergrps/lugs.tex
-2021/08/11 | 9000 | usergrps/usergrps/mx.html
-2021/08/11 | 9386 | usergrps/usergrps/nl.html
-2021/08/11 | 9111 | usergrps/usergrps/no.html
-2021/08/11 | 9575 | usergrps/usergrps/pl.html
-2021/08/11 | 9139 | usergrps/usergrps/pt.html
-2021/08/11 | 9181 | usergrps/usergrps/us.html
-2021/08/11 | 9050 | usergrps/usergrps/uy.html
-2021/08/11 | 9121 | usergrps/usergrps/vn.html
-2021/08/11 | 9060 | usergrps/usergrps/za.html
+2021/08/12 | 9000 | usergrps/usergrps/mx.html
+2021/08/12 | 9386 | usergrps/usergrps/nl.html
+2021/08/12 | 9111 | usergrps/usergrps/no.html
+2021/08/12 | 9575 | usergrps/usergrps/pl.html
+2021/08/12 | 9139 | usergrps/usergrps/pt.html
+2021/08/12 | 9181 | usergrps/usergrps/us.html
+2021/08/12 | 9050 | usergrps/usergrps/uy.html
+2021/08/12 | 9121 | usergrps/usergrps/vn.html
+2021/08/12 | 9060 | usergrps/usergrps/za.html
1992/12/06 | 2551 | web/aplweb/announcement
1993/11/03 | 802292 | web/aplweb/aplweba.zip
1993/11/03 | 771814 | web/aplweb/aplwebb.zip
@@ -291240,14 +291247,14 @@
2016/07/04 | 11025 | web/protex/ProTex.sty
2016/07/04 | 16066 | web/protex/README
2016/07/04 | 22227 | web/protex.zip
-2021/03/17 | 5117 | web/pwebmac/index.md
-2021/03/17 | 11371 | web/pwebmac/makeall
-2021/03/17 | 19485 | web/pwebmac/pwebmac.tex
-2021/03/17 | 1901 | web/pwebmac/README.md
-2021/03/17 | 233 | web/pwebmac/trapman.ch
-2021/03/17 | 6081 | web/pwebmac/webman.ch
+2021/08/06 | 5116 | web/pwebmac/index.md
+2021/08/11 | 11476 | web/pwebmac/makeall
+2021/08/11 | 21226 | web/pwebmac/pwebmac.tex
+2021/08/12 | 1929 | web/pwebmac/README.md
+2020/06/08 | 233 | web/pwebmac/trapman.ch
+2021/08/09 | 10783 | web/pwebmac/webman.ch
2021/03/17 | 1514 | web/pwebmac/Xerrorlog.tex
-2021/03/17 | 17655 | web/pwebmac.zip
+2021/08/12 | 19715 | web/pwebmac.zip
1998/01/02 | 51534 | web/reduce/rweb/appl/integrator.web
1998/01/02 | 2014 | web/reduce/rweb/appl/liesuperconvert.web
1998/01/02 | 199508 | web/reduce/rweb/appl/liesuper.web
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 17214724d0..f4626ba5bb 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index feaf34e82b..11a78d3a96 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,48 +1,286 @@
+2021/08/12 | 9908 | systems/texlive/tlnet/archive/colorist.r60223.tar.xz
+2021/08/12 | 9897 | usergrps/usergrps/labels.pdf
+2021/08/12 | 98379 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/08/12 | 98261 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/08/12 | 980833 | macros/latex/contrib/geradwp.zip
+2021/08/12 | 975017 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/08/12 | 97338 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/08/12 | 96632 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/08/12 | 9637 | usergrps/usergrps/de.html
+2021/08/12 | 9575 | usergrps/usergrps/pl.html
+2021/08/12 | 9570 | usergrps/usergrps/hu.html
+2021/08/12 | 95401 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/08/12 | 9503 | usergrps/usergrps/cz.html
+2021/08/12 | 94798 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/08/12 | 9430 | usergrps/usergrps/fr.html
+2021/08/12 | 94309 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/08/12 | 9410 | usergrps/usergrps/kr.html
+2021/08/12 | 9387 | usergrps/usergrps/bg.html
+2021/08/12 | 9386 | usergrps/usergrps/nl.html
+2021/08/12 | 9349 | usergrps/usergrps/cn.html
+2021/08/12 | 932 | systems/win32/miktex/tm/packages/pr.ini
+2021/08/12 | 9293 | usergrps/usergrps/it.html
+2021/08/12 | 9290 | usergrps/usergrps/es.html
+2021/08/12 | 9273 | usergrps/usergrps/gb.html
+2021/08/12 | 9181 | usergrps/usergrps/us.html
+2021/08/12 | 9166 | usergrps/usergrps/gr.html
+2021/08/12 | 9145 | usergrps/usergrps/esc.html
+2021/08/12 | 9141 | usergrps/usergrps/dk.html
+2021/08/12 | 9139 | usergrps/usergrps/pt.html
+2021/08/12 | 9121 | usergrps/usergrps/vn.html
+2021/08/12 | 9111 | usergrps/usergrps/no.html
+2021/08/12 | 9084 | usergrps/usergrps/br.html
+2021/08/12 | 9066 | usergrps/usergrps/ie.html
+2021/08/12 | 9060 | usergrps/usergrps/za.html
+2021/08/12 | 9050 | usergrps/usergrps/uy.html
+2021/08/12 | 9041 | usergrps/usergrps/is.html
+2021/08/12 | 9010 | usergrps/usergrps/kh.html
+2021/08/12 | 9000 | usergrps/usergrps/mx.html
+2021/08/12 | 8950 | usergrps/usergrps/lt.html
+2021/08/12 | 8920 | usergrps/usergrps/ee.html
+2021/08/12 | 87778 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/08/12 | 8769 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/08/12 | 83540 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/08/12 | 815242 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/08/12 | 80450 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/08/12 | 78775 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/08/12 | 77952 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/08/12 | 7722 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/08/12 | 76826 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/08/12 | 75792 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/08/12 | 744118 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/08/12 | 74211 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/08/12 | 73196 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/08/12 | 73147 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/08/12 | 72206 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/08/12 | 7200 | systems/texlive/tlnet/archive/minimalist.r60223.tar.xz
+2021/08/12 | 71669 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/08/12 | 70648 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/08/12 | 703616 | systems/texlive/tlnet/archive/beaulivre.doc.r60223.tar.xz
+2021/08/12 | 69915 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/08/12 | 69173 | macros/latex/contrib/thesis-ekf/eszterhazy-logo-de.eps
+2021/08/12 | 681251 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/08/12 | 6811147 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/08/12 | 68024 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/08/12 | 67820 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/08/12 | 67618 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/08/12 | 67484 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/08/12 | 659964 | systems/texlive/tlnet/archive/simplivre.doc.r60223.tar.xz
+2021/08/12 | 65786 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/08/12 | 65620 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/08/12 | 651324 | systems/texlive/tlnet/archive/projlib.doc.r60222.tar.xz
+2021/08/12 | 6497 | language/japanese/jlreq/jlreq-trimmarks.md
+2021/08/12 | 64427 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/08/12 | 64184 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/08/12 | 63777 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/08/12 | 6322 | usergrps/usergrps/index.html
+2021/08/12 | 629401 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/08/12 | 62786 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/08/12 | 624652 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/08/12 | 62229 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/08/12 | 61811 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/08/12 | 60638 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/08/12 | 605192 | systems/texlive/tlnet/archive/easybook.doc.r60221.tar.xz
+2021/08/12 | 60039 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/08/12 | 596930 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/08/12 | 5960 | language/japanese/jlreq/README.md
+2021/08/12 | 595815 | language/japanese/jlreq.zip
+2021/08/12 | 592861 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/08/12 | 592457 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/08/12 | 591752 | systems/texlive/tlnet/archive/lebhart.doc.r60223.tar.xz
+2021/08/12 | 589842 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/08/12 | 57728 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/08/12 | 57547 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/08/12 | 57139 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/08/12 | 57013 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/08/12 | 5700 | systems/texlive/tlnet/archive/tipauni.r60220.tar.xz
+2021/08/12 | 56684 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/08/12 | 566530 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/08/12 | 56514 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/08/12 | 56474 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/08/12 | 56356 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/08/12 | 56318 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/08/12 | 562032 | systems/texlive/tlnet/archive/einfart.doc.r60223.tar.xz
+2021/08/12 | 55498 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/08/12 | 54631 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/08/12 | 531851 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/08/12 | 52523 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/08/12 | 51748 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/08/12 | 51309 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/08/12 | 51201 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/08/12 | 51110 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/08/12 | 510588 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/08/12 | 50395 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/08/12 | 50150 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/08/12 | 49882 | usergrps/usergrps/lugs.pdf
+2021/08/12 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/08/12 | 483654 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/08/12 | 48253 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/08/12 | 476921 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/08/12 | 46906 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/08/12 | 461814 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/08/12 | 461274 | macros/latex/contrib/thesis-ekf.zip
+2021/08/12 | 45972 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/08/12 | 45905 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/08/12 | 456832 | systems/texlive/tlnet/archive/tipauni.doc.r60220.tar.xz
+2021/08/12 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/08/12 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/08/12 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/08/12 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/08/12 | 45310 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/08/12 | 43658 | macros/latex/contrib/fancyvrb/latex/fancyvrb.sty
+2021/08/12 | 43425 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/08/12 | 43029 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/08/12 | 43002 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/08/12 | 42891 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/08/12 | 42711 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/08/12 | 42388 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/08/12 | 41194 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/08/12 | 40703 | macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex
+2021/08/12 | 40229 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/08/12 | 399236 | systems/texlive/tlnet/archive/texlive-scripts.doc.r60219.tar.xz
+2021/08/12 | 392792 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/08/12 | 3920 | systems/texlive/tlnet/archive/einfart.r60223.tar.xz
+2021/08/12 | 39129 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/08/12 | 3892 | systems/texlive/tlnet/archive/simplivre.r60223.tar.xz
+2021/08/12 | 3816 | systems/texlive/tlnet/archive/lebhart.r60223.tar.xz
+2021/08/12 | 38142 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/08/12 | 3804 | systems/texlive/tlnet/archive/beaulivre.r60223.tar.xz
+2021/08/12 | 37805 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/08/12 | 37360 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/08/12 | 37241 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/08/12 | 36629 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/08/12 | 35692 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/08/12 | 35176 | systems/texlive/tlnet/archive/projlib.source.r60222.tar.xz
+2021/08/12 | 35084 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/08/12 | 34664 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/08/12 | 345738 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/08/12 | 34178 | usergrps/usergrps/lugs.html
+2021/08/12 | 34178 | macros/latex/contrib/thesis-ekf/thesis-ekf.dtx
+2021/08/12 | 33632 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/08/12 | 33545 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/08/12 | 330788 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/08/12 | 327250 | macros/latex/contrib/thesis-ekf/thesis-ekf.pdf
+2021/08/12 | 32674 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/08/12 | 325043 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/08/12 | 31620 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/08/12 | 31539 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/08/12 | 31351 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/08/12 | 31231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/08/12 | 312110 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/08/12 | 30824 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/08/12 | 30059 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/08/12 | 29841 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/08/12 | 295204 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/08/12 | 29035 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/08/12 | 284580 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/08/12 | 284024 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/08/12 | 28391 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/08/12 | 28180 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/08/12 | 2796727 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/08/12 | 27729 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/08/12 | 27391 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/08/12 | 27358 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/08/12 | 27198 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/08/12 | 2672609 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/08/12 | 263959 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/08/12 | 258881 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/08/12 | 25585327 | systems/texlive/tlnet/install-tl.zip
+2021/08/12 | 25291 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/08/12 | 250265 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/08/12 | 25020 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/08/12 | 24994 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/08/12 | 243426 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/08/12 | 241811 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/08/12 | 23902 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/08/12 | 234589 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/08/12 | 234583 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/08/12 | 23363 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/08/12 | 2328968 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/08/12 | 22963 | macros/latex/contrib/thesis-ekf/eszterhazy-logo-de.pdf
+2021/08/12 | 22049 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/08/12 | 215249 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/08/12 | 21225 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/08/12 | 20810050 | systems/texlive/tlnet/install-tl-windows.exe
+2021/08/12 | 208050 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/08/12 | 206605 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/08/12 | 202797 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/08/12 | 20137 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/08/12 | 2009905 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/08/12 | 199733 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/08/12 | 198170 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/08/12 | 19715 | web/pwebmac.zip
+2021/08/12 | 196872 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/08/12 | 196742 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/08/12 | 195636 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/08/12 | 194382 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/08/12 | 1929 | web/pwebmac/README.md
+2021/08/12 | 18176 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/08/12 | 180120 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/08/12 | 180011 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/08/12 | 17981 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/08/12 | 178354 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/08/12 | 17352662 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/08/12 | 1713893 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/08/12 | 17128 | systems/texlive/tlnet/archive/easybook.source.r60221.tar.xz
+2021/08/12 | 17080 | systems/texlive/tlnet/archive/easybook.r60221.tar.xz
+2021/08/12 | 169242 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/08/12 | 16413 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/08/12 | 16356 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/08/12 | 161446 | macros/latex/contrib/fancyvrb.zip
+2021/08/12 | 1604 | macros/latex/contrib/fancyvrb/Changes
+2021/08/12 | 1602 | macros/latex/contrib/thesis-ekf/README
+2021/08/12 | 159580 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/08/12 | 154806 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/08/12 | 154426 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/08/12 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/08/12 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/08/12 | 147372 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/08/12 | 1464204 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/08/12 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/08/12 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/08/12 | 14348 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/08/12 | 1421867 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/08/12 | 1416 | macros/latex/contrib/thesis-ekf/thesis-ekf.ins
+2021/08/12 | 138429 | macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf
+2021/08/12 | 136820 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/08/12 | 136816 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/08/12 | 13464 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/08/12 | 1340928 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/08/12 | 133864 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/08/12 | 1326556 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/08/12 | 1325686 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/08/12 | 1301192 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/08/12 | 1291299 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/08/12 | 12520 | systems/texlive/tlnet/archive/tipauni.source.r60220.tar.xz
+2021/08/12 | 124281 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/08/12 | 1233823 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/08/12 | 1233091 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/08/12 | 11 | usergrps/gutenberg/VERSION
+2021/08/12 | 119821 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/08/12 | 118695 | language/japanese/jlreq/jlreq.pdf
+2021/08/12 | 11856 | systems/texlive/tlnet/archive/projlib.r60222.tar.xz
+2021/08/12 | 1169716 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/08/12 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/08/12 | 115352 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/08/12 | 112983 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/08/12 | 112087 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/08/12 | 10950230 | install/language/japanese/jlreq.tds.zip
+2021/08/12 | 109108 | systems/texlive/tlnet/archive/minimalist.doc.r60223.tar.xz
+2021/08/12 | 109031 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/08/12 | 108304 | systems/texlive/tlnet/archive/texlive-scripts.r60219.tar.xz
+2021/08/12 | 1077991 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/08/12 | 106004 | systems/texlive/tlnet/archive/colorist.doc.r60223.tar.xz
+2021/08/12 | 105219 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/08/12 | 103397 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/08/12 | 103203 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/08/12 | 100625 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/08/12 | 1003887 | usergrps/gutenberg/lettre/lettre44.pdf
2021/08/11 | 99326 | systems/win32/miktex/tm/packages/colorist__doc.tar.lzma
-2021/08/11 | 9895 | usergrps/usergrps/labels.pdf
-2021/08/11 | 98380 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/08/11 | 98261 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
2021/08/11 | 98049 | macros/latex/contrib/minimalist/minimalist-doc.pdf
2021/08/11 | 9783 | systems/win32/miktex/tm/packages/colorist.tar.lzma
-2021/08/11 | 975018 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/08/11 | 97338 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/08/11 | 96633 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2021/08/11 | 9637 | usergrps/usergrps/de.html
-2021/08/11 | 9575 | usergrps/usergrps/pl.html
-2021/08/11 | 9570 | usergrps/usergrps/hu.html
-2021/08/11 | 95401 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/08/11 | 9503 | usergrps/usergrps/cz.html
-2021/08/11 | 94798 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/08/11 | 94311 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2021/08/11 | 9430 | usergrps/usergrps/fr.html
-2021/08/11 | 9410 | usergrps/usergrps/kr.html
2021/08/11 | 93927 | macros/latex/contrib/colorist/colorist-doc.pdf
-2021/08/11 | 9387 | usergrps/usergrps/bg.html
-2021/08/11 | 9386 | usergrps/usergrps/nl.html
-2021/08/11 | 9349 | usergrps/usergrps/cn.html
-2021/08/11 | 932 | systems/win32/miktex/tm/packages/pr.ini
-2021/08/11 | 9293 | usergrps/usergrps/it.html
-2021/08/11 | 9290 | usergrps/usergrps/es.html
-2021/08/11 | 9273 | usergrps/usergrps/gb.html
-2021/08/11 | 9181 | usergrps/usergrps/us.html
-2021/08/11 | 9166 | usergrps/usergrps/gr.html
-2021/08/11 | 9145 | usergrps/usergrps/esc.html
-2021/08/11 | 9141 | usergrps/usergrps/dk.html
-2021/08/11 | 9139 | usergrps/usergrps/pt.html
-2021/08/11 | 9121 | usergrps/usergrps/vn.html
-2021/08/11 | 9111 | usergrps/usergrps/no.html
-2021/08/11 | 9084 | usergrps/usergrps/br.html
-2021/08/11 | 9066 | usergrps/usergrps/ie.html
-2021/08/11 | 9060 | usergrps/usergrps/za.html
-2021/08/11 | 9050 | usergrps/usergrps/uy.html
-2021/08/11 | 9041 | usergrps/usergrps/is.html
2021/08/11 | 90211 | macros/latex/contrib/projlib/ProjLib-doc.dtx
-2021/08/11 | 9010 | usergrps/usergrps/kh.html
-2021/08/11 | 9000 | usergrps/usergrps/mx.html
-2021/08/11 | 8950 | usergrps/usergrps/lt.html
-2021/08/11 | 8920 | usergrps/usergrps/ee.html
-2021/08/11 | 87776 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/08/11 | 8768 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
2021/08/11 | 8646 | systems/win32/miktex/tm/packages/minimalist__source.tar.lzma
2021/08/11 | 857 | macros/latex/contrib/projlib/ProjLib-doc.ins
2021/08/11 | 85746 | macros/latex/contrib/colorist/colorist.sty
@@ -50,283 +288,149 @@
2021/08/11 | 85125 | macros/unicodetex/latex/tipauni/tipauni-commands.pdf
2021/08/11 | 84979 | systems/win32/miktex/tm/packages/smart-eqn__doc.tar.lzma
2021/08/11 | 8370 | systems/win32/miktex/tm/packages/colorist__source.tar.lzma
-2021/08/11 | 83540 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/08/11 | 815244 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
2021/08/11 | 805052 | systems/win32/miktex/tm/packages/nwafuthesis__source.tar.lzma
-2021/08/11 | 80449 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
2021/08/11 | 80151 | systems/win32/miktex/tm/packages/pyluatex__doc.tar.lzma
2021/08/11 | 79078 | macros/latex/contrib/easybook/easybook.dtx
2021/08/11 | 79065 | macros/latex/contrib/easybook/easybook.tex
-2021/08/11 | 78774 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
2021/08/11 | 7867 | systems/win32/miktex/tm/packages/lua-uni-algos.tar.lzma
2021/08/11 | 780984 | macros/unicodetex/latex/beaulivre.zip
-2021/08/11 | 77951 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/08/11 | 7808 | language/japanese/jlreq/jlreq-trimmarks-ja.md
2021/08/11 | 777090 | systems/win32/miktex/tm/packages/markdown__doc.tar.lzma
-2021/08/11 | 7721 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/08/11 | 76826 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
2021/08/11 | 76380 | systems/win32/miktex/tm/packages/markdown__source.tar.lzma
-2021/08/11 | 75791 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/08/11 | 75653 | macros/latex/contrib/geradwp/geradwp.dtx
2021/08/11 | 75310 | systems/win32/miktex/tm/packages/elpres.tar.lzma
2021/08/11 | 75136 | systems/texlive/tlnet/archive/elpres.r60209.tar.xz
-2021/08/11 | 744118 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/08/11 | 74210 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
2021/08/11 | 741873 | macros/unicodetex/latex/simplivre.zip
2021/08/11 | 736791 | macros/latex/contrib/projlib.zip
2021/08/11 | 7350 | systems/win32/miktex/tm/packages/minimalist.tar.lzma
-2021/08/11 | 73197 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/08/11 | 73146 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/08/11 | 72207 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/08/11 | 71669 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
2021/08/11 | 71389 | systems/win32/miktex/tm/packages/lua-uni-algos__doc.tar.lzma
-2021/08/11 | 70649 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
2021/08/11 | 7038 | systems/win32/miktex/tm/packages/tikzlings__source.tar.lzma
-2021/08/11 | 69914 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/08/11 | 6957 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2021/08/11 | 686514 | systems/win32/miktex/tm/packages/beaulivre__doc.tar.lzma
-2021/08/11 | 681253 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/08/11 | 6811531 | systems/texlive/tlnet/install-tl-unx.tar.gz
2021/08/11 | 68100 | systems/texlive/tlnet/archive/spbmark.doc.r60216.tar.xz
-2021/08/11 | 68024 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/08/11 | 67819 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/08/11 | 67618 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/08/11 | 67484 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
2021/08/11 | 663999 | systems/win32/miktex/tm/packages/nchairx__doc.tar.lzma
2021/08/11 | 660902 | systems/win32/miktex/tm/packages/tikzlings__doc.tar.lzma
2021/08/11 | 65844 | systems/win32/miktex/tm/packages/spbmark__doc.tar.lzma
-2021/08/11 | 65785 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/08/11 | 65619 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2021/08/11 | 64426 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/08/11 | 64185 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/08/11 | 64937 | macros/latex/contrib/thesis-ekf/eszterhazy-logo-hu.eps
+2021/08/11 | 64873 | macros/latex/contrib/thesis-ekf/eszterhazy-logo-en.eps
2021/08/11 | 641471 | systems/win32/miktex/tm/packages/simplivre__doc.tar.lzma
-2021/08/11 | 63778 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/08/11 | 6322 | usergrps/usergrps/index.html
2021/08/11 | 631388 | systems/win32/miktex/tm/packages/projlib__doc.tar.lzma
-2021/08/11 | 629401 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
2021/08/11 | 6291584 | systems/texlive/tlnet/archive/schule.doc.r60210.tar.xz
2021/08/11 | 6286 | systems/win32/miktex/tm/packages/pyluatex.tar.lzma
-2021/08/11 | 62786 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
2021/08/11 | 625369 | macros/latex/contrib/easybook.zip
-2021/08/11 | 624652 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/08/11 | 62228 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
2021/08/11 | 620508 | macros/unicodetex/latex/lebhart.zip
-2021/08/11 | 61812 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
2021/08/11 | 6150 | systems/win32/miktex/tm/packages/smart-eqn__source.tar.lzma
-2021/08/11 | 60638 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/08/11 | 605240 | systems/texlive/tlnet/archive/easybook.doc.r60212.tar.xz
-2021/08/11 | 60039 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
2021/08/11 | 59872 | systems/texlive/tlnet/archive/ulthese.r60217.tar.xz
-2021/08/11 | 596931 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
2021/08/11 | 594434 | macros/unicodetex/latex/einfart.zip
-2021/08/11 | 592861 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/08/11 | 592457 | systems/win32/miktex/tm/packages/files.csv.lzma
2021/08/11 | 5909 | macros/latex/contrib/minimalist/minimart.cls
2021/08/11 | 5906 | macros/latex/contrib/minimalist/minimbook.cls
-2021/08/11 | 589840 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
2021/08/11 | 587919 | systems/win32/miktex/tm/packages/easybook__doc.tar.lzma
2021/08/11 | 584709 | macros/latex/contrib/easybook/easybook.pdf
-2021/08/11 | 57730 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/08/11 | 57547 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
2021/08/11 | 574685 | systems/win32/miktex/tm/packages/lebhart__doc.tar.lzma
-2021/08/11 | 57139 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/08/11 | 57012 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/08/11 | 56685 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/08/11 | 566530 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/08/11 | 56514 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/08/11 | 56475 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/08/11 | 56357 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/08/11 | 56317 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/08/11 | 55500 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
2021/08/11 | 5537 | macros/latex/contrib/colorist/colorart.cls
2021/08/11 | 5534 | macros/latex/contrib/colorist/colorbook.cls
2021/08/11 | 5500 | systems/win32/miktex/tm/packages/readarray.tar.lzma
-2021/08/11 | 54632 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
2021/08/11 | 543481 | systems/win32/miktex/tm/packages/einfart__doc.tar.lzma
2021/08/11 | 54210 | systems/win32/miktex/tm/packages/xetexko.tar.lzma
-2021/08/11 | 531852 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
2021/08/11 | 5255 | systems/win32/miktex/tm/packages/zref-check.tar.lzma
-2021/08/11 | 52523 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/08/11 | 51749 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/08/11 | 51309 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/08/11 | 51201 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/08/11 | 51114 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/08/11 | 510588 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/08/11 | 50395 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/08/11 | 50152 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/08/11 | 49880 | usergrps/usergrps/lugs.pdf
+2021/08/11 | 503393 | macros/latex/contrib/geradwp/geradwp-fr.pdf
2021/08/11 | 49834 | macros/unicodetex/latex/tipauni/tipauni.dtx
2021/08/11 | 492659 | systems/win32/miktex/tm/packages/readarray__doc.tar.lzma
-2021/08/11 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2021/08/11 | 483654 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/08/11 | 48251 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
2021/08/11 | 478280 | macros/unicodetex/latex/tipauni.zip
-2021/08/11 | 476919 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
2021/08/11 | 4691 | systems/win32/miktex/tm/packages/ulthese.tar.lzma
-2021/08/11 | 46906 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/08/11 | 461813 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/08/11 | 45970 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/08/11 | 45906 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/08/11 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/08/11 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2021/08/11 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/08/11 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
-2021/08/11 | 45311 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/08/11 | 460925 | macros/latex/contrib/geradwp/geradwp.pdf
+2021/08/11 | 46020 | language/japanese/jlreq/jlreq-trimmarks.sty
2021/08/11 | 451 | macros/unicodetex/latex/tipauni/README.txt
+2021/08/11 | 44612 | language/japanese/jlreq/README-ja.md
2021/08/11 | 4443 | systems/win32/miktex/tm/packages/pyluatex__source.tar.lzma
2021/08/11 | 4348 | macros/latex/contrib/projlib/README.md
2021/08/11 | 43424 | systems/win32/miktex/tm/packages/tuda-ci.tar.lzma
-2021/08/11 | 43424 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/08/11 | 43028 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/08/11 | 43002 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/08/11 | 42892 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/08/11 | 42711 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/08/11 | 42386 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
2021/08/11 | 4184 | systems/win32/miktex/tm/packages/lua-uni-algos__source.tar.lzma
-2021/08/11 | 41195 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
2021/08/11 | 4081 | systems/win32/miktex/tm/packages/einfart.tar.lzma
2021/08/11 | 406848 | systems/texlive/tlnet/archive/semantex.doc.r60215.tar.xz
2021/08/11 | 4055 | systems/win32/miktex/tm/packages/simplivre.tar.lzma
-2021/08/11 | 40228 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/08/11 | 399180 | systems/texlive/tlnet/archive/texlive-scripts.doc.r60208.tar.xz
2021/08/11 | 3971 | systems/win32/miktex/tm/packages/lebhart.tar.lzma
2021/08/11 | 3971 | systems/win32/miktex/tm/packages/beaulivre.tar.lzma
2021/08/11 | 39647 | systems/win32/miktex/tm/packages/schule.tar.lzma
2021/08/11 | 39592 | systems/texlive/tlnet/archive/schule.r60210.tar.xz
-2021/08/11 | 392792 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
2021/08/11 | 3919 | systems/win32/miktex/tm/packages/huawei__source.tar.lzma
-2021/08/11 | 39128 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
2021/08/11 | 388088 | systems/texlive/tlnet/archive/elpres.doc.r60209.tar.xz
2021/08/11 | 38376 | systems/win32/miktex/tm/packages/hep-paper__source.tar.lzma
2021/08/11 | 38183 | systems/win32/miktex/tm/packages/easybook__source.tar.lzma
-2021/08/11 | 38142 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/08/11 | 37806 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
2021/08/11 | 375313 | systems/win32/miktex/tm/packages/semantex__doc.tar.lzma
2021/08/11 | 374456 | systems/win32/miktex/tm/packages/elpres__doc.tar.lzma
-2021/08/11 | 37359 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/08/11 | 37241 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/08/11 | 368625 | language/japanese/jlreq/jlreq-ja.pdf
2021/08/11 | 3663 | macros/unicodetex/latex/tipauni/tipauni-commands.tex
-2021/08/11 | 36629 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2021/08/11 | 35691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
2021/08/11 | 35511 | systems/win32/miktex/tm/packages/projlib__source.tar.lzma
2021/08/11 | 35200 | systems/win32/miktex/tm/packages/semantex__source.tar.lzma
2021/08/11 | 35149 | macros/unicodetex/latex/tipauni/COPYING
-2021/08/11 | 35085 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
2021/08/11 | 3476704 | systems/win32/miktex/tm/packages/schule__doc.tar.lzma
-2021/08/11 | 34664 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/08/11 | 345740 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
2021/08/11 | 343418 | systems/win32/miktex/tm/packages/huawei__doc.tar.lzma
2021/08/11 | 3434174 | systems/win32/miktex/tm/packages/visualfaq.tar.lzma
-2021/08/11 | 34178 | usergrps/usergrps/lugs.html
2021/08/11 | 3415 | systems/win32/miktex/tm/packages/tikzbricks__source.tar.lzma
2021/08/11 | 33959 | systems/win32/miktex/tm/packages/markdown.tar.lzma
2021/08/11 | 3387 | systems/win32/miktex/tm/packages/spbmark__source.tar.lzma
-2021/08/11 | 33631 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/08/11 | 33545 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
2021/08/11 | 331915 | macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf
-2021/08/11 | 330788 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
2021/08/11 | 32747 | systems/win32/miktex/tm/packages/tikzlings.tar.lzma
-2021/08/11 | 32673 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/08/11 | 325043 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2021/08/11 | 31619 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/08/11 | 31539 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/08/11 | 31351 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/08/11 | 31230 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/08/11 | 312110 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
2021/08/11 | 312075 | systems/win32/miktex/tm/packages/ulthese__doc.tar.lzma
2021/08/11 | 311756 | macros/latex/contrib/projlib/ProjLib-doc-cn.pdf
2021/08/11 | 31098 | systems/win32/miktex/tm/packages/nicematrix.tar.lzma
2021/08/11 | 31072 | systems/texlive/tlnet/archive/nicematrix.r60214.tar.xz
+2021/08/11 | 3104 | macros/latex/contrib/geradwp/README.md
2021/08/11 | 31026 | macros/latex/contrib/minimalist/minimalist.sty
2021/08/11 | 309221 | macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf
-2021/08/11 | 30823 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/08/11 | 30058 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/08/11 | 29841 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/08/11 | 295202 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
2021/08/11 | 29377 | macros/latex/contrib/minimalist/minimalist-doc.tex
2021/08/11 | 29190 | macros/unicodetex/latex/einfart/einfart-doc-fr.tex
-2021/08/11 | 29037 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/08/11 | 284580 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/08/11 | 284024 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/08/11 | 28390 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
2021/08/11 | 28377 | macros/unicodetex/latex/simplivre/simplivre-doc-fr.tex
2021/08/11 | 28362 | macros/latex/contrib/colorist/colorist-doc.tex
2021/08/11 | 2832 | macros/latex/contrib/projlib/ProjLib.ins
2021/08/11 | 28318 | systems/win32/miktex/tm/packages/nwafuthesis.tar.lzma
-2021/08/11 | 28179 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/08/11 | 282366 | language/japanese/jlreq/jlreq.cls
2021/08/11 | 28169 | macros/unicodetex/latex/lebhart/lebhart-doc-fr.tex
2021/08/11 | 2813755 | systems/win32/miktex/tm/packages/schule__source.tar.lzma
2021/08/11 | 28088 | systems/texlive/tlnet/archive/hep-paper.source.r60213.tar.xz
-2021/08/11 | 2796726 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
2021/08/11 | 279341 | macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf
2021/08/11 | 2789 | systems/win32/miktex/tm/packages/smart-eqn.tar.lzma
-2021/08/11 | 27728 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
2021/08/11 | 27693 | systems/win32/miktex/tm/packages/ulthese__source.tar.lzma
2021/08/11 | 27540 | systems/win32/miktex/tm/packages/nchairx__source.tar.lzma
-2021/08/11 | 27390 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/08/11 | 27357 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
2021/08/11 | 27228 | systems/texlive/tlnet/archive/ulthese.source.r60217.tar.xz
-2021/08/11 | 27197 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
2021/08/11 | 2717 | systems/win32/miktex/tm/packages/cooltooltips.tar.lzma
2021/08/11 | 27087 | macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.tex
2021/08/11 | 26976 | macros/unicodetex/latex/einfart/einfart-doc-en.tex
2021/08/11 | 26848 | systems/texlive/tlnet/archive/semantex.r60215.tar.xz
2021/08/11 | 2681 | systems/win32/miktex/tm/packages/spbmark.tar.lzma
-2021/08/11 | 2672608 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/08/11 | 263958 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
2021/08/11 | 26265 | macros/unicodetex/latex/simplivre/simplivre-doc-en.tex
2021/08/11 | 261777 | systems/win32/miktex/tm/packages/huawei.tar.lzma
2021/08/11 | 26046 | macros/unicodetex/latex/lebhart/lebhart-doc-en.tex
2021/08/11 | 258940 | systems/texlive/tlnet/archive/ulthese.doc.r60217.tar.xz
-2021/08/11 | 258881 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
2021/08/11 | 256379 | systems/win32/miktex/tm/packages/xetexko__doc.tar.lzma
-2021/08/11 | 25585304 | systems/texlive/tlnet/install-tl.zip
-2021/08/11 | 25291 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
2021/08/11 | 25107 | macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex
2021/08/11 | 250392 | macros/unicodetex/latex/einfart/einfart-doc-cn.pdf
2021/08/11 | 25034 | macros/unicodetex/latex/einfart/einfart-doc-cn.tex
-2021/08/11 | 250265 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/08/11 | 25020 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/08/11 | 24994 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
2021/08/11 | 2488 | systems/texlive/tlnet/archive/spbmark.r60216.tar.xz
2021/08/11 | 248249 | macros/unicodetex/latex/tipauni/tipauni.pdf
2021/08/11 | 2454206 | systems/win32/miktex/tm/packages/visualfaq__source.tar.lzma
2021/08/11 | 24344 | macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex
-2021/08/11 | 243425 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
2021/08/11 | 243424 | systems/texlive/tlnet/archive/tikzbricks.doc.r60211.tar.xz
2021/08/11 | 24312 | macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex
-2021/08/11 | 241810 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
2021/08/11 | 241548 | systems/win32/miktex/tm/packages/tikzbricks__doc.tar.lzma
-2021/08/11 | 23901 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
2021/08/11 | 23891 | systems/win32/miktex/tm/packages/semantex.tar.lzma
-2021/08/11 | 234617 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/08/11 | 234540 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
2021/08/11 | 23376 | macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex
-2021/08/11 | 23365 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/08/11 | 2329272 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/08/11 | 2266 | usergrps/usergrps/labels.tex
2021/08/11 | 224725 | systems/win32/miktex/tm/packages/cooltooltips__doc.tar.lzma
-2021/08/11 | 22049 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
2021/08/11 | 22038 | usergrps/usergrps/lugs.tex
2021/08/11 | 219755 | macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.pdf
+2021/08/11 | 21798 | macros/latex/contrib/thesis-ekf/eszterhazy-logo-hu.pdf
+2021/08/11 | 21649 | macros/latex/contrib/thesis-ekf/eszterhazy-logo-en.pdf
2021/08/11 | 215836 | macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf
-2021/08/11 | 215249 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
2021/08/11 | 212933 | macros/unicodetex/latex/simplivre/simplivre-doc-fr.pdf
-2021/08/11 | 21226 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/08/11 | 21226 | web/pwebmac/pwebmac.tex
2021/08/11 | 210494 | macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf
-2021/08/11 | 20808770 | systems/texlive/tlnet/install-tl-windows.exe
-2021/08/11 | 208047 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/08/11 | 206605 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
2021/08/11 | 2062 | macros/latex/contrib/minimalist/README.md
-2021/08/11 | 202794 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
2021/08/11 | 2026079 | systems/win32/miktex/tm/packages/nwafuthesis__doc.tar.lzma
-2021/08/11 | 20138 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/08/11 | 2009903 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
2021/08/11 | 2008 | macros/latex/contrib/colorist/README.md
-2021/08/11 | 199733 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/08/11 | 198171 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/08/11 | 20084 | language/japanese/jlreq/jlreq-helpers.sty
2021/08/11 | 19709 | systems/win32/miktex/tm/packages/zref-check__source.tar.lzma
-2021/08/11 | 196872 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/08/11 | 196741 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/08/11 | 195636 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/08/11 | 194383 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
2021/08/11 | 192902 | macros/latex/contrib/projlib/ProjLib-doc-fr.pdf
2021/08/11 | 191210 | macros/latex/contrib/projlib/ProjLib-doc-en.pdf
2021/08/11 | 19106 | macros/unicodetex/latex/simplivre/LICENSE
@@ -338,113 +442,58 @@
2021/08/11 | 19106 | macros/latex/contrib/colorist/LICENSE
2021/08/11 | 18570 | systems/win32/miktex/tm/packages/einfart__source.tar.lzma
2021/08/11 | 18440 | systems/win32/miktex/tm/packages/simplivre__source.tar.lzma
-2021/08/11 | 18176 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
2021/08/11 | 1809888 | systems/texlive/tlnet/archive/nicematrix.doc.r60214.tar.xz
2021/08/11 | 18028 | macros/unicodetex/latex/simplivre/simplivre.cls
2021/08/11 | 18024 | macros/unicodetex/latex/einfart/einfart.cls
-2021/08/11 | 180119 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/08/11 | 180012 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/08/11 | 17980 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/08/11 | 178353 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
2021/08/11 | 1773514 | systems/win32/miktex/tm/packages/nicematrix__doc.tar.lzma
2021/08/11 | 17714 | systems/win32/miktex/tm/packages/lebhart__source.tar.lzma
2021/08/11 | 17612 | macros/unicodetex/latex/beaulivre/beaulivre.cls
2021/08/11 | 17608 | macros/unicodetex/latex/lebhart/lebhart.cls
2021/08/11 | 17438 | systems/win32/miktex/tm/packages/beaulivre__source.tar.lzma
-2021/08/11 | 17352820 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2021/08/11 | 1713894 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/08/11 | 17128 | systems/texlive/tlnet/archive/easybook.source.r60212.tar.xz
-2021/08/11 | 17080 | systems/texlive/tlnet/archive/easybook.r60212.tar.xz
-2021/08/11 | 169242 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
2021/08/11 | 1669 | macros/unicodetex/latex/tipauni/tipauni.ins
-2021/08/11 | 16414 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/08/11 | 16357 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
2021/08/11 | 1630 | systems/win32/miktex/tm/packages/tikzbricks.tar.lzma
2021/08/11 | 162102 | macros/unicodetex/latex/einfart/einfart-doc-fr.pdf
2021/08/11 | 16014 | systems/win32/miktex/tm/packages/easybook.tar.lzma
-2021/08/11 | 159580 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
2021/08/11 | 159384 | macros/unicodetex/latex/lebhart/lebhart-doc-fr.pdf
2021/08/11 | 15875 | systems/win32/miktex/tm/packages/elpres__source.tar.lzma
2021/08/11 | 156965 | macros/unicodetex/latex/einfart/einfart-doc-en.pdf
2021/08/11 | 156264 | macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf
-2021/08/11 | 154807 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/08/11 | 154426 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/08/11 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/08/11 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
2021/08/11 | 1488 | systems/texlive/tlnet/archive/tikzbricks.r60211.tar.xz
2021/08/11 | 1484 | systems/texlive/tlnet/archive/collection-pictures.r60211.tar.xz
-2021/08/11 | 147373 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/08/11 | 1464203 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/08/11 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/08/11 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/08/11 | 14348 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
-2021/08/11 | 1421867 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/08/11 | 136817 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/08/11 | 136817 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
2021/08/11 | 1360504 | systems/texlive/tlnet/archive/hep-paper.doc.r60213.tar.xz
-2021/08/11 | 13465 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
2021/08/11 | 1346308 | systems/win32/miktex/tm/packages/hep-paper__doc.tar.lzma
2021/08/11 | 134368 | systems/win32/miktex/tm/packages/nicematrix__source.tar.lzma
-2021/08/11 | 1340930 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/08/11 | 133864 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/08/11 | 1327150 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/08/11 | 1326499 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/08/11 | 1301191 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
2021/08/11 | 12995 | systems/win32/miktex/tm/packages/hep-paper.tar.lzma
-2021/08/11 | 1291300 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
2021/08/11 | 128188 | macros/unicodetex/latex/tipauni/tipauni-example.pdf
2021/08/11 | 12792 | systems/texlive/tlnet/archive/hep-paper.r60213.tar.xz
2021/08/11 | 12534 | systems/win32/miktex/tm/packages/readarray__source.tar.lzma
-2021/08/11 | 124280 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
2021/08/11 | 12348 | systems/win32/miktex/tm/packages/projlib.tar.lzma
-2021/08/11 | 1232738 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/08/11 | 1232198 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2021/08/11 | 12089 | systems/win32/miktex/tm/packages/xetexko__source.tar.lzma
2021/08/11 | 120053 | macros/latex/contrib/colorist.zip
2021/08/11 | 119843 | macros/latex/contrib/minimalist.zip
-2021/08/11 | 119820 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/08/11 | 1169719 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/08/11 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
-2021/08/11 | 115351 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
2021/08/11 | 11494 | systems/win32/miktex/tm/packages/nchairx.tar.lzma
-2021/08/11 | 112982 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/08/11 | 11476 | web/pwebmac/makeall
2021/08/11 | 1123244 | systems/win32/miktex/tm/packages/tuda-ci__doc.tar.lzma
-2021/08/11 | 112088 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
2021/08/11 | 1116 | macros/unicodetex/latex/einfart/README.md
2021/08/11 | 1113 | macros/unicodetex/latex/simplivre/README.md
2021/08/11 | 1098 | macros/unicodetex/latex/lebhart/README.md
2021/08/11 | 1096 | macros/unicodetex/latex/beaulivre/README.md
-2021/08/11 | 109031 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/08/11 | 108280 | systems/texlive/tlnet/archive/texlive-scripts.r60208.tar.xz
-2021/08/11 | 1077990 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2021/08/11 | 105222 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
2021/08/11 | 105028 | systems/texlive/tlnet/archive/nicematrix.source.r60214.tar.xz
-2021/08/11 | 103399 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/08/11 | 103203 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
2021/08/11 | 101905 | systems/win32/miktex/tm/packages/minimalist__doc.tar.lzma
2021/08/11 | 1015241 | systems/win32/miktex/tm/packages/zref-check__doc.tar.lzma
2021/08/11 | 10115 | macros/unicodetex/latex/tipauni/tipauni-example.tex
-2021/08/11 | 100624 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
2021/08/11 | 10049 | systems/win32/miktex/tm/packages/cooltooltips__source.tar.lzma
-2021/08/10 | 9856 | systems/texlive/tlnet/archive/colorist.r60206.tar.xz
2021/08/10 | 9712 | systems/texlive/tlnet/archive/cooltooltips.source.r60201.tar.xz
2021/08/10 | 8665 | macros/latex/contrib/spbmark/spbmark.sty
2021/08/10 | 8655 | graphics/pgf/contrib/tikzbricks/tikzbricks-doc.tex
2021/08/10 | 8500 | macros/latex/contrib/spbmark/spbmark.tex
2021/08/10 | 7684 | macros/latex/contrib/elpres/tex/elpres.cls
2021/08/10 | 7204950 | macros/latex/contrib/schule.zip
-2021/08/10 | 7188 | systems/texlive/tlnet/archive/minimalist.r60206.tar.xz
-2021/08/10 | 702196 | systems/texlive/tlnet/archive/beaulivre.doc.r60206.tar.xz
2021/08/10 | 69907 | macros/latex/contrib/spbmark.zip
-2021/08/10 | 6837 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2021/08/10 | 66119 | macros/latex/contrib/spbmark/spbmark.pdf
-2021/08/10 | 657860 | systems/texlive/tlnet/archive/simplivre.doc.r60206.tar.xz
2021/08/10 | 650267 | macros/latex/contrib/nicematrix/nicematrix.dtx
-2021/08/10 | 649048 | systems/texlive/tlnet/archive/projlib.doc.r60203.tar.xz
2021/08/10 | 600782 | macros/latex/contrib/elpres.zip
-2021/08/10 | 590356 | systems/texlive/tlnet/archive/lebhart.doc.r60206.tar.xz
2021/08/10 | 568 | systems/texlive/tlnet/archive/visualfaq.r60200.tar.xz
-2021/08/10 | 560044 | systems/texlive/tlnet/archive/einfart.doc.r60206.tar.xz
2021/08/10 | 54352 | systems/texlive/tlnet/archive/xetexko.r60205.tar.xz
2021/08/10 | 52582 | macros/latex/contrib/elpres/doc/elpres-manual.tex
2021/08/10 | 5182308 | systems/texlive/tlnet/archive/visualfaq.doc.r60200.tar.xz
@@ -452,13 +501,8 @@
2021/08/10 | 470144 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
2021/08/10 | 441952 | macros/latex/contrib/semantex.zip
2021/08/10 | 432501 | macros/latex/contrib/hep-paper/hep-paper-documentation.pdf
-2021/08/10 | 3912 | systems/texlive/tlnet/archive/einfart.r60206.tar.xz
-2021/08/10 | 3888 | systems/texlive/tlnet/archive/simplivre.r60206.tar.xz
2021/08/10 | 384739 | macros/latex/contrib/semantex/semantex.pdf
-2021/08/10 | 3796 | systems/texlive/tlnet/archive/lebhart.r60206.tar.xz
-2021/08/10 | 3784 | systems/texlive/tlnet/archive/beaulivre.r60206.tar.xz
2021/08/10 | 3644 | graphics/pgf/contrib/tikzbricks/tikzbricks.sty
-2021/08/10 | 35168 | systems/texlive/tlnet/archive/projlib.source.r60203.tar.xz
2021/08/10 | 350728 | macros/latex/contrib/ulthese.zip
2021/08/10 | 316011 | macros/latex/contrib/semantex/semantex.sty
2021/08/10 | 2914 | macros/latex/contrib/elpres/tex/elpreswhitebluescheme.sty
@@ -482,11 +526,8 @@
2021/08/10 | 1377012 | macros/latex/contrib/nicematrix/nicematrix.pdf
2021/08/10 | 125777 | macros/latex/contrib/hep-paper/hep-paper-implementation.dtx
2021/08/10 | 12086 | macros/latex/contrib/semantex/stripsemantex.lua
-2021/08/10 | 12048 | systems/texlive/tlnet/archive/projlib.r60203.tar.xz
2021/08/10 | 116984902 | macros/context/latest/cont-tmf.zip
-2021/08/10 | 108744 | systems/texlive/tlnet/archive/minimalist.doc.r60206.tar.xz
2021/08/10 | 1079808 | macros/latex/contrib/hep-paper/hep-paper-implementation.pdf
-2021/08/10 | 105992 | systems/texlive/tlnet/archive/colorist.doc.r60206.tar.xz
2021/08/09 | 991 | macros/latex/contrib/schule/doc/modulLizenzen.tex
2021/08/09 | 985 | macros/latex/contrib/schule/data/xsim-style/xsim.style.schule-tcolorbox.code.tex
2021/08/09 | 96856 | macros/latex/contrib/schule/doc/Beispiele/minimal-kl-teilpunkte.pdf
@@ -579,6 +620,7 @@
2021/08/09 | 114295 | macros/latex/contrib/schule/doc/Beispiele/minimal-ka.pdf
2021/08/09 | 11384 | systems/texlive/tlnet/archive/nchairx.r60196.tar.xz
2021/08/09 | 108612 | macros/latex/contrib/ulthese/ulthese.dtx
+2021/08/09 | 10783 | web/pwebmac/webman.ch
2021/08/09 | 10728 | macros/latex/contrib/schule/latex/schulekl.sty
2021/08/09 | 10220 | macros/latex/contrib/schule/latex/schule.sty
2021/08/08 | 9499 | macros/luatex/generic/lua-uni-algos/lua-uni-algos.tex
@@ -961,6 +1003,7 @@
2021/08/06 | 604627 | macros/latex/contrib/huawei.zip
2021/08/06 | 595079 | macros/generic/markdown/markdown.html
2021/08/06 | 518773 | macros/generic/markdown/markdown.dtx
+2021/08/06 | 5116 | web/pwebmac/index.md
2021/08/06 | 5036 | systems/texlive/tlnet/archive/zref-check.r60171.tar.xz
2021/08/06 | 4530 | macros/generic/markdown/markdown.css
2021/08/06 | 4485 | macros/generic/markdown/docstrip.cfg
@@ -1007,113 +1050,3 @@
2021/08/06 | 10506 | graphics/pgf/contrib/tikzlings/tikzlings-rhinos.sty
2021/08/06 | 1013184 | systems/texlive/tlnet/archive/zref-check.doc.r60171.tar.xz
2021/08/06 | 10086 | graphics/pgf/contrib/tikzlings/tikzlings-snowmen.sty
-2021/08/05 | 9622 | macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg
-2021/08/05 | 9383 | macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty
-2021/08/05 | 8703 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex
-2021/08/05 | 864 | systems/texlive/tlnet/archive/python.doc.r60162.tar.xz
-2021/08/05 | 849070 | systems/win32/miktex/tm/packages/l3backend__doc.tar.lzma
-2021/08/05 | 847156 | systems/texlive/tlnet/archive/l3backend.doc.r60167.tar.xz
-2021/08/05 | 8294 | macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty
-2021/08/05 | 79939 | systems/win32/miktex/tm/packages/l3experimental__source.tar.lzma
-2021/08/05 | 79584 | systems/texlive/tlnet/archive/dtk.doc.r60166.tar.xz
-2021/08/05 | 79312 | systems/texlive/tlnet/archive/l3experimental.source.r60167.tar.xz
-2021/08/05 | 7631 | macros/latex/contrib/tuda-ci/tex/tudabeamer.cls
-2021/08/05 | 75120 | systems/texlive/tlnet/archive/bangla.doc.r60159.tar.xz
-2021/08/05 | 73667 | systems/win32/miktex/tm/packages/bangla__doc.tar.lzma
-2021/08/05 | 7336 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex
-2021/08/05 | 6881 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex
-2021/08/05 | 682571 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf
-2021/08/05 | 655456 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf
-2021/08/05 | 647245 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf
-2021/08/05 | 6466020 | macros/latex/contrib/tuda-ci.zip
-2021/08/05 | 6365 | macros/latex/contrib/tuda-ci/tex/tudarules.sty
-2021/08/05 | 62595 | macros/unicodetex/latex/nwafuthesis/nwafuthesis-doc.dtx
-2021/08/05 | 622116 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf
-2021/08/05 | 61492 | systems/texlive/tlnet/archive/siunitx.r60164.tar.xz
-2021/08/05 | 60969 | systems/win32/miktex/tm/packages/siunitx.tar.lzma
-2021/08/05 | 6043 | systems/win32/miktex/tm/packages/beamer-rl.tar.lzma
-2021/08/05 | 594859 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf
-2021/08/05 | 589937 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf
-2021/08/05 | 586895 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf
-2021/08/05 | 5859 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex
-2021/08/05 | 583234 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf
-2021/08/05 | 5817 | macros/latex/contrib/tuda-ci/tex/tudacolors.sty
-2021/08/05 | 5789 | macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo
-2021/08/05 | 5772 | systems/texlive/tlnet/archive/beamer-rl.r60165.tar.xz
-2021/08/05 | 574086 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf
-2021/08/05 | 558963 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf
-2021/08/05 | 550790 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf
-2021/08/05 | 5381 | macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo
-2021/08/05 | 5188 | systems/win32/miktex/tm/packages/fontsize.tar.lzma
-2021/08/05 | 5172 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex
-2021/08/05 | 5128 | systems/texlive/tlnet/archive/scrambledenvs.source.r60163.tar.xz
-2021/08/05 | 4984 | systems/texlive/tlnet/archive/fontsize.r60161.tar.xz
-2021/08/05 | 45550 | systems/win32/miktex/tm/packages/l3packages__source.tar.lzma
-2021/08/05 | 44888 | systems/texlive/tlnet/archive/l3packages.source.r60167.tar.xz
-2021/08/05 | 4441 | macros/latex/contrib/tuda-ci/tex/tudacolors.def
-2021/08/05 | 4328 | macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty
-2021/08/05 | 42644 | macros/latex/contrib/tuda-ci/tex/tudapub.cls
-2021/08/05 | 392 | systems/texlive/tlnet/archive/ptex-manual.r60158.tar.xz
-2021/08/05 | 3871 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco
-2021/08/05 | 3815 | macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty
-2021/08/05 | 379528 | systems/win32/miktex/tm/packages/fontsize__doc.tar.lzma
-2021/08/05 | 377600 | systems/texlive/tlnet/archive/fontsize.doc.r60161.tar.xz
-2021/08/05 | 3497953 | systems/win32/miktex/tm/packages/l3experimental__doc.tar.lzma
-2021/08/05 | 3496764 | systems/texlive/tlnet/archive/l3experimental.doc.r60167.tar.xz
-2021/08/05 | 3243 | macros/latex/contrib/tuda-ci/tex/tudafonts.sty
-2021/08/05 | 32198 | macros/latex/contrib/tuda-ci/tex/tudaexercise.cls
-2021/08/05 | 31760 | systems/win32/miktex/tm/packages/l3backend__source.tar.lzma
-2021/08/05 | 3175 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex
-2021/08/05 | 31492 | systems/texlive/tlnet/archive/l3backend.source.r60167.tar.xz
-2021/08/05 | 30816 | macros/latex/contrib/tuda-ci/tex/tudathesis.cfg
-2021/08/05 | 2866077 | systems/win32/miktex/tm/packages/siunitx__doc.tar.lzma
-2021/08/05 | 2863024 | systems/texlive/tlnet/archive/siunitx.doc.r60164.tar.xz
-2021/08/05 | 28400 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex
-2021/08/05 | 269 | macros/unicodetex/latex/nwafuthesis/build.sh
-2021/08/05 | 26972 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex
-2021/08/05 | 26639 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex
-2021/08/05 | 2644 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib
-2021/08/05 | 263 | macros/unicodetex/latex/nwafuthesis/build-win.bat
-2021/08/05 | 2623 | systems/win32/miktex/tm/packages/bangla__source.tar.lzma
-2021/08/05 | 2480612 | systems/texlive/tlnet/archive/ptex-manual.doc.r60158.tar.xz
-2021/08/05 | 2350 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex
-2021/08/05 | 23399 | systems/win32/miktex/tm/packages/l3experimental.tar.lzma
-2021/08/05 | 23297 | macros/unicodetex/latex/nwafuthesis/logo/motto.png
-2021/08/05 | 22984 | systems/texlive/tlnet/archive/l3experimental.r60167.tar.xz
-2021/08/05 | 2260 | systems/texlive/tlnet/archive/scrambledenvs.r60163.tar.xz
-2021/08/05 | 2235 | systems/win32/miktex/tm/packages/python.tar.lzma
-2021/08/05 | 218987 | macros/unicodetex/latex/nwafuthesis/logo/building.jpg
-2021/08/05 | 2180 | macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty
-2021/08/05 | 21784 | systems/win32/miktex/tm/packages/l3packages.tar.lzma
-2021/08/05 | 2172 | macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty
-2021/08/05 | 21596 | systems/texlive/tlnet/archive/l3packages.r60167.tar.xz
-2021/08/05 | 208960 | systems/win32/miktex/tm/packages/bangla.tar.lzma
-2021/08/05 | 208900 | systems/texlive/tlnet/archive/bangla.r60159.tar.xz
-2021/08/05 | 207663 | systems/win32/miktex/tm/packages/beamer-rl__doc.tar.lzma
-2021/08/05 | 207352 | systems/texlive/tlnet/archive/beamer-rl.doc.r60165.tar.xz
-2021/08/05 | 2012 | systems/texlive/tlnet/archive/python.r60162.tar.xz
-2021/08/05 | 18915 | macros/latex/contrib/tuda-ci/tex/tudasciposter.cls
-2021/08/05 | 186524 | systems/texlive/tlnet/archive/scrambledenvs.doc.r60163.tar.xz
-2021/08/05 | 1839289 | systems/win32/miktex/tm/packages/l3packages__doc.tar.lzma
-2021/08/05 | 1837412 | systems/texlive/tlnet/archive/l3packages.doc.r60167.tar.xz
-2021/08/05 | 17622 | macros/latex/contrib/tuda-ci/tex/tudaletter.cls
-2021/08/05 | 17408 | macros/latex/contrib/tuda-ci/tex/tudaposter.cls
-2021/08/05 | 1686 | macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo
-2021/08/05 | 1684 | macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo
-2021/08/05 | 1682 | macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo
-2021/08/05 | 1681 | macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo
-2021/08/05 | 1680 | macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo
-2021/08/05 | 1676 | macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo
-2021/08/05 | 16613 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex
-2021/08/05 | 16364 | systems/texlive/tlnet/archive/dtk.r60166.tar.xz
-2021/08/05 | 16036 | macros/latex/contrib/tuda-ci/README.md
-2021/08/05 | 15380 | systems/win32/miktex/tm/packages/fontsize__source.tar.lzma
-2021/08/05 | 15124 | systems/texlive/tlnet/archive/fontsize.source.r60161.tar.xz
-2021/08/05 | 14735 | systems/win32/miktex/tm/packages/l3backend.tar.lzma
-2021/08/05 | 14572 | systems/texlive/tlnet/archive/l3backend.r60167.tar.xz
-2021/08/05 | 13710 | macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls
-2021/08/05 | 1179 | systems/win32/miktex/tm/packages/python__doc.tar.lzma
-2021/08/05 | 1143068 | macros/latex/contrib/zref-check.zip
-2021/08/05 | 106008 | systems/win32/miktex/tm/packages/siunitx__source.tar.lzma
-2021/08/05 | 105932 | systems/texlive/tlnet/archive/siunitx.source.r60164.tar.xz
-2021/08/05 | 10078 | macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty
diff --git a/language/japanese/jlreq/README-ja.md b/language/japanese/jlreq/README-ja.md
index 8f61b2462f..2cbb6e075a 100644
--- a/language/japanese/jlreq/README-ja.md
+++ b/language/japanese/jlreq/README-ja.md
@@ -19,7 +19,7 @@
## 動作環境
pLaTeX / upLaTeX / LuaLaTeX上で動きます.以下のパッケージを内部で読み込みます.
-* (常時):l3keys2e,etoolbox,lmodern
+* (常時):l3keys2e,lmodern
* (LuaLaTeX非利用時):everyhook
* (LuaLaTeX利用時):luatexja,luatexja-adjust
@@ -518,6 +518,9 @@ JFMの名前は次の通りです.`[]`で囲まれている文字は設定に
- バグ修正
* 2021-07-30
- バグ修正
+* 2021-08-12
+ - `etoolbox`への直接の依存をなくした.
+ - バグ修正
--------------
diff --git a/language/japanese/jlreq/README.md b/language/japanese/jlreq/README.md
index 8e7f149366..4f968b938a 100644
--- a/language/japanese/jlreq/README.md
+++ b/language/japanese/jlreq/README.md
@@ -152,7 +152,8 @@ This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENS
* 2021-07-25
- Load `ifthen` again. (Only for Re:VIEW, will be removed in future.)
- Fixed bugs.
-* 2021-07-30
+* 2021-08-12
+ - Removed the direct dependence on `etoolbox` package.
- Fixed a bug.
diff --git a/language/japanese/jlreq/jlreq-helpers.sty b/language/japanese/jlreq/jlreq-helpers.sty
index 5d6ae8791c..ee11f2e4ff 100644
--- a/language/japanese/jlreq/jlreq-helpers.sty
+++ b/language/japanese/jlreq/jlreq-helpers.sty
@@ -1,9 +1,9 @@
% エンジン非依存のマクロ集
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{jlreq-helpers}[2021/07/22 jlreq-helpers]
-\RequirePackage{etoolbox}
+\ProvidesPackage{jlreq-helpers}[2021/08/12 jlreq-helpers]
+\ExplSyntaxOn
%. helper1
\newcount\jlreq@tempcnta
\newcount\jlreq@tempcntb
@@ -32,9 +32,9 @@
\long\def\jlreq@deleteuntileendmark#1\jlreq@endmark{}
\def\jlreq@expandafter@ii{\expandafter\expandafter\expandafter}
-\edef\jlreq@expandafter@iii{\expandonce{\jlreq@expandafter@ii}\noexpand\expandafter\expandonce{\jlreq@expandafter@ii}}
-\edef\jlreq@expandtwice#1{\expandonce{\jlreq@expandafter@ii}\noexpand\unexpanded\expandonce{\jlreq@expandafter@ii}{#1}}
-\edef\jlreq@expand@three#1{\expandonce{\jlreq@expandafter@iii}\noexpand\unexpanded\expandonce{\jlreq@expandafter@iii}{#1}}
+\edef\jlreq@expandafter@iii{\exp_not:o {\jlreq@expandafter@ii}\noexpand\expandafter\exp_not:o {\jlreq@expandafter@ii}}
+\edef\jlreq@expandtwice#1{\exp_not:o {\jlreq@expandafter@ii}\noexpand\unexpanded\exp_not:o {\jlreq@expandafter@ii}{#1}}
+\edef\jlreq@expand@three#1{\exp_not:o {\jlreq@expandafter@iii}\noexpand\unexpanded\exp_not:o {\jlreq@expandafter@iii}{#1}}
% \jlreq@getfirsttoken#1\jlreq@uniqtoken{}\jlreq@endmark@の形で使う
% 二回展開すると,#1の先頭(ただし空白は無視される)を取り出す.#1が空の場合は\jlreq@uniqtoken,先頭が{の場合は\bgroupとなる
@@ -46,8 +46,8 @@
% #1の先頭トークンが#2か(ただし#1が空ならば#2=\jlreq@uniqtoken,#1={ならば#2=\bgroupでTRUEとなる)
\long\edef\jlreq@iffirsttoken#1#2{%
% スペースチェック
- \unexpanded{\expandafter\expandafter\expandafter\jlreq@deleteuntileendmark\expandafter\ifx\expandafter}\expandonce{\space}\noexpand\detokenize{#1}\unexpanded{\@undefined\jlreq@endmark\expandafter\@firstoftwo\else\jlreq@endmark\expandafter\@secondoftwo\fi}{%
- \noexpand\ifx\expandonce{\space}#2\unexpanded{\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}%
+ \unexpanded{\expandafter\expandafter\expandafter\jlreq@deleteuntileendmark\expandafter\ifx\expandafter}\exp_not:o {\space}\noexpand\detokenize{#1}\unexpanded{\@undefined\jlreq@endmark\expandafter\@firstoftwo\else\jlreq@endmark\expandafter\@secondoftwo\fi}{%
+ \noexpand\ifx\exp_not:o {\space}#2\unexpanded{\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}%
}{%
\noexpand\jlreq@iffirsttoken@ignorespaces{#1}{#2}%
}%
@@ -69,7 +69,7 @@
% #1の先頭が引数なしのマクロか
\long\def\jlreq@ifmacro@noargument#1{%
\jlreq@ifempty{#1}{\@secondoftwo}{%
- \jlreq@iffirsttoken{#1}{ }{\@secondoftwo}{%
+ \jlreq@iffirsttoken{#1}{~}{\@secondoftwo}{%
\expandafter\expandafter\expandafter\jlreq@ifmacro@noargument@\jlreq@getfirsttoken#1\jlreq@uniqtoken{}\jlreq@endmark@
}}}
\long\def\jlreq@ifmacro@noargument@#1{\expandafter\jlreq@ifmacro@noargument@@\expandafter{\meaning #1}}
@@ -146,7 +146,7 @@
\def\jlreq@tempb{}% 消していない分を放り込んでいく
\jlreq@tempatrue% 最初の\jlreq@tempbへの追加か.
\jlreq@helper@removeelement@#2,\jlreq@endmark,%
- \edef\jlreq@do{\unexpanded{\def#3}{\expandonce{\jlreq@tempb}}}%
+ \edef\jlreq@do{\unexpanded{\def#3}{\exp_not:o {\jlreq@tempb}}}%
\expandafter\endgroup
\jlreq@do
}
@@ -154,7 +154,7 @@
\jlreq@ifendmark{#1}{}{%
\edef\@tempa{\unexpanded{#1}}%
\ifx\jlreq@tempa\@tempa\expandafter\@gobble\else\expandafter\@firstofone\fi{%
- \eappto\jlreq@tempb{\ifjlreq@tempa\else,\fi\unexpanded{#1}}%
+ \tl_put_right:Nx \jlreq@tempb{\ifjlreq@tempa\else,\fi\unexpanded{#1}}%
\jlreq@tempafalse
}%
\jlreq@helper@removeelement@
@@ -174,6 +174,7 @@
}
% 空白を無視しない\@ifsart
\newcommand*{\jlreq@ifstar}[2]{\jlreq@ifnextchar *{\edef\reserved@a*{\unexpanded{#1}}\reserved@a}{#2}}
+
% カンマで区切って,その前と後ろを\jlreq@resulta,\jlreq@resultbに入れる
% もしカンマがない場合は\ifjlreq@resultがfalseになる.
\newcommand*{\jlreq@helper@dividebycomma}[1]{\jlreq@helper@dividebycomma@#1,\jlreq@endmark}
@@ -203,61 +204,6 @@
\fi
}
-% 簡易なkeyvalのパース.
-% \jlreq@parsekeyval*[family=jlreq@key]{ % *ありは\setkeys*を使う
-% {key}{\def\val{#1}}
-% {key1,key2}{\def\val{#1}} % key1=valとkey2=valを受け付けるようになる
-% *{key}{\def\val{#1}} % デフォルト値を空文字列にする
-% {key}[choice1,choice2]{\def\valchoice{#1}}
-%}{parse対象}
-%\newcommand*{\jlreq@parsekeyval}{%
-% \@ifstar{\jlreq@helper@parsekeyval@{*}}{\jlreq@helper@parsekeyval@{}}%
-%}
-%\def\jlreq@helper@parsekeyval@#1{%
-% \@ifnextchar[{\jlreq@helper@parsekeyval@@{#1}}{\jlreq@helper@parsekeyval@@{#1}[jlreq@key]}%
-%}
-%\long\def\jlreq@helper@parsekeyval@@#1[#2]#3#4{%
-% \begingroup
-% \def\jlreq@do{}% \setkeysの結果処理がここに入れられる(よってループ内で利用不可)
-% \jlreq@helper@parsekeyval@@@{#2}#3{\jlreq@endmark}%
-% \setkeys#1{#2}{#4}%
-% \expandafter\endgroup
-% \jlreq@do
-%}
-%\def\jlreq@helper@parsekeyval@@@#1#2#{%
-% \jlreq@iffirsttoken@ignorespaces{#2}{*}{%
-% \jlreq@helper@parsekeyval@@@definekeywithdefault{#1}%
-% }{%
-% \jlreq@helper@parsekeyval@@@@{#1}%
-% }%
-%}
-%\long\def\jlreq@helper@parsekeyval@@@@#1#2{%
-% \jlreq@ifendmark{#2}{}{%
-% \@ifnextchar[{\jlreq@helper@parsekeyval@@@choicekey{#1}{#2}}{\jlreq@helper@parsekeyval@@@definekey{#1}{#2}}%
-% }%
-%}
-%\long\def\jlreq@helper@parsekeyval@@@choicekey#1#2[#3]#4{%
-% \@for\@tempa:=#2\do{%
-% \edef\jlreq@next{\unexpanded{\define@choicekey{#1}}{\expandonce{\@tempa}}}%
-% \jlreq@next{#3}{\eappto\jlreq@do{\unexpanded{#4}}}%
-% }%
-% \jlreq@helper@parsekeyval@@@{#1}%
-%}
-%\long\def\jlreq@helper@parsekeyval@@@definekeywithdefault#1#2#3{%
-% \@for\@tempa:=#2\do{%
-% \edef\jlreq@next{\unexpanded{\define@key{#1}}{\expandonce{\@tempa}}}%
-% \jlreq@next[]{\eappto\jlreq@do{\unexpanded{#3}}}%
-% }%
-% \jlreq@helper@parsekeyval@@@{#1}%
-%}
-%\long\def\jlreq@helper@parsekeyval@@@definekey#1#2#3{%
-% \@for\@tempa:=#2\do{%
-% \edef\jlreq@next{\unexpanded{\define@key{#1}}{\expandonce{\@tempa}}}%
-% \jlreq@next{\eappto\jlreq@do{\unexpanded{#3}}}%
-% }%
-% \jlreq@helper@parsekeyval@@@{#1}%
-%}
-
% キー指定しないkeyval(独自実装)
% \jlreq@parsekeyval@nokey{<action>}{<parse対象>}
% action内では#1=key, #2=val
@@ -292,48 +238,27 @@
\jlreq@remove@spaceandbracket{#2}{\jlreq@tempa}%
\jlreq@remove@spaceandbracket{#3}{\jlreq@tempb}%
\ifx\jlreq@tempb\@empty\else
- \edef\@tempa{\noexpand\jlreq@parsekeyval@nokey@iv{#1}{\expandonce{\jlreq@tempb}}{\expandonce{\jlreq@tempa}}}%
+ \edef\@tempa{\noexpand\jlreq@parsekeyval@nokey@iv{#1}{\exp_not:o {\jlreq@tempb}}{\exp_not:o {\jlreq@tempa}}}%
\@tempa
\fi
\jlreq@parsekeyval@nokey@i@wuniq\jlreq@uniqtoken
}
\long\def\jlreq@parsekeyval@nokey@iv#1#2#3{%
- \eappto\jlreq@do{%
+ \tl_put_right:Nx \jlreq@do{%
\unexpanded{\let\ifjlreq@parsekeyval@nokey@novalue}\jlreq@ifempty{#1}{\noexpand\@secondoftwo}{\noexpand\@firstoftwo}%
- \expandonce{\jlreq@parsekeyval@nokey@execute{#2}{#3}}%
+ \exp_not:o {\jlreq@parsekeyval@nokey@execute{#2}{#3}}%
}%
}
\long\def\jlreq@parsekeyval@nokey@removeequal#1{\jlreq@parsekeyval@nokey@removeequal@\jlreq@uniqtoken#1\jlreq@endmark}
\long\def\jlreq@parsekeyval@nokey@removeequal@#1=\jlreq@endmark{\expandafter\unexpanded\expandafter{\@gobble#1}}
% #1の先頭のスペースを削除し,#2に入れる.
-\long\def\jlreq@helper@trim#1#2{\edef#2{\jlreq@helper@trim@i{#1}}}
-\def\jlreq@do#1{% #1 = " "として後で実行
- \long\def\jlreq@helper@trim@i##1{%
- \jlreq@iffirsttoken{##1}{#1}%
- % 先頭スペースの除去.{}を外さないために\jlreq@uniqtokenを前後にいったん挟む.
- {\jlreq@helper@trim@ii##1\jlreq@uniqtoken\jlreq@endmark}%
- % 後方スペースの除去.先頭に\jlreq@uniqtokenを加えて{}が外れるのを防ぐ.
- {\jlreq@helper@trim@iii\jlreq@uniqtoken##1\jlreq@uniqtoken#1\jlreq@uniqtoken\jlreq@endmark}%
- }
- \long\def\jlreq@helper@trim@ii#1##1\jlreq@endmark{%
- \expandafter\expandafter\expandafter\jlreq@helper@trim@i\jlreq@helper@trim@vi\jlreq@uniqtoken##1\jlreq@endmark
- }
- \long\def\jlreq@helper@trim@iii##1#1\jlreq@uniqtoken##2\jlreq@endmark{%
- \jlreq@ifempty{##2}%
- {\expandafter\jlreq@helper@trim@iv\jlreq@helper@trim@v##1\jlreq@endmark}%
- {\jlreq@helper@trim@iii##1\jlreq@uniqtoken#1\jlreq@uniqtoken\jlreq@endmark}%
- }%
- \long\def\jlreq@helper@trim@iv##1{\expandafter\unexpanded\expandafter{\@gobble ##1}}
- \long\def\jlreq@helper@trim@v##1\jlreq@uniqtoken\jlreq@endmark{{##1}}
- \long\def\jlreq@helper@trim@vi##1\jlreq@uniqtoken\jlreq@endmark{\expandafter{\@gobble ##1}}
-}
-\jlreq@do{ }
+\long\def\jlreq@helper@trim#1#2{\edef#2{\tl_trim_spaces:n{#1}}}
\long\def\jlreq@remove@spaceandbracket#1#2{%
\begingroup
\jlreq@helper@trim{#1}{\jlreq@tempa}%
- \edef\jlreq@do{\unexpanded{\jlreq@remove@spaceandbracket@{#2}}\expandonce{\jlreq@tempa}\noexpand\jlreq@endmark}%
+ \edef\jlreq@do{\unexpanded{\jlreq@remove@spaceandbracket@{#2}}\exp_not:o {\jlreq@tempa}\noexpand\jlreq@endmark}%
\expandafter\endgroup
\jlreq@do
}
@@ -368,7 +293,7 @@
\ifx\jlreq@do\@undefined
\edef\jlreq@do{\unexpanded{\jlreq@ifnextchar[{\jlreq@helper@switch@executeoption{#2}}{}}}%
\else
- \appto\jlreq@do{\@ifnextchar[{\jlreq@helper@removeoption}{}}%
+ \tl_put_right:Nn \jlreq@do{\@ifnextchar[{\jlreq@helper@removeoption}{}}%
\fi
\expandafter\endgroup
\jlreq@do
@@ -413,7 +338,7 @@
% 先頭にあるマクロを展開しまくった結果の先頭を#2に入れる.
\newcommand{\jlreq@getfirsttoken@expandmacros}[2]{%
- \jlreq@iffirsttoken{#1}{ }{\def#2{ }}{%
+ \jlreq@iffirsttoken{#1}{~}{\def#2{~}}{%
\jlreq@ifempty{#1}{\def#2{}}{%
\jlreq@ifmacro@noargument{#1}{%
\expandafter\jlreq@getfirsttoken@expandmacros\expandafter{#1}{#2}%
@@ -428,7 +353,7 @@
\long\def\jlreq@helper@checktokenlist#1#2{%
\jlreq@ifendmark{#2}{\@firstoftwo}%
{%
- \jlreq@if{\ifnum0#1{#2}>0 \fi}%
+ \jlreq@if{\ifnum0#1{#2}>0~\fi}%
{\jlreq@helper@checktokenlist{#1}}%
{\expandafter\@secondoftwo\jlreq@deleteuntileendmark}%
}%
@@ -449,7 +374,6 @@
\ifx\@tempa\@tempb\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi
}
-\ExplSyntaxOn
\newcommand*{\jlreq@helper@guessengine}{%
\token_if_primitive:NTF \directlua {
\let\jlreq@result=l
@@ -462,20 +386,19 @@
}
}
}
-\ExplSyntaxOff
% #1を\@undefinedに,既に\@undefinedならば#2{#1}を呼ぶ
\newcommand*{\jlreq@helper@undefcs}[2]{%
- \ifundef{#1}{#2{#1}}{\undef{#1}}%
+ \@ifundefined{\expandafter\@gobble\string #1}{#2{#1}}{\cs_undefine:N #1}%
}
% \if版
\newcommand*{\jlreq@helper@undefif}[2]{%
- \ifundef{#1}{#2{#1}}{%
+ \@ifundefined{\expandafter\@gobble\string #1}{%
\edef\@tempa{\expandafter\@gobble\string#1}%
\edef\@tempa{\expandafter\@gobbletwo\@tempa}%
- \undef{#1}%
- \expandafter\undef\expandafter{\csname\@tempa true\endcsname}%
- \expandafter\undef\expandafter{\csname\@tempa false\endcsname}%
+ \cs_undefine:N #1%
+ \cs_undefine:c {\@tempa true}
+ \cs_undefine:c {\@tempa false}
}%
}
@@ -538,18 +461,17 @@
\jlreq@tempdimb=\dimexpr\jlreq@tempdima + 1pt\relax
% \jlreq@tempdimaと\jlreq@tempdimbで挟んでいく二分法
\jlreq@tempcnta=0 % 無限ループを避けるためのカウンタ
- \loop\ifnum\numexpr\ifdim\dimexpr\jlreq@tempdimb - \jlreq@tempdima\relax>1sp 1\else0\fi*\ifnum\jlreq@tempcnta<100 1\else 0\fi\relax=1
+ \loop\ifnum\numexpr\ifdim\dimexpr\jlreq@tempdimb - \jlreq@tempdima\relax>1sp 1\else0\fi*\ifnum\jlreq@tempcnta<100~1\else 0\fi\relax=1
\jlreq@tempdimc=\dimexpr(\jlreq@tempdima+\jlreq@tempdimb)/2\relax
\ifdim\strip@pt\jlreq@tempdimc\@tempdimb>\@tempdima\jlreq@tempdimb=\jlreq@tempdimc
\else\jlreq@tempdima=\jlreq@tempdimc\fi
- \advance\jlreq@tempcnta by 1
+ \advance\jlreq@tempcnta by 1\relax
\repeat
\edef\jlreq@do{\noexpand\jlreq@resultdimen=\the\jlreq@tempdima\noexpand\relax}%
\expandafter\endgroup
\jlreq@do
}
-\def\jlreq@for@noexpand#1:={\@for#1:=\@empty}
\def\jlreq@helper@swap#1#2{%
\let\jlreq@helper@swaptoken=#1%
@@ -563,6 +485,7 @@
#2=\jlreq@helper@swaptoken\relax
\let\jlreq@helper@swaptoken=\@undefined
}
+\ExplSyntaxOff
\endinput
diff --git a/language/japanese/jlreq/jlreq-ja.pdf b/language/japanese/jlreq/jlreq-ja.pdf
index b7ac6f3445..ed11b073a8 100644
--- a/language/japanese/jlreq/jlreq-ja.pdf
+++ b/language/japanese/jlreq/jlreq-ja.pdf
Binary files differ
diff --git a/language/japanese/jlreq/jlreq-trimmarks-ja.md b/language/japanese/jlreq/jlreq-trimmarks-ja.md
index d318c27420..6c93a850aa 100644
--- a/language/japanese/jlreq/jlreq-trimmarks-ja.md
+++ b/language/japanese/jlreq/jlreq-trimmarks-ja.md
@@ -163,6 +163,8 @@ dviドライバの指定です.エンジンに`lualatex`を利用する場合
- `\jlreqtrimmarkssetup`の`banner_font`が指定された場合,`\@bannerfont`を無視するようにした.
* 2021-07-22
- expl3コードとの親和性を高めた.
+* 2021-08-12
+ - `etoolbox`に依存しないようにした.
--------------
diff --git a/language/japanese/jlreq/jlreq-trimmarks.md b/language/japanese/jlreq/jlreq-trimmarks.md
index c13c5c051f..8f69b39b57 100644
--- a/language/japanese/jlreq/jlreq-trimmarks.md
+++ b/language/japanese/jlreq/jlreq-trimmarks.md
@@ -151,12 +151,14 @@ This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENS
* 2019-04-01
- Extended `banner` in `\jlreqtrimmarkssetup`.
- Extended `bleed_margin`.
-- 2020-05-01
+* 2020-05-01
- `jlreq-trimmarks` outputs the contents in `\@bannertoken` when `banner` in `\jlreqtrimmarkssetup` is not used.
- `\@bannertoken` is ignored when `banner` in `\jlreqtrimmarkssetup` is used.
- `\@bannerfont` is ignored when `banner_font` in `\jlreqtrimmarkssetup` is used.
* 2021-07-22
- It has more compatibility with expl3.
+* 2021-08-12
+ - Removed dependence on `etoolbox` package.
--------------
diff --git a/language/japanese/jlreq/jlreq-trimmarks.sty b/language/japanese/jlreq/jlreq-trimmarks.sty
index d7eb46fa49..cc1f43adc9 100644
--- a/language/japanese/jlreq/jlreq-trimmarks.sty
+++ b/language/japanese/jlreq/jlreq-trimmarks.sty
@@ -1,28 +1,36 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{jlreq-trimmarks}[2021/07/22 jlreq-trimmarks]
-\RequirePackage{l3keys2e,etoolbox}
+\ProvidesPackage{jlreq-trimmarks}[2021/08/12 jlreq-trimmarks]
+\RequirePackage{l3keys2e}
\RequirePackage{jlreq-helpers}
\ExplSyntaxOn
-
% check \tombowdatetrue
\ifx\tombowdatetrue\@undefined
\PackageError{jlreq-trimmarks}{This~package~only~works~with~pLaTeX,~upLaTeX~or~LuaTeX-ja}{\@ehc}
\fi
-\newcommand*{\jlreq@trimmarks@undeferr}[1]{\PackageError{jlreq-trimmarks}{Trying~to~delete~\string#1~even~though~it~is~not~defined,~may~be~a~bug}{\@ehc}}
-\newcommand*{\jlreq@trimmarks@afterpkg@addtodeletecs}[1]{%
- \appto\jlreq@trimmarks@afterpkg@deletecslist{\jlreq@helper@undefcs{#1}{\jlreq@trimmarks@undeferr}}%
+\cs_set:Nn \__jlreq_trimmarks_undeferr:n {\ClassError{jlreq-trimmarks}{Trying~to~delete~\string#1~even~though~it~is~not~defined,~may~be~a~bug}{\@ehc}}
+% クラスファイル内でしか使わないマクロをクラスファイル終了時に未定義にする
+\seq_new:N \g__jlreq_trimmarks_afterpkg_deletecs_seq
+\seq_new:N \g__jlreq_trimmarks_afterpkg_deleteif_seq
+\cs_set:Nn \__jlreq_trimmarks_afterpkg_addtodeletecs:N {
+ \seq_gput_right:Nn \g__jlreq_trimmarks_afterpkg_deletecs_seq {#1}
}
-\newcommand*{\jlreq@trimmarks@afterpkg@addtodeleteif}[1]{%
- \appto\jlreq@trimmarks@afterpkg@deletecslist{\jlreq@helper@undefif{#1}{\jlreq@trimmarks@undeferr}}%
+\__jlreq_trimmarks_afterpkg_addtodeletecs:N \__jlreq_trimmarks_afterpkg_addtodeletecs:N
+\cs_set:Nn \__jlreq_trimmarks_afterpkg_addtodeleteif:N {
+ \seq_gput_right:Nn \g__jlreq_trimmarks_afterpkg_deleteif_seq {#1}
}
-\jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@afterpkg@addtodeletecs}
-\jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@afterpkg@addtodeleteif}
+\__jlreq_trimmarks_afterpkg_addtodeletecs:N \__jlreq_trimmarks_afterpkg_addtodeleteif:N
\AtEndOfPackage{%
- \jlreq@trimmarks@afterpkg@deletecslist
- \jlreq@helper@undefcs{\jlreq@trimmarks@afterpkg@deletecslist}{\jlreq@trimmarks@undeferr}%
- \undef{\jlreq@trimmarks@undeferr}%
+ \seq_map_inline:Nn \g__jlreq_trimmarks_afterpkg_deletecs_seq {
+ \jlreq@helper@undefcs{#1}{\__jlreq_trimmarks_undeferr:n}
+ }
+ \seq_map_inline:Nn \g__jlreq_trimmarks_afterpkg_deleteif_seq {
+ \jlreq@helper@undefif{#1}{\__jlreq_trimmarks_undeferr:n}
+ }
+ \cs_undefine:N \g__jlreq_trimmarks_afterpkg_deletecs_seq
+ \cs_undefine:N \g__jlreq_trimmarks_afterpkg_deleteif_seq
+ \cs_undefine:N \__jlreq_trimmarks_undeferr:n
}
\@ifclassloaded{jlreq}{\let\ifjlreq@trimmarks@jlreqloaded=\@firstoftwo}{\let\ifjlreq@trimmarks@jlreqloaded=\@secondoftwo}
@@ -47,18 +55,18 @@
\@ifnextchar[{\jlreq@trimmarks@addpapersize@{#1}}{\jlreq@trimmarks@addpapersize@@{#1}}
}
\def\jlreq@trimmarks@addpapersize@#1[#2]{%
- \edef\@tempa{\unexpanded{\jlreq@trimmarks@addpapersize@@{#1}}\csexpandonce{jlreq@helper@papersizelist@#2}}%
+ \edef\@tempa{\unexpanded{\jlreq@trimmarks@addpapersize@@{#1}}\exp_not:v {jlreq@helper@papersizelist@#2}}%
\@tempa
}
\newcommand*{\jlreq@trimmarks@addpapersize@@}[3]{%
\clist_map_variable:nNn {#1} \@tempa {
- \eappto\jlreq@trimmarks@switchpapersize{{\expandonce{\@tempa}}{\unexpanded{\def\jlreq@resulta{#2}\def\jlreq@resultb{#3}}}}%
+ \tl_put_right:Nx \jlreq@trimmarks@switchpapersize {{\exp_not:o {\@tempa}}{\unexpanded{\def\jlreq@resulta{#2}\def\jlreq@resultb{#3}}}}%
}%
}
-\jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@switchpapersize}
-\jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@addpapersize}
-\jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@addpapersize@}
-\jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@addpapersize@@}
+\__jlreq_trimmarks_afterpkg_addtodeletecs:N \jlreq@trimmarks@switchpapersize
+\__jlreq_trimmarks_afterpkg_addtodeletecs:N \jlreq@trimmarks@addpapersize
+\__jlreq_trimmarks_afterpkg_addtodeletecs:N \jlreq@trimmarks@addpapersize@
+\__jlreq_trimmarks_afterpkg_addtodeletecs:N \jlreq@trimmarks@addpapersize@@
\jlreq@trimmarks@addpapersize{a0,A0}[a0]
\jlreq@trimmarks@addpapersize{a1,A1}[a1]
@@ -103,7 +111,7 @@
% width -> \jlreq@resulta, height -> \jlreq@resultb
\edef\jlreq@trimmarks@analyzepapersize#1{
\noexpand\jlreq@switch{#1}{
- \expandonce{\jlreq@trimmarks@switchpapersize}%
+ \exp_not:o {\jlreq@trimmarks@switchpapersize}%
{%
\noexpand\jlreq@helper@dividebycomma{#1}%
\unexpanded{\ifjlreq@result\else}%
@@ -113,10 +121,10 @@
}%
}\noexpand\relax
}
-\jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@analyzepapersize}
+\__jlreq_trimmarks_afterpkg_addtodeletecs:N \jlreq@trimmarks@analyzepapersize
\keys_define:nn { jlreq-trimmarks } { trimmarks_paper .tl_set:N = \jlreq@trimmarks@option@papersize }
-\jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@option@papersize}
+\__jlreq_trimmarks_afterpkg_addtodeletecs:N \jlreq@trimmarks@option@papersize
\newif\ifjlreq@trimmarks@digital \jlreq@trimmarks@digitaltrue
\newif\ifjlreq@trimmarks@show \jlreq@trimmarks@showtrue
@@ -153,7 +161,7 @@
\ifjlreq@parsekeyval@nokey@novalue{%
\clist_map_variable:nNn { top,bottom,gutter,fore-edge } \jlreq@tempa {
\epreto\jlreq@do{%
- \noexpand\def\expandonce{\csname jlreq@trimmarks@bleed@\jlreq@tempa\endcsname}{##1}%
+ \noexpand\def\exp_not:o {\csname jlreq@trimmarks@bleed@\jlreq@tempa\endcsname}{##1}%
}%
}%
}{%
@@ -161,8 +169,8 @@
\str_if_eq_p:nn {##1} {top} || \str_if_eq_p:nn {##1} {bottom} ||
\str_if_eq_p:nn {##1} {gutter} || \str_if_eq_p:nn {##1} {fore-edge}
}{
- \eappto\jlreq@do{%
- \noexpand\def\expandonce{\csname jlreq@trimmarks@bleed@##1\endcsname}{##2}%
+ \tl_put_right:Nx \jlreq@do{%
+ \noexpand\def\exp_not:o {\csname jlreq@trimmarks@bleed@##1\endcsname}{##2}%
}%
}{%
\PackageError{jlreq-trimmarks}{Unknown~position~`##1'~in~bleed_margin}{\@ehc}
@@ -176,7 +184,7 @@
\newif\ifjlreq@trimmarks@landscape \jlreq@trimmarks@landscapefalse
\keys_define:nn { jlreq-trimmarks } { landscape .code:n = {\jlreq@trimmarks@landscapetrue}, .value_forbidden:n = true }
-\jlreq@trimmarks@afterpkg@addtodeleteif{\ifjlreq@trimmarks@landscape}
+\__jlreq_trimmarks_afterpkg_addtodeleteif:N \ifjlreq@trimmarks@landscape
\keys_set:nn { jlreq-trimmarks } {
trimmarks_paper = {+2in},
@@ -219,7 +227,7 @@
\edef\jlreq@trimmarks@paperheight{\jlreq@resultb}
}
}
-\jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@setpapersize}
+\__jlreq_trimmarks_afterpkg_addtodeletecs:N \jlreq@trimmarks@setpapersize
\expandafter\jlreq@trimmarks@setpapersize\expandafter{\jlreq@trimmarks@option@papersize}
\ifx o\jlreq@trimmarks@driver
@@ -234,20 +242,20 @@
\jlreq@parsekeyval@nokey{%
\ifjlreq@parsekeyval@nokey@novalue{}{%
\jlreq@switch{##1}{
- {yoko}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@@{yoko@#1}{yoko@#2}{##2}}}
- {horizontal}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@@{yoko@#1}{yoko@#2}{##2}}}
- {tate}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@@{tate@#1}{tate@#2}{##2}}}
- {vertial}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@@{tate@#1}{tate@#2}{##2}}}
- {corner}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@@{corner@#1}{corner@#2}{##2}}}
- {in-yoko}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@@{inyoko@#1}{inyoko@#2}{##2}}}
- {in-horizontal}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@@{inyoko@#1}{inyoko@#2}{##2}}}
- {in-tate}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@@{intate@#1}{intate@#2}{##2}}}
- {in-vertial}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@@{intate@#1}{intate@#2}{##2}}}
+ {yoko}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@@{yoko@#1}{yoko@#2}{##2}}}
+ {horizontal}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@@{yoko@#1}{yoko@#2}{##2}}}
+ {tate}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@@{tate@#1}{tate@#2}{##2}}}
+ {vertial}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@@{tate@#1}{tate@#2}{##2}}}
+ {corner}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@@{corner@#1}{corner@#2}{##2}}}
+ {in-yoko}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@@{inyoko@#1}{inyoko@#2}{##2}}}
+ {in-horizontal}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@@{inyoko@#1}{inyoko@#2}{##2}}}
+ {in-tate}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@@{intate@#1}{intate@#2}{##2}}}
+ {in-vertial}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@@{intate@#1}{intate@#2}{##2}}}
}%
}%
}{#3}%
\jlreq@if{\ifx\jlreq@do\@empty\fi}{%
- \appto\jlreq@do{\jlreq@trimmarks@setbanner@@{yoko@#1}{yoko@#2}{#3}}%
+ \tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@@{yoko@#1}{yoko@#2}{#3}}%
}{}%
\expandafter\endgroup
\jlreq@do
@@ -259,16 +267,16 @@
\jlreq@parsekeyval@nokey{%
\ifjlreq@parsekeyval@nokey@novalue{}{%
\jlreq@switch*{##1}{
- {left}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@@{before@#1}{before@#2}{##2}}}
- {right}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@@{after@#1}{after@#2}{##2}}}
- {above}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@@{before@#1}{before@#2}{##2}}}
- {below}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@@{after@#1}{after@#2}{##2}}}
- {in}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@@{in@#1}{in@#2}{##2}}}
+ {left}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@@{before@#1}{before@#2}{##2}}}
+ {right}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@@{after@#1}{after@#2}{##2}}}
+ {above}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@@{before@#1}{before@#2}{##2}}}
+ {below}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@@{after@#1}{after@#2}{##2}}}
+ {in}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@@{in@#1}{in@#2}{##2}}}
}%
}%
}{#3}%
\jlreq@if{\ifx\jlreq@do\@empty\fi}{
- \appto\jlreq@do{\jlreq@trimmarks@setbanner@@{before@#1}{before@#2}{#3}}%
+ \tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@@{before@#1}{before@#2}{#3}}%
}{}%
\expandafter\endgroup
\jlreq@do
@@ -281,13 +289,13 @@
\jlreq@parsekeyval@nokey{%
\ifjlreq@parsekeyval@nokey@novalue{}{%
\jlreq@switch*{##1}{
- {odd}{\appto\jlreq@do{\expandafter\edef\csname jlreq@trimmarks@banner@odd@#1\endcsname{\unexpanded{##2}}}}
- {even}{\appto\jlreq@do{\expandafter\edef\csname jlreq@trimmarks@banner@even@#2\endcsname{\unexpanded{##2}}}}
+ {odd}{\tl_put_right:Nn \jlreq@do{\expandafter\edef\csname jlreq@trimmarks@banner@odd@#1\endcsname{\unexpanded{##2}}}}
+ {even}{\tl_put_right:Nn \jlreq@do{\expandafter\edef\csname jlreq@trimmarks@banner@even@#2\endcsname{\unexpanded{##2}}}}
}%
}%
}{#3}%
\jlreq@if{\ifx\jlreq@do\@empty\fi}{
- \appto\jlreq@do{%
+ \tl_put_right:Nn \jlreq@do{%
\expandafter\edef\csname jlreq@trimmarks@banner@odd@#1\endcsname{\unexpanded{#3}}%
\expandafter\edef\csname jlreq@trimmarks@banner@even@#2\endcsname{\unexpanded{#3}}%
}%
@@ -325,39 +333,39 @@
\let\jlreq@guttereven\jlreq@gutterodd
\fi
\jlreq@switch*{##1}{
- {top-left}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@left}{top@left}{##2}}}
- {left-top}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@left}{top@left}{##2}}}
- {top-right}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@right}{top@right}{##2}}}
- {right-top}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@right}{top@right}{##2}}}
- {top-gutter}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@\jlreq@gutterodd}{top@\jlreq@guttereven}{##2}}}
- {gutter-top}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@\jlreq@gutterodd}{top@\jlreq@guttereven}{##2}}}
- {top-fore-edge}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@\jlreq@guttereven}{top@\jlreq@gutterodd}{##2}}}
- {fore-edge-top}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@\jlreq@guttereven}{top@\jlreq@gutterodd}{##2}}}
- {bottom-left}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@left}{bottom@left}{##2}}}
- {left-bottom}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@left}{bottom@left}{##2}}}
- {bottom-right}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@right}{bottom@right}{##2}}}
- {right-bottom}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@right}{bottom@right}{##2}}}
- {bottom-gutter}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@\jlreq@gutterodd}{bottom@\jlreq@guttereven}{##2}}}
- {gutter-bottom}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@\jlreq@gutterodd}{bottom@\jlreq@guttereven}{##2}}}
- {bottom-fore-edge}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@\jlreq@guttereven}{bottom@\jlreq@gutterodd}{##2}}}
- {fore-edge-bottom}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@\jlreq@guttereven}{bottom@\jlreq@gutterodd}{##2}}}
- {top-center}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{top@center}{top@center}{##2}}}
- {center-top}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{top@center}{top@center}{##2}}}
- {bottom-center}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{bottom@center}{bottom@center}{##2}}}
- {center-bottom}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{bottom@center}{bottom@center}{##2}}}
- {center-right}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@right}{center@right}{##2}}}
- {right-center}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@right}{center@right}{##2}}}
- {center-left}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@left}{center@left}{##2}}}
- {left-center}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@left}{center@left}{##2}}}
- {center-gutter}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@\jlreq@gutterodd}{center@\jlreq@guttereven}{##2}}}
- {gutter-center}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@\jlreq@gutterodd}{center@\jlreq@guttereven}{##2}}}
- {center-fore-edge}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@\jlreq@guttereven}{center@\jlreq@gutterodd}{##2}}}
- {fore-edge-center}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@\jlreq@guttereven}{center@\jlreq@gutterodd}{##2}}}
+ {top-left}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner{top@left}{top@left}{##2}}}
+ {left-top}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner{top@left}{top@left}{##2}}}
+ {top-right}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner{top@right}{top@right}{##2}}}
+ {right-top}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner{top@right}{top@right}{##2}}}
+ {top-gutter}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner{top@\jlreq@gutterodd}{top@\jlreq@guttereven}{##2}}}
+ {gutter-top}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner{top@\jlreq@gutterodd}{top@\jlreq@guttereven}{##2}}}
+ {top-fore-edge}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner{top@\jlreq@guttereven}{top@\jlreq@gutterodd}{##2}}}
+ {fore-edge-top}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner{top@\jlreq@guttereven}{top@\jlreq@gutterodd}{##2}}}
+ {bottom-left}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner{bottom@left}{bottom@left}{##2}}}
+ {left-bottom}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner{bottom@left}{bottom@left}{##2}}}
+ {bottom-right}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner{bottom@right}{bottom@right}{##2}}}
+ {right-bottom}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner{bottom@right}{bottom@right}{##2}}}
+ {bottom-gutter}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner{bottom@\jlreq@gutterodd}{bottom@\jlreq@guttereven}{##2}}}
+ {gutter-bottom}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner{bottom@\jlreq@gutterodd}{bottom@\jlreq@guttereven}{##2}}}
+ {bottom-fore-edge}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner{bottom@\jlreq@guttereven}{bottom@\jlreq@gutterodd}{##2}}}
+ {fore-edge-bottom}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner{bottom@\jlreq@guttereven}{bottom@\jlreq@gutterodd}{##2}}}
+ {top-center}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@{top@center}{top@center}{##2}}}
+ {center-top}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@{top@center}{top@center}{##2}}}
+ {bottom-center}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@{bottom@center}{bottom@center}{##2}}}
+ {center-bottom}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@{bottom@center}{bottom@center}{##2}}}
+ {center-right}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@{center@right}{center@right}{##2}}}
+ {right-center}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@{center@right}{center@right}{##2}}}
+ {center-left}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@{center@left}{center@left}{##2}}}
+ {left-center}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@{center@left}{center@left}{##2}}}
+ {center-gutter}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@{center@\jlreq@gutterodd}{center@\jlreq@guttereven}{##2}}}
+ {gutter-center}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@{center@\jlreq@gutterodd}{center@\jlreq@guttereven}{##2}}}
+ {center-fore-edge}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@{center@\jlreq@guttereven}{center@\jlreq@gutterodd}{##2}}}
+ {fore-edge-center}{\tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner@{center@\jlreq@guttereven}{center@\jlreq@gutterodd}{##2}}}
}%
}%
}{#1}%
\jlreq@if{\ifx\jlreq@do\@empty\fi}{
- \appto\jlreq@do{\jlreq@trimmarks@setbanner{top@left}{top@left}{#1}}%
+ \tl_put_right:Nn \jlreq@do{\jlreq@trimmarks@setbanner{top@left}{top@left}{#1}}%
}{}%
\jlreq@do
},
@@ -398,7 +406,7 @@
}%
}%
}
-\newcommand{\jlreqtrimmarkssetup}[1]{%
+\NewDocumentCommand { \jlreqtrimmarkssetup } { +m } {
\keys_set:nn { jlreqtrimmarkssetup } {#1}
}
\@onlypreamble\jlreqtrimmarkssetup
@@ -868,12 +876,12 @@
\ifjlreq@trimmarks@show@artbox /ArtBox~\jlreq@trimmarks@trimboxsize\fi
/BleedBox~\jlreq@trimmarks@bleedboxsize@even
}
- \jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@pttobp}
- \jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@trimboxsize}
- \jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@bleedboxsize@odd}
- \jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@bleedboxsize@even}
- \jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@pdfattribute@odd}
- \jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@pdfattribute@even}
+ \__jlreq_trimmarks_afterpkg_addtodeletecs:N \jlreq@trimmarks@pttobp
+ \__jlreq_trimmarks_afterpkg_addtodeletecs:N \jlreq@trimmarks@trimboxsize
+ \__jlreq_trimmarks_afterpkg_addtodeletecs:N \jlreq@trimmarks@bleedboxsize@odd
+ \__jlreq_trimmarks_afterpkg_addtodeletecs:N \jlreq@trimmarks@bleedboxsize@even
+ \__jlreq_trimmarks_afterpkg_addtodeletecs:N \jlreq@trimmarks@pdfattribute@odd
+ \__jlreq_trimmarks_afterpkg_addtodeletecs:N \jlreq@trimmarks@pdfattribute@even
\begingroup
\c@page=1\relax
@@ -892,7 +900,7 @@
\@tempa
\fi
\ifx f\jlreq@trimmarks@driver
- \epreto\@outputtombow{\noexpand\special{pdf:~put~@thispage~<<\jlreq@trimmarks@pdfattribute@odd>>}}
+ \tl_put_left:Nx \@outputtombow {\noexpand\special{pdf:~put~@thispage~<<\jlreq@trimmarks@pdfattribute@odd>>}}
\fi
\ifx s\jlreq@trimmarks@driver
\edef\@tempa{\noexpand\special{ps:SDict~begin~
@@ -905,19 +913,19 @@
}{
\ifx l\jlreq@trimmarks@driver
% in \@outputtombow, it's too late
- \epreto\@outputpage{%
+ \tl_put_left:Nx \@outputpage {%
\unexpanded{\ifodd\c@page\pdfvariable} pageattr{\jlreq@trimmarks@pdfattribute@odd}%
\unexpanded{\else\pdfvariable} pageattr{\jlreq@trimmarks@pdfattribute@even}\noexpand\fi
}
\fi
\ifx f\jlreq@trimmarks@driver
- \epreto\@outputtombow{%
+ \tl_put_left:Nx \@outputtombow {%
\unexpanded{\ifodd\c@page\special}{pdf:~put~@thispage~<<\jlreq@trimmarks@pdfattribute@odd>>}%
\unexpanded{\else\special}{pdf:~put~@thispage~<<\jlreq@trimmarks@pdfattribute@even>>}\noexpand\fi
}
\fi
\ifx s\jlreq@trimmarks@driver
- \epreto\@outputtombow{%
+ \tl_put_left:Nx \@outputtombow {%
\unexpanded{\ifodd\c@page\special}{ps:SDict~begin~
[~/TrimBox~\jlreq@trimmarks@trimboxsize /PAGE~pdfmark~
\ifjlreq@trimmarks@show@artbox [~/ArtBox~\jlreq@trimmarks@trimboxsize /PAGE~pdfmark~\fi
diff --git a/language/japanese/jlreq/jlreq.cls b/language/japanese/jlreq/jlreq.cls
index f1883d08b2..4cffe13825 100644
--- a/language/japanese/jlreq/jlreq.cls
+++ b/language/japanese/jlreq/jlreq.cls
@@ -5,8 +5,8 @@
%%
% (based on JLReq 20200811 https://www.w3.org/TR/2020/NOTE-jlreq-20200811/)
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jlreq}[2021/07/30 jlreq]
-\RequirePackage{l3keys2e,etoolbox}
+\ProvidesClass{jlreq}[2021/08/12 jlreq]
+\RequirePackage{l3keys2e}
\RequirePackage{ifthen}
\RequirePackage{jlreq-helpers}
@@ -18,26 +18,35 @@
\str_new:N \l_jlreq_tmpc_str
\bool_new:N \l_jlreq_tmpa_bool
\clist_new:N \l_jlreq_tmpa_clist
+\seq_new:N \l_jlreq_tmpa_seq
\dim_new:N \l_jlreq_tmpa_dim
\skip_new:N \l_jlreq_tmpa_skip
\box_new:N \l_jlreq_tmpa_box
\box_new:N \l_jlreq_tmpb_box
\box_new:N \l_jlreq_tmpc_box
-\def\jlreq@undeferr#1{\ClassError{jlreq}{Trying~to~delete~\string#1~even~though~it~is~not~defined,~may~be~a~bug}{\@ehc}}
+\cs_set:Nn \__jlreq_undeferr:n {\ClassError{jlreq}{Trying~to~delete~\string#1~even~though~it~is~not~defined,~may~be~a~bug}{\@ehc}}
% クラスファイル内でしか使わないマクロをクラスファイル終了時に未定義にする
-\def\jlreq@aftercls@addtodeletecs#1{%
- \appto\jlreq@aftercls@deletecslist{\jlreq@helper@undefcs{#1}{\jlreq@undeferr}}%
+\seq_new:N \g__jlreq_aftercls_deletecs_seq
+\seq_new:N \g__jlreq_aftercls_deleteif_seq
+\cs_set:Nn \__jlreq_aftercls_addtodeletecs:N {
+ \seq_gput_right:Nn \g__jlreq_aftercls_deletecs_seq {#1}
}
-\def\jlreq@aftercls@addtodeleteif#1{%
- \appto\jlreq@aftercls@deletecslist{\jlreq@helper@undefif{#1}{\jlreq@undeferr}}%
+\__jlreq_aftercls_addtodeletecs:N \__jlreq_aftercls_addtodeletecs:N
+\cs_set:Nn \__jlreq_aftercls_addtodeleteif:N {
+ \seq_gput_right:Nn \g__jlreq_aftercls_deleteif_seq {#1}
}
-\jlreq@aftercls@addtodeletecs{\jlreq@aftercls@addtodeletecs}
-\jlreq@aftercls@addtodeletecs{\jlreq@aftercls@addtodeleteif}
+\__jlreq_aftercls_addtodeletecs:N \__jlreq_aftercls_addtodeleteif:N
\AtEndOfClass{%
- \jlreq@aftercls@deletecslist
- \jlreq@helper@undefcs{\jlreq@aftercls@deletecslist}{\jlreq@undeferr}%
- \undef{\jlreq@undeferr}%
+ \seq_map_inline:Nn \g__jlreq_aftercls_deletecs_seq {
+ \jlreq@helper@undefcs{#1}{\__jlreq_undeferr:n}
+ }
+ \seq_map_inline:Nn \g__jlreq_aftercls_deleteif_seq {
+ \jlreq@helper@undefif{#1}{\__jlreq_undeferr:n}
+ }
+ \cs_undefine:N \g__jlreq_aftercls_deletecs_seq
+ \cs_undefine:N \g__jlreq_aftercls_deleteif_seq
+ \cs_undefine:N \__jlreq_undeferr:n
}
% preambleにいるかのスイッチ
@@ -53,7 +62,7 @@
\ClassError{jlreq}{Trying~to~save~#1~twice,~may~be~a~bug}{\@ehc}%
}
\begingroup
- \edef\jlreq@do{\noexpand\let\expandonce{\csname jlreq@original@#1\endcsname}=\expandonce{\csname #1\endcsname}}
+ \edef\jlreq@do{\noexpand\let\exp_not:c {jlreq@original@#1}=\exp_not:c {#1}}
\expandafter\endgroup
\jlreq@do
}
@@ -83,121 +92,114 @@
\keys_define:nn { jlreq } { book .code:n = { \def\jlreq@article@type{book} }, book .value_forbidden:n = true }
%.. 基本版面.まずは紙サイズ.
-\def\jlreq@switchpapersize{}
-\jlreq@aftercls@addtodeletecs{\jlreq@switchpapersize}
-% \jlreq@addpapersize{paper=に指定するもの}{単独オプション名}{横}{縦}
-
-\def\jlreq@addpapersize#1#2{%
- \@ifnextchar[{\jlreq@addpapersize@{#1}{#2}}{\jlreq@addpapersize@@{#1}{#2}}%
+\tl_new:N \g__jlreq_papersizelist_tl
+\cs_set:Nn \__jlreq_addpapersize:nnn {
+ \exp_args:Nnnv \__jlreq_addpapersize_aux:nnn {#1}{#2}{jlreq@helper@papersizelist@#3}
}
-\def\jlreq@addpapersize@#1#2[#3]{%
- \edef\@tempa{\unexpanded{\jlreq@addpapersize@@{#1}{#2}}\csexpandonce{jlreq@helper@papersizelist@#3}}%
- \@tempa
+\cs_set:Nn \__jlreq_addpapersize_aux:nnn {
+ \__jlreq_addpapersize_auxi:nnnn {#1}{#2}#3
}
-\def\jlreq@addpapersize@@#1#2#3#4{%
- \clist_map_variable:nNn {#1} \@tempa {
- \eappto\jlreq@switchpapersize{{\expandonce{\@tempa}}{\unexpanded{\setlength{\paperwidth}{#3}\setlength{\paperheight}{#4}}}}%
- }%
- \clist_map_inline:nn {#2} {
- \keys_define:nn { jlreq } {
- ##1 .code:n = { \setlength{\paperwidth}{#3}\setlength{\paperheight}{#4} },
- ##1 .value_forbidden:n = true
- }
+\cs_set:Nn \__jlreq_addpapersize_auxi:nnnn {
+ \clist_map_inline:nn {#1} {
+ \tl_gput_right:Nn \g__jlreq_papersizelist_tl { { ##1 } { \setlength{\paperwidth}{#3} \setlength{\paperheight}{#4} } }
+ }
+ \clist_map_inline:nn {#2} {
+ \keys_define:nn { jlreq } { ##1 .code:n = { \setlength{\paperwidth}{#3} \setlength{\paperheight}{#4} } }
}
}
-\jlreq@aftercls@addtodeletecs{\jlreq@addpapersize}
-\jlreq@aftercls@addtodeletecs{\jlreq@addpapersize@}
-\jlreq@aftercls@addtodeletecs{\jlreq@addpapersize@@}
\keys_define:nn { jlreq } {
paper .code:n = {
- \edef\jlreq@do{%
- \unexpanded{\jlreq@switch{#1}}{\expandonce{\jlreq@switchpapersize}}%
- [\unexpanded{%
- \jlreq@helper@dividebycomma{#1}%
- \ifjlreq@result
- \setlength{\paperwidth}{\dimexpr\jlreq@resulta\relax}%
- \setlength{\paperheight}{\dimexpr\jlreq@resultb\relax}%
- \else
- \ClassError{jlreq}{The~paper~#1~is~unknown}{\@ehc}%
- \fi
- }]%
- }%
- \jlreq@do
+ \str_case:nVF {#1} \g__jlreq_papersizelist_tl
+ {
+ \jlreq@helper@dividebycomma{#1}%
+ \legacy_if:nTF { jlreq@result } {
+ \setlength{\paperwidth}{\dimexpr\jlreq@resulta\relax}
+ \setlength{\paperheight}{\dimexpr\jlreq@resultb\relax}
+ } {
+ \ClassError { jlreq } { The~paper~#1~is~unknown } {\@ehc}
+ }
+ }
}
}
+
+\__jlreq_aftercls_addtodeletecs:N \__jlreq_addpapersize:nnn
+\__jlreq_aftercls_addtodeletecs:N \__jlreq_addpapersize_aux:nnn
+\__jlreq_aftercls_addtodeletecs:N \__jlreq_addpapersize_auxi:nnnn
+\__jlreq_aftercls_addtodeletecs:N \g__jlreq_papersizelist_tl
+
% 紙サイズ一覧.b*はJIS B.
-\jlreq@addpapersize{a0,A0}{}[a0]
-\jlreq@addpapersize{a1,A1}{}[a1]
-\jlreq@addpapersize{a2,A2}{}[a2]
-\jlreq@addpapersize{a3,A3}{a3paper}[a3]
-\jlreq@addpapersize{a4,A4}{a4paper}[a4]
-\jlreq@addpapersize{a5,A5}{a5paper}[a5]
-\jlreq@addpapersize{a6,A6}{a6paper}[a6]
-\jlreq@addpapersize{a7,A7}{}[a7]
-\jlreq@addpapersize{a8,A8}{}[a8]
-\jlreq@addpapersize{a9,A9}{}[a9]
-\jlreq@addpapersize{a10,A10}{}[a10]
-
-\jlreq@addpapersize{b0,B0}{}[b0]
-\jlreq@addpapersize{b1,B1}{}[b1]
-\jlreq@addpapersize{b2,B2}{}[b2]
-\jlreq@addpapersize{b3,B3}{}[b3]
-\jlreq@addpapersize{b4,B4}{b4paper}[b4]
-\jlreq@addpapersize{b5,B5}{b5paper}[b5]
-\jlreq@addpapersize{b6,B6}{b6paper}[b6]
-\jlreq@addpapersize{b7,B7}{}[b7]
-\jlreq@addpapersize{b8,B8}{}[b8]
-\jlreq@addpapersize{b9,B9}{}[b9]
-\jlreq@addpapersize{b10,B10}{}[b10]
-
-\jlreq@addpapersize{c2,C2}{}[c2]
-\jlreq@addpapersize{c3,C3}{}[c3]
-\jlreq@addpapersize{c4,C4}{}[c4]
-\jlreq@addpapersize{c5,C5}{}[c5]
-\jlreq@addpapersize{c6,C6}{}[c6]
-\jlreq@addpapersize{c7,C7}{}[c7]
-\jlreq@addpapersize{c8,C8}{}[c8]
-
-\jlreq@addpapersize{a4var}{}[a4var]
-\jlreq@addpapersize{b5var}{}[b5var]
-
-\jlreq@addpapersize{letter}{letterpaper}[letter]
-\jlreq@addpapersize{legal}{legalpaper}[legal]
-\jlreq@addpapersize{executive}{executivepaper}[executive]
-\jlreq@addpapersize{hagaki}{}[hagaki]
+\__jlreq_addpapersize:nnn{a0,A0}{}{a0}
+\__jlreq_addpapersize:nnn{a1,A1}{}{a1}
+\__jlreq_addpapersize:nnn{a2,A2}{}{a2}
+\__jlreq_addpapersize:nnn{a3,A3}{a3paper}{a3}
+\__jlreq_addpapersize:nnn{a4,A4}{a4paper}{a4}
+\__jlreq_addpapersize:nnn{a5,A5}{a5paper}{a5}
+\__jlreq_addpapersize:nnn{a6,A6}{a6paper}{a6}
+\__jlreq_addpapersize:nnn{a7,A7}{}{a7}
+\__jlreq_addpapersize:nnn{a8,A8}{}{a8}
+\__jlreq_addpapersize:nnn{a9,A9}{}{a9}
+\__jlreq_addpapersize:nnn{a10,A10}{}{a10}
+
+\__jlreq_addpapersize:nnn{b0,B0}{}{b0}
+\__jlreq_addpapersize:nnn{b1,B1}{}{b1}
+\__jlreq_addpapersize:nnn{b2,B2}{}{b2}
+\__jlreq_addpapersize:nnn{b3,B3}{}{b3}
+\__jlreq_addpapersize:nnn{b4,B4}{b4paper}{b4}
+\__jlreq_addpapersize:nnn{b5,B5}{b5paper}{b5}
+\__jlreq_addpapersize:nnn{b6,B6}{b6paper}{b6}
+\__jlreq_addpapersize:nnn{b7,B7}{}{b7}
+\__jlreq_addpapersize:nnn{b8,B8}{}{b8}
+\__jlreq_addpapersize:nnn{b9,B9}{}{b9}
+\__jlreq_addpapersize:nnn{b10,B10}{}{b10}
+
+\__jlreq_addpapersize:nnn{c2,C2}{}{c2}
+\__jlreq_addpapersize:nnn{c3,C3}{}{c3}
+\__jlreq_addpapersize:nnn{c4,C4}{}{c4}
+\__jlreq_addpapersize:nnn{c5,C5}{}{c5}
+\__jlreq_addpapersize:nnn{c6,C6}{}{c6}
+\__jlreq_addpapersize:nnn{c7,C7}{}{c7}
+\__jlreq_addpapersize:nnn{c8,C8}{}{c8}
+
+\__jlreq_addpapersize:nnn{a4var}{}{a4var}
+\__jlreq_addpapersize:nnn{b5var}{}{b5var}
+
+\__jlreq_addpapersize:nnn{letter}{letterpaper}{letter}
+\__jlreq_addpapersize:nnn{legal}{legalpaper}{legal}
+\__jlreq_addpapersize:nnn{executive}{executivepaper}{executive}
+\__jlreq_addpapersize:nnn{hagaki}{}{hagaki}
%.. フォントサイズ,行長,1ページあたりの行数で基本版面のサイズを決める(2.4.1.a)
-\jlreq@aftercls@addtodeletecs{\jlreq@option@fontsize}
+\__jlreq_aftercls_addtodeletecs:N \jlreq@option@fontsize
\keys_define:nn { jlreq } { fontsize .tl_set:N = \jlreq@option@fontsize }
\keys_define:nn { jlreq } {
10pt .code:n = {\def\jlreq@option@fontsize{10pt}}, 10pt .value_forbidden:n = true,
11pt .code:n = {\def\jlreq@option@fontsize{11pt}}, 11pt .value_forbidden:n = true,
12pt .code:n = {\def\jlreq@option@fontsize{12pt}}, 12pt .value_forbidden:n = true,
}
-\keys_define:nn { jlreq } { jafontsize .tl_set:N = \jlreq@option@jafontsize}
-\keys_define:nn { jlreq } { jafontscale .tl_set:N = \jlreq@option@jafontscale}
-\jlreq@aftercls@addtodeletecs{\jlreq@option@jafontsize}
-\jlreq@aftercls@addtodeletecs{\jlreq@option@jafontscale}
+\keys_define:nn { jlreq } { jafontsize .tl_set:N = \jlreq@option@jafontsize }
+\keys_define:nn { jlreq } { jafontscale .tl_set:N = \jlreq@option@jafontscale }
+\__jlreq_aftercls_addtodeletecs:N \jlreq@option@jafontsize
+\__jlreq_aftercls_addtodeletecs:N \jlreq@option@jafontscale
%.. 行の長さ
-\keys_define:nn { jlreq } { line_length .tl_set:N = \jlreq@option@line@length}
-\jlreq@aftercls@addtodeletecs{\jlreq@option@line@length}
+\keys_define:nn { jlreq } { line_length .tl_set:N = \jlreq@option@line@length }
+\__jlreq_aftercls_addtodeletecs:N \jlreq@option@line@length
%.. 1ページあたりの行数
-\keys_define:nn { jlreq } { number_of_lines .tl_set:N = \jlreq@option@number@of@lines}
-\jlreq@aftercls@addtodeletecs{\jlreq@option@number@of@lines}
+\keys_define:nn { jlreq } { number_of_lines .tl_set:N = \jlreq@option@number@of@lines }
+\__jlreq_aftercls_addtodeletecs:N \jlreq@option@number@of@lines
% 地の空き量,のどの空き量で配置位置を決める(2.4.1.b)省略されたら中央配置.
%.. 天
-\keys_define:nn { jlreq } { head_space .tl_set:N = \jlreq@option@head@space}
-\jlreq@aftercls@addtodeletecs{\jlreq@option@head@space}
+\keys_define:nn { jlreq } { head_space .tl_set:N = \jlreq@option@head@space }
+\__jlreq_aftercls_addtodeletecs:N \jlreq@option@head@space
%.. 地
-\keys_define:nn { jlreq } { foot_space .tl_set:N = \jlreq@option@foot@space}
-\jlreq@aftercls@addtodeletecs{\jlreq@option@foot@space}
+\keys_define:nn { jlreq } { foot_space .tl_set:N = \jlreq@option@foot@space }
+\__jlreq_aftercls_addtodeletecs:N \jlreq@option@foot@space
%.. のど
-\keys_define:nn { jlreq } { gutter .tl_set:N = \jlreq@option@gutter}
-\jlreq@aftercls@addtodeletecs{\jlreq@option@gutter}
+\keys_define:nn { jlreq } { gutter .tl_set:N = \jlreq@option@gutter }
+\__jlreq_aftercls_addtodeletecs:N \jlreq@option@gutter
%.. 小口
-\jlreq@aftercls@addtodeletecs{\jlreq@option@fore@edge}
+\__jlreq_aftercls_addtodeletecs:N \jlreq@option@fore@edge
\keys_define:nn { jlreq } {
fore_edge .tl_set:N = \jlreq@option@fore@edge,
fore-edge .tl_set:N = \jlreq@option@fore@edge
@@ -206,20 +208,20 @@
%.. 柱とノンブル
% 本文とヘッダ/フッタの間の空き
\keys_define:nn { jlreq } { headfoot_verticalposition .tl_set:N = \jlreq@option@headfoot@verticalpos}
-\jlreq@aftercls@addtodeletecs{\jlreq@option@headfoot@verticalpos}
+\__jlreq_aftercls_addtodeletecs:N \jlreq@option@headfoot@verticalpos
% 柱やノンブルの左右の空き
\keys_define:nn { jlreq } { headfoot_sidemargin .tl_set:N = \jlreq@headfoot@sidemargin}
%.. 段間
\keys_define:nn { jlreq } { column_gap .tl_set:N = \jlreq@option@column@gap}
-\jlreq@aftercls@addtodeletecs{\jlreq@option@column@gap}
+\__jlreq_aftercls_addtodeletecs:N \jlreq@option@column@gap
%.. 行送り,指定無しの場合は文字サイズの1.7倍とする.(1.5から2倍が好ましい:2.4.2.d 注3)
\keys_define:nn { jlreq } {
baselineskip .tl_set:N = \jlreq@option@baselineskip,
linegap .code:n = { \def\jlreq@option@baselineskip{1zw + #1} }
}
-\jlreq@aftercls@addtodeletecs{\jlreq@option@baselineskip}
+\__jlreq_aftercls_addtodeletecs:N \jlreq@option@baselineskip
%.. 組み方系
% 行頭に括弧が来たときの配置:3.1.5
@@ -231,16 +233,16 @@
% jsarticleと同じkanjiskipを使う
\newif\ifjlreq@narrow@kanjiskip\jlreq@narrow@kanjiskipfalse
\keys_define:nn { jlreq } { narrow_kanjiskip .code:n = {\jlreq@narrow@kanjiskiptrue}, narrow_kanjiskip .value_forbidden:n = true}
-\jlreq@aftercls@addtodeleteif{\ifjlreq@narrow@kanjiskip}
+\__jlreq_aftercls_addtodeleteif:N \ifjlreq@narrow@kanjiskip
%.. 注
% 傍注のタイプ
\keys_define:nn { jlreq } { sidenote_length .tl_set:N = \jlreq@option@sidenote@length }
-\jlreq@aftercls@addtodeletecs{\jlreq@option@sidenote@length}
+\__jlreq_aftercls_addtodeletecs:N \jlreq@option@sidenote@length
%.. 逆ノンブル
\newif\ifjlreq@option@use@reverse@pagination
-\jlreq@aftercls@addtodeleteif{\ifjlreq@option@use@reverse@pagination}
+\__jlreq_aftercls_addtodeleteif:N \ifjlreq@option@use@reverse@pagination
\jlreq@option@use@reverse@paginationfalse
\keys_define:nn { jlreq } { use_reverse_pagination .code:n = {\jlreq@option@use@reverse@paginationtrue}, use_reverse_pagination .value_forbidden:n = true }
@@ -250,7 +252,7 @@
\newif\if@landscape\@landscapefalse
\newif\if@tate \@tatefalse
\newif\ifjlreq@option@titlepage \jlreq@option@titlepagefalse % titlepageかnotitlepageかが指定された
-\jlreq@aftercls@addtodeleteif{\ifjlreq@option@titlepage}
+\__jlreq_aftercls_addtodeleteif:N \ifjlreq@option@titlepage
\keys_define:nn { jlreq } { landscape .code:n = {\@landscapetrue}, landscape .value_forbidden:n = true }
\keys_define:nn { jlreq } { tombo .code:n = {\ClassWarningNoLine{jlreq}{The~option~`tombo'~is~not~supported~by~jlreq~class.~Please~use~the~jlreq-trimmarks~package}} }
\keys_define:nn { jlreq } { tombow .code:n = {\ClassWarningNoLine{jlreq}{The~option~`tombow'~is~not~supported~by~jlreq~class.~Please~use~the~jlreq-trimmarks~package}} }
@@ -258,7 +260,7 @@
\keys_define:nn { jlreq } { tate .code:n = { \@tatetrue }, tate .value_forbidden:n = true}
\newif\ifjlreq@option@twoside\jlreq@option@twosidefalse % onesideかtwosideが指定された
-\jlreq@aftercls@addtodeleteif{\ifjlreq@option@twoside}
+\__jlreq_aftercls_addtodeleteif:N \ifjlreq@option@twoside
\keys_define:nn { jlreq } { oneside .code:n = { \@twosidefalse\@mparswitchfalse\jlreq@option@twosidetrue }, oneside .value_forbidden:n = true }
\keys_define:nn { jlreq } { twoside .code:n = { \@twosidetrue\@mparswitchtrue\jlreq@option@twosidetrue }, twoside .value_forbidden:n = true }
\keys_define:nn { jlreq } { onecolumn .code:n = { \@twocolumnfalse }, onecolumn .value_forbidden:n = true }
@@ -269,19 +271,18 @@
\keys_define:nn { jlreq } { final .code:n = { \setlength\overfullrule{0pt} }, final .value_forbidden:n = true }
\newif\if@openright
\newif\ifjlreq@option@open \jlreq@option@openfalse % openrightかopenanyが指定された
-\jlreq@aftercls@addtodeleteif{\ifjlreq@option@open}
+\__jlreq_aftercls_addtodeleteif:N \ifjlreq@option@open
\keys_define:nn { jlreq } { openright .code:n = { \@openrighttrue\jlreq@option@opentrue }, openright .value_forbidden:n = true}
\keys_define:nn { jlreq } { openany .code:n = { \@openrightfalse\jlreq@option@opentrue }, openany .value_forbidden:n = true}
\keys_define:nn { jlreq } { leqno .code:n = { \input{leqno.clo } }, leqno .value_forbidden:n = true}
\keys_define:nn { jlreq } { fleqn .code:n = { \input{fleqn.clo } }, fleqn .value_forbidden:n = true}
\newif\ifjlreq@option@enablejfam \jlreq@option@enablejfamtrue
-\jlreq@aftercls@addtodeleteif{\ifjlreq@option@enablejfam}
+\__jlreq_aftercls_addtodeleteif:N \ifjlreq@option@enablejfam
\keys_define:nn { jlreq } { disablejfam .code:n = { \jlreq@option@enablejfamfalse }, disablejfam .value_forbidden:n = true}
\def\jlreq@note#1{}
\keys_define:nn { jlreq } { jlreq_notes .code:n = { \def\jlreq@note##1{\message{^^JJLReq note: ##1^^J}}}, jlreq_notes .value_forbidden:n = true}
-%\ExecuteOptionsX{article_type=article,paper=a4,open_bracket_pos=zenkaku_tentsuki,onecolumn,final}
\keys_set:nn { jlreq } {
article_type=article,paper=a4,
number_of_lines={},line_length = {},
@@ -317,7 +318,7 @@
}
% \jlreqsetupの最後に必ず実行される処理を入れる.
\cs_set:Nn \__jlreq_jlreqsetup_addtofinally:n { \tl_gput_right:Nx \g__jlreq_jlreqsetup_finally_tl { \exp_not:n {#1} } }
-\jlreq@aftercls@addtodeletecs{\__jlreq_jlreqsetup_addtofinally:n}
+\__jlreq_aftercls_addtodeletecs:N \__jlreq_jlreqsetup_addtofinally:n
\@onlypreamble\jlreqsetup
% エンジンの設定
@@ -352,7 +353,7 @@
\else
\RequirePackage{everyhook}
\def\jlreq@jfmname@prefix{}
- \jlreq@aftercls@addtodeletecs{\jlreq@jfmname@prefix}
+ \__jlreq_aftercls_addtodeletecs:N \jlreq@jfmname@prefix
\ifjlreq@burasage\edef\jlreq@jfmname@prefix{b\jlreq@jfmname@prefix}\fi
\str_if_eq:VnT \jlreq@open@bracket@pos { zenkakunibu_nibu } {
\edef\jlreq@jfmname@prefix { \jlreq@jfmname@prefix z }
@@ -360,8 +361,8 @@
\ifx u\jlreq@engine\edef\jlreq@jfmname@prefix{u\jlreq@jfmname@prefix}\fi
\edef\jlreq@jfmname{\jlreq@jfmname@prefix jlreq} % JFMの名前
\edef\jlreq@jfmnameg{\jlreq@jfmname@prefix jlreqg} % ゴシックなJFMの名前
- \jlreq@aftercls@addtodeletecs{\jlreq@jfmname}
- \jlreq@aftercls@addtodeletecs{\jlreq@jfmnameg}
+ \__jlreq_aftercls_addtodeletecs:N \jlreq@jfmname
+ \__jlreq_aftercls_addtodeletecs:N \jlreq@jfmnameg
\fi
% (u)pLaTeXの場合ここで初めて\epTeXinputencodingが発行されるので,
@@ -599,7 +600,7 @@
\jlreq@getfirsttoken@expandmacros{\jlreq@nextchar}{\jlreq@tempa}%
\expandafter\jlreq@ifletter\expandafter{\jlreq@tempa}{%
\jlreq@calc@jfmglue{\char\jlreq@lastnodechar}{\jlreq@tempa}%
-% \message{fixjfm Insert: \the\jlreq@resultskip}%
+% \message{fixjfm,~before~lastnodechar~=~\the\jlreq@lastnodechar,~after~=~\meaning\jlreq@nextchar,~Insert:~\the\jlreq@resultskip}
\edef\jlreq@do{%
\noexpand\hskip\the\jlreq@resultskip\space
\noexpand\inhibitglue
@@ -655,7 +656,7 @@
\else
\def\jlreq@expand@optionfontsize#1{\dimexpr#1\relax}
\fi
-\jlreq@aftercls@addtodeletecs{\jlreq@expand@optionfontsize}
+\__jlreq_aftercls_addtodeletecs:N \jlreq@expand@optionfontsize
\ifx\jlreq@option@fontsize\@empty
\ifx\jlreq@option@jafontsize\@empty
\jlreq@fontsize=10pt
@@ -696,7 +697,7 @@
\fi
\jlreq@divide{\jlreq@jafontsize}{\jlreq@fontsize}
\edef\jlreq@jafontscale{\strip@pt\jlreq@resultdimen}
-\jlreq@aftercls@addtodeletecs{\jlreq@jafontscale}
+\__jlreq_aftercls_addtodeletecs:N \jlreq@jafontscale
\ifx l\jlreq@engine
\jlreq@saveoriginalcs{DeclareFontShape}
\def\DeclareFontShape#1#2#3#4#5#6{
@@ -737,9 +738,8 @@
\DeclareFontShape{\jlreq@tatekanjiencoding}{mc}{m}{n-jidori}{<->s*[\jlreq@jafontscale]\jlreq@tempa jlreq-v-jidori}{}
\DeclareFontShape{\jlreq@tatekanjiencoding}{gt}{m}{n-jidori}{<->s*[\jlreq@jafontscale]\jlreq@tempa jlreqg-v-jidori}{}
\fi
-\clist_set:NV \l_jlreq_tmpa_clist \jlreq@yokokanjiencoding
-\clist_push:NV \l_jlreq_tmpa_clist \jlreq@tatekanjiencoding
-\clist_map_inline:Nn \l_jlreq_tmpa_clist {% #1 = encoding
+
+\exp_args:Nx \clist_map_inline:nn {\jlreq@yokokanjiencoding,\jlreq@tatekanjiencoding} {% #1 = encoding
\clist_map_inline:nn { n,it,sl,sc } {% ##1 = shape
\clist_map_inline:nn { m,b,bx,sb,c } {% ####1 = series
\bool_if:nF { \str_if_eq_p:nn {##1} {n} && \str_if_eq_p:nn {####1} {m} } {
@@ -792,7 +792,7 @@
\ifx l\jlreq@engine
% \itemの直後は折り返し行頭と同じにする.
\cs_set:Nn \__jlreq_hook_everypar: {}
- \def\item{%
+ \renewcommand*{\item}{%
\cs_set:Nn \__jlreq_hook_everypar: { \cs_set:Nn \__jlreq_hook_everypar: {} \inhibitglue }
\expandafter\everypar\expandafter{\the\everypar\__jlreq_hook_everypar:}
\jlreq@useoriginalcs{item}%
@@ -804,20 +804,20 @@
% 行頭括弧に対して\inhibitglueを入れたりする命令を作る
% \jlreq@charlist@openingbracketsの各括弧に対して,\ifx\jlreq@nextchar 「1\fiみたいなのが並んだのを作る
\def\jlreq@tempa{}
- \def\jlreq@do#1{\jlreq@ifendmark{#1}{}{\appto\jlreq@tempa{\ifx\jlreq@nextchar#11\fi}\jlreq@do}}
+ \def\jlreq@do#1{\jlreq@ifendmark{#1}{}{\tl_put_right:Nn \jlreq@tempa{\ifx\jlreq@nextchar#11\fi}\jlreq@do}}
\expandafter\jlreq@do\jlreq@charlist@openingbrackets\jlreq@endmark
% JFM glueの伸び縮みで行頭括弧が揃わないのを防ぐために常に\inhibitglueを入れる.
\str_if_eq:VnTF \jlreq@open@bracket@pos { nibu_tentsuki } {
- \edef\jlreq@openbracket@hook@ii{\noexpand\ifnum0\expandonce{\jlreq@tempa}>0~\unexpanded{\hskip -.5\jlreq@zw\inhibitglue}\noexpand\fi}
+ \edef\jlreq@openbracket@hook@ii{\noexpand\ifnum0\exp_not:o {\jlreq@tempa}>0~\unexpanded{\hskip -.5\jlreq@zw\inhibitglue}\noexpand\fi}
}{% zenkakunibu_nibu,zenkaku_tentsuki
- \edef\jlreq@openbracket@hook@ii{\noexpand\ifnum0\expandonce{\jlreq@tempa}>0~\unexpanded{\inhibitglue}\noexpand\fi}
+ \edef\jlreq@openbracket@hook@ii{\noexpand\ifnum0\exp_not:o {\jlreq@tempa}>0~\unexpanded{\inhibitglue}\noexpand\fi}
}
% source special対策
\def\jlreq@openbracket@hook@i{\ifx\jlreq@nextchar\special\expandafter\jlreq@openbracket@hook@iii\else\expandafter\jlreq@openbracket@hook@ii\fi}
\def\jlreq@openbracket@hook@iii#1#2{#1{#2}\futurelet\jlreq@nextchar\jlreq@openbracket@hook@i}
\def\jlreq@openbracket@hook{\futurelet\jlreq@nextchar\jlreq@openbracket@hook@i}
\let\jlreq@hook@everypar=\jlreq@openbracket@hook
- \def\item{%
+ \renewcommand*{\item}{%
\def\jlreq@hook@everypar{%
\let\jlreq@hook@everypar=\jlreq@openbracket@hook
\inhibitglue
@@ -828,19 +828,19 @@
%.. 禁則処理
\ifx l\jlreq@engine
- \def\jlreq@setpostbreakpenalty@#1#2{\ltjsetparameter{postbreakpenalty={`#1,#2}}}
- \def\jlreq@setprebreakpenalty@#1#2{\ltjsetparameter{prebreakpenalty={`#1,#2}}}
- \def\jlreq@addjaxspmode@#1#2{%
+ \cs_set:Nn \__jlreq_setpostbreakpenalty_aux:nn {\ltjsetparameter{postbreakpenalty={`#1,#2}}}
+ \cs_set:Nn \__jlreq_setprebreakpenalty_aux:nn {\ltjsetparameter{prebreakpenalty={`#1,#2}}}
+ \cs_set:Nn \__jlreq_addjaxspmode_aux:nn {%
\jlreq@tempcnta=\ltjgetparameter{jaxspmode}{`#1}%
- \jlreq@switch{#2}{
- {pre}{%
+ \str_case:nn {#2} {
+ { pre } {%
\ifnum\jlreq@tempcnta=2
\ltjsetparameter{jaxspmode={`#1,allow}}%
\else\ifnum\jlreq@tempcnta=0
\ltjsetparameter{jaxspmode={`#1,preonly}}%
\fi\fi
}
- {post}{%
+ { post } {%
\ifnum\jlreq@tempcnta=1
\ltjsetparameter{jaxspmode={`#1,allow}}%
\else\ifnum\jlreq@tempcnta=0
@@ -849,17 +849,17 @@
}
}%
}
- \def\jlreq@deljaxspmode@#1#2{%
+ \cs_set:Nn \__jlreq_deljaxspmode_aux:nn {
\jlreq@tempcnta=\ltjgetparameter{jaxspmode}{`#1}%
- \jlreq@switch{#2}{
- {pre}{%
+ \str_case:nn {#2} {
+ { pre } {%
\ifnum\jlreq@tempcnta=2
\ltjsetparameter{jaxspmode={`#1,postonly}}%
\else\ifnum\jlreq@tempcnta=1
\ltjsetparameter{jaxspmode={`#1,inhibit}}%
\fi\fi
}
- {post}{%
+ { post } {%
\ifnum\jlreq@tempcnta=3
\ltjsetparameter{jaxspmode={`#1,preonly}}%
\else\ifnum\jlreq@tempcnta=2
@@ -869,19 +869,19 @@
}%
}
\else
- \def\jlreq@setpostbreakpenalty@#1#2{\postbreakpenalty`#1=#2}
- \def\jlreq@setprebreakpenalty@#1#2{\prebreakpenalty`#1=#2}
- \def\jlreq@addjaxspmode@#1#2{%
+ \cs_set:Nn \__jlreq_setpostbreakpenalty_aux:nn {\postbreakpenalty`#1=#2}
+ \cs_set:Nn \__jlreq_setprebreakpenalty_aux:nn {\prebreakpenalty`#1=#2}
+ \cs_set:Nn \__jlreq_addjaxspmode_aux:nn {
\jlreq@tempcnta=\inhibitxspcode`#1
- \jlreq@switch{#2}{
- {pre}{%
+ \str_case:nn {#2} {
+ { pre }{%
\ifnum\jlreq@tempcnta=1
\inhibitxspcode`#1=3
\else\ifnum\jlreq@tempcnta=0
\inhibitxspcode`#1=2
\fi\fi
}
- {post}{%
+ { post }{%
\ifnum\jlreq@tempcnta=2
\inhibitxspcode`#1=3
\else\ifnum\jlreq@tempcnta=0
@@ -890,17 +890,17 @@
}
}%
}
- \def\jlreq@deljaxspmode@#1#2{%
+ \cs_set:Nn \__jlreq_deljaxspmode_aux:nn {
\jlreq@tempcnta=\inhibitxspcode`#1
- \jlreq@switch{#2}{
- {pre}{%
+ \str_case;nn {#2} {
+ { pre } {%
\ifnum\jlreq@tempcnta=3
\inhibitxspcode`#1=1
\else\ifnum\jlreq@tempcnta=2
\inhibitxspcode`#1=0
\fi\fi
}
- {post}{%
+ { post } {%
\ifnum\jlreq@tempcnta=3
\inhibitxspcode`#1=2
\else\ifnum\jlreq@tempcnta=1
@@ -911,33 +911,33 @@
}
\fi
% #1{...}{#3}を...が#2のリストに対して適用.
-\cs_set:Nn \__jlreq_iterateapply:nnn {
+\cs_set:Nn \__jlreq_iterateapply:Nnn {
\tl_map_inline:nn {#2} {
#1{##1}{#3}
}
}
-\cs_set:Nn \__jlreq_setpostbreakpenalty:nn { \__jlreq_iterateapply:nnn {\jlreq@setpostbreakpenalty@} {#1} {#2}}
+\cs_set:Nn \__jlreq_setpostbreakpenalty:nn { \__jlreq_iterateapply:Nnn \__jlreq_setpostbreakpenalty_aux:nn {#1} {#2}}
\cs_generate_variant:Nn \__jlreq_setpostbreakpenalty:nn { Vn }
-\cs_set:Nn \__jlreq_setprebreakpenalty:nn { \__jlreq_iterateapply:nnn {\jlreq@setprebreakpenalty@} {#1} {#2} }
+\cs_set:Nn \__jlreq_setprebreakpenalty:nn { \__jlreq_iterateapply:Nnn \__jlreq_setprebreakpenalty_aux:nn {#1} {#2} }
\cs_generate_variant:Nn \__jlreq_setprebreakpenalty:nn { Vn }
-\cs_set:Nn \__jlreq_addjaxspmode:nn {\__jlreq_iterateapply:nnn {\jlreq@addjaxspmode@} {#1} {#2} }
+\cs_set:Nn \__jlreq_addjaxspmode:nn {\__jlreq_iterateapply:Nnn \__jlreq_addjaxspmode_aux:nn {#1} {#2} }
\cs_generate_variant:Nn \__jlreq_addjaxspmode:nn { Vn }
-\cs_set:Nn \__jlreq_deljaxspmode:nn { \__jlreq_iterateapply:nnn{\jlreq@deljaxspmode@} {#1} {#2} }
+\cs_set:Nn \__jlreq_deljaxspmode:nn { \__jlreq_iterateapply:Nnn \__jlreq_deljaxspmode_aux:nn {#1} {#2} }
\cs_generate_variant:Nn \__jlreq_deljaxspmode:nn { Vn }
-\jlreq@aftercls@addtodeletecs{\__jlreq_iterateapply:nnn}
-\jlreq@aftercls@addtodeletecs{\__jlreq_setpostbreakpenalty:nn}
-\jlreq@aftercls@addtodeletecs{\__jlreq_setpostbreakpenalty:Vn}
-\jlreq@aftercls@addtodeletecs{\jlreq@setpostbreakpenalty@}
-\jlreq@aftercls@addtodeletecs{\__jlreq_setprebreakpenalty:nn}
-\jlreq@aftercls@addtodeletecs{\__jlreq_setprebreakpenalty:Vn}
-\jlreq@aftercls@addtodeletecs{\jlreq@setprebreakpenalty@}
-\jlreq@aftercls@addtodeletecs{\__jlreq_addjaxspmode:nn}
-\jlreq@aftercls@addtodeletecs{\__jlreq_addjaxspmode:Vn}
-\jlreq@aftercls@addtodeletecs{\jlreq@addjaxspmode@}
-\jlreq@aftercls@addtodeletecs{\__jlreq_deljaxspmode:nn}
-\jlreq@aftercls@addtodeletecs{\__jlreq_deljaxspmode:Vn}
-\jlreq@aftercls@addtodeletecs{\jlreq@deljaxspmode@}
+\__jlreq_aftercls_addtodeletecs:N \__jlreq_iterateapply:Nnn
+\__jlreq_aftercls_addtodeletecs:N \__jlreq_setpostbreakpenalty:nn
+\__jlreq_aftercls_addtodeletecs:N \__jlreq_setpostbreakpenalty:Vn
+\__jlreq_aftercls_addtodeletecs:N \__jlreq_setpostbreakpenalty_aux:nn
+\__jlreq_aftercls_addtodeletecs:N \__jlreq_setprebreakpenalty:nn
+\__jlreq_aftercls_addtodeletecs:N \__jlreq_setprebreakpenalty:Vn
+\__jlreq_aftercls_addtodeletecs:N \__jlreq_setprebreakpenalty_aux:nn
+\__jlreq_aftercls_addtodeletecs:N \__jlreq_addjaxspmode:nn
+\__jlreq_aftercls_addtodeletecs:N \__jlreq_addjaxspmode:Vn
+\__jlreq_aftercls_addtodeletecs:N \__jlreq_addjaxspmode_aux:nn
+\__jlreq_aftercls_addtodeletecs:N \__jlreq_deljaxspmode:nn
+\__jlreq_aftercls_addtodeletecs:N \__jlreq_deljaxspmode:Vn
+\__jlreq_aftercls_addtodeletecs:N \__jlreq_deljaxspmode_aux:nn
% 行末禁則
\__jlreq_setpostbreakpenalty:Vn \jlreq@charlist@openingbrackets {10000}
@@ -977,7 +977,7 @@
\cs_set:Nn \__jlreq_setkcatcode:nn {
\clist_map_inline:nn {#1} { \kcatcode"##1=#2\relax }
}
- \jlreq@aftercls@addtodeletecs{\__jlreq_setkcatcode:nn}
+ \__jlreq_aftercls_addtodeletecs:N \__jlreq_setkcatcode:nn
% LuaTeX-jaのデフォルトのままに近い設定をする
% 範囲1&8
\__jlreq_setkcatcode:nn {80} {15} % Latin-1 Supplement,どうしよう……
@@ -1063,13 +1063,13 @@
\DeclareRobustCommand*\ {\futurelet\jlreq@nextchar\jlreq@zenkakuspace@ignorespaces}
% 後続の空白を無視する処理
\edef\jlreq@zenkakuspace@ignorespaces{%
- \noexpand\ifx\expandonce{\space}\unexpanded{\jlreq@nextchar\expandafter\jlreq@zenkakuspace@ignorespaces@\else\expandafter\jlreq@zenkakuspace@main\fi}%
+ \noexpand\ifx\exp_not:o {\space}\unexpanded{\jlreq@nextchar\expandafter\jlreq@zenkakuspace@ignorespaces@\else\expandafter\jlreq@zenkakuspace@main\fi}%
}
\expandafter\def\expandafter\jlreq@zenkakuspace@ignorespaces@\space{\ }
\def\jlreq@tempa{}
-\def\jlreq@do#1{\jlreq@ifendmark{#1}{}{\appto\jlreq@tempa{\ifnum\lastnodechar=`#1~1\fi}\jlreq@do}}
+\def\jlreq@do#1{\jlreq@ifendmark{#1}{}{\tl_put_right:Nn \jlreq@tempa{\ifnum\lastnodechar=`#1~1\fi}\jlreq@do}}
\expandafter\jlreq@do\jlreq@charlist@dividingpunctuationmarks\jlreq@endmark
-\edef\@tempa{\noexpand\ifnum0\expandonce{\jlreq@tempa}>0~}
+\edef\@tempa{\noexpand\ifnum0\exp_not:o {\jlreq@tempa}>0~}
\expandafter\DeclareRobustCommand\expandafter*\expandafter\jlreq@zenkakuspace@main\expandafter{\@tempa
\hskip 1\jlreq@zw\hbox{}%
\jlreq@lastnodechar=` 
@@ -1096,10 +1096,10 @@
% 区切り約物.\? みたいな命令を作る.直後の空きが自動で入る.
% \?*とすると文中の?として扱われる.
\def\jlreq@tempa{}
-\def\jlreq@do#1{\jlreq@ifendmark{#1}{}{\appto\jlreq@tempa{\ifx\jlreq@nextchar #11\fi}\jlreq@do}}
+\def\jlreq@do#1{\jlreq@ifendmark{#1}{}{\tl_put_right:Nn \jlreq@tempa{\ifx\jlreq@nextchar #11\fi}\jlreq@do}}
\expandafter\jlreq@do\jlreq@charlist@closingbrackets\jlreq@endmark
\edef\jlreq@dividingpunctuationmarkscommand{%
- \noexpand\ifnum 0\expandonce{\jlreq@tempa}>0~\unexpanded{\expandafter\ignorespaces\else\expandafter\ \fi}%
+ \noexpand\ifnum 0\exp_not:o {\jlreq@tempa}>0~\unexpanded{\expandafter\ignorespaces\else\expandafter\ \fi}%
}
\def\jlreq@do#1{%
\jlreq@ifendmark{#1}{}{
@@ -1140,14 +1140,15 @@
\emergencystretch 3\jlreq@gol
\setlength{\parindent}{1\zw}
-\def\jlreq@setfontsizehook{}
-\jlreq@saveoriginalcs{set@fontsize}
-\apptocmd{\set@fontsize}{\expandafter\def\expandafter\size@update\expandafter{\size@update\jlreq@setfontsizehook}}{}{}
-\appto\jlreq@setfontsizehook{ \dim_compare:nT { \parindent>0pt } { \setlength{\parindent}{1\jlreq@zw} } }
+\hook_gput_code:nnn { cmd/set@fontsize/after } {.} {
+ \expandafter\def\expandafter\size@update\expandafter{\size@update\g__jlreq_setfontsizehook}
+}
+\tl_new:N \g__jlreq_setfontsizehook
+\tl_set:Nn \g__jlreq_setfontsizehook { \dim_compare:nT { \parindent>0pt } { \setlength{\parindent}{1\jlreq@zw} } }
\ifx l\jlreq@engine
\@tempskipa=\ltjgetparameter{kanjiskip}
\ifdim\@tempskipa=\maxdimen\else
- \appto\jlreq@setfontsizehook{%
+ \tl_put_right:Nn \g__jlreq_setfontsizehook {%
\ltj@setpar@global
\ltjsetkanjiskip\jlreqkanjiskip
\@tempskipa=\ltjgetparameter{xkanjiskip}%
@@ -1157,7 +1158,7 @@
}
\fi
\else
- \appto\jlreq@setfontsizehook{%
+ \tl_put_right:Nn \g__jlreq_setfontsizehook {%
\kanjiskip=\jlreqkanjiskip
\ifdim\xkanjiskip>0pt
\xkanjiskip=\jlreqxkanjiskip
@@ -1357,8 +1358,8 @@
\jlreq@determine@kihonhanmen@warning@firstfalse
\fi
}
-\jlreq@aftercls@addtodeletecs{\jlreq@determine@kihonhanmen@warning}
-\jlreq@aftercls@addtodeleteif{\ifjlreq@determine@kihonhanmen@warning@first}
+\__jlreq_aftercls_addtodeletecs:N \jlreq@determine@kihonhanmen@warning
+\__jlreq_aftercls_addtodeleteif:N \ifjlreq@determine@kihonhanmen@warning@first
\@tempdima=1\zw
\ifx\jlreq@option@line@length\@empty
\if@tate
@@ -1412,7 +1413,7 @@
\divide\textheight\baselineskip \multiply\textheight\baselineskip
\addtolength{\textheight}{\topskip}
}
-\jlreq@aftercls@addtodeletecs{\jlreq@adjusttextheight}
+\__jlreq_aftercls_addtodeletecs:N \jlreq@adjusttextheight
\ifx\jlreq@option@number@of@lines\@empty
\if@tate
\ifnum 0\ifx\jlreq@option@gutter\@empty 1\fi\ifx\jlreq@option@fore@edge\@empty 1\fi>0
@@ -1457,8 +1458,8 @@
\jlreq@note{基本版面の配置はのどの空き量を指定する (2.4.1.b).}
\fi
}
-\jlreq@aftercls@addtodeletecs{\jlreq@setsidemargin@by@gutter}
-\jlreq@aftercls@addtodeletecs{\jlreq@setsidemargin@by@fore@edge}
+\__jlreq_aftercls_addtodeletecs:N \jlreq@setsidemargin@by@gutter
+\__jlreq_aftercls_addtodeletecs:N \jlreq@setsidemargin@by@fore@edge
\ifx\jlreq@option@gutter\@empty
\ifx\jlreq@option@fore@edge\@empty
@@ -1511,7 +1512,7 @@
\setlength{\topmargin}{\dimexpr #1 - \headsep - \headheight - \topskip + \Cht\relax}
\fi
}
-\jlreq@aftercls@addtodeletecs{\jlreq@settopmarginbyhead}
+\__jlreq_aftercls_addtodeletecs:N \jlreq@settopmarginbyhead
% 地の値から
\def\jlreq@settopmarginbyfoot#1{
\if@tate
@@ -1521,7 +1522,7 @@
\setlength{\topmargin}{\dimexpr\paperheight - \textheight + \topskip - 1\zh - \headsep - \headheight - #1\relax}
\fi
}
-\jlreq@aftercls@addtodeletecs{\jlreq@settopmarginbyfoot}
+\__jlreq_aftercls_addtodeletecs:N \jlreq@settopmarginbyfoot
\ifx\jlreq@option@head@space\@empty
\ifx\jlreq@option@foot@space\@empty
\if@tate
@@ -1624,7 +1625,7 @@
\jlreq@tempdimb=\dimexpr\the\numexpr\jlreq@tempdima/\dimexpr 1\jlreq@zw\relax + 2\relax\jlreq@zw\relax
\edef\jlreq@do{%
\unexpanded{\def\jlreq@result}{%
- \noexpand\def\expandonce{\csname l@#1\endcsname}{%
+ \noexpand\def\exp_not:c {l@#1}{%
\unexpanded{\@dottedtocline{#2}{0pt}}{\the\jlreq@tempdimb}%
}%
}%
@@ -1669,7 +1670,7 @@
\begingroup
\let\jlreq@contents@label@format=\@undefined
\let\jlreq@format=\@undefined
- \edef\jlreq@label@format{\expandonce{\csname the#1\endcsname}}%
+ \edef\jlreq@label@format{\exp_not:c {the#1}}%
\newif\ifjlreq@number
\keys_define:nn { DeclareTobiraHeading:#1 } {
label_format .tl_set:N = \jlreq@label@format,
@@ -1686,12 +1687,12 @@
\ifx\jlreq@format\@undefined
\def\jlreq@format##1##2{##1##2}%
\fi
- \edef\jlreq@formatwlabel{\noexpand\jlreq@format{\expandonce{\jlreq@label@format}}}%
+ \edef\jlreq@formatwlabel{\noexpand\jlreq@format{\exp_not:o {\jlreq@label@format}}}%
\jlreq@heading@make@l@{#1}{#2}{\jlreq@label@format}%
- \eappto\jlreq@do{\expandonce{\jlreq@result}}%
+ \tl_put_right:Nx \jlreq@do {\exp_not:o {\jlreq@result}}%
\edef\jlreq@do{%
- \expandonce{\jlreq@do}%
- \noexpand\def\expandonce{\csname jlreq@TobiraHeading@start@#1\endcsname}[####1]####2{%
+ \exp_not:o {\jlreq@do}%
+ \noexpand\def\exp_not:c {jlreq@TobiraHeading@start@#1}[####1]####2{%
\ifjlreq@number
\unexpanded{\ifnum#2>\c@secnumdepth\else}%
\unexpanded{\refstepcounter{#1}}%
@@ -1704,41 +1705,41 @@
\ifjlreq@number
\unexpanded{\jlreq@if{\ifnum#2>\c@secnumdepth\relax\fi}}{%
\unexpanded{\long\gdef\jlreqHeadingLabel####1{}}%
- \expandonce{\jlreq@format{}{##1}}%
+ \exp_not:o {\jlreq@format{}{##1}}%
}{%
\unexpanded{\long\gdef\jlreqHeadingLabel####1{####1}}%
- \expandafter\expandonce\expandafter{\jlreq@formatwlabel{##2}}%
+ \expandafter\exp_not:o \expandafter{\jlreq@formatwlabel{##2}}%
}%
\else
\unexpanded{\long\gdef\jlreqHeadingLabel####1{}}%
- \expandonce{\jlreq@format{}{##1}}%
+ \exp_not:o {\jlreq@format{}{##1}}%
\fi
- \expandonce{\csname jlreq@heading@maketoc@#1\endcsname}{\ifjlreq@number\else -\fi}{\expandonce{\jlreq@label@format}}{####1}%
+ \exp_not:c {jlreq@heading@maketoc@#1}{\ifjlreq@number\else -\fi}{\exp_not:o {\jlreq@label@format}}{####1}%
\noexpand\@afterheading
- \expandonce{\jlreq@heading@clearpage}%
+ \exp_not:o {\jlreq@heading@clearpage}%
\unexpanded{\if@restonecol\twocolumn\fi}%
}%
- \noexpand\def\expandonce{\csname jlreq@TobiraHeading@start@s@#1\endcsname}####1{%
+ \noexpand\def\exp_not:c {jlreq@TobiraHeading@start@s@#1}####1{%
\unexpanded{\long\gdef\jlreqHeadingLabel####1{}}%
\unexpanded{\jlreq@ifempty{##1}%
{\long\gdef\jlreqHeadingText####1{}}%
{\long\gdef\jlreqHeadingText####1{####1}}%
}%
- \expandonce{\jlreq@format{}{##1}}
- \expandonce{\csname jlreq@heading@maketoc@#1\endcsname}{*}{\expandonce{\jlreq@label@format}}{####1}%
+ \exp_not:o {\jlreq@format{}{##1}}
+ \exp_not:c {jlreq@heading@maketoc@#1}{*}{\exp_not:o {\jlreq@label@format}}{####1}%
\noexpand\@afterheading
- \expandonce{\jlreq@heading@clearpage}%
+ \exp_not:o {\jlreq@heading@clearpage}%
\unexpanded{\if@restonecol\twocolumn\fi}%
}%
- \noexpand\def\expandonce{\csname jlreq@headingcs@#1\endcsname}{%
+ \noexpand\def\exp_not:c {jlreq@headingcs@#1}{%
% 改丁.これでよいのかな.
\unexpanded{\if@twocolumn\onecolumn\@restonecoltrue\else\@restonecolfalse\fi\cleartooddpage[empty]}%
- \ifx\jlreq@pagestyle\@empty\else\noexpand\thispagestyle{\expandonce{\jlreq@pagestyle}}\fi
- \noexpand\secdef{\expandonce{\csname jlreq@TobiraHeading@start@#1\endcsname}}{\expandonce{\csname jlreq@TobiraHeading@start@s@#1\endcsname}}}%
- \noexpand\def\expandonce{\csname #1\endcsname}{%
+ \ifx\jlreq@pagestyle\@empty\else\noexpand\thispagestyle{\exp_not:o {\jlreq@pagestyle}}\fi
+ \noexpand\secdef{\exp_not:c {jlreq@TobiraHeading@start@#1}}{\exp_not:c {jlreq@TobiraHeading@start@s@#1}}}%
+ \noexpand\def\exp_not:c {#1}{%
\noexpand\UseHook{jlreq/heading/before}%
\noexpand\UseHook{jlreq/heading/before/#1}%
- \expandonce{\csname jlreq@headingcs@#1\endcsname}%
+ \exp_not:c {jlreq@headingcs@#1}%
}%
}%
\expandafter\endgroup
@@ -1771,8 +1772,8 @@
\long\def\jlreq@BlockHeading@start#1#2#3#4#5#6{%
\if@noskipsec\leavevmode\fi
% #5と#6は\parを含むかもしれないので引数渡しはしない(後の\@ifstarで詰まる)
- \edef\jlreq@BlockHeading@start@eachformat{\expandonce{\@firstoftwo#5}}%
- \edef\jlreq@BlockHeading@start@format{\expandonce{\@secondoftwo#5}}%
+ \edef\jlreq@BlockHeading@start@eachformat{\exp_not:o {\@firstoftwo#5}}%
+ \edef\jlreq@BlockHeading@start@format{\exp_not:o {\@secondoftwo#5}}%
\edef\jlreq@BlockHeading@start@totalformat{\unexpanded{#6}}%
\jlreq@BlockHeading@start@{#1}{#2}{#3}{#4}%
}
@@ -1787,20 +1788,20 @@
% {1 = 命令}{2 = レベル}{3 = スペース関連}{4 = *}{5 = running head}{6 = 見出し}[7 = 副題]
\long\def\jlreq@BlockHeading@start@@@#1#2#3#4#5#6[#7]{%
- \edef\jlreq@do{\unexpanded{\jlreq@BlockHeading@start@@@@{#1}{#2}{#3}}{\expandonce{\jlreq@BlockHeading@start@totalformat}}}%
+ \edef\jlreq@do{\unexpanded{\jlreq@BlockHeading@start@@@@{#1}{#2}{#3}}{\exp_not:o {\jlreq@BlockHeading@start@totalformat}}}%
\jlreq@do{#4}{#5}{#6}{#7}%
}
% {1 = 命令}{2 = レベル}{3 = スペース関連}{4 = 全フォーマット}{5 = *}{6 = running head}{7 = 見出し}{8 = 副題}
\long\def\jlreq@BlockHeading@start@@@@#1#2#3#4#5#6#7#8{%
\edef\jlreq@tempa##1##2##3##4##5##6##7{%
- \unexpanded{\jlreq@BlockHeading@start@makeoutput{#1}{#2}}{{##1}{##2}{##3}}{\expandonce{\jlreq@BlockHeading@start@eachformat}}{\expandonce{\jlreq@BlockHeading@start@format}}\unexpanded{{#5}{#6}{#7}{#8}}%
+ \unexpanded{\jlreq@BlockHeading@start@makeoutput{#1}{#2}}{{##1}{##2}{##3}}{\exp_not:o {\jlreq@BlockHeading@start@eachformat}}{\exp_not:o {\jlreq@BlockHeading@start@format}}\unexpanded{{#5}{#6}{#7}{#8}}%
\unexpanded{\def\jlreq@tempb}{{##4}{##5}{##6}}% 縦方向空き
\noexpand\jlreq@ifempty{##7}{\noexpand\jlreq@tempatrue}{\noexpand\jlreq@tempafalse}% 偶数ページのみで改ページするならば\jlreq@tempatrue
}%
\jlreq@tempa#3%
\global\advance\jlreq@BlockHeading@spaces@current@count by 1
- \gappto\jlreq@BlockHeading@spaces@current@sequence{_#1}%
+ \tl_gput_right:Nn \jlreq@BlockHeading@spaces@current@sequence {_#1}%
% 連続する見出しの間の処理をするために,即時では出力せず,いったんマクロに格納する.
% \jlreq@BlockHeading@spaces@current@before@<n>
% \jlreq@BlockHeading@start@gyodori\jlreq@BlockHeading@spaces@current@space@<n>{jlreq@BlockHeading@spaces@current@output@<n>}
@@ -1808,16 +1809,16 @@
% \jlreq@BlockHeading@spaces@current@after@<n>
% として後に呼び出される.(spaceは書き換えられる可能性がある.)
\expandafter\xdef\csname jlreq@BlockHeading@spaces@current@output@\the\jlreq@BlockHeading@spaces@current@count\endcsname{%
- \expandonce{\jlreq@resultb}%
+ \exp_not:o {\jlreq@resultb}%
}%
\expandafter\xdef\csname jlreq@BlockHeading@spaces@current@space@\the\jlreq@BlockHeading@spaces@current@count\endcsname{%
- \expandonce{\jlreq@tempb}%
+ \exp_not:o {\jlreq@tempb}%
}%
\def\@tempa##1##2##3{##1}%
\expandafter\xdef\csname jlreq@BlockHeading@spaces@current@before@\the\jlreq@BlockHeading@spaces@current@count\endcsname{%
\noexpand\allowbreak
- \expandonce{\@tempa#4}%
- \expandonce{\jlreq@resulta}%
+ \exp_not:o {\@tempa#4}%
+ \exp_not:o {\jlreq@resulta}%
\ifjlreq@tempa\unexpanded{%
\jlreq@setcurrentpage
\edef\jlreq@BlockHeading@currentpage{\the\jlreq@currentpage}%
@@ -1825,17 +1826,17 @@
}%
\def\@tempa##1##2##3{##2}%
\expandafter\xdef\csname jlreq@BlockHeading@spaces@current@format@\the\jlreq@BlockHeading@spaces@current@count\endcsname{%
- \expandonce{\@tempa#4}%
+ \exp_not:o {\@tempa#4}%
}%
\def\@tempa##1##2##3{##3}%
\expandafter\xdef\csname jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count\endcsname{%
- \expandonce{\jlreq@resultc}%
+ \exp_not:o {\jlreq@resultc}%
\ifjlreq@tempa\unexpanded{%
\ifx\jlreq@BlockHeading@currentpage\@empty\nobreak\else
\ifodd\jlreq@BlockHeading@currentpage\nobreak\else\allowbreak\fi
\fi
}\else\noexpand\nobreak\fi
- \expandonce{\@tempa#4}%
+ \exp_not:o {\@tempa#4}%
}%
\ifx\jlreq@BlockHeading@spaces@headingslist\@empty
\expandafter\jlreq@BlockHeading@spaces@outputwospace
@@ -1847,7 +1848,7 @@
\def\jlreq@BlockHeading@start@afterheading{\futurelet\jlreq@nextchar\jlreq@BlockHeading@start@afterheading@i}
\edef\jlreq@BlockHeading@start@afterheading@i{%
- \noexpand\ifx\expandonce{\space}\unexpanded{\jlreq@nextchar\expandafter\jlreq@BlockHeading@start@afterheading@skipspaces}%
+ \noexpand\ifx\exp_not:o {\space}\unexpanded{\jlreq@nextchar\expandafter\jlreq@BlockHeading@start@afterheading@skipspaces}%
\unexpanded{\else\expandafter\jlreq@BlockHeading@start@afterheading@ii\fi}%
}
% スペースを読み飛ばす
@@ -1873,11 +1874,11 @@
% コントロールシークエンスを保存
\long\def\jlreq@BlockHeading@start@afterheading@saveafter@cs@noargument#1{%
- \csgappto{jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count}{#1}%
+ \tl_put_right:cn {jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count} {#1}
\jlreq@BlockHeading@start@afterheading
}
\long\def\jlreq@BlockHeading@start@afterheading@saveafter@cs#1{%
- \csgappto{jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count}{#1}%
+ \tl_put_right:cn {jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count} {#1}
\jlreq@BlockHeading@start@afterheading@saveafter@option
}
% オプションがあれば保存
@@ -1885,7 +1886,7 @@
\@ifnextchar[{\jlreq@BlockHeading@start@afterheading@saveafter@option@}{\jlreq@BlockHeading@start@afterheading@saveafter@arguments}%
}
\long\def\jlreq@BlockHeading@start@afterheading@saveafter@option@[#1]{%
- \csxappto{jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count}{\unexpanded{[#1]}}%
+ \tl_put_right:cx {jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count} {\exp_not:n {[#1]}}
\jlreq@BlockHeading@start@afterheading@saveafter@arguments
}
% 引数を保存し続けるループ
@@ -1896,14 +1897,14 @@
\noexpand\ifx\space\unexpanded{\jlreq@nextchar\expandafter\jlreq@BlockHeading@start@afterheading@saveafter@arguments@@\else\expandafter\jlreq@BlockHeading@start@afterheading@saveafter@arguments@@@\fi}%
}
\expandafter\def\expandafter\jlreq@BlockHeading@start@afterheading@saveafter@arguments@@\space{%
- \csgappto{jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count}{ }%
+ \tl_put_right:cn {jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count} { }
\jlreq@BlockHeading@start@afterheading@saveafter@arguments
}
\def\jlreq@BlockHeading@start@afterheading@saveafter@arguments@@@{%
\jlreq@ifnextchar\bgroup{\jlreq@BlockHeading@start@afterheading@saveafter@arguments@@@@}{\jlreq@BlockHeading@start@afterheading}%
}
\long\def\jlreq@BlockHeading@start@afterheading@saveafter@arguments@@@@#1{%
- \csxappto{jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count}{\unexpanded{{#1}}}%
+ \tl_put_right:cx {jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count} {\exp_not:n {{#1}}}
\jlreq@BlockHeading@start@afterheading@saveafter@arguments
}
@@ -1923,9 +1924,9 @@
\fi
\edef\jlreq@tempa{\expandafter\jlreq@BlockHeading@start@geteachformat\expandafter{\jlreq@tempc}#4}% {ラベルフォーマット}{本文フォーマット}{副題フォーマット}
\edef\jlreq@tempb{\expandafter\jlreq@BlockHeading@start@getformat\expandafter{\jlreq@tempc}#5}% {まとめるフォーマット}
- \edef\jlreq@do{\noexpand\jlreq@BlockHeading@start@makeoutput@@\expandonce{\jlreq@tempa}\expandonce{\jlreq@tempb}\unexpanded{{#8}{#9}}}%
+ \edef\jlreq@do{\noexpand\jlreq@BlockHeading@start@makeoutput@@\exp_not:o {\jlreq@tempa}\exp_not:o {\jlreq@tempb}\unexpanded{{#8}{#9}}}%
\jlreq@do
- \edef\jlreq@do{\noexpand\jlreq@BlockHeading@start@makeoutput@\unexpanded{#3}{\expandonce{\jlreq@result}}}%
+ \edef\jlreq@do{\noexpand\jlreq@BlockHeading@start@makeoutput@\unexpanded{#3}{\exp_not:o {\jlreq@result}}}%
\jlreq@do
% \jlreq@tempa -> 素のラベルフォーマット
\edef\jlreq@tempa{\jlreq@BlockHeading@start@getonlylabelformat#4}%
@@ -1945,10 +1946,10 @@
{\unexpanded{\long\gdef\jlreqHeadingSubtitle####1{####1}}}%
}%
\unexpanded{\def\jlreq@resultb}{%
- \expandonce{\jlreq@result}%
+ \exp_not:o {\jlreq@result}%
}%
\unexpanded{\def\jlreq@resultc}{%
- \expandonce{\csname jlreq@heading@maketoc@#1\endcsname}{\unexpanded{#6}}{\expandonce{\jlreq@tempa}}{\unexpanded{#7}}%
+ \exp_not:c {jlreq@heading@maketoc@#1}{\unexpanded{#6}}{\exp_not:o {\jlreq@tempa}}{\unexpanded{#7}}%
}%
}%
\expandafter\endgroup
@@ -1998,9 +1999,9 @@
}%
\long\def\jlreq@tempc##1##2##3{#4}% 全体のフォーマット
% 二度展開すると欲しいものが得られる
- \edef\jlreq@tempa{\noexpand\jlreq@tempc{\unexpanded{#1}}{\expandonce{\jlreq@tempa}}{\expandonce{\jlreq@tempb}}}%
+ \edef\jlreq@tempa{\noexpand\jlreq@tempc{\unexpanded{#1}}{\exp_not:o {\jlreq@tempa}}{\exp_not:o {\jlreq@tempb}}}%
\edef\jlreq@do{%
- \unexpanded{\def\jlreq@result}{\expandafter\expandonce\expandafter{\jlreq@tempa}}%
+ \unexpanded{\def\jlreq@result}{\expandafter\exp_not:o \expandafter{\jlreq@tempa}}%
}%
\expandafter\endgroup
\jlreq@do
@@ -2019,7 +2020,7 @@
\def\jlreq@resultb{}%
}{%
\let\jlreq@resulta=#1
- \edef\jlreq@resultb{\expandonce{\jlreq@BlockHeading@start@removecolumn#2}}%
+ \edef\jlreq@resultb{\exp_not:o {\jlreq@BlockHeading@start@removecolumn#2}}%
}%
}
@@ -2196,7 +2197,7 @@
\def\jlreq@parsecomma##1##2{%
\jlreq@helper@dividebycomma{##1}%
\jlreq@if{\ifjlreq@result\fi}{%
- \edef\jlreq@do{\noexpand\jlreq@tempa{\expandonce{\jlreq@resulta}}{\expandonce{\jlreq@resultb}}}%
+ \edef\jlreq@do{\noexpand\jlreq@tempa{\exp_not:o {\jlreq@resulta}}{\exp_not:o {\jlreq@resultb}}}%
}{%
\edef\jlreq@do{\noexpand\jlreq@tempa{##1}{}}%
}%
@@ -2227,7 +2228,7 @@
\jlreq@parsecomma{##1}{%
\jlreq@iffirsttoken{####1}{*}{%
\jlreq@second@text@indent@withlabelfalse
- \edef\jlreq@second@heading@text@indent@wlabel{\expandonce{\@gobble ####1}}%
+ \edef\jlreq@second@heading@text@indent@wlabel{\exp_not:o {\@gobble ####1}}%
}{%
\jlreq@second@text@indent@withlabeltrue
\def\jlreq@second@heading@text@indent@wlabel{####1}%
@@ -2244,14 +2245,14 @@
subtitle_indent .code:n = {%
\jlreq@iffirsttoken{##1}{*}{%
\jlreq@subtitleindent@withlabelfalse
- \edef\jlreq@subtitle@indent{\expandonce{\@gobble ##1}}%
+ \edef\jlreq@subtitle@indent{\exp_not:o {\@gobble ##1}}%
}{%
\jlreq@subtitleindent@withlabeltrue
\def\jlreq@subtitle@indent{##1}%
}%
},
subtitle_break .choices:nn = {true,false}{\csname jlreq@subtitle@break##1\endcsname},
- afterindent .choices:nn = {true,false}{\edef\jlreq@afterindent{\expandonce{\csname @afterindent##1\endcsname}}},
+ afterindent .choices:nn = {true,false}{\edef\jlreq@afterindent{\exp_not:c {@afterindent##1}}},
allowbreak_if_evenpage .choices:nn = {true,false}{%
\str_if_eq:nnTF {##1} {true}
{\def\jlreq@allowbreak@evenpage{}}
@@ -2273,7 +2274,7 @@
\jlreq@tempafalse
\def\jlreq@column@spanning{true}%
}{%
- \jlreq@switch{##1}{%
+ \str_case_e:nn {##1} {
{true}{\jlreq@tempafalse\def\jlreq@column@spanning{true}}
{false}{\jlreq@tempafalse\def\jlreq@column@spanning{false}}
}%
@@ -2303,20 +2304,20 @@
% ラベルありフォーマット:前
\edef\jlreq@pre@format@wlabel{%
\noexpand\noindent
- \expandonce{\jlreq@font}%
+ \exp_not:o {\jlreq@font}%
\ifnum 0\ifjlreq@second@text@indent@withlabel 1\fi\ifjlreq@subtitleindent@withlabel 1\fi>0
- \unexpanded{\setbox\jlreq@BlockHeading@start@label@box=\hbox}{\expandonce{\jlreq@label@format}}%
+ \unexpanded{\setbox\jlreq@BlockHeading@start@label@box=\hbox}{\exp_not:o {\jlreq@label@format}}%
\unexpanded{\xdef\jlreq@BlockHeading@start@labellength{\the\wd\jlreq@BlockHeading@start@label@box}}%
\unexpanded{\def\jlreq@BlockHeading@start@outputlabel{\box\jlreq@BlockHeading@start@label@box}}%
\else
\unexpanded{\xdef\jlreq@BlockHeading@start@labellength{0pt}}%
- \unexpanded{\def\jlreq@BlockHeading@start@outputlabel}{\expandonce{\jlreq@label@format}}%
+ \unexpanded{\def\jlreq@BlockHeading@start@outputlabel}{\exp_not:o {\jlreq@label@format}}%
\fi
}%
% ラベルなしフォーマット:前
\edef\jlreq@pre@format@wolabel{%
\noexpand\noindent
- \expandonce{\jlreq@font}%
+ \exp_not:o {\jlreq@font}%
\unexpanded{\xdef\jlreq@BlockHeading@start@labellength{0pt}}%
\unexpanded{\def\jlreq@BlockHeading@start@outputlabel}{}%
}%
@@ -2325,22 +2326,22 @@
\noexpand\jlreq@BlockHeading@start@outputlabel
\unexpanded{\inhibitglue\hbox{}}%
\ifdim\dimexpr\jlreq@after@label@space\relax=\dimexpr 0pt\relax\else
- \noexpand\hspace*{\noexpand\dimexpr\expandonce{\jlreq@after@label@space}\noexpand\relax}%
+ \noexpand\hspace*{\noexpand\dimexpr\exp_not:o {\jlreq@after@label@space}\noexpand\relax}%
\fi
}%
\edef\jlreq@heading@text@format@wlabel{%
\ifnum 0\ifdim\jlreq@second@heading@text@indent@wlabel=\dimexpr 0pt\relax\else 1\fi\ifjlreq@second@text@indent@withlabel 1\fi>0
- \unexpanded{\hangindent=\glueexpr}(\expandonce{\jlreq@second@heading@text@indent@wlabel})%
- \ifjlreq@second@text@indent@withlabel + (\expandonce{\jlreq@after@label@space}) + \unexpanded{\jlreq@BlockHeading@start@labellength}\fi
+ \unexpanded{\hangindent=\glueexpr}(\exp_not:o {\jlreq@second@heading@text@indent@wlabel})%
+ \ifjlreq@second@text@indent@withlabel + (\exp_not:o {\jlreq@after@label@space}) + \unexpanded{\jlreq@BlockHeading@start@labellength}\fi
\noexpand\relax
\fi
- \expandonce{\jlreq@heading@text@format}%
+ \exp_not:o {\jlreq@heading@text@format}%
}%
\edef\jlreq@heading@text@format@wolabel{%
\ifdim\dimexpr\jlreq@second@heading@text@indent@wolabel\relax=\dimexpr 0pt\relax\else
- \unexpanded{\hangindent=\dimexpr}\expandonce{\jlreq@second@heading@text@indent@wolabel}\noexpand\relax
+ \unexpanded{\hangindent=\dimexpr}\exp_not:o {\jlreq@second@heading@text@indent@wolabel}\noexpand\relax
\fi
- \expandonce{\jlreq@heading@text@format}%
+ \exp_not:o {\jlreq@heading@text@format}%
}%
% 副題:ラベルありかなしかはhangindentの扱いだけなので,他はまとめる
\def\jlreq@make@subtitle@format##1##2{%
@@ -2351,35 +2352,35 @@
\unexpanded{\nobreak\noindent}%
\else
\ifdim\jlreq@subtitle@indent=\dimexpr 0pt\relax\else
- \noexpand\hspace*{\expandonce{\jlreq@subtitle@indent}}%
+ \noexpand\hspace*{\exp_not:o {\jlreq@subtitle@indent}}%
\fi
\fi
- {\expandonce{\jlreq@subtitle@font}\expandonce{\jlreq@subtitle@format}}%
+ {\exp_not:o {\jlreq@subtitle@font}\exp_not:o {\jlreq@subtitle@format}}%
}%
}%
\jlreq@make@subtitle@format\jlreq@subtitle@format@wlabel{%
\ifjlreq@subtitleindent@withlabel
\noexpand\hangafter=0
- \unexpanded{\hangindent=\dimexpr}\noexpand\jlreq@BlockHeading@start@labellength + (\expandonce{\jlreq@after@label@space}) + (\expandonce{\jlreq@subtitle@indent})\noexpand\relax
+ \unexpanded{\hangindent=\dimexpr}\noexpand\jlreq@BlockHeading@start@labellength + (\exp_not:o {\jlreq@after@label@space}) + (\exp_not:o {\jlreq@subtitle@indent})\noexpand\relax
\else
\ifdim\jlreq@subtitle@indent=\dimexpr 0pt\relax\else
\noexpand\hangafter=0
- \unexpanded{\hangindent=\dimexpr}\expandonce{\jlreq@subtitle@indent}\noexpand\relax
+ \unexpanded{\hangindent=\dimexpr}\exp_not:o {\jlreq@subtitle@indent}\noexpand\relax
\fi
\fi
}%
\jlreq@make@subtitle@format\jlreq@subtitle@format@wolabel{%
\ifdim\jlreq@subtitle@indent=\dimexpr 0pt\relax\else
\noexpand\hangafter=0
- \unexpanded{\hangindent=\dimexpr}\expandonce{\jlreq@subtitle@indent}\noexpand\relax
+ \unexpanded{\hangindent=\dimexpr}\exp_not:o {\jlreq@subtitle@indent}\noexpand\relax
\fi
}%
\jlreq@heading@make@l@{#1}{#2}{\jlreq@label@format}%
- \eappto\jlreq@do{\expandonce{\jlreq@result}}%
+ \tl_put_right:Nx \jlreq@do {\exp_not:o {\jlreq@result}}%
\jlreq@BlockHeading@gyodori@parsekeyval*[BlockHeading:#1]{#3}{}{}{1}%
\let\jlreq@spaceset=\jlreq@result
\edef\jlreq@totalformat{\unexpanded{##1}}%
- \edef\jlreq@totalformat@after{\expandonce{\jlreq@afterindent}\noexpand\@afterheading}%
+ \edef\jlreq@totalformat@after{\exp_not:o {\jlreq@afterindent}\noexpand\@afterheading}%
\if@twocolumn
\str_if_eq:VnT \jlreq@column@spanning { true }{%
\def\@tempa##1##2##3{%
@@ -2394,7 +2395,7 @@
\jlreq@iffirsttoken{##2}{r}{}{\unexpanded{\vskip\glueexpr\baselineskip - \topskip\relax}}%
}]%
}{%
- \expandonce{\jlreq@totalformat}
+ \exp_not:o {\jlreq@totalformat}
}%
}%
}%
@@ -2403,30 +2404,30 @@
}%
\fi
\edef\jlreq@do{%
- \expandonce{\jlreq@do}%
- \noexpand\edef\expandonce{\csname jlreq@headingcs@#1\endcsname}{\noexpand\unexpanded{%
+ \exp_not:o {\jlreq@do}%
+ \noexpand\edef\exp_not:c {jlreq@headingcs@#1}{\noexpand\unexpanded{%
\noexpand\UseHook{jlreq/heading/before}%
\noexpand\UseHook{jlreq/heading/before/#1}%
- \expandonce{\jlreq@pagebreak}%
+ \exp_not:o {\jlreq@pagebreak}%
\tl_if_empty:NF \l__jlreq_pagestyle_tl { \exp_not:N \thispagestyle {\exp_not:o { \l__jlreq_pagestyle_tl } } }
\unexpanded{\jlreq@BlockHeading@start{#1}{#2}}%
- {{\expandonce{\jlreq@align}}{\expandonce{\jlreq@indent}}{\expandonce{\jlreq@end@indent}}\expandonce{\jlreq@spaceset}{\expandonce{\jlreq@allowbreak@evenpage}}}%
+ {{\exp_not:o {\jlreq@align}}{\exp_not:o {\jlreq@indent}}{\exp_not:o {\jlreq@end@indent}}\exp_not:o {\jlreq@spaceset}{\exp_not:o {\jlreq@allowbreak@evenpage}}}%
{\ifjlreq@number\else -\fi}%
{%
{%
- {\expandonce{\jlreq@label@format}}{\expandonce{\jlreq@label@format@modified}}%
- {\expandonce{\jlreq@heading@text@format@wlabel}}{\expandonce{\jlreq@heading@text@format@wolabel}}%
- {\expandonce{\jlreq@subtitle@format@wlabel}}{\expandonce{\jlreq@subtitle@format@wolabel}}%
+ {\exp_not:o {\jlreq@label@format}}{\exp_not:o {\jlreq@label@format@modified}}%
+ {\exp_not:o {\jlreq@heading@text@format@wlabel}}{\exp_not:o {\jlreq@heading@text@format@wolabel}}%
+ {\exp_not:o {\jlreq@subtitle@format@wlabel}}{\exp_not:o {\jlreq@subtitle@format@wolabel}}%
}%
{%
- {\expandonce{\jlreq@pre@format@wlabel}}{\expandonce{\jlreq@pre@format@wolabel}}%
- {\expandonce{\jlreq@format}}%
+ {\exp_not:o {\jlreq@pre@format@wlabel}}{\exp_not:o {\jlreq@pre@format@wolabel}}%
+ {\exp_not:o {\jlreq@format}}%
{}{}%
}%
}%
- {{}{\expandonce{\jlreq@totalformat}}{\expandonce{\jlreq@totalformat@after}}}%
+ {{}{\exp_not:o {\jlreq@totalformat}}{\exp_not:o {\jlreq@totalformat@after}}}%
}}%
- \noexpand\def\expandonce{\csname #1\endcsname}{\expandonce{\csname jlreq@headingcs@#1\endcsname}}%
+ \noexpand\def\exp_not:c {#1}{\exp_not:c {jlreq@headingcs@#1}}%
}%
\expandafter\endgroup
\jlreq@do
@@ -2486,8 +2487,8 @@
\expandafter\let\csname jlreq@BlockHeading@spaces@setlist@####1\endcsname=\@undefined
}%
}%
- \unexpanded{\def\jlreq@BlockHeading@spaces@headingslist}{\expandonce{\jlreq@tempa}}%
- \expandonce{\jlreq@tempb}%
+ \unexpanded{\def\jlreq@BlockHeading@spaces@headingslist}{\exp_not:o {\jlreq@tempa}}%
+ \exp_not:o {\jlreq@tempb}%
}%
\expandafter\endgroup
\jlreq@do
@@ -2511,22 +2512,22 @@
}%
\expandafter\jlreq@do\jlreq@totalset
\jlreq@SetBlockHeadingSpaces@iii{#2}%
- \eappto\jlreq@tempa{,\expandonce{\jlreq@headings}}% \jlreq@tempaに\jlreq@headingsを追加
+ \tl_put_right:Nx \jlreq@tempa {,\exp_not:o{\jlreq@headings}}% \jlreq@tempaに\jlreq@headingsを追加
\ifjlreq@tempb
\ifx\jlreq@lastdimen\@empty\else % 最後が寸法だったので\jlreq@SetBlockHeadingSpaces@totalsetを改変
\def\jlreq@do##1##2##3{%
- \edef\jlreq@totalset{{\unexpanded{##1}}{r:\expandonce{\jlreq@lastdimen}}{\unexpanded{##3}}}%
+ \edef\jlreq@totalset{{\unexpanded{##1}}{r:\exp_not:o {\jlreq@lastdimen}}{\unexpanded{##3}}}%
}%
\expandafter\jlreq@do\jlreq@totalset
\fi
\else
- \eappto\jlreq@set{{\expandonce{\jlreq@lastdimen}}}%
+ \tl_put_right:Nx \jlreq@set{{\exp_not:o {\jlreq@lastdimen}}}
\fi
- \eappto\jlreq@tempb{%
+ \tl_put_right:Nx \jlreq@tempb {%
\noexpand\@ifundefined{jlreq@BlockHeading@spaces@setlist@\jlreq@headings}{}{%
\noexpand\ClassError{jlreq}{The~spaces~for~\jlreq@headings\space is~defined~more~than~once~(in~SetBlockHeadingSpaces)}{\noexpand\@ehc}%
}%
- \noexpand\def\expandonce{\csname jlreq@BlockHeading@spaces@setlist@\jlreq@headings\endcsname}{{\expandonce{\jlreq@totalset}}\expandonce{\jlreq@set}}%
+ \noexpand\def\exp_not:c {jlreq@BlockHeading@spaces@setlist@\jlreq@headings}{{\exp_not:o {\jlreq@totalset}}\exp_not:o {\jlreq@set}}%
}%
\jlreq@SetBlockHeadingSpaces
}%
@@ -2553,7 +2554,7 @@
\clist_map_variable:nNn {#1} \@tempa {
\expandafter\jlreq@helper@trim\expandafter{\@tempa}{\@tempa}%
\str_if_eq:eeTF {\str_head:N \@tempa} {_} {
- \ifx\jlreq@lastdimen\@empty\else\eappto\jlreq@set{{\expandonce{\jlreq@lastdimen}}}\fi%
+ \ifx\jlreq@lastdimen\@empty\else\tl_put_right:Nx \jlreq@set {{\exp_not:o {\jlreq@lastdimen}}}\fi%
\def\jlreq@lastdimen{}%
\expandafter\jlreq@SetBlockHeadingSpaces@iv\@tempa{\jlreq@endmark}\jlreq@endmark
}{%
@@ -2561,11 +2562,11 @@
\ifjlreq@tempa
% 最初が寸法なので,全体の設定(\jlreq@totalset)に組み込む.
\def\jlreq@do##1##2##3{%
- \edef\jlreq@totalset{{r:\expandonce{\@tempa}}{\unexpanded{##2}}{\unexpanded{##3}}}%
+ \edef\jlreq@totalset{{r:\exp_not:o {\@tempa}}{\unexpanded{##2}}{\unexpanded{##3}}}%
}%
\expandafter\jlreq@do\jlreq@totalset
\else
- \ifx\jlreq@lastdimen\@empty\else\eappto\jlreq@set{{\expandonce{\jlreq@lastdimen}}}\fi
+ \ifx\jlreq@lastdimen\@empty\else\tl_put_right:Nx \jlreq@set {{\exp_not:o {\jlreq@lastdimen}}}\fi
\let\jlreq@lastdimen=\@tempa
\fi
}%
@@ -2583,21 +2584,21 @@
\@tempa#1%
\ClassWarning{jlreq}{The~heading~name~`\@gobble #1'~ends~with~`*'.~Do~you^mean~`_\@tempa{*}'?~(in~SetBlockHeadingSpaces)}%
}}{}%
- \appto\jlreq@headings{#1}%
+ \tl_put_right:Nn \jlreq@headings {#1}%
\jlreq@SetBlockHeadingSpaces@v
}
\def\jlreq@SetBlockHeadingSpaces@v#1{%
% 空っぽの場合は{_{r:0pt}{r:0pt}{}}
\jlreq@ifendmark{#1}{%
- \appto\jlreq@set{{_{r:0pt}{r:0pt}{}}}
+ \tl_put_right:Nn \jlreq@set {{_{r:0pt}{r:0pt}{}}}
\@gobble
}{%
\jlreq@iffirsttoken{#1}{*}{% *始まりの場合は{_*{}{}{}}
\expandafter\jlreq@BlockHeading@gyodori@parsekeyval\expandafter{\@gobble #1}{}{}{}%
- \eappto\jlreq@set{{_*\expandonce{\jlreq@result}}}%
+ \tl_put_right:Nx \jlreq@set{{_*\exp_not:o {\jlreq@result}}}%
}{% それ以外の場合は{_{}{}{}}
\jlreq@BlockHeading@gyodori@parsekeyval{#1}{}{}{}%
- \eappto\jlreq@set{{_\expandonce{\jlreq@result}}}%
+ \tl_put_right:Nx \jlreq@set{{_\exp_not:o {\jlreq@result}}}%
}%
\jlreq@SetBlockHeadingSpaces@vi
}%
@@ -2635,19 +2636,19 @@
\def\jlreq@BlockHeading@spaces@outputwospace@{%
\ifnum\jlreq@tempcnta<\jlreq@BlockHeading@spaces@current@count
\advance\jlreq@tempcnta by 1
- \eappto\jlreq@do{\csexpandonce{jlreq@BlockHeading@spaces@current@before@\the\jlreq@tempcnta}}%
+ \tl_put_right:Nx \jlreq@do {\exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@before@\the\jlreq@tempcnta}}%
\edef\jlreq@tempa{%
- \unexpanded{\long\def\jlreq@tempa##1}{\csexpandonce{jlreq@BlockHeading@spaces@current@format@\the\jlreq@tempcnta}}%
+ \unexpanded{\long\def\jlreq@tempa##1}{\exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@format@\the\jlreq@tempcnta}}%
}%
\jlreq@tempa
\edef\jlreq@tempb{%
- \noexpand\expandonce{\noexpand\jlreq@tempa{%
+ \noexpand\exp_not:o {\noexpand\jlreq@tempa{%
\noexpand\jlreq@BlockHeading@start@gyodori
- \csexpandonce{jlreq@BlockHeading@spaces@current@space@\the\jlreq@tempcnta}%
- {\csexpandonce{jlreq@BlockHeading@spaces@current@output@\the\jlreq@tempcnta}}%
+ \exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@space@\the\jlreq@tempcnta}%
+ {\exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@output@\the\jlreq@tempcnta}}%
}}%
}%
- \eappto\jlreq@do{\jlreq@tempb\csexpandonce{jlreq@BlockHeading@spaces@current@after@\the\jlreq@tempcnta}}%
+ \tl_put_right:Nx \jlreq@do {\jlreq@tempb\exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@after@\the\jlreq@tempcnta}}%
\expandafter\jlreq@BlockHeading@spaces@outputwospace@
\fi
}
@@ -2662,10 +2663,10 @@
\edef\jlreq@do{%
\ifjlreq@tempa
\unexpanded{\jlreq@BlockHeading@start@gyodori#1}{%
- \expandonce{\jlreq@result}%
+ \exp_not:o {\jlreq@result}%
}%
\else
- \expandonce{\jlreq@result}%
+ \exp_not:o {\jlreq@result}%
\fi
}%
\jlreq@BlockHeading@spaces@clear
@@ -2678,7 +2679,7 @@
\advance\jlreq@tempcnta by 1
\expandafter\jlreq@BlockHeading@spaces@output@@@\expandafter{\@gobble #1}%
}{%
- \appto\jlreq@result{\vskip\glueexpr #1\relax}%
+ \tl_put_right:Nn \jlreq@result {\vskip\glueexpr #1\relax}%
}%
\jlreq@BlockHeading@spaces@output@@
}%
@@ -2686,20 +2687,20 @@
\def\jlreq@BlockHeading@spaces@output@@@#1{%
\edef\jlreq@do{%
\noexpand\jlreq@BlockHeading@spaces@output@@@@
- \jlreq@iffirsttoken@ignorespaces{#1}{*}{{*}\expandonce{\@gobble #1}}{\unexpanded{{}#1}}%
- \csexpandonce{jlreq@BlockHeading@spaces@current@space@\the\jlreq@tempcnta}%
- {\csexpandonce{jlreq@BlockHeading@spaces@current@output@\the\jlreq@tempcnta}}%
+ \jlreq@iffirsttoken@ignorespaces{#1}{*}{{*}\exp_not:o {\@gobble #1}}{\unexpanded{{}#1}}%
+ \exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@space@\the\jlreq@tempcnta}%
+ {\exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@output@\the\jlreq@tempcnta}}%
}%
\jlreq@do
}
% #1: デフォルト値を使うならば*,#2#3#4が設定された値,#5#6#7がデフォルト値,#8は偶数ページの,#9が出力
\def\jlreq@BlockHeading@spaces@output@@@@#1#2#3#4#5#6#7#8{%
\edef\jlreq@tempa{%
- \unexpanded{\long\def\jlreq@tempa##1}{\csexpandonce{jlreq@BlockHeading@spaces@current@format@\the\jlreq@tempcnta}}%
+ \unexpanded{\long\def\jlreq@tempa##1}{\exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@format@\the\jlreq@tempcnta}}%
}%
\jlreq@tempa
\edef\jlreq@tempb{%
- \noexpand\expandonce{\noexpand\jlreq@tempa{%
+ \noexpand\exp_not:o {\noexpand\jlreq@tempa{%
\noexpand\jlreq@BlockHeading@start@gyodori
\jlreq@ifempty{#1}{\unexpanded{{#2}{#3}{#4}}}{%
{\jlreq@ifempty{#2}{\unexpanded{#5}}{\unexpanded{#2}}}%
@@ -2708,10 +2709,10 @@
}\unexpanded{{#8}}%
}}%
}%
- \eappto\jlreq@result{%
- \csexpandonce{jlreq@BlockHeading@spaces@current@before@\the\jlreq@tempcnta}%
+ \tl_put_right:Nx \jlreq@result {%
+ \exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@before@\the\jlreq@tempcnta}%
\jlreq@tempb
- \csexpandonce{jlreq@BlockHeading@spaces@current@after@\the\jlreq@tempcnta}%
+ \exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@after@\the\jlreq@tempcnta}%
}%
}
@@ -2742,7 +2743,7 @@
}
% {1 = 命令名}{2 = レベル}{3 = */-}{4 = running head}{5 = 見出し}
\long\def\jlreq@RuninHeading@start@#1#2#3[#4]#5{%
- \edef\jlreq@do{\unexpanded{\jlreq@RuninHeading@start@@{#1}{#2}{#3}{#4}{#5}}{\expandonce{\jlreq@RuninHeading@start@format@label}}{\expandonce{\jlreq@RuninHeading@start@format@wlabel}}{\expandonce{\jlreq@RuninHeading@start@format@wolabel}}}%
+ \edef\jlreq@do{\unexpanded{\jlreq@RuninHeading@start@@{#1}{#2}{#3}{#4}{#5}}{\exp_not:o {\jlreq@RuninHeading@start@format@label}}{\exp_not:o {\jlreq@RuninHeading@start@format@wlabel}}{\exp_not:o {\jlreq@RuninHeading@start@format@wolabel}}}%
\jlreq@do
}
% {1 = 命令名}{2 = レベル}{3 = *}{4 = running head}{5 = 見出し}{6 = ラベルフォーマット}{7 = ラベルありフォーマット}{8 = ラベルなしフォーマット}
@@ -2755,19 +2756,19 @@
\ifnum0\jlreq@ifempty{#3}{}{1}\ifnum #2>\c@secnumdepth 1\fi>0
\def\jlreq@tempa##1{#8}%
\else
- \appto\jlreq@do{\refstepcounter{#1}}%
+ \tl_put_right:Nn \jlreq@do {\refstepcounter{#1}}%
\def\jlreq@tempa##1{#7}%
\fi
\par}%
- \unexpanded{\eappto\jlreq@do}{%
+ \unexpanded{\tl_put_right:Nx \jlreq@do}{%
\unexpanded{\noexpand\everypar}{%
\unexpanded{%
\noexpand\if@noskipsec
\unexpanded{\global\@noskipsecfalse}%
\unexpanded{{\setbox\jlreq@tempboxa\lastbox}}%
\noexpand\begingroup
- \expandonce{\jlreq@tempa{#5}}%
- \expandonce{\csname jlreq@heading@maketoc@#1\endcsname}\unexpanded{{#3}{#6}{#4}}%
+ \exp_not:o {\jlreq@tempa{#5}}%
+ \exp_not:c {jlreq@heading@maketoc@#1}\unexpanded{{#3}{#6}{#4}}%
\noexpand\endgroup
\noexpand\inhibitglue
\noexpand\else
@@ -2848,7 +2849,7 @@
\cs_set:Nx \l__jlreq_do: {
\exp_not:o { \jlreq@result }
% パラメータトークンを含むので,\edefして\unexpandedで包む
- \noexpand\edef\expandonce{\csname #1\endcsname}{%
+ \noexpand\edef\exp_not:c {#1}{%
\noexpand\unexpanded{%
\exp_not:N \UseHook{jlreq/heading/before}%
\exp_not:N \UseHook{jlreq/heading/before/#1}
@@ -3010,10 +3011,10 @@
}
}
\cs_set:Nx \l_jlreq_do: {
- \exp_not:v { jlreq@heading@type@#1 }
+ \exp_args:Nc \exp_not:o { jlreq@heading@type@#1 }
{ \exp_not:n { #1 } }
- { \exp_not:v { jlreq@heading@level@#1 } }
- { \exp_not:v { jlreq@heading@setting@#1 },\exp_not:V \l_jlreq_tmpa_tl }
+ { \exp_args:Nc \exp_not:o { jlreq@heading@level@#1 } }
+ { \exp_args:Nc \exp_not:o { jlreq@heading@setting@#1 },\exp_not:V \l_jlreq_tmpa_tl }
}
\exp_after:wN \group_end:
\l_jlreq_do:
@@ -3022,7 +3023,7 @@
\NewDocumentCommand{\SaveHeading}{ m m }{%
\@ifundefined{jlreq@heading@setting@#1}{\ClassError{jlreq}{Unknown~heading:~#1}{\@ehc}}{}%
\edef#2{%
- \csexpandonce{jlreq@heading@type@#1}{\unexpanded{#1}}{\csexpandonce{jlreq@heading@level@#1}}{\csexpandonce{jlreq@heading@setting@#1}}%
+ \exp_args:Nc \exp_not:o {jlreq@heading@type@#1}{\unexpanded{#1}}{\exp_args:Nc \exp_not:o {jlreq@heading@level@#1}}{\exp_args:Nc \exp_not:o {jlreq@heading@setting@#1}}%
}%
}
@@ -3062,10 +3063,9 @@
%.. カウンターの定義(見出し本体はこのファイルの末尾で)
\setcounter{secnumdepth}{3}
\newcounter{part}
-\jlreq@switch{\jlreq@article@type}{
- {article}{\newcounter{section}}
- {\newcounter{chapter}\newcounter{section}[chapter]}% book, report
-}
+\str_if_eq:VnTF \jlreq@article@type { article }
+ { \newcounter{section} }
+ { \newcounter{chapter}\newcounter{section}[chapter] }
\newcounter{subsection}[section]
\newcounter{subsubsection}[subsection]
\newcounter{paragraph}[subsubsection]
@@ -3095,14 +3095,14 @@
% 後ろ側に始め括弧類(cl-01)が配置される場合を除いて,ベタ組(4.2.3,二つ目のc,三つ目のb).
\def\jlreq@hook@postnote{\futurelet\jlreq@nextchar\jlreq@postnote@checkopenbracket}%
\def\@tempa{}
- \def\jlreq@do##1{\jlreq@ifendmark{##1}{}{\appto\@tempa{\ifx\jlreq@tempb##11\fi}\jlreq@do}}
+ \def\jlreq@do##1{\jlreq@ifendmark{##1}{}{\tl_put_right:Nn \@tempa {\ifx\jlreq@tempb##11\fi}\jlreq@do}}
\expandafter\jlreq@do\jlreq@charlist@openingbrackets\jlreq@endmark
\edef\jlreq@postnote@checkopenbracket{%
\unexpanded{%
\jlreq@getfirsttoken@expandmacros{\jlreq@nextchar}{\jlreq@tempa}%
\expandafter\let\expandafter\jlreq@tempb\jlreq@tempa
}%
- \noexpand\jlreq@if{\noexpand\ifnum 0\expandonce{\@tempa}>0~\noexpand\fi}{}{\noexpand\inhibitglue}%
+ \noexpand\jlreq@if{\noexpand\ifnum 0\exp_not:o {\@tempa}>0~\noexpand\fi}{}{\noexpand\inhibitglue}%
}
},
reference_mark / interlinear .code:n = {
@@ -3199,7 +3199,7 @@
}{
\def\jlreq@makefntext{\addtolength{\leftskip}{\glueexpr #1\relax}}
}
- \long\edef\jlreq@makefntext##1{\expandonce{\jlreq@makefntext}%
+ \long\edef\jlreq@makefntext##1{\exp_not:o {\jlreq@makefntext}%
\unexpanded{%
\addtolength{\leftskip}{\jlreq@footnoteindent}%
\parindent=1\jlreq@zw
@@ -3265,7 +3265,7 @@
\expandafter\gdef\expandafter\jlreq@footnote@delayfootnoteslist\expandafter{\expandafter}%
\jlreq@footnote@delayfootnoteslist
}
- \preto\@opcol{\jlreq@hook@@opcol}
+ \tl_put_left:Nn \@opcol{\jlreq@hook@@opcol}
% \jlreq@footnote@delayfootnote@delay#1#2:#1ページ目に#2を出す
% \jlreq@footnote@delayfootnote@page:何ページ目に\footnotetextを入れるかを\jlreq@resultcntに入れる.その場での場合は-1.
\if@twocolumn
@@ -3286,7 +3286,7 @@
\long\def\jlreq@footnote@delayfootnote@delay#1#2{%
% 二段組みの場合は上段を組んだ直後に\footnotetextを挿入(そのページの下段に入る)
\jlreq@if{\ifnum 0\if@firstcolumn\else 1\fi\ifnum#1>\value{page}1\fi>0~\fi}{%
- \xappto\jlreq@footnote@delayfootnoteslist{\unexpanded{\jlreq@footnote@delayfootnote{#1}{#2}}}%
+ \tl_gput_right:Nx \jlreq@footnote@delayfootnoteslist {\exp_not:n { \jlreq@footnote@delayfootnote{#1}{#2} } }
}{#2}%
}
\else
@@ -3301,13 +3301,13 @@
\long\def\jlreq@footnote@delayfootnote@delay#1#2{%
% 一段組の場合はその前のページを組んだ直後に\footnotetextを挿入.
\jlreq@if{\ifnum\numexpr#1 - 1\relax>\value{page}~\fi}{%
- \xappto\jlreq@footnote@delayfootnoteslist{\unexpanded{\jlreq@footnote@delayfootnote{#1}{#2}}}%
+ \tl_gput_right:Nx \jlreq@footnote@delayfootnoteslist { \exp_not:n {\jlreq@footnote@delayfootnote{#1}{#2} } }
}{#2}%
}
\fi
\long\def\jlreq@footnote@delayfootnote@immediate#1#2{%
\jlreq@if{\ifnum #1<\jlreq@currentpage\relax\fi}{%
- \xappto\jlreq@footnote@delayfootnoteslist{\unexpanded{\jlreq@footnote@delayfootnote{#1}{#2}}}%
+ \tl_gput_right:Nx \jlreq@footnote@delayfootnoteslist{ \exp_not:n { \jlreq@footnote@delayfootnote{#1}{#2} } }
}{#2}%
}
\let\jlreq@footnote@delayfootnote=\jlreq@footnote@delayfootnote@delay
@@ -3321,7 +3321,7 @@
}%
}
\AtEndDocument{\jlreq@footnote@flushdelayfootnoteslist}
- \preto\newpage{\jlreq@footnote@flushdelayfootnoteslist}
+ \tl_put_left:Nn \newpage {\jlreq@footnote@flushdelayfootnoteslist}
\long\def\jlreq@footnote@impl@woption#1#2#3[#4]#5{%
\jlreq@footnote@delayfootnote@page
\begingroup
@@ -3331,10 +3331,10 @@
\def\jlreq@result{}#3[#4]{#5}%
\jlreq@restore@jlreq@footnotes}%
\int_compare:nTF { \jlreq@resultcnt=-1 }{\noexpand\jlreq@result}{\unexpanded{%
- \xappto\jlreq@footnote@delayfootnoteslist{%
+ \tl_gput_right:Nx \jlreq@footnote@delayfootnoteslist {%
\noexpand\jlreq@footnote@delayfootnote{\the\jlreq@resultcnt}{%
\noexpand\jlreq@restore@original@footnotes
- \expandonce{\jlreq@result}%
+ \exp_not:o {\jlreq@result}%
\noexpand\jlreq@restore@jlreq@footnotes
}%
}%
@@ -3351,10 +3351,10 @@
\unexpanded{\def\jlreq@result{}#2}[\the\value{footnote}]\noexpand\jlreq@result
\unexpanded{\def\jlreq@result{}#3}[\the\value{footnote}]\unexpanded{{#4}}%
\jlreq@if{\ifnum\jlreq@resultcnt=-1~\fi}{\noexpand\jlreq@result}{\unexpanded{%
- \xappto\jlreq@footnote@delayfootnoteslist{%
+ \tl_gput_right:Nx \jlreq@footnote@delayfootnoteslist {%
\noexpand\jlreq@footnote@delayfootnote{\the\jlreq@resultcnt}{%
\noexpand\jlreq@restore@original@footnotes
- \expandonce{\jlreq@result}%
+ \exp_not:o {\jlreq@result}%
\noexpand\jlreq@restore@jlreq@footnotes
}%
}%
@@ -3401,13 +3401,28 @@
\newdimen\jlreq@endnote@indent
% 現在の後注一覧を,\jlreq@endnote@textsに{{合印1}{後注1}}{{合印2}{後注2}}...の形で保持する
\def\jlreq@endnote@texts{}
-\long\def\jlreq@endnote@addtext#1#2{\xappto\jlreq@endnote@texts{\unexpanded{{{#1}{#2}}}}}
+\long\def\jlreq@endnote@addtext#1#2{\tl_gput_right:Nx \jlreq@endnote@texts { \exp_not:n {{{#1}{#2}}} } }
% \endnote自身は後で定義する
-\def\jlreq@endnote@impl{\jlreq@hook@prenote\@ifnextchar[{\jlreq@endnote}{\jlreq@endnote[]}}
-\def\endnotemark{\jlreq@hook@prenote\@ifnextchar[{\jlreq@endnotemark}{\jlreq@endnotemark[]}}
-\def\endnotetext{\@ifnextchar[{\jlreq@endnotetext}{\jlreq@endnotetext[]}}
-\long\def\jlreq@endnote[#1]#2{\jlreq@endnotemark[#1]\@endnotetext{#2}\jlreq@hook@postnote}
-\def\jlreq@endnotemark[#1]{%
+\NewHook{cmd/endnote/before}
+\NewHook{cmd/endnote/after}
+\NewHook{cmd/endnotemark/before}
+\NewHook{cmd/endnotemark/after}
+\NewDocumentCommand { \endnotemark }{ O{} } {
+ \jlreq@hook@prenote
+ \UseHook{cmd/endnote/before}
+ \jlreq@endnotemark{#1}
+ \UseHook{cmd/endnote/after}
+ \jlreq@hook@postnote
+}
+\NewDocumentCommand { \endnotetext } { O{} +m } { \jlreq@endnotetext{#1}{#2} }
+\long\def\jlreq@endnote#1#2{
+ \jlreq@hook@prenote
+ \UseHook{ cmd/endnote/before }
+ \jlreq@endnotemark{#1}\@endnotetext{#2}
+ \UseHook{ cmd/endnote/after }
+ \jlreq@hook@postnote
+}
+\def\jlreq@endnotemark#1{%
\jlreq@ifempty{#1}{%
\stepcounter{\jlreq@endnotecounter}%
\expandafter\protected@xdef\csname\jlreq@endnotemarkname\endcsname{\csname the\jlreq@endnotecounter\endcsname}%
@@ -3418,10 +3433,9 @@
\endgroup
}%
\@endnotemark
- \jlreq@hook@postnote
}
\jlreq@setdefaultnotemark\@endnotemark\@makeendmark
-\long\def\jlreq@endnotetext[#1]#2{%
+\long\def\jlreq@endnotetext#1#2{%
\jlreq@ifempty{#1}{%
\expandafter\protected@xdef\csname\jlreq@endnotemarkname\endcsname{\csname the\jlreq@endnotecounter\endcsname}%
}{%
@@ -3502,35 +3516,39 @@
\jlreq@tempafalse % headingsが指定された
\jlreq@tempbfalse % paragraphが指定された
% \jlreq@tempcにセクション名たちを入れていく
- \def\jlreq@tempc{}
+ \seq_clear:N \l_jlreq_tmpa_seq
\clist_map_variable:nNn {#1} \jlreq@tempa {
- \expandafter\jlreq@helper@trim\expandafter{\jlreq@tempa}{\jlreq@tempa}%
- \jlreq@switch{\jlreq@tempa}{
+ \tl_set:Nx \@tempa { \tl_trim_spaces:o \@tempa }
+ \str_case_e:nnF {\jlreq@tempa} {
{headings}{\jlreq@tempatrue}
{paragraph}{
\jlreq@tempatrue% _paragraphの時は_headingsも有効にする
\jlreq@tempbtrue
}
- {
- \str_if_eq:eeTF { \str_head:N \jlreq@tempa } {_} {
- \edef\jlreq@tempc{\jlreq@tempc,\expandafter\@gobble\jlreq@tempa}
- }{
- \ClassError{jlreq}{Invalid~value~\jlreq@tempa\space in~endnote_position}{\@ehc}
- }
+ }{
+ \str_if_eq:eeTF { \str_head:N \jlreq@tempa } {_} {
+ \seq_put_left:Nx \l_jlreq_tmpa_seq { \tl_tail:N \jlreq@tempa }
+ }{
+ \ClassError{jlreq}{Invalid~value~\jlreq@tempa\space in~endnote_position}{\@ehc}
}
}
}
\ifjlreq@tempb
- \edef\endnote{\unexpanded{\def\par{\@restorepar\theendnotes\par}}\expandonce{\jlreq@endnote@impl}}
+ \DeclareDocumentCommand { \endnote } { O{} +m } {
+ \AddToHookNext { para/after } { \theendnotes }
+ \jlreq@endnote{##1}{##2}
+ }
\else
- \let\endnote=\jlreq@endnote@impl
+ \DeclareDocumentCommand { \endnote } { O{} +m } {
+ \jlreq@endnote{##1}{##2}
+ }
\fi
\ifjlreq@tempa
\AddToHook{jlreq/heading/before}[jlreq/endnote]{\theendnotes}
\else
- \clist_map_variable:NNn \jlreq@tempc \@tempa {
+ \seq_map_variable:NNn \l_jlreq_tmpa_seq \@tempa {
\tl_if_empty:VF \@tempa {
\AddToHook{jlreq/heading/before/\@tempa}[jlreq/endnote]{}
\RemoveFromHook{jlreq/heading/before/\@tempa}[jlreq/endnote]
@@ -3551,8 +3569,11 @@
% (1) では\sidenote[]{}を定義
% (2) では\sidenote{見出し}{注中身}を定義
% sidenote_length>0ptの時のみ定義する
-\jlreq@if{\ifdim\jlreq@sidenote@length>0pt\relax\fi}
-{
+\dim_compare:nT { \jlreq@sidenote@length > 0pt } {
+ \ProvideHook{ cmd/sidenote/before }
+ \ProvideHook{ cmd/sidenote/after }
+ \ProvideHook{ cmd/sidenotemark/before }
+ \ProvideHook{ cmd/sidenotemark/after }
\def\jlreq@sidenotemarkname{@thefnmark}% 合印用番号を一時的に入れるマクロ名
\long\def\@sidenotetext#1{%
\marginpar{\reset@font\footnotesize
@@ -3569,12 +3590,20 @@
\def\jlreq@sidenote@type{number}
\__jlreq_jlreqsetup_addtofinally:n {
\str_if_eq:VnT \jlreq@sidenote@type { number } {
- \def\sidenote{\jlreq@hook@prenote\@ifnextchar[{\jlreq@sidenote}{\jlreq@sidenote[]}}
- \def\sidenotemark{\jlreq@hook@prenote\@ifnextchar[{\jlreq@sidenotemark}{\jlreq@sidenotemark[]}}
- \def\sidenotetext{\@ifnextchar[{\jlreq@sidenotetext}{\jlreq@sidenotetext[]}}
- \long\def\jlreq@sidenote[#1]#2{\jlreq@sidenotemark[#1]\@sidenotetext{#2}\jlreq@hook@postnote}
- \def\jlreq@sidenotemark[#1]{%
- \jlreq@ifempty{#1}{%
+ \DeclareDocumentCommand { \sidenote } { O{} +m } {
+ \jlreq@hook@prenote\UseHook{cmd/sidenote/before}
+ \jlreq@sidenote{#1}{#2}
+ \UseHook{cmd/sidenote/after}\jlreq@hook@postnote
+ }
+ \DeclareDocumentCommand { \sidenotemark } { O{} } {
+ \jlreq@hook@prenote\UseHook{cmd/sidenotemark/before}
+ \jlreq@sidenotemark{#1}
+ \UseHook{cmd/sidenotemark/after}\jlreq@hook@postnote
+ }
+ \DeclareDocumentCommand { \sidenotetext } { O{} +m } { \jlreq@sidenotetext{#1}{#2} }
+ \long\def\jlreq@sidenote#1#2{\jlreq@sidenotemark{#1}\@sidenotetext{#2}}
+ \def\jlreq@sidenotemark#1{%
+ \tl_if_empty:nTF{#1}{%
\stepcounter{\jlreq@sidenotecounter}%
\expandafter\protected@xdef\csname\jlreq@sidenotemarkname\endcsname{\csname the\jlreq@sidenotecounter\endcsname}%
}{%
@@ -3584,10 +3613,9 @@
\endgroup
}%
\@sidenotemark
- \jlreq@hook@postnote
}
- \long\def\jlreq@sidenotetext[#1]#2{%
- \jlreq@ifempty{#1}{%
+ \long\def\jlreq@sidenotetext#1#2{%
+ \tl_if_empty:nTF{#1}{%
\expandafter\protected@xdef\csname\jlreq@sidenotemarkname\endcsname{\csname the\jlreq@sidenotecounter\endcsname}%
}{%
\begingroup
@@ -3607,15 +3635,15 @@
\let\@makesidemark=\@makefnmark
}
\str_if_eq:VnT \jlreq@sidenote@type { symbol } {% sidenote_type = symbol
- \long\def\sidenote#1#2{\jlreq@sidenote{#1}{#2}}
- \def\sidenotemark#1{\jlreq@sidenotemark{#1}}
- \long\def\sidenotetext#1#2{\jlreq@sidenotetext{#1}{#2}}
+ \DeclareDocumentCommand { \sidenote } { m +m } { \UseHook{cmd/sidenote/before}\jlreq@sidenote{#1}{#2}\UseHook{cmd/sidenote/after} }
+ \DeclareDocumentCommand { \sidenotemark } { m } { \UseHook{cmd/sidenotemark/before}\jlreq@sidenotemark{#1}\UseHook{cmd/sidenote/after} }
+ \DeclareDocumentCommand { \sidenotetext } { m +m } { \jlreq@sidenotetext{#1}{#2} }
\long\def\jlreq@sidenote#1#2{\jlreq@sidenotemark{#1}\jlreq@sidenotetext{#1}{#2}}
\edef\jlreq@sidenotemark#1{%
{\unexpanded{\reset@font\jlreq@sidenote@keywordfont}#1}%
\noexpand\jlreq@hook@prenote
\ifx\jlreq@sidenote@defaultmark\@empty\else
- \expandafter\edef\expandonce{\csname\jlreq@sidenotemarkname\endcsname}{\expandonce{\jlreq@sidenote@defaultmark}}%
+ \expandafter\edef\exp_not:c {\jlreq@sidenotemarkname}{\exp_not:o {\jlreq@sidenote@defaultmark}}%
\noexpand\@sidenotemark
\fi
}
@@ -3626,14 +3654,11 @@
}
\long\def\@makesidetext#1{{\sffamily\gtfamily\bfseries\csname\jlreq@sidenotemarkname\endcsname}\hspace*{1\jlreq@mol}#1}
\let\@makesidemark=\@makefnmark
-
- \apptocmd{\sidenote}{\jlreq@hook@postnote}{}{}
- \apptocmd{\sidenotemark}{\jlreq@hook@postnote}{}{}
}
}
\keys_define:nn { jlreqsetup } { sidenote_symbol .tl_set:N = \jlreq@sidenote@defaultmark }
\keys_define:nn { jlreqsetup } { sidenote_keyword_font .tl_set:N = \jlreq@sidenote@keywordfont }
-}{}
+}
%.. 割注(3.4)
\def\inlinenotesize{.6\jlreq@jafontsize} % 割注の文字サイズ
@@ -3956,9 +3981,9 @@
% #1のleftとrightを入れ替えて#1に代入
\def\jlreq@reverse@leftright#1{%
- \jlreq@switch{#1}{
- {left}{\def#1{right}}
- {right}{\def#1{left}}
+ \str_case_e:nn {#1} {
+ { left }{ \def#1{right} }
+ { right }{ \def#1{left} }
}%
}
@@ -4015,13 +4040,14 @@
}%
}%
\edef\jlreq@headingname{\expandafter\@gobble#1}% 見出し命令名
- \edef\jlreq@tempa{\noexpand\@removeelement{\expandonce{\jlreq@headingname}}}%
+ \edef\jlreq@tempa{\noexpand\@removeelement{\exp_not:o {\jlreq@headingname}}}%
\expandafter\jlreq@tempa\expandafter{#5}{#5}%
\@ifundefined{#4@\jlreq@headingname}{\expandafter\def\csname #4@\jlreq@headingname\endcsname{}}{}%
- \eappto\jlreq@do{%
- \noexpand\let\expandonce{\csname\expandafter\@gobble\string #1@heading@level\endcsname}=\expandonce{\csname jlreq@heading@level@\jlreq@headingname\endcsname}%
- \unexpanded{\def#5}{\expandonce{#5},\expandonce{\jlreq@headingname}}%
- \noexpand\appto\expandonce{\csname #4@\jlreq@headingname\endcsname}{{{\int_compare:nT {#2=0} {#3}}{#2}{\ifx r\jlreq@leftright r\else l\fi}}}%
+ \tl_put_right:Nx \jlreq@do {%
+ \exp_not:N \@ifundefined {#4@\jlreq@headingname} { \exp_not:N \@namedef {#4@\jlreq@headingname} {} } {}
+ \noexpand\let\exp_not:c {\expandafter\@gobble\string #1@heading@level}=\exp_not:c {jlreq@heading@level@\jlreq@headingname}%
+ \exp_not:n {\def#5}{\exp_not:o {#5},\exp_not:o {\jlreq@headingname}}%
+ \exp_not:N \tl_put_right:Nn \exp_not:c {#4@\jlreq@headingname} {{{\int_compare:nT {#2=0} {#3}}{#2}{\ifx r\jlreq@leftright r\else l\fi}}}%
}%
}{\def\jlreq@do{}}%
\expandafter\endgroup
@@ -4043,28 +4069,32 @@
% leftを設定する時は対応するrightを空にする.
\expandafter\ifx\csname jlreq@leftmark@0\endcsname\@empty
\expandafter\ifx\csname jlreq@rightmark@0\endcsname\@empty\else
- \eappto\jlreq@do{\jlreq@ifempty{#1}{\noexpand\markright}{\noexpand\jlreq@markright}{\csexpandonce{jlreq@rightmark@0}}}%
+ \tl_put_right:Nx \jlreq@do {
+ \jlreq@ifempty{#1}{\noexpand\markright}{\noexpand\jlreq@markright}{\exp_args:Nc \exp_not:o {jlreq@rightmark@0}}
+ }%
\fi
\else
- \eappto\jlreq@do{\jlreq@ifempty{#1}{\noexpand\markboth}{\noexpand\jlreq@markboth}{\csexpandonce{jlreq@leftmark@0}}{\csexpandonce{jlreq@rightmark@0}}}%
+ \tl_put_right:Nx \jlreq@do {
+ \jlreq@ifempty{#1}{\noexpand\markboth}{\noexpand\jlreq@markboth}{\exp_args:Nc \exp_not:o {jlreq@leftmark@0}}{\exp_args:Nc \exp_not:o {jlreq@rightmark@0}}
+ }%
\fi
\clist_map_variable:nNn {1,2} \jlreq@i {
\expandafter\ifx\csname jlreq@leftmark@\jlreq@i\endcsname\@empty
\expandafter\ifx\csname jlreq@rightmark@\jlreq@i\endcsname\@empty\else
- \eappto\jlreq@do{\noexpand\jlreq@setextrarightmark{\jlreq@i}{\csexpandonce{jlreq@rightmark@\jlreq@i}}}%
+ \tl_put_right:Nx \jlreq@do {\noexpand\jlreq@setextrarightmark{\jlreq@i}{\exp_args:Nc \exp_not:o {jlreq@rightmark@\jlreq@i}}}%
\fi
\else
- \eappto\jlreq@do{%
- \noexpand\jlreq@setextraleftmark{\jlreq@i}{\csexpandonce{jlreq@leftmark@\jlreq@i}}%
- \noexpand\jlreq@setextrarightmark{\jlreq@i}{\csexpandonce{jlreq@rightmark@\jlreq@i}}%
+ \tl_put_right:Nx \jlreq@do{%
+ \noexpand\jlreq@setextraleftmark{\jlreq@i}{\exp_args:Nc \exp_not:o {jlreq@leftmark@\jlreq@i}}%
+ \noexpand\jlreq@setextrarightmark{\jlreq@i}{\exp_args:Nc \exp_not:o {jlreq@rightmark@\jlreq@i}}%
}%
\fi
}%
\ifx\jlreq@do\@empty\else
\edef\jlreq@do{%
\unexpanded{\edef\jlreq@result}{\noexpand\unexpanded{%
- \noexpand\def\expandonce{\csname #2mark\endcsname}\unexpanded{##1}{%
- \expandonce{\jlreq@do}%
+ \noexpand\def\exp_not:c {#2mark}\unexpanded{##1}{%
+ \exp_not:o {\jlreq@do}%
}}%
}%
}%
@@ -4079,8 +4109,8 @@
\def\jlreq@pagestyle@make@headingmark@@#1#2#3#4#5{%
% \jlreq@tempbに\***markの定義を入れる
\edef\jlreq@tempb{%
- \expandonce{\csname the#1\endcsname}%
- \noexpand\ifx\expandonce{\csname the#1\endcsname}\unexpanded{\@empty\else\protect\quad\fi}%
+ \exp_not:c {the#1}%
+ \noexpand\ifx\exp_not:c {the#1}\unexpanded{\@empty\else\protect\quad\fi}%
\unexpanded{##1}%
}%
\jlreq@parsekeyval@nokey{%
@@ -4088,9 +4118,9 @@
\str_if_eq:nnT {##1} {_#1} {\edef\jlreq@tempb{\unexpanded{##2}}}%
}{#2}%
\ifx l#5%
- \expandafter\edef\csname jlreq@leftmark@#4\endcsname{\expandonce{\jlreq@tempb}}%
+ \expandafter\edef\csname jlreq@leftmark@#4\endcsname{\exp_not:o {\jlreq@tempb}}%
\else
- \expandafter\edef\csname jlreq@rightmark@#4\endcsname{\expandonce{\jlreq@tempb}}%
+ \expandafter\edef\csname jlreq@rightmark@#4\endcsname{\exp_not:o {\jlreq@tempb}}%
\fi
\jlreq@pagestyle@make@headingmark@{#1}{#2}%
}
@@ -4098,7 +4128,7 @@
% #2 #3 #4と並んだヘッダを作り#1に入れる.#1,#2,#3はコンロトールシークエンスの名前とする.
\def\jlreq@pagestyle@setheadfoot#1#2#3#4{%
\begingroup
- \edef\jlreq@do{\noexpand\jlreq@pagestyle@setheadfoot@{\unexpanded{#1}}{\csexpandonce{#2}}{\csexpandonce{#3}}{\csexpandonce{#4}}}%
+ \edef\jlreq@do{\noexpand\jlreq@pagestyle@setheadfoot@{\unexpanded{#1}}{\exp_args:Nc \exp_not:o {#2}}{\exp_args:Nc \exp_not:o {#3}}{\exp_args:Nc \exp_not:o {#4}}}%
\expandafter\endgroup
\jlreq@do
}
@@ -4114,13 +4144,13 @@
% +\topskip - \Chtは\jlreq@headfoot@sidemargin = 0ptの時に本文の右に一致させるための補正.
\jlreq@ifempty{#4}{\def\jlreq@right{}}{\edef\jlreq@right{\unexpanded{#4}\jlreq@pagestyle@hskip{\jlreq@expand@speciallength{\jlreq@headfoot@sidemargin}\if@tate + \topskip - \Cht\fi}}}%
\jlreq@ifempty{#3}{%
- \edef\jlreq@do{\unexpanded{\def#1}{\expandonce{\jlreq@left}\hfil\expandonce{\jlreq@right}}}%
+ \edef\jlreq@do{\unexpanded{\def#1}{\exp_not:o {\jlreq@left}\hfil\exp_not:o {\jlreq@right}}}%
\jlreq@ifempty{#2}{\jlreq@ifempty{#4}{\def\jlreq@do{\def#1{}}}{}}{}%
}{% #3を完全に真ん中に配置するために左右の幅を0にしておく
- \ifx\jlreq@left\@empty\else\edef\jlreq@left{\noexpand\hbox to 0pt{\expandonce{\jlreq@left}\noexpand\hss}}\fi
- \ifx\jlreq@right\@empty\else\edef\jlreq@right{\noexpand\hbox to 0pt{\noexpand\hss\expandonce{\jlreq@right}}}\fi
+ \ifx\jlreq@left\@empty\else\edef\jlreq@left{\noexpand\hbox to 0pt{\exp_not:o {\jlreq@left}\noexpand\hss}}\fi
+ \ifx\jlreq@right\@empty\else\edef\jlreq@right{\noexpand\hbox to 0pt{\noexpand\hss\exp_not:o {\jlreq@right}}}\fi
\edef\jlreq@do{%
- \unexpanded{\def#1}{\expandonce{\jlreq@left}\hfil\unexpanded{#3}\hfil\expandonce{\jlreq@right}}%
+ \unexpanded{\def#1}{\exp_not:o {\jlreq@left}\hfil\unexpanded{#3}\hfil\exp_not:o {\jlreq@right}}%
}%
}%
\expandafter\endgroup
@@ -4142,7 +4172,7 @@
\ifx#1\@empty\else
\edef#1{%
\jlreq@ifempty{#2}{}{\unexpanded{\hskip-\dimexpr #2\relax}}%
- \expandonce{#1}%
+ \exp_not:o {#1}%
\jlreq@ifempty{#3}{}{\unexpanded{\hskip-\dimexpr #3\relax}}%
}%
\fi
@@ -4150,7 +4180,7 @@
% #1が空かつ#4が空でないならば#2に#3と#4の中身を追加し,#4を空にする.引数は全てコントロールシークエンス
\def\jlreq@pagestyle@addifempty#1#2#3#4{%
- \ifx#1\@empty\ifx#4\@empty\else\eappto#2{\expandonce{#3}\expandonce{#4}}\def#4{}\fi\fi
+ \ifx#1\@empty\ifx#4\@empty\else\tl_put_right:Nx #2{ \exp_not:o {#3}\exp_not:o {#4} }\def#4{}\fi\fi
}
\newif\ifjlreq@PageStyle@first
@@ -4161,23 +4191,23 @@
\jlreq@if{\expandafter\ifx\csname #1\endcsname\@empty\fi}{}{%
\edef\jlreq@do{%
\noexpand\jlreq@tempatrue % 最初の処理かフラグ
- \unexpanded{\jlreq@pagestyle@make@runninghead@{#1}{#2}{#3}}\csexpandonce{#1}\noexpand\jlreq@endmark
+ \unexpanded{\jlreq@pagestyle@make@runninghead@{#1}{#2}{#3}}\exp_args:Nc \exp_not:o {#1}\noexpand\jlreq@endmark
}%
\expandafter\def\csname #1\endcsname{}%
\jlreq@do
% 項目が二つ以上あった.
- \ifjlreq@tempa\else\cspreto{#1}{\jlreq@PageStyle@firsttrue}\fi
+ \ifjlreq@tempa\else\tl_put_left:cn {#1} {\jlreq@PageStyle@firsttrue} \fi
}%
}
\def\jlreq@pagestyle@make@runninghead@#1#2#3#4#5{%
\jlreq@if{\ifnum\numexpr\jlreq@ifendmark{#5}{1}{0}*\ifjlreq@tempa 1\else 0\fi\relax=1~\fi}{%
% 項目が一つしか無い
- \jlreq@ifempty{#2}{\csappto}{\cspreto}{#1}{#4}%
+ \jlreq@ifempty{#2}{\tl_put_right:cn}{\tl_put_left:cn}{#1}{#4}%
}{%
% 最初の空でない柱に出会うまでは柱の間の空白を入れない.
% 空でない柱に出会ってないならば\ifjlreq@PageStyle@firstはtrue.
% 一番最初の\jlreq@PageStyle@firsttrueは後で入れる.
- \jlreq@ifempty{#2}{\csappto}{\cspreto}{#1}{%
+ \jlreq@ifempty{#2}{\tl_put_right:cn}{\tl_put_left:cn}{#1}{%
\protected@edef\jlreq@tempa{#4}%
\ifx\jlreq@tempa\@empty\else
\ifjlreq@PageStyle@first\else\hskip\glueexpr#3\relax\fi
@@ -4194,8 +4224,8 @@
\def\jlreq@pagestyle@applyformat#1#2#3{%
% デフォルト時に限り,\hbox to ***{空トークン}を避ける
\ifnum 0\ifx#1\@empty\else 1\fi\ifx#2\relax\else 1\fi>0
- \edef\jlreq@do{\unexpanded{\def\jlreq@tempa##1}{\ifx#2\relax\expandonce{#3}\else\expandonce{#2}\fi}}\jlreq@do
- \edef#1{\expandafter\expandonce\expandafter{\expandafter\jlreq@tempa\expandafter{#1}}}%
+ \edef\jlreq@do{\unexpanded{\def\jlreq@tempa##1}{\ifx#2\relax\exp_not:o {#3}\else\exp_not:o {#2}\fi}}\jlreq@do
+ \edef#1{\expandafter\exp_not:o \expandafter{\expandafter\jlreq@tempa\expandafter{#1}}}%
\fi
}
@@ -4203,20 +4233,20 @@
\def\jlreq@pagestyle@addfont@tocs#1#2{%
\expandafter\ifx\csname #1\endcsname\@empty\else
\expandafter\ifx\csname #2\endcsname\@empty\else
- \expandafter\edef\csname #1\endcsname{{\csexpandonce{#2}\csexpandonce{#1}}}%
+ \expandafter\edef\csname #1\endcsname{{\exp_args:Nc \exp_not:o {#2}\exp_args:Nc \exp_not:o {#1}}}%
\fi
\fi
}
% こちらは#1にトークン列を与える.\edefで展開される.制御綴名#3に代入.
\def\jlreq@pagestyle@addfont@totokens#1#2#3{%
\begingroup
- \edef\jlreq@do{\noexpand\edef\expandonce{\csname#3\endcsname}{\unexpanded{#1}}}%
+ \edef\jlreq@do{\noexpand\edef\exp_not:c {#3}{\unexpanded{#1}}}%
\expandafter\ifx\csname #2\endcsname\@empty\else
\edef\jlreq@tempa{#1}%
\ifx\jlreq@tempa\@empty\else
\edef\jlreq@do{%
- \noexpand\edef\expandonce{\csname #3\endcsname}{\noexpand\unexpanded{%
- {\csexpandonce{#2}\expandonce{\jlreq@tempa}}%
+ \noexpand\edef\exp_not:c {#3}{\noexpand\unexpanded{%
+ {\exp_args:Nc \exp_not:o {#2}\exp_not:o {\jlreq@tempa}}%
}}%
}%
\fi
@@ -4317,7 +4347,7 @@
\clist_map_variable:nNn { odd, even } \jlreq@parity {
\clist_map_variable:nNn { 0, 1, 2 } \jlreq@i {
% \jlreq@pagestyle@setmarkが上の処理を行う.
- \edef\jlreq@next{\noexpand\jlreq@pagestyle@setmark{\expandonce{\csname jlreq@\jlreq@parity @running@head@\@roman\numexpr\jlreq@i + 1\relax\endcsname}}{\expandonce{\jlreq@i}}{\expandonce{\jlreq@parity}}{jlreq@markdata}{\noexpand\jlreq@headingmarklist}}%
+ \edef\jlreq@next{\noexpand\jlreq@pagestyle@setmark{\exp_not:c {jlreq@\jlreq@parity @running@head@\@roman\numexpr\jlreq@i + 1\relax}}{\exp_not:o {\jlreq@i}}{\exp_not:o {\jlreq@parity}}{jlreq@markdata}{\noexpand\jlreq@headingmarklist}}%
\jlreq@next
}%
}%
@@ -4332,13 +4362,13 @@
\else\ifnum\jlreq@minimumlevel>\jlreq@level\space\let\jlreq@minimumlevel=\jlreq@level\fi\fi
\fi
% \jlreq@markdata@<見出し命令>にある情報とmark_formatをもとに,\<見出し命令>markを定義するマクロを作成,\jlreq@markdefinecommandに入れる.
- \edef\jlreq@do{\noexpand\jlreq@pagestyle@make@headingmark{\ifjlreq@headii@exist *\fi}{\expandonce{\jlreq@heading}}{\expandonce{\jlreq@mark@format}}{\csexpandonce{jlreq@markdata@\jlreq@heading}}}%
+ \edef\jlreq@do{\noexpand\jlreq@pagestyle@make@headingmark{\ifjlreq@headii@exist *\fi}{\exp_not:o {\jlreq@heading}}{\exp_not:o {\jlreq@mark@format}}{\exp_args:Nc \exp_not:o {jlreq@markdata@\jlreq@heading}}}%
\jlreq@do
- \eappto\jlreq@markdefinecommand{\expandonce{\jlreq@result}}%
+ \tl_put_right:Nx \jlreq@markdefinecommand { \exp_not:o {\jlreq@result} }%
\fi
}%
\ifx\jlreq@minimumlevel\@undefined\else
- \eappto\jlreq@markdefinecommand{\noexpand\jlreq@pagestyle@setclearmark{\expandonce{\jlreq@minimumlevel}}}%
+ \tl_put_right:Nx \jlreq@markdefinecommand { \exp_not:N \jlreq@pagestyle@setclearmark { \exp_not:o {\jlreq@minimumlevel} } }
\fi
% 見出しを出す場合:evenに章などの高いレベルの見出しを出す(2.6.3.a)
\@ifundefined{jlreq@odd@running@head@i@heading@level}{}{\@ifundefined{jlreq@even@running@head@i@heading@level}{}{%
@@ -4359,10 +4389,10 @@
\def\jlreq@oddfoot{}\def\jlreq@evenfoot{}%
\ifx\jlreq@nombre@i@position\@empty\def\jlreq@nombre@i@position{5\jlreq@zw}\fi
\ifx\jlreq@running@head@i@position\@empty\def\jlreq@running@head@i@position{4\jlreq@zw}\fi
- \edef\jlreq@gapcs{\noexpand\hskip\noexpand\glueexpr\expandonce{\jlreq@nombre@gap}\noexpand\relax}%
+ \edef\jlreq@gapcs{\noexpand\hskip\noexpand\glueexpr\exp_not:o {\jlreq@nombre@gap}\noexpand\relax}%
\jlreq@pagestyle@addifempty{\jlreq@nombre@iii@position}{\jlreq@nombre@ii}{\jlreq@gapcs}{\jlreq@nombre@iii}%
\jlreq@pagestyle@addifempty{\jlreq@nombre@ii@position}{\jlreq@nombre@i}{\jlreq@gapcs}{\jlreq@nombre@ii}%
- \edef\jlreq@gapcs{\noexpand\hskip\noexpand\glueexpr\expandonce{\jlreq@running@head@gap}\noexpand\relax}%
+ \edef\jlreq@gapcs{\noexpand\hskip\noexpand\glueexpr\exp_not:o {\jlreq@running@head@gap}\noexpand\relax}%
\jlreq@pagestyle@addifempty{\jlreq@running@head@iii@position}{\jlreq@odd@running@head@ii}{\jlreq@gapcs}{\jlreq@odd@running@head@iii}%
\jlreq@pagestyle@addifempty{\jlreq@running@head@ii@position}{\jlreq@odd@running@head@i}{\jlreq@gapcs}{\jlreq@odd@running@head@ii}%
\jlreq@pagestyle@addifempty{\jlreq@running@head@iii@position}{\jlreq@even@running@head@ii}{\jlreq@gapcs}{\jlreq@even@running@head@iii}%
@@ -4374,10 +4404,10 @@
\jlreq@ifgluezero{\glueexpr\jlreq@position\relax}{\def\jlreq@position{}}{}%
\expandafter\let\expandafter\jlreq@tempa\expandafter=\csname jlreq@nombre@\jlreq@i\endcsname
\jlreq@pagestyle@addfont@tocs{jlreq@tempa}{jlreq@nombre@font}%
- \eappto\jlreq@nombre@contents{%
- \noexpand\hbox to 0pt{\noexpand\hss
- \expandonce{\jlreq@tempa}%
- \ifx\jlreq@position\@empty\else\unexpanded{\hskip \glueexpr}\expandonce{\jlreq@position}\noexpand\relax\fi
+ \tl_put_right:Nx \jlreq@nombre@contents {%
+ \exp_not:N \hbox to 0pt{\exp_not:N \hss
+ \exp_not:o {\jlreq@tempa}%
+ \ifx\jlreq@position\@empty\else\exp_not:n {\hskip \glueexpr}\exp_not:o {\jlreq@position}\exp_not:N \relax\fi
}%
}%
\fi
@@ -4391,12 +4421,12 @@
\jlreq@ifgluezero{\glueexpr\jlreq@position\relax}{\def\jlreq@position{}}{}%
\expandafter\let\expandafter\jlreq@tempa\expandafter=\csname jlreq@\jlreq@parity @running@head@\jlreq@i\endcsname
\jlreq@pagestyle@addfont@tocs{jlreq@tempa}{jlreq@running@head@font}%
- \expandafter\eappto\csname jlreq@\jlreq@parity @contents\endcsname{%
- \noexpand\hbox to 0pt{\unexpanded{\hskip\glueexpr\headsep + \headheight}%
- \if@tate\else\unexpanded{+ \topskip - \Cht}\fi
- \ifx\jlreq@position\@empty\else + \expandonce{\jlreq@position}\fi\noexpand\relax
- \expandonce{\jlreq@tempa}%
- \noexpand\hss
+ \tl_put_right:cx {jlreq@\jlreq@parity @contents} {%
+ \exp_not:N \hbox to 0pt{\exp_not:n {\hskip\glueexpr\headsep + \headheight}%
+ \if@tate\else\exp_not:n {+ \topskip - \Cht}\fi
+ \ifx\jlreq@position\@empty\else + \exp_not:o {\jlreq@position}\fi\exp_not:N \relax
+ \exp_not:o {\jlreq@tempa}%
+ \exp_not:N \hss
}%
}%
\fi
@@ -4406,17 +4436,17 @@
\@ifundefined{jlreq@\jlreq@parity headformat}
{\def\jlreq@format{####1}}%
{\expandafter\let\expandafter\jlreq@format\csname jlreq@\jlreq@parity headformat\endcsname}%
- \edef\jlreq@do{\unexpanded{\def\jlreq@tempa##1}{\expandonce{\jlreq@format}}}\jlreq@do
+ \edef\jlreq@do{\unexpanded{\def\jlreq@tempa##1}{\exp_not:o {\jlreq@format}}}\jlreq@do
\edef\jlreq@tempb{%
- \csexpandonce{jlreq@\jlreq@parity @contents}%
+ \exp_args:Nc \exp_not:o {jlreq@\jlreq@parity @contents}%
\noexpand\hfil
- \expandonce{\jlreq@nombre@contents}%
+ \exp_not:o {\jlreq@nombre@contents}%
}%
\expandafter\edef\csname jlreq@\jlreq@parity head\endcsname{%
\unexpanded{\setbox\jlreq@tempboxa=\hbox to \dimexpr\headsep + \headheight + \textheight}\if@tate\else\unexpanded{- \topskip + 1\jlreq@zh}\fi\noexpand\relax
{%
\unexpanded{\tate\adjustbaseline}%
- \expandafter\expandonce\expandafter{\expandafter\jlreq@tempa\expandafter{\jlreq@tempb}}%
+ \expandafter\exp_not:o \expandafter{\expandafter\jlreq@tempa\expandafter{\jlreq@tempb}}%
}%
% Underful対策
\ifx l\jlreq@engine
@@ -4436,11 +4466,11 @@
\unexpanded{\box\jlreq@tempboxa\hss}%
}%
\if@tate
- \eappto\jlreq@oddhead{\expandonce{\jlreq@lefthead@adjustbox}}%
- \eappto\jlreq@evenhead{\expandonce{\jlreq@righthead@adjustbox}}%
+ \tl_put_right:Nx \jlreq@oddhead{\exp_not:o {\jlreq@lefthead@adjustbox}}%
+ \tl_put_right:Nx \jlreq@evenhead{\exp_not:o {\jlreq@righthead@adjustbox}}%
\else
- \eappto\jlreq@oddhead{\expandonce{\jlreq@righthead@adjustbox}}%
- \eappto\jlreq@evenhead{\expandonce{\jlreq@lefthead@adjustbox}}%
+ \tl_put_right:Nx \jlreq@oddhead{\exp_not:o {\jlreq@righthead@adjustbox}}%
+ \tl_put_right:Nx \jlreq@evenhead{\exp_not:o {\jlreq@lefthead@adjustbox}}%
\fi
}{% yoko
% 場所を正規化する.
@@ -4458,7 +4488,7 @@
\clist_map_variable:nNn {
jlreq@nombre@i@position, jlreq@nombre@ii@position, jlreq@nombre@iii@position, jlreq@running@head@i@position, jlreq@running@head@ii@position, jlreq@running@head@iii@position
} \jlreq@tempa {
- \edef\jlreq@next{\noexpand\jlreq@pagestyle@parse@position{\csexpandonce{\jlreq@tempa}}{\expandonce{\csname\jlreq@tempa\endcsname}}{\csexpandonce{\jlreq@tempa @default}}}%
+ \edef\jlreq@next{\noexpand\jlreq@pagestyle@parse@position{\exp_args:Nc \exp_not:o {\jlreq@tempa}}{\exp_not:c {\jlreq@tempa}}{\exp_args:Nc \exp_not:o {\jlreq@tempa @default}}}%
\jlreq@next
}%
\bool_if:nT { (
@@ -4506,10 +4536,10 @@
\edef\jlreq@vert{\expandafter\@firstoftwo\jlreq@position}%
\edef\jlreq@hor{\expandafter\@secondoftwo\jlreq@position}%
\str_if_eq:VnT \jlreq@parity { even } {\jlreq@reverse@leftright{\jlreq@hor}}
- \jlreq@ifleftpage{\jlreq@parity}{\let\jlreq@addtocs=\cseappto}{\let\jlreq@addtocs\csepreto}%
+ \jlreq@ifleftpage{\jlreq@parity}{\let\jlreq@addtocs=\tl_put_right:cx}{\let\jlreq@addtocs\tl_put_left:cx}%
\edef\jlreq@csname{jlreq@nombre@\jlreq@parity @\jlreq@vert @\jlreq@hor}%
- \expandafter\ifx\csname\jlreq@csname\endcsname\@empty\else\jlreq@addtocs{\jlreq@csname}{\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@nombre@gap}\noexpand\relax}\fi
- \jlreq@addtocs{\jlreq@csname}{\csexpandonce{jlreq@nombre@\jlreq@i}}%
+ \expandafter\ifx\csname\jlreq@csname\endcsname\@empty\else\jlreq@addtocs{\jlreq@csname}{\unexpanded{\hskip\glueexpr}\exp_not:o {\jlreq@nombre@gap}\noexpand\relax}\fi
+ \jlreq@addtocs{\jlreq@csname}{\exp_args:Nc \exp_not:o {jlreq@nombre@\jlreq@i}}%
\fi
% running@head
% 一度「紙面の外から」の順番で{A}{B}{C}と入れる
@@ -4518,16 +4548,16 @@
\edef\jlreq@vert{\expandafter\@firstoftwo\jlreq@position}%
\edef\jlreq@hor{\expandafter\@secondoftwo\jlreq@position}%
\str_if_eq:VnT \jlreq@parity { even } {\jlreq@reverse@leftright{\jlreq@hor}}
- \str_if_eq:VVTF \jlreq@hor \jlreq@pagehor {\let\jlreq@addtocs=\cseappto}{\let\jlreq@addtocs=\csepreto}%
+ \str_if_eq:VVTF \jlreq@hor \jlreq@pagehor {\let\jlreq@addtocs=\tl_put_right:cx}{\let\jlreq@addtocs=\tl_put_left:cx}%
\edef\jlreq@csname{jlreq@running@head@\jlreq@parity @\jlreq@vert @\jlreq@hor}%
- \jlreq@addtocs{\jlreq@csname}{{\csexpandonce{jlreq@\jlreq@parity @running@head@\jlreq@i}}}%
+ \jlreq@addtocs{\jlreq@csname}{{\exp_args:Nc \exp_not:o {jlreq@\jlreq@parity @running@head@\jlreq@i}}}%
\fi
}%
% {A}{B}{C}の順だった柱を結合する.本体は\jlreq@pagestyle@make@runninghead.
\clist_map_variable:nNn { top, bottom } \jlreq@vert {
\clist_map_variable:nNn { left, center, right } \jlreq@hor {
\str_if_eq:VnTF \jlreq@hor { right } { \def\jlreq@tempa{*} } { \def\jlreq@tempa{} }
- \edef\jlreq@do{\noexpand\jlreq@pagestyle@make@runninghead{jlreq@running@head@\jlreq@parity @\jlreq@vert @\jlreq@hor}{\expandonce{\jlreq@tempa}}{\expandonce{\jlreq@running@head@gap}}}%
+ \edef\jlreq@do{\noexpand\jlreq@pagestyle@make@runninghead{jlreq@running@head@\jlreq@parity @\jlreq@vert @\jlreq@hor}{\exp_not:o {\jlreq@tempa}}{\exp_not:o {\jlreq@running@head@gap}}}%
\jlreq@do
}%
}%
@@ -4540,7 +4570,7 @@
% nombreにフォント設定を追加.
\expandafter\ifx\csname\jlreq@nombrecsname\endcsname\@empty\else
\ifx\jlreq@nombre@font\@empty\else
- \expandafter\edef\csname\jlreq@nombrecsname\endcsname{{\expandonce{\jlreq@nombre@font}\csexpandonce{\jlreq@nombrecsname}}}%
+ \expandafter\edef\csname\jlreq@nombrecsname\endcsname{{\exp_not:o {\jlreq@nombre@font}\exp_args:Nc \exp_not:o {\jlreq@nombrecsname}}}%
\fi
\fi
\jlreq@if{\expandafter\ifx\csname\jlreq@runheadcsname\endcsname\@empty\fi}{%
@@ -4557,32 +4587,32 @@
\str_if_eq:VnTF \jlreq@hor { right } {
% <ノンブル><空き><柱>,右寄せ
% 柱が空出ないときに限り<空き>を入れる.
- \jlreq@pagestyle@addfont@totokens{\exp_not:N \dim_compare:nF { \exp_not:n { \wd\jlreq@PageStyle@box=0pt } } { \exp_not:N \hskip\expandonce{\jlreq@gap}\exp_no:N \relax } }{jlreq@running@head@font}{jlreq@tempa}%
+ \jlreq@pagestyle@addfont@totokens{\exp_not:N \dim_compare:nF { \exp_not:n { \wd\jlreq@PageStyle@box=0pt } } { \exp_not:N \hskip\exp_not:o {\jlreq@gap}\exp_not:N \relax } }{jlreq@running@head@font}{jlreq@tempa}%
\expandafter\edef\csname\jlreq@csname\endcsname{%
- \unexpanded{\setbox\jlreq@PageStyle@box=\hbox}{\expandonce{\jlreq@running@head@font}\csexpandonce{\jlreq@runheadcsname}}%
- \csexpandonce{\jlreq@nombrecsname}\expandonce{\jlreq@tempa}\unexpanded{\box\jlreq@PageStyle@box}%
+ \unexpanded{\setbox\jlreq@PageStyle@box=\hbox}{\exp_not:o {\jlreq@running@head@font}\exp_args:Nc \exp_not:o {\jlreq@runheadcsname}}%
+ \exp_args:Nc \exp_not:o {\jlreq@nombrecsname}\exp_not:o {\jlreq@tempa}\unexpanded{\box\jlreq@PageStyle@box}%
}%
}{%
% <ノンブル><空き><柱>,左寄せ
% ノンブルは常に空ではないと仮定する.
- \jlreq@pagestyle@addfont@totokens{\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@gap}\noexpand\relax\csexpandonce{\jlreq@runheadcsname}}{jlreq@running@head@font}{jlreq@tempa}%
- \expandafter\edef\csname\jlreq@csname\endcsname{\csexpandonce{\jlreq@nombrecsname}\expandonce{\jlreq@tempa}}%
+ \jlreq@pagestyle@addfont@totokens{\unexpanded{\hskip\glueexpr}\exp_not:o {\jlreq@gap}\noexpand\relax\exp_args:Nc \exp_not:o {\jlreq@runheadcsname}}{jlreq@running@head@font}{jlreq@tempa}%
+ \expandafter\edef\csname\jlreq@csname\endcsname{\exp_args:Nc \exp_not:o {\jlreq@nombrecsname}\exp_not:o {\jlreq@tempa}}%
}%
}{%
\str_if_eq:VnTF \jlreq@hor { left } {
% <柱><空き><ノンブル>,左寄せ
\jlreq@pagestyle@addfont@totokens{%
- \unexpanded{\setbox\jlreq@PageStyle@box=\hbox}{\csexpandonce{\jlreq@runheadcsname}}%
+ \unexpanded{\setbox\jlreq@PageStyle@box=\hbox}{\exp_args:Nc \exp_not:o {\jlreq@runheadcsname}}%
\unexpanded{\copy\jlreq@PageStyle@box}
\exp_not:N \dim_compare:nF { \exp_not:n { \wd\jlreq@PageStyle@box=0pt } } {
\exp_not:n { \hskip\glueexpr } \exp_not:o {\jlreq@gap} \exp_not:N \relax
}
}{jlreq@running@head@font}{jlreq@tempa}%
- \expandafter\edef\csname\jlreq@csname\endcsname{\expandonce{\jlreq@tempa}\csexpandonce{\jlreq@nombrecsname}}%
+ \expandafter\edef\csname\jlreq@csname\endcsname{\exp_not:o {\jlreq@tempa}\exp_args:Nc \exp_not:o {\jlreq@nombrecsname}}%
}{%
% <柱><空き><ノンブル>,右寄せ
- \jlreq@pagestyle@addfont@totokens{\csexpandonce{\jlreq@runheadcsname}\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@gap}\noexpand\relax}{jlreq@running@head@font}{jlreq@tempa}%
- \expandafter\edef\csname\jlreq@csname\endcsname{\expandonce{\jlreq@tempa}\csexpandonce{\jlreq@nombrecsname}}%
+ \jlreq@pagestyle@addfont@totokens{\exp_args:Nc \exp_not:o {\jlreq@runheadcsname}\unexpanded{\hskip\glueexpr}\exp_not:o {\jlreq@gap}\noexpand\relax}{jlreq@running@head@font}{jlreq@tempa}%
+ \expandafter\edef\csname\jlreq@csname\endcsname{\exp_not:o {\jlreq@tempa}\exp_args:Nc \exp_not:o {\jlreq@nombrecsname}}%
}%
}%
}%
@@ -4622,7 +4652,7 @@
\fi
}%
\edef\jlreq@do{%
- \noexpand\edef\expandonce{\csname ps@#1\endcsname}{%
+ \noexpand\edef\exp_not:c {ps@#1}{%
\noexpand\unexpanded{%
\unexpanded{\def\jlreq@current@pagestyle{#1}}%
\ifjlreq@clearmarkcommand\unexpanded{\jlreq@heading@execmacro@toallheadings\jlreq@clearheadingmarks}\fi
@@ -4631,12 +4661,12 @@
\else
\unexpanded{\let\@mkboth=\markboth}%
\fi
- \unexpanded{\def\@oddhead}{\expandonce{\jlreq@oddhead}}%
- \unexpanded{\def\@oddfoot}{\expandonce{\jlreq@oddfoot}}%
- \unexpanded{\def\@evenhead}{\expandonce{\jlreq@evenhead}}%
- \unexpanded{\def\@evenfoot}{\expandonce{\jlreq@evenfoot}}%
- \expandonce{\jlreq@markdefinecommand}%
- \expandonce{\jlreq@command}%
+ \unexpanded{\def\@oddhead}{\exp_not:o {\jlreq@oddhead}}%
+ \unexpanded{\def\@oddfoot}{\exp_not:o {\jlreq@oddfoot}}%
+ \unexpanded{\def\@evenhead}{\exp_not:o {\jlreq@evenhead}}%
+ \unexpanded{\def\@evenfoot}{\exp_not:o {\jlreq@evenfoot}}%
+ \exp_not:o {\jlreq@markdefinecommand}%
+ \exp_not:o {\jlreq@command}%
}%
}%
}%
@@ -4672,7 +4702,7 @@
\begingroup
\@ifundefined{jlreq@pagestyle@setting@#1}{\ClassError{jlreq}{Unknown~pagestyle:~#1}{\@ehc}}{}%
\expandafter\let\expandafter\setting\expandafter=\csname jlreq@pagestyle@setting@#1\endcsname
- \edef\jlreq@do{\noexpand\RenewPageStyle{#1}{\expandonce{\setting},\unexpanded{#2}}}%
+ \edef\jlreq@do{\noexpand\RenewPageStyle{#1}{\exp_not:o {\setting},\unexpanded{#2}}}%
\expandafter\endgroup
\jlreq@do
}
@@ -4697,19 +4727,19 @@
\def\jlreq@do{}%
\jlreq@parsekeyval@nokey{%
\ifjlreq@parsekeyval@nokey@novalue{%
- \epreto\jlreq@do{%
- \noexpand\edef\expandonce{\csname #2\endcsname}{\unexpanded{\unexpanded{##1}}}
- \noexpand\def\expandonce{\csname #1\endcsname}{}%
+ \tl_put_left:Nx \jlreq@do {%
+ \noexpand\edef\exp_not:c {#2}{\unexpanded{\unexpanded{##1}}}
+ \noexpand\def\exp_not:c {#1}{}%
}%
\clist_map_variable:cNn {#1} \jlreq@tempa {
- \epreto\jlreq@do{\noexpand\let\expandonce{\csname #2@\jlreq@tempa\endcsname}\noexpand\@undefined}%
+ \tl_put_left:Nx \jlreq@do {\noexpand\let\exp_not:c {#2@\jlreq@tempa}\noexpand\@undefined}%
}%
}{%
- \eappto\jlreq@do{%
- \noexpand\edef\expandonce{\csname #2@##1\endcsname}{\unexpanded{\unexpanded{##2}}}%
+ \tl_put_right:Nx \jlreq@do {%
+ \noexpand\edef\exp_not:c {#2@##1}{\unexpanded{\unexpanded{##2}}}%
\unexpanded{\def\jlreq@tempa{\jlreq@helper@removeelement{##1}}}%
- \unexpanded{\expandafter\jlreq@tempa\expandafter}{\expandonce{\csname #1\endcsname}}{\expandonce{\csname #1\endcsname}}%
- \unexpanded{\csappto{#1}{,##1}}%
+ \unexpanded{\expandafter\jlreq@tempa\expandafter}{\exp_not:c {#1}}{\exp_not:c {#1}}%
+ \unexpanded{\tl_put_right:cn {#1}{,##1}}%
}%
}%
}{#3}%
@@ -4720,7 +4750,7 @@
% #1@#2が定義されていれば\#1@#2の中身に,そうでなければ\#1の中身に展開される.
% 展開は\unexpandedで抑制される.
\def\jlreq@jlreqsetup@withenv@nameuse#1#2{%
- \jlreq@if{\expandafter\ifx\csname #1@#2\endcsname\relax\fi}{\csexpandonce{#1}}{\csexpandonce{#1@#2}}%
+ \jlreq@if{\expandafter\ifx\csname #1@#2\endcsname\relax\fi}{\exp_args:Nc \exp_not:o {#1}}{\exp_args:Nc \exp_not:o {#1@#2}}%
}
% 4.3.1 注4
\newlength\abovecaptionskip
@@ -4743,7 +4773,7 @@
\edef\jlreq@tempa{{\jlreq@jlreqsetup@withenv@nameuse{jlreq@@makecaption@font@setting}{\jlreq@tempb}\unexpanded{#2}}}%
\else
\edef\jlreq@tempa{%
- {\jlreq@jlreqsetup@withenv@nameuse{jlreq@@makecaption@label@font@setting}{\jlreq@tempb}\expandonce{\jlreq@tempa{#1}}}%
+ {\jlreq@jlreqsetup@withenv@nameuse{jlreq@@makecaption@label@font@setting}{\jlreq@tempb}\exp_not:o {\jlreq@tempa{#1}}}%
\unexpanded{\hskip\glueexpr}\jlreq@jlreqsetup@withenv@nameuse{jlreq@@makecaption@after@label@space@setting}{\jlreq@tempb}\noexpand\relax
{\jlreq@jlreqsetup@withenv@nameuse{jlreq@@makecaption@font@setting}{\jlreq@tempb}\unexpanded{#2}}%
}%
@@ -4796,11 +4826,11 @@
\tl_if_empty:nTF {#1} {
\clist_map_inline:Nn \g__jlreq_@makecaption_align_envlist_clist {
\tl_put_right:Nx \l_jlreq_tmpb_tl {
- \exp_not:N \let \exp_not:o {\csname jlreq@@makecaption@align@setting@large##1\endcsname}=\exp_not:N \@undefined
+ \exp_not:N \let \exp_not:c {jlreq@@makecaption@align@setting@large##1}=\exp_not:N \@undefined
}
\tl_if_empty:nT {#2} {
\tl_put_right:Nx \l_jlreq_tmpb_tl {
- \exp_not:N \let \exp_not:o {\csname jlreq@@makecaption@align@setting@small##1\endcsname}=\exp_not:N \@undefined
+ \exp_not:N \let \exp_not:c {jlreq@@makecaption@align@setting@small##1}=\exp_not:N \@undefined
}
}
}
@@ -4932,7 +4962,7 @@
% 縦書き時には表組み内でも縦書きにするようにする
\if@tate
\let\jlreq@temporary@original@ialign=\ialign
- \pretocmd{\ialign}{\unexpanded{\tate\let\ialign=\jlreq@temporary@original@ialign}}{}{}%
+ \tl_put_left:Nn \ialign {\unexpanded{\tate\let\ialign=\jlreq@temporary@original@ialign}}{}{}%
\fi
\begin{tabular}[t]{c}%
\@author
@@ -5005,7 +5035,7 @@
% 縦書き時には表組み内でも縦書きにするようにする
\if@tate
\let\jlreq@temporary@original@ialign=\ialign
- \pretocmd{\ialign}{\unexpanded{\tate\let\ialign=\jlreq@temporary@original@ialign}}{}{}%
+ \tl_put_left:Nn \ialign {\unexpanded{\tate\let\ialign=\jlreq@temporary@original@ialign}}{}{}%
\fi
\begin{tabular}[t]{c}%
\@author
@@ -5140,45 +5170,49 @@
\clist_map_variable:nNn {i,ii,iii,iv,v,vi} \jlreq@tempa{
\clist_map_variable:cNn {#1} \jlreq@tempb {
\ifx\jlreq@tempb\@empty\else
- \eappto\jlreq@generalset{\noexpand\let\expandonce{\csname #2@\jlreq@tempa @\jlreq@tempb\endcsname}\noexpand\@undefined}%
+ \tl_put_right:Nx \jlreq@generalset {
+ \noexpand\let\exp_not:c{#2@\jlreq@tempa @\jlreq@tempb}\noexpand\@undefined
+ }
\fi
}%
- \eappto\jlreq@generalset{%
- \noexpand\edef\expandonce{\csname #2@\jlreq@tempa\endcsname}{\unexpanded{\unexpanded{##1}}}%
+ \tl_put_right:Nx \jlreq@generalset {%
+ \exp_not:N \edef\exp_not:c {#2@\jlreq@tempa}{\exp_not:n {\exp_not:n {##1}}}%
}%
}%
- \appto\jlreq@generalset{\expandafter\def\csname #1\endcsname{}}%
+ \tl_put_right:Nn \jlreq@generalset { \expandafter\def\csname #1\endcsname{} }%
}{%
\bool_if:nTF{ \str_if_eq_p:nn {##1} {i} || \str_if_eq_p:nn {##1} {ii} || \str_if_eq_p:nn {##1} {iii} || \str_if_eq_p:nn {##1} {iv} || \str_if_eq_p:nn {##1} {v} || \str_if_eq_p:nn {##1} {vi} }{
% i=とかの時,環境に対応するものをクリアし,\#2@##1に値を入れる
\clist_map_variable:cNn {#1} \jlreq@tempa {
\ifx\jlreq@tempa\@empty\else
- \epreto\jlreq@envset{\noexpand\let\expandonce{\csname #2@##1@\jlreq@tempa\endcsname}\noexpand\@undefined}%
+ \tl_put_left:Nx \jlreq@envset{\noexpand\let\exp_not:c {#2@##1@\jlreq@tempa}\noexpand\@undefined}%
\fi
}%
- \eappto\jlreq@envset{\noexpand\edef\expandonce{\csname #2@##1\endcsname}{\unexpanded{\unexpanded{##2}}}}%
+ \tl_put_right:Nx \jlreq@envset{\exp_not:N \edef\exp_not:c{#2@##1}{\exp_not:n {\exp_not:n{##2}}}}%
}{%
% そうでないとき,環境.##1 = 環境名
\jlreq@parsekeyval@nokey{%
\ifjlreq@parsekeyval@nokey@novalue{%
% i - viまでに全てセットする.
\clist_map_variable:nNn {i,ii,iii,iv,v,vi} \jlreq@tempa{
- \epreto\jlreq@envset{\noexpand\edef\expandonce{\csname #2@\jlreq@tempa @##1\endcsname}{\unexpanded{\unexpanded{####1}}}}%
+ \tl_put_left:Nx \jlreq@envset{\noexpand\edef\exp_not:c {#2@\jlreq@tempa @##1}{\unexpanded{\unexpanded{####1}}}}%
}%
}{%
% ピンポイント代入
- \eappto\jlreq@envset{\noexpand\edef\expandonce{\csname #2@####1@##1\endcsname}{\unexpanded{\unexpanded{####2}}}}%
+ \tl_put_right:Nx \jlreq@envset {
+ \exp_not:N \edef\exp_not:c {#2@####1@##1}{\exp_not:n {\exp_not:n {####2}}}
+ }%
}%
}{##2}%
- \eappto\jlreq@envset{%
- \unexpanded{\def\jlreq@tempa{\jlreq@helper@removeelement{##1}}}%
- \unexpanded{\expandafter\jlreq@tempa\expandafter}{\expandonce{\csname #1\endcsname}}{\expandonce{\csname #1\endcsname}}%
- \noexpand\appto\expandonce{\csname #1\endcsname}{\unexpanded{,##1}}%
+ \tl_put_right:Nx \jlreq@envset{%
+ \exp_not:n {\def\jlreq@tempa{\jlreq@helper@removeelement{##1}}}%
+ \exp_not:n {\expandafter\jlreq@tempa\expandafter}{\exp_not:c{#1}}{\exp_not:c {#1}}%
+ \exp_not:N \tl_put_right:Nn \exp_not:c {#1}{\exp_not:n {,##1}}%
}%
}%
}%
}{#3}%
- \edef\jlreq@do{\expandonce{\jlreq@generalset}\expandonce{\jlreq@levelset}\expandonce{\jlreq@envset}}%
+ \edef\jlreq@do{\exp_not:o {\jlreq@generalset}\exp_not:o {\jlreq@levelset}\exp_not:o {\jlreq@envset}}%
\expandafter\endgroup
\jlreq@do
}
@@ -5215,7 +5249,7 @@
\keys_define:nn { jlreqsetup } { quote_end_indent .tl_set:N = \jlreq@quote@end@indent }
\keys_define:nn { jlreqsetup }{
quote_fontsize .choices:nn = {normalsize,small,footnotesize,scriptsize,tiny,{}}{
- \jlreq@ifempty{#1}{\def\jlreq@quote@fontsize{}}{\edef\jlreq@quote@fontsize{\expandonce{\csname #1\endcsname}}}
+ \jlreq@ifempty{#1}{\def\jlreq@quote@fontsize{}}{\edef\jlreq@quote@fontsize{\exp_not:c {#1}}}
}
}
\keys_define:nn { jlreqsetup } { quote_beforeafter_space .tl_set:N = \jlreq@quote@beforeafter@space }
@@ -5283,8 +5317,8 @@
% 表内の行間を0にする(4.4.3.f)
\jlreq@saveoriginalcs{tabular}
\jlreq@saveoriginalcs{endtabular}
-\preto\tabular{\begingroup\appto\@arrayparboxrestore{\baselineskip=0pt\lineskip=0pt}}
-\appto\endtabular{\endgroup}
+\tl_put_left:Nn \tabular {\begingroup\tl_put_right:Nn \@arrayparboxrestore{\baselineskip=0pt\lineskip=0pt}}
+\tl_put_right:Nn \endtabular{\endgroup}
% 4.4.3.e
\setlength\tabcolsep{.5\zh}
\setlength\arraycolsep{.5\zw}
@@ -5313,15 +5347,12 @@
% tarticleから
\newdimen\@lnumwidth
\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
-\def\addcontentsline#1#2#3{%
- \protected@write\@auxout{%
- \let\label\@gobble\let\index\@gobble\let\glossary\@gobble
- \if@tate
- \@temptokena{\tatechuyoko{\thepage}}%
- \else
- \@temptokena{\thepage}%
- \fi
- }{\string\@writefile{#1}{\protect\contentsline{#2}{#3}{\the\@temptokena}}}%
+
+% from latex.ltx
+\legacy_if:nT { @tate } {
+ \def\addcontentsline#1#2#3{%
+ \addtocontents{#1}{\protect\contentsline{#2}{#3}{\tatechuyoko*{\thepage}}{}%
+ \protected@file@percent}}
}
\newcount\jlreq@top@contents % トップ見出しを入れる.レベルと同じ値.
@@ -5465,14 +5496,16 @@
\jlreq@tempafalse % restore
\jlreq@parsekeyval@nokey{%
\ifjlreq@parsekeyval@nokey@novalue{\def\jlreq@tempa{##1}}{%
- \jlreq@switch{##1}{%
+ \str_if_eq:nnT {##1} { restore } {
{restore}{\csname jlreq@tempa##2\endcsname}%
}%
}%
}{#1}%
- \eappto\jlreq@theindex@pagestyle{\unexpanded{\let\jlreq@theindex@savedpagestyle}\ifjlreq@tempa\noexpand\jlreq@current@pagestyle\else\noexpand\@undefined\fi}%
+ \tl_put_right:Nx \jlreq@theindex@pagestyle {
+ \exp_not:n {\let\jlreq@theindex@savedpagestyle}\ifjlreq@tempa\exp_not:N \jlreq@current@pagestyle\else\exp_not:N \@undefined\fi
+ }%
\ifx\jlreq@tempa\@empty\else
- \eappto\jlreq@theindex@pagestyle{\noexpand\pagestyle{\expandonce{\jlreq@tempa}}}%
+ \tl_put_right:Nx \jlreq@theindex@pagestyle{\exp_not:N \pagestyle{\exp_not:o \jlreq@tempa}}%
\fi
}
}
@@ -5493,19 +5526,18 @@
\jlreq@parsekeyval@nokey{%
% 各見出し命令に対する設定を解析
\ifjlreq@parsekeyval@nokey@novalue{%
- \eappto\jlreq@headingsettings{\unexpanded{####1}}%
+ \tl_put_right:Nx \jlreq@headingsettings {\exp_not:n {####1}}%
}{%
\str_case_e:nnF {####1} {%
{heading_type}{%
\lowercase{\def\jlreq@tempa{####2}}%
- \jlreq@switch{\jlreq@tempa}{
+ \str_case_e:nnF { \jlreq@tempa } {
{tobira}{\def\jlreq@declaretype{RenewTobira}}
{block}{\def\jlreq@declaretype{RenewBlock}}
{runin}{\def\jlreq@declaretype{RenewRunin}}
{cutin}{\def\jlreq@declaretype{RenewCutin}}
{modify}{\def\jlreq@declaretype{Modify}}
- {\ClassError{jlreq}{Unknown~heading~type~`####2'}{\@ehc}}
- }%
+ }{\ClassError{jlreq}{Unknown~heading~type~`####2'}{\@ehc}}
}
{heading_level}{\def\jlreq@level{####2}}
}{%
@@ -5514,35 +5546,35 @@
\csname jlreq@tempa####2\endcsname\@gobble
}{\@firstofone}%
}%
- {\eappto\jlreq@headingsettings{\ifx\jlreq@headingsettings\@empty\else ,\fi\unexpanded{####1={####2}}}}%
+ {\tl_put_right:Nx \jlreq@headingsettings{\ifx\jlreq@headingsettings\@empty\else ,\fi\unexpanded{####1={####2}}}}%
}%
}%
}{##2}%
\jlreq@ifempty{#1}{}{%
\ifjlreq@tempa
- \eappto\jlreq@headingscmds{\noexpand\SaveHeading{\unexpanded{##1}}{\expandonce{\csname #2@##1\endcsname}}}%
- \eappto\jlreq@restoreheadings{\ifx\jlreq@restoreheadings\@empty\else ,\fi\unexpanded{##1}}%
+ \tl_put_right:Nx \jlreq@headingscmds {\exp_not:N \SaveHeading{\exp_not:n {##1}}{\exp_not:c {#2@##1}}}%
+ \tl_put_right:Nx \jlreq@restoreheadings {\ifx\jlreq@restoreheadings\@empty\else ,\fi\exp_not:n {##1}}%
\fi
}%
% \jlreq@declareに\ModifyHeadingか\Renew***Headingを入れる
- \edef\jlreq@declare{\expandonce{\csname\jlreq@declaretype Heading\endcsname}{##1}}%
+ \edef\jlreq@declare{\exp_not:c {\jlreq@declaretype Heading}{##1}}%
\str_if_eq:VnF \jlreq@declaretype { Modify } {
\ifx\jlreq@level\@empty
% \frontmatter時でのレベルを引用する.
\edef\jlreq@declare{%
- \unexpanded{\edef\jlreq@tempa}{\noexpand\unexpanded{\expandonce{\jlreq@declare}}{\noexpand\expandonce{\expandonce{\csname jlreq@heading@level@##1\endcsname}}}}%
+ \unexpanded{\edef\jlreq@tempa}{\noexpand\unexpanded{\exp_not:o {\jlreq@declare}}{\noexpand\exp_not:o {\exp_not:c {jlreq@heading@level@##1}}}}%
\noexpand\jlreq@tempa
}%
\else
- \eappto\jlreq@declare{{\expandonce{\jlreq@level}}}%
+ \tl_put_right:Nx \jlreq@declare {{\exp_not:o {\jlreq@level}}}%
\fi
}{}%
- \eappto\jlreq@headingscmds{\expandonce{\jlreq@declare}{\expandonce{\jlreq@headingsettings}}}%
+ \tl_put_right:Nx \jlreq@headingscmds {\exp_not:o {\jlreq@declare}{\exp_not:o {\jlreq@headingsettings}}}%
}{#4}%
\edef\jlreq@do{%
\unexpanded{\def#3}{%
- \expandonce{\jlreq@headingscmds}%
- \jlreq@ifempty{#1}{}{\unexpanded{\def#1}{\expandonce{\jlreq@restoreheadings}}}%
+ \exp_not:o {\jlreq@headingscmds}%
+ \jlreq@ifempty{#1}{}{\unexpanded{\def#1}{\exp_not:o {\jlreq@restoreheadings}}}%
}%
}%
\expandafter\endgroup
@@ -5552,11 +5584,11 @@
\def\jlreq@matter@counter@norestore#1#2{%
\def#1{}%
\jlreq@parsekeyval@nokey{%
- \keys_define:nn { __jlreq_keyval } {
- value .code:n = \appto#1{\setcounter{##1}{####1}},
- the .code:n = {\eappto#1{\noexpand\def\expandonce{\csname the##1\endcsname}{\unexpanded{####1}}}}
+ \keys_define:nn { __jlreq_keyval_matter_counter_norestore } {
+ value .code:n = { \tl_put_right:Nn #1 { \setcounter{##1}{####1} } },
+ the .code:n = { \tl_put_right:Nx #1 { \exp_not:N \def\exp_not:c {the##1}{\exp_not:n {####1}} } }
}
- \keys_set:nn { __jlreq_keyval } {##2}
+ \keys_set:nn { __jlreq_keyval_matter_counter_norestore } {##2}
}{#2}%
}
@@ -5564,30 +5596,29 @@
\newif\if@mainmatter
\@mainmattertrue
\keys_define:nn { jlreqsetup } {frontmatter_pagebreak .code:n = {%
- \edef\jlreq@frontmatter@pagebreak{\jlreq@ifempty{#1}{}{\expandonce{\csname #1\endcsname}}}%
+ \edef\jlreq@frontmatter@pagebreak{\jlreq@ifempty{#1}{}{\exp_not:c {#1}}}%
}}
\keys_define:nn { jlreqsetup } {frontmatter_counter .code:n = {%
\def\jlreq@frontmatter@counter{}%
- \def\jlreq@tempa{}% 復帰させるカウンタ名リスト
+ \tl_set:Nn \jlreq@frontmatter@counter { \seq_gclear:N \g__jlreq_frontmatter_resetcounter_seq }
\jlreq@parsekeyval@nokey{%
\def\jlreq@tempb{}% 中身
\jlreq@tempatrue % restore
\keys_define:nn { frontmatter_counter } {
- value .code:n = {\appto\jlreq@tempb{\setcounter{##1}{####1}}},
- restore .code:n = {\csname jlreq@tempa####1\endcsname},
- the .code:n = {\eappto\jlreq@tempb{\noexpand\def\expandonce{\csname the##1\endcsname}{\unexpanded{####1}}}}
+ value .code:n = { \tl_put_right:Nn \jlreq@tempb{\setcounter{##1}{####1}} },
+ restore .code:n = { \csname jlreq@tempa####1\endcsname },
+ the .code:n = { \tl_put_right:Nx \jlreq@tempb { \exp_not:N \def\exp_not:c {the##1}{\exp_not:n {####1}} } }
}
\keys_set:nn { frontmatter_counter } {##2}
\ifjlreq@tempa
- \epreto\jlreq@tempb{%
- \noexpand\let\expandonce{\csname jlreq@frontmatter@savedcounter@the@##1\endcsname}\expandonce{\csname the##1\endcsname}%
- \noexpand\edef\expandonce{\csname jlreq@frontmatter@savedcounter@value@##1\endcsname}{\unexpanded{\the\value{##1}}}%
+ \tl_put_left:Nx \jlreq@tempb {%
+ \noexpand\let\exp_not:c {jlreq@frontmatter@savedcounter@the@##1}\exp_not:c {the##1}%
+ \noexpand\edef\exp_not:c {jlreq@frontmatter@savedcounter@value@##1}{\unexpanded{\the\value{##1}}}%
}%
- \eappto\jlreq@tempa{\ifx\jlreq@tempa\@empty\else ,\fi\unexpanded{##1}}%
+ \tl_put_right:Nn \jlreq@frontmatter@counter { \seq_gput_right:Nn \g__jlreq_frontmatter_resetcounter_seq { ##1 } }
\fi
- \eappto\jlreq@frontmatter@counter{\expandonce{\jlreq@tempb}}%
+ \tl_put_right:NV \jlreq@frontmatter@counter \jlreq@tempb
}{#1}%
- \eappto\jlreq@frontmatter@counter{\unexpanded{\def\jlreq@frontmatter@restorecounters}{\expandonce{\jlreq@tempa}}}%
}
}
\keys_define:nn { jlreqsetup } {frontmatter_heading .code:n = {\jlreq@matter@heading[\jlreq@frontmatter@restoreheadings]{jlreq@frontmatter@savedheading}{\jlreq@frontmatter@heading}{#1}}}
@@ -5597,16 +5628,14 @@
\jlreq@tempatrue % restore
\jlreq@parsekeyval@nokey{%
\ifjlreq@parsekeyval@nokey@novalue{\def\jlreq@tempa{##1}}{%
- \jlreq@switch{##1}{%
- {restore}{\csname jlreq@tempa##2\endcsname}%
- }%
+ \str_if_eq:nnT { ##1 } { restore } { \csname jlreq@tempa##2\endcsname }
}%
}{#1}%
\ifjlreq@tempa
- \appto\jlreq@frontmatter@pagestyle{\let\jlreq@frontmatter@savedpagestyle\jlreq@current@pagestyle}%
+ \tl_put_right:Nn \jlreq@frontmatter@pagestyle{\let\jlreq@frontmatter@savedpagestyle\jlreq@current@pagestyle}%
\fi
\ifx\jlreq@tempa\@empty\else
- \eappto\jlreq@frontmatter@pagestyle{\noexpand\pagestyle{\expandonce{\jlreq@tempa}}}%
+ \tl_put_right:Nx \jlreq@frontmatter@pagestyle { \exp_not:N \pagestyle{\exp_not:o {\jlreq@tempa}} }%
\fi
}
}
@@ -5616,14 +5645,13 @@
\def\jlreq@pagination@frontmatterstyle{arabic}%
\let\jlreq@pagination@mainmatterpagecommand=\pagenumbering
\clist_map_variable:nNn {#1} \jlreq@tempa {
- \expandafter\jlreq@helper@trim\expandafter{\jlreq@tempa}{\jlreq@tempa}%
- \jlreq@switch{\jlreq@tempa}{
+ \tl_set:Nx \jlreq@tempa { \tl_trim_spaces:o \jlreq@tempa }
+ \str_case_e:nnF {\jlreq@tempa}{
{continuous}{%
\def\jlreq@pagination@mainmatterpagecommand##1{\gdef\thepage{\csname @##1\endcsname\c@page}}%
}
{independent}{\let\jlreq@pagination@mainmatterpagecommand=\pagenumbering}
- {\edef\jlreq@pagination@frontmatterstyle{\jlreq@tempa}}
- }%
+ }{\edef\jlreq@pagination@frontmatterstyle{\jlreq@tempa}}
}%
}
}
@@ -5638,11 +5666,11 @@
\expandafter\gdef\expandafter\thepage\expandafter{\csname @\jlreq@pagination@frontmatterstyle\endcsname\c@page}%
\jlreq@frontmatter@postcode
}
- \def\jlreq@frontmatter@restorecounters{}
+ \seq_new:N \g__jlreq_frontmatter_resetcounter_seq
\def\jlreq@frontmatter@restoreheadings{}
\def\jlreq@frontmatter@restorecommands{}
\keys_define:nn { jlreqsetup } {mainmatter_pagebreak .code:n = {%
- \edef\jlreq@mainmatter@pagebreak{\jlreq@ifempty{#1}{}{\expandonce{\csname #1\endcsname}}}%
+ \edef\jlreq@mainmatter@pagebreak{\jlreq@ifempty{#1}{}{\exp_not:c {#1}}}%
}}
\keys_define:nn { jlreqsetup } {mainmatter_pagestyle .code:n = {%
\edef\jlreq@mainmatter@pagestyle{\jlreq@ifempty{#1}{}{\unexpanded{\pagestyle{#1}}}}%
@@ -5661,7 +5689,7 @@
}{%
\expandafter\pagestyle\expandafter{\jlreq@frontmatter@savedpagestyle}%
}%
- \clist_map_variable:NNn \jlreq@frontmatter@restorecounters \jlreq@tempa {
+ \seq_map_variable:NNn \g__jlreq_frontmatter_resetcounter_seq \jlreq@tempa {
\setcounter{\jlreq@tempa}{\csname jlreq@frontmatter@savedcounter@value@\jlreq@tempa\endcsname}%
\expandafter\let\csname the\jlreq@tempa\expandafter\endcsname\csname jlreq@frontmatter@savedcounter@the@\jlreq@tempa\endcsname
}%
@@ -5675,7 +5703,7 @@
\jlreq@mainmatter@postcode
}
\keys_define:nn { jlreqsetup } {backmatter_pagebreak .code:n = {%
- \edef\jlreq@backmatter@pagebreak{\jlreq@ifempty{#1}{}{\expandonce{\csname #1\endcsname}}}%
+ \edef\jlreq@backmatter@pagebreak{\jlreq@ifempty{#1}{}{\exp_not:c {#1}}}%
}}
\keys_define:nn { jlreqsetup } {backmatter_pagestyle .code:n = {%
\edef\jlreq@backmatter@pagestyle{\jlreq@ifempty{#1}{}{\unexpanded{\pagestyle{#1}}}}%
@@ -5688,14 +5716,13 @@
\let\jlreq@pagination@backmatterpagecommand=\pagenumbering
\def\jlreq@pagination@backmatterstyle{arabic}%
\clist_map_variable:nNn {#1} \jlreq@tempa {
- \expandafter\jlreq@helper@trim\expandafter{\jlreq@tempa}{\jlreq@tempa}%
- \jlreq@switch{\jlreq@tempa}{
+ \tl_set:Nx \jlreq@tempa { \tl_trim_spaces:o \jlreq@tempa }
+ \str_case_e:nnF {\jlreq@tempa} {
{continuous}{%
\def\jlreq@pagination@backmatterpagecommand##1{\gdef\thepage{\csname @##1\endcsname\c@page}}%
}
{independent}{\let\jlreq@pagination@backmatterpagecommand=\pagenumbering}
- {\edef\jlreq@pagination@backmatterstyle{\jlreq@tempa}}
- }%
+ } {\edef\jlreq@pagination@backmatterstyle{\jlreq@tempa}}
}%
}
}
@@ -5725,14 +5752,14 @@
%. その他諸々
%.. 縦中横
-\protected\def\tatechuyoko{\@ifstar
- {\jlreq@tatechuyoko@i}%
- {%
+\NewDocumentCommand { \tatechuyoko } { s m } {
+ \IfBooleanTF{#1}{
+ \jlreq@iftdir{\jlreq@tatechuyoko@i{#2}}{#2}
+ }{
\jlreq@iftdir{}{\ClassError{jlreq}{\string\tatechuyoko\space is~not~allowed~in~yoko~mode}{\@ehc}}%
- \jlreq@tatechuyoko@ii
- }%
+ \jlreq@tatechuyoko@i{#2}
+ }
}
-\def\jlreq@tatechuyoko@i#1{\jlreq@iftdir{\jlreq@tatechuyoko@ii{#1}}{#1}}
\edef\@tempa{%
\unexpanded{\ifvmode\leavevmode\fi}%
@@ -5745,7 +5772,7 @@
}\fi
}
-\expandafter\def\expandafter\jlreq@tatechuyoko@ii\expandafter#\expandafter1\expandafter{%
+\expandafter\def\expandafter\jlreq@tatechuyoko@i\expandafter#\expandafter1\expandafter{%
\@tempa
% 前のJFM glue
\ifnum\jlreq@lastnodechar>-1
@@ -5758,9 +5785,9 @@
\vrule width~0pt~height~\ht\jlreq@tempboxa depth~\dp\jlreq@tempboxa
\endgroup
#1}%
- \futurelet\jlreq@nextchar\jlreq@tatechuyoko@iii
+ \futurelet\jlreq@nextchar\jlreq@tatechuyoko@ii
}
-\def\jlreq@tatechuyoko@iii{%
+\def\jlreq@tatechuyoko@ii{%
\begingroup
\def\jlreq@do{}%
\jlreq@getfirsttoken@expandmacros{\jlreq@nextchar}{\jlreq@tempa}%
@@ -5884,7 +5911,7 @@
}
}
\cs_set:Nn \__jlreq_warekiyear_aux:nnn {
- \int_compare:nTF { #1 = #2 } {元年} { \int_eval:n { #1 - #2 + 1 } 年 }
+ \int_compare:nTF { #1 = #2 } {元年} { #3\int_eval:n { #1 - #2 + 1 } 年 }
}
\def\today{%
\if西暦
@@ -5935,7 +5962,7 @@
\edef\jlreq@do{
\unexpanded{\def\jlreq@proof[#1]}{%
\unexpanded{\labelsep=1\jlreq@zw}%
- \expandonce{\proof[{\reset@font\jlreq@proof@label@font #1\inhibitglue}\nopunct]}%
+ \exp_not:o {\proof[{\reset@font\jlreq@proof@label@font #1\inhibitglue}\nopunct]}%
}
}
\jlreq@do
@@ -6007,6 +6034,7 @@
\renewcommand{\theparagraph}{\thesubsubsection .\arabic{paragraph}}
\renewcommand{\thesubparagraph}{\theparagraph .\arabic{subparagraph}}
\str_if_eq:VnTF \jlreq@article@type { article } {
+\def\X{}
\NewBlockHeading{part}{0}{font={\jlreq@keepbaselineskip{\LARGE\sffamily\gtfamily\bfseries}},label_format={第\thepart 部},lines=4,after_label_space=1\jlreq@zw,second_heading_text_indent={-1\jlreq@zw,1\jlreq@zw},subtitle_font={\jlreq@keepbaselineskip{\large}}}
\renewcommand{\thesection}{\arabic{section}}
}{% book, report
@@ -6125,12 +6153,13 @@
\renewcommand{\p@enumiii}{\theenumi(\theenumii)}
\renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
-\newcommand{\labelitemi}{\hbox to 1\jlreq@zw{\hss\textbullet\hss}}
%\newcommand{\labelitemi}{•}
\legacy_if:nTF { @tate } {
+ \newcommand{\labelitemi}{\hbox to 1\jlreq@zw{\hss\tatechuyoko{\textbullet}\hss}}
\newcommand{\labelitemii}{○}
\newcommand{\labelitemiii}{*}
}{
+ \newcommand{\labelitemi}{\hbox to 1\jlreq@zw{\hss\textbullet\hss}}
\newcommand{\labelitemii}{\hbox to 1\jlreq@zw{\hss\textendash\hss}}
\newcommand{\labelitemiii}{\hbox to 1\jlreq@zw{\hss\textasteriskcentered\hss}}
}
diff --git a/language/japanese/jlreq/jlreq.pdf b/language/japanese/jlreq/jlreq.pdf
index 75605aa016..6e237a3568 100644
--- a/language/japanese/jlreq/jlreq.pdf
+++ b/language/japanese/jlreq/jlreq.pdf
Binary files differ
diff --git a/macros/latex/contrib/fancyvrb/Changes b/macros/latex/contrib/fancyvrb/Changes
index a0a1010991..af5b079d3e 100644
--- a/macros/latex/contrib/fancyvrb/Changes
+++ b/macros/latex/contrib/fancyvrb/Changes
@@ -1,4 +1,6 @@
--- fancyvrb.sty
+3.8 2021/08/12 - fix for linenumbers and reused SaveVerbatim (hv)
+ (thanks to Ohad Kammar)
3.7 2021/01/20 - delete a doubled definied macro (hv)
3.6 2020/05/03 - added optional argument reflabel for page references
to verbatim environments (hv)
diff --git a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf
index fd5a4ed72f..875f151335 100644
--- a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf
+++ b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex
index 099ef80a63..a3c3466b2f 100644
--- a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex
+++ b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex
@@ -59,7 +59,7 @@
{\footnotesize and}\\[-2mm]
{\footnotesize Herbert Voß\ (FU Berlin -- DE)}
}
-\date{Version 3.7\\ \today}
+\date{\today}
\fvset{frame=single,xrightmargin=0cm,numbers=left,numbersep=3pt,commentchar=Z}
@@ -84,6 +84,7 @@ Jean-François Burnol,
Philippe Esperet, %\url{esperet@marie.polytechnique.fr},
Michael Friendly, %\url{friendly@hotspur.psych.yorku.ca},
Mario Hassler, %\url{HASSLER@ippnv2.ipp.kfa-juelich.de},
+Ohad Kammar, % \url{ohad.kammar@ed.ac.uk},
Mikhail Kolodin, %\url{myke@morrigan.spb.su},
Andreas Matthias,
Frank Mittelbach,
@@ -1107,6 +1108,26 @@ entire verbatim environments:
\LUseVerbatim{VerbEnv}
\end{SideBySideExample}
+
+\begin{SideBySideExample}
+\begin{SaveVerbatim}{FOO}
+However, if I define a
+reusable Verbatim by
+SaveVerbatim,
+linenumbers works.
+\end{SaveVerbatim}
+
+\begin{Verbatim}[numbers=left]
+This works.
+I use Verbatim directly.
+\end{Verbatim}
+
+\UseVerbatim[numbers=left]{FOO}
+\end{SideBySideExample}
+
+
+\clearpage
+
\section{Writing and reading verbatim files}
\label{sec:VerbatimInclude}
diff --git a/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty b/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty
index 2efbf7d248..1211daa44e 100644
--- a/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty
+++ b/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty
@@ -13,9 +13,9 @@
%% verbatim environments and commands and extensive documentation.
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{3.7}
-\def\filedate{2021/01/20}
-\ProvidesPackage{fancyvrb}[2021/01/20 v3.7 verbatim text (tvz,hv)]
+\def\fileversion{3.8}
+\def\filedate{2021/08/12}
+\ProvidesPackage{fancyvrb}[2021/08/12 v3.8 verbatim text (tvz,hv)]
%\message{Style option: `fancyvrb' v\fileversion \space <\filedate> (tvz)}
\csname fancyvrb@loaded\endcsname
\let\fancyvrb@loaded\endinput
@@ -1001,6 +1001,7 @@
\newcounter{FancyVerbLine}
\define@key{FV}{firstnumber}[auto]{%
\def\@tempa{#1}\def\@tempb{auto}%
+ \def\FV@FirstNumber{#1}% added 2021-08-12
\ifx\@tempa\@tempb
\def\FV@SetLineNo{%
\c@FancyVerbLine\FV@CodeLineNo%
@@ -1137,9 +1138,20 @@
\gdef\FV@TheVerbatim{}%
\def\FV@ProcessLine##1{%
\expandafter\gdef\expandafter\FV@TheVerbatim\expandafter{%
- \FV@TheVerbatim\FV@ProcessLine{##1}}}%
- \gdef\FV@TheVerbatim{}%
- \FV@Scan}
+% \FV@TheVerbatim\FV@ProcessLine{##1}}}% 2021-08-12
+% \gdef\FV@TheVerbatim{}%
+ \FV@TheVerbatim\advance\c@FancyVerbLine\@ne\FV@ProcessLine{##1}}}%
+ \gdef\FV@TheVerbatim{%
+ \edef\@tempa{\FV@FirstNumber}%
+ \def\@tempb{auto}%
+ \ifx\@tempa\@tempb%
+ \c@FancyVerbLine\FV@CodeLineNo%
+ \else%
+ \c@FancyVerbLine\FV@FirstNumber%
+ \advance\c@FancyVerbLine\m@ne%
+ \fi%
+ }%
+ \FV@Scan}
\def\FVE@SaveVerbatim{%
\expandafter\global\expandafter\let
\csname FV@SV@\SaveVerbatim@Name\endcsname\FV@TheVerbatim
diff --git a/macros/latex/contrib/geradwp/README.md b/macros/latex/contrib/geradwp/README.md
new file mode 100644
index 0000000000..fa873fb414
--- /dev/null
+++ b/macros/latex/contrib/geradwp/README.md
@@ -0,0 +1,98 @@
+This package provides the geradwp class, a class based on article
+and compatible with LaTeX. With this class, researchers
+at [GERAD](https://www.gerad.ca/fr) will be able to write their working paper
+while complying to all the presentation standards required by the
+_Cahiers du GERAD_ series.
+
+## LICENSE
+
+LaTeX Project Public License, version 1.3c or (at your option) any
+later version.
+
+## VERSION
+
+1.0
+
+******************************************************************
+_La version française de cette description est à la suite de la
+version anglaise._
+******************************************************************
+
+*** ENGLISH VERSION ***
+
+## DESCRIPTION
+
+The LaTeX geradwp document class has been created in order to
+allow researchers from [GERAD](https://www.gerad.ca/fr) to write their working
+paper with the typesetting system while complying with the
+presentation standards required by the _Cahiers du GERAD_ series.
+
+## ARCHIVE CONTENTS
+
+- geradwp.ins : the installation file of the class;
+- geradwp.dtx : the bilingual documented source code of the class;
+- geradwp.pdf : the English version of the class' documentation;
+- geradwp-fr.pdf : the French version of the class' documentation;
+- README.md : this file.
+
+## CLASS INSTALLATION
+
+Follow these steps to install the class:
+1. Create a working directory.
+2. Extract the .zip archive in the working directory.
+3. Open a command-line editor.
+4. Change directories to get to your working directory.
+5. Type the following command in the editor:
+
+```
+latex geradwp.ins
+```
+
+The command will generate two files:
+
+1. the class itself: *geradwp.cls*;
+2. the working paper template file: *geradwp.tex*.
+
+## DOCUMENTATION
+
+The documentation provided with this class was written to help you
+work with the geradwp document class.
+
+*** VERSION FRANÇAISE ***
+
+## DESCRIPTION
+
+La classe LaTeX geradwp a été conçue pour permettre aux chercheurs
+du [GERAD](https://www.gerad.ca/fr) de rédiger leur cahier de recherche à l'aide du système
+de préparation de documents tout en se conformant aux règles de
+présentation en vigueur pour la collection _Les Cahiers du GERAD_.
+## CONTENU DE L'ARCHIVE
+
+- geradwp.ins : le fichier d'installation de la classe;
+- geradwp.dtx : le code source documenté bilingue de la classe;
+- geradwp.pdf : la version anglaise de la documentation de la classe;
+- geradwp-fr.pdf : la version française de la documentation de la classe;
+- README.md : le présent fichier.
+
+## INSTALLATION DE LA CLASSE
+
+Suivez les étapes suivantes pour installer la classe :
+1. Créez-vous un répertoire de travail.
+2. Décompressez l'archive .zip dans votre répertoire de travail.
+3. Ouvrez un éditeur de ligne de commande.
+4. Changez de répertoire pour atteindre votre répertoire de travail.
+5. Saisissez la commande suivante dans l'éditeur :
+
+```
+latex geradwp.ins
+```
+
+La commande générera deux fichiers :
+
+1. la classe elle-même : *geradwp.cls*;
+2. le gabarit du cahier : *geradwp.tex*.
+
+## DOCUMENTATION
+
+La documentation jointe à cette classe a pour but de vous permettre
+de travailler avec la classe geradwp. \ No newline at end of file
diff --git a/macros/latex/contrib/geradwp/geradwp-fr.pdf b/macros/latex/contrib/geradwp/geradwp-fr.pdf
new file mode 100644
index 0000000000..c64aee442c
--- /dev/null
+++ b/macros/latex/contrib/geradwp/geradwp-fr.pdf
Binary files differ
diff --git a/macros/latex/contrib/geradwp/geradwp.dtx b/macros/latex/contrib/geradwp/geradwp.dtx
new file mode 100644
index 0000000000..1f5de065b7
--- /dev/null
+++ b/macros/latex/contrib/geradwp/geradwp.dtx
@@ -0,0 +1,2092 @@
+% \iffalse
+%
+% Copyright 2021 GERAD, HEC Montreal
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3c
+% of this license or (at your option) any later version.
+%
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2008/05/04 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Benoit Hamel
+% <benoit.2.hamel@hec.ca>.
+%
+% This work consists of the files geradwp.dtx, gerad.ins
+% and the derived files listed in the README file.
+%
+% \fi
+% \iffalse
+%<*dtx>
+\ProvidesFile{geradwp.dtx}
+%</dtx>
+%<class>\NeedsTeXFormat{LaTeX2e}
+%<class>\ProvidesClass{geradwp}[2021/08/11 v1.0 Class for the Cahiers du GERAD series]
+%<*driver>
+\documentclass[10pt,oneside,french,english]{ltxdoc}
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage{babel}
+\usepackage[autolanguage]{numprint}
+\usepackage{fontawesome}
+\usepackage{framed}
+\usepackage{url}
+\usepackage{color}
+\usepackage{enumitem}
+\usepackage{iflang}
+\usepackage{makeidx}
+\usepackage{tabularx}
+\usepackage{listings}
+\usepackage{hyperref}
+
+\newcommand{\frenchdoc}{%
+ \IfLanguageName{english}{0}{1}
+}
+
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+
+\ifnum\frenchdoc=1
+ \GlossaryPrologue{\section*{Historique des versions}%
+ \addcontentsline{toc}{section}{Historique des versions}}
+ \else
+ \GlossaryPrologue{\section*{Change History}%
+ \addcontentsline{toc}{section}{Change History}}
+\fi
+
+\definecolor{liens}{rgb}{0,0.35,0.65}
+\definecolor{shadecolor}{rgb}{0.93,0.97,0.99}
+\definecolor{TFFrameColor}{rgb}{0,0.235,0.443}
+\definecolor{TFTitleColor}{rgb}{1,1,1}
+\hypersetup{
+ colorlinks=true,
+ allcolors=liens,
+ pdftitle={Classe de documents LaTeX pour la collection des Cahiers du GERAD},
+ pdfauthor={Benoit Hamel, HEC Montr\'{e}al}
+}
+\setlength{\parskip}{6pt}
+\ifnum\frenchdoc=1
+ \frenchbsetup{
+ og=«, fg=»
+ }
+
+ \addto\captionsfrench{%
+ \renewcommand{\tablename}{Tableau}
+ }
+\fi
+\MakeShortVerb{\+}
+\lstset{%
+ basicstyle=\footnotesize\ttfamily,
+ stringstyle=\ttfamily,
+ numbers=left,
+ numberstyle=\footnotesize\ttfamily,
+ backgroundcolor=\color{shadecolor}
+}
+\ifnum\frenchdoc=1
+ \renewcommand{\lstlistingname}{Code source}
+ \newcommand{\lstcaptionone}{Un exemple de liste d'auteurs}
+ \newcommand{\lstcaptiontwo}{Un exemple de liste d'affiliations}
+ \newcommand{\lstcaptionthree}{Un exemple de liste d'adresses courriel}
+\else
+ \renewcommand{\lstlistingname}{Source Code}
+ \newcommand{\lstcaptionone}{Authors list example}
+ \newcommand{\lstcaptiontwo}{Affiliations list example}
+ \newcommand{\lstcaptionthree}{Email list example}
+\fi
+
+\newcommand{\gdwp}{\texttt{geradwp}}
+\newcommand{\cahiers}{\emph{Les Cahiers du GERAD}}
+\newcommand{\lien}[2]{%
+ \href{#1}{\bfseries #2~\faExternalLink}
+}
+\newcommand{\oui}{\color{green}\faCheck}
+
+\makeglossary
+
+\begin{document}
+ \DocInput{geradwp.dtx}
+\end{document}
+%</driver>
+% \fi
+% \CheckSum{922}
+% \changes{1.0}{2021-08-11}{Initial release}
+% \ifnum\frenchdoc=1
+% \title{Classe de documents \LaTeX\ pour la collection \cahiers}
+% \author{Benoit Hamel\thanks{Biblioth\`eque, HEC Montr\'eal} \and Karine Hébert\thanks{GERAD, HEC Montr\'eal}}
+% \else
+% \title{\LaTeX\ document class for \cahiers\ series}
+% \author{%
+% Benoit Hamel\thanks{Library, HEC Montr\'eal}%
+% \and Karine Hébert\thanks{GERAD, HEC Montr\'eal}%
+% \thanks{English translation by Jos\'ee Lafreni\`ere}%
+% }
+% \fi
+% \date{\today}
+% \maketitle
+%
+% \tableofcontents
+%
+% \begin{abstract}
+% \ifnum\frenchdoc=1
+% La classe de documents \gdwp\ a \'et\'e con\c{c}ue dans le but de permettre aux chercheurs
+% membres du \lien{https://www.gerad.ca/fr}{GERAD} de r\'ediger leurs documents de travail,
+% leurs pr\'eimpressions et leurs rapports techniques selon les normes de pr\'esentation de la
+% collection de rapports de recherche \cahiers. Cette classe et les fichiers associ\'es remplacent
+% le gabarit initialement distribu\'e par le GERAD.
+% \else
+% The \gdwp\ document class was designed to allow researchers who are
+% \lien{https://www.gerad.ca/fr}{GERAD} members to write
+% their working papers, preprints and technical reports in line with the presentation
+% standards of \cahiers\ working paper series. This class and the
+% associated files replace the template that GERAD initially distributed.
+% \fi
+% \end{abstract}
+%
+% \ifnum\frenchdoc=1
+% \section{Installation de la classe}
+%
+% \subsection{Pr\'erequis}
+% \else
+% \section{Installing the class}
+%
+% \subsection{Prerequisites}
+% \fi
+%
+% \ifnum\frenchdoc=1
+% L'utilisation de cette classe suppose que vous avez d\'ej\`a install\'e une distribution \TeX\ et
+% un \'editeur de code int\'egr\'e. Pour la conception de \gdwp, la distribution
+% \lien{https://www.tug.org/texlive/}{TeX Live 2020} et l'\'editeur de code
+% \lien{https://www.texstudio.org/}{TeXstudio} ont \'et\'e utilis\'es.
+%
+% Si vous utilisez la distribution TeXLive ou \lien{http://www.tug.org/mactex/}{MacTeX} et que la compilation
+% de votre document vous renvoie des bogues, assurez-vous que votre installation est à jour avant d'investiguer plus loin.
+%
+% Si vous utilisez la distribution \lien{https://miktex.org/}{MikTeX}, assurez-vous d'installer les derni\`eres versions des
+% \emph{packages} indiqu\'es dans le \autoref{tab:pre-loaded-pkgs} avant d'utiliser la classe \gdwp.
+%
+% Les utilisateurs d'\lien{https://www.overleaf.com/}{Overleaf} peuvent \'egalement utiliser cette classe
+% en r\'ecup\'erant les fichiers sur le \lien{https://www.gerad.ca/fr/cahiers-procedure}{site du GERAD}.
+% \else
+% Using this class assumes you’ve already installed a \TeX\ distribution with an integrated code editor.
+% In designing \gdwp, the \lien{https://www.tug.org/texlive/}{TeX Live 2020} distribution and the
+% \lien{https://www.texstudio.org/}{TeXstudio} editor were used.
+%
+% If you are using TeXLive or \lien{http://www.tug.org/mactex/}{MacTeX} and your document compilation
+% is buggy, begin by making sure
+% your installation is up to date before investigating any further.
+%
+% If you are using the \lien{https://miktex.org/}{MikTeX} distribution, make sure you install the latest
+% versions of the packages
+% indicated in \autoref{tab:pre-loaded-pkgs} before using the \gdwp\ class.
+%
+% Users of \lien{https://www.overleaf.com/}{Overleaf} can also use this class by downloading the necessary files from % the \lien{https://www.gerad.ca/fr/cahiers-procedure}{GERAD website}.
+% \fi
+%
+% \subsection{Installation}
+%
+% \ifnum\frenchdoc=1
+% L'archive +.zip+ que vous avez t\'el\'echarg\'ee contient les fichiers suivants :
+%
+% \begin{enumerate}
+% \item \textbf{geradwp.ins} : le fichier d'installation de la classe;
+% \item \textbf{geradwp.dtx} : le code source document\'e de la classe;
+% \item \textbf{geradwp.pdf} : la version anglaise de la documentation de la classe;
+% \item \textbf{geradwp-fr.pdf} : la version fran\c{c}aise de la documentation de la classe;
+% \item \textbf{README.md} : le fichier n\'ecessaire \`a l'affichage de la description de la classe
+% sur le site du \lien{https://www.ctan.org/}{CTAN}.
+%\end{enumerate}
+%
+% Suivez les \'etapes suivantes pour installer la classe sur votre poste de travail.
+%
+%\begin{enumerate}
+% \item Cr\'eez-vous un r\'epertoire de travail;
+% \item D\'ecompressez l'archive +.zip+ dans votre r\'epertoire de travail;
+% \item Ouvrez un \'editeur de ligne de commande \`a partir du r\'epertoire;
+% \item Saisissez la commande suivante dans l'\'{e}diteur : \\
+% \begin{shaded*}
+% +latex geradwp.ins+
+% \end{shaded*}
+% \end{enumerate}
+%
+% La commande cr\'eera le fichier de classe +geradwp.cls+ ainsi que le gabarit +geradwp.tex+ \`a
+% partir duquel vous pourrez r\'ediger votre rapport de recherche.
+% \else
+% The +.zip+ archive you downloaded contains these files:
+%
+% \begin{enumerate}
+% \item \textbf{geradwp.ins}: class installation file;
+% \item \textbf{geradwp.dtx}: documented source code for the class;
+% \item \textbf{geradwp.pdf}: the english version of the class' documentation;
+% \item \textbf{geradwp-fr.pdf} : the french version of the class' documentation;
+% \item \textbf{README.md}: file needed to display the class description on the
+% \lien{https://www.ctan.org/}{CTAN} website.
+%\end{enumerate}
+%
+% Follow these steps to install the class on your workstation.
+%
+%\begin{enumerate}
+% \item Create a working directory;
+% \item unzip the +.zip+ archive in your working directory;
+% \item open a command line terminal from the directory;
+% \item enter the following command: \\
+% \begin{shaded*}
+% +latex geradwp.ins+
+% \end{shaded*}
+% \end{enumerate}
+%
+% This command will create the +geradwp.cls+ class file and the
+% +geradwp.tex+ template from which you can draft your working paper.
+% \fi
+%
+% \ifnum\frenchdoc=1
+% \section{Utilisation de la classe}
+% \else
+% \section{Using the class}
+% \fi
+%
+% \ifnum\frenchdoc=1
+% La classe \gdwp\ est d\'eriv\'ee de la classe de base \lien{https://www.ctan.org/pkg/article}{article}.
+% Vous pouvez donc vous servir de toutes les fonctionnalit\'es de cette derni\`ere. Cependant,
+% quelques options de la classe +article+ sont d\'efinies par d\'efaut dans la class \gdwp\ et
+% celles-ci ne peuvent pas être modifi\'ees :
+%
+% \begin{itemize}
+% \item La taille de la police de caract\`eres est de +10pt+;
+% \item la taille du papier est +letterpaper+;
+% \item l'impression est recto seulement (+oneside+) pour les versions +gdweb+ et +gdplain+ du gabarit;
+% \item l'impression est recto-verso (+twoside+) pour la version +gdpaper+ du gabarit.
+% \end{itemize}
+%
+% Ces options \'etant d\'efinies dans le fichier de classe, vous ne risquez pas de les supprimer de la
+% commande +documentclass+ du gabarit. Assurez-vous seulement de ne pas y inscrire des options qui pourraient
+% entrer en conflit avec les options ci-haut mentionn\'ees.
+% \else
+% The \gdwp\ class is derived from the basic \lien{https://www.ctan.org/pkg/article}{article} class.
+% You can therefore use all of that
+% class’ functionalities. However, a few of the article class options are defined by default in the
+% \gdwp\ class and cannot be modified:
+%
+% \begin{itemize}
+% \item The font size is +10pt+;
+% \item the paper size is +letterpaper+;
+% \item printing is one-sided only (+oneside+) for the +gdweb+ and +gdplain+ versions of the template;
+% \item printing is two-sided (+twoside+) for the +gdpaper+ version of the template.
+% \end{itemize}
+%
+% Since these options are defined in the class file, there is no risk of you deleting them from the
+% template’s +documentclass+ command. Just make sure not to enter any options that might conflict with
+% the above-mentioned options.
+% \fi
+%
+% \subsection{Options}
+% \ifnum\frenchdoc=1
+% Outre les options disponibles via la classe +article+, quelques options sont disponibles pour \gdwp.
+% \else
+% In addition to the options available via the +article+ class, there are a few options available for \gdwp.
+% \fi
+%
+% \begin{DescribeMacro}{gdweb}
+% \ifnum\frenchdoc=1
+% La version Web d'un cahier de recherche destin\'ee \`a \^etre publi\'ee sur le site Web du GERAD. L'option
+% +oneside+ est pass\'ee \`a la classe +article+.
+% \else
+% The Web version of a paper that is to be posted on the GERAD website. The +oneside+ option is passed on to
+% the +article+ class.
+% \fi
+% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{gdpaper}
+% \ifnum\frenchdoc=1
+% La version papier d'un cahier de recherche destin\'ee \`a \^etre imprim\'ee et plac\'ee dans le centre
+% de documentation du GERAD. L'option +twoside+
+% est pass\'ee \`a la classe +article+.
+% \else
+% The paper version of an article that is to be printed and placed in the GERAD documentation centre.
+% The +twoside+ option is passed on to the article class.
+% \fi
+% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{gdplain}
+% \ifnum\frenchdoc=1
+% La version sans mise en forme d'un cahier de recherche, semblable \`a un article \LaTeX\ de base et
+% destin\'ee à la distribution par l'auteur. L'option +oneside+ est pass\'ee \`a la classe +article+.
+% \else
+% The unformatted version of a paper, similar to a basic \LaTeX\ article, that is to be distributed by
+% the author. The +oneside+ option is passed on to the article class.
+% \fi
+% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{gdrevised}
+% \ifnum\frenchdoc=1
+% Lorsqu'un cahier de recherche fait l'objet d'une r\'evision par ses auteurs, cette option
+% est utilis\'ee pour afficher la date de r\'evision sur la page couverture du cahier.
+% \else
+% When a paper is revised by the authors, this option is used to display the revision date
+% on the paper’s cover page.
+% \fi
+% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{gdfinal}
+% \ifnum\frenchdoc=1
+% Pendant la r\'edaction et la r\'evision d'un cahier, une +overfullrule+ de 5pt s'affiche dans la
+% marge de droite pour indiquer quels \'el\'ements du cahier d\'epassent de la marge. Une fois
+% la r\'edaction et la r\'evision termin\'ees, cette option est utilis\'ee pour retirer l'+overfullrule+
+% du document.
+% \else
+% During the drafting and revision process, a 5 pt +overfullrule+ is printed in the right-hand
+% margin to indicate any parts of the paper that go outside the margin. Once these two processes are
+% done, this option is used to remove the document’s +overfullrule+.
+% \fi
+% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{gdsmallhead}
+% \ifnum\frenchdoc=1
+% Certains \emph{packages} s'amusent \`a nos d\'epens en modifiant l'ent\^ete d'un cahier. L'option
+% +gdsmallhead+ vient corriger cet affront en r\'etablissant l'ent\^ete voulu.
+% \else
+% Some packages have fun at our expense by modifying the paper’s header. The
+% +gdsmallhead+ option corrects this by resetting the proper header.
+% \fi
+% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{gdpostpub}
+% \ifnum\frenchdoc=1
+% Une fois le contenu du cahier de recherche publi\'e chez un \'editeur, le cahier lui-m\^eme doit
+% \^etre mis \`a jour afin d'afficher ces nouvelles informations de publication sur la page
+% couverture du cahier. L'option +gdpostpub+ substitue la citation officielle de l'\'editeur \`a
+% celle du cahier et l'URL de l'article \`a celui du cahier.
+% \else
+% Once a paper’s content is published by a publisher, the paper must be updated to show the new
+% publication’s information on the cover page. The +gdpostpub+ option swaps out the \emph{Cahier}’s
+% citation for the publisher's official one and the article URL for the \emph{Cahier}’s
+% \fi
+% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{gdminitabs}
+% \ifnum\frenchdoc=1
+% Il arrive parfois que des auteurs cr\'eent des tableaux si grands que ceux-ci d\'epassent d'une
+% ou plusieurs marges. Dans de tels cas, l'option +gdneedsminitabs+ est utilis\'ee pour mettre les
+% tableaux du document en +footnotesize+.
+% \else
+% Authors sometimes create tables so large that they extend beyond the margins. To solve this issue,
+% the +gdneedsminitabs+ option can be used to set the tables in the document to +footnotesize+.
+% \fi
+% \end{DescribeMacro}
+%
+% \ifnum\frenchdoc=1
+% \subsection{Utilisation des \emph{packages}}
+%
+% Le but de cette classe \'etant d'assurer une coh\'esion dans la mise en forme des rapports de recherche,
+% tr\`es peu de \emph{packages} sont pr\'echarg\'es --- le \autoref{tab:pre-loaded-pkgs} recense ceux-ci
+% avec le fichier o\`u les trouver de m\^eme que leurs options, le cas \'ech\'eant --- et les chercheurs
+% auront le loisir d'utiliser ceux dont ils auront besoin en prenant en compte les particularit\'es
+% ci-dessous et en \'evitant de recharger des \emph{packages} ou d'en modifier les options par d\'efaut.
+% \else
+% \subsection{Using packages}
+%
+% Since the goal of this class is to make sure that working papers use a consistent layout,
+% very few packages are preloaded. \autoref{tab:pre-loaded-pkgs} lists those that are preloaded,
+% along with the files where you will find them (and their options, where applicable). Researchers
+% can choose to use whichever packages they will need, taking into account their features (see below). Care should
+% be taken not to reload any of them or to change any of the default options.
+% \fi
+%
+% \begin{table}[tbh]
+% \begin{tabularx}{\textwidth}{Xccl}
+% \hline
+% \ifnum\frenchdoc=1
+% \textbf{\emph{Package}} & \textbf{Fichier de classe} & \textbf{Gabarit} & \textbf{Options} \\
+% \else
+% \textbf{Package} & \textbf{Class file} & \textbf{Template} & \textbf{Options} \\
+% \fi
+% \hline
+% amssymb & \oui & & \\
+% amsmath & \oui & & \\
+% amsfonts & \oui & & \\
+% latexsym & \oui & & \\
+% graphicx & \oui & & graphicspath=Figures \\
+% mathrsfs & \oui & & \\
+% geometry & \oui & & \\
+% fancyhdr & \oui & & \\
+% booktabs & \oui & & \\
+% multirow & \oui & & \\
+% array & \oui & & \\
+% caption & \oui & & font=\{footnotesize,bf,sf\} \\
+% color & \oui & & \\
+% enumitem & \oui & & \\
+% float & \oui & & \\
+% algorithm & & \oui & \\
+% algorithm2e & & \oui & \\
+% hyperref & & \oui & colorlinks \\
+% & & & citecolor=\{blue\} \\
+% & & & urlcolor=\{blue\} \\
+% & & & breaklinks=\{true\} \\
+% \hline
+% \end{tabularx}
+% \ifnum\frenchdoc=1
+% \caption{Liste des \emph{packages} pr\'echarg\'es avec la classe, leur localisation et leurs options}
+% \else
+% \caption{List of the class' preloaded packages along with their location and options}
+% \fi
+% \label{tab:pre-loaded-pkgs}
+% \end{table}
+%
+% \subsubsection{babel}
+% \ifnum\frenchdoc=1
+% L'auteur de ces lignes ayant \'et\'e inform\'e par la maintenanci\`ere du gabarit originel que l'utilisation de babel
+% avec ce dernier causait de nombreux probl\`emes, il vous serait gr\'e de \textbf{ne pas utiliser le
+% \emph{package} babel avec ce nouveau gabarit}, et ce, jusqu'\`a ce que lesdits probl\`emes lui soient pr\'esent\'es
+% afin d'\^etre corrig\'es. Une version ult\'erieure de la classe vous permettra peut-\^etre de vous en servir.
+% \else
+% The person maintaining the original template advised the author of this document class that using babel with the template
+% causes a number of problems,
+% so \textbf{please do not use the babel package with this new template}, until these issues have been fixed.
+% A future release of the class may allow you to use it.
+% \fi
+%
+% \subsubsection{algorithm, algorithm2e}
+%
+% \ifnum\frenchdoc=1
+% \lien{https://www.ctan.org/pkg/algorithms}{algorithm} et \lien{https://www.ctan.org/pkg/algorithm2e}{algorithm2e} sont
+% deux \emph{packages} ayant leurs aficionados respectifs parmi les auteurs de \emph{Cahiers du GERAD}. Tous deux sont
+% accept\'es et charg\'es dans le pr\'eambule du gabarit. Il suffit de mettre en commentaire celui des deux qui ne
+% sera pas utilis\'e.
+%
+% Les deux \emph{packages} ne peuvent cependant pas \^etre charg\'es ensemble puisqu'ils entrent en conflit et cr\'eent
+% des bogues.
+% \else
+% \lien{https://www.ctan.org/pkg/algorithms}{algorithm} and \lien{https://www.ctan.org/pkg/algorithm2e}{algorithm2e} are
+% two different packages, each of which has its fans among the \emph{Cahiers du GERAD} authors. Both are accepted and
+% loaded in the preamble of the template. Simply comment out the one that will not be used.
+%
+% The two packages are mutually exclusive and cannot both be loaded at once without causing bugs.
+% \fi
+%
+% \subsubsection{float}
+%
+% \ifnum\frenchdoc=1
+% Le \emph{package} +float+ est charg\'e avec la classe \textbf{uniquement lorsque l'option +gdminitabs+ est utilis\'ee}, et ce,
+% afin de transformer les tableaux en +footnotesize+. Si vous avez besoin de ce \emph{package} et que vos tableaux
+% sont raisonnablement petits, chargez-le dans le pr\'eambule de votre document.
+% \else
+% The +float+ package is loaded with the class \textbf{only when the +gdminitabs+ option is enabled}. When loaded, it resizes
+% the tables in +footnotesize+. If you need this package and the tables are reasonably small, you can load it in the preamble
+% of the document.
+% \fi
+%
+% \subsubsection{cleveref}
+%
+% \ifnum\frenchdoc=1
+% Le gabarit inclut d\'ej\`a le package +amsthm+ pour permettre le r\'ef\'erencement des th\'eor\`emes. Toutefois,
+% afin que ceux-ci apparaissent lorsqu’il y a utilisation du package +cleveref+, les d\'efinitions +\newtheorem+ doivent
+% \^etre plac\'ees \textbf{apr\`es} que le package +cleveref+ ait \'et\'e charg\'e (tel que sp\'ecifi\'e dans la section 14.1 de la
+% \lien{https://www.ctan.org/pkg/cleveref}{documentation de cleveref}).
+% \else
+% The template already includes the +amsthm+ package to allow referencing of theorems. However, in order for them to
+% appear when using the +cleveref+ package, +\newtheorem+ definitions must be placed \textbf{after} the +cleveref+ package is loaded
+% (as specified in Section 14.1 of the \lien{https://www.ctan.org/pkg/cleveref}{cleveref package documentation}).
+% \fi
+%
+% \ifnum\frenchdoc=1
+% \subsection{Commandes}
+% \else
+% \subsection{Commands}
+% \fi
+%
+% \ifnum\frenchdoc=1
+% Les quelques commandes publiques qui ont \'et\'e cr\'e\'ees pour cette classe ont deux fonctions : renseigner les
+% m\'etadonn\'ees du cahier de recherche et faire de la mise en page.
+% \else
+% The handful of public commands that were created for this class have two purposes: formatting and filling in metadata
+% for the working paper.
+% \fi
+%
+% \ifnum\frenchdoc=1
+% \subsubsection{M\'etadonn\'ees}
+% \else
+% \subsubsection{Metadata}
+% \fi
+% \label{sec:metadonnees}
+%
+% \ifnum\frenchdoc=1
+% Toutes situ\'ees dans le pr\'eambule, les commandes de m\'etadonn\'ees permettent aux auteurs et \`a l'\'equipe du
+% GERAD d'inscrire les informations bibliographiques qui se retrouveront sur la page couverture et la page titre
+% du cahier.
+% \else
+% All located in the preamble, the metadata commands allow authors and the GERAD team to insert the bibliographical
+% data that will be found on the cover and title pages of the paper.
+% \fi
+%
+% \begin{DescribeMacro}{\GDtitre}
+% \ifnum\frenchdoc=1
+% Le titre du cahier de recherche. Celui-ci se retrouve \`a la fois sur la page couverture et la page titre.
+% \else
+% Title of the working paper. The title is on both the cover and title pages.
+% \fi
+% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{\GDauteursCourts}
+% \ifnum\frenchdoc=1
+% La liste des auteurs du cahier sous la forme \emph{[Initiale du pr\'enom]. [Nom de famille]}
+% (ex. : B. Hamel, K. H\'ebert). Le contenu de cette commande se retrouve sur la page couverture, sous le titre.
+% \else
+% List of authors, formatted as \emph{[First initial]. [Last name]} (e.g.: B. Hamel, K. H\'ebert).
+% The contents of this command will be found on the title page, under the title.
+% \fi
+% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{\GDauteursCopyright}
+% \ifnum\frenchdoc=1
+% La liste des noms de famille des auteurs \`a la mention des droits d'auteurs au bas de la page titre.
+% \else
+% List of the authors’ last names for the authors’ copyright notice at the bottom of the title page.
+% \fi
+% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{\GDmois}
+% \ifnum\frenchdoc=1
+% Le mois de publication du cahier de recherche dans ses formes fran\c{c}aise et anglaise. Le mois en fran\c{c}ais
+% est inscrit entre les premi\`eres accolades, celui en anglais, entre les deuxi\`emes.
+% \else
+% Publication month of the working paper in both French and English. The month for the French version is in the
+% first set of curly brackets and the English one in the second.
+% \fi
+% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{\GDannee}
+% \ifnum\frenchdoc=1
+% L'ann\'ee de publication du cahier sous la forme \emph{AAAA}.
+% \else
+% The year the paper was published, formatted as YYYY.
+% \fi
+% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{\GDnumero}
+% \ifnum\frenchdoc=1
+% Le num\'ero du cahier de recherche. Ce num\'ero est assign\'e par l'\'equipe du GERAD.
+% \else
+% Number assigned to the working paper by the GERAD team.
+% \fi
+% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{\GDrevised}
+% \ifnum\frenchdoc=1
+% Lorsqu'un cahier de recherche fait l'objet d'une r\'evision par ses auteurs, la date de r\'evision
+% est inscrite dans cette commande pour \^etre affich\'ee sur la page couverture.
+% \else
+% When a working paper is revised by its authors, this command is used to display the revision date
+% on the cover page.
+% \fi
+% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{\GDpostpubcitation}
+% \ifnum\frenchdoc=1
+% Lorsque le contenu du cahier de recherche est publi\'e chez un \'editeur, l'\'equipe du GERAD
+% substitue la citation officielle de l'article \`a celle du cahier de recherche et l'URL de l'\'editeur
+% \`a celle du site Web du GERAD en utilisant cette commande, la citation devant \^etre inscrite dans
+% les premi\`eres accolades et l'URL, dans les secondes.
+% \else
+% When the working paper is officially published, the GERAD team will replace the \emph{Cahier}’s citation
+% with the official journal citation and replace the link to the GERAD website with the URL from the
+% publisher. The citation must be placed in the first set of curly brackets and the URL in the second.
+% \fi
+% \end{DescribeMacro}
+%
+% \ifnum\frenchdoc=1
+% \subsubsection{Mise en page}
+%
+% Afin de d\'esembourber le gabarit et d'\'eviter que des commandes essentielles de mise en page soient
+% supprim\'ees par des auteurs, des commandes ont \'et\'e cr\'e\'ees. Celles-ci marquent en m\^eme temps
+% les subdivisions du document.
+% \else
+% \subsubsection{Formatting}
+%
+% To keep the template from getting cluttered and to keep authors from deleting critical formatting commands,
+% commands were created to mark each subdivision of the document.
+% \fi
+%
+% \begin{DescribeMacro}{\GDpageCouverture}
+% \ifnum\frenchdoc=1
+% Toute la page couverture d'un cahier de recherche est g\'en\'er\'ee \`a partir de cette commande.
+% Elle est entre autres mise en forme avec les m\'etadonn\'ees des commandes cit\'ees \`a la
+% \autoref{sec:metadonnees}. La page titre qui suit la page couverture est quant \`a elle g\'en\'er\'ee
+% par l'environnement +GDpagetitre+ d\'ecrit \`a la \autoref{sec:environnements}.
+% \else
+% The entire cover page is generated with this command. It is largely formatted with the formatting
+% commands listed in \autoref{sec:metadonnees}. The title page that follows the cover is generated
+% by the +GDpagetitre+ environment described in \autoref{sec:environnements}.
+% \fi
+% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{\GDabstracts}
+% \ifnum\frenchdoc=1
+% Cette commande repr\'esente le d\'ebut de la section \og contenu \fg\ du cahier de recherche, commen\c{c}ant
+% avec les r\'esum\'es anglais et fran\c{c}ais. C'est elle
+% qui configure les ent\^etes et pieds de pages qui seront effectifs jusqu'\`a la fin du cahier et qui
+% comprennent, notamment, les m\'etadonn\'ees d\'ecrites \`a la \autoref{sec:metadonnees}. Les r\'esum\'es
+% sont quant \`a eux r\'edig\'es \`a l'int\'erieur de l'environnement +GDabstract+ d\'ecrit \`a la
+% \autoref{sec:environnements}.
+% \else
+% This command marks the beginning of the ``content'' section, beginning with the English and French abstracts.
+% It configures the page headers and footers, which are used throughout the paper, including the metadata
+% described in \autoref{sec:metadonnees}. The abstracts are written in the +GDabstract+ environment described
+% in \autoref{sec:environnements}.
+% \fi
+% \end{DescribeMacro}
+%
+% \begin{DescribeMacro}{\GDarticlestart}
+% \ifnum\frenchdoc=1
+% Le cahier de recherche en tant que tel d\'ebute \`a partir de cette commande. Celle-ci fait quelques derniers
+% petits r\'eglages au niveau de la mise en page.
+% \else
+% The working paper begins with this command. It handles some final fine-tuning of the formatting settings.
+% \fi
+% \end{DescribeMacro}
+%
+% \ifnum\frenchdoc=1
+% \subsection{Environnements}
+% \else
+% \subsection{Environments}
+% \fi
+% \label{sec:environnements}
+%
+% \ifnum\frenchdoc=1
+% Les quelques environnements qui ont \'et\'e cr\'e\'es l'ont \'et\'e pour mettre en forme rapidement la page titre
+% et la section des r\'esum\'es.
+% \else
+% A few environments were created to quickly format the title page and the abstracts section.
+% \fi
+%
+% \ifnum\frenchdoc=1
+% \subsubsection{Page titre}
+% \else
+% \subsubsection{Title page}
+% \fi
+%
+% \begin{DescribeEnv}{GDpagetitre}
+% \ifnum\frenchdoc=1
+% Toute la page titre est g\'en\'er\'ee par le biais de cet environnement. Les auteurs n'ont qu'\`a inscrire
+% leurs informations personnelles dans les environnements +GDauthlist+, +GDaffillist+ et +GDemaillist+ d\'ecrits
+% ci-dessous pour compl\'eter la page.
+% \else
+% The entire title page is generated via this environment. To create the page, authors only need to type
+% their personal information in the +GDauthlist+, +GDaffillist+, and +GDemaillist+ environments described below.
+% \fi
+% \end{DescribeEnv}
+%
+% \begin{DescribeEnv}{GDauthlist}
+% \end{DescribeEnv}
+% \begin{DescribeMacro}{\GDauthitem}
+% \end{DescribeMacro}
+% \begin{DescribeMacro}{\GDrefsep}
+% \ifnum\frenchdoc=1
+% L'environnement +GDauthlist+ est une liste personnalis\'ee dans laquelle les auteurs y saisissent leur nom
+% complet \`a l'aide de la commande +\GDauthitem+, \`a raison d'un auteur par ligne. Les auteurs peuvent y
+% r\'ef\'erencer leurs affiliations avec la commande +\ref{}+, tel que d\'emontr\'e dans le \autoref{lst:gdauthlist}.
+% Dans le cas o\`u un auteur a plus d'une affiliation, il doit saisir une commande +\ref{}+
+% par affiliation en s\'eparant chacune d'entre elles par la commande +\GDrefsep+.
+% \else
+% The +GDauthlist+ environment is a customized list in which the authors enter their full name using the +\GDauthitem+
+% command (NB: one author per line). The authors can link their affiliations with the +\ref{}+ command, as demonstrated
+% in \autoref{lst:gdauthlist}. In the event that an author has more than one affiliation, they must use one +\ref{}+
+% command per affiliation, separating each one with a +\GDrefsep+ command.
+% \fi
+% \end{DescribeMacro}
+%
+% \iffalse
+%<*exampleone>
+% \fi
+% \begin{lstlisting}[name=pgtitlelists,float=h,caption=\lstcaptionone,label=lst:gdauthlist]
+\begin{GDauthlist}
+ \GDauthitem{Benoit Hamel\ref{affil:hec}}
+ \GDauthitem{Karine H\'ebert\ref{affil:gerad}\GDrefsep\ref{affil:hec}}
+\end{GDauthlist}
+\end{lstlisting}
+% \iffalse
+%</exampleone>
+% \fi
+%
+% \begin{DescribeEnv}{GDaffillist}
+% \end{DescribeEnv}
+% \begin{DescribeMacro}{\GDaffilitem}
+% \ifnum\frenchdoc=1
+% L'environnement +GDaffillist+ est une liste personnalis\'ee dans laquelle sont recens\'ees toutes les affiliations
+% des auteurs sans aucun ordre d'importance pr\'ed\'efini. Chaque affiliation est inscrite dans une commande
+% +\GDaffilitem+, le \emph{label} de l'affiliation \'etant inscrit entre les premi\`eres accolades, l'affiliation en tant que telle,
+% entre les secondes, tel qu'illustr\'e dans le \autoref{lst:gdaffillist}.
+% \else
+% The +GDaffillist+ environment is a customized list of all the authors’ affiliations, in no predefined order of
+% importance. Each affiliation is written with a +\GDaffilitem+ command with the label of the affiliation entered
+% between the first set of curly brackets, and the affiliation itself in the second, as shown in \autoref{lst:gdaffillist}.
+% \fi
+% \end{DescribeMacro}
+%
+% \iffalse
+%<*exampletwo>
+% \fi
+\begin{lstlisting}[name=pgtitlelists,float=h,caption=\lstcaptiontwo,label=lst:gdaffillist]
+\begin{GDaffillist}
+ \GDaffilitem{affil:hec}{HEC Montr\'eal}
+ \GDaffilitem{affil:gerad}{GERAD}
+\end{GDauthlist}
+\end{lstlisting}
+% \iffalse
+%</exampletwo>
+% \fi
+%
+% \begin{DescribeEnv}{GDemaillist}
+% \end{DescribeEnv}
+% \begin{DescribeMacro}{\GDemailitem}
+% \ifnum\frenchdoc=1
+% La derni\`ere liste personnalis\'ee cr\'e\'ee pour la page titre d'un cahier de recherche
+% est l'environnement +GDemaillist+ dans lequel sont recens\'ees les adresses courriel des
+% auteurs, \`a raison d'une adresse par commande +\GDemailitem+.
+% \else
+% The final customized list created for the title page of a \emph{Cahier} is the +GDemaillist+ environment,
+% where the authors’ email addresses are listed, with one email address per +\GDemailitem+ command.
+% \fi
+% \end{DescribeMacro}
+%
+% \iffalse
+%<*examplethree>
+% \fi
+\begin{lstlisting}[name=pgtitlelists,float=h,caption=\lstcaptionthree,label=lst:gdemaillist]
+\begin{GDemaillist}
+ \GDemailitem{benoit.2.hamel@hec.ca}
+ \GDemailitem{karine.hebert@gerad.ca}
+\end{GDauthlist}
+\end{lstlisting}
+% \iffalse
+%</examplethree>
+% \fi
+%
+% \ifnum\frenchdoc=1
+% \subsubsection{Section des r\'esum\'es}
+% \else
+% \subsubsection{Abstracts section}
+% \fi
+%
+% \begin{DescribeEnv}{GDabstract}
+% \ifnum\frenchdoc=1
+% \`A l'int\'erieur d'un cahier de recherche du GERAD, les r\'esum\'es fran\c{c}ais et anglais sont r\'edig\'es
+% dans un +paragraph+. M\^eme s'il aurait \'et\'e plus simple de n'inscrire qu'une commande +\paragraph+ par
+% r\'esum\'e dans le gabarit, les auteurs de cette classe ont choisi de conserver le format \og environnement \fg\
+% afin d'y ajouter de la mise en page et de reproduire le comportement de l'environnement +abstract+.
+% \else
+% In a GERAD working paper, the French and English abstracts are written in a single paragraph.
+% Even though it would have been simpler to write only one +\paragraph+ command per abstract in the template,
+% the authors of the class chose to use the ``environment'' format in order to add formatting and remain consistent
+% with the behaviour of the abstract environment.
+% \fi
+% \end{DescribeEnv}
+%
+% \begin{DescribeEnv}{GDacknowledgements}
+% \ifnum\frenchdoc=1
+% Dans les cahiers de recherche du GERAD, les remerciements sont un bloc de texte distinct qui ne correspond pas
+% \`a ce que la commande +\thanks+ donne en terme de mise en forme. Les auteurs r\'edigent donc leurs
+% remerciements dans leur ensemble dans l'environnement +GDacknowledgements+ et la classe \gdwp\ les
+% disposera en fonction du type de version choisie.
+% \else
+% In a GERAD working paper, the acknowledgements are in a distinct block of text that does not match what the
+% +\thanks+ command yields in terms of formatting. The authors therefore must write all their acknowledgements
+% in the GDacknowledgements environment, and the \gdwp\ class will handle the layout according to the chosen version.
+% \fi
+% \end{DescribeEnv}
+%
+% \ifnum\frenchdoc=1
+% \section{Le gabarit \texttt{geradwp.tex}}
+% \else
+% \section{The \texttt{geradwp.tex} template}
+% \fi
+% \label{sec:gabarit}
+%
+% \ifnum\frenchdoc=1
+% Le gabarit +geradwp.tex+ a \'et\'e con\c{c}u afin d'\^etre le plus simple possible et divis\'e de sorte que
+% le code source de chaque cahier soit uniforme. Voici une br\`eve pr\'esentation de ses diff\'erentes sections.
+% \else
+% The +geradwp.tex+ template was designed to be as simple as possible and is divided in a way that makes the
+% source code of each paper uniform. Here is a brief presentation of the different sections.
+% \fi
+%
+% \ifnum\frenchdoc=1
+% \subsection{\emph{Packages} par d\'efaut du cahier (lignes 104-117)}
+%
+% Tous les \emph{packages} qui ne sont pas charg\'es par d\'efaut dans le fichier de classe (voir le
+% \autoref{tab:pre-loaded-pkgs}) sont charg\'es dans cette section. C'est dans cette section que vous pourrez
+% choisir entre les \emph{packages} +algorithm+ et +algorithm2e+. C'est \'egalement ici que
+% vous devrez charger les \emph{packages} qui ont tendance \`a ne pas fonctionner ad\'equatement s'ils sont
+% charg\'es apr\`es le \emph{package} +hyperref+.
+% \else
+% \subsection{Default packages (lines 104-117)}
+%
+% All the packages that are not loaded by default in the class (see \autoref{tab:pre-loaded-pkgs})
+% are loaded in this section. It’s in this section that the choice between the +algorithm+ and +algorithm2e+
+% packages is made. Also, this is where you should load the packages that tend to malfunction if they are
+% loaded after the +hyperref+ package.
+% \fi
+%
+% \ifnum\frenchdoc=1
+% \subsection{Options par d\'efaut du cahier (lignes 118-132)}
+%
+% Si vous nommez le r\'epertoire dans lequel vous compilerez vos figures diff\'eremment que le nom que nous
+% lui avons donn\'e par d\'efaut ou si vous avez plus d'un r\'epertoire de figures, vous pourrez inscrire
+% ces informations ici.
+%
+% Si vous voulez ajouter des options de +hypersetup+, vous pouvez
+% \'egalement les inscrire ici, en prenant soin de ne pas supprimer ou modifier celles d\'ej\`a inscrites.
+%
+% Dans tous les autres cas, veuillez ne pas modifier cette section.
+% \else
+% \subsection{Default options (lines 118-132)}
+%
+% If the name of your folder containing your paper’s figures is named differently than the default name,
+% or if there are multiple folders with figures in them, this is where you can enter that information.
+%
+% If you want to add +hypersetup+ options without modifying or removing the default ones, you can do that here.
+%
+% In all other cases, this section should remain unchanged.
+% \fi
+%
+% \ifnum\frenchdoc=1
+% \subsection{Commandes de l'auteur (lignes 133-141)}
+%
+% Cette section vous appartient enti\`erement. Vous pouvez y charger les \emph{packages} n\'ecessaires \`a
+% votre r\'edaction de m\^eme que leurs options.
+%
+% C'est \'egalement dans cette section que vous pouvez inscrire vos commandes, environnements et
+% th\'eor\`emes personnalis\'es.
+% \else
+% \subsection{Author commands (lines 133-141)}
+%
+% This section belongs entirely to the author. This is where all the packages needed for the paper can be loaded,
+% as well as their options.
+%
+% This is also where customized commands, environments, and theorems can be entered.
+% \fi
+%
+% \ifnum\frenchdoc=1
+% \subsection{Métadonn\'ees du cahier (lignes 143-155)}
+%
+% Cette section, dont une partie est à la fin du pr\'eambule et l'autre dans l'environnement +GDpagetitre+, au
+% d\'ebut du document, est l'endroit o\`u vous devrez inscrire toutes les m\'etadonn\'ees bibliographiques
+% de votre cahier.
+% \else
+% \subsection{Metadata (lines 143-155)}
+%
+% This section is divided in two: the first is at the end of the preamble, and the second in the +GDpagetitre+
+% environment located at the beginning of the document. This is where all the bibliographical metadata for the
+% paper should be.
+% \fi
+%
+% \ifnum\frenchdoc=1
+% \subsection{R\'esum\'es, mots-cl\'es, remerciements, article (lignes 156 et suivantes)}
+%
+% Ces deux derni\`eres sections sont, bien entendu, les endroits o\`u vous r\'edigerez votre cahier de
+% recherche...
+% \else
+% \subsection{Abstracts, keywords, acknowledgements, article (starting at line 156)}
+%
+% These last two sections are, of course, where the body of the article will be.
+% \fi
+%
+% \StopEventually{
+% \clearpage
+% \PrintChanges
+% }
+%
+%
+% \appendix
+%
+% \ifnum\frenchdoc=1
+% \section{Code source de la classe}
+%
+% Vous retrouverez dans cette annexe le code source de la classe \gdwp.
+% Si vous avez envie de voir comment elle est programm\'ee, d'aider \`a la d\'eboguer,
+% \`a l'am\'eliorer, etc., cette section est pour vous!
+% \else
+% \section{Class source code}
+%
+% In this appendix, you will find the source code for the \gdwp\ class.
+% If you’re interested to see how it’s programmed, or help with debugging or improving the class,
+% this section is for you.
+% \fi
+%
+% \ifnum\frenchdoc=1
+% \subsection{Tests et valeurs bool\'eennes}
+%
+% Pour effectuer les tests conditionnels, la classe utilise le \emph{package} +ifthen+. Les variables
+% bool\'eennes servent \`a d\'eterminer quelle version d'un cahier on souhaite g\'en\'erer, \`a quelle
+% \'etape de publication le cahier est rendu de m\^eme qu'\`a configurer des portions de mise en page.
+% Une fois les variables cr\'e\'ees, des valeurs par d\'efaut leur sont attribu\'ees.
+% \else
+% \subsection{Tests and boolean values}
+%
+% To do conditional tests, the class uses the +ifthen+ package. The boolean variables
+% identify which version of the paper to generate, how far in the publication process the paper is and
+% it configures some parts of the formatting. Once the variables have been created, default values
+% are set.
+% \fi
+%
+% \begin{macrocode}
+%<*class>
+\RequirePackage{ifthen}
+
+% Booleans %
+\newboolean{GD@isWebVersion}
+\newboolean{GD@isPaperVersion}
+\newboolean{GD@isPlainVersion}
+\newboolean{GD@needsSmallHeadSep}
+\newboolean{GD@isFinalImpression}
+\newboolean{GD@isPostPublication}
+\newboolean{GD@isRevised}
+\newboolean{GD@needsminitabs}
+
+\setboolean{GD@isWebVersion}{false}
+\setboolean{GD@isPaperVersion}{true}
+\setboolean{GD@isPlainVersion}{false}
+\setboolean{GD@needsSmallHeadSep}{false}
+\setboolean{GD@isFinalImpression}{false}
+\setboolean{GD@isPostPublication}{false}
+\setboolean{GD@isRevised}{false}
+\setboolean{GD@needsminitabs}{false}
+% \end{macrocode}
+%
+% \ifnum\frenchdoc=1
+% \subsection{Options de la classe}
+%
+% Les quelques options de la classe sont d\'eclar\'ees ci-dessous. Elles servent essentiellement
+% \`a changer des valeurs bool\'eennes et \`a passer des options \`a la classe +article+.
+% \else
+% \subsection{Class options}
+%
+% The few class options are declared here. They essentially change some boolean values
+% and pass some options to the +article+ class.
+% \fi
+%
+% \begin{macrocode}
+
+% Class Options %
+\DeclareOption{gdweb}{%
+ \setboolean{GD@isWebVersion}{true}
+ \setboolean{GD@isPaperVersion}{false}
+ \setboolean{GD@isPlainVersion}{false}
+ \PassOptionsToClass{oneside}{article}
+}
+\DeclareOption{gdpaper}{%
+ \setboolean{GD@isWebVersion}{false}
+ \setboolean{GD@isPaperVersion}{true}
+ \setboolean{GD@isPlainVersion}{false}
+ \PassOptionsToClass{twoside}{article}
+}
+\DeclareOption{gdplain}{%
+ \setboolean{GD@isWebVersion}{false}
+ \setboolean{GD@isPaperVersion}{false}
+ \setboolean{GD@isPlainVersion}{true}
+ \PassOptionsToClass{oneside}{article}
+}
+\DeclareOption{gdsmallhead}{%
+ \setboolean{GD@needsSmallHeadSep}{true}
+}
+\DeclareOption{gdfinal}{%
+ \setboolean{GD@isFinalImpression}{true}
+}
+\DeclareOption{gdpostpub}{%
+ \setboolean{GD@isPostPublication}{true}
+}
+\DeclareOption{gdrevised}{%
+ \setboolean{GD@isRevised}{true}
+}
+\DeclareOption{gdminitabs}{%
+ \setboolean{GD@needsminitabs}{true}
+}
+% \end{macrocode}
+%
+% \ifnum\frenchdoc=1
+% \subsection{Chargement de la classe}
+%
+% La classe est charg\'ee dans le document avec toutes les options
+% d\'eclar\'ees par l'utilisateur et celles par d\'efaut.
+% \else
+% \subsection{Loading the class}
+%
+% The class is loaded in the document with all the user-defined or default values.
+% \fi
+%
+% \begin{macrocode}
+
+% Standard Class Loading %
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
+\ProcessOptions\relax
+\LoadClass[letterpaper,10pt]{article}
+% \end{macrocode}
+%
+% \ifnum\frenchdoc=1
+% \subsection{\emph{Packages} charg\'es par d\'efaut et leurs options}
+%
+% Tr\`es peu de \emph{packages} sont charg\'es avec la classe afin de vous permettre
+% de r\'ediger avec la plus grande flexibilit\'e possible. Ceux qui le sont, cependant,
+% le sont pour des fins d'harmonisation entre les diff\'erents cahiers de la collection.
+% \else
+% \subsection{Defaut packages and their options}
+%
+% Very few packages are loaded with the class in order to allow the user to write with
+% the greatest possible flexibility. The packages that are loaded, however, ensure that
+% all the papers in the collection have consistent formatting.
+% \fi
+%
+% \begin{macrocode}
+
+% Required Packages %
+\RequirePackage{amssymb}
+\RequirePackage{amsmath}
+\RequirePackage{amsthm}
+\RequirePackage{amsfonts}
+\RequirePackage{latexsym}
+\RequirePackage{graphicx}
+\RequirePackage{mathrsfs}
+\RequirePackage{geometry}
+\RequirePackage{fancyhdr}
+\RequirePackage{booktabs}
+\RequirePackage{multirow}
+\RequirePackage{array}
+\RequirePackage[font={footnotesize,bf,sf}]{caption}
+\RequirePackage{color}
+\RequirePackage{enumitem}
+\ifthenelse{\boolean{GD@needsminitabs}}{%
+ \RequirePackage{float}
+}{}
+
+% Required Packages Setup %
+\definecolor{gris}{rgb}{0.44,0.44,0.44} % color pkg setup
+\captionsetup[table]{skip=5pt} % caption pkg setup
+% \end{macrocode}
+%
+% \ifnum\frenchdoc=1
+% \subsection{Mise en page}
+%
+% Nous commen\c{c}ons d'abord par d\'efinir les \emph{lengths} du document.
+% Celles-ci peuvent changer d'une version \`a l'autre d'un cahier.
+% \else
+% \subsection{Formatting}
+%
+% We begin by defining the lengths of the document. These can change from
+% one version of the paper to another.
+% \fi
+%
+% \begin{macrocode}
+
+% Lengths %
+\newlength{\GD@authitemsep}
+\newlength{\GD@authtopsep}
+\newlength{\GD@affilitemsep}
+\newlength{\GD@affiltopsep}
+\newlength{\GD@titleminipage@hspace}
+\ifthenelse{\boolean{GD@isPlainVersion}}{%
+ \setlength{\GD@authitemsep}{0pt}
+ \setlength{\GD@authtopsep}{12pt}
+ \setlength{\GD@affilitemsep}{0pt}
+ \setlength{\GD@affiltopsep}{9pt}
+}{%
+ \setlength{\GD@authitemsep}{8pt}
+ \setlength{\GD@authtopsep}{24pt}
+ \setlength{\GD@affilitemsep}{6pt}
+ \setlength{\GD@affiltopsep}{9pt}
+}
+\ifthenelse{\boolean{GD@isPaperVersion}}{%
+ \setlength{\GD@titleminipage@hspace}{240pt}
+}{}
+\ifthenelse{\boolean{GD@isWebVersion}}{%
+ \setlength{\GD@titleminipage@hspace}{227pt}
+}{}
+% \end{macrocode}
+%
+% \ifnum\frenchdoc=1
+% Nous \'etablissons ensuite la g\'eom\'etrie du document,
+% qui diff\`ere d'une version \`a l'autre.
+% \else
+% We then set up the geometry of the document, which varies from one version to another.
+% \fi
+%
+% \begin{macrocode}
+
+% Geometry %
+\ifthenelse{\boolean{GD@isWebVersion}}{%
+ \geometry{tmargin=1.5cm,%
+ bmargin=2cm,%
+ lmargin=3cm,%
+ rmargin=3cm,%
+ nofoot,%
+ headsep=30pt,%
+ includehead}
+}{}
+\ifthenelse{\boolean{GD@isPlainVersion}}{%
+ \geometry{tmargin=1.5cm,%
+ bmargin=2cm,%
+ lmargin=3cm,%
+ rmargin=3cm,%
+ nofoot,%
+ headsep=30pt,%
+ includehead}
+}{}
+\ifthenelse{\boolean{GD@isPaperVersion}}{%
+ \geometry{tmargin=1.5cm,%
+ bmargin=2cm,%
+ lmargin=3cm,%
+ rmargin=2cm,%
+ nofoot,%
+ headsep=30pt,%
+ includehead}
+}{}
+\ifthenelse{\boolean{GD@needsSmallHeadSep}}{%
+ \headsep=15pt
+}{}
+\parindent=15pt
+\parskip=7pt plus 1pt minus 1pt
+\g@addto@macro\@floatboxreset\centering
+\widowpenalty=10000
+\clubpenalty=10000
+\raggedbottom
+\allowdisplaybreaks
+% \end{macrocode}
+%
+% \ifnum\frenchdoc=1
+% Nous ajoutons une touche d'uniformit\'e en modifiant les ent\^etes de sections, en descendant
+% la hi\'erarchie jusqu'au +\paragraph+. Entres autres, nous assignons la police +\sffamily+
+% aux ent\^etes, police que nous utiliserons \'egalement pour les th\'eor\`emes et +proof+.
+% \else
+% We add a touch of consistency by modifying the section headers, going down the hierarchy all
+% the way down to +\paragraph+. Among other changes, we assign the font +\sffamily+ to the headers,
+% theorems, and proof.
+% \fi
+%
+% \begin{macrocode}
+
+% Section headings %
+\renewcommand{\section}{\@startsection {section}{1}{\z@}%
+ {-2ex \@plus -1ex \@minus -.2ex}%
+ {1ex \@plus.2ex}%
+ {\normalfont\Large\sffamily\bfseries}}
+\renewcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
+ {-1.25ex\@plus -1ex \@minus -.2ex}%
+ {.75ex \@plus .2ex}%
+ {\normalfont\large\sffamily\bfseries}}
+\renewcommand{\subsubsection}{\@startsection{subsubsection}{3}%
+ {\z@}%
+ {-1.25ex\@plus -1ex \@minus -.2ex}%
+ {.75ex \@plus .2ex}%
+ {\normalfont\normalsize\sffamily\bfseries}}
+\renewcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
+ {-1.25ex \@plus 1ex \@minus -.2ex}%
+ {-.5em \@plus -.1em}%
+ {\normalfont\normalsize\sffamily\bfseries}}
+\setlength{\partopsep}{.5ex \@plus .1ex} %% to reduce spaces
+\def\@listI{\leftmargin\leftmargini %% above, between and under
+ \parsep .25ex \@plus .1ex %% lists - itemize
+ \topsep .25ex \@plus .1ex %% description - enumerate
+ \itemsep \parsep}
+\let\@listi\@listI
+\@listi
+% \end{macrocode}
+%
+% \ifnum\frenchdoc=1
+% Nous redimensionnons les immenses tableaux qui dépassent des marges.
+% \else
+% We resize oversized tables that extend past the margins.
+% \fi
+%
+% \begin{macrocode}
+
+% Resizing of huge tables %
+\ifthenelse{\boolean{GD@needsminitabs}}{%
+ \floatstyle{plaintop}
+ \restylefloat{table}
+ \let\oldtabular\tabular
+ \renewcommand{\tabular}{\footnotesize\oldtabular}
+ \let\oldtable\table
+}{}
+% \end{macrocode}
+%
+% \ifnum\frenchdoc=1
+% Finalement, nous ajustons la mise en forme des th\'eor\`emes et de
+% l'environnement +proof+ afin qu'elle soit uniforme avec tout le reste.
+% \else
+% Finally, we adjust the formatting of the theorems and of the +proof+
+% environment so they are consistent with everything else.
+% \fi
+%
+% \begin{macrocode}
+
+% Theorems and proof layout %
+\newtheoremstyle{gerad}%
+{3pt}% Space above
+{3pt}% Space below
+{}{}%
+{\sffamily\bfseries}% head font
+{.}% Punctuation
+{.5em}% Space after theorem head
+{}
+\theoremstyle{gerad}
+
+\renewenvironment{proof}[1][\proofname]{\par
+ \pushQED{\qed}%
+ \normalfont \topsep6\p@\@plus6\p@\relax
+ \trivlist
+ \item\relax
+ {\bfseries\sffamily
+ #1\@addpunct{.}}\hspace\labelsep\ignorespaces
+}{%
+ \popQED\endtrivlist\@endpefalse
+}
+% \end{macrocode}
+%
+% \ifnum\frenchdoc=1
+% \subsection{Commandes privées de la classe}
+%
+% Les commandes priv\'ees jouent deux r\^oles distincts : 1) stocker et
+% r\'eutiliser les m\'etadonn\'ees du document; 2) d\'ecortiquer de
+% larges portions de codes afin d'en \'eviter la r\'ep\'etition.
+% \else
+% \subsection{Private class commands}
+%
+% Private commands play two separate roles: 1) storing and reusing the
+% document’s metadata; 2) isolate large blocks of code to prevent code duplication.
+% \fi
+%
+% \ifnum\frenchdoc=1
+% \subsubsection{M\'etadonn\'ees}
+% \else
+% \subsubsection{Metadata}
+% \fi
+% \label{ann:private-meta}
+%
+% \ifnum\frenchdoc=1
+% Les commandes ci-dessous stockent les m\'etadonn\'ees inscrites dans
+% les commandes publiques correspondantes et populent diff\'erentes
+% parties du cahier, comme les ent\^etes, la page couverture et la page
+% titre.
+% \else
+% The following commands store the metadata in the associated public
+% commands and populate different parts of the paper such as the headers,
+% cover page and title page.
+% \fi
+%
+% \begin{macrocode}
+
+% Class Private Commands %
+% Metadata %
+\newcommand{\gd@annee}{}
+\newcommand{\gd@mois}{}
+\newcommand{\gd@month}{}
+\newcommand{\gd@numero}{}
+\newcommand{\gd@titre}{}
+\newcommand{\gd@auteurs@short}{}
+\newcommand{\gd@auteurs@copyright}{}
+\newcommand{\gd@postpubcitation}{}
+\newcommand{\gd@postpubcitation@url}{}
+\newcommand{\gd@revised}{}
+% \end{macrocode}
+%
+% \ifnum\frenchdoc=1
+% \subsubsection{Page couverture et page titre}
+%
+% La page couverture et la page titre changent en fonction non seulement
+% de la version du cahier qui est g\'en\'er\'ee, mais aussi en fonction
+% de l'\'etape de publication. Plut\^ot que de r\'ep\'eter le m\^eme code
+% plus d'une fois, les pages couverture et titre ont \'et\'e d\'cortiqu\'ees
+% en sections qui sont appel\'ees en fonction des crit\`eres mentionn\'es
+% ci-dessus.
+%
+% La page couverture s'affiche dans toutes les versions du cahier, \`a
+% l'exception de +gdplain+. Les commandes suivantes servent \`a son affichage.
+% La portion inf\'erieure de la page est diff\'erente si l'option
+% +gdpostpub+ est utilis\'ee.
+% \else
+% \subsubsection{Cover and title pages}
+%
+% The cover page and the title page change according to the version of the
+% paper being generated and its publication stage. Rather than duplicating
+% code, the cover and title pages have been separated into sections that are
+% called up with the criteria mentioned above.
+%
+% The cover page displays in every version of the paper except +gdplain+.
+% The following commands define its appearance. The bottom part of the page
+% is different if the +gdpostpub+ option is used.
+% \fi
+%
+% \begin{macrocode}
+
+% Cover page
+\newcommand{\GD@cover}{%
+ \ifthenelse{\boolean{GD@isFinalImpression}}{}{%
+ \overfullrule=5pt
+ }
+
+ \pagestyle{empty}
+ \begin{titlepage}
+ \sffamily
+ \ifthenelse{\boolean{GD@needsSmallHeadSep}}{%
+ \vspace*{35pt}
+ }{}
+
+ {\noindent{\large\bfseries Les Cahiers du GERAD}\hfill ISSN:\quad
+ 0711--2440}
+ \ifthenelse{\boolean{GD@isWebVersion}}{%
+
+ \vspace*{54pt}
+ {\noindent\LARGE\bfseries \gd@titre\par} %Title
+
+ \vspace*{18pt}
+ {\noindent\Large\gd@auteurs@short\par}
+ }{}
+
+ \vfill
+ \hspace*{\GD@titleminipage@hspace}
+ \begin{minipage}[c][5.4cm][c]{7cm}
+ {\ifthenelse{\boolean{GD@isWebVersion}}%
+ {\GDcover@minipagetable@web}%
+ {\GDcover@minipagetable@paper}%
+ }
+ \end{minipage}
+
+ \vfill
+
+ \ifthenelse{\boolean{GD@isPostPublication}}{%
+ \GDcover@bottom@postpub
+ }{%
+ \GDcover@bottom@regular
+ }
+ \end{titlepage}
+}
+
+% Cover page minipage table (web version)
+\newcommand{\GDcover@minipagetable@web}{%
+ \begin{tabular}{p{.5cm}|p{5.5cm}}
+ & \normalsize G--\gd@annee--\gd@numero
+ \ifthenelse{\boolean{GD@needsminitabs}}%
+ {\\*[10pt]}%
+ {\\*[8pt]}
+ & \normalsize\gd@month\ \gd@annee
+ \ifthenelse{\boolean{GD@isRevised}}{%
+ \\
+ &\normalsize Revised: \gd@revised
+ }{}
+ \end{tabular}
+}
+
+% Cover page minipage table (paper version)
+\newcommand{\GDcover@minipagetable@paper}{%
+ \begin{tabular}{p{.5cm}|p{5.5cm}}
+ \multicolumn{2}{p{6.5cm}}{\normalsize\bfseries \gd@titre
+ \ifthenelse{\boolean{GD@needsminitabs}}%
+ {\vspace*{12.5pt}}%
+ {\vspace*{10pt}}}\\
+ & \normalsize\gd@auteurs@short \\ %Initials. Name
+ & \ifthenelse{\boolean{GD@needsminitabs}}%
+ {\\*[15pt]}%
+ {\\*[12pt]}
+ & \normalsize G--\gd@annee--\gd@numero
+ \ifthenelse{\boolean{GD@needsminitabs}}%
+ {\\*[10pt]}%
+ {\\*[8pt]}
+ & \normalsize\gd@month\ \gd@annee
+ \ifthenelse{\boolean{GD@isRevised}}{%
+ \\
+ &\normalsize Revised: \gd@revised
+ }{}
+ \end{tabular}
+}
+
+% Regular cover page bottom
+\newcommand{\GDcover@bottom@regular}{%
+ \hrule
+ \smallskip
+
+ \noindent\begin{minipage}[t][][l]{7.5cm}
+ \scriptsize
+ La collection \textit{Les Cahiers du GERAD} est constitu\'{e}e des
+ travaux de recherche men\'{e}s par nos membres. La plupart de ces
+ documents de travail a \'{e}t\'{e} soumis \`{a} des revues avec
+ comit\'{e} de r\'{e}vision. Lorsqu'un document est accept\'{e} et
+ publi\'{e}, le pdf original est retir\'{e} si c'est n\'{e}cessaire et
+ un lien vers l'article publi\'{e} est ajout\'{e}.\\
+
+ \medskip
+ \scriptsize
+ \textbf{Citation sugg\'{e}r\'{e}e :} \gd@auteurs@short~(\gd@mois\
+ \gd@annee). \gd@titre, Rapport technique, Les Cahiers du GERAD G--
+ \gd@annee--\gd@numero, GERAD, HEC Montr\'{e}al, Canada.\\
+
+ \textbf{Avant de citer ce rapport technique,} veuillez visiter notre
+ site Web (\url{https://www.gerad.ca/fr/papers/G-\gd@annee-\gd@numero})
+ afin de mettre \`a jour vos donn\'ees de r\'ef\'erence, s'il a \'et\'e
+ publi\'e dans une revue scientifique.\par
+ \end{minipage}
+ \hfill
+ \begin{minipage}[t][][l]{7.5cm}
+ \scriptsize
+ The series \textit{Les Cahiers du GERAD} consists of working papers
+ carried out by our members. Most of these pre-prints have been submitted
+ to peer-reviewed journals. When accepted and published, if necessary,
+ the original pdf is removed and a link to the published article is
+ added.\\ \\
+
+ \scriptsize
+ \textbf{Suggested citation:} \gd@auteurs@short~(\gd@month\ \gd@annee).
+ \gd@titre, Technical report, Les Cahiers du GERAD G--\gd@annee--\gd@numero,
+ GERAD, HEC Montr\'{e}al, Canada.\\
+
+ \textbf{Before citing this technical report,} please visit our website
+ (\url{https://www.gerad.ca/en/papers/G-\gd@annee-\gd@numero}) to update
+ your reference data, if it has been published in a scientific journal.
+ \par
+ \end{minipage}
+
+ \bigskip
+ \hrule
+ \smallskip
+
+ \noindent\begin{minipage}[t][2.1cm][l]{7.5cm}
+ \scriptsize
+ La publication de ces rapports de recherche est rendue possible gr\^ace
+ au soutien de HEC Montr\'eal, Polytechnique Montr\'eal, Universit\'e
+ McGill, Universit\'e du Qu\'ebec \`a Montr\'eal, ainsi que du Fonds de
+ recherche du Qu\'ebec -- Nature et technologies.
+
+ \medskip
+ D\'ep\^ot l\'egal -- Biblioth\`eque et Archives nationales du Qu\'ebec,
+ \gd@annee\\
+ \phantom{Depot legal} -- Biblioth\`eque et Archives Canada, \gd@annee
+ \par
+ \end{minipage}
+ \hfill
+ \begin{minipage}[t][2.1cm][l]{7.5cm}
+ \scriptsize
+ The publication of these research reports is made possible
+ thanks to the support of HEC Montr\'eal, Polytechnique Montr\'eal,
+ McGill University, Universit\'e du Qu\'ebec \`a Montr\'eal, as well as
+ the Fonds de recherche du Qu\'ebec -- Nature et technologies.
+
+ \medskip
+ Legal deposit -- Biblioth\`eque et Archives nationales du Qu\'ebec,
+ \gd@annee\\
+ \phantom{Legal deposit} -- Library and Archives Canada, \gd@annee\par
+ \end{minipage}
+
+ \hrule
+ \smallskip
+
+ \noindent
+ \begin{minipage}[t][1cm][l]{7.5cm}
+ \begin{scriptsize}\raggedleft
+ \textbf{GERAD} HEC Montr\'eal
+
+ 3000, chemin de la C\^ote-Sainte-Catherine
+
+ Montr\'eal (Qu\'ebec) Canada H3T 2A7\par
+ \end{scriptsize}
+ \end{minipage}
+ \hspace*{.35cm}\vrule\hfill
+ \begin{minipage}[t][1cm][l]{7.5cm}
+ \begin{scriptsize}
+ \textbf{T\'el.\,: 514 340-6053}
+
+ T\'el\'ec.\,: 514 340-5665
+
+ info@gerad.ca
+
+ www.gerad.ca\par
+ \end{scriptsize}
+ \end{minipage}
+
+ \bigskip
+ \hrule
+}
+
+% Post-publication cover page bottom
+\newcommand{\GDcover@bottom@postpub}{%
+ \hrule
+ \smallskip
+
+ \noindent
+ \begin{minipage}[t][][l]{7.5cm}
+ \scriptsize
+ La collection \textit{Les Cahiers du GERAD} est constitu\'{e}e des
+ travaux de recherche men\'{e}s par nos membres. La plupart de ces
+ documents de travail a \'{e}t\'{e} soumis \`{a} des revues avec comit\'e
+ de r\'{e}vision. Lorsqu'un document est accept\'{e} et publi\'{e}, le
+ pdf original est retir\'{e} si c'est n\'{e}cessaire et un lien vers
+ l'article publi\'{e} est ajout\'{e}.\par
+ \end{minipage}
+ \hfill
+ \begin{minipage}[t][][l]{7.5cm}
+ \scriptsize
+ The series \textit{Les Cahiers du GERAD} consists of working papers
+ carried out by our members. Most of these pre-prints have been submitted
+ to peer-reviewed journals. When accepted and published, if necessary,
+ the original pdf is removed and a link to the published article is
+ added.\par
+ \end{minipage}
+
+ \noindent
+ \begin{minipage}[t][][l]{\textwidth}
+ \footnotesize
+ \textbf{CITATION ORIGINALE / ORIGINAL CITATION}
+ \smallskip
+
+ \gd@postpubcitation\ \url{\gd@postpubcitation@url}.
+ \end{minipage}
+
+ \bigskip
+
+ \hrule
+ \smallskip
+
+ \noindent
+ \begin{minipage}[t][2.1cm][l]{7.5cm}
+ \scriptsize
+ \medskip
+ La publication de ces rapports de recherche est rendue possible gr\^ace
+ au soutien de HEC Montr\'eal, Polytechnique Montr\'eal, Universit\'e
+ McGill, Universit\'e du Qu\'ebec \`a Montr\'eal, ainsi que du Fonds de
+ recherche du Qu\'ebec -- Nature et technologies.
+
+ \medskip
+ D\'ep\^ot l\'egal -- Biblioth\`eque et Archives nationales du Qu\'ebec,
+ 2020\\
+ \phantom{Depot legal} -- Biblioth\`eque et Archives Canada, 2020\par
+ \end{minipage}
+ \hfill
+ \begin{minipage}[t][2.1cm][l]{7.5cm}
+ \scriptsize
+ \medskip
+ The publication of these research reports is made possible
+ thanks to the support of HEC Montr\'eal, Polytechnique Montr\'eal,
+ McGill University, Universit\'e du Qu\'ebec \`a Montr\'eal, as well as
+ the Fonds de recherche du Qu\'ebec -- Nature et technologies.
+
+ \medskip
+ Legal deposit -- Biblioth\`eque et Archives nationales du Qu\'ebec,
+ 2020\\
+ \phantom{Legal deposit} -- Library and Archives Canada, 2020\par
+ \end{minipage}
+
+ \hrule
+ \smallskip
+
+ \noindent
+ \begin{minipage}[t][1cm][l]{7.5cm}
+ \begin{scriptsize}\raggedleft
+ \textbf{GERAD} HEC Montr\'eal
+
+ 3000, chemin de la C\^ote-Sainte-Catherine
+
+ Montr\'eal (Qu\'ebec) Canada H3T 2A7\par
+ \end{scriptsize}
+ \end{minipage}
+ \hspace*{.35cm}\vrule\hfill
+ \begin{minipage}[t][1cm][l]{7.5cm}
+ \begin{scriptsize}
+ \textbf{T\'el.\,: 514 340-6053}
+
+ T\'el\'ec.\,: 514 340-5665
+
+ info@gerad.ca
+
+ www.gerad.ca\par
+ \end{scriptsize}
+ \end{minipage}
+
+ \bigskip
+ \hrule
+}
+% \end{macrocode}
+%
+% \ifnum\frenchdoc=1
+% La page titre s'affiche dans toutes les versions du cahier, mais
+% diffère en fonction des versions. Étant donné qu'elle est contenue
+% dans l'environnement +GDpagetitre+, les commandes internes pour son
+% affichage sont divisées en deux parties +@begin+ et +@end+.
+% \else
+% The title page appears in all versions of the paper, but it varies
+% according to the version. Given that it is contained in the +GDpagetitre+
+% environment, the internal commands for the title page’s display are
+% divided into two parts: +@begin+ and +@end+.
+% \fi
+%
+% \begin{macrocode}
+
+% Regular title page
+\newcommand{\GD@titlepage@begin}{%
+ \ifthenelse{\boolean{GD@isWebVersion}}{%
+ \newpage\clearpage
+ }{%
+ \ifthenelse{\boolean{GD@isPaperVersion}}{%
+ \newpage\cleardoublepage
+ }{}
+ }
+ \parindent=0pt
+ \sffamily
+ {\LARGE\bfseries \gd@titre\par} %Title
+ \begin{minipage}[t][10cm][l]{7.5cm}
+ \vspace*{55pt}
+}
+
+\newcommand{\GD@titlepage@end}{%
+ \vfill
+\end{minipage}
+\vfill
+{\bfseries \gd@month\ \gd@annee}\\*
+\ifthenelse{\boolean{GD@isRevised}}%
+ {\\ \gd@revised \\}%
+ {}
+{\bfseries Les Cahiers du GERAD}\\
+{\bfseries G--\gd@annee--\gd@numero}\\
+{\footnotesize Copyright \copyright\ \gd@annee\ GERAD,
+ \gd@auteurs@copyright}
+\vspace*{0.05cm}
+
+\hrule
+\smallskip
+
+\noindent
+\begin{minipage}[t][][l]{7.5cm}
+ \begin{scriptsize}
+ Les textes publi\'es dans la s\'erie des rapports de recherche
+ \textit{Les Cahiers du GERAD} n'engagent que la responsabilit\'e de
+ leurs auteurs. Les auteurs conservent leur droit d'auteur et leurs
+ droits moraux sur leurs publications et les utilisateurs s'engagent \`a
+ reconna\^{\i}tre et respecter les exigences l\'{e}gales associ\'{e}es
+ \`{a} ces droits. Ainsi, les utilisateurs:
+ \begin {itemize}
+ \item Peuvent t\'{e}l\'{e}charger et imprimer une copie de toute
+ publication du portail public aux fins d'\'{e}tude ou de recherche
+ priv\'{e}e;
+ \item Ne peuvent pas distribuer le mat\'{e}riel ou l'utiliser pour une
+ activit\'{e} \`{a} but lucratif ou pour un gain commercial;
+ \item Peuvent distribuer gratuitement l'URL identifiant la publication.
+ \end{itemize}
+ Si vous pensez que ce document enfreint le droit d'auteur, contactez-
+ nous en fournissant des d\'etails. Nous supprimerons imm\'{e}diatement
+ l'acc\`es au travail et enqu\^{e}terons sur votre demande.\par
+\end{scriptsize}
+\end{minipage}
+\hfill
+\begin{minipage}[t][][l]{7.5cm}
+\begin{scriptsize}
+ The authors are exclusively responsible for the content of their
+ research papers published in the series \textit{Les Cahiers du GERAD}.
+ Copyright and moral rights for the publications are retained by the
+ authors and the users must commit themselves to recognize and abide the
+ legal requirements associated with these rights. Thus, users:
+ \begin{itemize}
+ \item May download and print one copy of any publication from the public
+ portal for the purpose of private study or research;
+ \item May not further distribute the material or use it for any
+ profit-making activity or commercial gain;
+ \item May freely distribute the URL identifying the publication.
+ \end{itemize}
+ If you believe that this document breaches copyright please contact us
+ providing details, and we will remove access to the work immediately and
+ investigate your claim.\par
+\end{scriptsize}
+\end{minipage}
+
+\thispagestyle{empty}
+\parindent=15pt
+\newpage
+}
+
+% Plain title page
+\newcommand{\GD@plain@titlepage@begin}{%
+ \thispagestyle{empty}
+ \sffamily
+ {\sffamily\LARGE\bfseries\noindent\gd@titre\par}
+}
+
+\newcommand{\GD@plain@pagetitle@end}{%
+ \vspace*{12pt}
+ {\noindent\gd@mois\ \gd@annee}
+ \vspace*{30pt}
+}
+% \end{macrocode}
+%
+% \ifnum\frenchdoc=1
+% \subsection{Commandes et environnements publics de la classe}
+%
+% Les commandes publiques sont celles directement accessibles à l'utilisateur.
+% Cependant, elles sont toutes li\'ees \`a une partie du cahier et ne peuvent
+% donc pas \^etre r\'eutilis\'ees ou d\'eplac\'ees.
+% \else
+% \subsection{Public class commands and environments}
+%
+% The public commands are those that can be directly accessed by the user.
+% They are, however, each linked to a specific part of the paper, and thus
+% cannot be reused or moved.
+% \fi
+%
+% \ifnum\frenchdoc=1
+% \subsubsection{M\'etadonn\'ees}
+% Les commandes suivantes sont celles o\`u l'utilisateur saisit les donn\'ees
+% bibliographiques de son cahier. Elles modifient la valeur des commandes
+% priv\'ees correspondantes (voir la \autoref{ann:private-meta}).
+% \else
+% \subsubsection{Metadata}
+% The following commands are those users use to enter their paper’s
+% bibliographical data. They modify the values of the corresponding private
+% commands (see \autoref{ann:private-meta}).
+% \fi
+%
+% \begin{macrocode}
+
+% Metadata public commands
+\newcommand{\GDannee}[1]{%
+ \renewcommand{\gd@annee}{#1}
+}
+\newcommand{\GDmois}[2]{%
+ \renewcommand{\gd@mois}{#1}
+ \renewcommand{\gd@month}{#2}
+}
+\newcommand{\GDnumero}[1]{%
+ \renewcommand{\gd@numero}{#1}
+}
+\newcommand{\GDtitre}[1]{%
+ \renewcommand{\gd@titre}{#1}
+}
+\newcommand{\GDauteursCourts}[1]{%
+ \renewcommand{\gd@auteurs@short}{#1}
+}
+\newcommand{\GDauteursCopyright}[1]{%
+ \renewcommand{\gd@auteurs@copyright}{#1}
+}
+\newcommand{\GDpostpubcitation}[2]{%
+ \renewcommand{\gd@postpubcitation}{#1}
+ \renewcommand{\gd@postpubcitation@url}{#2}
+}
+\newcommand{\GDrevised}[1]{%
+ \renewcommand{\gd@revised}{#1}
+}
+% \end{macrocode}
+%
+% \ifnum\frenchdoc=1
+% \subsubsection{Subdivisions du document}
+%
+% Chaque partie d'un cahier de recherche a ses particularit\'es, tant au niveau
+% de la géométrie que de la mise en page (ent\^etes, pieds de page, etc.) Plut\^ot
+% que d'engorger le gabarit avec de multiples lignes de code, quelques commandes
+% et environnements ont \'et\'e cr\'e\'es afin de les regrouper.
+% \else
+% \subsubsection{Document subdivisions}
+%
+% Each part of the paper has specific characteristics in terms of geometry and
+% formatting (headers, footers, etc.). Rather than bloating the template with
+% multiple lines of code, a few commands and environments were created to group them
+% together.
+% \fi
+%
+% \begin{macrocode}
+
+% Cover page
+\newcommand{\GDpageCouverture}{%
+ \ifthenelse{\boolean{GD@isPlainVersion}}{}{\GD@cover}
+}
+
+% Title page
+\newenvironment{GDpagetitre}{
+ \ifthenelse{\boolean{GD@isPlainVersion}}%
+ {\GD@plain@titlepage@begin}%
+ {\GD@titlepage@begin}
+}{
+ \ifthenelse{\boolean{GD@isPlainVersion}}%
+ {\GD@plain@pagetitle@end}%
+ {\GD@titlepage@end}
+}
+
+% Title page lists and list items
+\newlist{GDauthlist}{itemize}{1}
+\setlist[GDauthlist]{label={},%
+ left=0pt .. 0pt,%
+ itemsep=\GD@authitemsep,%
+ topsep=\GD@authtopsep}
+\newlist{GDaffillist}{enumerate}{1}
+\setlist[GDaffillist]{label=\textsuperscript{\emph{\alph*}},%
+ ref=\textsuperscript{\emph{\alph*}},%
+ wide,%
+ left=0pt .. 1em,%
+ itemsep=\GD@affilitemsep,%
+ topsep=\GD@affiltopsep}
+\newlist{GDemaillist}{itemize}{1}
+\setlist[GDemaillist]{label={},%
+ left=0pt .. 0pt,%
+ itemsep=0pt,%
+ parsep=0pt}
+\newcommand{\GDrefsep}{\textsuperscript{,\,}}
+\newcommand{\GDauthitem}[1]{%
+ \ifthenelse{\boolean{GD@isPlainVersion}}{%
+ \item {\sffamily\large\bfseries #1}
+ }{%
+ \item {\Large\bfseries #1}
+ }
+}
+\newcommand{\GDaffilitem}[2]{\item \label{#1}{\itshape #2}}
+\newcommand{\GDemailitem}[1]{\item {\small\ttfamily #1}}
+
+% Abstracts section
+\newcommand{\GDabstracts}{%
+ \ifthenelse{\boolean{GD@isPlainVersion}}{}{%
+ \setcounter{page}{2}
+ \renewcommand{\thepage}{\roman{page}}
+ \pagestyle{fancy}
+ \lhead[
+ \textcolor{gris}{\sffamily{\,}\thepage}\hfill
+ \textcolor{gris}{\sffamily G--\gd@annee--\gd@numero}\hfill %
+ \ifthenelse{\boolean{GD@isRevised}}%
+ {{ -- \itshape Revised}}%
+ {}
+ \textcolor{gris}{\sffamily Les Cahiers du GERAD}
+ {\large\strut}\color{gris}{\hrule}
+ ]
+ {
+ \textcolor{gris}{\sffamily{\,} Les Cahiers du GERAD}\hfill
+ \textcolor{gris}{\sffamily G--\gd@annee--\gd@numero}\hfill %
+ \ifthenelse{\boolean{GD@isRevised}}%
+ {{ -- \itshape Revised}}%
+ {}
+ \textcolor{gris}{\sffamily\thepage}
+ {\large\strut}\color{gris}{\hrule}
+ }
+ \chead[]{}
+ \rhead[]{}
+ \lfoot[]{}
+ \cfoot[]{}
+ \rfoot[]{}
+ \renewcommand{\headrulewidth}{0pt}
+ \renewcommand{\footrulewidth}{0pt}
+ \rmfamily
+ \vspace*{5pt}
+ }
+}
+
+% Custom abstract environment
+\newenvironment{GDabstract}[1]{%
+ \paragraph{#1 : }
+}{%
+ \ifthenelse{\boolean{GD@isPlainVersion}}{}{\vspace*{2cm}}
+}
+
+% Acknowledgements section
+\newenvironment{GDacknowledgements}{%
+ \ifthenelse{\boolean{GD@isPlainVersion}}{%
+ \paragraph{Acknowledgements: }
+ }{%
+ \vfill
+ \hrule
+ \smallskip
+ \paragraph{Acknowledgements: }
+ }
+}{}
+
+% Article section
+\newcommand{\GDarticlestart}{%
+ \ifthenelse{\boolean{GD@isPlainVersion}}{}{%
+ \newpage
+ \setcounter{page}{1}
+ \renewcommand{\thepage}{\arabic{page}}
+ \baselineskip=12.5pt
+ \rmfamily
+ }
+}
+%</class>
+% \end{macrocode}
+%
+% ^^A Fin du code de la classe
+% \Finale
+%
+% \iffalse
+% ^^A Code du gabarit
+%<*template>
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% %%%%%%%%%% Notes pour les auteurs %%%%%%%%%%%%%%%
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Inscrire tous les titres en minuscules (sauf la première lettre du
+%% premier mot).
+%% Section, Table, Figure prennent une majuscule en anglais,
+%% mais pas en français.
+%% Les tableaux se font avec Booktabs et ils sont écrits en \footnotesize.
+%% (Booktabs crée des tableaux avec des lignes horizontales seulement et
+%% plus d'espaces entre les lignes.)
+%% Pour éviter que des références ne se retrouvent seules au début d'une ligne,
+%% on doit faire précéder les "\ref{...}" par "~", donc "~\ref{...}".
+%% On fait de même avec "\cite{...}" qui devrait plutôt s'écrire "~\cite{...}".
+%% Vérifier que les chiffres (références ou non) n'apparaissent pas seuls
+%% au début d'une ligne.
+%% Enlever toutes les commandes d'espacement (\smallskip, \vspace, \\) à la fin
+%% des lignes et des paragraphes.
+%% "et al." ne s'écrit pas en italiques et a un point.
+%% Les titres des figures, tableaux et algorithmes prennent un point ou non,
+%% mais ils doivent être tous identiques.
+%% Pour les Tables, les titres sont placés en haut.
+%% Pour les Figures, les titres sont placés en-dessous.
+%% S'assurer que le chiffre de la note de bas de page soit après la ponctuation
+%% en anglais.
+%% Bibliographie : ajouter "\small" après le \begin{thebibliography}.
+%% Bibliographie : transférer le .bbl dans le fichier lui-même
+%% s'il y a un fichier .bib.
+%% Bibliographie : vérifier qu'il y a bien deux tirets (--) entre les numéros
+%% de pages quand c'est nécessaire.
+%% Bibliographie : éviter les caractères en italique et en gras. Enlever
+%% les \em et \it.
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%% Notes for Authors %%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Write all titles in lowercase letters (aside from the first letter of the
+%% first word).
+%% Section, Table, Figure are capitalized in English, but not in French.
+%% Tables are done with Booktabs and are written in \footnotesize.
+%% (With Booktabs there's only horizontal lines and more space between
+%% the lines).
+%% To make sure references don't end up alone at the start of a line,
+%% before each "\ref{...}" use "~", therefore: "~\ref{...}".
+%% The same thing applies to "\cite{...}", which should instead
+%% be written "~\cite{...}".
+%% Check that numbers (references or other) do not appear by themselves
+%% at the start of a line .
+%% Remove all spacing commands (\smallskip, \vspace, \\) at the end of
+%% lines and paragraphs.
+%% "et al." must not be written in italics and must include a period after "al".
+%% Figure, table and algorithm titles may use a period or not, but must do so
+%% consistently throughout.
+%% Table titles are placed above the table.
+%% Figure titles are placed below the figure.
+%% Make sure footnote numbers are positioned after the punctuation in English.
+%% Bibliography: transfer the .bbl into the file itself if there is a .bib file.
+%% Bibliography: add "\small" after \begin{thebibliography}.
+%% Bibliography: check that there are two dashes (--) between page numbers where
+%% necessary.
+%% Bibliography: avoid using italics and bold. Remove instances of \em and \it.
+\documentclass[gdweb]{geradwp}
+
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% %%% Packages par défaut du cahier %%%%%%%%%%%%%%
+%% %%% ----- NE PAS MODIFIER! ------- %%%%%%%%%%%%%%
+%% %%% Working paper default packages %%%%%%%%%%%%%%
+%% %%% ----- DO NOT MODIFY! --------- %%%%%%%%%%%%%%
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\PassOptionsToPackage{hyphens}{url}
+
+%% Choose one of the two following algorithm packages
+%% \usepackage{algorithm}
+\usepackage{algorithm2e}
+\usepackage{hyperref}
+
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% %%% Options par défaut du cahier %%%%%%%%%%%%%%%
+%% %%% ----- NE PAS MODIFIER! ------ %%%%%%%%%%%%%%%
+%% %%% Working paper default options %%%%%%%%%%%%%%%
+%% %%% ----- DO NOT MODIFY! -------- %%%%%%%%%%%%%%%
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\graphicspath{{Figures/}} % graphicx pkg setup
+\hypersetup{colorlinks,%
+ citecolor={blue}, % Change for "black" with natbib
+ urlcolor={blue},
+ linkcolor={blue},
+ breaklinks={true}
+}
+
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% %%%%%% Début - commandes de l'auteur %%%%%%%%%%%%
+%% %%%%%%%% Start of author commands %%%%%%%%%%%%%%%
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% %%%%%%% Fin - commandes de l'auteur %%%%%%%%%%%%%
+%% %%%%%%%%% End of author commands %%%%%%%%%%%%%%%%
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% %%%%%%%%%% Métadonnées du cahier %%%%%%%%%%%%%%%
+%% %%%%%%%%%% Working paper metadata %%%%%%%%%%%%%%%
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\GDtitre{This is a title}
+\GDmois{Mai}{May}
+\GDannee{2021}
+\GDnumero{XX}
+\GDauteursCourts{B. Hamel, K. H\'ebert}
+\GDauteursCopyright{Hamel, H\'ebert}
+\GDpostpubcitation{Hamel, Benoit, Karine H\'ebert (2021). \og Un exemple de citation \fg, \emph{Journal of Journals}, vol. X issue Y, p. n-m}{https://www.gerad.ca/fr}
+\GDrevised{Mai 2021}
+
+\begin{document}
+
+ \GDpageCouverture
+
+ \begin{GDpagetitre}
+
+ \begin{GDauthlist}
+ \GDauthitem{Benoit Hamel \ref{affil:bib}}
+ \GDauthitem{Karine H\'ebert \ref{affil:gerad}\GDrefsep\ref{affil:hec}}
+ \end{GDauthlist}
+
+ \begin{GDaffillist}
+ \GDaffilitem{affil:bib}{Biblioth\`eque, HEC Montr\'eal, Montr\'eal (Qc), Canada, H3T 2A7}
+ \GDaffilitem{affil:gerad}{GERAD, Montr\'eal (Qc), Canada, H3T 1J4}
+ \GDaffilitem{affil:hec}{HEC Montr\'eal, Montr\'eal (Qc), Canada, H3T 2A7}
+ \end{GDaffillist}
+
+ \begin{GDemaillist}
+ \GDemailitem{benoit.2.hamel@hec.ca}
+ \GDemailitem{karine.hebert@gerad.ca}
+ \end{GDemaillist}
+
+ \end{GDpagetitre}
+
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% %%%%%%%%% Résumés, mots-clés, remerciements %%%%%%%%%%%
+%% %%%%%%% Abstract, keywords, acknowledgements %%%%%%%%%%
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+ \GDabstracts
+
+ \begin{GDabstract}{Abstract}
+ Write your abstract here...
+
+ \paragraph{Keywords: }
+ %Here
+ Here
+ \end{GDabstract}
+
+ \begin{GDabstract}{R\'esum\'e}
+ R\'edigez votre r\'esum\'e ici...
+
+ \paragraph{Mots cl\'es\,: }
+ %Here
+ Here
+
+ \end{GDabstract}
+
+
+ \begin{GDacknowledgements}
+ Here
+
+ \end{GDacknowledgements}
+
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% %%%%%%%%%%%%%%%% Article %%%%%%%%%%%%%%%%%%%%%%%%
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+ \GDarticlestart
+ %Here
+ Write your article article.
+
+\end{document}
+%</template>
+% \fi \ No newline at end of file
diff --git a/macros/latex/contrib/geradwp/geradwp.ins b/macros/latex/contrib/geradwp/geradwp.ins
new file mode 100644
index 0000000000..7ef7e7c993
--- /dev/null
+++ b/macros/latex/contrib/geradwp/geradwp.ins
@@ -0,0 +1,63 @@
+%%
+%% Copyright 2021 GERAD, HEC Montréal
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%%
+%% The latest version of this license is in
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+\input docstrip
+\keepsilent
+\askforoverwritefalse
+
+\preamble
+
+This is a stripped version of the original file.
+
+Copyright 2021 GERAD, HEC Montreal
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3c
+of this license or (at your option) any later version.
+
+The latest version of this license is in
+http://www.latex-project.org/lppl.txt
+and version 1.3c or later is part of all distributions of LaTeX
+version 2008/05/04 or later.
+
+This work has the LPPL maintenance status `maintained'.
+
+The Current Maintainer of this work is Benoit Hamel
+<benoit.2.hamel@hec.ca>.
+
+This work consists of the files geradwp.dtx, geradwp.ins,
+geradwp.pdf and the derived files listed in the README file.
+
+\endpreamble
+
+\generate{
+ \file{geradwp.cls}{\from{geradwp.dtx}{class}}
+ \file{geradwp.tex}{\from{geradwp.dtx}{template}}
+}
+
+\obeyspaces
+\Msg{*********************************************************}
+\Msg{* Classe geradwp v1.0 *}
+\Msg{* *}
+\Msg{* La classe geradwp est installee et prete a l'emploi. *}
+\Msg{* Consultez le document geradwp.pdf afin de prendre *}
+\Msg{* connaissance de toutes ses fonctionnalites. *}
+\Msg{* *}
+\Msg{* Pour tout commentaire, demande de correction de bogue *}
+\Msg{* ou d'amelioration, ou tout simplement pour obtenir de *}
+\Msg{* l'aide sur l'utilisation de la classe pour votre *}
+\Msg{* travail, communiquez avec Benoit Hamel a l'adresse *}
+\Msg{* benoit.2.hamel[a]hec.ca. *}
+\Msg{*********************************************************}
+
+\endbatchfile \ No newline at end of file
diff --git a/macros/latex/contrib/geradwp/geradwp.pdf b/macros/latex/contrib/geradwp/geradwp.pdf
new file mode 100644
index 0000000000..3b22f85463
--- /dev/null
+++ b/macros/latex/contrib/geradwp/geradwp.pdf
Binary files differ
diff --git a/macros/latex/contrib/thesis-ekf/README b/macros/latex/contrib/thesis-ekf/README
index 65b561ff43..88bfa090a5 100644
--- a/macros/latex/contrib/thesis-ekf/README
+++ b/macros/latex/contrib/thesis-ekf/README
@@ -1,5 +1,5 @@
thesis-ekf class
-Copyright 2014-2020 by Tibor Tomacs
+Copyright 2014-2021 by Tibor Tomacs
This file may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -37,4 +37,4 @@ The files should be installed in the following subdirectories of the TEXMF tree.
thesis-ekf.ins source/latex/thesis-ekf/
=============================================================
-Thesis class for Eszterhazy Karoly University (Eger, Hungary). \ No newline at end of file
+Thesis class for Eszterházy Károly Catholic University (Eger, Hungary). \ No newline at end of file
diff --git a/macros/latex/contrib/thesis-ekf/eszterhazy-logo-de.eps b/macros/latex/contrib/thesis-ekf/eszterhazy-logo-de.eps
index 54e1ef087f..bbe4513520 100644
--- a/macros/latex/contrib/thesis-ekf/eszterhazy-logo-de.eps
+++ b/macros/latex/contrib/thesis-ekf/eszterhazy-logo-de.eps
@@ -1,10 +1,10 @@
%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: cairo 1.15.10 (http://cairographics.org)
-%%CreationDate: Thu Mar 28 16:43:19 2019
+%%Creator: cairo 1.16.0 (https://cairographics.org)
+%%CreationDate: Thu Aug 12 11:46:03 2021
%%Pages: 1
%%DocumentData: Clean7Bit
%%LanguageLevel: 2
-%%BoundingBox: 0 0 256 85
+%%BoundingBox: 0 0 256 88
%%EndComments
%%BeginProlog
50 dict begin
@@ -67,587 +67,1069 @@
%%EndSetup
%%Page: 1 1
%%BeginPageSetup
-%%PageBoundingBox: 0 0 256 85
+%%PageBoundingBox: 0 0 256 88
%%EndPageSetup
-q 0 0 256 85 rectclip
-1 0 0 -1 0 85 cm q
-0 0.282353 0.388235 rg
-152.777 9.16 m 152.777 9.785 152.809 10.262 152.172 10.57 c 152.172 10.602
- l 154.32 10.602 l 154.32 10.57 l 153.77 10.211 153.809 9.742 153.809 9.16
- c 153.809 3.391 l 153.777 3.391 l 153.305 4.207 152.5 4.863 151.59 5.18
- c 151.59 5.211 l 152.777 5.211 l 152.777 9.16 l f
-161.648 4.543 m 162.129 4.543 162.609 4.629 163.082 4.727 c 160.5 10.602
- l 162.211 10.602 l 162.211 10.57 l 161.73 10.367 161.938 9.914 162.527
-8.535 c 164.52 3.871 l 160.113 3.871 l 159.652 5.098 l 159.684 5.098 l 160.246
- 4.672 160.934 4.543 161.648 4.543 c f
-170.574 4.543 m 171.051 4.543 171.539 4.629 172.004 4.727 c 169.43 10.602
- l 171.137 10.602 l 171.137 10.57 l 170.656 10.367 170.859 9.914 171.453
- 8.535 c 173.449 3.871 l 169.039 3.871 l 168.582 5.098 l 168.609 5.098 l
- 169.172 4.672 169.859 4.543 170.574 4.543 c f
-180.141 9.477 m 180.141 9.996 180.199 10.367 179.637 10.57 c 179.637 10.602
- l 181.621 10.602 l 181.621 10.57 l 181.18 10.344 181.172 9.863 181.172
-9.414 c 181.172 9.211 l 181.98 9.211 l 182.469 7.98 l 182.113 8.277 181.641
- 8.41 181.172 8.41 c 181.172 3.871 l 179.758 3.871 l 176.578 9.211 l 180.141
- 9.211 l h
-177.98 8.34 m 180.141 4.613 l 180.141 8.41 l 179.246 8.41 178.512 8.371
- 177.98 8.34 c f
-77.039 9.863 m 75.742 9.738 l 75.742 7.316 l 76.5 7.316 l 76.813 7.316
-77.246 7.309 77.406 7.602 c 77.438 7.602 l 77.438 6.52 l 77.406 6.52 l 77.285
- 6.582 77.125 6.582 76.957 6.582 c 75.742 6.582 l 75.742 4.68 l 76.07 4.613
- 76.426 4.605 76.781 4.605 c 77.254 4.605 77.676 4.645 77.988 5.012 c 78.02
- 5.012 l 78.02 3.816 l 77.988 3.816 l 77.859 3.891 77.684 3.871 77.512 3.871
- c 74.238 3.871 l 74.238 3.902 l 74.758 4.094 74.695 4.84 74.695 5.313 c
- 74.695 9.168 l 74.695 9.629 74.758 10.387 74.238 10.57 c 74.238 10.602
-l 78.504 10.602 l 78.965 9.258 l 78.934 9.258 l 78.422 9.711 77.715 9.922
- 77.039 9.863 c f
-86.695 7.203 m 87.156 7.391 87.168 7.891 87.168 8.363 c 87.168 9.832 l
-86.707 9.969 86.215 10.027 85.742 10.027 c 84.129 10.027 82.82 8.781 82.82
- 7.133 c 82.82 5.484 84.039 4.445 85.633 4.445 c 86.254 4.445 87.035 4.586
- 87.453 5.055 c 87.484 5.055 l 87.484 3.879 l 86.949 3.766 86.422 3.707
-85.879 3.707 c 83.402 3.707 81.652 5.078 81.652 7.277 c 81.652 9.332 83.199
- 10.762 85.816 10.762 c 86.645 10.762 87.445 10.609 88.262 10.457 c 88.199
- 10.313 88.211 10.152 88.211 9.996 c 88.211 7.645 l 88.211 7.492 88.211
-7.328 88.262 7.203 c 88.262 7.172 l 86.695 7.172 l 86.695 7.203 l f
-93.938 9.863 m 92.641 9.738 l 92.641 7.316 l 93.398 7.316 l 93.715 7.316
- 94.145 7.309 94.305 7.602 c 94.336 7.602 l 94.336 6.52 l 94.305 6.52 l
-94.188 6.582 94.023 6.582 93.859 6.582 c 92.641 6.582 l 92.641 4.68 l 92.969
- 4.613 93.324 4.605 93.684 4.605 c 94.156 4.605 94.574 4.645 94.891 5.012
- c 94.922 5.012 l 94.922 3.816 l 94.891 3.816 l 94.758 3.891 94.586 3.871
- 94.41 3.871 c 91.137 3.871 l 91.137 3.902 l 91.66 4.094 91.598 4.84 91.598
- 5.313 c 91.598 9.168 l 91.598 9.629 91.66 10.387 91.137 10.57 c 91.137
-10.602 l 95.402 10.602 l 95.863 9.258 l 95.832 9.258 l 95.32 9.711 94.617
- 9.922 93.938 9.863 c f
-103.137 9.172 m 101.66 7.316 l 102.5 7.121 103.289 6.418 103.289 5.516
-c 103.289 4.586 102.539 3.871 101.172 3.871 c 98.738 3.871 l 98.738 3.902
- l 99.258 4.094 99.188 4.84 99.188 5.313 c 99.188 9.172 l 99.188 9.629 99.258
- 10.387 98.738 10.57 c 98.738 10.602 l 100.691 10.602 l 100.691 10.57 l
-100.172 10.387 100.23 9.641 100.23 9.172 c 100.23 4.586 l 100.465 4.543
-100.691 4.516 100.926 4.504 c 101.613 4.473 102.242 4.902 102.242 5.641
-c 102.242 6.602 101.293 6.98 100.477 7.102 c 101.418 8.547 l 102.664 10.09
- l 102.973 10.469 103.309 10.602 103.852 10.602 c 104.793 10.602 l 104.207
- 10.234 103.563 9.699 103.137 9.172 c f
-128.234 22.066 m 113.488 28.605 l 107.441 28.594 l 107.441 32.273 l 54.52
- 32.254 l 55.582 33.84 l 55.582 62.5 l 0 62.5 l 0 63.527 l 254.828 63.527
- l 254.828 62.5 l 200.867 62.5 l 200.867 33.84 l 201.93 32.254 l 149.008
- 32.273 l 149.008 28.594 l 143.105 28.605 l h
-128.234 23.016 m 140.734 28.605 l 115.715 28.605 l h
-108.32 29.824 m 111.902 29.824 l 111.926 51.219 l 108.32 51.219 l h
-112.758 29.824 m 114.844 29.824 l 114.844 51.219 l 112.762 51.219 l h
-115.727 29.824 m 140.723 29.824 l 140.723 51.219 l 137.898 51.227 l 137.887
- 44.957 l 137.887 44.043 137.262 43.129 135.926 43.129 c 134.598 43.129
-133.973 44.18 133.973 44.902 c 133.973 51.223 l 130.195 51.223 l 130.195
- 44.953 l 130.195 44.043 129.566 43.129 128.238 43.129 c 126.906 43.129
-126.25 44.043 126.25 44.953 c 126.25 51.219 l 122.477 51.219 l 122.477 44.902
- l 122.477 44.18 121.848 43.129 120.52 43.129 c 119.191 43.129 118.563 44.043
- 118.563 44.953 c 118.551 51.227 l 115.727 51.219 l h
-141.578 29.824 m 143.66 29.824 l 143.66 51.219 l 141.578 51.223 l h
-144.516 29.824 m 148.094 29.824 l 148.094 51.219 l 144.496 51.219 l h
-107.441 33.824 m 107.441 51.219 l 76.941 51.219 l 76.941 33.898 l h
-149.008 33.824 m 179.504 33.898 l 179.504 51.219 l 149.008 51.219 l h
-56.48 33.898 m 58.492 33.898 l 58.516 51.219 l 56.48 51.219 l h
-59.398 33.898 m 73.145 33.898 l 73.145 51.219 l 59.375 51.219 l h
-73.973 33.898 m 76.039 33.898 l 76.039 51.219 l 73.973 51.219 l h
-180.41 33.898 m 182.477 33.898 l 182.477 51.219 l 180.41 51.219 l h
-183.305 33.898 m 197.051 33.898 l 197.074 51.219 l 183.305 51.219 l h
-197.957 33.898 m 199.973 33.898 l 199.973 51.219 l 197.934 51.219 l h
-56.48 52.102 m 58.492 52.102 l 58.492 62.492 l 56.48 62.492 l h
-108.32 52.102 m 111.902 52.109 l 111.902 62.5 l 108.32 62.5 l h
-114.844 52.102 m 114.844 62.492 l 112.758 62.5 l 112.758 52.109 l h
-115.727 52.102 m 116.16 52.102 l 116.16 52.91 l 117.008 52.91 l 117.008
- 52.102 l 117.711 52.102 l 117.707 52.91 l 118.563 52.91 l 118.563 52.102
- l 122.477 52.102 l 122.477 52.91 l 123.332 52.91 l 123.332 52.102 l 124.105
- 52.109 l 124.105 52.91 l 124.957 52.91 l 124.957 52.102 l 131.492 52.102
- l 131.492 52.91 l 132.344 52.91 l 132.344 52.109 l 133.117 52.102 l 133.117
- 52.91 l 133.973 52.91 l 133.973 52.102 l 137.887 52.102 l 137.887 52.91
- l 138.738 52.91 l 138.738 52.102 l 139.441 52.102 l 139.441 52.91 l 140.289
- 52.91 l 140.289 52.102 l 140.723 52.102 l 140.734 62.5 l 137.887 62.5 l
- 137.887 56.043 l 137.887 55.133 137.262 54.219 135.926 54.219 c 134.598
- 54.219 133.973 55.133 133.973 56.043 c 133.961 62.504 l 130.895 62.5 l
-130.895 56.105 l 130.895 55.09 130.133 53.684 128.238 53.66 c 128.211 53.66
- l 126.316 53.684 125.555 55.09 125.555 56.105 c 125.555 62.5 l 122.477
-62.5 l 122.477 56.043 l 122.477 55.133 121.848 54.219 120.52 54.219 c 119.191
- 54.219 118.563 55.133 118.563 56.043 c 118.563 62.5 l 115.715 62.5 l h
-141.605 52.102 m 143.691 52.109 l 143.691 62.5 l 141.605 62.492 l h
-148.125 52.102 m 148.125 62.5 l 144.547 62.5 l 144.547 52.109 l h
-197.957 52.102 m 199.973 52.102 l 199.973 62.492 l 197.957 62.492 l h
-59.398 52.109 m 73.145 52.109 l 73.145 62.5 l 59.398 62.5 l h
-73.973 52.109 m 76.039 52.109 l 76.039 62.492 l 73.973 62.5 l h
-76.941 52.109 m 107.441 52.109 l 107.441 62.5 l 76.941 62.5 l h
-149.004 52.109 m 179.504 52.109 l 179.504 62.5 l 149.004 62.5 l h
-180.41 52.109 m 182.477 52.109 l 182.477 62.5 l 180.41 62.492 l h
-183.305 52.109 m 197.051 52.109 l 197.051 62.5 l 183.305 62.5 l h
-183.305 52.109 m f
-149.832 28.594 m 149.832 31.563 l 177.422 31.563 l 186.547 21.426 l 182.469
- 18.645 l 146.844 18.609 l 151.586 28.594 l 149.832 28.594 l f
-142.441 17.969 m 146.129 18.309 l 136.574 12.172 l 142.441 17.969 l f
-145.746 27.871 m 150.453 27.871 l 146.316 18.984 l 142.594 18.609 l 145.746
- 27.871 l f
-138.422 42.504 m 138.422 41.953 l 138.766 41.953 l 138.766 41.379 l 135.926
- 40.23 l 133.09 41.379 l 133.09 41.953 l 133.438 41.953 l 133.438 42.504
- l 134 42.504 l 134 41.957 l 137.871 41.957 l 137.871 42.504 l 138.422 42.504
+q 0 0 256 88 rectclip
+1 0 0 -1 0 88 cm q
+Q q
+q
+0 0 256 88 re W n
+ q
+Q q
+q
+0 0 256 88 re W n
+ q
+0.0666667 0.247059 0.380392 rg
+175.531 19.148 m 175.523 19.18 175.516 19.211 175.512 19.234 c 175.34 19.359
+ l 175.336 19.418 l 181.77 19.41 l 181.359 19.152 l 179.332 17.875 l 179.266
+ 17.832 l 179.258 17.613 l 179.074 17.484 l 179.043 17.359 178.984 16.969
+ 179.246 16.684 c 179.5 16.488 179.676 16.141 179.676 15.738 c 179.676 15.684
+ 179.676 15.391 179.5 15.09 c 179.441 14.984 179.371 14.895 179.289 14.828
+ c 179.281 14.762 179.258 14.59 179.129 14.48 c 179.09 14.441 179.043 14.41
+ 178.992 14.383 c 178.992 14.375 178.996 14.355 178.996 14.344 c 178.996
+ 14.25 178.945 14.172 178.875 14.129 c 178.844 14.109 178.813 14.098 178.781
+ 14.098 c 178.66 14.098 178.563 14.211 178.563 14.344 c 178.563 14.355 178.563
+ 14.375 178.566 14.383 c 178.402 14.465 178.285 14.633 178.27 14.828 c 178.035
+ 15.027 177.883 15.359 177.883 15.738 c 177.883 16.133 178.051 16.477 178.301
+ 16.676 c 178.426 16.82 178.594 17.082 178.5 17.398 c 178.492 17.43 178.488
+ 17.461 178.48 17.484 c 178.309 17.613 l 178.297 17.805 l 176.137 19.063
+ l 176.078 19.094 l 176.063 18.922 176.078 18.648 176.273 18.438 c 176.531
+ 18.246 176.703 17.891 176.703 17.488 c 176.703 17.438 176.703 17.141 176.531
+ 16.84 c 176.469 16.734 176.402 16.648 176.316 16.582 c 176.313 16.512 176.289
+ 16.34 176.16 16.23 c 176.117 16.191 176.074 16.16 176.02 16.133 c 176.023
+ 16.121 176.023 16.105 176.023 16.094 c 176.023 16 175.973 15.922 175.902
+ 15.879 c 175.875 15.859 175.844 15.848 175.809 15.848 c 175.688 15.848
+175.59 15.961 175.59 16.094 c 175.59 16.105 175.59 16.121 175.594 16.133
+ c 175.43 16.215 175.316 16.383 175.297 16.582 c 175.066 16.777 174.914
+17.109 174.914 17.488 c 174.914 17.883 175.078 18.227 175.328 18.422 c 175.453
+ 18.566 175.621 18.836 175.531 19.148 c f
+192.492 51.828 3.563 0.25 re f
+186.133 51.828 3.559 0.25 re f
+192.836 59.727 m 192.836 61.66 l 195.711 61.66 l 195.711 56.922 l 195.711
+ 56.922 195.043 56.723 194.301 56.684 c 193.527 56.723 192.836 56.91 192.836
+ 56.91 c 192.836 59.727 l f
+186.477 59.727 m 186.477 61.66 l 189.352 61.66 l 189.352 56.922 l 189.352
+ 56.922 188.684 56.723 187.941 56.684 c 187.168 56.723 186.477 56.91 186.477
+ 56.91 c 186.477 59.727 l f
+147.211 61.629 m 147.211 56.887 l 147.211 56.887 146.734 56.691 146.203
+ 56.66 c 145.652 56.691 145.156 56.883 145.156 56.883 c 145.156 61.629 l
+ 147.211 61.629 l f
+144.883 51.797 2.574 0.223 re f
+175.242 51.813 3.559 0.25 re f
+169.043 51.813 3.559 0.25 re f
+162.84 51.813 3.563 0.25 re f
+156.637 51.813 3.566 0.25 re f
+150.438 51.813 3.566 0.25 re f
+175.582 59.73 m 175.582 61.664 l 178.453 61.664 l 178.453 56.922 l 178.453
+ 56.922 177.785 56.727 177.047 56.688 c 176.273 56.727 175.582 56.914 175.582
+ 56.914 c 175.582 59.73 l f
+169.379 59.73 m 169.379 61.664 l 172.254 61.664 l 172.254 56.922 l 172.254
+ 56.922 171.586 56.727 170.844 56.688 c 170.074 56.727 169.379 56.914 169.379
+ 56.914 c 169.379 59.73 l f
+163.18 59.73 m 163.18 61.664 l 166.055 61.664 l 166.055 56.922 l 166.055
+ 56.922 165.383 56.727 164.641 56.688 c 163.871 56.727 163.18 56.914 163.18
+ 56.914 c 163.18 59.73 l f
+159.852 61.664 m 159.852 56.922 l 159.852 56.922 159.184 56.727 158.441
+ 56.688 c 157.668 56.727 156.977 56.914 156.977 56.914 c 156.977 61.664
+l 159.852 61.664 l f
+150.773 59.73 m 150.773 61.664 l 153.648 61.664 l 153.648 56.922 l 153.648
+ 56.922 152.98 56.727 152.238 56.688 c 151.469 56.727 150.773 56.914 150.773
+ 56.914 c 150.773 59.73 l f
+132.977 34.723 m 133.535 34.723 l 133.535 34.375 l 133.535 34.375 134.23
+ 33.91 135.539 33.91 c 136.859 33.91 137.547 34.375 137.547 34.375 c 137.547
+ 34.723 l 138.082 34.723 l 138.082 33.91 l 138.465 33.91 l 138.465 33.238
+ l 132.605 33.238 l 132.605 33.91 l 132.977 33.91 l 132.977 34.723 l f
+127.609 55.297 m 125.766 55.316 124.887 56.695 124.809 57.785 c 124.797
+ 64.828 l 130.422 64.828 l 130.406 57.785 l 130.328 56.695 129.449 55.316
+ 127.609 55.297 c f
+119.586 55.91 m 118.277 55.91 117.641 56.828 117.59 57.777 c 117.582 64.828
+ l 121.602 64.828 l 121.586 57.777 l 121.535 56.828 120.898 55.91 119.59
+ 55.91 c f
+135.629 55.91 m 134.32 55.91 133.68 56.828 133.633 57.777 c 133.617 64.828
+ l 137.633 64.828 l 137.625 57.777 l 137.578 56.828 136.938 55.91 135.629
+ 55.91 c f
+201.207 53.273 m 199.121 53.273 l 199.145 35.52 l 201.207 35.52 l h
+184.129 53.273 m 184.129 43.316 l 198.227 43.316 l 198.238 53.273 l h
+184.129 35.52 m 198.215 35.52 l 198.223 43.012 l 184.129 43.012 l h
+183.281 53.27 m 181.164 53.27 l 181.164 35.52 l 183.281 35.52 l h
+180.238 35.52 m 180.238 43.063 l 148.988 43.063 l 148.988 35.453 l h
+180.238 53.273 m 148.988 53.273 l 148.988 43.316 l 180.238 43.316 l h
+148.082 53.27 m 144.395 53.27 l 144.414 31.348 l 148.082 31.348 l h
+143.535 53.27 m 141.398 53.27 l 141.398 31.348 l 143.535 31.348 l h
+127.656 30.098 m 114.707 30.098 l 127.609 24.34 l 140.508 30.098 l h
+140.496 50.758 m 137.438 50.758 l 137.438 45.352 l 137.438 45.352 136.512
+ 45.098 135.484 45.047 c 134.465 45.098 133.547 45.344 133.547 45.344 c
+133.547 46.887 l 133.543 46.887 l 133.543 50.758 l 129.547 50.758 l 129.547
+ 49.234 l 129.543 49.234 l 129.543 47.109 l 129.547 47.109 l 129.547 45.355
+ l 129.547 45.355 128.633 45.113 127.609 45.059 c 126.586 45.109 125.668
+ 45.355 125.668 45.355 c 125.684 50.758 l 121.676 50.758 l 121.676 46.887
+ l 121.668 46.887 l 121.668 45.344 l 121.668 45.344 120.75 45.098 119.727
+ 45.047 c 118.703 45.098 117.781 45.352 117.781 45.352 c 117.781 50.758
+l 114.719 50.758 l 114.719 31.348 l 115.152 31.348 l 115.152 31.957 l 116.016
+ 31.957 l 116.016 31.348 l 116.762 31.348 l 116.762 31.957 l 117.625 31.957
+ l 117.625 31.348 l 121.652 31.348 l 121.652 31.957 l 122.516 31.957 l 122.516
+ 31.348 l 123.336 31.348 l 123.336 31.957 l 124.199 31.957 l 124.199 31.348
+ l 131.02 31.348 l 131.02 31.957 l 131.883 31.957 l 131.883 31.348 l 132.703
+ 31.348 l 132.703 31.957 l 133.566 31.957 l 133.566 31.348 l 137.59 31.348
+ l 137.59 31.957 l 138.453 31.957 l 138.453 31.348 l 139.199 31.348 l 139.199
+ 31.957 l 140.063 31.957 l 140.063 31.348 l 140.496 31.348 l h
+140.496 53.27 m 139.195 53.27 l 139.195 51.313 l 140.496 51.313 l h
+138.668 53.27 m 137.438 53.27 l 137.438 51.313 l 138.668 51.313 l h
+133.543 53.27 m 132.844 53.27 l 132.844 51.313 l 133.543 51.313 l h
+132.316 53.27 m 130.727 53.27 l 130.727 51.313 l 132.316 51.313 l h
+130.199 53.27 m 129.547 53.273 l 129.547 51.547 l 129.543 51.547 l 129.543
+ 51.316 l 129.547 51.316 l 129.668 51.313 l 130.199 51.313 l h
+125.688 53.27 m 125.02 53.27 l 125.02 51.313 l 125.688 51.313 l h
+124.488 53.27 m 122.902 53.27 l 122.902 51.313 l 124.488 51.313 l h
+122.371 53.27 m 121.672 53.27 l 121.672 51.313 l 122.371 51.313 l h
+117.781 51.547 m 117.781 53.27 l 116.551 53.27 l 116.551 51.313 l 117.781
+ 51.313 l h
+116.02 53.27 m 114.719 53.27 l 114.719 51.313 l 116.02 51.313 l h
+113.816 53.27 m 111.684 53.27 l 111.68 31.348 l 113.816 31.348 l h
+107.133 53.27 m 107.133 31.348 l 110.801 31.348 l 110.824 53.27 l h
+106.23 43.063 m 74.98 43.063 l 74.98 35.52 l 106.23 35.453 l h
+106.23 53.273 m 74.98 53.273 l 74.98 43.316 l 106.23 43.316 l h
+74.051 53.27 m 71.938 53.27 l 71.938 35.52 l 74.051 35.52 l h
+71.086 43.012 m 56.992 43.012 l 57 35.52 l 71.086 35.52 l h
+71.086 53.273 m 56.977 53.273 l 56.988 43.316 l 71.086 43.316 l h
+54.008 53.273 m 54.008 35.52 l 56.07 35.52 l 56.094 53.273 l h
+56.289 30.371 m 56.652 29.883 58.25 30.164 58.25 30.164 c 59.766 30.164
+ 60.113 29.77 60.488 29.313 c 60.797 28.934 60.945 28.473 60.789 27.922
+c 60.676 27.523 60.578 27.27 60.613 26.715 c 60.625 26.551 60.664 26.402
+ 60.695 26.254 c 60.762 25.934 60.875 25.645 61.016 25.383 c 61.16 25.125
+ 61.336 24.891 61.535 24.684 c 61.832 24.383 62.184 24.137 62.555 23.969
+ c 62.676 23.918 62.805 23.871 62.934 23.832 c 63.246 23.727 63.563 23.672
+ 63.863 23.676 c 65.266 23.648 67.02 24.773 67.148 26.715 c 67.184 27.27
+ 67.09 27.523 66.977 27.922 c 66.82 28.473 66.969 28.934 67.277 29.313 c
+ 67.652 29.77 68 30.164 69.516 30.164 c 69.516 30.164 70.902 30.02 71.477
+ 30.336 c 71.855 30.543 71.551 32.063 71.551 32.063 c 56.215 32.063 l 56.215
+ 32.063 56.008 30.746 56.289 30.371 c h
+92.836 31.641 m 88.145 31.641 l 88.145 30.578 l 88.145 30.578 88.363 30.348
+ 88.578 30.09 c 88.75 29.879 88.832 29.621 88.746 29.305 c 88.68 29.082
+88.629 28.934 88.648 28.629 c 88.719 27.527 89.688 26.891 90.48 26.914 c
+ 91.273 26.891 92.266 27.527 92.336 28.629 c 92.355 28.934 92.305 29.082
+ 92.238 29.305 c 92.148 29.621 92.234 29.879 92.41 30.09 c 92.621 30.348
+ 92.836 30.578 92.836 30.578 c h
+86.496 21.816 m 86.496 21.84 l 85.266 21.84 l 85.266 18.027 l 86.496 18.027
+ l h
+162.379 30.578 m 162.379 30.578 162.598 30.348 162.809 30.09 c 162.984
+29.879 163.066 29.621 162.977 29.305 c 162.914 29.082 162.859 28.934 162.883
+ 28.629 c 162.953 27.527 163.945 26.891 164.734 26.914 c 165.527 26.891
+166.496 27.527 166.57 28.629 c 166.59 28.934 166.535 29.082 166.473 29.305
+ c 166.383 29.621 166.469 29.879 166.641 30.09 c 166.852 30.348 167.07 30.578
+ 167.07 30.578 c 167.07 31.641 l 162.379 31.641 l h
+168.723 21.816 m 168.723 18.027 l 169.953 18.027 l 169.953 21.84 l 168.723
+ 21.84 l h
+199.004 32.063 m 183.664 32.063 l 183.664 32.063 183.359 30.543 183.738
+ 30.336 c 184.313 30.02 185.699 30.164 185.699 30.164 c 187.215 30.164 187.563
+ 29.77 187.941 29.313 c 188.246 28.934 188.395 28.473 188.238 27.922 c 188.125
+ 27.523 188.031 27.27 188.066 26.715 c 188.195 24.773 189.949 23.648 191.352
+ 23.676 c 191.656 23.672 191.973 23.727 192.285 23.832 c 192.41 23.871 192.539
+ 23.918 192.66 23.969 c 193.031 24.137 193.383 24.383 193.684 24.684 c 193.883
+ 24.891 194.059 25.125 194.199 25.383 c 194.344 25.645 194.453 25.934 194.52
+ 26.254 c 194.551 26.402 194.59 26.551 194.602 26.715 c 194.637 27.27 194.543
+ 27.523 194.426 27.922 c 194.27 28.473 194.422 28.934 194.727 29.313 c 195.102
+ 29.77 195.453 30.164 196.969 30.164 c 196.969 30.164 198.563 29.883 198.926
+ 30.371 c 199.211 30.746 199.004 32.063 199.004 32.063 c h
+200.441 29.422 m 197.848 27.652 l 195.18 25.836 l 195.18 25.836 194.91
+24.605 193.672 23.676 c 193.266 23.371 192.852 23.176 192.465 23.055 c 191.648
+ 22.797 190.984 22.871 190.879 22.883 c 190.867 22.887 190.863 22.887 190.863
+ 22.887 c 188.742 21.816 l 188.707 21.801 l 188.688 21.816 l 178.516 33.141
+ l 179.102 33.141 l 203.176 33.145 l 202.852 33.484 l 150.367 33.488 l 150.367
+ 33.141 l 177.523 33.141 l 187.211 22.477 l 188.098 21.504 l 184.855 19.848
+ l 184.816 19.832 l 170.383 19.832 l 170.383 18.027 l 170.672 18.027 l 170.672
+ 17.363 l 168.016 17.363 l 168.016 18.027 l 168.129 18.027 l 168.125 18.047
+ l 167.711 19.832 l 147.445 19.832 l 147.453 19.848 l 148.344 21.816 l 152.086
+ 30.098 l 152.078 30.176 l 149.617 30.172 l 149.617 34.332 l 202.051 34.328
+ l 201.488 34.922 l 149.004 34.922 l 149.004 30.172 l 142.469 30.172 l 127.609
+ 23.293 l 112.832 30.172 l 106.23 30.172 l 106.23 34.922 l 53.73 34.922
+l 53.164 34.328 l 105.609 34.332 l 105.609 30.172 l 103.137 30.176 l 103.133
+ 30.098 l 106.871 21.816 l 107.762 19.848 l 107.77 19.832 l 87.504 19.832
+ l 87.094 18.047 l 87.09 18.027 l 87.203 18.027 l 87.203 17.363 l 84.547
+ 17.363 l 84.547 18.027 l 84.832 18.027 l 84.832 19.832 l 70.398 19.832
+l 70.363 19.848 l 67.184 21.469 l 68.094 22.477 l 77.684 33.141 l 104.848
+ 33.141 l 104.848 33.488 l 104.305 33.488 l 52.363 33.484 l 52.043 33.145
+ l 76.113 33.141 l 76.703 33.141 l 66.527 21.816 l 66.512 21.801 l 66.473
+ 21.816 l 64.355 22.887 l 64.355 22.887 64.348 22.887 64.336 22.883 c 64.234
+ 22.871 63.57 22.797 62.75 23.055 c 62.367 23.176 61.953 23.371 61.543 23.676
+ c 60.305 24.605 60.039 25.836 60.039 25.836 c 57.367 27.652 l 54.773 29.422
+ l 50.281 32.48 l 53.09 35.461 l 53.09 64.828 l 54.008 64.828 l 54.008 54.176
+ l 56.07 54.176 l 56.07 64.828 l 57 64.828 l 57 54.184 l 71.086 54.184 l
+ 71.086 64.828 l 71.938 64.828 l 71.938 54.184 l 74.051 54.184 l 74.051
+64.828 l 74.98 64.828 l 74.98 54.184 l 106.23 54.184 l 106.23 64.828 l 107.137
+ 64.828 l 107.137 54.176 l 108.969 54.18 l 110.805 54.184 l 110.805 64.828
+ l 111.68 64.828 l 111.68 54.184 l 113.816 54.176 l 113.816 64.828 l 114.707
+ 64.828 l 114.719 54.176 l 115.152 54.176 l 115.152 54.977 l 116.016 54.977
+ l 116.016 54.176 l 116.762 54.176 l 116.762 54.977 l 117.625 54.977 l 117.625
+ 54.176 l 121.844 54.176 l 121.844 54.977 l 122.707 54.977 l 122.707 54.176
+ l 123.527 54.176 l 123.527 54.977 l 124.391 54.977 l 124.391 54.176 l 130.824
+ 54.176 l 130.824 54.977 l 131.691 54.977 l 131.691 54.176 l 132.512 54.176
+ l 132.512 54.977 l 133.371 54.977 l 133.371 54.176 l 137.59 54.176 l 137.59
+ 54.977 l 138.453 54.977 l 138.453 54.176 l 139.199 54.176 l 139.199 54.977
+ l 140.063 54.977 l 140.063 54.176 l 140.496 54.176 l 140.508 64.828 l 141.398
+ 64.828 l 141.398 54.176 l 143.535 54.184 l 143.535 64.828 l 144.414 64.828
+ l 144.414 54.184 l 146.246 54.18 l 148.082 54.176 l 148.082 64.828 l 148.988
+ 64.828 l 148.988 54.184 l 180.238 54.184 l 180.238 64.828 l 181.164 64.828
+ l 181.164 54.184 l 183.281 54.184 l 183.281 64.828 l 184.129 64.828 l 184.129
+ 54.184 l 198.215 54.184 l 198.215 64.828 l 199.145 64.828 l 199.145 54.176
+ l 201.207 54.176 l 201.207 64.828 l 202.125 64.828 l 202.125 35.461 l 204.934
+ 32.48 l 200.441 29.422 l f
+133.551 44.043 m 135.527 43.398 l 137.434 44.043 l h
+138.355 43.883 m 135.621 42.965 l 135.563 42.941 135.5 42.941 135.445 42.965
+ c 132.707 43.848 l 132.625 43.875 132.566 43.93 132.551 44.008 c 132.527
+ 44.078 132.555 44.148 132.609 44.203 c 132.832 44.41 l 132.879 44.453 132.945
+ 44.477 133.016 44.477 c 133.051 44.477 l 133.051 44.832 l 133.051 44.953
+ 133.164 45.047 133.301 45.047 c 133.438 45.047 133.551 44.953 133.551 44.832
+ c 133.551 44.477 l 137.508 44.477 l 137.508 44.832 l 137.508 44.879 137.523
+ 44.922 137.551 44.957 c 137.594 45.008 137.672 45.047 137.758 45.047 c
+137.895 45.047 138.008 44.953 138.008 44.832 c 138.008 44.477 l 138.043
+44.477 l 138.105 44.477 138.164 44.461 138.211 44.422 c 138.434 44.254 l
+ 138.496 44.203 138.527 44.125 138.512 44.047 c 138.496 43.973 138.438 43.914
+ 138.355 43.883 c f
+164.754 27.633 m 164.152 27.633 163.66 28.125 163.66 28.727 c 163.66 29.336
+ 164.152 29.828 164.754 29.828 c 165.359 29.828 165.848 29.336 165.848 28.727
+ c 165.848 28.125 165.359 27.633 164.754 27.633 c f
+191.418 24.922 m 190.328 24.922 189.441 25.809 189.441 26.898 c 189.441
+ 27.996 190.328 28.883 191.418 28.883 c 192.512 28.883 193.398 27.996 193.398
+ 26.898 c 193.398 25.809 192.512 24.922 191.418 24.922 c f
+192.852 44.734 2.852 6.629 re f
+186.492 44.734 2.848 6.629 re f
+133.609 38.758 m 133.609 41.238 l 137.418 41.238 l 137.418 35.145 l 137.418
+ 35.145 136.531 34.895 135.547 34.848 c 134.523 34.895 133.609 35.133 133.609
+ 35.133 c 133.609 38.758 l f
+133.102 41.586 4.777 0.285 re f
+194.039 41.73 m 195.711 41.73 l 195.711 36.988 l 195.711 36.988 195.043
+ 36.797 194.301 36.758 c 193.527 36.797 192.836 36.98 192.836 36.98 c 192.836
+ 41.73 l 194.039 41.73 l f
+192.461 42.09 3.605 0.223 re f
+187.676 41.73 m 189.352 41.73 l 189.352 36.988 l 189.352 36.988 188.684
+ 36.797 187.941 36.758 c 187.168 36.797 186.477 36.98 186.477 36.98 c 186.477
+ 41.73 l 187.676 41.73 l f
+186.102 42.09 3.605 0.223 re f
+145.098 34.695 m 145.355 34.695 l 145.355 34.344 l 145.355 34.344 145.68
+ 33.883 146.281 33.883 c 146.891 33.883 147.211 34.344 147.211 34.344 c
+147.211 34.695 l 147.457 34.695 l 147.457 33.883 l 147.633 33.883 l 147.633
+ 33.215 l 144.926 33.215 l 144.926 33.883 l 145.098 33.883 l 145.098 34.695
l f
-137.887 39.035 m 137.887 39.035 137.887 35.441 137.887 34.523 c 137.887
- 33.609 137.262 32.699 135.93 32.699 c 134.602 32.699 133.973 33.609 133.973
- 34.523 c 133.973 35.441 133.973 39.035 133.973 39.035 c 137.887 39.035
-l f
-138.781 30.918 m 133.066 30.918 l 133.066 31.566 l 133.426 31.566 l 133.426
- 32.367 l 133.973 32.367 l 133.973 32.02 l 133.973 32.02 134.652 31.566
-135.926 31.566 c 137.215 31.566 137.887 32.02 137.887 32.02 c 137.887 32.367
- l 138.406 32.367 l 138.406 31.566 l 138.781 31.566 l 138.781 30.918 l f
-159.422 55.676 m 159.422 54.883 158.902 54.57 157.945 54.57 c 156.984 54.57
- 156.504 54.883 156.504 55.676 c 156.504 56.469 156.504 59.91 156.504 59.91
- c 159.422 59.91 l 159.422 59.91 159.422 56.469 159.422 55.676 c f
-165.715 55.676 m 165.715 54.883 165.195 54.57 164.238 54.57 c 163.281 54.57
- 162.801 54.883 162.801 55.676 c 162.801 56.469 162.801 59.91 162.801 59.91
- c 165.715 59.91 l 165.715 59.91 165.715 56.469 165.715 55.676 c f
-172.008 55.676 m 172.008 54.883 171.488 54.57 170.527 54.57 c 169.574 54.57
- 169.094 54.883 169.094 55.676 c 169.094 56.469 169.094 59.91 169.094 59.91
- c 172.008 59.91 l 172.008 59.91 172.008 56.469 172.008 55.676 c f
-178.305 55.676 m 178.305 54.883 177.781 54.57 176.824 54.57 c 175.867 54.57
- 175.387 54.883 175.387 55.676 c 175.387 56.469 175.387 59.91 175.387 59.91
- c 178.305 59.91 l 178.305 59.91 178.305 56.469 178.305 55.676 c f
-153.125 55.676 m 153.125 54.883 152.609 54.57 151.648 54.57 c 150.691 54.57
- 150.211 54.883 150.211 55.676 c 150.211 56.469 150.211 59.91 150.211 59.91
- c 153.125 59.91 l 153.125 59.91 153.125 56.469 153.125 55.676 c f
-159.422 35.711 m 159.422 34.902 158.902 34.586 157.945 34.586 c 156.988
- 34.586 156.508 34.902 156.508 35.711 c 156.508 36.516 156.508 39.93 156.508
- 39.93 c 159.422 39.93 l 159.422 39.93 159.422 36.516 159.422 35.711 c f
-165.715 35.711 m 165.715 34.902 165.195 34.586 164.238 34.586 c 163.281
- 34.586 162.801 34.902 162.801 35.711 c 162.801 36.516 162.801 39.93 162.801
- 39.93 c 165.715 39.93 l 165.715 39.93 165.715 36.516 165.715 35.711 c f
-172.008 35.711 m 172.008 34.902 171.488 34.586 170.527 34.586 c 169.574
- 34.586 169.094 34.902 169.094 35.711 c 169.094 36.516 169.094 39.93 169.094
- 39.93 c 172.008 39.93 l 172.008 39.93 172.008 36.516 172.008 35.711 c f
-178.301 35.711 m 178.301 34.902 177.781 34.586 176.824 34.586 c 175.867
- 34.586 175.383 34.902 175.383 35.711 c 175.383 36.516 175.383 39.93 175.383
- 39.93 c 178.301 39.93 l 178.301 39.93 178.301 36.516 178.301 35.711 c f
-153.129 35.711 m 153.129 34.902 152.609 34.586 151.648 34.586 c 150.695
- 34.586 150.215 34.902 150.215 35.711 c 150.215 36.516 150.215 39.93 150.215
- 39.93 c 153.129 39.93 l 153.129 39.93 153.129 36.516 153.129 35.711 c f
-172.008 43.262 m 172.008 43.227 172.008 43.207 172.008 43.207 c 169.094
- 43.207 l 169.094 43.207 169.094 43.227 169.094 43.262 c 169.094 48.859
-l 172.008 48.859 l 172.008 43.262 l f
-178.301 43.262 m 178.301 43.227 178.301 43.207 178.301 43.207 c 175.383
- 43.207 l 175.383 43.207 175.383 43.227 175.383 43.262 c 175.383 48.859
-l 178.301 48.859 l 178.301 43.262 l f
-165.715 43.262 m 165.715 43.227 165.715 43.207 165.715 43.207 c 162.801
- 43.207 l 162.801 43.207 162.801 43.227 162.801 43.262 c 162.801 48.859
-l 165.715 48.859 l 165.715 43.262 l f
-159.422 43.262 m 159.422 43.227 159.422 43.207 159.422 43.207 c 156.508
- 43.207 l 156.508 43.207 156.508 43.227 156.508 43.262 c 156.508 48.859
-l 159.422 48.859 l 159.422 43.262 l f
-153.129 43.262 m 153.129 43.227 153.129 43.207 153.129 43.207 c 150.215
- 43.207 l 150.215 43.207 150.215 43.227 150.215 43.262 c 150.215 48.859
-l 153.129 48.859 l 153.129 43.262 l f
-188.5 55.766 m 188.5 54.969 187.98 54.66 187.023 54.66 c 186.063 54.66
-185.582 54.969 185.582 55.766 c 185.582 56.559 185.582 60 185.582 60 c 188.5
- 60 l 188.5 60 188.5 56.559 188.5 55.766 c f
-194.797 55.766 m 194.797 54.969 194.273 54.66 193.316 54.66 c 192.359 54.66
- 191.879 54.969 191.879 55.766 c 191.879 56.559 191.879 60 191.879 60 c
-194.797 60 l 194.797 60 194.797 56.559 194.797 55.766 c f
-187.023 34.629 m 186.063 34.629 185.582 34.938 185.582 35.73 c 185.582
-36.523 185.582 39.891 185.582 39.891 c 188.5 39.891 l 188.5 39.891 188.5
- 36.523 188.5 35.73 c 188.5 34.938 187.98 34.629 187.023 34.629 c f
-193.316 34.629 m 192.359 34.629 191.879 34.938 191.879 35.73 c 191.879
-36.523 191.879 39.891 191.879 39.891 c 194.797 39.891 l 194.797 39.891 194.797
- 36.523 194.797 35.73 c 194.797 34.938 194.273 34.629 193.316 34.629 c f
-185.586 43.262 m 185.586 48.859 l 188.5 48.859 l 188.5 43.262 l 188.5 43.227
- 188.5 43.207 188.5 43.207 c 185.586 43.207 l 185.586 43.207 185.586 43.227
- 185.586 43.262 c f
-191.879 43.262 m 191.879 48.859 l 194.793 48.859 l 194.793 43.262 l 194.793
- 43.227 194.793 43.207 194.793 43.207 c 191.879 43.207 l 191.879 43.207
-191.879 43.227 191.879 43.262 c f
-187.781 21.043 m 178.398 31.586 l 201.93 31.586 l 202.371 31.582 l 202.676
- 31.164 l 193.477 24.918 l 193.301 24.293 192.926 23.531 192.16 22.969 c
- 191.188 22.254 190.305 22.238 189.637 22.313 c h
-190.125 23.117 m 190.129 23.117 l 191.25 23.098 192.621 23.996 192.719
-25.547 c 192.75 25.988 192.676 26.191 192.582 26.508 c 192.457 26.949 192.578
- 27.316 192.82 27.617 c 193.121 27.984 193.402 28.297 194.613 28.297 c 196.234
- 28.305 l 196.234 29.816 l 183.992 29.816 l 183.992 28.305 l 185.613 28.297
- l 186.824 28.297 187.102 27.984 187.402 27.617 c 187.652 27.316 187.77
-26.949 187.641 26.508 c 187.555 26.191 187.477 25.988 187.504 25.547 c 187.609
- 23.996 189.004 23.098 190.125 23.117 c h
-190.125 23.117 m f
-146.414 33.992 m 145.863 33.992 145.602 34.793 145.602 35.598 c 145.602
- 36.398 145.602 39.301 145.602 39.301 c 147.227 39.301 l 147.227 39.301
-147.227 36.398 147.227 35.598 c 147.227 34.793 146.969 33.992 146.414 33.992
+145.391 38.73 m 145.391 41.215 l 147.152 41.215 l 147.152 35.121 l 147.152
+ 35.121 146.738 34.871 146.285 34.82 c 145.813 34.871 145.391 35.105 145.391
+ 35.105 c 145.391 38.73 l f
+145.152 41.559 2.211 0.285 re f
+147.172 46.563 m 147.172 45.273 l 147.172 45.273 146.746 45.094 146.27
+45.059 c 146.27 45.051 l 145.797 45.09 145.371 45.266 145.371 45.266 c 145.371
+ 46.398 l 145.367 46.398 l 145.367 51.313 l 147.172 51.313 l 147.172 46.563
+ l f
+146.285 43.402 m 147.172 44.047 l 145.371 44.047 l h
+145.035 44.414 m 145.059 44.457 145.09 44.477 145.121 44.477 c 145.141
+44.477 l 145.141 44.836 l 145.141 44.957 145.191 45.051 145.254 45.051 c
+ 145.316 45.051 145.371 44.957 145.371 44.836 c 145.371 44.477 l 147.207
+ 44.477 l 147.207 44.836 l 147.207 44.883 147.211 44.922 147.227 44.957
+c 147.246 45.012 147.281 45.051 147.324 45.051 c 147.387 45.051 147.438
+44.957 147.438 44.836 c 147.438 44.477 l 147.453 44.477 l 147.48 44.477
+147.512 44.465 147.531 44.426 c 147.633 44.258 l 147.664 44.207 147.68 44.129
+ 147.672 44.051 c 147.664 43.977 147.637 43.918 147.602 43.887 c 146.332
+ 42.965 l 146.305 42.945 146.273 42.945 146.25 42.965 c 144.977 43.852 l
+ 144.941 43.879 144.914 43.938 144.906 44.008 c 144.895 44.082 144.906 44.152
+ 144.934 44.211 c 145.035 44.414 l f
+175.602 44.727 2.852 6.625 re f
+169.398 44.727 2.852 6.625 re f
+163.195 44.727 2.852 6.625 re f
+156.996 44.727 2.852 6.625 re f
+153.645 51.352 m 153.645 44.727 l 150.793 44.727 l 150.793 46.754 l 150.797
+ 46.754 l 150.797 48.164 l 150.793 48.164 l 150.793 51.352 l 153.645 51.352
+ l f
+176.781 41.73 m 178.453 41.73 l 178.453 36.988 l 178.453 36.988 177.785
+ 36.797 177.047 36.758 c 176.273 36.797 175.582 36.98 175.582 36.98 c 175.582
+ 41.73 l 176.781 41.73 l f
+175.207 42.09 3.602 0.223 re f
+170.578 41.73 m 172.254 41.73 l 172.254 36.988 l 172.254 36.988 171.586
+ 36.797 170.844 36.758 c 170.074 36.797 169.379 36.98 169.379 36.98 c 169.379
+ 41.73 l 170.578 41.73 l f
+169.004 42.09 3.605 0.223 re f
+164.379 41.73 m 166.055 41.73 l 166.055 36.988 l 166.055 36.988 165.383
+ 36.797 164.641 36.758 c 163.871 36.797 163.18 36.98 163.18 36.98 c 163.18
+ 41.73 l 164.379 41.73 l f
+162.801 42.09 3.605 0.223 re f
+158.18 41.73 m 159.852 41.73 l 159.852 36.988 l 159.852 36.988 159.184
+36.797 158.441 36.758 c 157.668 36.797 156.977 36.98 156.977 36.98 c 156.977
+ 41.73 l 158.18 41.73 l f
+156.602 42.09 3.605 0.223 re f
+151.977 41.73 m 153.648 41.73 l 153.648 36.988 l 153.648 36.988 152.98
+36.797 152.238 36.758 c 151.469 36.797 150.773 36.98 150.773 36.98 c 150.773
+ 41.73 l 151.977 41.73 l f
+150.398 42.09 3.605 0.223 re f
+142.941 21.816 m 145.773 29.547 l 151.129 29.547 l 147.621 21.816 l 146.934
+ 20.309 l 142.262 19.969 l 142.941 21.816 l f
+142.137 19.297 m 146.672 19.633 l 142.398 16.672 l 137.918 13.563 l 135.289
+ 11.738 l 142.137 19.297 l f
+79.879 19.418 m 79.879 19.359 l 79.703 19.234 l 79.699 19.211 79.695 19.18
+ 79.688 19.148 c 79.598 18.836 79.762 18.566 79.891 18.422 c 80.137 18.227
+ 80.305 17.883 80.305 17.488 c 80.305 17.109 80.152 16.777 79.918 16.582
+ c 79.898 16.383 79.785 16.215 79.621 16.133 c 79.625 16.121 79.625 16.105
+ 79.625 16.094 c 79.625 15.961 79.527 15.848 79.41 15.848 c 79.375 15.848
+ 79.34 15.859 79.313 15.879 c 79.242 15.922 79.191 16 79.191 16.094 c 79.191
+ 16.105 79.191 16.121 79.195 16.133 c 79.145 16.16 79.098 16.191 79.059
+16.23 c 78.926 16.34 78.902 16.512 78.898 16.582 c 78.816 16.648 78.746
+16.734 78.688 16.84 c 78.512 17.141 78.516 17.438 78.516 17.488 c 78.516
+ 17.891 78.688 18.246 78.945 18.438 c 79.137 18.648 79.152 18.922 79.137
+ 19.094 c 79.082 19.063 l 76.918 17.805 l 76.906 17.613 l 76.734 17.484
+l 76.73 17.461 76.723 17.43 76.715 17.398 c 76.625 17.082 76.789 16.82 76.918
+ 16.676 c 77.168 16.477 77.332 16.133 77.332 15.738 c 77.332 15.359 77.18
+ 15.027 76.949 14.828 c 76.93 14.633 76.813 14.465 76.652 14.383 c 76.652
+ 14.375 76.656 14.355 76.656 14.344 c 76.656 14.211 76.559 14.098 76.438
+ 14.098 c 76.402 14.098 76.371 14.109 76.344 14.129 c 76.27 14.172 76.219
+ 14.25 76.219 14.344 c 76.219 14.355 76.223 14.375 76.223 14.383 c 76.172
+ 14.41 76.125 14.441 76.086 14.48 c 75.957 14.59 75.934 14.762 75.926 14.828
+ c 75.844 14.895 75.773 14.984 75.715 15.09 c 75.539 15.391 75.543 15.688
+ 75.543 15.738 c 75.543 16.141 75.715 16.488 75.973 16.684 c 76.23 16.969
+ 76.172 17.359 76.145 17.484 c 75.957 17.613 l 75.949 17.832 l 75.883 17.875
+ l 73.449 19.41 l 79.879 19.418 l f
+59.16 51.828 3.563 0.25 re f
+65.523 51.828 3.563 0.25 re f
+59.504 56.922 m 59.504 61.66 l 62.379 61.66 l 62.379 56.91 l 62.379 56.91
+ 61.688 56.723 60.914 56.684 c 60.172 56.723 59.504 56.922 59.504 56.922
+ c f
+65.867 56.922 m 65.867 61.66 l 68.742 61.66 l 68.742 56.91 l 68.742 56.91
+ 68.047 56.723 67.277 56.684 c 66.535 56.723 65.867 56.922 65.867 56.922
+ c f
+108.008 56.887 m 108.008 61.629 l 110.059 61.629 l 110.059 56.883 l 110.059
+ 56.883 109.566 56.691 109.016 56.66 c 108.484 56.691 108.008 56.887 108.008
+ 56.887 c f
+107.758 51.797 2.574 0.223 re f
+76.414 51.813 3.559 0.25 re f
+82.613 51.813 3.563 0.25 re f
+88.813 51.813 3.566 0.25 re f
+95.016 51.813 3.566 0.25 re f
+101.219 51.813 3.559 0.25 re f
+76.762 56.922 m 76.762 61.664 l 79.637 61.664 l 79.637 56.914 l 79.637
+56.914 78.941 56.727 78.172 56.688 c 77.43 56.727 76.762 56.922 76.762 56.922
+ c f
+82.965 56.922 m 82.965 61.664 l 85.836 61.664 l 85.836 56.914 l 85.836
+56.914 85.145 56.727 84.375 56.688 c 83.633 56.727 82.965 56.922 82.965
+56.922 c f
+89.164 56.922 m 89.164 61.664 l 92.039 61.664 l 92.039 56.914 l 92.039
+56.914 91.348 56.727 90.574 56.688 c 89.832 56.727 89.164 56.922 89.164
+56.922 c f
+95.363 56.922 m 95.363 61.664 l 98.242 61.664 l 98.242 56.914 l 98.242
+56.914 97.547 56.727 96.777 56.688 c 96.035 56.727 95.363 56.922 95.363
+56.922 c f
+101.566 56.922 m 101.566 61.664 l 104.441 61.664 l 104.441 56.914 l 104.441
+ 56.914 103.75 56.727 102.977 56.688 c 102.234 56.727 101.566 56.922 101.566
+ 56.922 c f
+117.133 34.723 m 117.668 34.723 l 117.668 34.375 l 117.668 34.375 118.355
+ 33.91 119.676 33.91 c 120.984 33.91 121.68 34.375 121.68 34.375 c 121.68
+ 34.723 l 122.238 34.723 l 122.238 33.91 l 122.609 33.91 l 122.609 33.238
+ l 116.754 33.238 l 116.754 33.91 l 117.133 33.91 l 117.133 34.723 l f
+117.785 44.043 m 119.691 43.398 l 121.664 44.043 l h
+122.508 43.848 m 119.773 42.965 l 119.719 42.941 119.652 42.941 119.598
+ 42.965 c 116.859 43.883 l 116.777 43.914 116.719 43.973 116.703 44.047
+c 116.688 44.125 116.719 44.203 116.785 44.254 c 117.008 44.422 l 117.051
+ 44.461 117.113 44.477 117.172 44.477 c 117.207 44.477 l 117.207 44.832
+l 117.207 44.953 117.32 45.047 117.461 45.047 c 117.543 45.047 117.621 45.008
+ 117.664 44.957 c 117.691 44.922 117.711 44.879 117.711 44.832 c 117.711
+ 44.477 l 121.664 44.477 l 121.664 44.832 l 121.664 44.953 121.781 45.047
+ 121.914 45.047 c 122.055 45.047 122.168 44.953 122.168 44.832 c 122.168
+ 44.477 l 122.199 44.477 l 122.27 44.477 122.336 44.453 122.383 44.41 c
+122.605 44.203 l 122.664 44.148 122.688 44.078 122.668 44.008 c 122.648
+43.93 122.59 43.875 122.512 43.848 c f
+90.461 27.633 m 89.855 27.633 89.367 28.125 89.367 28.727 c 89.367 29.336
+ 89.855 29.828 90.461 29.828 c 91.066 29.828 91.555 29.336 91.555 28.727
+ c 91.555 28.125 91.066 27.633 90.461 27.633 c f
+63.797 28.883 m 64.891 28.883 65.777 27.996 65.777 26.898 c 65.777 25.809
+ 64.891 24.922 63.797 24.922 c 62.707 24.922 61.816 25.809 61.816 26.898
+ c 61.816 27.996 62.707 28.883 63.797 28.883 c f
+59.516 44.734 2.855 6.629 re f
+65.879 44.734 2.848 6.629 re f
+125.184 41.586 4.855 0.285 re f
+117.801 35.145 m 117.801 41.238 l 121.609 41.238 l 121.609 35.133 l 121.609
+ 35.133 120.691 34.895 119.668 34.848 c 118.688 34.895 117.801 35.145 117.801
+ 35.145 c f
+117.34 41.586 4.773 0.285 re f
+61.406 41.73 m 62.379 41.73 l 62.379 36.98 l 62.379 36.98 61.688 36.797
+ 60.914 36.758 c 60.172 36.797 59.504 36.988 59.504 36.988 c 59.504 41.73
+ l 61.406 41.73 l f
+59.152 42.09 3.602 0.223 re f
+65.867 41.73 m 68.742 41.73 l 68.742 36.98 l 68.742 36.98 68.047 36.797
+ 67.277 36.758 c 66.535 36.797 65.867 36.988 65.867 36.988 c 65.867 41.73
+ l f
+65.512 42.09 3.605 0.223 re f
+107.758 34.695 m 108.004 34.695 l 108.004 34.344 l 108.004 34.344 108.324
+ 33.883 108.934 33.883 c 109.539 33.883 109.859 34.344 109.859 34.344 c
+109.859 34.695 l 110.121 34.695 l 110.121 33.883 l 110.293 33.883 l 110.293
+ 33.215 l 107.582 33.215 l 107.582 33.883 l 107.758 33.883 l 107.758 34.695
+ l f
+108.066 35.121 m 108.066 41.215 l 109.828 41.215 l 109.828 35.105 l 109.828
+ 35.105 109.402 34.871 108.93 34.82 c 108.477 34.871 108.066 35.121 108.066
+ 35.121 c f
+107.852 41.559 2.211 0.285 re f
+108.043 49.809 m 108.043 51.313 l 109.852 51.313 l 109.852 46.398 l 109.848
+ 46.398 l 109.848 45.266 l 109.848 45.266 109.422 45.09 108.945 45.051 c
+ 108.945 45.059 l 108.469 45.094 108.043 45.273 108.043 45.273 c 108.043
+ 49.809 l f
+108.93 43.402 m 109.844 44.047 l 108.047 44.047 l h
+107.777 44.477 m 107.777 44.836 l 107.777 44.957 107.832 45.051 107.895
+ 45.051 c 107.934 45.051 107.969 45.012 107.992 44.957 c 108.004 44.922
+108.012 44.883 108.012 44.836 c 108.012 44.477 l 109.844 44.477 l 109.844
+ 44.836 l 109.844 44.957 109.898 45.051 109.961 45.051 c 110.027 45.051
+110.078 44.957 110.078 44.836 c 110.078 44.477 l 110.094 44.477 l 110.125
+ 44.477 110.156 44.457 110.18 44.414 c 110.281 44.211 l 110.309 44.152 110.32
+ 44.082 110.309 44.008 c 110.301 43.938 110.273 43.879 110.238 43.852 c
+108.969 42.965 l 108.941 42.945 108.91 42.945 108.887 42.965 c 107.617 43.887
+ l 107.578 43.918 107.551 43.977 107.547 44.051 c 107.539 44.129 107.551
+ 44.207 107.582 44.258 c 107.688 44.426 l 107.707 44.465 107.734 44.477
+107.762 44.477 c 107.777 44.477 l f
+76.766 44.727 2.855 6.625 re f
+82.969 44.727 2.848 6.625 re f
+89.168 44.727 2.852 6.625 re f
+95.371 44.727 2.848 6.625 re f
+101.57 44.727 2.852 6.625 re f
+76.762 41.73 m 79.637 41.73 l 79.637 36.98 l 79.637 36.98 78.941 36.797
+ 78.172 36.758 c 77.43 36.797 76.762 36.988 76.762 36.988 c 76.762 41.73
+ l f
+76.406 42.09 3.605 0.223 re f
+84.867 41.73 m 85.836 41.73 l 85.836 36.98 l 85.836 36.98 85.145 36.797
+ 84.375 36.758 c 83.633 36.797 82.965 36.988 82.965 36.988 c 82.965 41.73
+ l 84.867 41.73 l f
+82.609 42.09 3.602 0.223 re f
+89.164 41.73 m 92.039 41.73 l 92.039 36.98 l 92.039 36.98 91.348 36.797
+ 90.574 36.758 c 89.832 36.797 89.164 36.988 89.164 36.988 c 89.164 41.73
+ l f
+88.809 42.09 3.605 0.223 re f
+97.27 41.73 m 98.242 41.73 l 98.242 36.98 l 98.242 36.98 97.547 36.797
+96.777 36.758 c 96.035 36.797 95.363 36.988 95.363 36.988 c 95.363 41.73
+ l 97.27 41.73 l f
+95.012 42.09 3.605 0.223 re f
+103.469 41.73 m 104.441 41.73 l 104.441 36.98 l 104.441 36.98 103.75 36.797
+ 102.977 36.758 c 102.234 36.797 101.566 36.988 101.566 36.988 c 101.566
+ 41.73 l 103.469 41.73 l f
+101.211 42.09 3.605 0.223 re f
+104.086 29.547 m 109.445 29.547 l 112.273 21.816 l 112.953 19.969 l 108.281
+ 20.309 l 107.594 21.816 l 104.086 29.547 l f
+141.398 19.969 m 113.816 19.969 l 113.133 21.816 l 110.281 29.547 l 112.832
+ 29.555 l 127.609 22.609 l 142.469 29.547 l 144.934 29.547 l 142.082 21.816
+ l 141.398 19.969 l f
+133.488 5.297 m 133.457 6.82 l 132.195 8.633 l 123.02 8.633 l 121.758 6.82
+ l 121.73 5.297 l h
+124.234 3.871 m 124.254 3.789 124.371 3.707 124.559 3.633 c 125.133 3.41
+ 126.367 3.223 127.551 3.223 c 127.555 3.223 127.559 3.223 127.559 3.223
+ c 127.563 3.223 127.563 3.223 127.566 3.223 c 127.594 3.223 127.621 3.227
+ 127.652 3.227 c 127.652 3.223 l 127.652 3.223 127.656 3.223 127.656 3.223
+ c 127.656 3.223 127.66 3.223 127.664 3.223 c 128.848 3.223 130.082 3.41
+ 130.656 3.633 c 130.844 3.707 130.961 3.789 130.98 3.871 c 130.98 3.879
+ 130.992 3.883 130.992 3.891 c 124.219 3.891 l 124.219 3.883 124.234 3.879
+ 124.234 3.871 c h
+133.324 11.215 m 133.051 11.383 l 133.047 11.527 l 122.172 11.527 l 122.168
+ 11.383 l 121.895 11.215 l 121.871 11.113 121.84 10.898 121.887 10.668 c
+ 121.918 10.5 121.984 10.316 122.145 10.164 c 122.41 9.984 122.602 9.711
+ 122.699 9.379 c 132.52 9.379 l 132.617 9.711 132.813 9.984 133.074 10.164
+ c 133.234 10.316 133.301 10.5 133.332 10.668 c 133.379 10.898 133.352 11.113
+ 133.324 11.215 c h
+118.664 10.113 m 120.121 9.754 l 120.141 9.754 120.219 9.723 120.348 9.688
+ c 120.457 9.883 120.602 10.047 120.773 10.164 c 120.934 10.316 121 10.5
+ 121.031 10.668 c 121.078 10.898 121.051 11.113 121.027 11.215 c 120.754
+ 11.383 l 120.746 11.527 l 114.117 19.227 l 141.102 19.227 l 134.469 11.527
+ l 134.465 11.383 l 134.191 11.215 l 134.168 11.113 134.137 10.898 134.184
+ 10.668 c 134.215 10.5 134.285 10.316 134.441 10.164 c 134.621 10.047 134.762
+ 9.883 134.871 9.688 c 135 9.723 135.074 9.754 135.094 9.754 c 136.551 10.113
+ l 136.551 12.105 l 137.863 12.957 l 137.863 8.98 l 136.969 8.754 l 136.953
+ 8.746 l 136.914 8.734 l 135.984 8.496 l 135.984 5.105 l 134.09 3.895 l
+134.059 3.879 l 131.762 3.879 l 131.762 2.75 130.734 0.898 128.988 0.238
+ c 128.586 0.09 128.141 0 127.66 0 c 127.641 0 127.578 0 127.563 0 c 127.559
+ 0 l 127.078 0 126.633 0.09 126.23 0.238 c 124.484 0.898 123.457 2.75 123.457
+ 3.879 c 121.16 3.879 l 121.129 3.895 l 119.234 5.105 l 119.234 8.496 l
+119.176 8.508 l 117.355 8.98 l 117.355 12.957 l 118.668 12.09 l 118.668
+10.113 l f
+119.926 11.738 m 117.297 13.563 l 112.816 16.672 l 108.547 19.633 l 113.078
+ 19.297 l 119.926 11.738 l f
+125.633 44.043 m 127.605 43.402 l 129.512 44.043 l h
+130.434 43.883 m 127.699 42.965 l 127.645 42.945 127.578 42.945 127.523
+ 42.965 c 124.785 43.848 l 124.707 43.879 124.648 43.93 124.629 44.008 c
+ 124.609 44.078 124.633 44.148 124.688 44.207 c 124.914 44.41 l 124.961
+44.457 125.027 44.477 125.098 44.477 c 125.129 44.477 l 125.129 44.836 l
+ 125.129 44.953 125.242 45.047 125.379 45.047 c 125.516 45.047 125.629 44.953
+ 125.629 44.836 c 125.629 44.477 l 129.586 44.477 l 129.586 44.836 l 129.586
+ 44.879 129.602 44.922 129.629 44.957 c 129.676 45.008 129.754 45.047 129.836
+ 45.047 c 129.977 45.047 130.086 44.953 130.086 44.836 c 130.086 44.477
+l 130.125 44.477 l 130.184 44.477 130.246 44.461 130.289 44.422 c 130.512
+ 44.254 l 130.578 44.203 130.605 44.125 130.594 44.047 c 130.578 43.973
+130.516 43.914 130.434 43.883 c f
+125.063 34.723 m 125.598 34.723 l 125.598 34.375 l 125.598 34.375 126.285
+ 33.91 127.605 33.91 c 128.93 33.91 129.617 34.375 129.617 34.375 c 129.617
+ 34.723 l 130.156 34.723 l 130.156 33.91 l 130.539 33.91 l 130.539 33.246
+ l 124.68 33.238 l 124.68 33.91 l 125.063 33.91 l 125.063 34.723 l f
+129.523 41.238 m 129.523 35.145 l 129.523 35.145 128.586 34.895 127.602
+ 34.848 c 126.621 34.895 125.695 35.145 125.695 35.145 c 125.695 41.238
+l 129.523 41.238 l f
+82.039 8.652 m 82.766 8.609 83.484 8.59 84.168 8.59 c 84.895 8.59 85.578
+ 8.609 86.258 8.652 c 86.215 8.527 86.203 8.418 86.203 8.246 c 86.203 8.09
+ 86.215 7.973 86.258 7.871 c 85.293 7.918 83.836 7.953 83.543 7.953 c 83.543
+ 4.871 l 84.066 4.871 84.598 4.883 85.121 4.891 c 85.406 4.898 85.703 4.922
+ 86 4.945 c 85.965 4.871 85.941 4.719 85.941 4.559 c 85.941 4.387 85.965
+ 4.273 86 4.148 c 85.395 4.219 84.121 4.23 83.543 4.23 c 83.543 1.559 l
+84.586 1.559 84.703 1.559 85.121 1.582 c 86.191 1.637 l 86.156 1.547 86.133
+ 1.387 86.133 1.215 c 86.133 1.082 86.156 0.988 86.191 0.852 c 85.371 0.879
+ 84.621 0.922 84.098 0.922 c 83.484 0.922 82.598 0.883 82.039 0.852 c 82.121
+ 1.988 82.145 4.184 82.145 4.664 c 82.145 5.184 82.121 6.57 82.098 7.23
+c 82.086 7.711 82.063 8.176 82.039 8.652 c f
+91.48 8.813 m 92.574 8.813 93.813 8.527 94.781 8.016 c 94.758 7.703 94.746
+ 7.418 94.746 6.98 c 94.746 6.672 94.77 5.48 94.836 5.07 c 94.598 5.121
+94.438 5.148 94.121 5.148 c 93.824 5.148 93.563 5.105 93.313 5.07 c 93.348
+ 5.633 93.383 6.184 93.383 6.746 c 93.383 6.891 93.383 6.98 93.348 7.777
+ c 92.895 8.078 92.266 8.188 91.73 8.188 c 90.695 8.188 90.082 7.688 89.672
+ 7.152 c 89.141 6.465 88.98 5.641 88.98 4.773 c 88.98 2.629 89.992 1.379
+ 91.891 1.379 c 93.531 1.379 93.926 2.172 94.063 2.445 c 94.176 2.445 l
+94.52 1.336 l 93.609 0.922 92.789 0.758 91.855 0.758 c 88.82 0.758 87.422
+ 2.59 87.422 4.883 c 87.422 7.438 89.266 8.813 91.48 8.813 c f
+96.695 8.652 m 97.422 8.609 98.137 8.59 98.82 8.59 c 99.547 8.59 100.23
+ 8.609 100.91 8.652 c 100.867 8.527 100.855 8.418 100.855 8.246 c 100.855
+ 8.09 100.867 7.973 100.91 7.871 c 99.945 7.918 98.492 7.953 98.195 7.953
+ c 98.195 4.871 l 98.719 4.871 99.254 4.883 99.773 4.891 c 100.059 4.898
+ 100.355 4.922 100.652 4.945 c 100.617 4.871 100.594 4.719 100.594 4.559
+ c 100.594 4.387 100.617 4.273 100.652 4.148 c 100.047 4.219 98.773 4.23
+ 98.195 4.23 c 98.195 1.559 l 99.238 1.559 99.355 1.559 99.773 1.582 c 100.844
+ 1.637 l 100.809 1.547 100.785 1.387 100.785 1.215 c 100.785 1.082 100.809
+ 0.988 100.844 0.852 c 100.023 0.879 99.273 0.922 98.75 0.922 c 98.137 0.922
+ 97.25 0.883 96.695 0.852 c 96.773 1.988 96.797 4.184 96.797 4.664 c 96.797
+ 5.184 96.773 6.57 96.75 7.23 c 96.738 7.711 96.715 8.176 96.695 8.652 c
+ f
+103.973 1.465 m 104.145 1.457 104.563 1.414 104.781 1.414 c 105.156 1.414
+ 105.531 1.465 105.84 1.691 c 106.234 1.988 106.316 2.398 106.316 2.879
+c 106.316 3.621 105.898 4.445 104.758 4.445 c 104.461 4.445 104.191 4.422
+ 103.973 4.414 c h
+103.258 8.59 m 103.543 8.59 103.793 8.633 104.02 8.652 c 104.02 8.359 103.973
+ 6.891 103.973 6.563 c 103.973 4.945 l 104.246 4.945 l 104.859 5.809 105.566
+ 6.813 106.145 7.711 c 106.316 7.973 106.566 8.391 106.738 8.652 c 107.078
+ 8.609 107.215 8.59 107.656 8.59 c 108.066 8.59 108.352 8.625 108.672 8.652
+ c 107.953 7.758 107.648 7.355 106.746 6.094 c 106.578 5.855 106.328 5.48
+ 106.156 5.246 c 105.84 4.789 l 106.871 4.594 107.816 3.945 107.816 2.684
+ c 107.816 2.207 107.637 1.738 107.297 1.414 c 106.805 0.941 106.25 0.852
+ 105.508 0.852 c 105.246 0.852 103.926 0.91 103.633 0.91 c 103.055 0.91
+102.758 0.879 102.496 0.852 c 102.574 2.32 102.574 2.477 102.574 3.969 c
+ 102.574 6.164 102.563 6.418 102.473 8.652 c 102.723 8.625 102.996 8.59
+103.258 8.59 c f
+152.805 2.129 m 152.805 4.23 l 152.805 7.223 152.781 7.473 152.668 8.563
+ c 152.859 8.551 153.203 8.496 153.465 8.496 c 153.723 8.496 154.043 8.551
+ 154.191 8.563 c 154.133 7.758 154.109 6.688 154.109 5.594 c 154.109 4.695
+ 154.125 1.805 154.238 0.84 c 154.109 0.758 l 153.883 0.91 153.156 1.336
+ 152.895 1.457 c 151.949 1.914 151.449 2.164 150.621 2.465 c 150.621 2.559
+ l 150.871 2.84 150.938 2.914 151.109 3.09 c 151.449 2.922 152.543 2.297
+ 152.805 2.129 c f
+156.48 8.484 m 156.504 8.563 l 156.715 8.527 156.863 8.496 157.059 8.496
+ c 157.297 8.496 157.48 8.527 157.672 8.563 c 158.32 7.277 158.945 6.133
+ 159.652 4.82 c 159.969 4.23 161.496 1.539 161.664 1.336 c 161.664 1.055
+ l 159.73 1.055 157.391 1.055 156.547 0.965 c 156.57 1.215 156.605 1.465
+ 156.605 1.707 c 156.605 1.914 156.594 2.055 156.547 2.34 c 157.879 2.262
+ 158.23 2.262 158.742 2.262 c 160.301 2.262 l 159.832 3.137 157.445 7.121
+ 156.762 8.078 c 156.48 8.484 l f
+162.441 8.484 m 162.465 8.563 l 162.68 8.527 162.824 8.496 163.02 8.496
+ c 163.258 8.496 163.441 8.527 163.633 8.563 c 164.285 7.277 164.906 6.133
+ 165.613 4.82 c 165.934 4.23 167.457 1.539 167.625 1.336 c 167.625 1.055
+ l 165.691 1.055 163.352 1.055 162.508 0.965 c 162.531 1.215 162.566 1.465
+ 162.566 1.707 c 162.566 1.914 162.555 2.055 162.508 2.34 c 163.84 2.262
+ 164.191 2.262 164.703 2.262 c 166.262 2.262 l 165.797 3.137 163.406 7.121
+ 162.723 8.078 c 162.441 8.484 l f
+171.188 2.398 m 171.188 5.641 l 168.914 5.641 l h
+171.188 6.59 m 171.188 7.711 171.188 7.984 171.098 8.563 c 171.359 8.543
+ 171.609 8.496 171.871 8.496 c 172.063 8.496 172.246 8.527 172.508 8.563
+ c 172.449 7.965 172.449 7.828 172.449 6.59 c 172.77 6.59 173.074 6.605
+173.418 6.621 c 173.371 6.426 173.363 6.344 173.363 6.141 c 173.363 5.914
+ 173.371 5.82 173.418 5.621 c 172.813 5.641 172.746 5.641 172.449 5.641
+c 172.449 4.637 172.484 1.715 172.52 0.965 c 172.383 1.004 172.223 1.035
+ 172.02 1.035 c 171.848 1.035 171.645 1.004 171.516 0.965 c 171.371 1.238
+ 171.313 1.316 170.801 2.039 c 169.164 4.355 l 168.902 4.73 168.652 5.121
+ 168.379 5.48 c 168.277 5.621 168.094 5.836 168.094 5.914 c 168.094 6.594
+ l 168.379 6.59 168.813 6.57 169.164 6.57 c 169.742 6.57 170.336 6.57 171.188
+ 6.59 c f
+Q q
+0 63.992 255.113 3 re W n
+q
+0 63 256 4 re W n
+ q
+0.0666667 0.247059 0.380392 rg
+0 64.828 255.102 1.234 re f
+ Q
+Q
+Q q
+0.0666667 0.247059 0.380392 rg
+192.461 62.016 3.605 0.223 re f
+186.102 62.016 3.605 0.223 re f
+175.207 62.02 m 175.207 62.238 l 178.809 62.238 l 178.809 62.016 l 175.207
+ 62.016 l 175.207 62.02 l f
+162.801 62.016 3.605 0.223 re f
+156.602 62.02 m 156.602 62.238 l 160.207 62.238 l 160.207 62.016 l 156.602
+ 62.016 l 156.602 62.02 l f
+150.398 62.02 m 150.398 62.238 l 154.004 62.238 l 154.004 62.016 l 150.398
+ 62.016 l 150.398 62.02 l f
+59.152 62.016 3.602 0.223 re f
+65.512 62.016 3.605 0.223 re f
+76.406 62.016 3.605 0.223 re f
+82.609 62.02 m 82.609 62.238 l 86.211 62.238 l 86.211 62.016 l 82.609 62.016
+ l 82.609 62.02 l f
+88.809 62.02 m 88.809 62.238 l 92.414 62.238 l 92.414 62.016 l 88.809 62.016
+ l 88.809 62.02 l f
+95.012 62.02 m 95.012 62.238 l 98.617 62.238 l 98.617 62.016 l 95.012 62.016
+ l 95.012 62.02 l f
+101.211 62.02 m 101.211 62.238 l 104.816 62.238 l 104.816 62.016 l 101.211
+ 62.016 l 101.211 62.02 l f
+107.75 62.008 2.57 0.223 re f
+144.898 62.008 2.566 0.223 re f
+169.031 62.02 m 169.031 62.238 l 172.637 62.238 l 172.637 62.016 l 169.031
+ 62.016 l 169.031 62.02 l f
+Q q
+0 85.992 255.113 1.75 re W n
+q
+0 85 256 3 re W n
+ q
+0.0666667 0.247059 0.380392 rg
+0 86.473 255.117 1.273 re f
+ Q
+Q
+Q q
+0.0666667 0.247059 0.380392 rg
+244.434 71.383 m 244.434 71.016 244.742 70.695 245.102 70.695 c 245.465
+ 70.695 245.785 71.016 245.785 71.383 c 245.785 71.75 245.453 72.051 245.102
+ 72.051 c 244.754 72.051 244.434 71.75 244.434 71.383 c f
+246.547 71.383 m 246.547 71.016 246.855 70.695 247.219 70.695 c 247.578
+ 70.695 247.898 71.016 247.898 71.383 c 247.898 71.75 247.566 72.051 247.219
+ 72.051 c 246.867 72.051 246.547 71.75 246.547 71.383 c f
+77.973 76.215 m 78.547 76.215 79.813 76.195 80.41 76.133 c 80.379 76.258
+ 80.355 76.371 80.355 76.539 c 80.355 76.691 80.379 76.84 80.41 76.922 c
+ 80.117 76.898 79.824 76.879 79.543 76.863 c 79.023 76.852 78.492 76.84
+77.973 76.84 c 77.973 79.898 l 78.266 79.898 79.711 79.871 80.672 79.82
+c 80.625 79.922 80.613 80.039 80.613 80.195 c 80.613 80.363 80.625 80.477
+ 80.672 80.602 c 79.992 80.555 79.316 80.535 78.594 80.535 c 77.914 80.535
+ 77.203 80.555 76.48 80.602 c 76.504 80.129 76.527 79.664 76.539 79.188
+c 76.559 78.535 76.582 77.16 76.582 76.637 c 76.582 76.168 76.559 73.984
+ 76.48 72.855 c 77.035 72.887 77.914 72.922 78.523 72.922 c 79.043 72.922
+ 79.789 72.883 80.602 72.855 c 80.566 72.996 80.547 73.082 80.547 73.215
+ c 80.547 73.387 80.566 73.547 80.602 73.633 c 79.543 73.582 l 79.125 73.555
+ 79.012 73.555 77.973 73.555 c 77.973 76.215 l f
+82.074 78.91 m 82.59 80.039 83.156 80.211 83.82 80.211 c 84.715 80.211
+85.301 79.605 85.301 78.797 c 85.301 77.902 84.59 77.59 84.375 77.5 c 84.059
+ 77.359 83.527 77.16 83.211 77.023 c 82.117 76.539 81.789 75.965 81.789
+75.023 c 81.789 74.027 82.375 72.766 84.418 72.766 c 85.246 72.766 85.742
+ 72.98 86.293 73.227 c 86.07 73.785 86.047 73.875 85.945 74.301 c 85.785
+ 74.301 l 85.617 73.66 85.02 73.316 84.309 73.316 c 83.418 73.316 82.977
+ 73.875 82.977 74.543 c 82.977 75.359 83.551 75.59 84.547 75.973 c 85.414
+ 76.309 85.754 76.434 86.078 76.797 c 86.555 77.305 86.633 77.969 86.633
+ 78.289 c 86.633 79.438 85.832 80.758 83.766 80.758 c 82.793 80.758 82.059
+ 80.387 81.656 80.184 c 81.848 79.598 81.855 79.453 81.914 78.91 c 82.074
+ 78.91 l f
+87.234 80.238 m 87.48 79.891 88.621 78.352 88.848 78.039 c 89.367 77.258
+ 91.129 74.605 91.703 73.613 c 90.441 73.613 89.094 73.625 87.707 73.734
+ c 87.719 73.598 87.742 73.441 87.742 73.297 c 87.742 73.113 87.73 73.004
+ 87.707 72.855 c 88.578 72.934 89.422 72.922 90.742 72.922 c 92.461 72.922
+ 93.172 72.902 93.793 72.855 c 93.805 72.934 93.813 72.996 93.813 73.047
+ c 93.813 73.137 93.793 73.164 93.656 73.352 c 93.082 74.152 l 92.664 74.746
+ 92.031 75.676 91.523 76.445 c 90.527 77.934 l 89.965 78.785 89.605 79.348
+ 89.309 79.844 c 90.395 79.844 l 90.914 79.844 91.852 79.82 92.484 79.766
+ c 92.91 79.73 93.34 79.711 93.77 79.684 c 93.75 79.82 93.715 79.945 93.715
+ 80.148 c 93.715 80.316 93.734 80.488 93.77 80.602 c 93.434 80.59 92.699
+ 80.535 90.496 80.535 c 88.949 80.535 88.371 80.535 87.234 80.602 c 87.234
+ 80.238 l f
+97.836 79.055 m 97.836 79.918 97.883 80.289 97.914 80.602 c 97.586 80.566
+ 97.227 80.535 97.09 80.535 c 96.898 80.535 96.73 80.555 96.32 80.602 c
+96.367 79.746 96.434 78.875 96.434 78.016 c 96.426 74.863 l 96.426 74.445
+ 96.414 74.051 96.402 73.613 c 95.84 73.613 l 95.738 73.613 94.652 73.633
+ 94.074 73.691 c 94.109 73.555 94.133 73.414 94.133 73.273 c 94.133 73.137
+ 94.109 72.996 94.074 72.855 c 94.969 72.914 96.219 72.922 97.09 72.922
+c 98.027 72.922 99.02 72.914 100.105 72.855 c 100.07 73.047 100.047 73.195
+ 100.047 73.285 c 100.047 73.414 100.07 73.512 100.105 73.691 c 99.438 73.625
+ 98.637 73.613 97.859 73.613 c 97.848 74.016 97.836 74.445 97.836 74.879
+ c 97.836 79.055 l f
+102.094 76.215 m 102.672 76.215 103.938 76.195 104.535 76.133 c 104.5 76.258
+ 104.477 76.371 104.477 76.539 c 104.477 76.691 104.5 76.84 104.535 76.922
+ c 104.238 76.898 103.945 76.879 103.664 76.863 c 103.145 76.852 102.613
+ 76.84 102.094 76.84 c 102.094 79.898 l 102.391 79.898 103.832 79.871 104.793
+ 79.82 c 104.75 79.922 104.734 80.039 104.734 80.195 c 104.734 80.363 104.75
+ 80.477 104.793 80.602 c 104.117 80.555 103.438 80.535 102.715 80.535 c
+102.039 80.535 101.324 80.555 100.605 80.602 c 100.629 80.129 100.648 79.664
+ 100.66 79.188 c 100.684 78.535 100.707 77.16 100.707 76.637 c 100.707 76.168
+ 100.684 73.984 100.605 72.855 c 101.156 72.887 102.039 72.922 102.648 72.922
+ c 103.168 72.922 103.914 72.883 104.727 72.855 c 104.691 72.996 104.672
+ 73.082 104.672 73.215 c 104.672 73.387 104.691 73.547 104.727 73.633 c
+103.664 73.582 l 103.246 73.555 103.133 73.555 102.094 73.555 c 102.094
+76.215 l f
+107.18 76.391 m 107.391 76.398 107.66 76.422 107.957 76.422 c 109.086 76.422
+ 109.504 75.598 109.504 74.863 c 109.504 74.391 109.426 73.984 109.027 73.691
+ c 108.727 73.465 108.352 73.414 107.977 73.414 c 107.766 73.414 107.348
+ 73.457 107.18 73.465 c h
+109.344 77.215 m 109.516 77.453 109.762 77.82 109.934 78.059 c 110.824
+79.313 111.129 79.711 111.84 80.602 c 111.523 80.566 111.242 80.535 110.836
+ 80.535 c 110.395 80.535 110.258 80.555 109.922 80.602 c 109.754 80.34 109.504
+ 79.922 109.336 79.664 c 108.758 78.77 108.059 77.777 107.449 76.922 c 107.18
+ 76.922 l 107.18 78.523 l 107.18 78.848 107.223 80.309 107.223 80.602 c
+106.996 80.582 106.75 80.535 106.469 80.535 c 106.207 80.535 105.938 80.566
+ 105.688 80.602 c 105.777 78.379 105.789 78.133 105.789 75.953 c 105.789
+ 74.469 105.789 74.313 105.711 72.855 c 105.969 72.883 106.266 72.914 106.84
+ 72.914 c 107.133 72.914 108.441 72.855 108.703 72.855 c 109.438 72.855
+109.988 72.945 110.473 73.414 c 110.813 73.734 110.992 74.203 110.992 74.672
+ c 110.992 75.926 110.059 76.57 109.027 76.762 c 109.344 77.215 l f
+117.938 76.797 m 117.328 76.773 116.719 76.754 116.109 76.754 c 115.469
+ 76.754 114.82 76.773 114.18 76.797 c 114.18 77.926 l 114.18 79.383 114.223
+ 79.891 114.281 80.602 c 114.109 80.59 113.816 80.535 113.5 80.535 c 113.23
+ 80.535 112.973 80.582 112.699 80.602 c 112.789 78.883 112.801 77.18 112.801
+ 75.465 c 112.801 74.586 112.766 73.723 112.688 72.855 c 112.914 72.883
+113.32 72.922 113.5 72.922 c 113.715 72.922 114.133 72.883 114.281 72.855
+ c 114.223 73.477 114.18 73.965 114.18 76.078 c 114.742 76.094 115.316 76.121
+ 115.883 76.121 c 116.574 76.121 117.25 76.094 117.938 76.078 c 117.938
+75.777 117.93 74.414 117.914 74.133 c 117.914 73.785 117.906 73.691 117.859
+ 72.855 c 118.074 72.883 118.434 72.922 118.684 72.922 c 118.887 72.922
+119.262 72.883 119.473 72.855 c 119.328 74.027 119.316 76.762 119.316 77.934
+ c 119.316 78.832 119.316 79.789 119.43 80.602 c 119.156 80.582 118.875
+80.535 118.605 80.535 c 118.367 80.535 118.074 80.582 117.836 80.602 c 117.848
+ 80.395 117.93 79.035 117.93 78.613 c 117.938 76.797 l f
+123.641 72.359 m 123.066 72.359 l 124.656 70.641 l 124.805 70.484 124.996
+ 70.34 125.199 70.34 c 125.484 70.34 125.73 70.52 125.73 70.801 c 125.73
+ 71.047 125.57 71.164 125.492 71.219 c h
+123.598 74.672 m 122.445 77.453 l 122.84 77.465 123.227 77.5 123.621 77.5
+ c 123.969 77.5 124.309 77.473 124.656 77.453 c h
+125.461 79.348 m 124.984 78.148 l 124.5 78.133 124.023 78.105 123.539 78.105
+ c 123.09 78.105 122.637 78.133 122.184 78.148 c 121.824 79.02 121.465 79.961
+ 121.281 80.602 c 121.133 80.582 120.922 80.535 120.738 80.535 c 120.551
+ 80.535 120.391 80.582 120.234 80.602 c 121.543 77.688 l 122.68 75.137 123.336
+ 73.672 123.609 72.746 c 123.73 72.777 123.844 72.797 123.98 72.797 c 124.105
+ 72.797 124.219 72.777 124.34 72.746 c 124.883 74.293 125.563 75.875 125.969
+ 76.82 c 126.398 77.801 127.141 79.508 127.648 80.602 c 127.48 80.59 127.086
+ 80.535 126.77 80.535 c 126.453 80.535 126.137 80.59 125.934 80.602 c 125.461
+ 79.348 l f
+127.867 80.238 m 128.113 79.891 129.254 78.352 129.48 78.039 c 130 77.258
+ 131.762 74.605 132.336 73.613 c 131.07 73.613 129.73 73.625 128.34 73.734
+ c 128.352 73.598 128.371 73.441 128.371 73.297 c 128.371 73.113 128.363
+ 73.004 128.34 72.855 c 129.207 72.934 130.055 72.922 131.379 72.922 c 133.094
+ 72.922 133.805 72.902 134.426 72.855 c 134.438 72.934 134.449 72.996 134.449
+ 73.047 c 134.449 73.137 134.426 73.164 134.293 73.352 c 133.715 74.152
+l 133.297 74.746 132.664 75.676 132.156 76.445 c 131.16 77.934 l 130.598
+ 78.785 130.234 79.348 129.941 79.844 c 131.027 79.844 l 131.547 79.844
+132.484 79.82 133.117 79.766 c 133.543 79.73 133.977 79.711 134.402 79.684
+ c 134.379 79.82 134.348 79.945 134.348 80.148 c 134.348 80.316 134.371
+80.488 134.402 80.602 c 134.063 80.59 133.328 80.535 131.129 80.535 c 129.582
+ 80.535 129.004 80.535 127.867 80.602 c 127.867 80.238 l f
+138.648 77.996 m 138.648 78.941 138.684 79.551 138.727 80.602 c 138.469
+ 80.582 138.207 80.535 137.949 80.535 c 137.723 80.535 137.406 80.582 137.195
+ 80.602 c 137.227 79.719 137.262 78.238 137.262 77.543 c 136.594 76.391
+l 136.02 75.395 135.059 73.84 134.473 72.855 c 134.891 72.902 135.148 72.922
+ 135.398 72.922 c 135.668 72.922 135.996 72.914 136.324 72.855 c 136.91
+74.098 137.34 74.988 138.301 76.672 c 139.258 75.023 139.438 74.641 140.25
+ 72.855 c 140.434 72.887 140.66 72.922 140.906 72.922 c 141.133 72.922 141.258
+ 72.902 141.383 72.855 c 141.215 73.164 140.387 74.469 140.219 74.746 c
+139.711 75.555 139.27 76.398 138.797 77.215 c 138.719 77.348 138.648 77.473
+ 138.648 77.578 c 138.648 77.996 l f
+145.043 72.855 m 145.301 72.883 145.594 72.922 145.832 72.922 c 146.078
+ 72.922 146.363 72.887 146.621 72.855 c 146.543 73.414 146.543 74.23 146.531
+ 74.641 c 146.52 75.207 146.52 75.848 146.52 76.434 c 147.355 75.703 147.809
+ 75.227 148.453 74.523 c 148.949 73.984 149.559 73.332 149.895 72.855 c
+150.023 72.902 150.234 72.922 150.426 72.922 c 150.617 72.922 150.844 72.914
+ 151.184 72.855 c 150.605 73.34 149.816 74.098 149.344 74.559 c 148.777
+75.113 148.598 75.285 147.773 76.188 c 148.371 76.977 l 148.949 77.734 150.574
+ 79.883 151.363 80.602 c 150.836 80.535 150.574 80.535 150.359 80.535 c
+150.09 80.535 149.727 80.582 149.398 80.602 c 148.598 79.473 147.719 78.23
+ 146.52 76.91 c 146.52 78.148 146.52 79.402 146.621 80.602 c 146.43 80.59
+ 146.102 80.535 145.832 80.535 c 145.594 80.535 145.277 80.59 145.043 80.602
+ c 145.145 78.691 145.145 78.566 145.145 75.465 c 145.145 74.176 145.133
+ 73.984 145.043 72.855 c f
+154.867 72.359 m 154.289 72.359 l 155.883 70.641 l 156.027 70.484 156.219
+ 70.34 156.422 70.34 c 156.707 70.34 156.953 70.52 156.953 70.801 c 156.953
+ 71.047 156.797 71.164 156.715 71.219 c h
+154.82 74.672 m 153.668 77.453 l 154.063 77.465 154.449 77.5 154.844 77.5
+ c 155.191 77.5 155.531 77.473 155.883 77.453 c h
+156.684 79.348 m 156.211 78.148 l 155.723 78.133 155.25 78.105 154.766
+78.105 c 154.313 78.105 153.859 78.133 153.41 78.148 c 153.047 79.02 152.688
+ 79.961 152.504 80.602 c 152.359 80.582 152.145 80.535 151.965 80.535 c
+151.773 80.535 151.613 80.582 151.457 80.602 c 152.766 77.688 l 153.906
+75.137 154.559 73.672 154.832 72.746 c 154.957 72.777 155.07 72.797 155.203
+ 72.797 c 155.328 72.797 155.441 72.777 155.566 72.746 c 156.109 74.293
+156.785 75.875 157.191 76.82 c 157.621 77.801 158.367 79.508 158.875 80.602
+ c 158.703 80.59 158.309 80.535 157.992 80.535 c 157.676 80.535 157.363
+80.59 157.156 80.602 c 156.684 79.348 l f
+161.234 76.391 m 161.449 76.398 161.719 76.422 162.012 76.422 c 163.141
+ 76.422 163.559 75.598 163.559 74.863 c 163.559 74.391 163.48 73.984 163.086
+ 73.691 c 162.781 73.465 162.41 73.414 162.035 73.414 c 161.82 73.414 161.402
+ 73.457 161.234 73.465 c h
+163.402 77.215 m 163.57 77.453 163.82 77.82 163.988 78.059 c 164.883 79.313
+ 165.188 79.711 165.898 80.602 c 165.582 80.566 165.301 80.535 164.891 80.535
+ c 164.453 80.535 164.316 80.555 163.977 80.602 c 163.809 80.34 163.559
+79.922 163.391 79.664 c 162.816 78.77 162.113 77.777 161.504 76.922 c 161.234
+ 76.922 l 161.234 78.523 l 161.234 78.848 161.277 80.309 161.277 80.602
+c 161.055 80.582 160.805 80.535 160.523 80.535 c 160.262 80.535 159.992
+80.566 159.746 80.602 c 159.832 78.379 159.848 78.133 159.848 75.953 c 159.848
+ 74.469 159.848 74.313 159.766 72.855 c 160.027 72.883 160.32 72.914 160.895
+ 72.914 c 161.191 72.914 162.5 72.855 162.758 72.855 c 163.492 72.855 164.047
+ 72.945 164.531 73.414 c 164.871 73.734 165.051 74.203 165.051 74.672 c
+165.051 75.926 164.113 76.57 163.086 76.762 c 163.402 77.215 l f
+169.988 80.184 m 171.906 80.184 172.652 78.379 172.652 76.762 c 172.652
+ 74.922 171.965 73.34 169.988 73.34 c 168.047 73.34 167.32 75.215 167.32
+ 76.762 c 167.32 78.445 168.047 80.184 169.988 80.184 c h
+174.199 76.629 m 174.199 79.145 172.492 80.758 169.988 80.758 c 167.637
+ 80.758 165.773 79.371 165.773 76.898 c 165.773 74.027 167.742 72.766 170.02
+ 72.766 c 172.133 72.766 174.199 73.918 174.199 76.629 c f
+175.25 75.938 m 175.25 75.441 175.25 75.332 175.219 74.328 c 175.207 74.09
+ 175.184 73.07 175.172 72.855 c 175.453 72.914 175.672 72.922 175.949 72.922
+ c 176.234 72.922 176.461 72.902 176.742 72.855 c 176.664 74.559 176.629
+ 75.98 176.629 77.719 c 176.629 78.512 176.652 79.25 176.664 79.871 c 176.867
+ 79.871 l 177.195 79.871 178.82 79.871 179.484 79.766 c 179.453 79.891 179.43
+ 79.961 179.43 80.215 c 179.43 80.387 179.438 80.457 179.484 80.602 c 178.91
+ 80.582 177.938 80.535 177.328 80.535 c 176.605 80.535 175.996 80.555 175.172
+ 80.602 c 175.172 80.422 175.25 77.801 175.25 77.52 c 175.25 75.938 l f
+182.863 77.996 m 182.863 78.941 182.895 79.551 182.941 80.602 c 182.68
+80.582 182.422 80.535 182.16 80.535 c 181.938 80.535 181.621 80.582 181.406
+ 80.602 c 181.441 79.719 181.473 78.238 181.473 77.543 c 180.809 76.391
+l 180.23 75.395 179.27 73.84 178.688 72.855 c 179.102 72.902 179.363 72.922
+ 179.609 72.922 c 179.883 72.922 180.211 72.914 180.535 72.855 c 181.125
+ 74.098 181.551 74.988 182.512 76.672 c 183.469 75.023 183.652 74.641 184.465
+ 72.855 c 184.645 72.887 184.871 72.922 185.121 72.922 c 185.348 72.922
+185.469 72.902 185.594 72.855 c 185.426 73.164 184.602 74.469 184.434 74.746
+ c 183.922 75.555 183.484 76.398 183.008 77.215 c 182.93 77.348 182.863
+77.473 182.863 77.578 c 182.863 77.996 l f
+Q q
+0 71.992 6.992 9 re W n
+q
+0 71 7 10 re W n
+ q
+0.0666667 0.247059 0.380392 rg
+0 72.855 m 0.258 72.883 0.555 72.922 0.789 72.922 c 1.039 72.922 1.32 72.887
+ 1.582 72.855 c 1.504 73.414 1.504 74.23 1.488 74.641 c 1.48 75.207 1.48
+ 75.848 1.48 76.434 c 2.316 75.703 2.766 75.227 3.41 74.523 c 3.906 73.984
+ 4.516 73.332 4.855 72.855 c 4.977 72.902 5.191 72.922 5.387 72.922 c 5.578
+ 72.922 5.805 72.914 6.141 72.855 c 5.566 73.34 4.773 74.098 4.301 74.559
+ c 3.738 75.113 3.555 75.285 2.73 76.188 c 3.328 76.977 l 3.906 77.734 5.531
+ 79.883 6.324 80.602 c 5.789 80.535 5.531 80.535 5.316 80.535 c 5.047 80.535
+ 4.684 80.582 4.359 80.602 c 3.555 79.473 2.676 78.23 1.48 76.91 c 1.48
+78.148 1.48 79.402 1.582 80.602 c 1.387 80.59 1.063 80.535 0.789 80.535
+c 0.555 80.535 0.238 80.59 0 80.602 c 0.102 78.691 0.102 78.566 0.102 75.465
+ c 0.102 74.176 0.09 73.984 0 72.855 c f
+ Q
+Q
+Q q
+0.0666667 0.247059 0.380392 rg
+9.777 74.672 m 8.625 77.453 l 9.023 77.465 9.406 77.5 9.801 77.5 c 10.152
+ 77.5 10.492 77.473 10.84 77.453 c h
+11.641 79.348 m 11.168 78.148 l 10.684 78.133 10.207 78.105 9.723 78.105
+ c 9.27 78.105 8.82 78.133 8.367 78.148 c 8.008 79.02 7.645 79.961 7.465
+ 80.602 c 7.316 80.582 7.102 80.535 6.922 80.535 c 6.73 80.535 6.57 80.582
+ 6.414 80.602 c 7.723 77.688 l 8.863 75.137 9.52 73.672 9.789 72.746 c 9.914
+ 72.777 10.027 72.797 10.164 72.797 c 10.289 72.797 10.398 72.777 10.523
+ 72.746 c 11.066 74.293 11.742 75.875 12.148 76.82 c 12.578 77.801 13.324
+ 79.508 13.832 80.602 c 13.66 80.59 13.266 80.535 12.949 80.535 c 12.637
+ 80.535 12.316 80.59 12.117 80.602 c 11.641 79.348 l f
+16.793 79.055 m 16.793 79.918 16.836 80.289 16.871 80.602 c 16.543 80.566
+ 16.184 80.535 16.047 80.535 c 15.852 80.535 15.688 80.555 15.277 80.602
+ c 15.324 79.746 15.391 78.875 15.391 78.016 c 15.379 74.863 l 15.379 74.445
+ 15.371 74.051 15.355 73.613 c 14.793 73.613 l 14.691 73.613 13.605 73.633
+ 13.031 73.691 c 13.066 73.555 13.09 73.414 13.09 73.273 c 13.09 73.137
+13.066 72.996 13.031 72.855 c 13.926 72.914 15.176 72.922 16.047 72.922
+c 16.984 72.922 17.977 72.914 19.059 72.855 c 19.027 73.047 19.004 73.195
+ 19.004 73.285 c 19.004 73.414 19.027 73.512 19.059 73.691 c 18.395 73.625
+ 17.594 73.613 16.816 73.613 c 16.801 74.016 16.793 74.445 16.793 74.879
+ c 16.793 79.055 l f
+25.328 76.797 m 24.719 76.773 24.109 76.754 23.5 76.754 c 22.855 76.754
+ 22.215 76.773 21.566 76.797 c 21.566 77.926 l 21.566 79.383 21.613 79.891
+ 21.672 80.602 c 21.5 80.59 21.207 80.535 20.891 80.535 c 20.621 80.535
+20.359 80.582 20.09 80.602 c 20.18 78.883 20.191 77.18 20.191 75.465 c 20.191
+ 74.586 20.156 73.723 20.078 72.855 c 20.305 72.883 20.711 72.922 20.891
+ 72.922 c 21.105 72.922 21.523 72.883 21.672 72.855 c 21.613 73.477 21.566
+ 73.965 21.566 76.078 c 22.133 76.094 22.711 76.121 23.273 76.121 c 23.961
+ 76.121 24.637 76.094 25.328 76.078 c 25.328 75.777 25.316 74.414 25.309
+ 74.133 c 25.309 73.785 25.293 73.691 25.25 72.855 c 25.465 72.883 25.824
+ 72.922 26.074 72.922 c 26.277 72.922 26.648 72.883 26.863 72.855 c 26.715
+ 74.027 26.707 76.762 26.707 77.934 c 26.707 78.832 26.707 79.789 26.82
+80.602 c 26.547 80.582 26.266 80.535 25.996 80.535 c 25.758 80.535 25.465
+ 80.582 25.227 80.602 c 25.238 80.395 25.316 79.035 25.316 78.613 c 25.328
+ 76.797 l f
+31.945 80.184 m 33.867 80.184 34.613 78.379 34.613 76.762 c 34.613 74.922
+ 33.922 73.34 31.945 73.34 c 30.004 73.34 29.281 75.215 29.281 76.762 c
+29.281 78.445 30.004 80.184 31.945 80.184 c h
+36.16 76.629 m 36.16 79.145 34.453 80.758 31.945 80.758 c 29.598 80.758
+ 27.734 79.371 27.734 76.898 c 27.734 74.027 29.699 72.766 31.98 72.766
+c 34.094 72.766 36.16 73.918 36.16 76.629 c f
+37.211 75.938 m 37.211 75.441 37.211 75.332 37.176 74.328 c 37.168 74.09
+ 37.145 73.07 37.133 72.855 c 37.414 72.914 37.629 72.922 37.91 72.922 c
+ 38.195 72.922 38.418 72.902 38.699 72.855 c 38.621 74.559 38.59 75.98 38.59
+ 77.719 c 38.59 78.512 38.613 79.25 38.621 79.871 c 38.828 79.871 l 39.152
+ 79.871 40.777 79.871 41.445 79.766 c 41.41 79.891 41.391 79.961 41.391
+80.215 c 41.391 80.387 41.398 80.457 41.445 80.602 c 40.871 80.582 39.898
+ 80.535 39.289 80.535 c 38.566 80.535 37.957 80.555 37.133 80.602 c 37.133
+ 80.422 37.211 77.801 37.211 77.52 c 37.211 75.938 l f
+42.734 72.855 m 42.949 72.883 43.367 72.922 43.535 72.922 c 43.785 72.922
+ 44.066 72.887 44.336 72.855 c 44.211 73.691 44.211 75.645 44.211 76.789
+ c 44.211 78.465 44.234 79.684 44.328 80.602 c 44.066 80.59 43.793 80.535
+ 43.535 80.535 c 43.285 80.535 42.969 80.59 42.723 80.602 c 42.848 79.258
+ 42.848 77.395 42.848 75.465 c 42.848 74.754 42.848 73.953 42.734 72.855
c f
-146.414 42.824 m 145.863 42.824 145.602 43.625 145.602 44.43 c 145.602
-45.23 145.602 48.133 145.602 48.133 c 147.227 48.133 l 147.227 48.133 147.227
- 45.23 147.227 44.43 c 147.227 43.625 146.969 42.824 146.414 42.824 c f
-146.414 54.191 m 145.863 54.191 145.602 54.992 145.602 55.793 c 145.602
- 56.598 145.602 59.5 145.602 59.5 c 147.227 59.5 l 147.227 59.5 147.227
-56.598 147.227 55.793 c 147.227 54.992 146.969 54.191 146.414 54.191 c f
-190.156 27.242 m 191.012 27.242 191.703 26.547 191.703 25.691 c 191.703
- 24.84 191.012 24.145 190.156 24.145 c 189.301 24.145 188.605 24.84 188.605
- 25.691 c 188.605 26.547 189.301 27.242 190.156 27.242 c f
-114.004 17.969 m 110.32 18.309 l 119.879 12.172 l 114.004 17.969 l f
-110.703 27.871 m 105.996 27.871 l 110.133 18.984 l 113.859 18.609 l 110.703
- 27.871 l f
-144.93 27.871 m 143.254 27.871 l 128.234 21.223 l 113.195 27.871 l 111.52
- 27.871 l 114.645 18.609 l 141.805 18.609 l 144.93 27.871 l f
-118.027 42.504 m 118.027 41.953 l 117.684 41.953 l 117.684 41.379 l 120.52
- 40.23 l 123.355 41.379 l 123.355 41.953 l 123.016 41.953 l 123.016 42.504
- l 122.449 42.504 l 122.449 41.957 l 118.578 41.957 l 118.578 42.504 l 118.027
- 42.504 l f
-118.563 39.035 m 118.563 39.035 118.563 35.441 118.563 34.523 c 118.563
- 33.609 119.191 32.699 120.52 32.699 c 121.852 32.699 122.477 33.609 122.477
- 34.523 c 122.477 35.441 122.477 39.035 122.477 39.035 c 118.563 39.035
+46.191 78.91 m 46.707 80.039 47.273 80.211 47.941 80.211 c 48.832 80.211
+ 49.418 79.605 49.418 78.797 c 49.418 77.902 48.707 77.59 48.492 77.5 c
+48.176 77.359 47.645 77.16 47.328 77.023 c 46.234 76.539 45.906 75.965 45.906
+ 75.023 c 45.906 74.027 46.492 72.766 48.535 72.766 c 49.363 72.766 49.859
+ 72.98 50.414 73.227 c 50.184 73.785 50.164 73.875 50.063 74.301 c 49.902
+ 74.301 l 49.734 73.66 49.137 73.316 48.426 73.316 c 47.531 73.316 47.09
+ 73.875 47.09 74.543 c 47.09 75.359 47.668 75.59 48.66 75.973 c 49.531 76.309
+ 49.871 76.434 50.199 76.797 c 50.672 77.305 50.75 77.969 50.75 78.289 c
+ 50.75 79.438 49.949 80.758 47.883 80.758 c 46.91 80.758 46.176 80.387 45.773
+ 80.184 c 45.961 79.598 45.977 79.453 46.031 78.91 c 46.191 78.91 l f
+58.543 74.434 m 58.43 74.434 l 58.293 74.168 57.898 73.379 56.273 73.379
+ c 54.387 73.379 53.383 74.621 53.383 76.754 c 53.383 77.145 53.383 78.195
+ 54.07 79.109 c 54.477 79.641 55.086 80.137 56.113 80.137 c 57.504 80.137
+ 58.215 79.453 58.723 78.848 c 58.848 78.93 l 58.723 80.047 l 57.863 80.52
+ 56.895 80.758 55.867 80.758 c 53.664 80.758 51.836 79.391 51.836 76.852
+ c 51.836 74.586 53.223 72.766 56.238 72.766 c 57.164 72.766 57.977 72.922
+ 58.883 73.332 c 58.543 74.434 l f
+65.316 76.797 m 64.707 76.773 64.098 76.754 63.488 76.754 c 62.844 76.754
+ 62.203 76.773 61.559 76.797 c 61.559 77.926 l 61.559 79.383 61.605 79.891
+ 61.66 80.602 c 61.488 80.59 61.195 80.535 60.879 80.535 c 60.609 80.535
+ 60.352 80.582 60.078 80.602 c 60.168 78.883 60.18 77.18 60.18 75.465 c
+60.18 74.586 60.145 73.723 60.066 72.855 c 60.293 72.883 60.699 72.922 60.879
+ 72.922 c 61.094 72.922 61.512 72.883 61.66 72.855 c 61.605 73.477 61.559
+ 73.965 61.559 76.078 c 62.121 76.094 62.699 76.121 63.262 76.121 c 63.949
+ 76.121 64.629 76.094 65.316 76.078 c 65.316 75.777 65.309 74.414 65.293
+ 74.133 c 65.293 73.785 65.285 73.691 65.238 72.855 c 65.453 72.883 65.813
+ 72.922 66.063 72.922 c 66.266 72.922 66.641 72.883 66.855 72.855 c 66.707
+ 74.027 66.695 76.762 66.695 77.934 c 66.695 78.832 66.695 79.789 66.809
+ 80.602 c 66.539 80.582 66.254 80.535 65.984 80.535 c 65.746 80.535 65.453
+ 80.582 65.215 80.602 c 65.227 80.395 65.309 79.035 65.309 78.613 c 65.316
+ 76.797 l f
+70.094 76.215 m 70.672 76.215 71.938 76.195 72.535 76.133 c 72.5 76.258
+ 72.477 76.371 72.477 76.539 c 72.477 76.691 72.5 76.84 72.535 76.922 c
+72.238 76.898 71.945 76.879 71.664 76.863 c 71.145 76.852 70.613 76.84 70.094
+ 76.84 c 70.094 79.898 l 70.391 79.898 71.836 79.871 72.793 79.82 c 72.75
+ 79.922 72.738 80.039 72.738 80.195 c 72.738 80.363 72.75 80.477 72.793
+80.602 c 72.117 80.555 71.438 80.535 70.715 80.535 c 70.039 80.535 69.328
+ 80.555 68.605 80.602 c 68.629 80.129 68.648 79.664 68.66 79.188 c 68.684
+ 78.535 68.707 77.16 68.707 76.637 c 68.707 76.168 68.684 73.984 68.605
+72.855 c 69.16 72.887 70.039 72.922 70.648 72.922 c 71.168 72.922 71.914
+ 72.883 72.727 72.855 c 72.691 72.996 72.668 73.082 72.668 73.215 c 72.668
+ 73.387 72.691 73.547 72.727 73.633 c 71.664 73.582 l 71.246 73.555 71.133
+ 73.555 70.094 73.555 c 70.094 76.215 l f
+190.797 73.715 m 190.766 74.57 190.766 75.66 190.766 76.629 c 190.766 78.422
+ 190.789 78.832 191.117 79.266 c 191.441 79.711 192.051 79.961 192.844 79.961
+ c 193.758 79.961 194.48 79.48 194.73 78.797 c 194.82 78.547 194.875 78.195
+ 194.875 77.27 c 194.875 75.801 194.863 74.328 194.773 72.855 c 194.934
+72.883 195.102 72.922 195.281 72.922 c 195.461 72.922 195.645 72.883 195.813
+ 72.855 c 195.777 73.395 l 195.723 74.371 195.688 76.691 195.664 77.836
+c 195.645 79.168 195.258 79.777 194.512 80.254 c 193.984 80.59 193.227 80.734
+ 192.617 80.734 c 191.262 80.734 189.637 80.309 189.391 78.555 c 189.367
+ 78.398 189.367 78.059 189.367 77.961 c 189.367 74.887 l 189.367 74.313
+189.344 73.43 189.309 72.855 c 189.57 72.887 189.852 72.922 190.102 72.922
+ c 190.348 72.922 190.605 72.887 190.836 72.855 c 190.797 73.715 l f
+197.023 76.027 m 197.023 74.965 197.012 73.91 197 72.855 c 197.094 72.863
+ 197.18 72.883 197.273 72.883 c 197.363 72.883 197.441 72.863 197.531 72.855
+ c 198.605 74.043 199.609 75.09 200.977 76.422 c 202.309 77.734 l 202.523
+ 77.934 202.625 78.016 202.871 78.219 c 202.871 75.715 l 202.871 74.754
+202.816 73.785 202.738 72.855 c 202.871 72.887 203.02 72.922 203.223 72.922
+ c 203.426 72.922 203.563 72.887 203.695 72.855 c 203.594 74.223 203.574
+ 75.023 203.574 76.672 c 203.574 77.328 203.582 78.953 203.582 79.543 c
+203.582 79.789 203.594 80.379 203.594 80.66 c 203.516 80.648 203.438 80.633
+ 203.367 80.633 c 203.289 80.633 203.211 80.648 203.133 80.66 c 201.699
+79.098 198.922 76.336 197.723 75.238 c 197.723 76.773 197.734 77.598 197.758
+ 78.797 c 197.77 79.453 197.781 79.563 197.859 80.602 c 197.734 80.59 197.512
+ 80.535 197.352 80.535 c 197.18 80.535 197.035 80.566 196.898 80.602 c 196.988
+ 79.035 l 197.012 78.727 197.023 77.883 197.023 77.563 c 197.023 76.027
l f
-117.664 30.918 m 123.383 30.918 l 123.383 31.566 l 123.02 31.566 l 123.02
- 32.367 l 122.477 32.367 l 122.477 32.02 l 122.477 32.02 121.797 31.566
-120.52 31.566 c 119.23 31.566 118.563 32.02 118.563 32.02 c 118.563 32.367
- l 118.039 32.367 l 118.039 31.566 l 117.664 31.566 l 117.664 30.918 l f
-128.234 0 m 131.223 0.07 131.449 3.039 131.449 3.039 c 125 3.039 l 125
-3.039 125.23 0.07 128.211 0 c 128.211 0.141 l 128.234 0 l f
-97.027 55.676 m 97.027 54.883 97.547 54.57 98.508 54.57 c 99.461 54.57
-99.945 54.883 99.945 55.676 c 99.945 56.469 99.945 59.91 99.945 59.91 c
-97.027 59.91 l 97.027 59.91 97.027 56.469 97.027 55.676 c f
-130.195 42.504 m 130.195 41.957 l 126.277 41.957 l 126.277 42.504 l 125.746
- 42.504 l 125.746 41.953 l 125.402 41.953 l 125.402 41.379 l 128.238 40.23
- l 131.07 41.379 l 131.07 41.953 l 130.727 41.953 l 130.727 42.504 l 130.195
- 42.504 l f
-130.199 32.02 m 130.199 32.02 129.523 31.566 128.238 31.566 c 126.949 31.566
- 126.273 32.02 126.273 32.02 c 126.273 32.367 l 125.75 32.367 l 125.75 31.566
- l 125.375 31.566 l 125.375 30.918 l 131.094 30.918 l 131.094 31.566 l 130.723
- 31.566 l 130.723 32.367 l 130.199 32.367 l 130.199 32.02 l f
-90.734 55.676 m 90.734 54.883 91.254 54.57 92.211 54.57 c 93.172 54.57
-93.652 54.883 93.652 55.676 c 93.652 56.469 93.652 59.91 93.652 59.91 c
-90.734 59.91 l 90.734 59.91 90.734 56.469 90.734 55.676 c f
-128.242 32.699 m 129.57 32.699 130.199 33.609 130.199 34.527 c 130.199
-39.035 l 126.25 39.035 l 126.25 34.527 l 126.25 33.609 126.879 32.699 128.207
- 32.699 c 128.242 32.699 l f
-84.441 55.676 m 84.441 54.883 84.961 54.57 85.918 54.57 c 86.875 54.57
-87.355 54.883 87.355 55.676 c 87.355 56.469 87.355 59.91 87.355 59.91 c
-84.441 59.91 l 84.441 59.91 84.441 56.469 84.441 55.676 c f
-78.148 55.676 m 78.148 54.883 78.664 54.57 79.621 54.57 c 80.578 54.57
-81.059 54.883 81.059 55.676 c 81.059 56.469 81.059 59.91 81.059 59.91 c
-78.148 59.91 l 78.148 59.91 78.148 56.469 78.148 55.676 c f
-103.32 55.676 m 103.32 54.883 103.844 54.57 104.801 54.57 c 105.758 54.57
- 106.238 54.883 106.238 55.676 c 106.238 56.469 106.238 59.91 106.238 59.91
- c 103.32 59.91 l 103.32 59.91 103.32 56.469 103.32 55.676 c f
-97.027 35.711 m 97.027 34.902 97.547 34.586 98.504 34.586 c 99.461 34.586
- 99.945 34.902 99.945 35.711 c 99.945 36.516 99.945 39.93 99.945 39.93 c
- 97.027 39.93 l 97.027 39.93 97.027 36.516 97.027 35.711 c f
-90.734 35.711 m 90.734 34.902 91.254 34.586 92.211 34.586 c 93.172 34.586
- 93.652 34.902 93.652 35.711 c 93.652 36.516 93.652 39.93 93.652 39.93 c
- 90.734 39.93 l 90.734 39.93 90.734 36.516 90.734 35.711 c f
-84.441 35.711 m 84.441 34.902 84.961 34.586 85.918 34.586 c 86.875 34.586
- 87.355 34.902 87.355 35.711 c 87.355 36.516 87.355 39.93 87.355 39.93 c
- 84.441 39.93 l 84.441 39.93 84.441 36.516 84.441 35.711 c f
-78.148 35.711 m 78.148 34.902 78.668 34.586 79.625 34.586 c 80.582 34.586
- 81.063 34.902 81.063 35.711 c 81.063 36.516 81.063 39.93 81.063 39.93 c
- 78.148 39.93 l 78.148 39.93 78.148 36.516 78.148 35.711 c f
-103.32 35.711 m 103.32 34.902 103.84 34.586 104.801 34.586 c 105.754 34.586
- 106.234 34.902 106.234 35.711 c 106.234 36.516 106.234 39.93 106.234 39.93
- c 103.32 39.93 l 103.32 39.93 103.32 36.516 103.32 35.711 c f
-84.441 43.262 m 84.441 43.227 84.441 43.207 84.441 43.207 c 87.355 43.207
- l 87.355 43.207 87.355 43.227 87.355 43.262 c 87.355 48.859 l 84.441 48.859
- l 84.441 43.262 l f
-78.148 43.262 m 78.148 43.227 78.148 43.207 78.148 43.207 c 81.063 43.207
- l 81.063 43.207 81.063 43.227 81.063 43.262 c 81.063 48.859 l 78.148 48.859
- l 78.148 43.262 l f
-90.734 43.262 m 90.734 43.227 90.734 43.207 90.734 43.207 c 93.652 43.207
- l 93.652 43.207 93.652 43.227 93.652 43.262 c 93.652 48.859 l 90.734 48.859
- l 90.734 43.262 l f
-97.027 43.262 m 97.027 43.227 97.027 43.207 97.027 43.207 c 99.945 43.207
- l 99.945 43.207 99.945 43.227 99.945 43.262 c 99.945 48.859 l 97.027 48.859
- l 97.027 43.262 l f
-103.32 43.262 m 103.32 43.227 103.32 43.207 103.32 43.207 c 106.234 43.207
- l 106.234 43.207 106.234 43.227 106.234 43.262 c 106.234 48.859 l 103.32
- 48.859 l 103.32 43.262 l f
-67.949 55.766 m 67.949 54.969 68.469 54.66 69.426 54.66 c 70.383 54.66
-70.863 54.969 70.863 55.766 c 70.863 56.559 70.863 60 70.863 60 c 67.949
- 60 l 67.949 60 67.949 56.559 67.949 55.766 c f
-61.656 55.766 m 61.656 54.969 62.172 54.66 63.133 54.66 c 64.09 54.66 64.57
- 54.969 64.57 55.766 c 64.57 56.559 64.57 60 64.57 60 c 61.656 60 l 61.656
- 60 61.656 56.559 61.656 55.766 c f
-69.426 34.629 m 70.383 34.629 70.863 34.938 70.863 35.73 c 70.863 36.523
- 70.863 39.891 70.863 39.891 c 67.949 39.891 l 67.949 39.891 67.949 36.523
- 67.949 35.73 c 67.949 34.938 68.469 34.629 69.426 34.629 c f
-63.133 34.629 m 64.09 34.629 64.57 34.938 64.57 35.73 c 64.57 36.523 64.57
- 39.891 64.57 39.891 c 61.656 39.891 l 61.656 39.891 61.656 36.523 61.656
- 35.73 c 61.656 34.938 62.172 34.629 63.133 34.629 c f
-70.863 43.262 m 70.863 48.859 l 67.949 48.859 l 67.949 43.262 l 67.949
-43.227 67.949 43.207 67.949 43.207 c 70.863 43.207 l 70.863 43.207 70.863
- 43.227 70.863 43.262 c f
-64.57 43.262 m 64.57 48.859 l 61.656 48.859 l 61.656 43.262 l 61.656 43.227
- 61.656 43.207 61.656 43.207 c 64.57 43.207 l 64.57 43.207 64.57 43.227
-64.57 43.262 c f
-106.613 28.594 m 106.613 31.563 l 79.027 31.563 l 69.902 21.426 l 73.977
- 18.645 l 109.605 18.609 l 104.863 28.594 l 106.613 28.594 l f
-68.672 21.043 m 66.813 22.313 l 66.145 22.238 65.262 22.254 64.289 22.969
- c 63.52 23.531 63.152 24.293 62.973 24.918 c 53.773 31.164 l 54.078 31.582
- l 54.52 31.586 l 78.051 31.586 l h
-66.32 23.117 m 66.324 23.117 l 67.445 23.102 68.844 23.996 68.945 25.547
- c 68.973 25.988 68.898 26.191 68.805 26.508 c 68.68 26.949 68.801 27.316
- 69.043 27.617 c 69.344 27.984 69.625 28.297 70.832 28.297 c 72.457 28.305
- l 72.457 29.816 l 60.211 29.816 l 60.211 28.305 l 61.836 28.297 l 63.047
- 28.297 63.324 27.984 63.625 27.617 c 63.875 27.316 63.992 26.949 63.863
- 26.508 c 63.773 26.191 63.699 25.988 63.727 25.547 c 63.832 23.996 65.199
- 23.102 66.32 23.117 c h
-66.32 23.117 m f
-122.18 3.754 m 120.832 4.547 l 120.832 8.07 l 118.969 8.563 l 118.969 12.063
- l 121.906 10.746 l 115.047 17.969 l 141.406 17.969 l 134.547 10.746 l 137.477
- 12.063 l 137.477 8.563 l 135.613 8.07 l 135.613 4.547 l 134.27 3.754 l
-h
-122.543 4.34 m 133.91 4.34 l 133.879 5.828 l 132.645 7.59 l 123.801 7.59
- l 122.57 5.828 l h
-122.816 8.32 m 133.637 8.32 l 133.637 9.754 l 122.816 9.754 l h
-122.066 8.418 m 122.066 9.961 l 119.551 11.012 l 119.551 9.039 l h
-134.379 8.418 m 136.898 9.039 l 136.898 11.012 l 134.379 9.961 l h
-134.379 8.418 m f
-110.035 33.992 m 110.59 33.992 110.848 34.793 110.848 35.598 c 110.848
-36.398 110.848 39.301 110.848 39.301 c 109.223 39.301 l 109.223 39.301 109.223
- 36.398 109.223 35.598 c 109.223 34.793 109.484 33.992 110.035 33.992 c f
-110.035 42.824 m 110.59 42.824 110.848 43.625 110.848 44.43 c 110.848 45.23
- 110.848 48.133 110.848 48.133 c 109.223 48.133 l 109.223 48.133 109.223
- 45.23 109.223 44.43 c 109.223 43.625 109.484 42.824 110.035 42.824 c f
-110.035 54.191 m 110.59 54.191 110.848 54.992 110.848 55.793 c 110.848
-56.598 110.848 59.5 110.848 59.5 c 109.223 59.5 l 109.223 59.5 109.223 56.598
- 109.223 55.793 c 109.223 54.992 109.484 54.191 110.035 54.191 c f
-66.293 27.242 m 65.438 27.242 64.746 26.547 64.746 25.691 c 64.746 24.84
- 65.438 24.145 66.293 24.145 c 67.148 24.145 67.84 24.84 67.84 25.691 c
-67.84 26.547 67.148 27.242 66.293 27.242 c f
-0 0.278431 0.423529 rg
-0.098 83.441 255.02 1.027 re f
-0.098 62.516 255.02 1.027 re f
-0.0117647 0.239216 0.380392 rg
-2.465 73.691 m 3.402 73.691 l 3.793 73.691 4.32 73.68 4.523 74.043 c 4.563
- 74.043 l 4.563 72.703 l 4.523 72.703 l 4.371 72.777 4.172 72.777 3.969
-72.777 c 2.465 72.777 l 2.465 70.426 l 2.867 70.348 3.313 70.336 3.754 70.336
- c 4.336 70.336 4.855 70.387 5.246 70.844 c 5.285 70.844 l 5.285 69.363
-l 5.246 69.363 l 5.082 69.449 4.867 69.426 4.652 69.426 c 0.602 69.426 l
- 0.602 69.461 l 1.25 69.703 1.172 70.629 1.172 71.211 c 1.172 75.98 l 1.172
- 76.551 1.25 77.484 0.602 77.715 c 0.602 77.75 l 5.879 77.75 l 6.449 76.094
- l 6.414 76.094 l 5.777 76.652 4.906 76.914 4.07 76.84 c 2.465 76.691 l
-h
-2.465 73.691 m f*
-14.09 69.5 m 13.48 69.313 12.836 69.223 12.203 69.223 c 10.66 69.223 9.027
- 69.832 9.027 71.426 c 9.027 74.105 13.379 73.754 13.379 75.727 c 13.379
- 76.613 12.293 77.043 11.57 77.043 c 10.582 77.043 9.547 76.641 8.801 75.992
- c 9.164 77.574 l 9.887 77.84 10.66 77.953 11.43 77.953 c 13.402 77.953
-14.824 76.691 14.824 75.332 c 14.824 72.996 10.469 73.02 10.469 71.285 c
- 10.469 70.41 11.379 70.133 12.102 70.133 c 12.809 70.133 13.594 70.426
-14.09 70.93 c h
-14.09 69.5 m f*
-24.059 77.75 m 24.766 76.145 l 24.727 76.145 l 23.945 76.613 23.148 76.891
- 22.223 76.84 c 19.563 76.691 l 24.121 69.426 l 18.527 69.426 l 17.883 70.879
- l 17.922 70.879 l 18.578 70.449 19.031 70.285 19.816 70.336 c 21.969 70.461
- l 17.387 77.75 l h
-24.059 77.75 m f*
-30.371 70.336 m 31.508 70.336 l 31.926 70.336 32.43 70.398 32.598 70.844
- c 32.637 70.844 l 33.039 69.336 l 33 69.336 l 32.84 69.41 32.637 69.426
- 32.418 69.426 c 27.383 69.426 l 27.219 69.398 27.055 69.398 26.902 69.336
- c 26.867 69.336 l 26.422 70.844 l 26.457 70.844 l 26.852 70.477 27.422
-70.336 27.965 70.336 c 29.078 70.336 l 29.078 75.98 l 29.078 76.551 29.156
- 77.477 28.523 77.711 c 28.523 77.75 l 31.027 77.75 l 31.027 77.711 l 30.355
- 77.324 30.371 76.828 30.371 76.105 c h
-30.371 70.336 m f*
-37.129 73.691 m 38.066 73.691 l 38.457 73.691 38.988 73.68 39.188 74.043
- c 39.227 74.043 l 39.227 72.703 l 39.188 72.703 l 39.039 72.777 38.836
-72.777 38.633 72.777 c 37.129 72.777 l 37.129 70.426 l 37.535 70.348 37.977
- 70.336 38.418 70.336 c 39 70.336 39.52 70.387 39.91 70.844 c 39.949 70.844
- l 39.949 69.363 l 39.91 69.363 l 39.75 69.449 39.531 69.426 39.316 69.426
- c 35.27 69.426 l 35.27 69.461 l 35.914 69.703 35.836 70.629 35.836 71.211
- c 35.836 75.98 l 35.836 76.551 35.914 77.484 35.27 77.715 c 35.27 77.75
- l 40.543 77.75 l 41.113 76.094 l 41.078 76.094 l 40.445 76.652 39.57 76.914
- 38.734 76.84 c 37.129 76.691 l h
-37.129 73.691 m f*
-43.832 69.426 m 43.832 69.461 l 44.477 69.703 44.387 70.629 44.387 71.211
- c 44.387 75.98 l 44.387 76.551 44.477 77.484 43.832 77.711 c 43.832 77.75
- l 46.246 77.75 l 46.246 77.711 l 45.602 77.484 45.68 76.563 45.68 75.98
- c 45.68 70.309 l 45.969 70.262 46.246 70.223 46.539 70.207 c 47.387 70.172
- 48.172 70.703 48.172 71.613 c 48.172 72.805 46.996 73.27 45.98 73.426 c
- 47.148 75.207 l 48.691 77.117 l 49.07 77.586 49.488 77.75 50.16 77.75 c
- 51.32 77.75 l 50.602 77.297 49.805 76.641 49.273 75.98 c 47.449 73.691
-l 48.488 73.449 49.465 72.574 49.465 71.465 c 49.465 70.309 48.539 69.426
- 46.844 69.426 c h
-43.832 69.426 m f*
-59.406 73.691 m 59.406 75.98 l 59.406 76.551 59.496 77.477 58.848 77.711
- c 58.848 77.75 l 61.266 77.75 l 61.266 77.711 l 60.621 77.477 60.695 76.551
- 60.695 75.98 c 60.695 71.195 l 60.695 70.629 60.621 69.703 61.266 69.461
- c 61.266 69.426 l 58.848 69.426 l 58.848 69.461 l 59.496 69.703 59.406
-70.629 59.406 71.211 c 59.406 72.777 l 54.84 72.777 l 54.84 71.211 l 54.84
- 70.629 54.762 69.703 55.395 69.461 c 55.395 69.426 l 52.988 69.426 l 52.988
- 69.461 l 53.633 69.703 53.547 70.629 53.547 71.195 c 53.547 75.98 l 53.547
- 76.551 53.621 77.477 52.988 77.711 c 52.988 77.75 l 55.395 77.75 l 55.395
- 77.711 l 54.762 77.477 54.84 76.551 54.84 75.98 c 54.84 73.691 l h
-59.406 73.691 m f*
-66.77 68.707 m 70.211 67.668 l 69.516 66.746 l h
-69.695 74.324 m 70.379 76.109 l 70.719 76.996 70.82 77.137 70.199 77.41
- c 70.199 77.449 l 72.797 77.449 l 72.797 77.41 l 72.074 77.047 71.844 76.34
- 71.551 75.617 c 68.922 69.125 l 66.922 69.125 l 66.922 69.16 l 67.531 69.352
- 67.289 69.883 67.109 70.34 c 65 75.617 l 64.711 76.34 64.508 77.047 63.773
- 77.41 c 63.773 77.449 l 66.102 77.449 l 66.102 77.41 l 65.492 77.184 65.578
- 76.816 65.848 76.109 c 66.504 74.324 l h
-69.324 73.391 m 66.836 73.391 l 68.086 70.199 l h
-69.324 73.391 m f*
-81.625 77.75 m 82.336 76.145 l 82.297 76.145 l 81.512 76.613 80.715 76.891
- 79.789 76.84 c 77.133 76.691 l 81.691 69.426 l 76.094 69.426 l 75.449 70.879
- l 75.488 70.879 l 76.145 70.449 76.602 70.285 77.387 70.336 c 79.539 70.461
- l 74.957 77.75 l h
-81.625 77.75 m f*
-88.648 74.105 m 91.762 69.426 l 89.543 69.426 l 89.543 69.461 l 90.254
-69.805 89.965 70.414 89.746 70.73 c 88.18 73.082 l 86.156 69.781 l 85.988
- 69.512 85.609 69.426 85.203 69.426 c 84.055 69.426 l 84.66 69.754 84.914
- 70.172 85.254 70.73 c 87.355 74.105 l 87.355 75.98 l 87.355 76.574 87.445
- 77.398 86.824 77.711 c 86.824 77.75 l 89.293 77.75 l 89.293 77.711 l 88.648
- 77.246 88.648 76.863 88.648 76.105 c h
-88.648 74.105 m f*
-99.93 75.969 m 99.93 76.539 100.008 77.477 99.363 77.711 c 99.363 77.75
- l 101.789 77.75 l 101.789 77.711 l 101.145 77.477 101.219 76.551 101.219
- 75.969 c 101.219 71.195 l 101.219 70.629 101.145 69.691 101.789 69.461
-c 101.789 69.426 l 99.363 69.426 l 99.363 69.461 l 100.008 69.703 99.93
-70.629 99.93 71.195 c h
-101.387 73.426 m 104.195 77.207 l 104.422 77.512 105.004 77.75 105.625
-77.75 c 106.816 77.75 l 106.816 77.711 l 106.168 77.398 105.688 77.043 105.297
- 76.523 c 102.738 73.172 l 105.648 69.438 l 105.648 69.426 l 103.371 69.426
- l 103.371 69.461 l 104.219 69.844 103.484 70.641 103.043 71.223 c 101.387
- 73.422 l h
-101.387 73.426 m f*
-111.555 68.707 m 115 67.668 l 114.305 66.746 l h
-114.48 74.324 m 115.164 76.109 l 115.504 76.996 115.605 77.137 114.988
-77.41 c 114.988 77.449 l 117.578 77.449 l 117.578 77.41 l 116.859 77.047
- 116.633 76.34 116.34 75.617 c 113.707 69.125 l 111.707 69.125 l 111.707
- 69.16 l 112.316 69.352 112.078 69.883 111.898 70.34 c 109.785 75.617 l
-109.492 76.34 109.293 77.047 108.559 77.41 c 108.559 77.449 l 110.887 77.449
- l 110.887 77.41 l 110.277 77.184 110.367 76.816 110.633 76.109 c 111.293
- 74.324 l h
-114.113 73.391 m 111.621 73.391 l 112.875 70.199 l h
-114.113 73.391 m f*
-120.125 69.426 m 120.125 69.461 l 120.77 69.703 120.68 70.629 120.68 71.211
- c 120.68 75.98 l 120.68 76.551 120.77 77.484 120.125 77.711 c 120.125 77.75
- l 122.543 77.75 l 122.543 77.711 l 121.895 77.484 121.973 76.563 121.973
- 75.98 c 121.973 70.309 l 122.262 70.262 122.543 70.223 122.832 70.207 c
- 123.68 70.172 124.465 70.703 124.465 71.613 c 124.465 72.805 123.289 73.27
- 122.273 73.426 c 123.441 75.207 l 124.984 77.117 l 125.363 77.586 125.781
- 77.75 126.453 77.75 c 127.617 77.75 l 126.895 77.297 126.098 76.641 125.566
- 75.98 c 123.742 73.691 l 124.781 73.449 125.754 72.574 125.754 71.465 c
- 125.754 70.309 124.832 69.426 123.137 69.426 c h
-120.125 69.426 m f*
-133.52 69.211 m 130.867 69.188 128.777 71.16 128.777 73.563 c 128.777 76.156
- 130.891 77.953 133.395 77.953 c 135.914 77.953 138.051 76.082 138.051 73.5
- c 138.051 71.223 136.18 69.238 133.52 69.211 c h
-133.434 70.121 m 135.434 70.121 136.609 71.906 136.609 73.754 c 136.609
- 75.637 135.383 77.043 133.457 77.043 c 131.473 77.043 130.219 75.223 130.219
- 73.449 c 130.219 71.539 131.473 70.121 133.434 70.121 c h
-133.434 70.121 m f*
-142.406 76.727 m 142.406 71.211 l 142.406 70.641 142.316 69.703 142.961
- 69.461 c 142.961 69.426 l 140.543 69.426 l 140.543 69.461 l 141.188 69.703
- 141.113 70.629 141.113 71.211 c 141.113 75.98 l 141.113 76.551 141.188
-77.484 140.543 77.711 c 140.543 77.75 l 145.746 77.75 l 146.402 76.066 l
- 146.363 76.066 l 145.73 76.602 144.984 76.891 144.125 76.84 c h
-142.406 76.727 m f*
-152.031 74.105 m 155.145 69.426 l 152.93 69.426 l 152.93 69.461 l 153.637
- 69.805 153.348 70.414 153.129 70.73 c 151.563 73.082 l 149.539 69.781 l
- 149.371 69.512 148.996 69.426 148.59 69.426 c 147.438 69.426 l 148.043
-69.754 148.297 70.172 148.637 70.73 c 150.742 74.105 l 150.742 75.98 l 150.742
- 76.574 150.828 77.398 150.207 77.711 c 150.207 77.75 l 152.676 77.75 l
-152.676 77.711 l 152.031 77.246 152.031 76.863 152.031 76.105 c h
-152.031 74.105 m f*
-168.539 77.75 m 170.402 77.75 l 170.402 77.711 l 169.754 77.477 169.828
- 76.551 169.828 75.98 c 169.828 71.211 l 169.828 70.629 169.754 69.703 170.402
- 69.461 c 170.387 69.426 l 167.984 69.426 l 167.984 69.461 l 168.617 69.703
- 168.539 70.629 168.539 71.195 c 168.539 75.008 l 168.539 75.461 168.551
- 75.777 168.273 76.156 c 167.855 76.754 167.137 77.043 166.426 77.043 c
-165.125 77.043 164.414 76.258 164.414 74.574 c 164.414 71.195 l 164.414
-70.629 164.34 69.703 164.973 69.461 c 164.973 69.426 l 162.566 69.426 l
-162.566 69.461 l 163.211 69.703 163.121 70.629 163.121 71.195 c 163.121
-74.574 l 163.121 75.484 163.098 76.336 163.77 77.066 c 164.34 77.688 165.223
- 77.953 166.059 77.953 c 166.945 77.953 167.984 77.648 168.539 76.914 c
-h
-168.539 77.75 m f*
-174.891 71.211 m 179.234 76.715 l 179.801 77.438 180.18 77.852 181.078
-78.156 c 181.078 71.059 l 181.078 70.348 181.078 69.844 181.734 69.461 c
- 181.734 69.426 l 179.508 69.426 l 179.508 69.461 l 180.18 69.844 180.168
- 70.348 180.168 71.059 c 180.168 75.855 l 175.539 70.008 l 175.359 69.754
- l 175.27 69.652 175.219 69.59 175.168 69.438 c 175.168 69.426 l 173.324
- 69.426 l 173.324 69.461 l 173.98 69.844 173.98 70.348 173.98 71.055 c 173.98
- 76.105 l 173.98 76.816 173.98 77.32 173.313 77.711 c 173.313 77.75 l 175.551
- 77.75 l 175.551 77.711 l 174.879 77.32 174.891 76.816 174.891 76.105 c
-h
-174.891 71.211 m f*
-185.051 75.98 m 185.051 76.551 185.129 77.484 184.496 77.711 c 184.496
-77.75 l 186.898 77.75 l 186.898 77.711 l 186.266 77.477 186.344 76.551 186.344
- 75.98 c 186.344 71.211 l 186.344 70.641 186.266 69.703 186.898 69.461 c
- 186.898 69.426 l 184.496 69.426 l 184.496 69.461 l 185.141 69.703 185.051
- 70.629 185.051 71.211 c h
-185.051 75.98 m f*
-193.324 76.258 m 191.316 70.754 l 191.215 70.477 190.945 69.855 190.973
- 69.578 c 190.984 69.426 l 189.137 69.426 l 189.137 69.461 l 189.695 69.895
- 189.887 70.629 190.125 71.273 c 192.035 76.449 l 192.402 77.449 192.695
- 77.547 193.582 78.133 c 196.918 69.426 l 195.035 69.426 l 195.035 69.461
- l 195.82 69.781 195.387 70.816 195.047 71.715 c 193.328 76.258 l h
-193.324 76.258 m f*
-201.348 73.691 m 202.281 73.691 l 202.676 73.691 203.207 73.68 203.41 74.043
- c 203.449 74.043 l 203.449 72.703 l 203.41 72.703 l 203.258 72.777 203.055
- 72.777 202.852 72.777 c 201.348 72.777 l 201.348 70.426 l 201.754 70.348
- 202.195 70.336 202.641 70.336 c 203.219 70.336 203.738 70.387 204.133 70.844
- c 204.172 70.844 l 204.172 69.363 l 204.133 69.363 l 203.965 69.449 203.75
- 69.426 203.535 69.426 c 199.488 69.426 l 199.488 69.461 l 200.133 69.703
- 200.055 70.629 200.055 71.211 c 200.055 75.98 l 200.055 76.551 200.133
-77.484 199.488 77.715 c 199.488 77.75 l 204.766 77.75 l 205.332 76.094 l
- 205.293 76.094 l 204.664 76.652 203.789 76.914 202.953 76.84 c 201.348
-76.691 l h
-201.348 73.691 m f*
-208.051 69.426 m 208.051 69.461 l 208.695 69.703 208.605 70.629 208.605
- 71.211 c 208.605 75.98 l 208.605 76.551 208.695 77.484 208.051 77.711 c
- 208.051 77.75 l 210.465 77.75 l 210.465 77.711 l 209.82 77.484 209.898
-76.563 209.898 75.98 c 209.898 70.309 l 210.191 70.262 210.465 70.223 210.758
- 70.207 c 211.605 70.172 212.391 70.703 212.391 71.613 c 212.391 72.805
-211.215 73.27 210.203 73.426 c 211.363 75.207 l 212.91 77.117 l 213.289
-77.586 213.707 77.75 214.375 77.75 c 215.543 77.75 l 214.82 77.297 214.023
- 76.641 213.492 75.98 c 211.672 73.691 l 212.707 73.449 213.68 72.574 213.68
- 71.465 c 213.68 70.309 212.758 69.426 211.063 69.426 c h
-208.051 69.426 m f*
-222.461 69.5 m 221.852 69.313 221.207 69.223 220.574 69.223 c 219.031 69.223
- 217.398 69.832 217.398 71.426 c 217.398 74.105 221.75 73.754 221.75 75.727
- c 221.75 76.613 220.664 77.043 219.941 77.043 c 218.953 77.043 217.918
-76.641 217.172 75.992 c 217.539 77.574 l 218.258 77.84 219.031 77.953 219.801
- 77.953 c 221.777 77.953 223.195 76.691 223.195 75.332 c 223.195 72.996
-218.84 73.02 218.84 71.285 c 218.84 70.41 219.75 70.133 220.473 70.133 c
- 221.18 70.133 221.965 70.426 222.461 70.93 c h
-222.461 69.5 m f*
-226.672 75.98 m 226.672 76.551 226.746 77.484 226.113 77.711 c 226.113
-77.75 l 228.52 77.75 l 228.52 77.711 l 227.887 77.477 227.961 76.551 227.961
- 75.98 c 227.961 71.211 l 227.961 70.641 227.887 69.703 228.52 69.461 c
-228.52 69.426 l 226.113 69.426 l 226.113 69.461 l 226.758 69.703 226.672
- 70.629 226.672 71.211 c h
-226.672 75.98 m f*
-235.07 70.336 m 236.211 70.336 l 236.629 70.336 237.133 70.398 237.297
-70.844 c 237.336 70.844 l 237.742 69.336 l 237.703 69.336 l 237.539 69.41
- 237.336 69.426 237.121 69.426 c 232.082 69.426 l 231.918 69.398 231.758
- 69.398 231.605 69.336 c 231.566 69.336 l 231.121 70.844 l 231.16 70.844
- l 231.555 70.477 232.121 70.336 232.664 70.336 c 233.781 70.336 l 233.781
- 75.98 l 233.781 76.551 233.855 77.477 233.223 77.711 c 233.223 77.75 l
-235.727 77.75 l 235.727 77.711 l 235.059 77.324 235.07 76.828 235.07 76.105
- c h
-235.07 70.336 m f*
-242.59 67.578 m 242.59 67.176 242.27 66.773 241.855 66.773 c 241.398 66.773
- 241.031 67.098 241.031 67.555 c 241.031 67.973 241.375 68.363 241.789 68.363
- c 242.246 68.363 242.59 68.035 242.59 67.578 c h
-244.918 67.57 m 244.918 67.164 244.598 66.773 244.172 66.773 c 243.727
-66.773 243.359 67.098 243.359 67.555 c 243.359 67.961 243.691 68.363 244.121
- 68.363 c 244.574 68.363 244.918 68.035 244.918 67.57 c h
-244.414 74.324 m 245.094 76.109 l 245.434 76.996 245.535 77.137 244.918
- 77.41 c 244.918 77.449 l 247.508 77.449 l 247.508 77.41 l 246.789 77.047
- 246.563 76.34 246.27 75.617 c 243.641 69.125 l 241.637 69.125 l 241.637
- 69.16 l 242.246 69.352 242.008 69.883 241.828 70.34 c 239.715 75.617 l
-239.422 76.34 239.223 77.047 238.488 77.41 c 238.488 77.449 l 240.816 77.449
- l 240.816 77.41 l 240.207 77.184 240.297 76.816 240.566 76.109 c 241.223
- 74.324 l h
-244.043 73.391 m 241.551 73.391 l 242.805 70.199 l h
-244.043 73.391 m f*
-252.027 70.035 m 253.168 70.035 l 253.582 70.035 254.094 70.098 254.254
- 70.543 c 254.293 70.543 l 254.699 69.035 l 254.66 69.035 l 254.496 69.109
- 254.293 69.125 254.078 69.125 c 249.039 69.125 l 248.879 69.098 248.715
- 69.098 248.563 69.035 c 248.523 69.035 l 248.082 70.543 l 248.121 70.543
- l 248.512 70.176 249.078 70.035 249.625 70.035 c 250.738 70.035 l 250.738
- 75.68 l 250.738 76.25 250.813 77.176 250.18 77.41 c 250.18 77.449 l 252.688
- 77.449 l 252.688 77.41 l 252.016 77.023 252.027 76.527 252.027 75.805 c
- h
-252.027 70.035 m f*
+205.504 72.855 m 205.719 72.883 206.137 72.922 206.305 72.922 c 206.555
+ 72.922 206.836 72.887 207.109 72.855 c 206.984 73.691 206.984 75.645 206.984
+ 76.789 c 206.984 78.465 207.004 79.684 207.094 80.602 c 206.836 80.59 206.566
+ 80.535 206.305 80.535 c 206.059 80.535 205.742 80.59 205.492 80.602 c 205.617
+ 79.258 205.617 77.395 205.617 75.465 c 205.617 74.754 205.617 73.953 205.504
+ 72.855 c f
+212.391 77.703 m 212.492 77.438 213.758 74.293 214.199 72.855 c 214.449
+ 72.902 214.594 72.922 214.719 72.922 c 214.852 72.922 215.012 72.902 215.262
+ 72.855 c 214.766 73.84 214.086 75.41 213.645 76.445 c 213.07 77.813 212.527
+ 79.203 212.031 80.602 c 211.895 80.566 211.816 80.535 211.613 80.535 c
+211.34 80.535 211.254 80.566 211.094 80.602 c 210.586 79.16 210.527 78.953
+ 209.75 77.09 c 209.578 76.684 208.859 74.898 208.711 74.547 c 208.598 74.277
+ 208.078 73.094 207.977 72.855 c 208.246 72.914 208.609 72.922 208.891 72.922
+ c 209.152 72.922 209.445 72.887 209.727 72.855 c 210.055 73.973 210.258
+ 74.57 211.184 76.965 c 211.418 77.578 211.703 78.164 211.965 78.762 c 212.391
+ 77.703 l f
+217.508 76.215 m 218.082 76.215 219.348 76.195 219.945 76.133 c 219.91
+76.258 219.887 76.371 219.887 76.539 c 219.887 76.691 219.91 76.84 219.945
+ 76.922 c 219.652 76.898 219.359 76.879 219.074 76.863 c 218.559 76.852
+218.027 76.84 217.508 76.84 c 217.508 79.898 l 217.801 79.898 219.246 79.871
+ 220.203 79.82 c 220.16 79.922 220.148 80.039 220.148 80.195 c 220.148 80.363
+ 220.16 80.477 220.203 80.602 c 219.527 80.555 218.852 80.535 218.129 80.535
+ c 217.449 80.535 216.738 80.555 216.016 80.602 c 216.039 80.129 216.063
+ 79.664 216.074 79.188 c 216.098 78.535 216.117 77.16 216.117 76.637 c 216.117
+ 76.168 216.098 73.984 216.016 72.855 c 216.57 72.887 217.449 72.922 218.063
+ 72.922 c 218.578 72.922 219.324 72.883 220.137 72.855 c 220.105 72.996
+220.082 73.082 220.082 73.215 c 220.082 73.387 220.105 73.547 220.137 73.633
+ c 219.074 73.582 l 218.656 73.555 218.547 73.555 217.508 73.555 c 217.508
+ 76.215 l f
+223.133 76.391 m 223.344 76.398 223.617 76.422 223.91 76.422 c 225.039
+76.422 225.457 75.598 225.457 74.863 c 225.457 74.391 225.379 73.984 224.984
+ 73.691 c 224.68 73.465 224.305 73.414 223.934 73.414 c 223.719 73.414 223.301
+ 73.457 223.133 73.465 c h
+225.297 77.215 m 225.469 77.453 225.719 77.82 225.887 78.059 c 226.777
+79.313 227.082 79.711 227.797 80.602 c 227.48 80.566 227.195 80.535 226.789
+ 80.535 c 226.352 80.535 226.215 80.555 225.875 80.602 c 225.703 80.34 225.457
+ 79.922 225.285 79.664 c 224.711 78.77 224.012 77.777 223.402 76.922 c 223.133
+ 76.922 l 223.133 78.523 l 223.133 78.848 223.176 80.309 223.176 80.602
+c 222.949 80.582 222.703 80.535 222.422 80.535 c 222.16 80.535 221.891 80.566
+ 221.641 80.602 c 221.73 78.379 221.742 78.133 221.742 75.953 c 221.742
+74.469 221.742 74.313 221.664 72.855 c 221.922 72.883 222.215 72.914 222.793
+ 72.914 c 223.086 72.914 224.395 72.855 224.656 72.855 c 225.391 72.855
+225.941 72.945 226.43 73.414 c 226.766 73.734 226.945 74.203 226.945 74.672
+ c 226.945 75.926 226.012 76.57 224.984 76.762 c 225.297 77.215 l f
+234.563 72.855 m 234.777 72.883 235.195 72.922 235.363 72.922 c 235.613
+ 72.922 235.895 72.887 236.164 72.855 c 236.043 73.691 236.043 75.645 236.043
+ 76.789 c 236.043 78.465 236.066 79.684 236.152 80.602 c 235.895 80.59 235.625
+ 80.535 235.363 80.535 c 235.117 80.535 234.801 80.59 234.551 80.602 c 234.676
+ 79.258 234.676 77.395 234.676 75.465 c 234.676 74.754 234.676 73.953 234.563
+ 72.855 c f
+240.93 79.055 m 240.93 79.918 240.977 80.289 241.008 80.602 c 240.684 80.566
+ 240.32 80.535 240.184 80.535 c 239.996 80.535 239.824 80.555 239.418 80.602
+ c 239.461 79.746 239.531 78.875 239.531 78.016 c 239.52 74.863 l 239.52
+ 74.445 239.508 74.051 239.496 73.613 c 238.934 73.613 l 238.828 73.613
+237.746 73.633 237.172 73.691 c 237.203 73.555 237.227 73.414 237.227 73.273
+ c 237.227 73.137 237.203 72.996 237.172 72.855 c 238.063 72.914 239.316
+ 72.922 240.188 72.922 c 241.125 72.922 242.117 72.914 243.199 72.855 c
+243.168 73.047 243.145 73.195 243.145 73.285 c 243.145 73.414 243.168 73.512
+ 243.199 73.691 c 242.535 73.625 241.734 73.613 240.953 73.613 c 240.941
+ 74.016 240.93 74.445 240.93 74.879 c 240.93 79.055 l f
+245.82 74.672 m 244.668 77.453 l 245.063 77.465 245.449 77.5 245.844 77.5
+ c 246.191 77.5 246.531 77.473 246.883 77.453 c h
+247.684 79.348 m 247.211 78.148 l 246.723 78.133 246.25 78.105 245.766
+78.105 c 245.313 78.105 244.859 78.133 244.41 78.148 c 244.047 79.02 243.688
+ 79.961 243.508 80.602 c 243.359 80.582 243.145 80.535 242.965 80.535 c
+242.773 80.535 242.613 80.582 242.457 80.602 c 243.766 77.688 l 244.906
+75.137 245.563 73.672 245.832 72.746 c 245.957 72.777 246.07 72.797 246.207
+ 72.797 c 246.328 72.797 246.441 72.777 246.566 72.746 c 247.109 74.293
+247.785 75.875 248.191 76.82 c 248.621 77.801 249.367 79.508 249.875 80.602
+ c 249.703 80.59 249.309 80.535 248.992 80.535 c 248.68 80.535 248.363 80.59
+ 248.156 80.602 c 247.684 79.348 l f
+Q q
+248.992 71.992 6.121 9 re W n
+q
+248 71 8 10 re W n
+ q
+0.0666667 0.247059 0.380392 rg
+252.836 79.055 m 252.836 79.918 252.879 80.289 252.91 80.602 c 252.586
+80.566 252.223 80.535 252.09 80.535 c 251.898 80.535 251.727 80.555 251.32
+ 80.602 c 251.367 79.746 251.434 78.875 251.434 78.016 c 251.422 74.863
+l 251.422 74.445 251.41 74.051 251.398 73.613 c 250.836 73.613 l 250.734
+ 73.613 249.648 73.633 249.074 73.691 c 249.105 73.555 249.129 73.414 249.129
+ 73.273 c 249.129 73.137 249.105 72.996 249.074 72.855 c 249.965 72.914
+251.219 72.922 252.09 72.922 c 253.027 72.922 254.02 72.914 255.102 72.855
+ c 255.07 73.047 255.047 73.195 255.047 73.285 c 255.047 73.414 255.07 73.512
+ 255.102 73.691 c 254.438 73.625 253.637 73.613 252.855 73.613 c 252.844
+ 74.016 252.836 74.445 252.836 74.879 c 252.836 79.055 l f
+ Q
+Q
+Q q
+0.0666667 0.247059 0.380392 rg
+228.953 78.91 m 229.473 80.039 230.035 80.211 230.703 80.211 c 231.594
+80.211 232.18 79.605 232.18 78.797 c 232.18 77.902 231.469 77.59 231.258
+ 77.5 c 230.941 77.359 230.41 77.16 230.094 77.023 c 229 76.539 228.668
+75.965 228.668 75.023 c 228.668 74.027 229.258 72.766 231.301 72.766 c 232.125
+ 72.766 232.621 72.98 233.176 73.227 c 232.949 73.785 232.926 73.875 232.828
+ 74.301 c 232.668 74.301 l 232.496 73.66 231.898 73.316 231.188 73.316 c
+ 230.293 73.316 229.855 73.875 229.855 74.543 c 229.855 75.359 230.43 75.59
+ 231.426 75.973 c 232.293 76.309 232.633 76.434 232.961 76.797 c 233.434
+ 77.305 233.516 77.969 233.516 78.289 c 233.516 79.438 232.711 80.758 230.648
+ 80.758 c 229.676 80.758 228.941 80.387 228.535 80.184 c 228.727 79.598
+228.738 79.453 228.793 78.91 c 228.953 78.91 l f
+ Q
+Q
+ Q
+Q
Q Q
showpage
%%Trailer
diff --git a/macros/latex/contrib/thesis-ekf/eszterhazy-logo-de.pdf b/macros/latex/contrib/thesis-ekf/eszterhazy-logo-de.pdf
index 2d5b066f0a..1ead852c20 100644
--- a/macros/latex/contrib/thesis-ekf/eszterhazy-logo-de.pdf
+++ b/macros/latex/contrib/thesis-ekf/eszterhazy-logo-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/thesis-ekf/eszterhazy-logo-en.eps b/macros/latex/contrib/thesis-ekf/eszterhazy-logo-en.eps
index be0c117516..7a8050dc14 100644
--- a/macros/latex/contrib/thesis-ekf/eszterhazy-logo-en.eps
+++ b/macros/latex/contrib/thesis-ekf/eszterhazy-logo-en.eps
@@ -1,10 +1,10 @@
%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: cairo 1.15.10 (http://cairographics.org)
-%%CreationDate: Tue Mar 26 19:07:39 2019
+%%Creator: cairo 1.16.0 (https://cairographics.org)
+%%CreationDate: Wed Aug 11 13:20:57 2021
%%Pages: 1
%%DocumentData: Clean7Bit
%%LanguageLevel: 2
-%%BoundingBox: 0 0 256 85
+%%BoundingBox: 0 0 256 88
%%EndComments
%%BeginProlog
50 dict begin
@@ -67,559 +67,1004 @@
%%EndSetup
%%Page: 1 1
%%BeginPageSetup
-%%PageBoundingBox: 0 0 256 85
+%%PageBoundingBox: 0 0 256 88
%%EndPageSetup
-q 0 0 256 85 rectclip
-1 0 0 -1 0 85 cm q
-0 0.282353 0.388235 rg
-152.496 9.141 m 152.496 9.762 152.527 10.238 151.895 10.551 c 151.895 10.578
- l 154.039 10.578 l 154.039 10.551 l 153.484 10.191 153.527 9.719 153.527
- 9.141 c 153.527 3.379 l 153.496 3.379 l 153.027 4.199 152.219 4.848 151.313
- 5.168 c 151.313 5.199 l 152.496 5.199 l 152.496 9.141 l f
-161.355 4.535 m 161.832 4.535 162.313 4.617 162.781 4.719 c 160.211 10.578
- l 161.914 10.578 l 161.914 10.551 l 161.434 10.344 161.637 9.895 162.23
- 8.516 c 164.223 3.863 l 159.82 3.863 l 159.359 5.086 l 159.395 5.086 l
-159.953 4.656 160.637 4.535 161.355 4.535 c f
-170.262 4.535 m 170.742 4.535 171.223 4.617 171.691 4.719 c 169.117 10.578
- l 170.824 10.578 l 170.824 10.551 l 170.344 10.344 170.547 9.895 171.141
- 8.516 c 173.129 3.863 l 168.73 3.863 l 168.27 5.086 l 168.301 5.086 l 168.863
- 4.656 169.547 4.535 170.262 4.535 c f
-179.809 9.457 m 179.809 9.977 179.867 10.344 179.309 10.551 c 179.309 10.578
- l 181.289 10.578 l 181.289 10.551 l 180.852 10.324 180.84 9.844 180.84
-9.395 c 180.84 9.191 l 181.645 9.191 l 182.137 7.965 l 181.781 8.262 181.309
- 8.395 180.84 8.395 c 180.84 3.863 l 179.434 3.863 l 176.254 9.191 l 179.809
- 9.191 l h
-177.652 8.324 m 179.809 4.605 l 179.809 8.395 l 178.922 8.395 178.184 8.352
- 177.652 8.324 c f
-76.898 9.844 m 75.602 9.719 l 75.602 7.301 l 76.359 7.301 l 76.676 7.301
- 77.102 7.289 77.266 7.586 c 77.297 7.586 l 77.297 6.504 l 77.266 6.504
-l 77.145 6.566 76.98 6.566 76.816 6.566 c 75.602 6.566 l 75.602 4.664 l
-75.93 4.605 76.285 4.594 76.645 4.594 c 77.113 4.594 77.535 4.637 77.848
- 5.004 c 77.879 5.004 l 77.879 3.809 l 77.848 3.809 l 77.715 3.879 77.543
- 3.863 77.367 3.863 c 74.102 3.863 l 74.102 3.891 l 74.621 4.086 74.563
-4.828 74.563 5.301 c 74.563 9.148 l 74.563 9.609 74.621 10.367 74.102 10.551
- c 74.102 10.578 l 78.359 10.578 l 78.816 9.242 l 78.785 9.242 l 78.277
-9.691 77.574 9.902 76.898 9.844 c f
-86.535 7.188 m 86.996 7.371 87.008 7.875 87.008 8.34 c 87.008 9.813 l 86.547
- 9.945 86.055 10.008 85.586 10.008 c 83.973 10.008 82.668 8.762 82.668 7.117
- c 82.668 5.473 83.883 4.434 85.473 4.434 c 86.098 4.434 86.871 4.574 87.293
- 5.047 c 87.324 5.047 l 87.324 3.871 l 86.793 3.758 86.262 3.695 85.719
-3.695 c 83.25 3.695 81.504 5.066 81.504 7.258 c 81.504 9.313 83.043 10.742
- 85.66 10.742 c 86.484 10.742 87.281 10.59 88.098 10.438 c 88.039 10.293
- 88.047 10.129 88.047 9.977 c 88.047 7.629 l 88.047 7.473 88.047 7.313 88.098
- 7.188 c 88.098 7.156 l 86.535 7.156 l 86.535 7.188 l f
-93.77 9.844 m 92.473 9.719 l 92.473 7.301 l 93.227 7.301 l 93.543 7.301
- 93.973 7.289 94.133 7.586 c 94.164 7.586 l 94.164 6.504 l 94.133 6.504
-l 94.012 6.566 93.852 6.566 93.684 6.566 c 92.473 6.566 l 92.473 4.664 l
- 92.797 4.605 93.156 4.594 93.516 4.594 c 93.98 4.594 94.402 4.637 94.715
- 5.004 c 94.75 5.004 l 94.75 3.809 l 94.715 3.809 l 94.586 3.879 94.41 3.863
- 94.238 3.863 c 90.969 3.863 l 90.969 3.891 l 91.488 4.086 91.43 4.828 91.43
- 5.301 c 91.43 9.148 l 91.43 9.609 91.488 10.367 90.969 10.551 c 90.969
-10.578 l 95.227 10.578 l 95.688 9.242 l 95.656 9.242 l 95.148 9.691 94.441
- 9.902 93.77 9.844 c f
-102.949 9.148 m 101.477 7.301 l 102.313 7.105 103.102 6.402 103.102 5.504
- c 103.102 4.574 102.355 3.863 100.988 3.863 c 98.555 3.863 l 98.555 3.891
- l 99.074 4.086 99.004 4.832 99.004 5.301 c 99.004 9.148 l 99.004 9.609
-99.074 10.367 98.555 10.551 c 98.555 10.578 l 100.508 10.578 l 100.508 10.551
- l 99.984 10.367 100.047 9.621 100.047 9.148 c 100.047 4.574 l 100.281 4.535
- 100.508 4.504 100.738 4.496 c 101.426 4.465 102.059 4.891 102.059 5.625
- c 102.059 6.586 101.109 6.965 100.289 7.086 c 101.23 8.527 l 102.477 10.07
- l 102.781 10.449 103.117 10.578 103.66 10.578 c 104.598 10.578 l 104.02
- 10.211 103.375 9.68 102.949 9.148 c f
-128 22.023 m 113.281 28.551 l 107.246 28.539 l 107.246 32.211 l 54.418
-32.191 l 55.48 33.773 l 55.48 62.383 l 0 62.383 l 0 63.41 l 254.363 63.41
- l 254.363 62.383 l 200.496 62.383 l 200.496 33.773 l 201.559 32.191 l 148.738
- 32.211 l 148.738 28.539 l 142.844 28.551 l h
-128 22.973 m 140.473 28.551 l 115.5 28.551 l h
-108.125 29.77 m 111.699 29.77 l 111.719 51.121 l 108.125 51.121 l h
-112.551 29.77 m 114.633 29.77 l 114.633 51.125 l 112.551 51.121 l h
-115.512 29.77 m 140.465 29.77 l 140.465 51.125 l 137.645 51.129 l 137.633
- 44.871 l 137.633 43.957 137.008 43.047 135.68 43.047 c 134.352 43.047 133.727
- 44.094 133.727 44.82 c 133.727 51.125 l 129.957 51.125 l 129.957 44.871
- l 129.957 43.957 129.328 43.047 128 43.047 c 126.672 43.047 126.023 43.957
- 126.023 44.871 c 126.023 51.125 l 122.254 51.125 l 122.254 44.82 l 122.254
- 44.094 121.629 43.047 120.301 43.047 c 118.973 43.047 118.344 43.957 118.344
- 44.871 c 118.332 51.129 l 115.512 51.125 l h
-141.316 29.77 m 143.395 29.77 l 143.395 51.121 l 141.316 51.125 l h
-144.25 29.77 m 147.824 29.77 l 147.824 51.121 l 144.234 51.121 l h
-107.246 33.762 m 107.246 51.125 l 76.801 51.125 l 76.801 33.832 l h
-148.738 33.762 m 179.176 33.832 l 179.176 51.125 l 148.738 51.125 l h
-56.371 33.832 m 58.383 33.832 l 58.406 51.125 l 56.371 51.125 l h
-59.289 33.832 m 73.012 33.832 l 73.012 51.125 l 59.266 51.125 l h
-73.836 33.832 m 75.898 33.832 l 75.898 51.125 l 73.836 51.125 l h
-180.082 33.832 m 182.141 33.832 l 182.141 51.125 l 180.082 51.125 l h
-182.969 33.832 m 196.691 33.832 l 196.711 51.125 l 182.969 51.125 l h
-197.594 33.832 m 199.605 33.832 l 199.605 51.125 l 197.574 51.125 l h
-56.371 52.004 m 58.383 52.004 l 58.383 62.379 l 56.371 62.379 l h
-108.125 52.004 m 111.699 52.012 l 111.699 62.383 l 108.125 62.383 l h
-114.633 52.004 m 114.633 62.379 l 112.551 62.383 l 112.551 52.012 l h
-115.512 52.004 m 115.945 52.004 l 115.945 52.809 l 116.793 52.809 l 116.793
- 52.004 l 117.492 52.004 l 117.492 52.809 l 118.344 52.809 l 118.344 52.004
- l 122.254 52.004 l 122.254 52.809 l 123.102 52.809 l 123.102 52.004 l 123.879
- 52.012 l 123.879 52.809 l 124.73 52.809 l 124.73 52.004 l 131.25 52.004
- l 131.25 52.809 l 132.102 52.809 l 132.102 52.012 l 132.875 52.004 l 132.875
- 52.809 l 133.727 52.809 l 133.727 52.004 l 137.633 52.004 l 137.633 52.809
- l 138.488 52.809 l 138.484 52.004 l 139.184 52.004 l 139.184 52.809 l 140.031
- 52.809 l 140.031 52.004 l 140.465 52.004 l 140.477 62.383 l 137.633 62.383
- l 137.633 55.941 l 137.633 55.031 137.008 54.117 135.68 54.117 c 134.352
- 54.117 133.727 55.031 133.727 55.941 c 133.719 62.391 l 130.656 62.383
-l 130.656 56.004 l 130.656 54.988 129.895 53.582 128 53.563 c 127.977 53.563
- l 126.082 53.582 125.324 54.988 125.324 56.004 c 125.324 62.383 l 122.254
- 62.383 l 122.254 55.941 l 122.254 55.031 121.629 54.117 120.301 54.117
-c 118.973 54.117 118.344 55.031 118.344 55.941 c 118.344 62.383 l 115.504
- 62.383 l h
-141.348 52.004 m 143.43 52.012 l 143.43 62.383 l 141.348 62.379 l h
-147.855 52.004 m 147.855 62.383 l 144.281 62.383 l 144.281 52.012 l h
-197.594 52.004 m 199.605 52.004 l 199.605 62.379 l 197.594 62.379 l h
-59.285 52.012 m 73.008 52.012 l 73.008 62.383 l 59.285 62.383 l h
-73.836 52.012 m 75.898 52.012 l 75.898 62.379 l 73.836 62.383 l h
-76.801 52.012 m 107.246 52.012 l 107.246 62.383 l 76.801 62.383 l h
-148.73 52.012 m 179.176 52.012 l 179.176 62.383 l 148.73 62.383 l h
-180.082 52.012 m 182.141 52.012 l 182.141 62.383 l 180.082 62.379 l h
-182.969 52.012 m 196.691 52.012 l 196.691 62.383 l 182.969 62.383 l h
-182.969 52.012 m f
-149.559 28.539 m 149.559 31.504 l 177.094 31.504 l 186.207 21.383 l 182.137
- 18.605 l 146.574 18.574 l 151.309 28.539 l 149.559 28.539 l f
-142.18 17.934 m 145.863 18.27 l 136.32 12.148 l 142.18 17.934 l f
-145.477 27.816 m 150.176 27.816 l 146.047 18.945 l 142.332 18.574 l 145.477
- 27.816 l f
-138.168 42.426 m 138.168 41.875 l 138.512 41.875 l 138.512 41.301 l 135.68
- 40.156 l 132.848 41.301 l 132.848 41.875 l 133.191 41.875 l 133.191 42.426
- l 133.754 42.426 l 133.754 41.879 l 137.617 41.879 l 137.617 42.426 l 138.168
- 42.426 l f
-137.633 38.961 m 137.633 38.961 137.633 35.371 137.633 34.461 c 137.633
- 33.547 137.008 32.637 135.68 32.637 c 134.352 32.637 133.727 33.547 133.727
- 34.461 c 133.727 35.371 133.727 38.961 133.727 38.961 c 137.633 38.961
-l f
-138.531 30.859 m 132.824 30.859 l 132.824 31.508 l 133.184 31.508 l 133.184
- 32.305 l 133.727 32.305 l 133.727 31.961 l 133.727 31.961 134.402 31.508
- 135.68 31.508 c 136.969 31.508 137.633 31.961 137.633 31.961 c 137.633
-32.305 l 138.156 32.305 l 138.156 31.508 l 138.531 31.508 l 138.531 30.859
+q 0 0 256 88 rectclip
+1 0 0 -1 0 88 cm q
+Q q
+q
+0 0 256 88 re W n
+ q
+Q q
+q
+0 0 256 88 re W n
+ q
+Q q
+0 85.992 255.113 1.715 re W n
+q
+0 85 256 3 re W n
+ q
+0.0666667 0.247059 0.380392 rg
+0 86.469 255.117 1.238 re f
+ Q
+Q
+Q q
+0.0666667 0.247059 0.380392 rg
+175.461 19.141 m 175.453 19.176 175.449 19.203 175.441 19.227 c 175.27
+19.355 l 175.266 19.41 l 181.699 19.402 l 181.289 19.145 l 179.262 17.867
+ l 179.195 17.824 l 179.188 17.605 l 179.004 17.48 l 178.973 17.355 178.914
+ 16.965 179.172 16.684 c 179.43 16.488 179.602 16.137 179.602 15.734 c 179.602
+ 15.684 179.605 15.387 179.43 15.082 c 179.371 14.984 179.301 14.895 179.219
+ 14.824 c 179.215 14.762 179.191 14.582 179.059 14.477 c 179.02 14.438 178.973
+ 14.402 178.922 14.379 c 178.926 14.367 178.926 14.352 178.926 14.34 c 178.926
+ 14.246 178.875 14.164 178.805 14.125 c 178.773 14.105 178.742 14.098 178.707
+ 14.098 c 178.59 14.098 178.492 14.203 178.492 14.34 c 178.492 14.352 178.492
+ 14.367 178.492 14.379 c 178.332 14.461 178.219 14.625 178.199 14.824 c
+177.965 15.023 177.813 15.355 177.813 15.734 c 177.813 16.129 177.977 16.473
+ 178.227 16.668 c 178.355 16.813 178.52 17.078 178.43 17.391 c 178.422 17.426
+ 178.418 17.453 178.414 17.48 c 178.242 17.605 l 178.227 17.801 l 176.066
+ 19.055 l 176.008 19.086 l 175.996 18.914 176.008 18.645 176.203 18.43 c
+ 176.461 18.238 176.633 17.883 176.633 17.484 c 176.633 17.43 176.637 17.137
+ 176.461 16.832 c 176.402 16.73 176.328 16.645 176.25 16.57 c 176.242 16.508
+ 176.219 16.332 176.09 16.227 c 176.047 16.188 176.004 16.152 175.953 16.129
+ c 175.953 16.117 175.957 16.102 175.957 16.09 c 175.957 15.992 175.906
+15.91 175.832 15.871 c 175.805 15.855 175.773 15.848 175.738 15.848 c 175.621
+ 15.848 175.523 15.953 175.523 16.09 c 175.523 16.102 175.523 16.117 175.527
+ 16.129 c 175.363 16.207 175.246 16.375 175.23 16.57 c 174.996 16.773 174.844
+ 17.105 174.844 17.484 c 174.844 17.879 175.008 18.223 175.258 18.418 c
+175.387 18.563 175.551 18.824 175.461 19.141 c f
+192.418 51.805 3.559 0.25 re f
+186.059 51.805 3.563 0.25 re f
+192.762 59.707 m 192.762 61.633 l 195.633 61.633 l 195.633 56.898 l 195.633
+ 56.898 194.965 56.703 194.223 56.664 c 193.453 56.703 192.762 56.887 192.762
+ 56.887 c 192.762 59.707 l f
+186.402 59.707 m 186.402 61.633 l 189.273 61.633 l 189.273 56.898 l 189.273
+ 56.898 188.605 56.703 187.863 56.664 c 187.094 56.703 186.402 56.887 186.402
+ 56.887 c 186.402 59.707 l f
+147.152 61.605 m 147.152 56.867 l 147.152 56.867 146.676 56.676 146.145
+ 56.637 c 145.594 56.676 145.102 56.859 145.102 56.859 c 145.102 61.605
+l 147.152 61.605 l f
+144.828 51.773 2.574 0.223 re f
+175.172 51.793 3.563 0.25 re f
+168.973 51.793 3.566 0.25 re f
+162.777 51.793 3.559 0.25 re f
+156.578 51.793 3.559 0.25 re f
+150.379 51.793 3.559 0.25 re f
+175.512 59.711 m 175.512 61.637 l 178.383 61.637 l 178.383 56.902 l 178.383
+ 56.902 177.719 56.707 176.977 56.672 c 176.203 56.707 175.512 56.891 175.512
+ 56.891 c 175.512 59.711 l f
+169.313 59.711 m 169.313 61.637 l 172.184 61.637 l 172.184 56.902 l 172.184
+ 56.902 171.516 56.707 170.777 56.672 c 170.004 56.707 169.313 56.891 169.313
+ 56.891 c 169.313 59.711 l f
+163.113 59.711 m 163.113 61.637 l 165.988 61.637 l 165.988 56.902 l 165.988
+ 56.902 165.32 56.707 164.578 56.672 c 163.805 56.707 163.113 56.891 163.113
+ 56.891 c 163.113 59.711 l f
+159.785 61.637 m 159.785 56.902 l 159.785 56.902 159.121 56.707 158.379
+ 56.672 c 157.609 56.707 156.914 56.891 156.914 56.891 c 156.914 61.637
+l 159.785 61.637 l f
+150.715 59.711 m 150.715 61.637 l 153.59 61.637 l 153.59 56.902 l 153.59
+ 56.902 152.922 56.707 152.18 56.672 c 151.41 56.707 150.715 56.891 150.715
+ 56.891 c 150.715 59.711 l f
+132.926 34.711 m 133.484 34.711 l 133.484 34.359 l 133.484 34.359 134.18
+ 33.895 135.488 33.895 c 136.809 33.895 137.492 34.359 137.492 34.359 c
+137.492 34.711 l 138.027 34.711 l 138.027 33.895 l 138.41 33.895 l 138.41
+ 33.23 l 132.555 33.23 l 132.555 33.895 l 132.926 33.895 l 132.926 34.711
l f
-159.129 55.57 m 159.129 54.777 158.609 54.465 157.652 54.465 c 156.699
-54.465 156.219 54.777 156.219 55.57 c 156.219 56.363 156.219 59.797 156.219
- 59.797 c 159.129 59.797 l 159.129 59.797 159.129 56.363 159.129 55.57 c
- f
-165.41 55.57 m 165.41 54.777 164.891 54.465 163.938 54.465 c 162.98 54.465
- 162.5 54.777 162.5 55.57 c 162.5 56.363 162.5 59.797 162.5 59.797 c 165.41
- 59.797 l 165.41 59.797 165.41 56.363 165.41 55.57 c f
-171.695 55.57 m 171.695 54.777 171.176 54.465 170.219 54.465 c 169.266
-54.465 168.781 54.777 168.781 55.57 c 168.781 56.363 168.781 59.797 168.781
- 59.797 c 171.695 59.797 l 171.695 59.797 171.695 56.363 171.695 55.57 c
- f
-177.977 55.57 m 177.977 54.777 177.457 54.465 176.5 54.465 c 175.547 54.465
- 175.066 54.777 175.066 55.57 c 175.066 56.363 175.066 59.797 175.066 59.797
- c 177.977 59.797 l 177.977 59.797 177.977 56.363 177.977 55.57 c f
-152.848 55.57 m 152.848 54.777 152.328 54.465 151.371 54.465 c 150.414
-54.465 149.934 54.777 149.934 55.57 c 149.934 56.363 149.934 59.797 149.934
- 59.797 c 152.848 59.797 l 152.848 59.797 152.848 56.363 152.848 55.57 c
- f
-159.129 35.641 m 159.129 34.836 158.609 34.52 157.652 34.52 c 156.699 34.52
- 156.219 34.836 156.219 35.641 c 156.219 36.445 156.219 39.855 156.219 39.855
- c 159.129 39.855 l 159.129 39.855 159.129 36.445 159.129 35.641 c f
-165.41 35.641 m 165.41 34.836 164.891 34.52 163.938 34.52 c 162.98 34.52
- 162.5 34.836 162.5 35.641 c 162.5 36.445 162.5 39.855 162.5 39.855 c 165.41
- 39.855 l 165.41 39.855 165.41 36.445 165.41 35.641 c f
-171.691 35.641 m 171.691 34.836 171.176 34.52 170.215 34.52 c 169.266 34.52
- 168.785 34.836 168.785 35.641 c 168.785 36.445 168.785 39.855 168.785 39.855
- c 171.691 39.855 l 171.691 39.855 171.691 36.445 171.691 35.641 c f
-177.973 35.641 m 177.973 34.836 177.457 34.52 176.5 34.52 c 175.547 34.52
- 175.066 34.836 175.066 35.641 c 175.066 36.445 175.066 39.855 175.066 39.855
- c 177.973 39.855 l 177.973 39.855 177.973 36.445 177.973 35.641 c f
-152.852 35.641 m 152.852 34.836 152.328 34.52 151.371 34.52 c 150.418 34.52
- 149.938 34.836 149.938 35.641 c 149.938 36.445 149.938 39.855 149.938 39.855
- c 152.852 39.855 l 152.852 39.855 152.852 36.445 152.852 35.641 c f
-171.691 43.18 m 171.691 43.145 171.691 43.121 171.691 43.121 c 168.785
-43.121 l 168.785 43.121 168.785 43.145 168.785 43.18 c 168.785 48.766 l
-171.691 48.766 l 171.691 43.18 l f
-177.973 43.18 m 177.973 43.145 177.973 43.121 177.973 43.121 c 175.066
-43.121 l 175.066 43.121 175.066 43.145 175.066 43.18 c 175.066 48.766 l
-177.973 48.766 l 177.973 43.18 l f
-165.41 43.18 m 165.41 43.145 165.41 43.121 165.41 43.121 c 162.5 43.121
- l 162.5 43.121 162.5 43.145 162.5 43.18 c 162.5 48.766 l 165.41 48.766
-l 165.41 43.18 l f
-159.129 43.18 m 159.129 43.145 159.129 43.121 159.129 43.121 c 156.219
-43.121 l 156.219 43.121 156.219 43.145 156.219 43.18 c 156.219 48.766 l
-159.129 48.766 l 159.129 43.18 l f
-152.852 43.18 m 152.852 43.145 152.852 43.121 152.852 43.121 c 149.938
-43.121 l 149.938 43.121 149.938 43.145 149.938 43.18 c 149.938 48.766 l
-152.852 48.766 l 152.852 43.18 l f
-188.156 55.66 m 188.156 54.867 187.637 54.559 186.68 54.559 c 185.727 54.559
- 185.246 54.867 185.246 55.66 c 185.246 56.453 185.246 59.887 185.246 59.887
- c 188.156 59.887 l 188.156 59.887 188.156 56.453 188.156 55.66 c f
-194.438 55.66 m 194.438 54.867 193.922 54.559 192.965 54.559 c 192.008
-54.559 191.527 54.867 191.527 55.66 c 191.527 56.453 191.527 59.887 191.527
- 59.887 c 194.438 59.887 l 194.438 59.887 194.438 56.453 194.438 55.66 c
- f
-186.68 34.559 m 185.727 34.559 185.246 34.867 185.246 35.664 c 185.246
-36.457 185.246 39.813 185.246 39.813 c 188.156 39.813 l 188.156 39.813 188.156
- 36.457 188.156 35.664 c 188.156 34.867 187.637 34.559 186.68 34.559 c f
-192.965 34.559 m 192.008 34.559 191.527 34.867 191.527 35.664 c 191.527
- 36.457 191.527 39.813 191.527 39.813 c 194.438 39.813 l 194.438 39.813
-194.438 36.457 194.438 35.664 c 194.438 34.867 193.922 34.559 192.965 34.559
- c f
-185.246 43.18 m 185.246 48.766 l 188.156 48.766 l 188.156 43.18 l 188.156
- 43.145 188.156 43.121 188.156 43.121 c 185.246 43.121 l 185.246 43.121
-185.246 43.145 185.246 43.18 c f
-191.527 43.18 m 191.527 48.766 l 194.438 48.766 l 194.438 43.18 l 194.438
- 43.145 194.438 43.121 194.438 43.121 c 191.527 43.121 l 191.527 43.121
-191.527 43.145 191.527 43.18 c f
-187.434 21 m 178.074 31.523 l 201.559 31.523 l 202.004 31.52 l 202.305
-31.102 l 193.121 24.867 l 192.949 24.242 192.574 23.484 191.809 22.926 c
- 190.836 22.211 189.957 22.195 189.289 22.27 c h
-189.777 23.074 m 190.898 23.055 192.266 23.949 192.367 25.496 c 192.398
- 25.941 192.32 26.141 192.23 26.457 c 192.102 26.902 192.223 27.266 192.469
- 27.566 c 192.77 27.93 193.047 28.242 194.254 28.242 c 195.879 28.25 l 195.879
- 29.758 l 183.652 29.758 l 183.652 28.25 l 185.273 28.242 l 186.48 28.242
- 186.758 27.93 187.059 27.566 c 187.305 27.266 187.426 26.902 187.301 26.457
- c 187.207 26.141 187.133 25.941 187.164 25.496 c 187.266 23.949 188.664
- 23.055 189.777 23.074 c h
-189.777 23.074 m f
-146.145 33.926 m 145.594 33.926 145.332 34.727 145.332 35.527 c 145.332
- 36.332 145.332 39.227 145.332 39.227 c 146.957 39.227 l 146.957 39.227
-146.957 36.332 146.957 35.527 c 146.957 34.727 146.695 33.926 146.145 33.926
- c f
-146.145 42.742 m 145.594 42.742 145.332 43.543 145.332 44.344 c 145.332
- 45.145 145.332 48.043 145.332 48.043 c 146.957 48.043 l 146.957 48.043
-146.957 45.145 146.957 44.344 c 146.957 43.543 146.695 42.742 146.145 42.742
- c f
-146.145 54.09 m 145.594 54.09 145.332 54.887 145.332 55.691 c 145.332 56.492
- 145.332 59.387 145.332 59.387 c 146.957 59.387 l 146.957 59.387 146.957
- 56.492 146.957 55.691 c 146.957 54.887 146.695 54.09 146.145 54.09 c f
-189.809 27.188 m 190.66 27.188 191.352 26.496 191.352 25.645 c 191.352
-24.789 190.66 24.098 189.809 24.098 c 188.953 24.098 188.262 24.789 188.262
- 25.645 c 188.262 26.496 188.953 27.188 189.809 27.188 c f
-113.797 17.934 m 110.117 18.27 l 119.656 12.148 l 113.797 17.934 l f
-110.504 27.816 m 105.801 27.816 l 109.93 18.945 l 113.648 18.574 l 110.504
- 27.816 l f
-144.664 27.816 m 142.992 27.816 l 128 21.184 l 112.988 27.816 l 111.313
- 27.816 l 114.438 18.574 l 141.543 18.574 l 144.664 27.816 l f
-117.813 42.426 m 117.813 41.875 l 117.465 41.875 l 117.465 41.301 l 120.297
- 40.156 l 123.133 41.301 l 123.133 41.875 l 122.785 41.875 l 122.785 42.426
- l 122.227 42.426 l 122.227 41.879 l 118.359 41.879 l 118.359 42.426 l 117.813
- 42.426 l f
-118.344 38.961 m 118.344 38.961 118.344 35.371 118.344 34.461 c 118.344
- 33.547 118.969 32.637 120.297 32.637 c 121.625 32.637 122.254 33.547 122.254
- 34.461 c 122.254 35.371 122.254 38.961 122.254 38.961 c 118.344 38.961
+127.559 55.277 m 125.719 55.301 124.84 56.676 124.762 57.762 c 124.746
+64.801 l 130.371 64.801 l 130.355 57.762 l 130.277 56.676 129.398 55.301
+ 127.559 55.277 c f
+119.543 55.891 m 118.234 55.891 117.594 56.805 117.547 57.758 c 117.535
+ 64.801 l 121.551 64.801 l 121.535 57.758 l 121.488 56.805 120.852 55.891
+ 119.543 55.891 c f
+135.574 55.891 m 134.266 55.891 133.625 56.805 133.578 57.758 c 133.566
+ 64.801 l 137.582 64.801 l 137.57 57.758 l 137.523 56.805 136.887 55.891
+ 135.574 55.891 c f
+201.129 53.254 m 199.043 53.254 l 199.066 35.508 l 201.129 35.508 l h
+184.059 53.254 m 184.059 43.301 l 198.148 43.301 l 198.16 53.254 l h
+184.059 35.508 m 198.137 35.508 l 198.148 42.996 l 184.059 42.996 l h
+183.207 53.254 m 181.094 53.254 l 181.094 35.508 l 183.207 35.508 l h
+180.164 35.508 m 180.164 43.047 l 148.93 43.047 l 148.93 35.438 l h
+180.164 53.254 m 148.93 53.254 l 148.93 43.301 l 180.164 43.301 l h
+148.023 53.25 m 144.336 53.25 l 144.355 31.34 l 148.023 31.34 l h
+143.477 53.25 m 142.055 53.25 l 141.344 53.254 l 141.344 31.34 l 143.48
+ 31.34 l h
+127.605 30.086 m 114.664 30.086 l 127.559 24.332 l 140.453 30.086 l h
+140.441 50.738 m 137.383 50.738 l 137.383 45.34 l 137.383 45.34 136.457
+ 45.082 135.434 45.035 c 134.414 45.082 133.496 45.328 133.496 45.328 c
+133.496 46.871 l 133.492 46.871 l 133.492 50.738 l 129.496 50.738 l 129.496
+ 45.34 l 129.496 45.34 128.582 45.094 127.559 45.047 c 127.559 45.043 l
+126.539 45.094 125.621 45.34 125.621 45.34 c 125.637 50.738 l 121.625 50.738
+ l 121.625 46.871 l 121.621 46.871 l 121.621 45.328 l 121.621 45.328 120.699
+ 45.082 119.68 45.035 c 118.652 45.082 117.734 45.34 117.734 45.34 c 117.734
+ 50.738 l 114.676 50.738 l 114.676 31.34 l 115.109 31.34 l 115.109 31.945
+ l 115.973 31.945 l 115.973 31.34 l 116.715 31.34 l 116.715 31.945 l 117.578
+ 31.945 l 117.578 31.34 l 121.605 31.34 l 121.605 31.945 l 122.469 31.945
+ l 122.469 31.34 l 123.285 31.34 l 123.285 31.945 l 124.148 31.945 l 124.148
+ 31.34 l 130.965 31.34 l 130.965 31.945 l 131.828 31.945 l 131.828 31.34
+ l 132.652 31.34 l 132.652 31.945 l 133.516 31.945 l 133.516 31.34 l 137.539
+ 31.34 l 137.539 31.945 l 138.398 31.945 l 138.398 31.34 l 139.145 31.34
+ l 139.145 31.945 l 140.008 31.945 l 140.008 31.34 l 140.441 31.34 l h
+140.441 53.254 m 139.141 53.254 l 139.141 51.297 l 140.441 51.297 l h
+138.613 53.254 m 137.383 53.254 l 137.383 51.297 l 138.613 51.297 l h
+133.492 53.254 m 132.789 53.254 l 132.789 51.297 l 133.492 51.297 l h
+132.262 53.254 m 130.676 53.254 l 130.676 51.297 l 132.262 51.297 l h
+130.145 53.254 m 129.496 53.254 l 129.496 51.301 l 129.617 51.297 l 130.145
+ 51.297 l h
+125.637 53.254 m 124.969 53.254 l 124.969 51.297 l 125.637 51.297 l h
+124.441 53.254 m 122.852 53.254 l 122.852 51.297 l 124.441 51.297 l h
+122.324 53.254 m 121.625 53.254 l 121.625 51.297 l 122.324 51.297 l h
+117.734 51.523 m 117.734 53.254 l 116.504 53.254 l 116.504 51.297 l 117.734
+ 51.297 l h
+115.973 53.254 m 114.676 53.254 l 114.676 51.297 l 115.973 51.297 l h
+113.773 53.254 m 113.059 53.25 l 111.641 53.25 l 111.637 31.34 l 113.773
+ 31.34 l h
+107.094 53.25 m 107.094 31.34 l 110.762 31.34 l 110.781 53.25 l h
+106.188 43.047 m 74.949 43.047 l 74.949 35.508 l 106.188 35.438 l h
+106.188 53.254 m 74.949 53.254 l 74.949 43.301 l 106.188 43.301 l h
+74.023 53.254 m 71.906 53.254 l 71.906 35.508 l 74.023 35.508 l h
+71.059 42.996 m 56.969 42.996 l 56.98 35.508 l 71.059 35.508 l h
+71.059 53.254 m 56.957 53.254 l 56.969 43.301 l 71.059 43.301 l h
+53.984 53.254 m 53.984 35.508 l 56.051 35.508 l 56.074 53.254 l h
+56.27 30.355 m 56.629 29.875 58.227 30.152 58.227 30.152 c 59.742 30.152
+ 60.09 29.758 60.465 29.305 c 60.773 28.926 60.926 28.465 60.766 27.914
+c 60.652 27.516 60.555 27.262 60.59 26.707 c 60.605 26.543 60.641 26.395
+ 60.672 26.242 c 60.672 26.238 60.672 26.238 60.672 26.238 c 60.738 25.926
+ 60.852 25.637 60.992 25.375 c 61.137 25.117 61.313 24.883 61.512 24.68
+c 61.809 24.371 62.16 24.133 62.531 23.965 c 62.656 23.91 62.781 23.859
+62.906 23.82 c 63.219 23.723 63.539 23.664 63.84 23.672 c 65.242 23.641
+66.996 24.77 67.125 26.707 c 67.16 27.262 67.066 27.516 66.949 27.914 c
+66.793 28.465 66.941 28.926 67.25 29.305 c 67.625 29.758 67.977 30.152 69.492
+ 30.152 c 69.492 30.152 70.875 30.008 71.449 30.324 c 71.828 30.527 71.523
+ 32.051 71.523 32.051 c 56.191 32.051 l 56.191 32.051 55.984 30.734 56.27
+ 30.355 c h
+92.801 31.633 m 88.113 31.633 l 88.113 30.566 l 88.113 30.566 88.328 30.34
+ 88.543 30.078 c 88.715 29.867 88.801 29.605 88.711 29.293 c 88.648 29.07
+ 88.594 28.926 88.613 28.617 c 88.688 27.52 89.656 26.887 90.445 26.898
+c 91.238 26.887 92.227 27.52 92.301 28.617 c 92.32 28.926 92.266 29.07 92.203
+ 29.293 c 92.113 29.605 92.199 29.867 92.371 30.078 c 92.586 30.34 92.801
+ 30.566 92.801 30.566 c h
+86.461 21.813 m 86.461 21.832 l 85.23 21.832 l 85.23 18.023 l 86.461 18.023
+ l h
+162.316 30.566 m 162.316 30.566 162.531 30.34 162.742 30.078 c 162.918
+29.867 163.004 29.605 162.914 29.293 c 162.852 29.07 162.793 28.926 162.816
+ 28.617 c 162.887 27.52 163.879 26.887 164.668 26.898 c 165.461 26.887 166.434
+ 27.52 166.504 28.617 c 166.523 28.926 166.469 29.07 166.406 29.293 c 166.316
+ 29.605 166.402 29.867 166.574 30.078 c 166.785 30.34 167.004 30.566 167.004
+ 30.566 c 167.004 31.633 l 162.316 31.633 l h
+168.656 21.813 m 168.656 18.023 l 169.887 18.023 l 169.887 21.832 l 168.656
+ 21.832 l h
+198.926 32.051 m 183.594 32.051 l 183.594 32.051 183.289 30.527 183.668
+ 30.324 c 184.238 30.008 185.625 30.152 185.625 30.152 c 187.141 30.152
+187.488 29.758 187.863 29.305 c 188.176 28.926 188.324 28.465 188.164 27.914
+ c 188.051 27.516 187.957 27.262 187.992 26.707 c 188.121 24.77 189.875
+23.641 191.277 23.672 c 191.578 23.664 191.898 23.723 192.207 23.82 c 192.336
+ 23.859 192.461 23.91 192.586 23.965 c 192.957 24.133 193.309 24.371 193.605
+ 24.68 c 193.805 24.883 193.98 25.117 194.125 25.375 c 194.266 25.637 194.375
+ 25.926 194.441 26.238 c 194.441 26.238 194.445 26.238 194.445 26.242 c
+194.477 26.395 194.512 26.543 194.523 26.707 c 194.563 27.262 194.465 27.516
+ 194.352 27.914 c 194.195 28.465 194.344 28.926 194.648 29.305 c 195.027
+ 29.758 195.375 30.152 196.891 30.152 c 196.891 30.152 198.488 29.875 198.848
+ 30.355 c 199.129 30.734 198.926 32.051 198.926 32.051 c h
+200.363 29.41 m 197.773 27.645 l 195.102 25.82 l 195.102 25.82 194.832
+24.602 193.598 23.668 c 193.188 23.363 192.773 23.168 192.391 23.047 c 191.57
+ 22.789 190.91 22.863 190.801 22.879 c 190.793 22.879 190.789 22.879 190.789
+ 22.879 c 188.668 21.813 l 188.629 21.793 l 188.613 21.813 l 178.445 33.129
+ l 179.031 33.129 l 203.094 33.133 l 202.773 33.473 l 150.309 33.477 l 150.309
+ 33.129 l 177.453 33.129 l 187.137 22.473 l 188.023 21.496 l 184.781 19.844
+ l 184.746 19.824 l 170.316 19.824 l 170.316 18.023 l 170.602 18.023 l 170.602
+ 17.359 l 167.949 17.359 l 167.949 18.023 l 168.063 18.023 l 168.059 18.043
+ l 167.645 19.824 l 147.391 19.824 l 147.398 19.844 l 148.285 21.813 l 152.023
+ 30.086 l 152.02 30.168 l 149.555 30.164 l 149.555 34.316 l 201.973 34.316
+ l 201.41 34.906 l 148.945 34.906 l 148.945 30.16 l 142.414 30.16 l 127.559
+ 23.285 l 112.789 30.16 l 106.188 30.16 l 106.188 34.906 l 53.707 34.906
+ l 53.145 34.316 l 105.566 34.316 l 105.566 30.156 l 103.098 30.168 l 103.09
+ 30.086 l 106.832 21.813 l 107.719 19.844 l 107.727 19.824 l 87.473 19.824
+ l 87.059 18.043 l 87.055 18.023 l 87.168 18.023 l 87.168 17.359 l 84.512
+ 17.359 l 84.512 18.023 l 84.801 18.023 l 84.801 19.824 l 70.371 19.824
+l 70.336 19.844 l 67.156 21.461 l 68.066 22.473 l 77.652 33.129 l 104.809
+ 33.129 l 104.809 33.477 l 104.266 33.477 l 52.344 33.473 l 52.023 33.133
+ l 76.086 33.129 l 76.672 33.129 l 66.504 21.813 l 66.484 21.793 l 66.449
+ 21.813 l 64.328 22.879 l 64.328 22.879 64.324 22.879 64.313 22.879 c 64.211
+ 22.863 63.547 22.789 62.727 23.047 c 62.344 23.168 61.926 23.363 61.52
+23.668 c 60.285 24.602 60.016 25.82 60.016 25.82 c 57.344 27.645 l 54.754
+ 29.41 l 50.266 32.473 l 53.07 35.449 l 53.07 64.801 l 53.984 64.801 l 53.984
+ 54.16 l 56.051 54.16 l 56.051 64.801 l 56.98 64.801 l 56.98 54.164 l 71.059
+ 54.164 l 71.059 64.801 l 71.906 64.801 l 71.906 54.164 l 74.023 54.164
+l 74.023 64.801 l 74.953 64.801 l 74.953 54.164 l 106.188 54.164 l 106.188
+ 64.801 l 107.094 64.801 l 107.094 54.16 l 108.93 54.16 l 110.762 54.164
+ l 110.762 64.801 l 111.637 64.801 l 111.637 54.164 l 113.773 54.156 l 113.773
+ 64.801 l 114.664 64.801 l 114.676 54.16 l 115.109 54.16 l 115.109 54.957
+ l 115.973 54.957 l 115.973 54.16 l 116.719 54.16 l 116.719 54.957 l 117.582
+ 54.957 l 117.582 54.16 l 121.793 54.16 l 121.793 54.957 l 122.656 54.957
+ l 122.656 54.16 l 123.48 54.16 l 123.48 54.957 l 124.344 54.957 l 124.344
+ 54.16 l 130.773 54.16 l 130.773 54.957 l 131.637 54.957 l 131.637 54.16
+ l 132.457 54.16 l 132.457 54.957 l 133.32 54.957 l 133.32 54.16 l 137.539
+ 54.16 l 137.539 54.957 l 138.398 54.957 l 138.398 54.16 l 139.145 54.16
+ l 139.145 54.957 l 140.008 54.957 l 140.008 54.16 l 140.441 54.16 l 140.453
+ 64.801 l 141.344 64.801 l 141.344 54.156 l 143.48 54.164 l 143.48 64.801
+ l 144.355 64.801 l 144.355 54.164 l 146.188 54.16 l 148.023 54.16 l 148.023
+ 64.801 l 148.93 64.801 l 148.93 54.164 l 180.164 54.164 l 180.164 64.801
+ l 181.094 64.801 l 181.094 54.164 l 183.207 54.164 l 183.207 64.801 l 184.059
+ 64.801 l 184.059 54.164 l 198.137 54.164 l 198.137 64.801 l 199.066 64.801
+ l 199.066 54.16 l 201.129 54.16 l 201.129 64.801 l 202.043 64.801 l 202.043
+ 35.449 l 204.852 32.473 l 200.363 29.41 l f
+133.5 44.023 m 135.473 43.387 l 137.379 44.023 l h
+138.305 43.867 m 135.566 42.949 l 135.512 42.93 135.445 42.93 135.391 42.949
+ c 132.652 43.836 l 132.574 43.859 132.516 43.918 132.496 43.988 c 132.477
+ 44.059 132.5 44.133 132.559 44.188 c 132.781 44.395 l 132.828 44.434 132.895
+ 44.461 132.965 44.461 c 132.996 44.461 l 132.996 44.816 l 132.996 44.938
+ 133.109 45.035 133.246 45.035 c 133.383 45.035 133.496 44.938 133.496 44.816
+ c 133.496 44.461 l 137.453 44.461 l 137.453 44.816 l 137.453 44.859 137.469
+ 44.902 137.496 44.938 c 137.539 44.992 137.617 45.035 137.703 45.035 c
+137.84 45.035 137.953 44.938 137.953 44.816 c 137.953 44.461 l 137.988 44.461
+ l 138.051 44.461 138.109 44.441 138.156 44.406 c 138.379 44.234 l 138.445
+ 44.184 138.473 44.105 138.457 44.031 c 138.445 43.957 138.383 43.895 138.305
+ 43.867 c f
+164.691 27.625 m 164.086 27.625 163.598 28.113 163.598 28.719 c 163.598
+ 29.324 164.086 29.813 164.691 29.813 c 165.297 29.813 165.785 29.324 165.785
+ 28.719 c 165.785 28.113 165.297 27.625 164.691 27.625 c f
+191.344 24.914 m 190.25 24.914 189.367 25.797 189.367 26.891 c 189.367
+27.984 190.25 28.867 191.344 28.867 c 192.438 28.867 193.32 27.984 193.32
+ 26.891 c 193.32 25.797 192.438 24.914 191.344 24.914 c f
+192.773 44.723 2.852 6.625 re f
+186.414 44.723 2.852 6.625 re f
+133.555 38.746 m 133.555 41.227 l 137.363 41.227 l 137.363 35.133 l 137.363
+ 35.133 136.477 34.887 135.496 34.836 c 135.496 34.84 l 134.473 34.887 133.555
+ 35.121 133.555 35.121 c 133.555 38.746 l f
+133.051 41.57 4.773 0.285 re f
+193.961 41.715 m 195.633 41.715 l 195.633 36.977 l 195.633 36.977 194.965
+ 36.785 194.223 36.75 c 193.453 36.785 192.762 36.965 192.762 36.965 c 192.762
+ 41.715 l 193.961 41.715 l f
+192.387 42.074 3.602 0.223 re f
+187.605 41.715 m 189.273 41.715 l 189.273 36.977 l 189.273 36.977 188.605
+ 36.785 187.863 36.75 c 187.094 36.785 186.402 36.965 186.402 36.965 c 186.402
+ 41.715 l 187.605 41.715 l f
+186.027 42.074 3.602 0.223 re f
+145.039 34.684 m 145.297 34.684 l 145.297 34.332 l 145.297 34.332 145.621
+ 33.867 146.223 33.867 c 146.836 33.867 147.152 34.332 147.152 34.332 c
+147.152 34.684 l 147.398 34.684 l 147.398 33.867 l 147.574 33.867 l 147.574
+ 33.203 l 144.867 33.203 l 144.867 33.867 l 145.039 33.867 l 145.039 34.684
+ l f
+145.332 38.719 m 145.332 41.199 l 147.09 41.199 l 147.09 35.109 l 147.09
+ 35.109 146.684 34.859 146.227 34.813 c 145.754 34.859 145.332 35.098 145.332
+ 35.098 c 145.332 38.719 l f
+145.098 41.543 2.207 0.289 re f
+147.113 46.547 m 147.113 45.262 l 147.113 45.262 146.688 45.078 146.211
+ 45.043 c 146.211 45.035 l 145.738 45.07 145.313 45.25 145.313 45.25 c 145.313
+ 46.383 l 145.309 46.383 l 145.309 51.297 l 147.113 51.297 l 147.113 46.547
+ l f
+146.227 43.387 m 147.113 44.027 l 145.313 44.027 l h
+144.98 44.395 m 145.004 44.441 145.031 44.461 145.066 44.461 c 145.082
+44.461 l 145.082 44.816 l 145.082 44.938 145.133 45.035 145.199 45.035 c
+ 145.262 45.035 145.313 44.938 145.313 44.816 c 145.313 44.461 l 147.148
+ 44.461 l 147.148 44.816 l 147.148 44.863 147.156 44.906 147.168 44.941
+c 147.188 44.996 147.223 45.035 147.262 45.035 c 147.328 45.035 147.379
+44.938 147.379 44.816 c 147.379 44.461 l 147.398 44.461 l 147.426 44.461
+ 147.453 44.445 147.473 44.406 c 147.578 44.238 l 147.605 44.188 147.621
+ 44.109 147.613 44.035 c 147.609 43.961 147.578 43.898 147.543 43.867 c
+146.273 42.953 l 146.246 42.934 146.219 42.934 146.191 42.953 c 144.922
+43.836 l 144.883 43.859 144.859 43.918 144.848 43.992 c 144.84 44.063 144.848
+ 44.137 144.879 44.191 c 144.98 44.395 l f
+175.531 44.707 2.848 6.625 re f
+169.332 44.707 2.848 6.625 re f
+165.98 51.332 m 165.98 51.176 l 165.984 51.176 l 165.984 44.707 l 163.133
+ 44.707 l 163.133 51.332 l 165.98 51.332 l f
+156.934 44.707 2.848 6.625 re f
+150.734 44.707 2.852 6.625 re f
+176.711 41.715 m 178.383 41.715 l 178.383 36.977 l 178.383 36.977 177.719
+ 36.785 176.977 36.75 c 176.203 36.785 175.512 36.965 175.512 36.965 c 175.512
+ 41.715 l 176.711 41.715 l f
+175.137 42.074 3.602 0.223 re f
+170.512 41.715 m 172.184 41.715 l 172.184 36.977 l 172.184 36.977 171.516
+ 36.785 170.777 36.75 c 170.004 36.785 169.313 36.965 169.313 36.965 c 169.313
+ 41.715 l 170.512 41.715 l f
+168.938 42.074 3.605 0.223 re f
+164.313 41.715 m 165.988 41.715 l 165.988 36.977 l 165.988 36.977 165.32
+ 36.785 164.578 36.75 c 163.805 36.785 163.113 36.965 163.113 36.965 c 163.113
+ 41.715 l 164.313 41.715 l f
+162.738 42.074 3.602 0.223 re f
+158.117 41.715 m 159.785 41.715 l 159.785 36.977 l 159.785 36.977 159.121
+ 36.785 158.379 36.75 c 157.609 36.785 156.914 36.965 156.914 36.965 c 156.914
+ 41.715 l 158.117 41.715 l f
+156.539 42.074 3.605 0.223 re f
+151.918 41.715 m 153.59 41.715 l 153.59 36.977 l 153.59 36.977 152.922
+36.785 152.18 36.75 c 151.41 36.785 150.715 36.965 150.715 36.965 c 150.715
+ 41.715 l 151.918 41.715 l f
+150.34 42.074 3.602 0.223 re f
+142.887 21.813 m 145.715 29.531 l 151.07 29.531 l 147.563 21.813 l 146.879
+ 20.301 l 142.207 19.965 l 142.887 21.813 l f
+142.078 19.293 m 146.613 19.625 l 142.344 16.664 l 137.867 13.559 l 135.234
+ 11.734 l 142.078 19.293 l f
+79.848 19.41 m 79.848 19.355 l 79.672 19.227 l 79.668 19.203 79.664 19.176
+ 79.656 19.141 c 79.566 18.824 79.73 18.563 79.859 18.418 c 80.109 18.223
+ 80.273 17.879 80.273 17.484 c 80.273 17.105 80.121 16.773 79.887 16.57
+c 79.867 16.375 79.754 16.207 79.594 16.129 c 79.594 16.117 79.594 16.102
+ 79.594 16.09 c 79.594 15.953 79.496 15.848 79.379 15.848 c 79.344 15.848
+ 79.313 15.855 79.281 15.871 c 79.211 15.91 79.16 15.992 79.16 16.09 c 79.16
+ 16.102 79.164 16.117 79.164 16.129 c 79.113 16.152 79.066 16.188 79.027
+ 16.227 c 78.895 16.332 78.871 16.508 78.867 16.57 c 78.785 16.645 78.715
+ 16.73 78.656 16.832 c 78.48 17.137 78.484 17.43 78.484 17.484 c 78.484
+17.883 78.656 18.238 78.914 18.43 c 79.105 18.645 79.125 18.914 79.105 19.086
+ c 79.051 19.055 l 76.887 17.801 l 76.879 17.605 l 76.703 17.48 l 76.699
+ 17.453 76.695 17.426 76.688 17.395 c 76.594 17.078 76.762 16.813 76.887
+ 16.668 c 77.137 16.473 77.305 16.129 77.305 15.734 c 77.305 15.355 77.152
+ 15.023 76.918 14.824 c 76.898 14.625 76.785 14.461 76.621 14.379 c 76.625
+ 14.367 76.625 14.352 76.625 14.34 c 76.625 14.203 76.527 14.098 76.406
+14.098 c 76.375 14.098 76.344 14.105 76.313 14.125 c 76.242 14.164 76.191
+ 14.246 76.191 14.34 c 76.191 14.352 76.195 14.367 76.195 14.379 c 76.145
+ 14.402 76.098 14.438 76.059 14.477 c 75.926 14.582 75.902 14.762 75.898
+ 14.824 c 75.816 14.895 75.742 14.984 75.688 15.082 c 75.512 15.387 75.512
+ 15.684 75.512 15.734 c 75.512 16.137 75.688 16.488 75.945 16.684 c 76.203
+ 16.965 76.145 17.355 76.113 17.48 c 75.93 17.605 l 75.922 17.824 l 75.855
+ 17.867 l 73.418 19.402 l 79.848 19.41 l f
+59.141 51.805 3.563 0.25 re f
+65.496 51.805 3.563 0.25 re f
+59.48 56.898 m 59.48 61.633 l 62.355 61.633 l 62.355 56.887 l 62.355 56.887
+ 61.66 56.703 60.891 56.664 c 60.152 56.703 59.48 56.898 59.48 56.898 c f
+65.84 56.898 m 65.84 61.633 l 68.715 61.633 l 68.715 56.887 l 68.715 56.887
+ 68.02 56.703 67.25 56.664 c 66.508 56.703 65.84 56.898 65.84 56.898 c f
+107.965 56.867 m 107.965 61.605 l 110.02 61.605 l 110.02 56.859 l 110.02
+ 56.859 109.523 56.676 108.973 56.637 c 108.441 56.676 107.965 56.867 107.965
+ 56.867 c f
+107.715 51.773 2.574 0.223 re f
+76.383 51.793 3.559 0.25 re f
+82.582 51.793 3.559 0.25 re f
+88.781 51.793 3.559 0.25 re f
+94.98 51.793 3.559 0.25 re f
+101.18 51.793 3.559 0.25 re f
+76.734 56.902 m 76.734 61.637 l 79.605 61.637 l 79.605 56.891 l 79.605
+56.891 78.914 56.707 78.141 56.672 c 77.402 56.707 76.734 56.902 76.734
+56.902 c f
+82.93 56.902 m 82.93 61.637 l 85.805 61.637 l 85.805 56.891 l 85.805 56.891
+ 85.113 56.707 84.34 56.672 c 83.598 56.707 82.93 56.902 82.93 56.902 c f
+89.129 56.902 m 89.129 61.637 l 92.004 61.637 l 92.004 56.891 l 92.004
+56.891 91.309 56.707 90.539 56.672 c 89.797 56.707 89.129 56.902 89.129
+56.902 c f
+95.328 56.902 m 95.328 61.637 l 98.199 61.637 l 98.199 56.891 l 98.199
+56.891 97.508 56.707 96.738 56.672 c 95.996 56.707 95.328 56.902 95.328
+56.902 c f
+101.527 56.902 m 101.527 61.637 l 104.398 61.637 l 104.398 56.891 l 104.398
+ 56.891 103.707 56.707 102.938 56.672 c 102.195 56.707 101.527 56.902 101.527
+ 56.902 c f
+117.09 34.711 m 117.625 34.711 l 117.625 34.359 l 117.625 34.359 118.309
+ 33.895 119.629 33.895 c 120.938 33.895 121.633 34.359 121.633 34.359 c
+121.633 34.711 l 122.191 34.711 l 122.191 33.895 l 122.563 33.895 l 122.563
+ 33.23 l 116.707 33.23 l 116.707 33.895 l 117.09 33.895 l 117.09 34.711
l f
-117.453 30.859 m 123.156 30.859 l 123.156 31.508 l 122.793 31.508 l 122.793
- 32.305 l 122.254 32.305 l 122.254 31.961 l 122.254 31.961 121.574 31.508
- 120.297 31.508 c 119.012 31.508 118.344 31.961 118.344 31.961 c 118.344
- 32.305 l 117.824 32.305 l 117.824 31.508 l 117.453 31.508 l 117.453 30.859
+117.738 44.023 m 119.641 43.387 l 121.617 44.023 l h
+122.465 43.836 m 119.727 42.949 l 119.668 42.93 119.605 42.93 119.547 42.949
+ c 116.813 43.867 l 116.734 43.895 116.676 43.957 116.656 44.031 c 116.641
+ 44.105 116.676 44.184 116.738 44.234 c 116.961 44.406 l 117.008 44.441
+117.066 44.461 117.125 44.461 c 117.164 44.461 l 117.164 44.816 l 117.164
+ 44.938 117.273 45.035 117.414 45.035 c 117.496 45.035 117.574 44.992 117.621
+ 44.938 c 117.648 44.902 117.664 44.859 117.664 44.816 c 117.664 44.461
+l 121.617 44.461 l 121.617 44.816 l 121.617 44.938 121.73 45.035 121.867
+ 45.035 c 122.008 45.035 122.121 44.938 122.121 44.816 c 122.121 44.461
+l 122.152 44.461 l 122.223 44.461 122.285 44.434 122.336 44.395 c 122.559
+ 44.188 l 122.617 44.133 122.641 44.059 122.621 43.988 c 122.602 43.918
+122.543 43.859 122.465 43.836 c f
+90.426 27.625 m 89.824 27.625 89.332 28.113 89.332 28.719 c 89.332 29.324
+ 89.824 29.813 90.426 29.813 c 91.031 29.813 91.52 29.324 91.52 28.719 c
+ 91.52 28.113 91.031 27.625 90.426 27.625 c f
+63.773 28.867 m 64.863 28.867 65.75 27.984 65.75 26.891 c 65.75 25.797
+64.863 24.914 63.773 24.914 c 62.68 24.914 61.797 25.797 61.797 26.891 c
+ 61.797 27.984 62.68 28.867 63.773 28.867 c f
+59.496 51.348 m 62.34 51.348 l 62.34 44.723 l 59.492 44.723 l 59.492 51.348
l f
-128 0 m 130.98 0.07 131.207 3.031 131.207 3.031 c 124.77 3.031 l 124.77
- 3.031 125 0.07 127.98 0 c 127.98 0.137 l 128 0 l f
-96.852 55.57 m 96.852 54.777 97.367 54.465 98.324 54.465 c 99.281 54.465
- 99.762 54.777 99.762 55.57 c 99.762 56.363 99.762 59.797 99.762 59.797
-c 96.852 59.797 l 96.852 59.797 96.852 56.363 96.852 55.57 c f
-129.957 42.426 m 129.957 41.879 l 126.043 41.879 l 126.043 42.426 l 125.516
- 42.426 l 125.516 41.875 l 125.168 41.875 l 125.168 41.301 l 128 40.156
-l 130.828 41.301 l 130.828 41.875 l 130.488 41.875 l 130.488 42.426 l 129.957
- 42.426 l f
-129.961 31.961 m 129.961 31.961 129.289 31.508 128 31.508 c 126.715 31.508
- 126.043 31.961 126.043 31.961 c 126.043 32.305 l 125.52 32.305 l 125.52
- 31.508 l 125.145 31.508 l 125.145 30.859 l 130.855 30.859 l 130.855 31.508
- l 130.48 31.508 l 130.48 32.305 l 129.961 32.305 l 129.961 31.961 l f
-90.57 55.57 m 90.57 54.777 91.086 54.465 92.043 54.465 c 92.996 54.465
-93.477 54.777 93.477 55.57 c 93.477 56.363 93.477 59.797 93.477 59.797 c
- 90.57 59.797 l 90.57 59.797 90.57 56.363 90.57 55.57 c f
-128.008 32.637 m 129.336 32.637 129.961 33.547 129.961 34.461 c 129.961
- 38.961 l 126.02 38.961 l 126.02 34.461 l 126.02 33.547 126.645 32.637 127.969
- 32.637 c 128.008 32.637 l f
-84.285 55.57 m 84.285 54.777 84.801 54.465 85.758 54.465 c 86.715 54.465
- 87.195 54.777 87.195 55.57 c 87.195 56.363 87.195 59.797 87.195 59.797
-c 84.285 59.797 l 84.285 59.797 84.285 56.363 84.285 55.57 c f
-78 55.57 m 78 54.777 78.52 54.465 79.477 54.465 c 80.434 54.465 80.91 54.777
- 80.91 55.57 c 80.91 56.363 80.91 59.797 80.91 59.797 c 78 59.797 l 78 59.797
- 78 56.363 78 55.57 c f
-103.133 55.57 m 103.133 54.777 103.652 54.465 104.609 54.465 c 105.563
-54.465 106.043 54.777 106.043 55.57 c 106.043 56.363 106.043 59.797 106.043
- 59.797 c 103.133 59.797 l 103.133 59.797 103.133 56.363 103.133 55.57 c
- f
-96.852 35.641 m 96.852 34.836 97.367 34.52 98.324 34.52 c 99.277 34.52
-99.758 34.836 99.758 35.641 c 99.758 36.445 99.758 39.855 99.758 39.855
-c 96.852 39.855 l 96.852 39.855 96.852 36.445 96.852 35.641 c f
-90.57 35.641 m 90.57 34.836 91.086 34.52 92.043 34.52 c 92.996 34.52 93.477
- 34.836 93.477 35.641 c 93.477 36.445 93.477 39.855 93.477 39.855 c 90.57
- 39.855 l 90.57 39.855 90.57 36.445 90.57 35.641 c f
-84.285 35.641 m 84.285 34.836 84.805 34.52 85.762 34.52 c 86.715 34.52
-87.195 34.836 87.195 35.641 c 87.195 36.445 87.195 39.855 87.195 39.855
-c 84.285 39.855 l 84.285 39.855 84.285 36.445 84.285 35.641 c f
-78.004 35.641 m 78.004 34.836 78.523 34.52 79.477 34.52 c 80.434 34.52
-80.914 34.836 80.914 35.641 c 80.914 36.445 80.914 39.855 80.914 39.855
-c 78.004 39.855 l 78.004 39.855 78.004 36.445 78.004 35.641 c f
-103.133 35.641 m 103.133 34.836 103.648 34.52 104.605 34.52 c 105.559 34.52
- 106.039 34.836 106.039 35.641 c 106.039 36.445 106.039 39.855 106.039 39.855
- c 103.133 39.855 l 103.133 39.855 103.133 36.445 103.133 35.641 c f
-84.285 43.18 m 84.285 43.145 84.285 43.121 84.285 43.121 c 87.195 43.121
- l 87.195 43.121 87.195 43.145 87.195 43.18 c 87.195 48.766 l 84.285 48.766
- l 84.285 43.18 l f
-78.004 43.18 m 78.004 43.145 78.004 43.121 78.004 43.121 c 80.914 43.121
- l 80.914 43.121 80.914 43.145 80.914 43.18 c 80.914 48.766 l 78.004 48.766
- l 78.004 43.18 l f
-90.57 43.18 m 90.57 43.145 90.57 43.121 90.57 43.121 c 93.477 43.121 l
-93.477 43.121 93.477 43.145 93.477 43.18 c 93.477 48.766 l 90.57 48.766
-l 90.57 43.18 l f
-96.852 43.18 m 96.852 43.145 96.852 43.121 96.852 43.121 c 99.758 43.121
- l 99.758 43.121 99.758 43.145 99.758 43.18 c 99.758 48.766 l 96.852 48.766
- l 96.852 43.18 l f
-103.133 43.18 m 103.133 43.145 103.133 43.121 103.133 43.121 c 106.039
-43.121 l 106.039 43.121 106.039 43.145 106.039 43.18 c 106.039 48.766 l
-103.133 48.766 l 103.133 43.18 l f
-67.824 55.66 m 67.824 54.867 68.34 54.559 69.297 54.559 c 70.254 54.559
- 70.73 54.867 70.73 55.66 c 70.73 56.453 70.73 59.887 70.73 59.887 c 67.824
- 59.887 l 67.824 59.887 67.824 56.453 67.824 55.66 c f
-61.539 55.66 m 61.539 54.867 62.059 54.559 63.016 54.559 c 63.973 54.559
- 64.453 54.867 64.453 55.66 c 64.453 56.453 64.453 59.887 64.453 59.887
-c 61.539 59.887 l 61.539 59.887 61.539 56.453 61.539 55.66 c f
-69.297 34.559 m 70.254 34.559 70.73 34.867 70.73 35.664 c 70.73 36.457
-70.73 39.813 70.73 39.813 c 67.824 39.813 l 67.824 39.813 67.824 36.457
-67.824 35.664 c 67.824 34.867 68.34 34.559 69.297 34.559 c f
-63.016 34.559 m 63.973 34.559 64.453 34.867 64.453 35.664 c 64.453 36.457
- 64.453 39.813 64.453 39.813 c 61.539 39.813 l 61.539 39.813 61.539 36.457
- 61.539 35.664 c 61.539 34.867 62.059 34.559 63.016 34.559 c f
-70.73 43.18 m 70.73 48.766 l 67.824 48.766 l 67.824 43.18 l 67.824 43.145
- 67.824 43.121 67.824 43.121 c 70.73 43.121 l 70.73 43.121 70.73 43.145
-70.73 43.18 c f
-64.453 43.18 m 64.453 48.766 l 61.539 48.766 l 61.539 43.18 l 61.539 43.145
- 61.539 43.121 61.539 43.121 c 64.453 43.121 l 64.453 43.121 64.453 43.145
- 64.453 43.18 c f
-106.418 28.539 m 106.418 31.504 l 78.883 31.504 l 69.773 21.383 l 73.844
- 18.605 l 109.402 18.574 l 104.672 28.539 l 106.418 28.539 l f
-68.543 21 m 66.688 22.27 l 66.02 22.195 65.145 22.211 64.172 22.926 c 63.406
- 23.484 63.031 24.242 62.855 24.867 c 53.672 31.102 l 53.977 31.52 l 54.418
- 31.523 l 77.902 31.523 l h
-66.199 23.074 m 67.32 23.055 68.715 23.949 68.816 25.496 c 68.848 25.941
- 68.77 26.141 68.68 26.457 c 68.551 26.902 68.672 27.266 68.918 27.566 c
- 69.219 27.93 69.496 28.242 70.707 28.242 c 72.324 28.25 l 72.324 29.758
- l 60.102 29.758 l 60.102 28.25 l 61.723 28.242 l 62.934 28.242 63.211 27.93
- 63.512 27.566 c 63.754 27.266 63.875 26.902 63.75 26.457 c 63.656 26.141
- 63.582 25.941 63.609 25.496 c 63.711 23.949 65.078 23.055 66.199 23.074
+65.852 44.723 2.852 6.625 re f
+125.133 41.57 4.852 0.285 re f
+117.754 35.133 m 117.754 41.227 l 121.563 41.227 l 121.563 35.121 l 121.563
+ 35.121 120.645 34.887 119.621 34.84 c 119.621 34.836 l 118.641 34.887 117.754
+ 35.133 117.754 35.133 c f
+117.293 41.57 4.773 0.285 re f
+61.383 41.715 m 62.355 41.715 l 62.355 36.965 l 62.355 36.965 61.66 36.785
+ 60.891 36.75 c 60.148 36.785 59.48 36.977 59.48 36.977 c 59.48 41.715 l
+ 61.383 41.715 l f
+59.129 42.074 3.602 0.223 re f
+65.84 41.715 m 68.715 41.715 l 68.715 36.965 l 68.715 36.965 68.02 36.785
+ 67.25 36.75 c 66.508 36.785 65.84 36.977 65.84 36.977 c 65.84 41.715 l f
+65.488 42.074 3.602 0.223 re f
+107.715 34.684 m 107.965 34.684 l 107.965 34.332 l 107.965 34.332 108.281
+ 33.867 108.891 33.867 c 109.496 33.867 109.82 34.332 109.82 34.332 c 109.82
+ 34.684 l 110.078 34.684 l 110.078 33.867 l 110.25 33.867 l 110.25 33.203
+ l 107.539 33.203 l 107.539 33.867 l 107.715 33.867 l 107.715 34.684 l f
+108.023 35.109 m 108.023 41.199 l 109.785 41.199 l 109.785 35.098 l 109.785
+ 35.098 109.359 34.859 108.891 34.813 c 108.434 34.859 108.023 35.109 108.023
+ 35.109 c f
+107.813 41.543 2.207 0.289 re f
+108.004 49.793 m 108.004 51.297 l 109.805 51.297 l 109.805 45.25 l 109.805
+ 45.25 109.379 45.07 108.906 45.035 c 108.906 45.043 l 108.426 45.082 108
+ 45.262 108 45.262 c 108 46.547 l 108.004 46.547 l 108.004 49.793 l f
+108.887 43.387 m 109.801 44.027 l 108.004 44.027 l h
+107.734 44.461 m 107.734 44.816 l 107.734 44.938 107.789 45.035 107.852
+ 45.035 c 107.895 45.035 107.93 44.996 107.949 44.941 c 107.961 44.906 107.969
+ 44.863 107.969 44.816 c 107.969 44.461 l 109.805 44.461 l 109.805 44.816
+ l 109.805 44.938 109.855 45.035 109.918 45.035 c 109.984 45.035 110.035
+ 44.938 110.035 44.816 c 110.035 44.461 l 110.051 44.461 l 110.082 44.461
+ 110.113 44.441 110.133 44.395 c 110.238 44.191 l 110.266 44.137 110.277
+ 44.063 110.27 43.992 c 110.258 43.918 110.23 43.859 110.195 43.836 c 108.926
+ 42.953 l 108.898 42.934 108.871 42.934 108.844 42.953 c 107.574 43.867
+l 107.539 43.898 107.512 43.961 107.504 44.035 c 107.496 44.109 107.512
+44.188 107.539 44.238 c 107.645 44.406 l 107.664 44.445 107.691 44.461 107.723
+ 44.461 c 107.734 44.461 l f
+76.738 44.707 2.848 6.625 re f
+82.934 44.707 2.855 6.625 re f
+89.137 44.707 2.848 6.625 re f
+95.332 44.707 2.852 6.625 re f
+101.531 44.707 2.848 6.625 re f
+76.734 41.715 m 79.605 41.715 l 79.605 36.965 l 79.605 36.965 78.914 36.785
+ 78.141 36.75 c 77.402 36.785 76.734 36.977 76.734 36.977 c 76.734 41.715
+ l f
+76.375 42.074 3.605 0.223 re f
+84.832 41.715 m 85.805 41.715 l 85.805 36.965 l 85.805 36.965 85.113 36.785
+ 84.34 36.75 c 83.598 36.785 82.93 36.977 82.93 36.977 c 82.93 41.715 l
+84.832 41.715 l f
+82.578 42.074 3.602 0.223 re f
+89.129 41.715 m 92.004 41.715 l 92.004 36.965 l 92.004 36.965 91.309 36.785
+ 90.539 36.75 c 89.797 36.785 89.129 36.977 89.129 36.977 c 89.129 41.715
+ l f
+88.773 42.074 3.605 0.223 re f
+97.23 41.715 m 98.199 41.715 l 98.199 36.965 l 98.199 36.965 97.508 36.785
+ 96.738 36.75 c 95.996 36.785 95.328 36.977 95.328 36.977 c 95.328 41.715
+ l 97.23 41.715 l f
+94.973 42.074 3.605 0.223 re f
+103.426 41.715 m 104.402 41.715 l 104.402 39.785 l 104.398 39.785 l 104.398
+ 38.281 l 104.402 38.281 l 104.402 36.965 l 104.402 36.965 103.707 36.785
+ 102.938 36.75 c 102.195 36.785 101.527 36.977 101.527 36.977 c 101.527
+41.715 l 103.426 41.715 l f
+101.172 42.074 3.602 0.223 re f
+104.047 29.531 m 109.402 29.531 l 112.23 21.813 l 112.91 19.965 l 108.238
+ 20.301 l 107.555 21.813 l 104.047 29.531 l f
+141.344 19.965 m 113.773 19.965 l 113.09 21.813 l 110.238 29.531 l 112.789
+ 29.547 l 127.559 22.605 l 142.414 29.531 l 144.879 29.531 l 142.027 21.813
+ l 141.344 19.965 l f
+133.438 5.297 m 133.402 6.82 l 132.145 8.629 l 122.973 8.629 l 121.711
+6.82 l 121.68 5.297 l h
+124.188 3.871 m 124.203 3.785 124.324 3.703 124.512 3.633 c 125.082 3.406
+ 126.316 3.227 127.504 3.227 c 127.504 3.227 127.508 3.227 127.508 3.227
+ c 127.512 3.227 127.512 3.227 127.516 3.227 c 127.543 3.227 127.57 3.227
+ 127.602 3.227 c 127.602 3.227 127.605 3.227 127.605 3.227 c 127.605 3.227
+ 127.609 3.227 127.613 3.227 c 128.797 3.227 130.031 3.406 130.605 3.633
+ c 130.793 3.703 130.91 3.785 130.926 3.871 c 130.93 3.875 130.941 3.887
+ 130.941 3.895 c 124.172 3.895 l 124.172 3.887 124.184 3.875 124.188 3.871
c h
-66.199 23.074 m f
-121.957 3.746 m 120.613 4.535 l 120.613 8.055 l 118.754 8.543 l 118.754
- 12.035 l 121.68 10.723 l 114.832 17.934 l 141.145 17.934 l 134.297 10.723
- l 137.223 12.035 l 137.223 8.543 l 135.367 8.055 l 135.367 4.535 l 134.02
- 3.746 l h
-122.316 4.328 m 133.66 4.328 l 133.629 5.816 l 132.402 7.574 l 123.574
-7.574 l 122.348 5.816 l h
-122.59 8.301 m 133.387 8.301 l 133.387 9.734 l 122.59 9.734 l h
-121.848 8.398 m 121.848 9.941 l 119.332 10.988 l 119.332 9.02 l h
-134.133 8.398 m 136.645 9.02 l 136.645 10.988 l 134.133 9.941 l h
-134.133 8.398 m f
-109.832 33.926 m 110.383 33.926 110.645 34.727 110.645 35.527 c 110.645
- 36.332 110.645 39.227 110.645 39.227 c 109.02 39.227 l 109.02 39.227 109.02
- 36.332 109.02 35.527 c 109.02 34.727 109.281 33.926 109.832 33.926 c f
-109.832 42.742 m 110.383 42.742 110.645 43.543 110.645 44.344 c 110.645
- 45.145 110.645 48.043 110.645 48.043 c 109.02 48.043 l 109.02 48.043 109.02
- 45.145 109.02 44.344 c 109.02 43.543 109.281 42.742 109.832 42.742 c f
-109.832 54.09 m 110.383 54.09 110.645 54.887 110.645 55.691 c 110.645 56.492
- 110.645 59.387 110.645 59.387 c 109.02 59.387 l 109.02 59.387 109.02 56.492
- 109.02 55.691 c 109.02 54.887 109.281 54.09 109.832 54.09 c f
-66.168 27.188 m 65.316 27.188 64.625 26.496 64.625 25.645 c 64.625 24.789
- 65.316 24.098 66.168 24.098 c 67.023 24.098 67.719 24.789 67.719 25.645
- c 67.719 26.496 67.023 27.188 66.168 27.188 c f
-0 0.278431 0.423529 rg
-3.168 73.461 m 4.133 73.461 l 4.535 73.461 5.082 73.445 5.289 73.824 c
-5.328 73.824 l 5.328 72.445 l 5.289 72.445 l 5.133 72.52 4.926 72.52 4.719
- 72.52 c 3.168 72.52 l 3.168 70.098 l 3.582 70.023 4.039 70.012 4.496 70.012
- c 5.094 70.012 5.629 70.059 6.031 70.531 c 6.07 70.531 l 6.07 69.008 l
-6.031 69.008 l 5.863 69.098 5.641 69.07 5.422 69.07 c 1.254 69.07 l 1.254
- 69.109 l 1.918 69.359 1.84 70.309 1.84 70.906 c 1.84 75.813 l 1.84 76.402
- 1.918 77.363 1.254 77.598 c 1.254 77.637 l 6.68 77.637 l 7.27 75.93 l 7.23
- 75.93 l 6.578 76.504 5.684 76.777 4.82 76.699 c 3.168 76.543 l 3.168 73.461
- l f*
-15.129 69.152 m 14.504 68.957 13.84 68.863 13.188 68.863 c 11.598 68.863
- 9.922 69.492 9.922 71.129 c 9.922 73.887 14.398 73.523 14.398 75.555 c
-14.398 76.465 13.281 76.91 12.535 76.91 c 11.523 76.91 10.453 76.488 9.688
- 75.828 c 10.063 77.457 l 10.805 77.727 11.598 77.844 12.395 77.844 c 14.426
- 77.844 15.883 76.543 15.883 75.152 c 15.883 72.742 11.402 72.77 11.402
-70.984 c 11.402 70.086 12.34 69.801 13.086 69.801 c 13.813 69.801 14.621
- 70.098 15.129 70.621 c 15.129 69.152 l f*
-25.379 77.637 m 26.109 75.984 l 26.07 75.984 l 25.266 76.465 24.445 76.754
- 23.496 76.699 c 20.758 76.543 l 25.449 69.07 l 19.691 69.07 l 19.027 70.57
- l 19.07 70.57 l 19.746 70.125 20.211 69.957 21.02 70.012 c 23.234 70.141
- l 18.523 77.637 l 25.379 77.637 l f*
-31.875 70.012 m 33.047 70.012 l 33.477 70.012 33.996 70.074 34.164 70.531
- c 34.207 70.531 l 34.621 68.98 l 34.582 68.98 l 34.414 69.059 34.207 69.07
- 33.984 69.07 c 28.801 69.07 l 28.633 69.047 28.465 69.047 28.309 68.98
-c 28.27 68.98 l 27.816 70.531 l 27.852 70.531 l 28.258 70.152 28.844 70.012
- 29.402 70.012 c 30.547 70.012 l 30.547 75.813 l 30.547 76.402 30.625 77.348
- 29.973 77.598 c 29.973 77.637 l 32.551 77.637 l 32.551 77.598 l 31.859
-77.195 31.875 76.688 31.875 75.945 c 31.875 70.012 l f*
-38.824 73.461 m 39.789 73.461 l 40.195 73.461 40.738 73.445 40.949 73.824
- c 40.984 73.824 l 40.984 72.445 l 40.949 72.445 l 40.793 72.52 40.586 72.52
- 40.375 72.52 c 38.824 72.52 l 38.824 70.098 l 39.242 70.023 39.699 70.012
- 40.152 70.012 c 40.754 70.012 41.285 70.059 41.688 70.531 c 41.727 70.531
- l 41.727 69.008 l 41.688 69.008 l 41.52 69.098 41.301 69.07 41.078 69.07
- c 36.91 69.07 l 36.91 69.109 l 37.574 69.359 37.5 70.309 37.5 70.906 c
-37.5 75.813 l 37.5 76.402 37.574 77.363 36.91 77.598 c 36.91 77.637 l 42.34
- 77.637 l 42.926 75.93 l 42.887 75.93 l 42.234 76.504 41.34 76.777 40.477
- 76.699 c 38.824 76.543 l 38.824 73.461 l f*
-45.723 69.07 m 45.723 69.109 l 46.387 69.359 46.293 70.309 46.293 70.906
- c 46.293 75.813 l 46.293 76.402 46.387 77.363 45.723 77.598 c 45.723 77.637
- l 48.207 77.637 l 48.207 77.598 l 47.543 77.363 47.621 76.414 47.621 75.813
- c 47.621 69.984 l 47.922 69.93 48.207 69.891 48.508 69.879 c 49.379 69.84
- 50.188 70.387 50.188 71.324 c 50.188 72.547 48.977 73.027 47.934 73.184
- c 49.133 75.02 l 50.719 76.984 l 51.109 77.469 51.543 77.637 52.23 77.637
- c 53.43 77.637 l 52.684 77.168 51.867 76.488 51.316 75.813 c 49.441 73.461
- l 50.512 73.211 51.512 72.313 51.512 71.164 c 51.512 69.984 50.563 69.07
- 48.82 69.07 c 45.723 69.07 l f
-61.352 73.461 m 61.352 75.813 l 61.352 76.402 61.441 77.348 60.777 77.598
- c 60.777 77.637 l 63.266 77.637 l 63.266 77.598 l 62.602 77.348 62.676
-76.402 62.676 75.813 c 62.676 70.895 l 62.676 70.309 62.602 69.359 63.266
- 69.109 c 63.266 69.07 l 60.777 69.07 l 60.777 69.109 l 61.441 69.359 61.352
- 70.309 61.352 70.906 c 61.352 72.52 l 56.652 72.52 l 56.652 70.906 l 56.652
- 70.309 56.574 69.359 57.227 69.109 c 57.227 69.07 l 54.75 69.07 l 54.75
- 69.109 l 55.414 69.359 55.324 70.309 55.324 70.895 c 55.324 75.813 l 55.324
- 76.402 55.402 77.348 54.75 77.598 c 54.75 77.637 l 57.227 77.637 l 57.227
- 77.598 l 56.574 77.348 56.652 76.402 56.652 75.813 c 56.652 73.461 l 61.352
- 73.461 l f
-68.93 68.645 m 72.465 67.574 l 71.75 66.625 l h
-71.934 74.422 m 72.637 76.258 l 72.988 77.168 73.094 77.313 72.453 77.598
- c 72.453 77.637 l 75.125 77.637 l 75.125 77.598 l 74.379 77.223 74.148
-76.488 73.844 75.75 c 71.141 69.07 l 69.086 69.07 l 69.086 69.109 l 69.707
- 69.305 69.461 69.852 69.277 70.32 c 67.105 75.75 l 66.805 76.488 66.598
- 77.223 65.844 77.598 c 65.844 77.637 l 68.238 77.637 l 68.238 77.598 l
-67.613 77.363 67.703 76.984 67.977 76.258 c 68.652 74.422 l h
-71.555 73.461 m 68.992 73.461 l 70.281 70.18 l 71.555 73.461 l f*
-84.207 77.637 m 84.938 75.984 l 84.898 75.984 l 84.094 76.465 83.27 76.754
- 82.32 76.699 c 79.59 76.543 l 84.273 69.07 l 78.52 69.07 l 77.859 70.57
- l 77.898 70.57 l 78.574 70.125 79.043 69.957 79.848 70.012 c 82.063 70.141
- l 77.348 77.637 l 84.207 77.637 l f*
-91.434 73.887 m 94.633 69.07 l 92.355 69.07 l 92.355 69.109 l 93.082 69.465
- 92.781 70.086 92.563 70.414 c 90.949 72.832 l 88.867 69.434 l 88.695 69.164
- 88.305 69.07 87.891 69.07 c 86.703 69.07 l 87.332 69.406 87.59 69.84 87.941
- 70.414 c 90.102 73.887 l 90.102 75.813 l 90.102 76.426 90.191 77.273 89.559
- 77.598 c 89.559 77.637 l 92.094 77.637 l 92.094 77.598 l 91.434 77.117
-91.434 76.727 91.434 75.945 c 91.434 73.887 l f
-103.035 75.801 m 103.035 76.387 103.117 77.348 102.449 77.598 c 102.449
- 77.637 l 104.949 77.637 l 104.949 77.598 l 104.289 77.348 104.363 76.402
- 104.363 75.801 c 104.363 70.895 l 104.363 70.309 104.289 69.344 104.949
- 69.109 c 104.949 69.07 l 102.449 69.07 l 102.449 69.109 l 103.117 69.359
- 103.035 70.309 103.035 70.895 c h
-104.531 73.184 m 107.426 77.078 l 107.656 77.391 108.258 77.637 108.895
- 77.637 c 110.117 77.637 l 110.117 77.598 l 109.453 77.273 108.961 76.91
- 108.555 76.375 c 105.926 72.926 l 108.922 69.082 l 108.922 69.07 l 106.578
- 69.07 l 106.578 69.109 l 107.449 69.5 106.695 70.32 106.238 70.922 c 104.531
- 73.184 l f*
-114.996 68.645 m 118.535 67.574 l 117.82 66.625 l h
-118 74.422 m 118.707 76.258 l 119.059 77.168 119.16 77.313 118.523 77.598
- c 118.523 77.637 l 121.191 77.637 l 121.191 77.598 l 120.449 77.223 120.215
- 76.488 119.914 75.75 c 117.211 69.07 l 115.152 69.07 l 115.152 69.109 l
- 115.777 69.305 115.531 69.852 115.348 70.32 c 113.172 75.75 l 112.875 76.488
- 112.664 77.223 111.91 77.598 c 111.91 77.637 l 114.309 77.637 l 114.309
- 77.598 l 113.68 77.363 113.773 76.984 114.043 76.258 c 114.723 74.422 l
- h
-117.625 73.461 m 115.059 73.461 l 116.352 70.18 l 117.625 73.461 l f*
-123.809 69.07 m 123.809 69.109 l 124.473 69.359 124.379 70.309 124.379
-70.906 c 124.379 75.813 l 124.379 76.402 124.473 77.363 123.809 77.598 c
- 123.809 77.637 l 126.293 77.637 l 126.293 77.598 l 125.633 77.363 125.707
- 76.414 125.707 75.813 c 125.707 69.984 l 126.008 69.93 126.293 69.891 126.594
- 69.879 c 127.465 69.84 128.273 70.387 128.273 71.324 c 128.273 72.547 127.063
- 73.027 126.023 73.184 c 127.219 75.02 l 128.805 76.984 l 129.195 77.469
- 129.629 77.637 130.316 77.637 c 131.516 77.637 l 130.773 77.168 129.953
- 76.488 129.402 75.813 c 127.531 73.461 l 128.598 73.211 129.602 72.313
-129.602 71.164 c 129.602 69.984 128.648 69.07 126.906 69.07 c 123.809 69.07
+133.273 11.211 m 133 11.375 l 132.992 11.523 l 122.125 11.523 l 122.117
+ 11.375 l 121.844 11.211 l 121.82 11.113 121.793 10.898 121.84 10.664 c
+121.871 10.492 121.938 10.316 122.098 10.16 c 122.359 9.984 122.555 9.703
+ 122.652 9.375 c 132.469 9.375 l 132.563 9.703 132.758 9.984 133.02 10.16
+ c 133.18 10.316 133.246 10.492 133.281 10.664 c 133.328 10.898 133.297
+11.113 133.273 11.211 c h
+118.621 10.109 m 120.078 9.75 l 120.098 9.746 120.172 9.719 120.301 9.688
+ c 120.406 9.879 120.551 10.043 120.727 10.16 c 120.887 10.316 120.953 10.492
+ 120.988 10.664 c 121.035 10.898 121.004 11.113 120.98 11.211 c 120.703
+11.375 l 120.699 11.523 l 114.074 19.219 l 141.047 19.219 l 134.418 11.523
+ l 134.414 11.375 l 134.141 11.211 l 134.117 11.113 134.082 10.898 134.133
+ 10.664 c 134.164 10.492 134.23 10.316 134.391 10.16 c 134.566 10.043 134.711
+ 9.879 134.816 9.688 c 134.945 9.719 135.023 9.746 135.039 9.75 c 136.5
+10.109 l 136.5 12.102 l 137.813 12.949 l 137.813 8.977 l 136.914 8.746 l
+ 136.898 8.742 l 136.859 8.734 l 135.934 8.492 l 135.934 5.105 l 134.035
+ 3.895 l 134.008 3.879 l 131.711 3.879 l 131.711 2.75 130.684 0.902 128.941
+ 0.242 c 128.531 0.09 128.086 0 127.609 0 c 127.59 0 127.527 0 127.512 0
+ c 127.031 0 126.586 0.09 126.18 0.242 c 124.434 0.902 123.41 2.75 123.41
+ 3.879 c 121.113 3.879 l 121.082 3.895 l 119.188 5.105 l 119.188 8.492 l
+ 119.129 8.508 l 117.309 8.977 l 117.309 12.949 l 118.621 12.09 l 118.621
+ 10.109 l f
+119.883 11.734 m 117.25 13.559 l 112.77 16.664 l 108.504 19.625 l 113.035
+ 19.293 l 119.883 11.734 l f
+125.582 44.023 m 127.559 43.387 l 129.461 44.023 l h
+130.387 43.867 m 127.648 42.949 l 127.594 42.93 127.531 42.93 127.473 42.949
+ c 124.738 43.836 l 124.656 43.859 124.598 43.918 124.578 43.988 c 124.559
+ 44.063 124.582 44.137 124.641 44.188 c 124.863 44.395 l 124.914 44.438
+124.977 44.461 125.047 44.461 c 125.082 44.461 l 125.082 44.816 l 125.082
+ 44.938 125.191 45.035 125.332 45.035 c 125.469 45.035 125.582 44.938 125.582
+ 44.816 c 125.582 44.461 l 129.535 44.461 l 129.535 44.816 l 129.535 44.863
+ 129.551 44.902 129.578 44.938 c 129.625 44.996 129.703 45.035 129.789 45.035
+ c 129.926 45.035 130.039 44.938 130.039 44.816 c 130.039 44.461 l 130.07
+ 44.461 l 130.133 44.461 130.191 44.445 130.238 44.406 c 130.461 44.234
+l 130.523 44.184 130.555 44.105 130.539 44.035 c 130.523 43.957 130.465
+43.895 130.387 43.867 c f
+125.012 34.711 m 125.547 34.711 l 125.547 34.359 l 125.547 34.359 126.238
+ 33.898 127.559 33.898 c 128.879 33.898 129.57 34.359 129.57 34.359 c 129.57
+ 34.711 l 130.102 34.711 l 130.102 33.898 l 130.484 33.898 l 130.484 33.23
+ l 124.629 33.23 l 124.629 33.898 l 125.012 33.898 l 125.012 34.711 l f
+129.473 41.227 m 129.473 35.137 l 129.473 35.137 128.535 34.883 127.551
+ 34.836 c 126.57 34.883 125.645 35.137 125.645 35.137 c 125.645 41.227 l
+ 129.473 41.227 l f
+82.008 8.652 m 82.734 8.605 83.453 8.586 84.133 8.586 c 84.859 8.586 85.543
+ 8.605 86.227 8.652 c 86.18 8.527 86.168 8.414 86.168 8.242 c 86.168 8.086
+ 86.18 7.969 86.227 7.867 c 85.262 7.914 83.805 7.949 83.508 7.949 c 83.508
+ 4.867 l 84.031 4.867 84.566 4.879 85.09 4.891 c 85.371 4.902 85.668 4.926
+ 85.965 4.945 c 85.93 4.867 85.906 4.719 85.906 4.559 c 85.906 4.391 85.93
+ 4.273 85.965 4.148 c 85.363 4.219 84.09 4.23 83.508 4.23 c 83.508 1.559
+ l 84.555 1.559 84.668 1.559 85.09 1.582 c 86.156 1.641 l 86.125 1.547 86.102
+ 1.387 86.102 1.215 c 86.102 1.082 86.125 0.988 86.156 0.855 c 85.34 0.879
+ 84.59 0.922 84.066 0.922 c 83.453 0.922 82.563 0.887 82.008 0.855 c 82.086
+ 1.992 82.109 4.188 82.109 4.66 c 82.109 5.184 82.086 6.574 82.066 7.23
+c 82.055 7.711 82.031 8.176 82.008 8.652 c f
+91.445 8.813 m 92.539 8.813 93.777 8.527 94.742 8.016 c 94.719 7.699 94.707
+ 7.414 94.707 6.98 c 94.707 6.676 94.73 5.48 94.801 5.074 c 94.563 5.117
+ 94.402 5.152 94.086 5.152 c 93.785 5.152 93.527 5.105 93.277 5.074 c 93.309
+ 5.629 93.344 6.188 93.344 6.742 c 93.344 6.891 93.344 6.98 93.309 7.777
+ c 92.855 8.07 92.23 8.188 91.695 8.188 c 90.66 8.188 90.047 7.688 89.637
+ 7.152 c 89.105 6.457 88.945 5.641 88.945 4.777 c 88.945 2.629 89.957 1.375
+ 91.855 1.375 c 93.492 1.375 93.891 2.172 94.027 2.445 c 94.141 2.445 l
+94.48 1.332 l 93.574 0.922 92.754 0.762 91.82 0.762 c 88.785 0.762 87.387
+ 2.594 87.387 4.879 c 87.387 7.438 89.23 8.813 91.445 8.813 c f
+96.656 8.652 m 97.383 8.605 98.098 8.586 98.781 8.586 c 99.508 8.586 100.191
+ 8.605 100.871 8.652 c 100.828 8.527 100.816 8.414 100.816 8.242 c 100.816
+ 8.086 100.828 7.969 100.871 7.867 c 99.906 7.914 98.453 7.949 98.156 7.949
+ c 98.156 4.867 l 98.68 4.867 99.215 4.879 99.738 4.891 c 100.02 4.902 100.316
+ 4.926 100.609 4.945 c 100.578 4.867 100.555 4.719 100.555 4.559 c 100.555
+ 4.391 100.578 4.273 100.609 4.148 c 100.008 4.219 98.734 4.23 98.156 4.23
+ c 98.156 1.559 l 99.203 1.559 99.316 1.559 99.738 1.582 c 100.805 1.641
+ l 100.77 1.547 100.75 1.387 100.75 1.215 c 100.75 1.082 100.77 0.988 100.805
+ 0.855 c 99.984 0.879 99.234 0.922 98.711 0.922 c 98.098 0.922 97.211 0.887
+ 96.656 0.855 c 96.734 1.992 96.758 4.188 96.758 4.66 c 96.758 5.184 96.734
+ 6.574 96.711 7.23 c 96.699 7.711 96.68 8.176 96.656 8.652 c f
+103.934 1.469 m 104.102 1.457 104.523 1.41 104.742 1.41 c 105.117 1.41
+105.492 1.469 105.797 1.695 c 106.195 1.992 106.273 2.398 106.273 2.879
+c 106.273 3.617 105.855 4.445 104.719 4.445 c 104.422 4.445 104.148 4.422
+ 103.934 4.414 c h
+103.215 8.586 m 103.5 8.586 103.75 8.629 103.98 8.652 c 103.98 8.355 103.934
+ 6.891 103.934 6.563 c 103.934 4.945 l 104.207 4.945 l 104.82 5.813 105.523
+ 6.813 106.105 7.711 c 106.273 7.969 106.523 8.391 106.695 8.652 c 107.035
+ 8.605 107.172 8.586 107.617 8.586 c 108.027 8.586 108.313 8.621 108.629
+ 8.652 c 107.91 7.754 107.605 7.355 106.707 6.094 c 106.539 5.855 106.285
+ 5.48 106.113 5.242 c 105.797 4.785 l 106.832 4.594 107.777 3.945 107.777
+ 2.684 c 107.777 2.207 107.594 1.742 107.254 1.41 c 106.766 0.945 106.207
+ 0.855 105.469 0.855 c 105.207 0.855 103.887 0.91 103.59 0.91 c 103.012
+0.91 102.719 0.879 102.453 0.855 c 102.535 2.32 102.535 2.48 102.535 3.969
+ c 102.535 6.164 102.523 6.414 102.434 8.652 c 102.68 8.621 102.953 8.586
+ 103.215 8.586 c f
+152.742 2.129 m 152.742 4.23 l 152.742 7.223 152.723 7.469 152.605 8.563
+ c 152.801 8.551 153.141 8.496 153.402 8.496 c 153.664 8.496 153.984 8.551
+ 154.129 8.563 c 154.074 7.754 154.051 6.688 154.051 5.594 c 154.051 4.699
+ 154.063 1.809 154.176 0.844 c 154.051 0.762 l 153.824 0.91 153.098 1.332
+ 152.832 1.457 c 151.891 1.91 151.391 2.16 150.559 2.469 c 150.559 2.559
+ l 150.809 2.844 150.879 2.91 151.051 3.094 c 151.391 2.922 152.48 2.297
+ 152.742 2.129 c f
+156.418 8.48 m 156.441 8.563 l 156.656 8.527 156.801 8.496 156.996 8.496
+ c 157.234 8.496 157.418 8.527 157.609 8.563 c 158.258 7.277 158.883 6.129
+ 159.59 4.824 c 159.906 4.23 161.43 1.535 161.602 1.332 c 161.602 1.059
+l 159.668 1.059 157.328 1.059 156.488 0.969 c 156.508 1.215 156.543 1.469
+ 156.543 1.707 c 156.543 1.91 156.531 2.059 156.488 2.344 c 157.813 2.266
+ 158.168 2.266 158.68 2.266 c 160.238 2.266 l 159.773 3.137 157.383 7.117
+ 156.699 8.07 c 156.418 8.48 l f
+162.375 8.48 m 162.398 8.563 l 162.613 8.527 162.762 8.496 162.957 8.496
+ c 163.195 8.496 163.379 8.527 163.57 8.563 c 164.219 7.277 164.844 6.129
+ 165.547 4.824 c 165.867 4.23 167.391 1.535 167.563 1.332 c 167.563 1.059
+ l 165.625 1.059 163.285 1.059 162.445 0.969 c 162.469 1.215 162.5 1.469
+ 162.5 1.707 c 162.5 1.91 162.488 2.059 162.445 2.344 c 163.773 2.266 164.125
+ 2.266 164.641 2.266 c 166.195 2.266 l 165.73 3.137 163.344 7.117 162.66
+ 8.07 c 162.375 8.48 l f
+171.121 2.398 m 171.121 5.641 l 168.848 5.641 l h
+171.121 6.586 m 171.121 7.711 171.121 7.98 171.027 8.563 c 171.293 8.539
+ 171.543 8.496 171.805 8.496 c 171.996 8.496 172.18 8.527 172.441 8.563
+c 172.383 7.961 172.383 7.82 172.383 6.586 c 172.699 6.586 173.008 6.605
+ 173.348 6.617 c 173.305 6.426 173.293 6.344 173.293 6.141 c 173.293 5.914
+ 173.305 5.82 173.348 5.617 c 172.746 5.641 172.676 5.641 172.383 5.641
+c 172.383 4.641 172.418 1.719 172.449 0.969 c 172.313 1.004 172.156 1.035
+ 171.953 1.035 c 171.781 1.035 171.578 1.004 171.449 0.969 c 171.301 1.238
+ 171.246 1.32 170.734 2.039 c 169.098 4.355 l 168.836 4.73 168.586 5.117
+ 168.313 5.48 c 168.211 5.617 168.031 5.832 168.031 5.914 c 168.031 6.598
+ l 168.313 6.586 168.746 6.574 169.098 6.574 c 169.676 6.574 170.266 6.574
+ 171.121 6.586 c f
+Q q
+0 63.992 255.113 3 re W n
+q
+0 63 256 4 re W n
+ q
+0.0666667 0.247059 0.380392 rg
+0 64.801 255 1.242 re f
+ Q
+Q
+Q q
+0.0666667 0.247059 0.380392 rg
+192.387 61.992 3.602 0.223 re f
+186.027 61.992 3.602 0.223 re f
+175.137 61.996 m 175.137 62.215 l 178.738 62.215 l 178.738 61.992 l 175.137
+ 61.992 l 175.137 61.996 l f
+162.738 61.992 3.602 0.223 re f
+156.539 61.996 m 156.539 62.215 l 160.145 62.215 l 160.145 61.992 l 156.539
+ 61.992 l 156.539 61.996 l f
+150.34 61.996 m 150.34 62.215 l 153.941 62.215 l 153.941 61.992 l 150.34
+ 61.992 l 150.34 61.996 l f
+59.129 61.992 3.602 0.223 re f
+65.488 61.992 3.602 0.223 re f
+76.375 61.992 3.605 0.223 re f
+82.578 61.996 m 82.578 62.215 l 86.18 62.215 l 86.18 61.992 l 82.578 61.992
+ l 82.578 61.996 l f
+88.773 61.996 m 88.773 62.215 l 92.379 62.215 l 92.379 61.992 l 88.773
+61.992 l 88.773 61.996 l f
+94.973 61.996 m 94.973 62.215 l 98.578 62.215 l 98.578 61.992 l 94.973
+61.992 l 94.973 61.996 l f
+101.172 61.996 m 101.172 62.215 l 104.773 62.215 l 104.773 61.992 l 101.172
+ 61.992 l 101.172 61.996 l f
+107.711 61.984 2.563 0.223 re f
+144.84 61.98 2.566 0.223 re f
+168.965 61.996 m 168.965 62.215 l 172.566 62.215 l 172.566 61.992 l 168.965
+ 61.992 l 168.965 61.996 l f
+Q q
+0 85.992 255.113 1.715 re W n
+q
+0 85 256 3 re W n
+ q
+0.0666667 0.247059 0.380392 rg
+0 86.441 255.117 1.266 re f
+ Q
+Q
+Q q
+0 71.992 5.992 10 re W n
+q
+0 71 6 11 re W n
+ q
+0.0666667 0.247059 0.380392 rg
+2.043 76.105 m 2.695 76.105 4.133 76.094 4.813 76.016 c 4.773 76.156 4.746
+ 76.285 4.746 76.477 c 4.746 76.656 4.773 76.824 4.813 76.914 c 4.477 76.887
+ 4.145 76.863 3.824 76.848 c 3.234 76.836 2.633 76.824 2.043 76.824 c 2.043
+ 80.297 l 2.375 80.297 4.016 80.258 5.105 80.203 c 5.055 80.32 5.043 80.449
+ 5.043 80.629 c 5.043 80.82 5.055 80.949 5.105 81.09 c 4.336 81.039 3.566
+ 81.012 2.75 81.012 c 1.98 81.012 1.172 81.039 0.352 81.09 c 0.379 80.551
+ 0.402 80.027 0.414 79.488 c 0.441 78.746 0.465 77.184 0.465 76.594 c 0.465
+ 76.055 0.441 73.582 0.352 72.301 c 0.98 72.34 1.98 72.379 2.672 72.379
+c 3.262 72.379 4.105 72.328 5.027 72.301 c 4.988 72.453 4.965 72.559 4.965
+ 72.711 c 4.965 72.902 4.988 73.082 5.027 73.184 c 3.824 73.121 l 3.348
+73.094 3.223 73.094 2.043 73.094 c 2.043 76.105 l f
+ Q
+Q
+Q q
+0.0666667 0.247059 0.380392 rg
+6.246 79.168 m 6.836 80.449 7.477 80.641 8.23 80.641 c 9.242 80.641 9.91
+ 79.961 9.91 79.039 c 9.91 78.027 9.105 77.668 8.859 77.566 c 8.5 77.414
+ 7.898 77.184 7.539 77.027 c 6.297 76.477 5.926 75.824 5.926 74.762 c 5.926
+ 73.633 6.594 72.199 8.91 72.199 c 9.848 72.199 10.41 72.441 11.039 72.723
+ c 10.781 73.352 10.758 73.453 10.641 73.941 c 10.461 73.941 l 10.27 73.211
+ 9.59 72.824 8.785 72.824 c 7.773 72.824 7.27 73.453 7.27 74.211 c 7.27
+75.145 7.926 75.398 9.051 75.836 c 10.039 76.223 10.422 76.363 10.793 76.773
+ c 11.332 77.348 11.422 78.105 11.422 78.461 c 11.422 79.77 10.512 81.266
+ 8.168 81.266 c 7.066 81.266 6.234 80.844 5.773 80.617 c 5.988 79.949 6.004
+ 79.781 6.066 79.168 c 6.246 79.168 l f
+11.652 80.68 m 11.938 80.281 13.23 78.539 13.484 78.18 c 14.074 77.297
+16.07 74.285 16.727 73.16 c 15.293 73.16 13.766 73.172 12.191 73.301 c 12.207
+ 73.145 12.23 72.969 12.23 72.801 c 12.23 72.598 12.219 72.465 12.191 72.301
+ c 13.18 72.391 14.137 72.379 15.637 72.379 c 17.586 72.379 18.391 72.352
+ 19.098 72.301 c 19.109 72.391 19.121 72.453 19.121 72.52 c 19.121 72.621
+ 19.098 72.648 18.941 72.863 c 18.289 73.773 l 17.816 74.441 17.098 75.504
+ 16.523 76.375 c 15.395 78.066 l 14.754 79.027 14.344 79.668 14.012 80.23
+ c 15.242 80.23 l 15.832 80.23 16.895 80.203 17.609 80.141 c 18.098 80.102
+ 18.582 80.078 19.07 80.051 c 19.047 80.203 19.008 80.348 19.008 80.578
+c 19.008 80.77 19.031 80.961 19.07 81.09 c 18.684 81.074 17.855 81.012 15.355
+ 81.012 c 13.602 81.012 12.949 81.012 11.652 81.09 c 11.652 80.68 l f
+23.82 79.336 m 23.82 80.309 23.871 80.73 23.906 81.09 c 23.535 81.051 23.129
+ 81.012 22.973 81.012 c 22.754 81.012 22.563 81.039 22.102 81.09 c 22.152
+ 80.117 22.23 79.129 22.23 78.156 c 22.219 74.582 l 22.219 74.109 22.203
+ 73.66 22.191 73.16 c 21.551 73.16 l 21.434 73.16 20.207 73.184 19.555 73.25
+ c 19.59 73.094 19.617 72.93 19.617 72.773 c 19.617 72.621 19.59 72.453
+19.555 72.301 c 20.566 72.363 21.984 72.379 22.973 72.379 c 24.035 72.379
+ 25.164 72.363 26.395 72.301 c 26.355 72.52 26.328 72.684 26.328 72.785
+c 26.328 72.93 26.355 73.043 26.395 73.25 c 25.637 73.172 24.727 73.16 23.844
+ 73.16 c 23.832 73.621 23.82 74.109 23.82 74.594 c 23.82 79.336 l f
+28.816 76.105 m 29.469 76.105 30.902 76.094 31.582 76.016 c 31.543 76.156
+ 31.52 76.285 31.52 76.477 c 31.52 76.656 31.543 76.824 31.582 76.914 c
+31.25 76.887 30.914 76.863 30.594 76.848 c 30.008 76.836 29.406 76.824 28.816
+ 76.824 c 28.816 80.297 l 29.148 80.297 30.789 80.258 31.875 80.203 c 31.824
+ 80.32 31.813 80.449 31.813 80.629 c 31.813 80.82 31.824 80.949 31.875 81.09
+ c 31.109 81.039 30.34 81.012 29.52 81.012 c 28.754 81.012 27.945 81.039
+ 27.125 81.09 c 27.152 80.551 27.176 80.027 27.188 79.488 c 27.215 78.746
+ 27.238 77.184 27.238 76.594 c 27.238 76.055 27.215 73.582 27.125 72.301
+ c 27.754 72.34 28.754 72.379 29.445 72.379 c 30.035 72.379 30.879 72.328
+ 31.801 72.301 c 31.762 72.453 31.738 72.559 31.738 72.711 c 31.738 72.902
+ 31.762 73.082 31.801 73.184 c 30.594 73.121 l 30.121 73.094 29.996 73.094
+ 28.816 73.094 c 28.816 76.105 l f
+34.75 76.309 m 34.992 76.324 35.297 76.348 35.633 76.348 c 36.914 76.348
+ 37.387 75.414 37.387 74.582 c 37.387 74.043 37.297 73.582 36.848 73.25
+c 36.504 72.992 36.082 72.93 35.656 72.93 c 35.414 72.93 34.941 72.98 34.75
+ 72.992 c h
+37.207 77.246 m 37.398 77.516 37.684 77.938 37.875 78.207 c 38.887 79.629
+ 39.23 80.078 40.039 81.09 c 39.68 81.051 39.359 81.012 38.898 81.012 c
+38.398 81.012 38.246 81.039 37.859 81.09 c 37.668 80.793 37.387 80.32 37.195
+ 80.027 c 36.543 79.016 35.746 77.887 35.055 76.914 c 34.75 76.914 l 34.75
+ 78.73 l 34.75 79.102 34.801 80.754 34.801 81.09 c 34.543 81.063 34.262
+81.012 33.941 81.012 c 33.645 81.012 33.34 81.051 33.055 81.09 c 33.16 78.566
+ 33.172 78.281 33.172 75.813 c 33.172 74.133 33.172 73.953 33.082 72.301
+ c 33.375 72.328 33.711 72.363 34.363 72.363 c 34.695 72.363 36.184 72.301
+ 36.477 72.301 c 37.309 72.301 37.938 72.402 38.488 72.93 c 38.871 73.301
+ 39.078 73.824 39.078 74.363 c 39.078 75.785 38.016 76.516 36.848 76.734
+ c 37.207 77.246 l f
+46.508 76.773 m 45.816 76.746 45.125 76.719 44.434 76.719 c 43.703 76.719
+ 42.973 76.746 42.242 76.773 c 42.242 78.055 l 42.242 79.707 42.293 80.281
+ 42.355 81.09 c 42.168 81.074 41.832 81.012 41.477 81.012 c 41.168 81.012
+ 40.871 81.063 40.566 81.09 c 40.668 79.141 40.68 77.207 40.68 75.262 c
+40.68 74.262 40.641 73.289 40.551 72.301 c 40.809 72.328 41.27 72.379 41.477
+ 72.379 c 41.719 72.379 42.191 72.328 42.355 72.301 c 42.293 73.004 42.242
+ 73.555 42.242 75.953 c 42.883 75.977 43.535 76.004 44.176 76.004 c 44.957
+ 76.004 45.727 75.977 46.508 75.953 c 46.508 75.617 46.496 74.066 46.484
+ 73.746 c 46.484 73.352 46.469 73.25 46.418 72.301 c 46.664 72.328 47.074
+ 72.379 47.355 72.379 c 47.586 72.379 48.008 72.328 48.254 72.301 c 48.086
+ 73.633 48.07 76.734 48.07 78.066 c 48.07 79.078 48.07 80.168 48.199 81.09
+ c 47.895 81.063 47.574 81.012 47.266 81.012 c 46.996 81.012 46.664 81.063
+ 46.395 81.09 c 46.406 80.859 46.496 79.309 46.496 78.836 c 46.508 76.773
+ l f
+52.531 71.738 m 51.879 71.738 l 53.684 69.789 l 53.852 69.609 54.066 69.445
+ 54.301 69.445 c 54.621 69.445 54.902 69.648 54.902 69.969 c 54.902 70.25
+ 54.723 70.379 54.633 70.441 c h
+52.48 74.363 m 51.172 77.516 l 51.621 77.527 52.059 77.566 52.504 77.566
+ c 52.902 77.566 53.289 77.539 53.684 77.516 c h
+54.594 79.668 m 54.055 78.309 l 53.508 78.281 52.969 78.258 52.414 78.258
+ c 51.902 78.258 51.391 78.281 50.879 78.309 c 50.469 79.293 50.059 80.359
+ 49.855 81.09 c 49.688 81.063 49.445 81.012 49.238 81.012 c 49.023 81.012
+ 48.844 81.063 48.664 81.09 c 50.148 77.785 l 51.441 74.891 52.184 73.223
+ 52.492 72.172 c 52.633 72.211 52.762 72.238 52.918 72.238 c 53.055 72.238
+ 53.188 72.211 53.324 72.172 c 53.941 73.93 54.707 75.719 55.172 76.797
+c 55.656 77.91 56.504 79.848 57.082 81.09 c 56.887 81.074 56.441 81.012
+56.078 81.012 c 55.723 81.012 55.363 81.074 55.133 81.09 c 54.594 79.668
l f
-137.59 68.852 m 134.855 68.824 132.707 70.855 132.707 73.328 c 132.707
-75.996 134.883 77.844 137.461 77.844 c 140.051 77.844 142.25 75.918 142.25
- 73.266 c 142.25 70.922 140.324 68.875 137.59 68.852 c h
-137.5 69.789 m 139.555 69.789 140.77 71.621 140.77 73.523 c 140.77 75.461
- 139.5 76.91 137.527 76.91 c 135.48 76.91 134.195 75.035 134.195 73.211
-c 134.195 71.246 135.48 69.789 137.5 69.789 c f*
-147.117 76.582 m 147.117 70.906 l 147.117 70.32 147.027 69.359 147.691
-69.109 c 147.691 69.07 l 145.203 69.07 l 145.203 69.109 l 145.867 69.359
- 145.789 70.309 145.789 70.906 c 145.789 75.813 l 145.789 76.402 145.867
- 77.363 145.203 77.598 c 145.203 77.637 l 150.555 77.637 l 151.23 75.906
- l 151.191 75.906 l 150.539 76.453 149.773 76.754 148.887 76.703 c 147.117
- 76.582 l f*
-157.801 73.887 m 161.004 69.07 l 158.723 69.07 l 158.723 69.109 l 159.453
- 69.465 159.156 70.086 158.93 70.414 c 157.32 72.832 l 155.238 69.434 l
-155.066 69.164 154.676 69.07 154.258 69.07 c 153.074 69.07 l 153.699 69.406
- 153.961 69.84 154.313 70.414 c 156.473 73.887 l 156.473 75.813 l 156.473
- 76.426 156.566 77.273 155.926 77.598 c 155.926 77.637 l 158.465 77.637
-l 158.465 77.598 l 157.801 77.117 157.801 76.727 157.801 75.945 c 157.801
- 73.887 l f
-174.781 77.637 m 176.695 77.637 l 176.695 77.598 l 176.031 77.348 176.113
- 76.402 176.113 75.813 c 176.113 70.906 l 176.113 70.309 176.031 69.359
-176.695 69.109 c 176.684 69.07 l 174.211 69.07 l 174.211 69.109 l 174.859
- 69.359 174.781 70.309 174.781 70.895 c 174.781 74.813 l 174.781 75.281
-174.793 75.605 174.508 75.996 c 174.078 76.609 173.34 76.91 172.605 76.91
- c 171.266 76.91 170.539 76.102 170.539 74.371 c 170.539 70.895 l 170.539
- 70.309 170.461 69.359 171.113 69.109 c 171.113 69.07 l 168.637 69.07 l
-168.637 69.109 l 169.301 69.359 169.211 70.309 169.211 70.895 c 169.211
-74.371 l 169.211 75.305 169.184 76.18 169.875 76.934 c 170.461 77.574 171.371
- 77.844 172.23 77.844 c 173.141 77.844 174.211 77.531 174.781 76.777 c 174.781
- 77.637 l f*
-181.316 70.906 m 185.781 76.57 l 186.363 77.313 186.754 77.742 187.68 78.051
- c 187.68 70.75 l 187.68 70.023 187.68 69.5 188.359 69.109 c 188.359 69.07
- l 186.066 69.07 l 186.066 69.109 l 186.754 69.5 186.742 70.023 186.742
-70.75 c 186.742 75.688 l 181.98 69.672 l 181.797 69.41 l 181.707 69.305
-181.656 69.238 181.602 69.082 c 181.602 69.07 l 179.699 69.07 l 179.699
-69.109 l 180.379 69.5 180.379 70.023 180.379 70.75 c 180.379 75.945 l 180.379
- 76.672 180.379 77.195 179.688 77.598 c 179.688 77.637 l 181.992 77.637
-l 181.992 77.598 l 181.305 77.195 181.316 76.672 181.316 75.945 c 181.316
- 70.906 l f
-191.77 75.813 m 191.77 76.402 191.844 77.363 191.195 77.598 c 191.195 77.637
- l 193.668 77.637 l 193.668 77.598 l 193.02 77.348 193.094 76.402 193.094
- 75.813 c 193.094 70.906 l 193.094 70.32 193.02 69.359 193.668 69.109 c
-193.668 69.07 l 191.195 69.07 l 191.195 69.109 l 191.855 69.359 191.77 70.309
- 191.77 70.906 c 191.77 75.813 l f
-200.277 76.102 m 198.207 70.438 l 198.102 70.152 197.832 69.516 197.855
- 69.227 c 197.871 69.07 l 195.969 69.07 l 195.969 69.109 l 196.539 69.555
- 196.738 70.309 196.984 70.973 c 198.949 76.297 l 199.328 77.324 199.625
- 77.43 200.539 78.027 c 203.973 69.07 l 202.035 69.07 l 202.035 69.109 l
- 202.84 69.434 202.398 70.508 202.047 71.43 c 200.277 76.102 l f
-208.527 73.461 m 209.492 73.461 l 209.895 73.461 210.441 73.445 210.652
- 73.824 c 210.691 73.824 l 210.691 72.445 l 210.652 72.445 l 210.492 72.52
- 210.285 72.52 210.078 72.52 c 208.527 72.52 l 208.527 70.098 l 208.945
-70.023 209.398 70.012 209.855 70.012 c 210.453 70.012 210.988 70.059 211.391
- 70.531 c 211.43 70.531 l 211.43 69.008 l 211.391 69.008 l 211.223 69.098
- 211.004 69.07 210.781 69.07 c 206.613 69.07 l 206.613 69.109 l 207.277
-69.359 207.199 70.309 207.199 70.906 c 207.199 75.813 l 207.199 76.402 207.277
- 77.363 206.613 77.598 c 206.613 77.637 l 212.043 77.637 l 212.629 75.93
- l 212.59 75.93 l 211.938 76.504 211.043 76.777 210.184 76.699 c 208.527
- 76.543 l 208.527 73.461 l f*
-215.422 69.07 m 215.422 69.109 l 216.086 69.359 216 70.309 216 70.906 c
- 216 75.813 l 216 76.402 216.086 77.363 215.422 77.598 c 215.422 77.637
-l 217.91 77.637 l 217.91 77.598 l 217.246 77.363 217.324 76.414 217.324
-75.813 c 217.324 69.984 l 217.621 69.93 217.91 69.891 218.211 69.879 c 219.082
- 69.84 219.887 70.387 219.887 71.324 c 219.887 72.547 218.676 73.027 217.637
- 73.184 c 218.832 75.02 l 220.422 76.984 l 220.813 77.469 221.242 77.637
- 221.934 77.637 c 223.129 77.637 l 222.387 77.168 221.566 76.488 221.023
- 75.813 c 219.148 73.461 l 220.215 73.211 221.215 72.313 221.215 71.164
-c 221.215 69.984 220.266 69.07 218.52 69.07 c 215.422 69.07 l f
-229.598 69.152 m 228.969 68.957 228.305 68.863 227.656 68.863 c 226.066
- 68.863 224.391 69.492 224.391 71.129 c 224.391 73.887 228.867 73.523 228.867
- 75.555 c 228.867 76.465 227.746 76.91 227.008 76.91 c 225.992 76.91 224.922
- 76.488 224.152 75.828 c 224.531 77.457 l 225.277 77.727 226.066 77.844
-226.863 77.844 c 228.895 77.844 230.352 76.543 230.352 75.152 c 230.352
-72.742 225.871 72.77 225.871 70.984 c 225.871 70.086 226.813 69.801 227.551
- 69.801 c 228.281 69.801 229.09 70.098 229.598 70.621 c 229.598 69.152 l
- f*
-233.926 75.813 m 233.926 76.402 234.008 77.363 233.355 77.598 c 233.355
- 77.637 l 235.828 77.637 l 235.828 77.598 l 235.18 77.348 235.254 76.402
- 235.254 75.813 c 235.254 70.906 l 235.254 70.32 235.18 69.359 235.828 69.109
- c 235.828 69.07 l 233.355 69.07 l 233.355 69.109 l 234.02 69.359 233.926
- 70.309 233.926 70.906 c 233.926 75.813 l f
-241.918 70.012 m 243.09 70.012 l 243.516 70.012 244.039 70.074 244.207
-70.531 c 244.246 70.531 l 244.664 68.98 l 244.625 68.98 l 244.457 69.059
- 244.246 69.07 244.027 69.07 c 238.844 69.07 l 238.676 69.047 238.508 69.047
- 238.352 68.98 c 238.313 68.98 l 237.855 70.531 l 237.895 70.531 l 238.297
- 70.152 238.883 70.012 239.445 70.012 c 240.59 70.012 l 240.59 75.813 l
-240.59 76.402 240.668 77.348 240.016 77.598 c 240.016 77.637 l 242.594 77.637
- l 242.594 77.598 l 241.906 77.195 241.918 76.688 241.918 75.945 c 241.918
- 70.012 l f*
-250.719 73.887 m 253.918 69.07 l 251.641 69.07 l 251.641 69.109 l 252.371
- 69.465 252.074 70.086 251.852 70.414 c 250.234 72.832 l 248.152 69.434
-l 247.984 69.164 247.594 69.07 247.176 69.07 c 245.992 69.07 l 246.617 69.406
- 246.879 69.84 247.23 70.414 c 249.387 73.887 l 249.387 75.813 l 249.387
- 76.426 249.48 77.273 248.844 77.598 c 248.844 77.637 l 251.383 77.637 l
- 251.383 77.598 l 250.719 77.117 250.719 76.727 250.719 75.945 c 250.719
- 73.887 l f
-0 83.285 255.117 1.027 re f
-0 62.398 255.117 1.023 re f
+57.457 80.68 m 57.738 80.281 59.035 78.539 59.289 78.18 c 59.879 77.297
+ 61.879 74.285 62.531 73.16 c 61.098 73.16 59.574 73.172 57.996 73.301 c
+ 58.008 73.145 58.035 72.969 58.035 72.801 c 58.035 72.598 58.023 72.465
+ 57.996 72.301 c 58.984 72.391 59.945 72.379 61.445 72.379 c 63.391 72.379
+ 64.195 72.352 64.902 72.301 c 64.914 72.391 64.926 72.453 64.926 72.52
+c 64.926 72.621 64.902 72.648 64.75 72.863 c 64.094 73.773 l 63.621 74.441
+ 62.902 75.504 62.324 76.375 c 61.199 78.066 l 60.559 79.027 60.148 79.668
+ 59.816 80.23 c 61.043 80.23 l 61.633 80.23 62.695 80.203 63.418 80.141
+c 63.902 80.102 64.391 80.078 64.875 80.051 c 64.852 80.203 64.813 80.348
+ 64.813 80.578 c 64.813 80.77 64.836 80.961 64.875 81.09 c 64.492 81.074
+ 63.656 81.012 61.16 81.012 c 59.406 81.012 58.75 81.012 57.457 81.09 c
+57.457 80.68 l f
+69.828 78.129 m 69.828 79.207 69.867 79.898 69.918 81.09 c 69.621 81.063
+ 69.328 81.012 69.031 81.012 c 68.777 81.012 68.418 81.063 68.176 81.09
+c 68.215 80.09 68.254 78.41 68.254 77.617 c 67.496 76.309 l 66.844 75.184
+ 65.754 73.414 65.086 72.301 c 65.563 72.352 65.855 72.379 66.137 72.379
+ c 66.445 72.379 66.816 72.363 67.191 72.301 c 67.855 73.711 68.34 74.723
+ 69.43 76.629 c 70.52 74.762 70.723 74.324 71.645 72.301 c 71.852 72.34
+72.109 72.379 72.391 72.379 c 72.645 72.379 72.789 72.352 72.926 72.301
+c 72.738 72.648 71.801 74.133 71.609 74.441 c 71.031 75.363 70.531 76.324
+ 69.992 77.246 c 69.906 77.398 69.828 77.539 69.828 77.656 c 69.828 78.129
+ l f
+76.184 72.301 m 76.477 72.328 76.813 72.379 77.082 72.379 c 77.359 72.379
+ 77.68 72.34 77.977 72.301 c 77.887 72.93 77.887 73.863 77.875 74.324 c
+77.863 74.965 77.863 75.695 77.863 76.363 c 78.809 75.531 79.324 74.992
+80.051 74.195 c 80.617 73.582 81.309 72.84 81.691 72.301 c 81.832 72.352
+ 82.074 72.379 82.293 72.379 c 82.512 72.379 82.77 72.363 83.152 72.301
+c 82.5 72.852 81.602 73.711 81.063 74.234 c 80.422 74.863 80.219 75.055
+79.281 76.082 c 79.965 76.977 l 80.617 77.836 82.461 80.27 83.355 81.09
+c 82.754 81.012 82.461 81.012 82.219 81.012 c 81.91 81.012 81.5 81.063 81.129
+ 81.09 c 80.219 79.809 79.219 78.398 77.863 76.898 c 77.863 78.309 77.863
+ 79.73 77.977 81.09 c 77.758 81.074 77.387 81.012 77.082 81.012 c 76.813
+ 81.012 76.453 81.074 76.184 81.09 c 76.297 78.922 76.297 78.781 76.297
+75.262 c 76.297 73.797 76.285 73.582 76.184 72.301 c f
+87.465 71.738 m 86.809 71.738 l 88.617 69.789 l 88.785 69.609 89 69.445
+ 89.234 69.445 c 89.551 69.445 89.836 69.648 89.836 69.969 c 89.836 70.25
+ 89.656 70.379 89.566 70.441 c h
+87.414 74.363 m 86.105 77.516 l 86.555 77.527 86.992 77.566 87.438 77.566
+ c 87.836 77.566 88.219 77.539 88.617 77.516 c h
+89.527 79.668 m 88.988 78.309 l 88.438 78.281 87.898 78.258 87.348 78.258
+ c 86.836 78.258 86.324 78.281 85.813 78.309 c 85.402 79.293 84.992 80.359
+ 84.785 81.09 c 84.621 81.063 84.379 81.012 84.172 81.012 c 83.953 81.012
+ 83.773 81.063 83.594 81.09 c 85.082 77.785 l 86.375 74.891 87.117 73.223
+ 87.426 72.172 c 87.566 72.211 87.695 72.238 87.848 72.238 c 87.988 72.238
+ 88.117 72.211 88.258 72.172 c 88.871 73.93 89.641 75.719 90.102 76.797
+c 90.59 77.91 91.434 79.848 92.012 81.09 c 91.82 81.074 91.371 81.012 91.012
+ 81.012 c 90.652 81.012 90.297 81.074 90.063 81.09 c 89.527 79.668 l f
+94.242 76.309 m 94.484 76.324 94.793 76.348 95.125 76.348 c 96.406 76.348
+ 96.883 75.414 96.883 74.582 c 96.883 74.043 96.793 73.582 96.344 73.25
+c 95.996 72.992 95.574 72.93 95.152 72.93 c 94.91 72.93 94.434 72.98 94.242
+ 72.992 c h
+96.703 77.246 m 96.895 77.516 97.176 77.938 97.367 78.207 c 98.379 79.629
+ 98.727 80.078 99.535 81.09 c 99.176 81.051 98.855 81.012 98.395 81.012
+c 97.895 81.012 97.742 81.039 97.355 81.09 c 97.164 80.793 96.883 80.32
+96.688 80.027 c 96.035 79.016 95.242 77.887 94.551 76.914 c 94.242 76.914
+ l 94.242 78.73 l 94.242 79.102 94.293 80.754 94.293 81.09 c 94.039 81.063
+ 93.754 81.012 93.434 81.012 c 93.141 81.012 92.832 81.051 92.551 81.09
+c 92.656 78.566 92.668 78.281 92.668 75.813 c 92.668 74.133 92.668 73.953
+ 92.578 72.301 c 92.871 72.328 93.207 72.363 93.859 72.363 c 94.191 72.363
+ 95.676 72.301 95.973 72.301 c 96.805 72.301 97.434 72.402 97.984 72.93
+c 98.367 73.301 98.574 73.824 98.574 74.363 c 98.574 75.785 97.508 76.516
+ 96.344 76.734 c 96.703 77.246 l f
+104.336 80.617 m 106.516 80.617 107.363 78.566 107.363 76.734 c 107.363
+ 74.645 106.578 72.852 104.336 72.852 c 102.137 72.852 101.316 74.977 101.316
+ 76.734 c 101.316 78.641 102.137 80.617 104.336 80.617 c h
+109.117 76.578 m 109.117 79.438 107.184 81.266 104.336 81.266 c 101.672
+ 81.266 99.563 79.691 99.563 76.887 c 99.563 73.633 101.789 72.199 104.375
+ 72.199 c 106.773 72.199 109.117 73.504 109.117 76.578 c f
+110.477 75.797 m 110.477 75.234 110.477 75.105 110.438 73.965 c 110.426
+ 73.695 110.398 72.543 110.387 72.301 c 110.707 72.363 110.953 72.379 111.273
+ 72.379 c 111.59 72.379 111.848 72.352 112.168 72.301 c 112.078 74.234 112.039
+ 75.848 112.039 77.824 c 112.039 78.719 112.066 79.551 112.078 80.258 c
+112.309 80.258 l 112.68 80.258 114.527 80.258 115.281 80.141 c 115.242 80.281
+ 115.219 80.359 115.219 80.652 c 115.219 80.844 115.23 80.922 115.281 81.09
+ c 114.629 81.063 113.523 81.012 112.832 81.012 c 112.016 81.012 111.324
+ 81.039 110.387 81.09 c 110.387 80.883 110.477 77.91 110.477 77.59 c 110.477
+ 75.797 l f
+118.664 78.129 m 118.664 79.207 118.703 79.898 118.754 81.09 c 118.457
+81.063 118.164 81.012 117.867 81.012 c 117.613 81.012 117.254 81.063 117.012
+ 81.09 c 117.051 80.09 117.09 78.41 117.09 77.617 c 116.332 76.309 l 115.68
+ 75.184 114.59 73.414 113.922 72.301 c 114.398 72.352 114.691 72.379 114.973
+ 72.379 c 115.281 72.379 115.652 72.363 116.023 72.301 c 116.691 73.711
+117.176 74.723 118.266 76.629 c 119.355 74.762 119.559 74.324 120.48 72.301
+ c 120.688 72.34 120.945 72.379 121.227 72.379 c 121.48 72.379 121.625 72.352
+ 121.762 72.301 c 121.57 72.648 120.637 74.133 120.445 74.441 c 119.867
+75.363 119.367 76.324 118.828 77.246 c 118.742 77.398 118.664 77.539 118.664
+ 77.656 c 118.664 78.129 l f
+132.258 74.094 m 132.129 74.094 l 131.973 73.789 131.527 72.891 129.68
+72.891 c 127.543 72.891 126.402 74.301 126.402 76.719 c 126.402 77.168 126.402
+ 78.359 127.184 79.398 c 127.645 80 128.336 80.563 129.504 80.563 c 131.078
+ 80.563 131.887 79.781 132.461 79.102 c 132.605 79.191 l 132.461 80.461
+l 131.488 81 130.387 81.266 129.223 81.266 c 126.723 81.266 124.648 79.719
+ 124.648 76.836 c 124.648 74.262 126.223 72.199 129.645 72.199 c 130.691
+ 72.199 131.617 72.379 132.641 72.84 c 132.258 74.094 l f
+136.707 74.363 m 135.402 77.516 l 135.852 77.527 136.285 77.566 136.734
+ 77.566 c 137.133 77.566 137.516 77.539 137.914 77.516 c h
+138.824 79.668 m 138.285 78.309 l 137.734 78.281 137.195 78.258 136.648
+ 78.258 c 136.133 78.258 135.621 78.281 135.109 78.309 c 134.699 79.293
+134.289 80.359 134.082 81.09 c 133.918 81.063 133.672 81.012 133.469 81.012
+ c 133.25 81.012 133.074 81.063 132.895 81.09 c 134.379 77.785 l 135.672
+ 74.891 136.414 73.223 136.723 72.172 c 136.863 72.211 136.992 72.238 137.145
+ 72.238 c 137.285 72.238 137.414 72.211 137.555 72.172 c 138.172 73.93 138.941
+ 75.719 139.402 76.797 c 139.887 77.91 140.734 79.848 141.309 81.09 c 141.117
+ 81.074 140.668 81.012 140.309 81.012 c 139.953 81.012 139.594 81.074 139.363
+ 81.09 c 138.824 79.668 l f
+144.219 79.336 m 144.219 80.309 144.27 80.73 144.309 81.09 c 143.934 81.051
+ 143.527 81.012 143.375 81.012 c 143.156 81.012 142.961 81.039 142.5 81.09
+ c 142.551 80.117 142.629 79.129 142.629 78.156 c 142.617 74.582 l 142.617
+ 74.109 142.602 73.66 142.59 73.16 c 141.949 73.16 l 141.836 73.16 140.605
+ 73.184 139.953 73.25 c 139.988 73.094 140.016 72.93 140.016 72.773 c 140.016
+ 72.621 139.988 72.453 139.953 72.301 c 140.965 72.363 142.387 72.379 143.375
+ 72.379 c 144.438 72.379 145.566 72.363 146.793 72.301 c 146.754 72.52 146.73
+ 72.684 146.73 72.785 c 146.73 72.93 146.754 73.043 146.793 73.25 c 146.039
+ 73.172 145.129 73.16 144.242 73.16 c 144.23 73.621 144.219 74.109 144.219
+ 74.594 c 144.219 79.336 l f
+153.457 76.773 m 152.766 76.746 152.07 76.719 151.379 76.719 c 150.652
+76.719 149.918 76.746 149.191 76.773 c 149.191 78.055 l 149.191 79.707 149.242
+ 80.281 149.305 81.09 c 149.113 81.074 148.781 81.012 148.422 81.012 c 148.113
+ 81.012 147.82 81.063 147.512 81.09 c 147.613 79.141 147.625 77.207 147.625
+ 75.262 c 147.625 74.262 147.59 73.289 147.5 72.301 c 147.754 72.328 148.215
+ 72.379 148.422 72.379 c 148.664 72.379 149.137 72.328 149.305 72.301 c
+149.242 73.004 149.191 73.555 149.191 75.953 c 149.832 75.977 150.484 76.004
+ 151.125 76.004 c 151.906 76.004 152.676 75.977 153.457 75.953 c 153.457
+ 75.617 153.441 74.066 153.43 73.746 c 153.43 73.352 153.418 73.25 153.367
+ 72.301 c 153.609 72.328 154.02 72.379 154.301 72.379 c 154.531 72.379 154.953
+ 72.328 155.199 72.301 c 155.031 73.633 155.02 76.734 155.02 78.066 c 155.02
+ 79.078 155.02 80.168 155.148 81.09 c 154.84 81.063 154.52 81.012 154.211
+ 81.012 c 153.941 81.012 153.609 81.063 153.34 81.09 c 153.352 80.859 153.441
+ 79.309 153.441 78.836 c 153.457 76.773 l f
+161.133 80.617 m 163.309 80.617 164.156 78.566 164.156 76.734 c 164.156
+ 74.645 163.375 72.852 161.133 72.852 c 158.93 72.852 158.105 74.977 158.105
+ 76.734 c 158.105 78.641 158.93 80.617 161.133 80.617 c h
+165.91 76.578 m 165.91 79.438 163.973 81.266 161.133 81.266 c 158.465 81.266
+ 156.352 79.691 156.352 76.887 c 156.352 73.633 158.582 72.199 161.168 72.199
+ c 163.566 72.199 165.91 73.504 165.91 76.578 c f
+167.27 75.797 m 167.27 75.234 167.27 75.105 167.23 73.965 c 167.219 73.695
+ 167.191 72.543 167.18 72.301 c 167.5 72.363 167.742 72.379 168.063 72.379
+ c 168.383 72.379 168.641 72.352 168.961 72.301 c 168.871 74.234 168.832
+ 75.848 168.832 77.824 c 168.832 78.719 168.855 79.551 168.871 80.258 c
+169.102 80.258 l 169.473 80.258 171.316 80.258 172.074 80.141 c 172.035
+80.281 172.008 80.359 172.008 80.652 c 172.008 80.844 172.023 80.922 172.074
+ 81.09 c 171.418 81.063 170.32 81.012 169.625 81.012 c 168.805 81.012 168.113
+ 81.039 167.18 81.09 c 167.18 80.883 167.27 77.91 167.27 77.59 c 167.27
+75.797 l f
+173.086 72.301 m 173.332 72.328 173.805 72.379 173.996 72.379 c 174.277
+ 72.379 174.598 72.34 174.906 72.301 c 174.766 73.25 174.766 75.465 174.766
+ 76.758 c 174.766 78.668 174.789 80.051 174.895 81.09 c 174.598 81.074 174.289
+ 81.012 173.996 81.012 c 173.715 81.012 173.355 81.074 173.074 81.09 c 173.215
+ 79.563 173.215 77.449 173.215 75.262 c 173.215 74.453 173.215 73.543 173.086
+ 72.301 c f
+183.758 74.094 m 183.629 74.094 l 183.477 73.789 183.027 72.891 181.184
+ 72.891 c 179.043 72.891 177.902 74.301 177.902 76.719 c 177.902 77.168
+177.902 78.359 178.684 79.398 c 179.148 80 179.84 80.563 181.004 80.563
+c 182.578 80.563 183.387 79.781 183.965 79.102 c 184.105 79.191 l 183.965
+ 80.461 l 182.988 81 181.887 81.266 180.723 81.266 c 178.223 81.266 176.148
+ 79.719 176.148 76.836 c 176.148 74.262 177.723 72.199 181.145 72.199 c
+182.195 72.199 183.117 72.379 184.141 72.84 c 183.758 74.094 l f
+189.488 73.273 m 189.445 74.25 189.445 75.477 189.445 76.578 c 189.445
+78.617 189.473 79.078 189.848 79.578 c 190.219 80.078 190.91 80.359 191.805
+ 80.359 c 192.844 80.359 193.66 79.82 193.945 79.039 c 194.047 78.758 194.113
+ 78.359 194.113 77.309 c 194.113 75.645 194.098 73.965 193.996 72.301 c
+194.176 72.328 194.367 72.379 194.57 72.379 c 194.777 72.379 194.98 72.328
+ 195.176 72.301 c 195.137 72.918 l 195.074 74.016 195.035 76.656 195.008
+ 77.949 c 194.98 79.461 194.547 80.152 193.699 80.691 c 193.102 81.074 192.242
+ 81.242 191.551 81.242 c 190.012 81.242 188.164 80.754 187.883 78.77 c 187.859
+ 78.59 187.859 78.207 187.859 78.09 c 187.859 74.605 l 187.859 73.953 187.836
+ 72.953 187.793 72.301 c 188.09 72.34 188.41 72.379 188.691 72.379 c 188.973
+ 72.379 189.27 72.34 189.527 72.301 c 189.488 73.273 l f
+196.711 75.902 m 196.711 74.695 196.699 73.492 196.688 72.301 c 196.789
+ 72.313 196.891 72.328 196.992 72.328 c 197.098 72.328 197.184 72.313 197.289
+ 72.301 c 198.508 73.645 199.645 74.836 201.195 76.348 c 202.707 77.836
+l 202.949 78.066 203.066 78.156 203.348 78.387 c 203.348 75.543 l 203.348
+ 74.453 203.285 73.352 203.195 72.301 c 203.348 72.34 203.516 72.379 203.746
+ 72.379 c 203.977 72.379 204.129 72.34 204.285 72.301 c 204.168 73.852 204.141
+ 74.762 204.141 76.629 c 204.141 77.375 204.156 79.219 204.156 79.883 c
+204.156 80.168 204.168 80.832 204.168 81.152 c 204.078 81.141 203.988 81.129
+ 203.91 81.129 c 203.82 81.129 203.734 81.141 203.645 81.152 c 202.016 79.387
+ 198.863 76.246 197.504 75.004 c 197.504 76.746 197.52 77.684 197.547 79.039
+ c 197.559 79.781 197.57 79.91 197.66 81.09 c 197.52 81.074 197.262 81.012
+ 197.082 81.012 c 196.891 81.012 196.727 81.051 196.57 81.09 c 196.672 79.309
+ l 196.699 78.961 196.711 78.004 196.711 77.641 c 196.711 75.902 l f
+205.887 72.301 m 206.129 72.328 206.602 72.379 206.797 72.379 c 207.078
+ 72.379 207.398 72.34 207.707 72.301 c 207.563 73.25 207.563 75.465 207.563
+ 76.758 c 207.563 78.668 207.59 80.051 207.691 81.09 c 207.398 81.074 207.09
+ 81.012 206.797 81.012 c 206.516 81.012 206.156 81.074 205.875 81.09 c 206.012
+ 79.563 206.012 77.449 206.012 75.262 c 206.012 74.453 206.012 73.543 205.887
+ 72.301 c f
+213.254 77.797 m 213.367 77.504 214.805 73.93 215.301 72.301 c 215.582
+72.352 215.75 72.379 215.891 72.379 c 216.047 72.379 216.223 72.352 216.508
+ 72.301 c 215.941 73.414 215.176 75.195 214.676 76.375 c 214.02 77.926 213.406
+ 79.5 212.844 81.09 c 212.688 81.051 212.598 81.012 212.367 81.012 c 212.063
+ 81.012 211.957 81.051 211.777 81.09 c 211.203 79.449 211.141 79.219 210.254
+ 77.105 c 210.063 76.645 209.242 74.621 209.078 74.223 c 208.949 73.914
+208.359 72.57 208.246 72.301 c 208.551 72.363 208.961 72.379 209.281 72.379
+ c 209.578 72.379 209.91 72.34 210.23 72.301 c 210.602 73.57 210.832 74.25
+ 211.883 76.965 c 212.152 77.656 212.473 78.32 212.766 79 c 213.254 77.797
+ l f
+218.609 76.105 m 219.262 76.105 220.695 76.094 221.375 76.016 c 221.34
+76.156 221.313 76.285 221.313 76.477 c 221.313 76.656 221.34 76.824 221.375
+ 76.914 c 221.043 76.887 220.711 76.863 220.391 76.848 c 219.801 76.836
+219.199 76.824 218.609 76.824 c 218.609 80.297 l 218.941 80.297 220.582
+80.258 221.668 80.203 c 221.617 80.32 221.609 80.449 221.609 80.629 c 221.609
+ 80.82 221.617 80.949 221.668 81.09 c 220.902 81.039 220.133 81.012 219.313
+ 81.012 c 218.547 81.012 217.738 81.039 216.918 81.09 c 216.945 80.551 216.969
+ 80.027 216.98 79.488 c 217.008 78.746 217.031 77.184 217.031 76.594 c 217.031
+ 76.055 217.008 73.582 216.918 72.301 c 217.547 72.34 218.547 72.379 219.238
+ 72.379 c 219.828 72.379 220.672 72.328 221.594 72.301 c 221.555 72.453
+221.531 72.559 221.531 72.711 c 221.531 72.902 221.555 73.082 221.594 73.184
+ c 220.391 73.121 l 219.914 73.094 219.785 73.094 218.609 73.094 c 218.609
+ 76.105 l f
+224.543 76.309 m 224.785 76.324 225.094 76.348 225.426 76.348 c 226.707
+ 76.348 227.18 75.414 227.18 74.582 c 227.18 74.043 227.09 73.582 226.641
+ 73.25 c 226.297 72.992 225.875 72.93 225.453 72.93 c 225.207 72.93 224.734
+ 72.98 224.543 72.992 c h
+227 77.246 m 227.191 77.516 227.477 77.938 227.668 78.207 c 228.68 79.629
+ 229.027 80.078 229.832 81.09 c 229.473 81.051 229.152 81.012 228.691 81.012
+ c 228.191 81.012 228.039 81.039 227.656 81.09 c 227.461 80.793 227.18 80.32
+ 226.988 80.027 c 226.336 79.016 225.539 77.887 224.848 76.914 c 224.543
+ 76.914 l 224.543 78.73 l 224.543 79.102 224.594 80.754 224.594 81.09 c
+224.336 81.063 224.055 81.012 223.734 81.012 c 223.441 81.012 223.133 81.051
+ 222.852 81.09 c 222.953 78.566 222.965 78.281 222.965 75.813 c 222.965
+74.133 222.965 73.953 222.875 72.301 c 223.172 72.328 223.504 72.363 224.156
+ 72.363 c 224.488 72.363 225.977 72.301 226.27 72.301 c 227.105 72.301 227.73
+ 72.402 228.285 72.93 c 228.668 73.301 228.871 73.824 228.871 74.363 c 228.871
+ 75.785 227.809 76.516 226.641 76.734 c 227 77.246 l f
+230.953 79.168 m 231.543 80.449 232.184 80.641 232.938 80.641 c 233.949
+ 80.641 234.617 79.961 234.617 79.039 c 234.617 78.027 233.813 77.668 233.566
+ 77.566 c 233.207 77.414 232.605 77.184 232.246 77.027 c 231.004 76.477
+230.633 75.824 230.633 74.762 c 230.633 73.633 231.301 72.199 233.617 72.199
+ c 234.555 72.199 235.117 72.441 235.746 72.723 c 235.488 73.352 235.465
+ 73.453 235.348 73.941 c 235.168 73.941 l 234.977 73.211 234.297 72.824
+233.492 72.824 c 232.48 72.824 231.977 73.453 231.977 74.211 c 231.977 75.145
+ 232.633 75.398 233.762 75.836 c 234.746 76.223 235.129 76.363 235.5 76.773
+ c 236.039 77.348 236.129 78.105 236.129 78.461 c 236.129 79.77 235.219
+81.266 232.875 81.266 c 231.773 81.266 230.941 80.844 230.48 80.617 c 230.695
+ 79.949 230.711 79.781 230.777 79.168 c 230.953 79.168 l f
+237.371 72.301 m 237.617 72.328 238.09 72.379 238.281 72.379 c 238.566
+72.379 238.887 72.34 239.191 72.301 c 239.051 73.25 239.051 75.465 239.051
+ 76.758 c 239.051 78.668 239.078 80.051 239.18 81.09 c 238.887 81.074 238.578
+ 81.012 238.281 81.012 c 238 81.012 237.641 81.074 237.359 81.09 c 237.5
+ 79.563 237.5 77.449 237.5 75.262 c 237.5 74.453 237.5 73.543 237.371 72.301
+ c f
+244.148 79.336 m 244.148 80.309 244.199 80.73 244.242 81.09 c 243.867 81.051
+ 243.457 81.012 243.305 81.012 c 243.086 81.012 242.895 81.039 242.434 81.09
+ c 242.484 80.117 242.563 79.129 242.563 78.156 c 242.547 74.582 l 242.547
+ 74.109 242.535 73.66 242.523 73.16 c 241.883 73.16 l 241.766 73.16 240.539
+ 73.184 239.883 73.25 c 239.922 73.094 239.949 72.93 239.949 72.773 c 239.949
+ 72.621 239.922 72.453 239.883 72.301 c 240.895 72.363 242.32 72.379 243.305
+ 72.379 c 244.367 72.379 245.496 72.363 246.727 72.301 c 246.688 72.52 246.66
+ 72.684 246.66 72.785 c 246.66 72.93 246.688 73.043 246.727 73.25 c 245.969
+ 73.172 245.059 73.16 244.176 73.16 c 244.164 73.621 244.148 74.109 244.148
+ 74.594 c 244.148 79.336 l f
+251.867 78.129 m 251.867 79.207 251.91 79.898 251.961 81.09 c 251.664 81.063
+ 251.371 81.012 251.074 81.012 c 250.82 81.012 250.461 81.063 250.215 81.09
+ c 250.258 80.09 250.293 78.41 250.293 77.617 c 249.539 76.309 l 248.883
+ 75.184 247.797 73.414 247.129 72.301 c 247.602 72.352 247.898 72.379 248.18
+ 72.379 c 248.488 72.379 248.859 72.363 249.23 72.301 c 249.898 73.711 250.383
+ 74.723 251.473 76.629 c 252.563 74.762 252.766 74.324 253.688 72.301 c
+253.895 72.34 254.152 72.379 254.43 72.379 c 254.691 72.379 254.828 72.352
+ 254.969 72.301 c 254.777 72.648 253.84 74.133 253.648 74.441 c 253.074
+75.363 252.574 76.324 252.035 77.246 c 251.945 77.398 251.867 77.539 251.867
+ 77.656 c 251.867 78.129 l f
+ Q
+Q
+ Q
+Q
Q Q
showpage
%%Trailer
diff --git a/macros/latex/contrib/thesis-ekf/eszterhazy-logo-en.pdf b/macros/latex/contrib/thesis-ekf/eszterhazy-logo-en.pdf
index d7a2d41cdf..ce98c88951 100644
--- a/macros/latex/contrib/thesis-ekf/eszterhazy-logo-en.pdf
+++ b/macros/latex/contrib/thesis-ekf/eszterhazy-logo-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/thesis-ekf/eszterhazy-logo-hu.eps b/macros/latex/contrib/thesis-ekf/eszterhazy-logo-hu.eps
index 769f347f5d..301ac1e171 100644
--- a/macros/latex/contrib/thesis-ekf/eszterhazy-logo-hu.eps
+++ b/macros/latex/contrib/thesis-ekf/eszterhazy-logo-hu.eps
@@ -1,10 +1,10 @@
%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: cairo 1.15.10 (http://cairographics.org)
-%%CreationDate: Tue Mar 26 19:05:44 2019
+%%Creator: cairo 1.16.0 (https://cairographics.org)
+%%CreationDate: Wed Aug 11 12:26:11 2021
%%Pages: 1
%%DocumentData: Clean7Bit
%%LanguageLevel: 2
-%%BoundingBox: 0 0 256 85
+%%BoundingBox: 0 0 256 88
%%EndComments
%%BeginProlog
50 dict begin
@@ -67,537 +67,1003 @@
%%EndSetup
%%Page: 1 1
%%BeginPageSetup
-%%PageBoundingBox: 0 0 256 85
+%%PageBoundingBox: 0 0 256 88
%%EndPageSetup
-q 0 0 256 85 rectclip
-1 0 0 -1 0 85 cm q
-0 0.282353 0.388235 rg
-152.777 9.16 m 152.777 9.785 152.809 10.262 152.172 10.57 c 152.172 10.602
- l 154.32 10.602 l 154.32 10.57 l 153.77 10.211 153.809 9.742 153.809 9.16
- c 153.809 3.391 l 153.777 3.391 l 153.305 4.207 152.5 4.863 151.59 5.18
- c 151.59 5.211 l 152.777 5.211 l 152.777 9.16 l f
-161.648 4.543 m 162.129 4.543 162.609 4.629 163.082 4.727 c 160.5 10.602
- l 162.211 10.602 l 162.211 10.57 l 161.73 10.367 161.938 9.914 162.527
-8.535 c 164.52 3.871 l 160.113 3.871 l 159.652 5.098 l 159.684 5.098 l 160.246
- 4.672 160.934 4.543 161.648 4.543 c f
-170.574 4.543 m 171.051 4.543 171.539 4.629 172.004 4.727 c 169.43 10.602
- l 171.137 10.602 l 171.137 10.57 l 170.656 10.367 170.859 9.914 171.453
- 8.535 c 173.449 3.871 l 169.039 3.871 l 168.582 5.098 l 168.609 5.098 l
- 169.172 4.672 169.859 4.543 170.574 4.543 c f
-180.141 9.477 m 180.141 9.996 180.199 10.367 179.637 10.57 c 179.637 10.602
- l 181.621 10.602 l 181.621 10.57 l 181.18 10.344 181.172 9.863 181.172
-9.414 c 181.172 9.211 l 181.98 9.211 l 182.469 7.98 l 182.113 8.277 181.641
- 8.41 181.172 8.41 c 181.172 3.871 l 179.758 3.871 l 176.578 9.211 l 180.141
- 9.211 l h
-177.98 8.34 m 180.141 4.613 l 180.141 8.41 l 179.246 8.41 178.512 8.371
- 177.98 8.34 c f
-77.039 9.863 m 75.742 9.738 l 75.742 7.316 l 76.5 7.316 l 76.813 7.316
-77.246 7.309 77.406 7.602 c 77.438 7.602 l 77.438 6.52 l 77.406 6.52 l 77.285
- 6.582 77.125 6.582 76.957 6.582 c 75.742 6.582 l 75.742 4.68 l 76.07 4.613
- 76.426 4.605 76.781 4.605 c 77.254 4.605 77.676 4.645 77.988 5.012 c 78.02
- 5.012 l 78.02 3.816 l 77.988 3.816 l 77.859 3.891 77.684 3.871 77.512 3.871
- c 74.238 3.871 l 74.238 3.902 l 74.758 4.094 74.695 4.84 74.695 5.313 c
- 74.695 9.168 l 74.695 9.629 74.758 10.387 74.238 10.57 c 74.238 10.602
-l 78.504 10.602 l 78.965 9.258 l 78.934 9.258 l 78.422 9.711 77.715 9.922
- 77.039 9.863 c f
-86.695 7.203 m 87.156 7.391 87.168 7.891 87.168 8.363 c 87.168 9.832 l
-86.707 9.969 86.215 10.027 85.742 10.027 c 84.129 10.027 82.82 8.781 82.82
- 7.133 c 82.82 5.484 84.039 4.445 85.633 4.445 c 86.254 4.445 87.035 4.586
- 87.453 5.055 c 87.484 5.055 l 87.484 3.879 l 86.949 3.766 86.422 3.707
-85.879 3.707 c 83.402 3.707 81.652 5.078 81.652 7.277 c 81.652 9.332 83.199
- 10.762 85.816 10.762 c 86.645 10.762 87.445 10.609 88.262 10.457 c 88.199
- 10.313 88.211 10.152 88.211 9.996 c 88.211 7.645 l 88.211 7.492 88.211
-7.328 88.262 7.203 c 88.262 7.172 l 86.695 7.172 l 86.695 7.203 l f
-93.938 9.863 m 92.641 9.738 l 92.641 7.316 l 93.398 7.316 l 93.715 7.316
- 94.145 7.309 94.305 7.602 c 94.336 7.602 l 94.336 6.52 l 94.305 6.52 l
-94.188 6.582 94.023 6.582 93.859 6.582 c 92.641 6.582 l 92.641 4.68 l 92.969
- 4.613 93.324 4.605 93.684 4.605 c 94.156 4.605 94.574 4.645 94.891 5.012
- c 94.922 5.012 l 94.922 3.816 l 94.891 3.816 l 94.758 3.891 94.586 3.871
- 94.41 3.871 c 91.137 3.871 l 91.137 3.902 l 91.66 4.094 91.598 4.84 91.598
- 5.313 c 91.598 9.168 l 91.598 9.629 91.66 10.387 91.137 10.57 c 91.137
-10.602 l 95.402 10.602 l 95.863 9.258 l 95.832 9.258 l 95.32 9.711 94.617
- 9.922 93.938 9.863 c f
-103.137 9.172 m 101.66 7.316 l 102.5 7.121 103.289 6.418 103.289 5.516
-c 103.289 4.586 102.539 3.871 101.172 3.871 c 98.738 3.871 l 98.738 3.902
- l 99.258 4.094 99.188 4.84 99.188 5.313 c 99.188 9.172 l 99.188 9.629 99.258
- 10.387 98.738 10.57 c 98.738 10.602 l 100.691 10.602 l 100.691 10.57 l
-100.172 10.387 100.23 9.641 100.23 9.172 c 100.23 4.586 l 100.465 4.543
-100.691 4.516 100.926 4.504 c 101.613 4.473 102.242 4.902 102.242 5.641
-c 102.242 6.602 101.293 6.98 100.477 7.102 c 101.418 8.547 l 102.664 10.09
- l 102.973 10.469 103.309 10.602 103.852 10.602 c 104.793 10.602 l 104.207
- 10.234 103.563 9.699 103.137 9.172 c f
-128.234 22.066 m 113.488 28.605 l 107.441 28.594 l 107.441 32.273 l 54.52
- 32.254 l 55.582 33.84 l 55.582 62.5 l 0 62.5 l 0 63.527 l 254.828 63.527
- l 254.828 62.5 l 200.867 62.5 l 200.867 33.84 l 201.93 32.254 l 149.008
- 32.273 l 149.008 28.594 l 143.105 28.605 l h
-128.234 23.016 m 140.734 28.605 l 115.715 28.605 l h
-108.32 29.824 m 111.902 29.824 l 111.926 51.219 l 108.32 51.219 l h
-112.758 29.824 m 114.844 29.824 l 114.844 51.219 l 112.762 51.219 l h
-115.727 29.824 m 140.723 29.824 l 140.723 51.219 l 137.898 51.227 l 137.887
- 44.957 l 137.887 44.043 137.262 43.129 135.926 43.129 c 134.598 43.129
-133.973 44.18 133.973 44.902 c 133.973 51.223 l 130.195 51.223 l 130.195
- 44.953 l 130.195 44.043 129.566 43.129 128.238 43.129 c 126.906 43.129
-126.25 44.043 126.25 44.953 c 126.25 51.219 l 122.477 51.219 l 122.477 44.902
- l 122.477 44.18 121.848 43.129 120.52 43.129 c 119.191 43.129 118.563 44.043
- 118.563 44.953 c 118.551 51.227 l 115.727 51.219 l h
-141.578 29.824 m 143.66 29.824 l 143.66 51.219 l 141.578 51.223 l h
-144.516 29.824 m 148.094 29.824 l 148.094 51.219 l 144.496 51.219 l h
-107.441 33.824 m 107.441 51.219 l 76.941 51.219 l 76.941 33.898 l h
-149.008 33.824 m 179.504 33.898 l 179.504 51.219 l 149.008 51.219 l h
-56.48 33.898 m 58.492 33.898 l 58.516 51.219 l 56.48 51.219 l h
-59.398 33.898 m 73.145 33.898 l 73.145 51.219 l 59.375 51.219 l h
-73.973 33.898 m 76.039 33.898 l 76.039 51.219 l 73.973 51.219 l h
-180.41 33.898 m 182.477 33.898 l 182.477 51.219 l 180.41 51.219 l h
-183.305 33.898 m 197.051 33.898 l 197.074 51.219 l 183.305 51.219 l h
-197.957 33.898 m 199.973 33.898 l 199.973 51.219 l 197.934 51.219 l h
-56.48 52.102 m 58.492 52.102 l 58.492 62.492 l 56.48 62.492 l h
-108.32 52.102 m 111.902 52.109 l 111.902 62.5 l 108.32 62.5 l h
-114.844 52.102 m 114.844 62.492 l 112.758 62.5 l 112.758 52.109 l h
-115.727 52.102 m 116.16 52.102 l 116.16 52.91 l 117.008 52.91 l 117.008
- 52.102 l 117.711 52.102 l 117.707 52.91 l 118.563 52.91 l 118.563 52.102
- l 122.477 52.102 l 122.477 52.91 l 123.332 52.91 l 123.332 52.102 l 124.105
- 52.109 l 124.105 52.91 l 124.957 52.91 l 124.957 52.102 l 131.492 52.102
- l 131.492 52.91 l 132.344 52.91 l 132.344 52.109 l 133.117 52.102 l 133.117
- 52.91 l 133.973 52.91 l 133.973 52.102 l 137.887 52.102 l 137.887 52.91
- l 138.738 52.91 l 138.738 52.102 l 139.441 52.102 l 139.441 52.91 l 140.289
- 52.91 l 140.289 52.102 l 140.723 52.102 l 140.734 62.5 l 137.887 62.5 l
- 137.887 56.043 l 137.887 55.133 137.262 54.219 135.926 54.219 c 134.598
- 54.219 133.973 55.133 133.973 56.043 c 133.961 62.504 l 130.895 62.5 l
-130.895 56.105 l 130.895 55.09 130.133 53.684 128.238 53.66 c 128.211 53.66
- l 126.316 53.684 125.555 55.09 125.555 56.105 c 125.555 62.5 l 122.477
-62.5 l 122.477 56.043 l 122.477 55.133 121.848 54.219 120.52 54.219 c 119.191
- 54.219 118.563 55.133 118.563 56.043 c 118.563 62.5 l 115.715 62.5 l h
-141.605 52.102 m 143.691 52.109 l 143.691 62.5 l 141.605 62.492 l h
-148.125 52.102 m 148.125 62.5 l 144.547 62.5 l 144.547 52.109 l h
-197.957 52.102 m 199.973 52.102 l 199.973 62.492 l 197.957 62.492 l h
-59.398 52.109 m 73.145 52.109 l 73.145 62.5 l 59.398 62.5 l h
-73.973 52.109 m 76.039 52.109 l 76.039 62.492 l 73.973 62.5 l h
-76.941 52.109 m 107.441 52.109 l 107.441 62.5 l 76.941 62.5 l h
-149.004 52.109 m 179.504 52.109 l 179.504 62.5 l 149.004 62.5 l h
-180.41 52.109 m 182.477 52.109 l 182.477 62.5 l 180.41 62.492 l h
-183.305 52.109 m 197.051 52.109 l 197.051 62.5 l 183.305 62.5 l h
-183.305 52.109 m f
-149.832 28.594 m 149.832 31.563 l 177.422 31.563 l 186.547 21.426 l 182.469
- 18.645 l 146.844 18.609 l 151.586 28.594 l 149.832 28.594 l f
-142.441 17.969 m 146.129 18.309 l 136.574 12.172 l 142.441 17.969 l f
-145.746 27.871 m 150.453 27.871 l 146.316 18.984 l 142.594 18.609 l 145.746
- 27.871 l f
-138.422 42.504 m 138.422 41.953 l 138.766 41.953 l 138.766 41.379 l 135.926
- 40.23 l 133.09 41.379 l 133.09 41.953 l 133.438 41.953 l 133.438 42.504
- l 134 42.504 l 134 41.957 l 137.871 41.957 l 137.871 42.504 l 138.422 42.504
+q 0 0 256 88 rectclip
+1 0 0 -1 0 88 cm q
+Q q
+q
+0 0 256 88 re W n
+ q
+Q q
+q
+0 0 256 88 re W n
+ q
+Q q
+0 71.992 5.992 10 re W n
+q
+0 71 6 11 re W n
+ q
+0.0666667 0.247059 0.380392 rg
+2.227 80.426 m 2.227 76.934 l 2.82 76.934 3.422 76.949 4.016 76.965 c 4.336
+ 76.977 4.672 77.004 5.008 77.027 c 4.969 76.934 4.941 76.766 4.941 76.59
+ c 4.941 76.395 4.969 76.266 5.008 76.129 c 4.324 76.207 2.883 76.215 2.227
+ 76.215 c 2.227 73.191 l 3.41 73.191 3.539 73.191 4.016 73.215 c 5.223 73.281
+ l 5.188 73.18 5.16 73.004 5.16 72.805 c 5.16 72.648 5.188 72.547 5.223
+72.395 c 4.297 72.422 3.449 72.469 2.855 72.469 c 2.16 72.469 1.156 72.434
+ 0.527 72.395 c 0.617 73.68 0.645 76.168 0.645 76.707 c 0.645 77.297 0.617
+ 78.871 0.594 79.613 c 0.578 80.152 0.555 80.68 0.527 81.223 c 1.352 81.172
+ 2.16 81.145 2.934 81.145 c 3.758 81.145 4.531 81.172 5.305 81.223 c 5.25
+ 81.082 5.238 80.957 5.238 80.758 c 5.238 80.582 5.25 80.449 5.305 80.336
+ c 4.207 80.383 2.559 80.426 2.227 80.426 c f
+ Q
+Q
+Q q
+0.0666667 0.247059 0.380392 rg
+8.957 80.77 m 8.199 80.77 7.555 80.582 6.965 79.293 c 6.785 79.293 l 6.719
+ 79.914 6.707 80.082 6.488 80.75 c 6.949 80.977 7.785 81.398 8.895 81.398
+ c 11.25 81.398 12.164 79.895 12.164 78.586 c 12.164 78.223 12.07 77.465
+ 11.531 76.883 c 11.16 76.473 10.773 76.336 9.781 75.945 c 8.648 75.508
+7.992 75.254 7.992 74.313 c 7.992 73.551 8.496 72.922 9.512 72.922 c 10.32
+ 72.922 11.004 73.305 11.199 74.043 c 11.379 74.043 l 11.492 73.551 11.52
+ 73.449 11.777 72.816 c 11.148 72.539 10.582 72.293 9.641 72.293 c 7.313
+ 72.293 6.641 73.73 6.641 74.863 c 6.641 75.934 7.016 76.59 8.266 77.141
+ c 8.621 77.297 9.227 77.527 9.586 77.684 c 9.832 77.789 10.645 78.145 10.645
+ 79.168 c 10.645 80.09 9.973 80.77 8.957 80.77 c f
+17.457 76.484 m 18.035 75.609 18.758 74.547 19.234 73.875 c 19.891 72.961
+ l 20.047 72.738 20.07 72.715 20.07 72.613 c 20.07 72.547 20.059 72.484
+20.047 72.395 c 19.336 72.445 18.527 72.469 16.57 72.469 c 15.066 72.469
+ 14.098 72.484 13.109 72.395 c 13.133 72.559 13.148 72.688 13.148 72.895
+ c 13.148 73.063 13.121 73.246 13.109 73.398 c 14.691 73.27 16.223 73.258
+ 17.664 73.258 c 17.008 74.387 15 77.418 14.406 78.301 c 14.152 78.664 12.852
+ 80.414 12.566 80.809 c 12.566 81.223 l 13.867 81.145 14.523 81.145 16.285
+ 81.145 c 18.797 81.145 19.633 81.215 20.02 81.223 c 19.98 81.094 19.957
+ 80.898 19.957 80.711 c 19.957 80.477 19.996 80.336 20.02 80.18 c 19.531
+ 80.211 19.043 80.23 18.551 80.27 c 17.832 80.336 16.766 80.359 16.172 80.359
+ c 14.934 80.359 l 15.27 79.797 15.684 79.148 16.324 78.184 c 17.457 76.484
l f
-137.887 39.035 m 137.887 39.035 137.887 35.441 137.887 34.523 c 137.887
- 33.609 137.262 32.699 135.93 32.699 c 134.602 32.699 133.973 33.609 133.973
- 34.523 c 133.973 35.441 133.973 39.035 133.973 39.035 c 137.887 39.035
-l f
-138.781 30.918 m 133.066 30.918 l 133.066 31.566 l 133.426 31.566 l 133.426
- 32.367 l 133.973 32.367 l 133.973 32.02 l 133.973 32.02 134.652 31.566
-135.926 31.566 c 137.215 31.566 137.887 32.02 137.887 32.02 c 137.887 32.367
- l 138.406 32.367 l 138.406 31.566 l 138.781 31.566 l 138.781 30.918 l f
-159.422 55.676 m 159.422 54.883 158.902 54.57 157.945 54.57 c 156.984 54.57
- 156.504 54.883 156.504 55.676 c 156.504 56.469 156.504 59.91 156.504 59.91
- c 159.422 59.91 l 159.422 59.91 159.422 56.469 159.422 55.676 c f
-165.715 55.676 m 165.715 54.883 165.195 54.57 164.238 54.57 c 163.281 54.57
- 162.801 54.883 162.801 55.676 c 162.801 56.469 162.801 59.91 162.801 59.91
- c 165.715 59.91 l 165.715 59.91 165.715 56.469 165.715 55.676 c f
-172.008 55.676 m 172.008 54.883 171.488 54.57 170.527 54.57 c 169.574 54.57
- 169.094 54.883 169.094 55.676 c 169.094 56.469 169.094 59.91 169.094 59.91
- c 172.008 59.91 l 172.008 59.91 172.008 56.469 172.008 55.676 c f
-178.305 55.676 m 178.305 54.883 177.781 54.57 176.824 54.57 c 175.867 54.57
- 175.387 54.883 175.387 55.676 c 175.387 56.469 175.387 59.91 175.387 59.91
- c 178.305 59.91 l 178.305 59.91 178.305 56.469 178.305 55.676 c f
-153.125 55.676 m 153.125 54.883 152.609 54.57 151.648 54.57 c 150.691 54.57
- 150.211 54.883 150.211 55.676 c 150.211 56.469 150.211 59.91 150.211 59.91
- c 153.125 59.91 l 153.125 59.91 153.125 56.469 153.125 55.676 c f
-159.422 35.711 m 159.422 34.902 158.902 34.586 157.945 34.586 c 156.988
- 34.586 156.508 34.902 156.508 35.711 c 156.508 36.516 156.508 39.93 156.508
- 39.93 c 159.422 39.93 l 159.422 39.93 159.422 36.516 159.422 35.711 c f
-165.715 35.711 m 165.715 34.902 165.195 34.586 164.238 34.586 c 163.281
- 34.586 162.801 34.902 162.801 35.711 c 162.801 36.516 162.801 39.93 162.801
- 39.93 c 165.715 39.93 l 165.715 39.93 165.715 36.516 165.715 35.711 c f
-172.008 35.711 m 172.008 34.902 171.488 34.586 170.527 34.586 c 169.574
- 34.586 169.094 34.902 169.094 35.711 c 169.094 36.516 169.094 39.93 169.094
- 39.93 c 172.008 39.93 l 172.008 39.93 172.008 36.516 172.008 35.711 c f
-178.301 35.711 m 178.301 34.902 177.781 34.586 176.824 34.586 c 175.867
- 34.586 175.383 34.902 175.383 35.711 c 175.383 36.516 175.383 39.93 175.383
- 39.93 c 178.301 39.93 l 178.301 39.93 178.301 36.516 178.301 35.711 c f
-153.129 35.711 m 153.129 34.902 152.609 34.586 151.648 34.586 c 150.695
- 34.586 150.215 34.902 150.215 35.711 c 150.215 36.516 150.215 39.93 150.215
- 39.93 c 153.129 39.93 l 153.129 39.93 153.129 36.516 153.129 35.711 c f
-172.008 43.262 m 172.008 43.227 172.008 43.207 172.008 43.207 c 169.094
- 43.207 l 169.094 43.207 169.094 43.227 169.094 43.262 c 169.094 48.859
-l 172.008 48.859 l 172.008 43.262 l f
-178.301 43.262 m 178.301 43.227 178.301 43.207 178.301 43.207 c 175.383
- 43.207 l 175.383 43.207 175.383 43.227 175.383 43.262 c 175.383 48.859
-l 178.301 48.859 l 178.301 43.262 l f
-165.715 43.262 m 165.715 43.227 165.715 43.207 165.715 43.207 c 162.801
- 43.207 l 162.801 43.207 162.801 43.227 162.801 43.262 c 162.801 48.859
-l 165.715 48.859 l 165.715 43.262 l f
-159.422 43.262 m 159.422 43.227 159.422 43.207 159.422 43.207 c 156.508
- 43.207 l 156.508 43.207 156.508 43.227 156.508 43.262 c 156.508 48.859
-l 159.422 48.859 l 159.422 43.262 l f
-153.129 43.262 m 153.129 43.227 153.129 43.207 153.129 43.207 c 150.215
- 43.207 l 150.215 43.207 150.215 43.227 150.215 43.262 c 150.215 48.859
-l 153.129 48.859 l 153.129 43.262 l f
-188.5 55.766 m 188.5 54.969 187.98 54.66 187.023 54.66 c 186.063 54.66
-185.582 54.969 185.582 55.766 c 185.582 56.559 185.582 60 185.582 60 c 188.5
- 60 l 188.5 60 188.5 56.559 188.5 55.766 c f
-194.797 55.766 m 194.797 54.969 194.273 54.66 193.316 54.66 c 192.359 54.66
- 191.879 54.969 191.879 55.766 c 191.879 56.559 191.879 60 191.879 60 c
-194.797 60 l 194.797 60 194.797 56.559 194.797 55.766 c f
-187.023 34.629 m 186.063 34.629 185.582 34.938 185.582 35.73 c 185.582
-36.523 185.582 39.891 185.582 39.891 c 188.5 39.891 l 188.5 39.891 188.5
- 36.523 188.5 35.73 c 188.5 34.938 187.98 34.629 187.023 34.629 c f
-193.316 34.629 m 192.359 34.629 191.879 34.938 191.879 35.73 c 191.879
-36.523 191.879 39.891 191.879 39.891 c 194.797 39.891 l 194.797 39.891 194.797
- 36.523 194.797 35.73 c 194.797 34.938 194.273 34.629 193.316 34.629 c f
-185.586 43.262 m 185.586 48.859 l 188.5 48.859 l 188.5 43.262 l 188.5 43.227
- 188.5 43.207 188.5 43.207 c 185.586 43.207 l 185.586 43.207 185.586 43.227
- 185.586 43.262 c f
-191.879 43.262 m 191.879 48.859 l 194.793 48.859 l 194.793 43.262 l 194.793
- 43.227 194.793 43.207 194.793 43.207 c 191.879 43.207 l 191.879 43.207
-191.879 43.227 191.879 43.262 c f
-187.781 21.043 m 178.398 31.586 l 201.93 31.586 l 202.371 31.582 l 202.676
- 31.164 l 193.477 24.918 l 193.301 24.293 192.926 23.531 192.16 22.969 c
- 191.188 22.254 190.305 22.238 189.637 22.313 c h
-190.125 23.117 m 190.129 23.117 l 191.25 23.098 192.621 23.996 192.719
-25.547 c 192.75 25.988 192.676 26.191 192.582 26.508 c 192.457 26.949 192.578
- 27.316 192.82 27.617 c 193.121 27.984 193.402 28.297 194.613 28.297 c 196.234
- 28.305 l 196.234 29.816 l 183.992 29.816 l 183.992 28.305 l 185.613 28.297
- l 186.824 28.297 187.102 27.984 187.402 27.617 c 187.652 27.316 187.77
-26.949 187.641 26.508 c 187.555 26.191 187.477 25.988 187.504 25.547 c 187.609
- 23.996 189.004 23.098 190.125 23.117 c h
-190.125 23.117 m f
-146.414 33.992 m 145.863 33.992 145.602 34.793 145.602 35.598 c 145.602
- 36.398 145.602 39.301 145.602 39.301 c 147.227 39.301 l 147.227 39.301
-147.227 36.398 147.227 35.598 c 147.227 34.793 146.969 33.992 146.414 33.992
+24.211 72.469 m 23.223 72.469 21.793 72.461 20.773 72.395 c 20.813 72.547
+ 20.84 72.715 20.84 72.871 c 20.84 73.023 20.813 73.191 20.773 73.348 c
+21.43 73.281 22.668 73.258 22.781 73.258 c 23.426 73.258 l 23.438 73.758
+ 23.453 74.211 23.453 74.684 c 23.465 78.273 l 23.465 79.254 23.387 80.246
+ 23.336 81.223 c 23.797 81.172 23.992 81.145 24.211 81.145 c 24.363 81.145
+ 24.777 81.184 25.152 81.223 c 25.109 80.863 25.059 80.438 25.059 79.465
+ c 25.059 74.699 l 25.059 74.211 25.074 73.719 25.086 73.258 c 25.973 73.258
+ 26.887 73.27 27.648 73.348 c 27.609 73.137 27.586 73.023 27.586 72.883
+c 27.586 72.777 27.609 72.613 27.648 72.395 c 26.41 72.461 25.277 72.469
+ 24.211 72.469 c f
+30.254 80.426 m 30.254 76.934 l 30.844 76.934 31.449 76.949 32.043 76.965
+ c 32.363 76.977 32.699 77.004 33.035 77.027 c 32.996 76.934 32.969 76.766
+ 32.969 76.59 c 32.969 76.395 32.996 76.266 33.035 76.129 c 32.352 76.207
+ 30.91 76.215 30.254 76.215 c 30.254 73.191 l 31.438 73.191 31.566 73.191
+ 32.043 73.215 c 33.25 73.281 l 33.215 73.18 33.188 73.004 33.188 72.805
+ c 33.188 72.648 33.215 72.547 33.25 72.395 c 32.324 72.422 31.477 72.469
+ 30.883 72.469 c 30.188 72.469 29.184 72.434 28.555 72.395 c 28.645 73.68
+ 28.672 76.168 28.672 76.707 c 28.672 77.297 28.645 78.871 28.617 79.613
+ c 28.605 80.152 28.578 80.68 28.555 81.223 c 29.379 81.172 30.188 81.145
+ 30.961 81.145 c 31.785 81.145 32.555 81.172 33.328 81.223 c 33.277 81.082
+ 33.266 80.957 33.266 80.758 c 33.266 80.582 33.277 80.449 33.328 80.336
+ c 32.234 80.383 30.586 80.426 30.254 80.426 c f
+36.387 73.09 m 36.578 73.074 37.055 73.023 37.301 73.023 c 37.723 73.023
+ 38.148 73.09 38.496 73.348 c 38.945 73.68 39.035 74.145 39.035 74.684 c
+ 39.035 75.52 38.563 76.465 37.273 76.465 c 36.938 76.465 36.629 76.434
+36.387 76.422 c h
+36.695 77.027 m 37.387 78.008 38.188 79.137 38.844 80.152 c 39.035 80.449
+ 39.32 80.926 39.512 81.223 c 39.898 81.172 40.051 81.145 40.555 81.145
+c 41.016 81.145 41.34 81.184 41.699 81.223 c 40.891 80.211 40.543 79.758
+ 39.527 78.324 c 39.332 78.055 39.051 77.633 38.855 77.359 c 38.496 76.848
+ l 39.668 76.629 40.734 75.895 40.734 74.465 c 40.734 73.922 40.531 73.398
+ 40.145 73.023 c 39.59 72.5 38.957 72.395 38.121 72.395 c 37.824 72.395
+36.332 72.461 36 72.461 c 35.344 72.461 35.008 72.422 34.711 72.395 c 34.801
+ 74.051 34.801 74.234 34.801 75.922 c 34.801 78.402 34.789 78.684 34.688
+ 81.223 c 34.969 81.184 35.277 81.145 35.574 81.145 c 35.895 81.145 36.18
+ 81.195 36.438 81.223 c 36.438 80.887 36.387 79.227 36.387 78.852 c 36.387
+ 77.027 l 36.695 77.027 l f
+220.367 77.359 m 220.906 76.434 221.406 75.469 221.988 74.547 c 222.18
+74.234 223.121 72.738 223.313 72.395 c 223.172 72.445 223.031 72.469 222.773
+ 72.469 c 222.488 72.469 222.234 72.434 222.027 72.395 c 221.102 74.426
+220.895 74.863 219.801 76.746 c 218.707 74.824 218.219 73.809 217.547 72.395
+ c 217.176 72.461 216.801 72.469 216.492 72.469 c 216.211 72.469 215.914
+ 72.445 215.438 72.395 c 216.105 73.512 217.199 75.293 217.855 76.422 c
+218.617 77.734 l 218.617 78.531 218.578 80.215 218.539 81.223 c 218.785
+81.195 219.145 81.145 219.402 81.145 c 219.699 81.145 219.992 81.195 220.289
+ 81.223 c 220.238 80.027 220.199 79.332 220.199 78.254 c 220.199 77.773
+l 220.199 77.656 220.277 77.516 220.367 77.359 c f
+226.004 80.426 m 226.004 76.934 l 226.598 76.934 227.199 76.949 227.793
+ 76.965 c 228.117 76.977 228.449 77.004 228.785 77.027 c 228.746 76.934
+228.719 76.766 228.719 76.59 c 228.719 76.395 228.746 76.266 228.785 76.129
+ c 228.102 76.207 226.66 76.215 226.004 76.215 c 226.004 73.191 l 227.188
+ 73.191 227.316 73.191 227.793 73.215 c 229.004 73.281 l 228.965 73.18 228.938
+ 73.004 228.938 72.805 c 228.938 72.648 228.965 72.547 229.004 72.395 c
+228.078 72.422 227.227 72.469 226.633 72.469 c 225.938 72.469 224.938 72.434
+ 224.305 72.395 c 224.395 73.68 224.422 76.168 224.422 76.707 c 224.422
+77.297 224.395 78.871 224.371 79.613 c 224.355 80.152 224.332 80.68 224.305
+ 81.223 c 225.129 81.172 225.938 81.145 226.715 81.145 c 227.535 81.145
+228.309 81.172 229.082 81.223 c 229.031 81.082 229.016 80.957 229.016 80.758
+ c 229.016 80.582 229.031 80.449 229.082 80.336 c 227.984 80.383 226.34
+80.426 226.004 80.426 c f
+233.211 72.469 m 232.223 72.469 230.793 72.461 229.777 72.395 c 229.813
+ 72.547 229.84 72.715 229.84 72.871 c 229.84 73.023 229.813 73.191 229.777
+ 73.348 c 230.434 73.281 231.668 73.258 231.785 73.258 c 232.426 73.258
+l 232.441 73.758 232.453 74.211 232.453 74.684 c 232.465 78.273 l 232.465
+ 79.254 232.391 80.246 232.336 81.223 c 232.801 81.172 232.992 81.145 233.211
+ 81.145 c 233.367 81.145 233.777 81.184 234.152 81.223 c 234.113 80.863
+234.063 80.438 234.063 79.465 c 234.063 74.699 l 234.063 74.211 234.074
+73.719 234.09 73.258 c 234.977 73.258 235.891 73.27 236.648 73.348 c 236.609
+ 73.137 236.586 73.023 236.586 72.883 c 236.586 72.777 236.609 72.613 236.648
+ 72.395 c 235.414 72.461 234.281 72.469 233.211 72.469 c f
+239.598 80.426 m 239.598 76.934 l 240.188 76.934 240.793 76.949 241.387
+ 76.965 c 241.707 76.977 242.039 77.004 242.375 77.027 c 242.34 76.934 242.313
+ 76.766 242.313 76.59 c 242.313 76.395 242.34 76.266 242.375 76.129 c 241.695
+ 76.207 240.254 76.215 239.598 76.215 c 239.598 73.191 l 240.781 73.191
+240.91 73.191 241.387 73.215 c 242.598 73.281 l 242.555 73.18 242.531 73.004
+ 242.531 72.805 c 242.531 72.648 242.555 72.547 242.598 72.395 c 241.668
+ 72.422 240.82 72.469 240.227 72.469 c 239.531 72.469 238.527 72.434 237.898
+ 72.395 c 237.988 73.68 238.016 76.168 238.016 76.707 c 238.016 77.297 237.988
+ 78.871 237.965 79.613 c 237.949 80.152 237.922 80.68 237.898 81.223 c 238.723
+ 81.172 239.531 81.145 240.305 81.145 c 241.129 81.145 241.902 81.172 242.672
+ 81.223 c 242.621 81.082 242.605 80.957 242.605 80.758 c 242.605 80.582
+242.621 80.449 242.672 80.336 c 241.578 80.383 239.934 80.426 239.598 80.426
c f
-146.414 42.824 m 145.863 42.824 145.602 43.625 145.602 44.43 c 145.602
-45.23 145.602 48.133 145.602 48.133 c 147.227 48.133 l 147.227 48.133 147.227
- 45.23 147.227 44.43 c 147.227 43.625 146.969 42.824 146.414 42.824 c f
-146.414 54.191 m 145.863 54.191 145.602 54.992 145.602 55.793 c 145.602
- 56.598 145.602 59.5 145.602 59.5 c 147.227 59.5 l 147.227 59.5 147.227
-56.598 147.227 55.793 c 147.227 54.992 146.969 54.191 146.414 54.191 c f
-190.156 27.242 m 191.012 27.242 191.703 26.547 191.703 25.691 c 191.703
- 24.84 191.012 24.145 190.156 24.145 c 189.301 24.145 188.605 24.84 188.605
- 25.691 c 188.605 26.547 189.301 27.242 190.156 27.242 c f
-114.004 17.969 m 110.32 18.309 l 119.879 12.172 l 114.004 17.969 l f
-110.703 27.871 m 105.996 27.871 l 110.133 18.984 l 113.859 18.609 l 110.703
- 27.871 l f
-144.93 27.871 m 143.254 27.871 l 128.234 21.223 l 113.195 27.871 l 111.52
- 27.871 l 114.645 18.609 l 141.805 18.609 l 144.93 27.871 l f
-118.027 42.504 m 118.027 41.953 l 117.684 41.953 l 117.684 41.379 l 120.52
- 40.23 l 123.355 41.379 l 123.355 41.953 l 123.016 41.953 l 123.016 42.504
- l 122.449 42.504 l 122.449 41.957 l 118.578 41.957 l 118.578 42.504 l 118.027
- 42.504 l f
-118.563 39.035 m 118.563 39.035 118.563 35.441 118.563 34.523 c 118.563
- 33.609 119.191 32.699 120.52 32.699 c 121.852 32.699 122.477 33.609 122.477
- 34.523 c 122.477 35.441 122.477 39.035 122.477 39.035 c 118.563 39.035
+253.266 72.395 m 253.176 72.422 253.086 72.434 252.996 72.434 c 252.906
+ 72.434 252.805 72.422 252.711 72.395 c 251.398 75.016 250.832 76.09 249.625
+ 78.215 c 249.148 79.047 l 248.453 77.813 l 247.23 75.625 246.867 74.941
+ 246.02 73.207 c 245.621 72.395 l 245.531 72.406 245.43 72.434 245.336 72.434
+ c 245.234 72.434 245.145 72.422 245.043 72.395 c 244.887 73.887 244.117
+ 79.227 243.805 80.824 c 243.73 81.223 l 243.898 81.184 244.066 81.145 244.27
+ 81.145 c 244.422 81.145 244.629 81.172 244.863 81.223 c 244.953 79.293
+245.168 77.309 245.402 75.508 c 245.582 75.844 246.496 77.465 246.691 77.84
+ c 247.652 79.707 247.977 80.246 248.465 81.223 c 248.543 81.215 248.633
+ 81.195 248.711 81.195 c 248.801 81.195 248.879 81.215 248.965 81.223 c
+249.727 79.473 251.168 76.848 252.031 75.383 c 252.066 75.922 252.379 78.52
+ 252.441 79.113 c 252.465 79.344 252.531 80.488 252.559 80.75 c 252.598
+81.223 l 252.996 81.172 253.227 81.145 253.473 81.145 c 253.652 81.145 254.09
+ 81.184 254.398 81.223 c 254.258 80.582 253.984 78.715 253.883 77.938 c
+253.68 76.395 253.512 74.98 253.367 73.465 c 253.266 72.395 l f
+49.223 72.469 m 48.941 72.469 48.527 72.422 48.281 72.395 c 48.332 73.348
+ 48.348 73.449 48.348 73.848 c 48.359 74.172 48.375 75.727 48.375 76.063
+ c 47.59 76.09 46.816 76.113 46.031 76.113 c 45.387 76.113 44.73 76.09 44.086
+ 76.063 c 44.086 73.652 44.137 73.102 44.203 72.395 c 44.035 72.422 43.559
+ 72.469 43.316 72.469 c 43.109 72.469 42.645 72.422 42.387 72.395 c 42.48
+ 73.383 42.516 74.363 42.516 75.371 c 42.516 77.32 42.504 79.266 42.402
+81.223 c 42.711 81.195 43.004 81.145 43.316 81.145 c 43.676 81.145 44.012
+ 81.215 44.203 81.223 c 44.137 80.414 44.086 79.836 44.086 78.172 c 44.086
+ 76.883 l 44.82 76.859 45.555 76.836 46.285 76.836 c 46.98 76.836 47.68
+76.859 48.375 76.883 c 48.359 78.961 l 48.359 79.434 48.27 80.988 48.258
+ 81.223 c 48.527 81.195 48.863 81.145 49.133 81.145 c 49.441 81.145 49.762
+ 81.195 50.074 81.223 c 49.945 80.297 49.945 79.199 49.945 78.184 c 49.945
+ 76.848 49.957 73.73 50.125 72.395 c 49.879 72.422 49.453 72.469 49.223
+72.469 c f
+56.707 70.527 m 56.797 70.465 56.977 70.336 56.977 70.051 c 56.977 69.727
+ 56.691 69.523 56.371 69.523 c 56.141 69.523 55.922 69.688 55.754 69.875
+ c 53.941 71.824 l 54.594 71.824 l 56.707 70.527 l f
+54.543 74.465 m 55.754 77.633 l 55.355 77.656 54.969 77.684 54.57 77.684
+ c 54.121 77.684 53.68 77.645 53.23 77.633 c h
+50.711 81.223 m 50.891 81.195 51.07 81.145 51.289 81.145 c 51.492 81.145
+ 51.738 81.195 51.906 81.223 c 52.113 80.488 52.523 79.422 52.934 78.43
+c 53.449 78.402 53.965 78.383 54.48 78.383 c 55.031 78.383 55.574 78.402
+ 56.125 78.43 c 56.668 79.797 l 57.207 81.223 l 57.441 81.215 57.801 81.145
+ 58.16 81.145 c 58.523 81.145 58.973 81.215 59.164 81.223 c 58.586 79.973
+ 57.734 78.031 57.246 76.914 c 56.781 75.832 56.012 74.027 55.395 72.266
+ c 55.254 72.301 55.125 72.332 54.98 72.332 c 54.828 72.332 54.695 72.301
+ 54.559 72.266 c 54.246 73.32 53.5 74.996 52.203 77.898 c 50.711 81.223
l f
-117.664 30.918 m 123.383 30.918 l 123.383 31.566 l 123.02 31.566 l 123.02
- 32.367 l 122.477 32.367 l 122.477 32.02 l 122.477 32.02 121.797 31.566
-120.52 31.566 c 119.23 31.566 118.563 32.02 118.563 32.02 c 118.563 32.367
- l 118.039 32.367 l 118.039 31.566 l 117.664 31.566 l 117.664 30.918 l f
-128.234 0 m 131.223 0.07 131.449 3.039 131.449 3.039 c 125 3.039 l 125
-3.039 125.23 0.07 128.211 0 c 128.211 0.141 l 128.234 0 l f
-97.027 55.676 m 97.027 54.883 97.547 54.57 98.508 54.57 c 99.461 54.57
-99.945 54.883 99.945 55.676 c 99.945 56.469 99.945 59.91 99.945 59.91 c
-97.027 59.91 l 97.027 59.91 97.027 56.469 97.027 55.676 c f
-130.195 42.504 m 130.195 41.957 l 126.277 41.957 l 126.277 42.504 l 125.746
- 42.504 l 125.746 41.953 l 125.402 41.953 l 125.402 41.379 l 128.238 40.23
- l 131.07 41.379 l 131.07 41.953 l 130.727 41.953 l 130.727 42.504 l 130.195
- 42.504 l f
-130.199 32.02 m 130.199 32.02 129.523 31.566 128.238 31.566 c 126.949 31.566
- 126.273 32.02 126.273 32.02 c 126.273 32.367 l 125.75 32.367 l 125.75 31.566
- l 125.375 31.566 l 125.375 30.918 l 131.094 30.918 l 131.094 31.566 l 130.723
- 31.566 l 130.723 32.367 l 130.199 32.367 l 130.199 32.02 l f
-90.734 55.676 m 90.734 54.883 91.254 54.57 92.211 54.57 c 93.172 54.57
-93.652 54.883 93.652 55.676 c 93.652 56.469 93.652 59.91 93.652 59.91 c
-90.734 59.91 l 90.734 59.91 90.734 56.469 90.734 55.676 c f
-128.242 32.699 m 129.57 32.699 130.199 33.609 130.199 34.527 c 130.199
-39.035 l 126.25 39.035 l 126.25 34.527 l 126.25 33.609 126.879 32.699 128.207
- 32.699 c 128.242 32.699 l f
-84.441 55.676 m 84.441 54.883 84.961 54.57 85.918 54.57 c 86.875 54.57
-87.355 54.883 87.355 55.676 c 87.355 56.469 87.355 59.91 87.355 59.91 c
-84.441 59.91 l 84.441 59.91 84.441 56.469 84.441 55.676 c f
-78.148 55.676 m 78.148 54.883 78.664 54.57 79.621 54.57 c 80.578 54.57
-81.059 54.883 81.059 55.676 c 81.059 56.469 81.059 59.91 81.059 59.91 c
-78.148 59.91 l 78.148 59.91 78.148 56.469 78.148 55.676 c f
-103.32 55.676 m 103.32 54.883 103.844 54.57 104.801 54.57 c 105.758 54.57
- 106.238 54.883 106.238 55.676 c 106.238 56.469 106.238 59.91 106.238 59.91
- c 103.32 59.91 l 103.32 59.91 103.32 56.469 103.32 55.676 c f
-97.027 35.711 m 97.027 34.902 97.547 34.586 98.504 34.586 c 99.461 34.586
- 99.945 34.902 99.945 35.711 c 99.945 36.516 99.945 39.93 99.945 39.93 c
- 97.027 39.93 l 97.027 39.93 97.027 36.516 97.027 35.711 c f
-90.734 35.711 m 90.734 34.902 91.254 34.586 92.211 34.586 c 93.172 34.586
- 93.652 34.902 93.652 35.711 c 93.652 36.516 93.652 39.93 93.652 39.93 c
- 90.734 39.93 l 90.734 39.93 90.734 36.516 90.734 35.711 c f
-84.441 35.711 m 84.441 34.902 84.961 34.586 85.918 34.586 c 86.875 34.586
- 87.355 34.902 87.355 35.711 c 87.355 36.516 87.355 39.93 87.355 39.93 c
- 84.441 39.93 l 84.441 39.93 84.441 36.516 84.441 35.711 c f
-78.148 35.711 m 78.148 34.902 78.668 34.586 79.625 34.586 c 80.582 34.586
- 81.063 34.902 81.063 35.711 c 81.063 36.516 81.063 39.93 81.063 39.93 c
- 78.148 39.93 l 78.148 39.93 78.148 36.516 78.148 35.711 c f
-103.32 35.711 m 103.32 34.902 103.84 34.586 104.801 34.586 c 105.754 34.586
- 106.234 34.902 106.234 35.711 c 106.234 36.516 106.234 39.93 106.234 39.93
- c 103.32 39.93 l 103.32 39.93 103.32 36.516 103.32 35.711 c f
-84.441 43.262 m 84.441 43.227 84.441 43.207 84.441 43.207 c 87.355 43.207
- l 87.355 43.207 87.355 43.227 87.355 43.262 c 87.355 48.859 l 84.441 48.859
- l 84.441 43.262 l f
-78.148 43.262 m 78.148 43.227 78.148 43.207 78.148 43.207 c 81.063 43.207
- l 81.063 43.207 81.063 43.227 81.063 43.262 c 81.063 48.859 l 78.148 48.859
- l 78.148 43.262 l f
-90.734 43.262 m 90.734 43.227 90.734 43.207 90.734 43.207 c 93.652 43.207
- l 93.652 43.207 93.652 43.227 93.652 43.262 c 93.652 48.859 l 90.734 48.859
- l 90.734 43.262 l f
-97.027 43.262 m 97.027 43.227 97.027 43.207 97.027 43.207 c 99.945 43.207
- l 99.945 43.207 99.945 43.227 99.945 43.262 c 99.945 48.859 l 97.027 48.859
- l 97.027 43.262 l f
-103.32 43.262 m 103.32 43.227 103.32 43.207 103.32 43.207 c 106.234 43.207
- l 106.234 43.207 106.234 43.227 106.234 43.262 c 106.234 48.859 l 103.32
- 48.859 l 103.32 43.262 l f
-67.949 55.766 m 67.949 54.969 68.469 54.66 69.426 54.66 c 70.383 54.66
-70.863 54.969 70.863 55.766 c 70.863 56.559 70.863 60 70.863 60 c 67.949
- 60 l 67.949 60 67.949 56.559 67.949 55.766 c f
-61.656 55.766 m 61.656 54.969 62.172 54.66 63.133 54.66 c 64.09 54.66 64.57
- 54.969 64.57 55.766 c 64.57 56.559 64.57 60 64.57 60 c 61.656 60 l 61.656
- 60 61.656 56.559 61.656 55.766 c f
-69.426 34.629 m 70.383 34.629 70.863 34.938 70.863 35.73 c 70.863 36.523
- 70.863 39.891 70.863 39.891 c 67.949 39.891 l 67.949 39.891 67.949 36.523
- 67.949 35.73 c 67.949 34.938 68.469 34.629 69.426 34.629 c f
-63.133 34.629 m 64.09 34.629 64.57 34.938 64.57 35.73 c 64.57 36.523 64.57
- 39.891 64.57 39.891 c 61.656 39.891 l 61.656 39.891 61.656 36.523 61.656
- 35.73 c 61.656 34.938 62.172 34.629 63.133 34.629 c f
-70.863 43.262 m 70.863 48.859 l 67.949 48.859 l 67.949 43.262 l 67.949
-43.227 67.949 43.207 67.949 43.207 c 70.863 43.207 l 70.863 43.207 70.863
- 43.227 70.863 43.262 c f
-64.57 43.262 m 64.57 48.859 l 61.656 48.859 l 61.656 43.262 l 61.656 43.227
- 61.656 43.207 61.656 43.207 c 64.57 43.207 l 64.57 43.207 64.57 43.227
-64.57 43.262 c f
-106.613 28.594 m 106.613 31.563 l 79.027 31.563 l 69.902 21.426 l 73.977
- 18.645 l 109.605 18.609 l 104.863 28.594 l 106.613 28.594 l f
-68.672 21.043 m 66.813 22.313 l 66.145 22.238 65.262 22.254 64.289 22.969
- c 63.52 23.531 63.152 24.293 62.973 24.918 c 53.773 31.164 l 54.078 31.582
- l 54.52 31.586 l 78.051 31.586 l h
-66.32 23.117 m 66.324 23.117 l 67.445 23.102 68.844 23.996 68.945 25.547
- c 68.973 25.988 68.898 26.191 68.805 26.508 c 68.68 26.949 68.801 27.316
- 69.043 27.617 c 69.344 27.984 69.625 28.297 70.832 28.297 c 72.457 28.305
- l 72.457 29.816 l 60.211 29.816 l 60.211 28.305 l 61.836 28.297 l 63.047
- 28.297 63.324 27.984 63.625 27.617 c 63.875 27.316 63.992 26.949 63.863
- 26.508 c 63.773 26.191 63.699 25.988 63.727 25.547 c 63.832 23.996 65.199
- 23.102 66.32 23.117 c h
-66.32 23.117 m f
-122.18 3.754 m 120.832 4.547 l 120.832 8.07 l 118.969 8.563 l 118.969 12.063
- l 121.906 10.746 l 115.047 17.969 l 141.406 17.969 l 134.547 10.746 l 137.477
- 12.063 l 137.477 8.563 l 135.613 8.07 l 135.613 4.547 l 134.27 3.754 l
+64.363 76.484 m 64.941 75.609 65.664 74.547 66.141 73.875 c 66.797 72.961
+ l 66.953 72.738 66.977 72.715 66.977 72.613 c 66.977 72.547 66.965 72.484
+ 66.953 72.395 c 66.242 72.445 65.434 72.469 63.477 72.469 c 61.969 72.469
+ 61.004 72.484 60.016 72.395 c 60.039 72.559 60.055 72.688 60.055 72.895
+ c 60.055 73.063 60.027 73.246 60.016 73.398 c 61.598 73.27 63.129 73.258
+ 64.57 73.258 c 63.914 74.387 61.906 77.418 61.316 78.301 c 61.055 78.664
+ 59.758 80.414 59.473 80.809 c 59.473 81.223 l 60.773 81.145 61.43 81.145
+ 63.195 81.145 c 65.703 81.145 66.539 81.215 66.926 81.223 c 66.887 81.094
+ 66.863 80.898 66.863 80.711 c 66.863 80.477 66.898 80.336 66.926 80.18
+c 66.438 80.211 65.949 80.23 65.457 80.27 c 64.738 80.336 63.668 80.359
+63.078 80.359 c 61.84 80.359 l 62.176 79.797 62.59 79.148 63.234 78.184
+c 64.363 76.484 l f
+72.105 77.359 m 72.645 76.434 73.148 75.469 73.727 74.547 c 73.918 74.234
+ 74.859 72.738 75.051 72.395 c 74.91 72.445 74.77 72.469 74.512 72.469 c
+ 74.227 72.469 73.969 72.434 73.766 72.395 c 72.836 74.426 72.633 74.863
+ 71.539 76.746 c 70.445 74.824 69.953 73.809 69.285 72.395 c 68.914 72.461
+ 68.539 72.469 68.23 72.469 c 67.949 72.469 67.652 72.445 67.176 72.395
+c 67.844 73.512 68.938 75.293 69.594 76.422 c 70.355 77.734 l 70.355 78.531
+ 70.316 80.215 70.277 81.223 c 70.52 81.195 70.883 81.145 71.137 81.145
+c 71.434 81.145 71.73 81.195 72.027 81.223 c 71.977 80.027 71.938 79.332
+ 71.938 78.254 c 71.938 77.773 l 71.938 77.656 72.016 77.516 72.105 77.359
+ c f
+85.414 81.145 m 85.656 81.145 85.953 81.145 86.559 81.223 c 85.656 80.398
+ 83.805 77.957 83.148 77.09 c 82.465 76.188 l 83.406 75.164 83.609 74.965
+ 84.254 74.34 c 84.793 73.809 85.695 72.945 86.352 72.395 c 85.965 72.461
+ 85.707 72.469 85.492 72.469 c 85.273 72.469 85.027 72.445 84.887 72.395
+ c 84.5 72.934 83.805 73.68 83.238 74.297 c 82.504 75.098 81.992 75.637
+81.039 76.473 c 81.039 75.801 81.039 75.07 81.051 74.426 c 81.063 73.965
+ 81.063 73.023 81.152 72.395 c 80.859 72.434 80.535 72.469 80.254 72.469
+ c 79.98 72.469 79.648 72.422 79.352 72.395 c 79.453 73.68 79.469 73.898
+ 79.469 75.371 c 79.469 78.906 79.469 79.047 79.352 81.223 c 79.621 81.215
+ 79.98 81.145 80.254 81.145 c 80.563 81.145 80.934 81.215 81.152 81.223
+c 81.039 79.855 81.039 78.43 81.039 77.012 c 82.402 78.52 83.406 79.934
+84.32 81.223 c 84.691 81.195 85.105 81.145 85.414 81.145 c f
+90.902 74.465 m 92.113 77.633 l 91.715 77.656 91.332 77.684 90.93 77.684
+ c 90.48 77.684 90.043 77.645 89.594 77.633 c h
+87.07 81.223 m 87.25 81.195 87.43 81.145 87.648 81.145 c 87.855 81.145
+88.098 81.195 88.266 81.223 c 88.473 80.488 88.883 79.422 89.297 78.43 c
+ 89.813 78.402 90.324 78.383 90.84 78.383 c 91.395 78.383 91.934 78.402
+92.488 78.43 c 93.027 79.797 l 93.566 81.223 l 93.801 81.215 94.16 81.145
+ 94.52 81.145 c 94.883 81.145 95.332 81.215 95.527 81.223 c 94.945 79.973
+ 94.098 78.031 93.609 76.914 c 93.145 75.832 92.371 74.027 91.754 72.266
+ c 91.613 72.301 91.484 72.332 91.344 72.332 c 91.188 72.332 91.059 72.301
+ 90.918 72.266 c 90.609 73.32 89.863 74.996 88.563 77.898 c 87.07 81.223
+ l f
+93.066 70.527 m 93.156 70.465 93.336 70.336 93.336 70.051 c 93.336 69.727
+ 93.055 69.523 92.73 69.523 c 92.5 69.523 92.281 69.688 92.113 69.875 c
+90.301 71.824 l 90.957 71.824 l 93.066 70.527 l f
+97.938 73.09 m 98.129 73.074 98.609 73.023 98.852 73.023 c 99.277 73.023
+ 99.699 73.09 100.047 73.348 c 100.496 73.68 100.59 74.145 100.59 74.684
+ c 100.59 75.52 100.113 76.465 98.828 76.465 c 98.492 76.465 98.18 76.434
+ 97.938 76.422 c h
+98.246 77.027 m 98.941 78.008 99.742 79.137 100.395 80.152 c 100.59 80.449
+ 100.875 80.926 101.063 81.223 c 101.449 81.172 101.605 81.145 102.109 81.145
+ c 102.57 81.145 102.895 81.184 103.254 81.223 c 102.441 80.211 102.094
+79.758 101.078 78.324 c 100.883 78.055 100.602 77.633 100.41 77.359 c 100.047
+ 76.848 l 101.219 76.629 102.289 75.895 102.289 74.465 c 102.289 73.922
+102.082 73.398 101.695 73.023 c 101.145 72.5 100.512 72.395 99.676 72.395
+ c 99.379 72.395 97.887 72.461 97.551 72.461 c 96.895 72.461 96.563 72.422
+ 96.266 72.395 c 96.355 74.051 96.355 74.234 96.355 75.922 c 96.355 78.402
+ 96.344 78.684 96.238 81.223 c 96.523 81.184 96.832 81.145 97.129 81.145
+ c 97.449 81.145 97.73 81.195 97.988 81.223 c 97.988 80.887 97.938 79.227
+ 97.938 78.852 c 97.938 77.027 l 98.246 77.027 l f
+111.289 76.848 m 111.289 78.684 110.441 80.75 108.254 80.75 c 106.039 80.75
+ 105.215 78.762 105.215 76.848 c 105.215 75.086 106.039 72.945 108.254 72.945
+ c 110.504 72.945 111.289 74.754 111.289 76.848 c h
+103.453 77.004 m 103.453 79.816 105.574 81.398 108.254 81.398 c 111.109
+ 81.398 113.055 79.563 113.055 76.691 c 113.055 73.602 110.699 72.293 108.293
+ 72.293 c 105.691 72.293 103.453 73.73 103.453 77.004 c f
+116.09 80.383 m 115.859 80.383 l 115.844 79.68 115.82 78.84 115.82 77.938
+ c 115.82 75.961 115.859 74.34 115.945 72.395 c 115.625 72.445 115.371 72.469
+ 115.047 72.469 c 114.727 72.469 114.48 72.461 114.16 72.395 c 114.172 72.637
+ 114.195 73.797 114.211 74.066 c 114.25 75.215 114.25 75.34 114.25 75.906
+ c 114.25 77.711 l 114.25 78.031 114.16 81.016 114.16 81.223 c 115.098 81.172
+ 115.793 81.145 116.617 81.145 c 117.313 81.145 118.418 81.195 119.074 81.223
+ c 119.023 81.055 119.012 80.977 119.012 80.781 c 119.012 80.488 119.039
+ 80.414 119.074 80.27 c 118.316 80.383 116.461 80.383 116.09 80.383 c f
+123.156 77.359 m 123.699 76.434 124.199 75.469 124.777 74.547 c 124.969
+ 74.234 125.91 72.738 126.102 72.395 c 125.961 72.445 125.82 72.469 125.563
+ 72.469 c 125.281 72.469 125.02 72.434 124.816 72.395 c 123.887 74.426 123.684
+ 74.863 122.59 76.746 c 121.496 74.824 121.004 73.809 120.336 72.395 c 119.965
+ 72.461 119.59 72.469 119.281 72.469 c 119 72.469 118.703 72.445 118.227
+ 72.395 c 118.895 73.512 119.988 75.293 120.648 76.422 c 121.406 77.734
+l 121.406 78.531 121.367 80.215 121.328 81.223 c 121.57 81.195 121.934 81.145
+ 122.191 81.145 c 122.484 81.145 122.781 81.195 123.078 81.223 c 123.027
+ 80.027 122.988 79.332 122.988 78.254 c 122.988 77.773 l 122.988 77.656
+123.066 77.516 123.156 77.359 c f
+136.465 81.145 m 136.707 81.145 137.004 81.145 137.609 81.223 c 136.707
+ 80.398 134.855 77.957 134.199 77.09 c 133.516 76.188 l 134.457 75.164 134.66
+ 74.965 135.309 74.34 c 135.848 73.809 136.746 72.945 137.402 72.395 c 137.02
+ 72.461 136.758 72.469 136.543 72.469 c 136.324 72.469 136.078 72.445 135.938
+ 72.395 c 135.551 72.934 134.855 73.68 134.289 74.297 c 133.555 75.098 133.043
+ 75.637 132.09 76.473 c 132.09 75.801 132.09 75.07 132.102 74.426 c 132.113
+ 73.965 132.113 73.023 132.207 72.395 c 131.91 72.434 131.586 72.469 131.305
+ 72.469 c 131.031 72.469 130.699 72.422 130.402 72.395 c 130.508 73.68 130.516
+ 73.898 130.516 75.371 c 130.516 78.906 130.516 79.047 130.402 81.223 c
+130.672 81.215 131.031 81.145 131.305 81.145 c 131.613 81.145 131.984 81.215
+ 132.207 81.223 c 132.09 79.855 132.09 78.43 132.09 77.012 c 133.453 78.52
+ 134.457 79.934 135.371 81.223 c 135.742 81.195 136.156 81.145 136.465 81.145
+ c f
+141.98 77.684 m 141.531 77.684 141.094 77.645 140.645 77.633 c 141.957
+74.465 l 143.164 77.633 l 142.766 77.656 142.383 77.684 141.98 77.684 c
h
-122.543 4.34 m 133.91 4.34 l 133.879 5.828 l 132.645 7.59 l 123.801 7.59
- l 122.57 5.828 l h
-122.816 8.32 m 133.637 8.32 l 133.637 9.754 l 122.816 9.754 l h
-122.066 8.418 m 122.066 9.961 l 119.551 11.012 l 119.551 9.039 l h
-134.379 8.418 m 136.898 9.039 l 136.898 11.012 l 134.379 9.961 l h
-134.379 8.418 m f
-110.035 33.992 m 110.59 33.992 110.848 34.793 110.848 35.598 c 110.848
-36.398 110.848 39.301 110.848 39.301 c 109.223 39.301 l 109.223 39.301 109.223
- 36.398 109.223 35.598 c 109.223 34.793 109.484 33.992 110.035 33.992 c f
-110.035 42.824 m 110.59 42.824 110.848 43.625 110.848 44.43 c 110.848 45.23
- 110.848 48.133 110.848 48.133 c 109.223 48.133 l 109.223 48.133 109.223
- 45.23 109.223 44.43 c 109.223 43.625 109.484 42.824 110.035 42.824 c f
-110.035 54.191 m 110.59 54.191 110.848 54.992 110.848 55.793 c 110.848
-56.598 110.848 59.5 110.848 59.5 c 109.223 59.5 l 109.223 59.5 109.223 56.598
- 109.223 55.793 c 109.223 54.992 109.484 54.191 110.035 54.191 c f
-66.293 27.242 m 65.438 27.242 64.746 26.547 64.746 25.691 c 64.746 24.84
- 65.438 24.145 66.293 24.145 c 67.148 24.145 67.84 24.84 67.84 25.691 c
-67.84 26.547 67.148 27.242 66.293 27.242 c f
-0 0.278431 0.423529 rg
-2.016 73.594 m 2.98 73.594 l 3.387 73.594 3.934 73.578 4.141 73.961 c 4.18
- 73.961 l 4.18 72.578 l 4.141 72.578 l 3.984 72.656 3.777 72.656 3.57 72.656
- c 2.016 72.656 l 2.016 70.23 l 2.434 70.152 2.891 70.141 3.344 70.141 c
- 3.945 70.141 4.48 70.191 4.887 70.66 c 4.922 70.66 l 4.922 69.137 l 4.887
- 69.137 l 4.715 69.227 4.496 69.199 4.273 69.199 c 0.098 69.199 l 0.098
-69.238 l 0.766 69.488 0.688 70.441 0.688 71.039 c 0.688 75.953 l 0.688 76.543
- 0.766 77.508 0.098 77.742 c 0.098 77.781 l 5.539 77.781 l 6.125 76.07 l
- 6.086 76.07 l 5.434 76.648 4.535 76.918 3.672 76.844 c 2.016 76.684 l 2.016
- 73.594 l f*
-14.902 69.277 m 14.277 69.082 13.613 68.992 12.957 68.992 c 11.367 68.992
- 9.684 69.621 9.684 71.262 c 9.684 74.023 14.172 73.66 14.172 75.695 c 14.172
- 76.605 13.051 77.051 12.305 77.051 c 11.289 77.051 10.219 76.633 9.449
-75.969 c 9.828 77.598 l 10.574 77.871 11.367 77.988 12.164 77.988 c 14.195
- 77.988 15.656 76.688 15.656 75.289 c 15.656 72.879 11.168 72.902 11.168
- 71.117 c 11.168 70.215 12.109 69.93 12.855 69.93 c 13.582 69.93 14.391
-70.23 14.902 70.754 c 14.902 69.277 l f*
-26.078 77.781 m 26.805 76.125 l 26.77 76.125 l 25.961 76.605 25.141 76.895
- 24.188 76.844 c 21.449 76.684 l 26.141 69.199 l 20.379 69.199 l 19.715
-70.699 l 19.754 70.699 l 20.43 70.258 20.898 70.086 21.707 70.141 c 23.926
- 70.27 l 19.203 77.781 l 26.078 77.781 l f*
-33.484 70.141 m 34.656 70.141 l 35.09 70.141 35.609 70.203 35.777 70.66
- c 35.816 70.66 l 36.234 69.105 l 36.199 69.105 l 36.027 69.188 35.816 69.199
- 35.598 69.199 c 30.41 69.199 l 30.238 69.176 30.066 69.176 29.914 69.105
- c 29.871 69.105 l 29.414 70.66 l 29.457 70.66 l 29.859 70.281 30.445 70.141
- 31.004 70.141 c 32.156 70.141 l 32.156 75.953 l 32.156 76.543 32.234 77.492
- 31.582 77.742 c 31.582 77.781 l 34.164 77.781 l 34.164 77.742 l 33.473
-77.336 33.484 76.832 33.484 76.086 c 33.484 70.141 l f*
-41.352 73.594 m 42.316 73.594 l 42.719 73.594 43.27 73.578 43.477 73.961
- c 43.516 73.961 l 43.516 72.578 l 43.477 72.578 l 43.32 72.656 43.113 72.656
- 42.902 72.656 c 41.352 72.656 l 41.352 70.23 l 41.77 70.152 42.223 70.141
- 42.68 70.141 c 43.281 70.141 43.816 70.191 44.223 70.66 c 44.258 70.66
-l 44.258 69.137 l 44.223 69.137 l 44.051 69.227 43.828 69.199 43.609 69.199
- c 39.434 69.199 l 39.434 69.238 l 40.102 69.488 40.02 70.441 40.02 71.039
- c 40.02 75.953 l 40.02 76.543 40.102 77.508 39.434 77.742 c 39.434 77.781
- l 44.875 77.781 l 45.461 76.07 l 45.418 76.07 l 44.766 76.648 43.871 76.918
- 43.008 76.844 c 41.352 76.684 l 41.352 73.594 l f*
-49.164 69.199 m 49.164 69.238 l 49.828 69.488 49.734 70.441 49.734 71.039
- c 49.734 75.957 l 49.734 76.543 49.828 77.508 49.164 77.742 c 49.164 77.785
- l 51.652 77.785 l 51.652 77.742 l 50.988 77.508 51.066 76.555 51.066 75.957
- c 51.066 70.113 l 51.367 70.059 51.652 70.023 51.953 70.008 c 52.828 69.973
- 53.637 70.516 53.637 71.457 c 53.637 72.684 52.422 73.164 51.383 73.324
- c 52.578 75.16 l 54.172 77.133 l 54.559 77.613 54.992 77.785 55.684 77.785
- c 56.883 77.785 l 56.137 77.313 55.316 76.633 54.773 75.957 c 52.891 73.594
- l 53.965 73.348 54.965 72.445 54.965 71.301 c 54.965 70.113 54.016 69.199
- 52.266 69.199 c 49.164 69.199 l f
-65.723 73.594 m 65.723 75.953 l 65.723 76.543 65.816 77.492 65.152 77.742
- c 65.152 77.781 l 67.641 77.781 l 67.641 77.742 l 66.977 77.492 67.055
-76.543 67.055 75.953 c 67.055 71.027 l 67.055 70.441 66.977 69.488 67.641
- 69.238 c 67.641 69.199 l 65.152 69.199 l 65.152 69.238 l 65.816 69.488
-65.723 70.441 65.723 71.039 c 65.723 72.656 l 61.02 72.656 l 61.02 71.039
- l 61.02 70.441 60.938 69.488 61.59 69.238 c 61.59 69.199 l 59.113 69.199
- l 59.113 69.238 l 59.777 69.488 59.688 70.441 59.688 71.027 c 59.688 75.953
- l 59.688 76.543 59.766 77.492 59.113 77.742 c 59.113 77.781 l 61.59 77.781
- l 61.59 77.742 l 60.938 77.492 61.02 76.543 61.02 75.953 c 61.02 73.594
- l 65.723 73.594 l f
-74.219 68.77 m 77.762 67.703 l 77.047 66.75 l h
-77.23 74.559 m 77.934 76.398 l 78.289 77.313 78.391 77.457 77.75 77.742
- c 77.75 77.781 l 80.426 77.781 l 80.426 77.742 l 79.68 77.363 79.449 76.633
- 79.148 75.891 c 76.434 69.199 l 74.371 69.199 l 74.371 69.238 l 75 69.434
- 74.75 69.984 74.566 70.453 c 72.395 75.891 l 72.094 76.633 71.883 77.363
- 71.129 77.742 c 71.129 77.781 l 73.527 77.781 l 73.527 77.742 l 72.898
-77.508 72.992 77.129 73.266 76.398 c 73.941 74.559 l h
-76.852 73.594 m 74.285 73.594 l 75.574 70.309 l 76.852 73.594 l f*
-90.43 77.781 m 91.16 76.125 l 91.121 76.125 l 90.313 76.605 89.488 76.895
- 88.539 76.844 c 85.797 76.684 l 90.496 69.199 l 84.73 69.199 l 84.066 70.699
- l 84.105 70.699 l 84.781 70.258 85.254 70.086 86.063 70.141 c 88.277 70.27
- l 83.555 77.781 l 90.43 77.781 l f*
-98.566 74.023 m 101.777 69.199 l 99.492 69.199 l 99.492 69.238 l 100.227
- 69.59 99.926 70.215 99.703 70.543 c 98.086 72.969 l 95.996 69.566 l 95.828
- 69.293 95.441 69.199 95.02 69.199 c 93.836 69.199 l 94.461 69.539 94.719
- 69.973 95.074 70.543 c 97.238 74.023 l 97.238 75.957 l 97.238 76.57 97.332
- 77.414 96.691 77.742 c 96.691 77.785 l 99.23 77.785 l 99.23 77.742 l 98.566
- 77.258 98.566 76.871 98.566 76.086 c 98.566 74.023 l f
-111.73 75.941 m 111.73 76.531 111.809 77.496 111.145 77.742 c 111.145 77.785
- l 113.648 77.785 l 113.648 77.742 l 112.98 77.496 113.063 76.543 113.063
- 75.941 c 113.063 71.027 l 113.063 70.441 112.98 69.477 113.648 69.238 c
- 113.648 69.199 l 111.145 69.199 l 111.145 69.238 l 111.809 69.488 111.73
- 70.441 111.73 71.027 c h
-113.23 73.324 m 116.125 77.223 l 116.359 77.535 116.961 77.785 117.598
-77.785 c 118.828 77.785 l 118.828 77.742 l 118.16 77.414 117.664 77.051
-117.262 76.52 c 114.625 73.059 l 117.625 69.215 l 117.625 69.199 l 115.277
- 69.199 l 115.277 69.238 l 116.152 69.633 115.395 70.453 114.938 71.055
-c 113.23 73.324 l f*
-124.617 68.77 m 128.164 67.703 l 127.449 66.75 l h
-127.629 74.559 m 128.332 76.398 l 128.684 77.313 128.789 77.457 128.148
- 77.742 c 128.148 77.781 l 130.824 77.781 l 130.824 77.742 l 130.078 77.363
- 129.844 76.633 129.547 75.891 c 126.836 69.199 l 124.773 69.199 l 124.773
- 69.238 l 125.398 69.434 125.148 69.984 124.969 70.453 c 122.789 75.891
-l 122.492 76.633 122.281 77.363 121.523 77.742 c 121.523 77.781 l 123.926
- 77.781 l 123.926 77.742 l 123.301 77.508 123.391 77.129 123.664 76.398
-c 124.344 74.559 l h
-127.25 73.594 m 124.68 73.594 l 125.969 70.309 l 127.25 73.594 l f*
-134.348 69.199 m 134.348 69.238 l 135.016 69.488 134.922 70.441 134.922
- 71.039 c 134.922 75.957 l 134.922 76.543 135.016 77.508 134.348 77.742
-c 134.348 77.785 l 136.84 77.785 l 136.84 77.742 l 136.176 77.508 136.25
- 76.555 136.25 75.957 c 136.25 70.113 l 136.551 70.059 136.84 70.023 137.141
- 70.008 c 138.012 69.973 138.82 70.516 138.82 71.457 c 138.82 72.684 137.609
- 73.164 136.563 73.324 c 137.766 75.16 l 139.355 77.133 l 139.746 77.613
- 140.176 77.785 140.867 77.785 c 142.07 77.785 l 141.324 77.313 140.504
-76.633 139.957 75.957 c 138.078 73.594 l 139.148 73.348 140.152 72.445 140.152
- 71.301 c 140.152 70.113 139.199 69.199 137.453 69.199 c 134.348 69.199
-l f
-149.059 68.98 m 146.316 68.953 144.168 70.988 144.168 73.465 c 144.168
-76.137 146.348 77.988 148.93 77.988 c 151.523 77.988 153.727 76.059 153.727
- 73.398 c 153.727 71.055 151.797 69.004 149.059 68.98 c h
-148.965 69.918 m 151.027 69.918 152.238 71.754 152.238 73.66 c 152.238
-75.602 150.977 77.051 148.992 77.051 c 146.941 77.051 145.652 75.172 145.652
- 73.348 c 145.652 71.379 146.941 69.918 148.965 69.918 c f*
-159.508 76.727 m 159.508 71.039 l 159.508 70.453 159.414 69.488 160.078
- 69.238 c 160.078 69.199 l 157.59 69.199 l 157.59 69.238 l 158.254 69.488
- 158.176 70.441 158.176 71.039 c 158.176 75.953 l 158.176 76.543 158.254
- 77.508 157.59 77.742 c 157.59 77.781 l 162.945 77.781 l 163.629 76.047
-l 163.586 76.047 l 162.934 76.594 162.164 76.895 161.277 76.844 c 159.508
- 76.727 l f*
-171.109 74.023 m 174.32 69.199 l 172.035 69.199 l 172.035 69.238 l 172.77
- 69.59 172.469 70.215 172.246 70.543 c 170.629 72.969 l 168.539 69.566 l
- 168.371 69.293 167.98 69.199 167.563 69.199 c 166.379 69.199 l 167.004
-69.539 167.262 69.973 167.617 70.543 c 169.781 74.023 l 169.781 75.957 l
- 169.781 76.57 169.875 77.414 169.234 77.742 c 169.234 77.785 l 171.777
-77.785 l 171.777 77.742 l 171.109 77.258 171.109 76.871 171.109 76.086 c
- 171.109 74.023 l f
-185.656 73.594 m 186.621 73.594 l 187.027 73.594 187.574 73.578 187.781
- 73.961 c 187.82 73.961 l 187.82 72.578 l 187.781 72.578 l 187.625 72.656
- 187.418 72.656 187.207 72.656 c 185.656 72.656 l 185.656 70.23 l 186.074
- 70.152 186.531 70.141 186.984 70.141 c 187.586 70.141 188.121 70.191 188.523
- 70.66 c 188.563 70.66 l 188.563 69.137 l 188.523 69.137 l 188.355 69.227
- 188.137 69.199 187.91 69.199 c 183.738 69.199 l 183.738 69.238 l 184.402
- 69.488 184.328 70.441 184.328 71.039 c 184.328 75.953 l 184.328 76.543
-184.402 77.508 183.738 77.742 c 183.738 77.781 l 189.176 77.781 l 189.766
- 76.07 l 189.727 76.07 l 189.074 76.648 188.172 76.918 187.313 76.844 c
-185.656 76.684 l 185.656 73.594 l f*
-200.664 69.215 m 199.988 69.07 199.313 68.992 198.617 68.992 c 195.461
-68.992 193.234 70.738 193.234 73.543 c 193.234 76.164 195.203 77.992 198.539
- 77.992 c 199.598 77.992 200.613 77.797 201.656 77.598 c 201.578 77.414
-201.594 77.207 201.594 77.012 c 201.594 74.012 l 201.594 73.816 201.594
-73.609 201.656 73.453 c 201.656 73.414 l 199.664 73.414 l 199.664 73.453
- l 200.246 73.688 200.262 74.328 200.262 74.926 c 200.262 76.805 l 199.676
- 76.977 199.051 77.051 198.449 77.051 c 196.387 77.051 194.719 75.461 194.719
- 73.359 c 194.719 71.262 196.273 69.93 198.305 69.93 c 199.098 69.93 200.094
- 70.113 200.629 70.711 c 200.664 70.711 l 200.664 69.215 l f
-209.133 74.023 m 212.34 69.199 l 210.059 69.199 l 210.059 69.238 l 210.789
- 69.59 210.488 70.215 210.266 70.543 c 208.652 72.969 l 206.563 69.566 l
- 206.395 69.293 206 69.199 205.586 69.199 c 204.398 69.199 l 205.023 69.539
- 205.285 69.973 205.637 70.543 c 207.801 74.023 l 207.801 75.957 l 207.801
- 76.57 207.891 77.414 207.254 77.742 c 207.254 77.785 l 209.797 77.785 l
- 209.797 77.742 l 209.133 77.258 209.133 76.871 209.133 76.086 c 209.133
- 74.023 l f
-217.309 73.594 m 218.273 73.594 l 218.68 73.594 219.227 73.578 219.434
-73.961 c 219.477 73.961 l 219.477 72.578 l 219.434 72.578 l 219.277 72.656
- 219.07 72.656 218.859 72.656 c 217.309 72.656 l 217.309 70.23 l 217.727
- 70.152 218.18 70.141 218.637 70.141 c 219.238 70.141 219.773 70.191 220.176
- 70.66 c 220.215 70.66 l 220.215 69.137 l 220.176 69.137 l 220.008 69.227
- 219.785 69.199 219.566 69.199 c 215.391 69.199 l 215.391 69.238 l 216.055
- 69.488 215.98 70.441 215.98 71.039 c 215.98 75.953 l 215.98 76.543 216.055
- 77.508 215.391 77.742 c 215.391 77.781 l 220.828 77.781 l 221.418 76.07
- l 221.375 76.07 l 220.723 76.648 219.828 76.918 218.965 76.844 c 217.309
- 76.684 l 217.309 73.594 l f*
-228.199 70.141 m 229.371 70.141 l 229.801 70.141 230.324 70.203 230.492
- 70.66 c 230.535 70.66 l 230.949 69.105 l 230.91 69.105 l 230.742 69.188
- 230.535 69.199 230.309 69.199 c 225.121 69.199 l 224.953 69.176 224.781
- 69.176 224.625 69.105 c 224.586 69.105 l 224.129 70.66 l 224.168 70.66
-l 224.57 70.281 225.16 70.141 225.719 70.141 c 226.867 70.141 l 226.867
-75.953 l 226.867 76.543 226.945 77.492 226.293 77.742 c 226.293 77.781 l
- 228.875 77.781 l 228.875 77.742 l 228.184 77.336 228.199 76.832 228.199
- 76.086 c 228.199 70.141 l f*
-236.066 73.594 m 237.027 73.594 l 237.434 73.594 237.98 73.578 238.188
-73.961 c 238.23 73.961 l 238.23 72.578 l 238.188 72.578 l 238.031 72.656
- 237.824 72.656 237.617 72.656 c 236.066 72.656 l 236.066 70.23 l 236.484
- 70.152 236.938 70.141 237.395 70.141 c 237.996 70.141 238.531 70.191 238.934
- 70.66 c 238.973 70.66 l 238.973 69.137 l 238.934 69.137 l 238.766 69.227
- 238.543 69.199 238.32 69.199 c 234.148 69.199 l 234.148 69.238 l 234.813
- 69.488 234.734 70.441 234.734 71.039 c 234.734 75.953 l 234.734 76.543
-234.813 77.508 234.148 77.742 c 234.148 77.781 l 239.586 77.781 l 240.172
- 76.07 l 240.133 76.07 l 239.48 76.648 238.582 76.918 237.719 76.844 c 236.066
- 76.684 l 236.066 73.594 l f*
-249.379 75.551 m 246.926 69.801 l 246.852 69.621 246.746 69.422 246.746
- 69.215 c 246.746 69.199 l 244.465 69.199 l 244.465 69.238 l 245.063 69.566
- 244.918 70.086 244.867 70.453 c 244.121 75.918 l 244.031 76.617 243.941
- 77.258 243.395 77.742 c 243.395 77.785 l 245.52 77.785 l 245.52 77.742
-l 244.906 77.469 244.996 76.895 245.102 76.098 c 245.844 70.492 l 248.324
- 76.375 l 248.637 77.105 248.82 77.457 249.469 77.953 c 252.391 70.48 l
-253.137 76.766 l 253.137 77.207 253.055 77.598 252.602 77.742 c 252.602
-77.785 l 255.117 77.785 l 255.117 77.742 l 254.594 77.375 254.531 77.027
- 254.453 76.414 c 253.594 70.008 l 253.594 69.707 253.68 69.332 253.996
-69.238 c 253.996 69.199 l 251.738 69.199 l 251.738 69.215 l 251.738 69.488
- 251.648 69.75 251.543 70.023 c 249.379 75.551 l f
-0.098 83.441 255.02 1.027 re f
-0.098 62.516 255.02 1.027 re f
+142.805 72.266 m 142.664 72.301 142.535 72.332 142.395 72.332 c 142.238
+ 72.332 142.109 72.301 141.969 72.266 c 141.66 73.32 140.914 74.996 139.613
+ 77.898 c 138.121 81.223 l 138.301 81.195 138.48 81.145 138.699 81.145 c
+ 138.906 81.145 139.148 81.195 139.316 81.223 c 139.523 80.488 139.934 79.422
+ 140.348 78.43 c 140.863 78.402 141.375 78.383 141.891 78.383 c 142.445
+78.383 142.984 78.402 143.539 78.43 c 144.078 79.797 l 144.617 81.223 l
+144.852 81.215 145.211 81.145 145.57 81.145 c 145.934 81.145 146.383 81.215
+ 146.578 81.223 c 145.996 79.973 145.148 78.031 144.66 76.914 c 144.195
+75.832 143.422 74.027 142.805 72.266 c f
+150.039 73.258 m 150.926 73.258 151.84 73.27 152.602 73.348 c 152.559 73.137
+ 152.535 73.023 152.535 72.883 c 152.535 72.777 152.559 72.613 152.602 72.395
+ c 151.363 72.461 150.23 72.469 149.164 72.469 c 148.176 72.469 146.746
+72.461 145.727 72.395 c 145.766 72.547 145.793 72.715 145.793 72.871 c 145.793
+ 73.023 145.766 73.191 145.727 73.348 c 146.383 73.281 147.621 73.258 147.734
+ 73.258 c 148.379 73.258 l 148.391 73.758 148.406 74.211 148.406 74.684
+c 148.418 78.273 l 148.418 79.254 148.34 80.246 148.289 81.223 c 148.754
+ 81.172 148.945 81.145 149.164 81.145 c 149.316 81.145 149.73 81.184 150.105
+ 81.223 c 150.063 80.863 150.012 80.438 150.012 79.465 c 150.012 74.699
+l 150.012 74.211 150.027 73.719 150.039 73.258 c f
+157.34 72.945 m 159.594 72.945 160.379 74.754 160.379 76.848 c 160.379
+78.684 159.531 80.75 157.34 80.75 c 155.129 80.75 154.305 78.762 154.305
+ 76.848 c 154.305 75.086 155.129 72.945 157.34 72.945 c h
+157.34 81.398 m 160.199 81.398 162.145 79.563 162.145 76.691 c 162.145
+73.602 159.789 72.293 157.379 72.293 c 154.781 72.293 152.543 73.73 152.543
+ 77.004 c 152.543 79.816 154.664 81.398 157.34 81.398 c f
+165.52 80.383 m 165.289 80.383 l 165.277 79.68 165.25 78.84 165.25 77.938
+ c 165.25 75.961 165.289 74.34 165.379 72.395 c 165.059 72.445 164.801 72.469
+ 164.48 72.469 c 164.156 72.469 163.914 72.461 163.59 72.395 c 163.602 72.637
+ 163.629 73.797 163.641 74.066 c 163.684 75.215 163.684 75.34 163.684 75.906
+ c 163.684 77.711 l 163.684 78.031 163.59 81.016 163.59 81.223 c 164.531
+ 81.172 165.223 81.145 166.051 81.145 c 166.742 81.145 167.852 81.195 168.508
+ 81.223 c 168.457 81.055 168.441 80.977 168.441 80.781 c 168.441 80.488
+168.469 80.414 168.508 80.27 c 167.75 80.383 165.895 80.383 165.52 80.383
+ c f
+170.609 72.469 m 170.418 72.469 169.941 72.422 169.699 72.395 c 169.824
+ 73.641 169.824 74.555 169.824 75.371 c 169.824 77.566 169.824 79.691 169.684
+ 81.223 c 169.969 81.215 170.328 81.145 170.609 81.145 c 170.906 81.145
+171.215 81.215 171.512 81.223 c 171.41 80.18 171.383 78.793 171.383 76.875
+ c 171.383 75.57 171.383 73.348 171.523 72.395 c 171.215 72.434 170.895
+72.469 170.609 72.469 c f
+179.383 81.145 m 179.625 81.145 179.922 81.145 180.527 81.223 c 179.625
+ 80.398 177.773 77.957 177.117 77.09 c 176.434 76.188 l 177.371 75.164 177.578
+ 74.965 178.223 74.34 c 178.762 73.809 179.664 72.945 180.32 72.395 c 179.934
+ 72.461 179.68 72.469 179.457 72.469 c 179.238 72.469 178.996 72.445 178.852
+ 72.395 c 178.465 72.934 177.773 73.68 177.207 74.297 c 176.473 75.098 175.957
+ 75.637 175.004 76.473 c 175.004 75.801 175.004 75.07 175.016 74.426 c 175.031
+ 73.965 175.031 73.023 175.121 72.395 c 174.824 72.434 174.504 72.469 174.219
+ 72.469 c 173.949 72.469 173.617 72.422 173.32 72.395 c 173.422 73.68 173.434
+ 73.898 173.434 75.371 c 173.434 78.906 173.434 79.047 173.32 81.223 c 173.59
+ 81.215 173.949 81.145 174.219 81.145 c 174.527 81.145 174.902 81.215 175.121
+ 81.223 c 175.004 79.855 175.004 78.43 175.004 77.012 c 176.367 78.52 177.371
+ 79.934 178.285 81.223 c 178.66 81.195 179.07 81.145 179.379 81.145 c f
+181.355 78.891 m 181.641 80.887 183.492 81.379 185.039 81.379 c 185.73
+81.379 186.594 81.215 187.199 80.824 c 188.047 80.281 188.484 79.59 188.512
+ 78.066 c 188.539 76.766 188.578 74.121 188.641 73.012 c 188.68 72.395 l
+ 188.484 72.422 188.277 72.469 188.074 72.469 c 187.867 72.469 187.676 72.422
+ 187.496 72.395 c 187.598 74.066 187.609 75.754 187.609 77.426 c 187.609
+ 78.48 187.547 78.883 187.445 79.168 c 187.16 79.945 186.336 80.488 185.293
+ 80.488 c 184.395 80.488 183.699 80.211 183.324 79.707 c 182.953 79.199
+182.926 78.738 182.926 76.691 c 182.926 75.586 182.926 74.348 182.965 73.375
+ c 183.004 72.395 l 182.746 72.434 182.449 72.469 182.168 72.469 c 181.883
+ 72.469 181.563 72.434 181.266 72.395 c 181.305 73.051 181.332 74.051 181.332
+ 74.715 c 181.332 78.215 l 181.332 78.324 181.332 78.715 181.355 78.891
+c f
+192.301 80.77 m 191.543 80.77 190.898 80.582 190.309 79.293 c 190.125 79.293
+ l 190.063 79.914 190.047 80.082 189.828 80.75 c 190.293 80.977 191.129
+81.398 192.238 81.398 c 194.594 81.398 195.508 79.895 195.508 78.586 c 195.508
+ 78.223 195.414 77.465 194.875 76.883 c 194.504 76.473 194.117 76.336 193.125
+ 75.945 c 191.992 75.508 191.336 75.254 191.336 74.313 c 191.336 73.551
+191.84 72.922 192.855 72.922 c 193.664 72.922 194.348 73.305 194.543 74.043
+ c 194.723 74.043 l 194.84 73.551 194.863 73.449 195.121 72.816 c 194.488
+ 72.539 193.922 72.293 192.984 72.293 c 190.652 72.293 189.984 73.73 189.984
+ 74.863 c 189.984 75.934 190.359 76.59 191.605 77.141 c 191.965 77.297 192.574
+ 77.527 192.934 77.684 c 193.176 77.789 193.988 78.145 193.988 79.168 c
+193.988 80.09 193.32 80.77 192.301 80.77 c f
+202.266 80.426 m 202.266 76.934 l 202.855 76.934 203.461 76.949 204.051
+ 76.965 c 204.375 76.977 204.711 77.004 205.043 77.027 c 205.004 76.934
+204.98 76.766 204.98 76.59 c 204.98 76.395 205.004 76.266 205.043 76.129
+ c 204.363 76.207 202.918 76.215 202.266 76.215 c 202.266 73.191 l 203.449
+ 73.191 203.578 73.191 204.051 73.215 c 205.266 73.281 l 205.223 73.18 205.199
+ 73.004 205.199 72.805 c 205.199 72.648 205.223 72.547 205.266 72.395 c
+204.336 72.422 203.484 72.469 202.895 72.469 c 202.199 72.469 201.199 72.434
+ 200.566 72.395 c 200.656 73.68 200.684 76.168 200.684 76.707 c 200.684
+77.297 200.656 78.871 200.633 79.613 c 200.617 80.152 200.59 80.68 200.566
+ 81.223 c 201.387 81.172 202.199 81.145 202.973 81.145 c 203.797 81.145
+204.566 81.172 205.34 81.223 c 205.289 81.082 205.277 80.957 205.277 80.758
+ c 205.277 80.582 205.289 80.449 205.34 80.336 c 204.246 80.383 202.598
+80.426 202.266 80.426 c f
+213.828 77.258 m 213.492 77.258 213.195 77.211 212.914 77.172 c 212.949
+ 77.797 212.992 78.43 212.992 79.059 c 212.992 79.227 212.992 79.332 212.949
+ 80.23 c 212.438 80.566 211.73 80.695 211.125 80.695 c 209.953 80.695 209.258
+ 80.133 208.797 79.523 c 208.191 78.738 208.012 77.813 208.012 76.836 c
+208.012 74.398 209.156 72.984 211.305 72.984 c 213.16 72.984 213.609 73.887
+ 213.762 74.195 c 213.891 74.195 l 214.277 72.934 l 213.246 72.469 212.32
+ 72.293 211.266 72.293 c 207.832 72.293 206.246 74.363 206.246 76.949 c
+206.246 79.844 208.332 81.398 210.84 81.398 c 212.078 81.398 213.48 81.082
+ 214.574 80.504 c 214.547 80.141 214.535 79.816 214.535 79.332 c 214.535
+ 78.98 214.563 77.633 214.637 77.172 c 214.367 77.219 214.188 77.258 213.828
+ 77.258 c f
+Q q
+0 85.992 255.113 1.715 re W n
+q
+0 85 256 3 re W n
+ q
+0.0666667 0.247059 0.380392 rg
+0 86.469 255.117 1.234 re f
+ Q
+Q
+Q q
+0.0666667 0.247059 0.380392 rg
+175.465 19.141 m 175.453 19.172 175.449 19.199 175.445 19.223 c 175.273
+ 19.352 l 175.27 19.406 l 181.699 19.398 l 181.289 19.141 l 179.262 17.863
+ l 179.195 17.82 l 179.191 17.602 l 179.004 17.477 l 178.977 17.352 178.914
+ 16.965 179.176 16.68 c 179.434 16.484 179.605 16.133 179.605 15.73 c 179.605
+ 15.68 179.609 15.383 179.434 15.082 c 179.371 14.98 179.305 14.891 179.219
+ 14.82 c 179.215 14.758 179.191 14.582 179.063 14.473 c 179.02 14.434 178.977
+ 14.398 178.922 14.379 c 178.926 14.363 178.926 14.348 178.926 14.34 c 178.926
+ 14.246 178.875 14.164 178.805 14.125 c 178.777 14.102 178.746 14.094 178.707
+ 14.094 c 178.59 14.094 178.492 14.199 178.492 14.34 c 178.492 14.348 178.496
+ 14.363 178.496 14.379 c 178.332 14.461 178.219 14.625 178.203 14.82 c 177.969
+ 15.02 177.816 15.352 177.816 15.73 c 177.816 16.129 177.98 16.469 178.23
+ 16.668 c 178.355 16.809 178.523 17.074 178.434 17.391 c 178.426 17.422
+178.418 17.449 178.414 17.477 c 178.242 17.602 l 178.23 17.797 l 176.066
+ 19.051 l 176.012 19.086 l 175.996 18.914 176.012 18.641 176.207 18.426
+c 176.461 18.234 176.633 17.883 176.633 17.48 c 176.633 17.426 176.637 17.133
+ 176.461 16.832 c 176.402 16.727 176.332 16.641 176.25 16.566 c 176.242
+16.508 176.219 16.332 176.09 16.223 c 176.051 16.184 176.004 16.148 175.953
+ 16.129 c 175.953 16.113 175.957 16.098 175.957 16.09 c 175.957 15.988 175.906
+ 15.914 175.836 15.871 c 175.805 15.852 175.773 15.844 175.742 15.844 c
+175.621 15.844 175.523 15.949 175.523 16.09 c 175.523 16.098 175.523 16.113
+ 175.527 16.129 c 175.363 16.207 175.25 16.375 175.23 16.566 c 174.996 16.77
+ 174.844 17.102 174.844 17.48 c 174.844 17.879 175.012 18.219 175.258 18.418
+ c 175.387 18.559 175.555 18.82 175.461 19.141 c f
+192.418 51.805 3.563 0.246 re f
+186.059 51.805 3.566 0.246 re f
+192.762 59.707 m 192.762 61.633 l 195.637 61.633 l 195.637 56.895 l 195.637
+ 56.895 194.969 56.699 194.227 56.668 c 193.453 56.699 192.762 56.883 192.762
+ 56.883 c 192.762 59.707 l f
+186.402 59.707 m 186.402 61.633 l 189.277 61.633 l 189.277 56.895 l 189.277
+ 56.895 188.609 56.699 187.867 56.668 c 187.098 56.699 186.402 56.883 186.402
+ 56.883 c 186.402 59.707 l f
+147.152 61.602 m 147.152 56.863 l 147.152 56.863 146.676 56.672 146.145
+ 56.637 c 145.594 56.672 145.102 56.855 145.102 56.855 c 145.102 61.602
+l 147.152 61.602 l f
+144.828 51.77 2.574 0.227 re f
+175.176 51.793 3.559 0.25 re f
+168.977 51.793 3.563 0.25 re f
+162.777 51.793 3.559 0.25 re f
+156.578 51.793 3.559 0.25 re f
+150.379 51.793 3.559 0.25 re f
+175.516 59.711 m 175.516 61.637 l 178.387 61.637 l 178.387 56.898 l 178.387
+ 56.898 177.719 56.707 176.977 56.672 c 176.207 56.711 175.516 56.887 175.516
+ 56.887 c 175.516 59.711 l f
+169.313 59.711 m 169.313 61.637 l 172.188 61.637 l 172.188 56.898 l 172.188
+ 56.898 171.52 56.707 170.777 56.672 c 170.008 56.711 169.313 56.887 169.313
+ 56.887 c 169.313 59.711 l f
+163.117 59.711 m 163.117 61.637 l 165.988 61.637 l 165.988 56.898 l 165.988
+ 56.898 165.32 56.707 164.578 56.672 c 163.809 56.711 163.117 56.887 163.117
+ 56.887 c 163.117 59.711 l f
+159.789 61.637 m 159.789 56.898 l 159.789 56.898 159.121 56.707 158.383
+ 56.672 c 157.609 56.711 156.918 56.887 156.918 56.887 c 156.918 61.637
+l 159.789 61.637 l f
+150.719 59.711 m 150.719 61.637 l 153.59 61.637 l 153.59 56.898 l 153.59
+ 56.898 152.922 56.707 152.18 56.672 c 151.41 56.711 150.719 56.887 150.719
+ 56.887 c 150.719 59.711 l f
+132.926 34.711 m 133.484 34.711 l 133.484 34.355 l 133.484 34.355 134.18
+ 33.891 135.488 33.891 c 136.809 33.891 137.492 34.355 137.492 34.355 c
+137.492 34.711 l 138.027 34.711 l 138.027 33.891 l 138.414 33.891 l 138.414
+ 33.227 l 132.555 33.227 l 132.555 33.891 l 132.926 33.891 l 132.926 34.711
+ l f
+127.559 55.273 m 125.719 55.297 124.84 56.672 124.762 57.758 c 124.746
+64.797 l 130.371 64.797 l 130.355 57.758 l 130.277 56.672 129.398 55.297
+ 127.559 55.273 c f
+119.543 55.887 m 118.234 55.887 117.594 56.805 117.547 57.758 c 117.539
+ 64.797 l 121.555 64.797 l 121.539 57.758 l 121.488 56.805 120.852 55.887
+ 119.543 55.887 c f
+135.574 55.887 m 134.266 55.887 133.629 56.805 133.578 57.758 c 133.566
+ 64.797 l 137.582 64.797 l 137.574 57.758 l 137.527 56.805 136.887 55.887
+ 135.578 55.887 c f
+201.133 53.254 m 199.043 53.254 l 199.066 35.508 l 201.133 35.508 l h
+184.059 53.254 m 184.059 43.301 l 198.152 43.301 l 198.164 53.254 l h
+184.059 35.508 m 198.141 35.508 l 198.148 42.996 l 184.059 42.996 l h
+183.211 53.254 m 181.094 53.254 l 181.094 35.508 l 183.211 35.508 l h
+180.168 35.508 m 180.168 43.047 l 148.93 43.047 l 148.93 35.434 l h
+180.168 53.254 m 148.93 53.254 l 148.93 43.301 l 180.168 43.301 l h
+148.027 53.25 m 144.336 53.25 l 144.359 31.34 l 148.023 31.34 l h
+143.48 53.25 m 142.055 53.25 l 141.348 53.254 l 141.348 31.34 l 143.48
+31.34 l h
+127.605 30.09 m 114.664 30.09 l 127.559 24.332 l 140.453 30.09 l h
+140.441 50.734 m 137.383 50.734 l 137.383 45.34 l 137.383 45.34 136.457
+ 45.082 135.434 45.031 c 134.414 45.082 133.496 45.324 133.496 45.324 c
+133.496 46.875 l 133.492 46.875 l 133.492 50.734 l 129.496 50.734 l 129.496
+ 45.34 l 129.496 45.34 128.582 45.09 127.559 45.047 c 127.559 45.043 l 126.539
+ 45.09 125.621 45.34 125.621 45.34 c 125.637 50.734 l 121.629 50.734 l 121.629
+ 46.875 l 121.621 46.875 l 121.621 45.324 l 121.621 45.324 120.703 45.082
+ 119.68 45.031 c 118.656 45.082 117.734 45.34 117.734 45.34 c 117.734 47.09
+ l 117.738 47.09 l 117.738 49.215 l 117.734 49.215 l 117.734 50.734 l 114.676
+ 50.734 l 114.676 31.34 l 115.109 31.34 l 115.109 31.941 l 115.973 31.941
+ l 115.973 31.34 l 116.719 31.34 l 116.719 31.941 l 117.582 31.941 l 117.582
+ 31.34 l 121.605 31.34 l 121.605 31.941 l 122.469 31.941 l 122.469 31.34
+ l 123.285 31.34 l 123.285 31.941 l 124.152 31.941 l 124.152 31.34 l 130.969
+ 31.34 l 130.969 31.941 l 131.832 31.941 l 131.832 31.34 l 132.652 31.34
+ l 132.652 31.941 l 133.516 31.941 l 133.516 31.34 l 137.539 31.34 l 137.539
+ 31.941 l 138.402 31.941 l 138.402 31.34 l 139.148 31.34 l 139.148 31.941
+ l 140.012 31.941 l 140.012 31.34 l 140.441 31.34 l h
+140.441 53.254 m 139.141 53.254 l 139.141 51.297 l 140.441 51.297 l h
+138.613 53.254 m 137.383 53.254 l 137.383 51.297 l 138.613 51.297 l h
+133.492 53.254 m 132.793 53.254 l 132.793 51.297 l 133.492 51.297 l h
+132.266 53.254 m 130.676 53.254 l 130.676 51.297 l 132.266 51.297 l h
+130.148 53.254 m 129.496 53.258 l 129.496 51.297 l 130.148 51.297 l h
+125.637 53.254 m 124.969 53.254 l 124.969 51.297 l 125.637 51.297 l h
+124.441 53.254 m 122.852 53.254 l 122.852 51.297 l 124.441 51.297 l h
+122.324 53.254 m 121.629 53.254 l 121.629 51.297 l 122.324 51.297 l h
+117.738 51.52 m 117.734 51.52 l 117.734 53.254 l 116.504 53.254 l 116.504
+ 51.297 l 117.738 51.297 l h
+115.977 53.254 m 114.676 53.254 l 114.676 51.297 l 115.977 51.297 l h
+113.773 53.254 m 113.063 53.25 l 111.637 53.25 l 111.637 31.34 l 113.773
+ 31.34 l h
+107.094 53.25 m 107.094 31.34 l 110.762 31.34 l 110.781 53.25 l h
+106.188 43.047 m 74.949 43.047 l 74.949 35.508 l 106.188 35.434 l h
+106.188 53.254 m 74.949 53.254 l 74.949 43.301 l 106.188 43.301 l h
+74.023 53.254 m 71.91 53.254 l 71.91 35.508 l 74.023 35.508 l h
+71.059 42.996 m 56.965 42.996 l 56.977 35.508 l 71.059 35.508 l h
+71.059 53.254 m 56.953 53.254 l 56.965 43.301 l 71.059 43.301 l h
+53.988 53.254 m 53.988 35.508 l 56.051 35.508 l 56.074 53.254 l h
+56.27 30.355 m 56.629 29.875 58.227 30.148 58.227 30.148 c 59.742 30.148
+ 60.09 29.758 60.465 29.301 c 60.773 28.922 60.922 28.465 60.766 27.914
+c 60.652 27.512 60.555 27.258 60.594 26.711 c 60.602 26.543 60.641 26.391
+ 60.672 26.238 c 60.742 25.922 60.848 25.633 60.992 25.379 c 61.137 25.113
+ 61.313 24.883 61.512 24.676 c 61.809 24.371 62.16 24.133 62.531 23.965
+c 62.652 23.906 62.781 23.855 62.906 23.816 c 63.219 23.719 63.539 23.664
+ 63.84 23.672 c 65.242 23.637 66.996 24.766 67.125 26.711 c 67.16 27.258
+ 67.063 27.512 66.953 27.914 c 66.793 28.465 66.941 28.922 67.25 29.301
+c 67.629 29.758 67.977 30.148 69.492 30.148 c 69.492 30.148 70.875 30.008
+ 71.449 30.32 c 71.828 30.527 71.523 32.047 71.523 32.047 c 56.191 32.047
+ l 56.191 32.047 55.984 30.73 56.27 30.355 c h
+92.801 31.633 m 88.113 31.633 l 88.113 30.563 l 88.113 30.563 88.332 30.34
+ 88.539 30.074 c 88.719 29.863 88.801 29.602 88.711 29.293 c 88.648 29.066
+ 88.59 28.926 88.613 28.613 c 88.684 27.516 89.656 26.883 90.449 26.895
+c 91.238 26.883 92.23 27.516 92.301 28.613 c 92.32 28.926 92.27 29.066 92.203
+ 29.293 c 92.113 29.602 92.199 29.863 92.375 30.074 c 92.586 30.34 92.801
+ 30.563 92.801 30.563 c h
+86.461 21.809 m 86.461 21.832 l 85.23 21.832 l 85.23 18.02 l 86.461 18.02
+ l h
+162.316 30.563 m 162.316 30.563 162.535 30.34 162.746 30.074 c 162.922
+29.863 163.004 29.602 162.914 29.293 c 162.852 29.066 162.797 28.926 162.82
+ 28.613 c 162.891 27.516 163.883 26.883 164.672 26.895 c 165.465 26.883
+166.434 27.516 166.504 28.613 c 166.527 28.926 166.473 29.066 166.406 29.293
+ c 166.32 29.602 166.402 29.863 166.578 30.074 c 166.789 30.34 167.008 30.563
+ 167.008 30.563 c 167.008 31.633 l 162.316 31.633 l h
+168.656 21.809 m 168.656 18.02 l 169.887 18.02 l 169.887 21.832 l 168.656
+ 21.832 l h
+198.926 32.047 m 183.594 32.047 l 183.594 32.047 183.289 30.527 183.668
+ 30.32 c 184.242 30.008 185.629 30.148 185.629 30.148 c 187.141 30.148 187.492
+ 29.758 187.867 29.301 c 188.176 28.922 188.324 28.465 188.168 27.914 c
+188.055 27.512 187.957 27.258 187.996 26.711 c 188.121 24.766 189.875 23.637
+ 191.277 23.672 c 191.582 23.664 191.898 23.719 192.211 23.816 c 192.336
+ 23.855 192.465 23.906 192.586 23.965 c 192.957 24.133 193.309 24.371 193.609
+ 24.676 c 193.809 24.883 193.984 25.113 194.125 25.379 c 194.27 25.633 194.379
+ 25.922 194.445 26.238 c 194.477 26.391 194.516 26.543 194.527 26.711 c
+194.563 27.258 194.465 27.512 194.352 27.914 c 194.195 28.465 194.348 28.922
+ 194.652 29.301 c 195.027 29.758 195.379 30.148 196.895 30.148 c 196.895
+ 30.148 198.488 29.875 198.848 30.355 c 199.133 30.73 198.926 32.047 198.926
+ 32.047 c h
+200.367 29.406 m 197.773 27.641 l 195.102 25.82 l 195.102 25.82 194.836
+ 24.598 193.598 23.668 c 193.191 23.359 192.777 23.168 192.391 23.047 c
+191.574 22.789 190.91 22.859 190.805 22.879 c 190.797 22.879 190.789 22.879
+ 190.789 22.879 c 188.668 21.809 l 188.633 21.793 l 188.617 21.809 l 178.445
+ 33.129 l 179.031 33.129 l 203.098 33.133 l 202.777 33.469 l 150.309 33.473
+ l 150.309 33.129 l 177.453 33.129 l 187.137 22.469 l 188.027 21.496 l 184.785
+ 19.84 l 184.746 19.82 l 170.32 19.82 l 170.32 18.02 l 170.605 18.02 l 170.605
+ 17.355 l 167.953 17.355 l 167.953 18.02 l 168.063 18.02 l 168.059 18.043
+ l 167.648 19.82 l 147.391 19.82 l 147.398 19.84 l 148.289 21.809 l 152.027
+ 30.09 l 152.02 30.168 l 149.559 30.164 l 149.559 34.313 l 201.973 34.313
+ l 201.41 34.902 l 148.949 34.902 l 148.949 30.164 l 142.414 30.164 l 127.559
+ 23.281 l 112.789 30.164 l 106.188 30.164 l 106.188 34.902 l 53.707 34.902
+ l 53.145 34.313 l 105.57 34.313 l 105.57 30.156 l 103.098 30.168 l 103.09
+ 30.09 l 106.832 21.809 l 107.723 19.84 l 107.73 19.82 l 87.473 19.82 l
+87.059 18.043 l 87.055 18.02 l 87.168 18.02 l 87.168 17.355 l 84.512 17.355
+ l 84.512 18.02 l 84.801 18.02 l 84.801 19.82 l 70.371 19.82 l 70.336 19.84
+ l 67.156 21.461 l 68.066 22.469 l 77.656 33.129 l 104.809 33.129 l 104.809
+ 33.473 l 104.266 33.473 l 52.344 33.469 l 52.023 33.133 l 76.086 33.129
+ l 76.672 33.129 l 66.5 21.809 l 66.484 21.793 l 66.449 21.809 l 64.328
+22.879 l 64.328 22.879 64.324 22.879 64.313 22.879 c 64.207 22.859 63.543
+ 22.789 62.727 23.047 c 62.344 23.168 61.93 23.359 61.52 23.668 c 60.281
+ 24.598 60.016 25.82 60.016 25.82 c 57.344 27.641 l 54.754 29.406 l 50.266
+ 32.469 l 53.07 35.445 l 53.07 64.797 l 53.988 64.797 l 53.988 54.156 l
+56.051 54.156 l 56.051 64.797 l 56.977 64.797 l 56.977 54.164 l 71.059 54.164
+ l 71.059 64.797 l 71.91 64.797 l 71.91 54.164 l 74.023 54.164 l 74.023
+64.797 l 74.949 64.797 l 74.949 54.164 l 106.188 54.164 l 106.188 64.797
+ l 107.094 64.797 l 107.094 54.156 l 108.926 54.156 l 110.762 54.164 l 110.762
+ 64.797 l 111.637 64.797 l 111.637 54.164 l 113.773 54.152 l 113.773 64.797
+ l 114.664 64.797 l 114.676 54.156 l 115.109 54.156 l 115.109 54.961 l 115.973
+ 54.961 l 115.973 54.156 l 116.715 54.156 l 116.715 54.961 l 117.578 54.961
+ l 117.578 54.156 l 121.797 54.156 l 121.797 54.961 l 122.66 54.961 l 122.66
+ 54.156 l 123.48 54.156 l 123.48 54.961 l 124.344 54.961 l 124.344 54.156
+ l 130.777 54.156 l 130.777 54.961 l 131.641 54.961 l 131.641 54.156 l 132.457
+ 54.156 l 132.457 54.961 l 133.32 54.961 l 133.32 54.156 l 137.539 54.156
+ l 137.539 54.961 l 138.402 54.961 l 138.402 54.156 l 139.145 54.156 l 139.145
+ 54.961 l 140.008 54.961 l 140.008 54.156 l 140.441 54.156 l 140.453 64.797
+ l 141.344 64.797 l 141.344 54.152 l 143.48 54.164 l 143.48 64.797 l 144.359
+ 64.797 l 144.359 54.164 l 146.191 54.156 l 148.023 54.156 l 148.023 64.797
+ l 148.93 64.797 l 148.93 54.164 l 180.168 54.164 l 180.168 64.797 l 181.094
+ 64.797 l 181.094 54.164 l 183.211 54.164 l 183.211 64.797 l 184.059 64.797
+ l 184.059 54.164 l 198.141 54.164 l 198.141 64.797 l 199.066 64.797 l 199.066
+ 54.156 l 201.133 54.156 l 201.133 64.797 l 202.047 64.797 l 202.047 35.445
+ l 204.855 32.469 l 200.367 29.406 l f
+133.5 44.02 m 135.477 43.383 l 137.379 44.02 l h
+138.305 43.863 m 135.566 42.945 l 135.512 42.926 135.449 42.926 135.391
+ 42.945 c 132.656 43.836 l 132.574 43.855 132.516 43.918 132.5 43.988 c
+132.477 44.055 132.504 44.133 132.559 44.184 c 132.781 44.391 l 132.828
+44.434 132.895 44.461 132.965 44.461 c 133 44.461 l 133 44.813 l 133 44.934
+ 133.109 45.031 133.25 45.031 c 133.387 45.031 133.5 44.934 133.5 44.813
+ c 133.5 44.461 l 137.457 44.461 l 137.457 44.813 l 137.457 44.855 137.469
+ 44.898 137.496 44.934 c 137.543 44.988 137.617 45.031 137.707 45.031 c
+137.844 45.031 137.957 44.934 137.957 44.813 c 137.957 44.461 l 137.988
+44.461 l 138.051 44.461 138.109 44.438 138.156 44.402 c 138.379 44.234 l
+ 138.445 44.184 138.473 44.102 138.457 44.027 c 138.445 43.957 138.383 43.891
+ 138.305 43.863 c f
+164.691 27.625 m 164.086 27.625 163.598 28.113 163.598 28.715 c 163.598
+ 29.32 164.086 29.809 164.691 29.809 c 165.297 29.809 165.785 29.32 165.785
+ 28.715 c 165.785 28.113 165.297 27.625 164.691 27.625 c f
+191.348 24.914 m 190.254 24.914 189.367 25.797 189.367 26.887 c 189.367
+ 27.98 190.254 28.863 191.348 28.863 c 192.438 28.863 193.324 27.98 193.324
+ 26.887 c 193.324 25.797 192.438 24.914 191.348 24.914 c f
+192.777 44.719 2.848 6.625 re f
+186.418 44.719 2.852 6.625 re f
+133.559 38.746 m 133.559 41.223 l 137.363 41.223 l 137.363 35.133 l 137.363
+ 35.133 136.477 34.883 135.496 34.836 c 135.496 34.84 l 134.473 34.883 133.559
+ 35.121 133.559 35.121 c 133.559 38.746 l f
+133.051 41.566 4.773 0.285 re f
+193.965 41.715 m 195.637 41.715 l 195.637 36.973 l 195.637 36.973 194.969
+ 36.781 194.227 36.75 c 193.453 36.781 192.762 36.965 192.762 36.965 c 192.762
+ 41.715 l 193.965 41.715 l f
+192.387 42.07 3.605 0.227 re f
+187.605 41.715 m 189.277 41.715 l 189.277 36.973 l 189.277 36.973 188.609
+ 36.781 187.867 36.75 c 187.098 36.781 186.402 36.965 186.402 36.965 c 186.402
+ 41.715 l 187.605 41.715 l f
+186.027 42.07 3.605 0.227 re f
+145.039 34.68 m 145.301 34.68 l 145.301 34.332 l 145.301 34.332 145.621
+ 33.863 146.223 33.863 c 146.836 33.863 147.152 34.332 147.152 34.332 c
+147.152 34.68 l 147.398 34.68 l 147.398 33.863 l 147.578 33.863 l 147.578
+ 33.199 l 144.867 33.199 l 144.867 33.863 l 145.039 33.863 l 145.039 34.68
+ l f
+145.332 38.715 m 145.332 41.195 l 147.094 41.195 l 147.094 35.105 l 147.094
+ 35.105 146.684 34.855 146.23 34.809 c 145.758 34.855 145.332 35.094 145.332
+ 35.094 c 145.332 38.715 l f
+145.098 41.543 2.207 0.289 re f
+147.117 46.547 m 147.117 45.258 l 147.117 45.258 146.688 45.082 146.215
+ 45.043 c 146.215 45.031 l 145.742 45.07 145.316 45.254 145.316 45.254 c
+ 145.316 46.383 l 145.309 46.383 l 145.309 51.297 l 147.117 51.297 l 147.117
+ 46.547 l f
+146.23 43.383 m 147.117 44.023 l 145.316 44.023 l h
+144.98 44.391 m 145.004 44.438 145.035 44.465 145.066 44.465 c 145.082
+44.465 l 145.082 44.813 l 145.082 44.934 145.133 45.031 145.199 45.031 c
+ 145.262 45.031 145.316 44.934 145.316 44.813 c 145.316 44.465 l 147.148
+ 44.465 l 147.148 44.813 l 147.148 44.859 147.156 44.902 147.168 44.938
+c 147.191 45 147.227 45.031 147.266 45.031 c 147.328 45.031 147.379 44.934
+ 147.379 44.813 c 147.379 44.465 l 147.398 44.465 l 147.426 44.465 147.453
+ 44.441 147.473 44.406 c 147.578 44.234 l 147.609 44.188 147.621 44.109
+147.617 44.039 c 147.609 43.965 147.578 43.895 147.543 43.871 c 146.273
+42.949 l 146.246 42.93 146.219 42.93 146.191 42.949 c 144.922 43.836 l 144.887
+ 43.855 144.859 43.922 144.852 43.988 c 144.84 44.063 144.852 44.137 144.879
+ 44.188 c 144.98 44.391 l f
+175.531 44.711 2.852 6.625 re f
+172.18 51.336 m 172.18 51.172 l 172.184 51.172 l 172.184 44.711 l 169.332
+ 44.711 l 169.332 46.734 l 169.336 46.734 l 169.336 48.137 l 169.332 48.137
+ l 169.332 51.336 l 172.18 51.336 l f
+163.133 44.711 2.852 6.625 re f
+156.938 44.711 2.852 6.625 re f
+150.734 44.711 2.852 6.625 re f
+176.715 41.715 m 178.387 41.715 l 178.387 36.973 l 178.387 36.973 177.719
+ 36.781 176.977 36.75 c 176.207 36.781 175.516 36.965 175.516 36.965 c 175.516
+ 41.715 l 176.715 41.715 l f
+175.137 42.07 3.605 0.227 re f
+170.516 41.715 m 172.188 41.715 l 172.188 36.973 l 172.188 36.973 171.52
+ 36.781 170.777 36.75 c 170.008 36.781 169.313 36.965 169.313 36.965 c 169.313
+ 41.715 l 170.516 41.715 l f
+168.938 42.07 3.605 0.227 re f
+164.316 41.715 m 165.988 41.715 l 165.988 36.973 l 165.988 36.973 165.32
+ 36.781 164.578 36.75 c 163.809 36.781 163.117 36.965 163.117 36.965 c 163.117
+ 41.715 l 164.316 41.715 l f
+162.738 42.07 3.605 0.227 re f
+158.117 41.715 m 159.789 41.715 l 159.789 36.973 l 159.789 36.973 159.121
+ 36.781 158.383 36.75 c 157.609 36.781 156.918 36.965 156.918 36.965 c 156.918
+ 41.715 l 158.117 41.715 l f
+156.539 42.07 3.605 0.227 re f
+151.918 41.715 m 153.59 41.715 l 153.59 36.973 l 153.59 36.973 152.922
+36.781 152.18 36.75 c 151.41 36.781 150.719 36.965 150.719 36.965 c 150.719
+ 41.715 l 151.918 41.715 l f
+150.34 42.07 3.605 0.227 re f
+142.887 21.809 m 145.719 29.527 l 151.07 29.527 l 147.566 21.809 l 146.879
+ 20.297 l 142.211 19.965 l 142.887 21.809 l f
+142.082 19.293 m 146.613 19.625 l 142.344 16.664 l 137.867 13.555 l 135.238
+ 11.73 l 142.082 19.293 l f
+79.852 19.406 m 79.848 19.352 l 79.676 19.223 l 79.672 19.199 79.668 19.172
+ 79.656 19.141 c 79.563 18.82 79.73 18.559 79.859 18.418 c 80.105 18.219
+ 80.273 17.879 80.273 17.48 c 80.273 17.102 80.121 16.77 79.887 16.566 c
+ 79.871 16.375 79.754 16.207 79.59 16.129 c 79.594 16.113 79.594 16.098
+79.594 16.09 c 79.594 15.949 79.496 15.844 79.379 15.844 c 79.344 15.844
+ 79.313 15.852 79.285 15.871 c 79.211 15.914 79.16 15.988 79.16 16.09 c
+79.16 16.098 79.164 16.113 79.164 16.129 c 79.113 16.148 79.066 16.184 79.027
+ 16.223 c 78.898 16.332 78.875 16.508 78.867 16.566 c 78.785 16.641 78.715
+ 16.727 78.656 16.832 c 78.48 17.133 78.484 17.426 78.484 17.48 c 78.484
+ 17.883 78.656 18.234 78.914 18.426 c 79.105 18.641 79.121 18.914 79.105
+ 19.086 c 79.051 19.051 l 76.887 17.797 l 76.875 17.602 l 76.703 17.477
+l 76.699 17.449 76.695 17.422 76.684 17.391 c 76.594 17.074 76.762 16.809
+ 76.887 16.668 c 77.137 16.469 77.301 16.129 77.301 15.73 c 77.301 15.352
+ 77.148 15.02 76.918 14.82 c 76.898 14.625 76.785 14.461 76.621 14.379 c
+ 76.625 14.363 76.625 14.348 76.625 14.34 c 76.625 14.199 76.527 14.094
+76.41 14.094 c 76.371 14.094 76.34 14.102 76.313 14.125 c 76.242 14.164
+76.191 14.246 76.191 14.34 c 76.191 14.348 76.191 14.363 76.195 14.379 c
+ 76.145 14.398 76.098 14.434 76.055 14.473 c 75.926 14.582 75.902 14.758
+ 75.898 14.82 c 75.816 14.891 75.746 14.98 75.684 15.082 c 75.512 15.383
+ 75.512 15.68 75.512 15.73 c 75.512 16.133 75.684 16.484 75.941 16.68 c
+76.203 16.965 76.141 17.352 76.113 17.477 c 75.926 17.602 l 75.922 17.82
+ l 75.855 17.863 l 73.418 19.398 l 73.422 19.398 l 79.848 19.406 l f
+1 g
+108.887 43.383 m 108.004 44.023 l 109.805 44.023 l h
+108.887 43.383 m f
+0.0666667 0.247059 0.380392 rg
+59.141 51.805 3.563 0.246 re f
+65.5 51.805 3.559 0.246 re f
+59.484 56.895 m 59.484 61.633 l 62.355 61.633 l 62.355 56.883 l 62.355
+56.883 61.664 56.699 60.891 56.668 c 60.152 56.699 59.484 56.895 59.484
+56.895 c f
+65.844 56.895 m 65.844 61.633 l 68.715 61.633 l 68.715 56.883 l 68.715
+56.883 68.023 56.699 67.25 56.668 c 66.512 56.699 65.844 56.895 65.844 56.895
+ c f
+107.965 56.863 m 107.965 61.602 l 110.02 61.602 l 110.02 56.855 l 110.02
+ 56.855 109.523 56.672 108.973 56.637 c 108.441 56.672 107.965 56.863 107.965
+ 56.863 c f
+107.715 51.77 2.574 0.227 re f
+76.383 51.793 3.563 0.25 re f
+82.582 51.793 3.559 0.25 re f
+88.781 51.793 3.563 0.25 re f
+94.98 51.793 3.559 0.25 re f
+101.18 51.793 3.559 0.25 re f
+76.73 56.898 m 76.73 61.637 l 79.605 61.637 l 79.605 56.887 l 79.605 56.887
+ 78.914 56.711 78.145 56.672 c 77.398 56.707 76.73 56.898 76.73 56.898 c
+ f
+82.93 56.898 m 82.93 61.637 l 85.805 61.637 l 85.805 56.887 l 85.805 56.887
+ 85.109 56.711 84.34 56.672 c 83.598 56.707 82.93 56.898 82.93 56.898 c f
+89.129 56.898 m 89.129 61.637 l 92.004 61.637 l 92.004 56.887 l 92.004
+56.887 91.313 56.711 90.539 56.672 c 89.797 56.707 89.129 56.898 89.129
+56.898 c f
+95.328 56.898 m 95.328 61.637 l 98.203 61.637 l 98.203 56.887 l 98.203
+56.887 97.508 56.711 96.738 56.672 c 95.996 56.707 95.328 56.898 95.328
+56.898 c f
+101.527 56.898 m 101.527 61.637 l 104.402 61.637 l 104.402 56.887 l 104.402
+ 56.887 103.707 56.711 102.938 56.672 c 102.195 56.707 101.527 56.898 101.527
+ 56.898 c f
+117.09 34.711 m 117.625 34.711 l 117.625 34.355 l 117.625 34.355 118.309
+ 33.891 119.633 33.891 c 120.938 33.891 121.633 34.355 121.633 34.355 c
+121.633 34.711 l 122.191 34.711 l 122.191 33.891 l 122.563 33.891 l 122.563
+ 33.227 l 116.707 33.227 l 116.707 33.891 l 117.09 33.891 l 117.09 34.711
+ l f
+117.738 44.02 m 119.641 43.383 l 121.617 44.02 l h
+122.461 43.836 m 119.73 42.945 l 119.672 42.926 119.609 42.926 119.551
+42.945 c 116.813 43.863 l 116.734 43.891 116.676 43.957 116.66 44.027 c
+116.645 44.102 116.676 44.184 116.738 44.234 c 116.961 44.402 l 117.008
+44.438 117.066 44.461 117.129 44.461 c 117.16 44.461 l 117.16 44.813 l 117.16
+ 44.934 117.277 45.031 117.414 45.031 c 117.5 45.031 117.574 44.988 117.621
+ 44.934 c 117.648 44.898 117.664 44.855 117.664 44.813 c 117.664 44.461
+l 121.617 44.461 l 121.617 44.813 l 121.617 44.934 121.734 45.031 121.867
+ 45.031 c 122.008 45.031 122.121 44.934 122.121 44.813 c 122.121 44.461
+l 122.152 44.461 l 122.223 44.461 122.289 44.434 122.336 44.391 c 122.559
+ 44.184 l 122.617 44.133 122.641 44.055 122.621 43.988 c 122.602 43.918
+122.543 43.855 122.461 43.836 c f
+90.426 27.625 m 89.82 27.625 89.332 28.113 89.332 28.715 c 89.332 29.32
+ 89.82 29.809 90.426 29.809 c 91.031 29.809 91.52 29.32 91.52 28.715 c 91.52
+ 28.113 91.031 27.625 90.426 27.625 c f
+63.773 28.863 m 64.863 28.863 65.75 27.98 65.75 26.887 c 65.75 25.797 64.863
+ 24.914 63.773 24.914 c 62.68 24.914 61.793 25.797 61.793 26.887 c 61.793
+ 27.98 62.68 28.863 63.773 28.863 c f
+59.492 44.719 2.852 6.625 re f
+65.852 44.719 2.855 6.625 re f
+125.133 41.566 4.852 0.285 re f
+117.758 35.133 m 117.758 41.223 l 121.563 41.223 l 121.563 35.121 l 121.563
+ 35.121 120.645 34.883 119.621 34.84 c 119.621 34.836 l 118.641 34.883 117.758
+ 35.133 117.758 35.133 c f
+117.293 41.566 4.773 0.285 re f
+61.383 41.715 m 62.355 41.715 l 62.355 36.965 l 62.355 36.965 61.664 36.781
+ 60.891 36.75 c 60.152 36.781 59.484 36.973 59.484 36.973 c 59.484 41.715
+ l 61.383 41.715 l f
+59.129 42.07 3.602 0.227 re f
+65.844 41.715 m 68.715 41.715 l 68.715 36.965 l 68.715 36.965 68.02 36.781
+ 67.25 36.75 c 66.512 36.781 65.844 36.973 65.844 36.973 c 65.844 41.715
+ l f
+65.484 42.07 3.605 0.227 re f
+107.719 34.68 m 107.965 34.68 l 107.965 34.332 l 107.965 34.332 108.281
+ 33.863 108.895 33.863 c 109.5 33.863 109.82 34.332 109.82 34.332 c 109.82
+ 34.68 l 110.078 34.68 l 110.078 33.863 l 110.25 33.863 l 110.25 33.199
+l 107.539 33.199 l 107.539 33.863 l 107.719 33.863 l 107.719 34.68 l f
+108.027 35.105 m 108.027 41.195 l 109.785 41.195 l 109.785 35.094 l 109.785
+ 35.094 109.363 34.855 108.891 34.809 c 108.434 34.855 108.027 35.105 108.027
+ 35.105 c f
+107.813 41.543 2.207 0.289 re f
+108.004 49.793 m 108.004 51.297 l 109.809 51.297 l 109.809 46.383 l 109.805
+ 46.383 l 109.805 45.254 l 109.805 45.254 109.379 45.07 108.906 45.031 c
+ 108.906 45.043 l 108.43 45.082 108.004 45.258 108.004 45.258 c 108.004
+49.793 l f
+108.887 43.383 m 109.805 44.023 l 108.004 44.023 l h
+107.738 44.465 m 107.738 44.813 l 107.738 44.934 107.789 45.031 107.852
+ 45.031 c 107.891 45.031 107.93 45 107.949 44.938 c 107.961 44.902 107.969
+ 44.859 107.969 44.813 c 107.969 44.465 l 109.805 44.465 l 109.805 44.813
+ l 109.805 44.934 109.855 45.031 109.922 45.031 c 109.984 45.031 110.035
+ 44.934 110.035 44.813 c 110.035 44.465 l 110.051 44.465 l 110.082 44.465
+ 110.113 44.438 110.137 44.391 c 110.242 44.188 l 110.266 44.137 110.277
+ 44.063 110.27 43.988 c 110.262 43.922 110.23 43.855 110.195 43.836 c 108.926
+ 42.949 l 108.898 42.93 108.871 42.93 108.844 42.949 c 107.578 43.871 l
+107.539 43.895 107.512 43.965 107.504 44.039 c 107.496 44.109 107.512 44.188
+ 107.539 44.234 c 107.645 44.406 l 107.664 44.441 107.691 44.465 107.723
+ 44.465 c 107.738 44.465 l f
+76.734 44.711 2.852 6.625 re f
+82.938 44.711 2.852 6.625 re f
+89.133 44.711 2.852 6.625 re f
+95.332 44.711 2.848 6.625 re f
+101.531 44.711 2.852 6.625 re f
+76.73 41.715 m 79.605 41.715 l 79.605 36.965 l 79.605 36.965 78.914 36.781
+ 78.145 36.75 c 77.398 36.781 76.73 36.973 76.73 36.973 c 76.73 41.715 l
+ f
+76.379 42.07 3.602 0.227 re f
+84.832 41.715 m 85.805 41.715 l 85.805 36.965 l 85.805 36.965 85.109 36.781
+ 84.34 36.75 c 83.598 36.781 82.93 36.973 82.93 36.973 c 82.93 41.715 l
+84.832 41.715 l f
+82.574 42.07 3.605 0.227 re f
+89.129 41.715 m 92.004 41.715 l 92.004 36.965 l 92.004 36.965 91.313 36.781
+ 90.539 36.75 c 89.797 36.781 89.129 36.973 89.129 36.973 c 89.129 41.715
+ l f
+88.773 42.07 3.605 0.227 re f
+97.23 41.715 m 98.203 41.715 l 98.203 36.965 l 98.203 36.965 97.508 36.781
+ 96.738 36.75 c 95.996 36.781 95.328 36.973 95.328 36.973 c 95.328 41.715
+ l 97.23 41.715 l f
+94.973 42.07 3.605 0.227 re f
+103.43 41.715 m 104.402 41.715 l 104.402 36.965 l 104.402 36.965 103.707
+ 36.781 102.938 36.75 c 102.195 36.781 101.527 36.973 101.527 36.973 c 101.527
+ 41.715 l 103.43 41.715 l f
+101.172 42.07 3.605 0.227 re f
+104.047 29.527 m 109.402 29.527 l 112.23 21.809 l 112.91 19.965 l 108.242
+ 20.297 l 107.555 21.809 l 104.047 29.527 l f
+141.348 19.965 m 113.773 19.965 l 113.09 21.809 l 110.242 29.527 l 112.789
+ 29.547 l 127.559 22.602 l 142.414 29.527 l 144.879 29.527 l 142.027 21.809
+ l 141.348 19.965 l f
+133.438 5.297 m 133.406 6.816 l 132.145 8.629 l 122.973 8.629 l 121.711
+ 6.816 l 121.684 5.297 l h
+124.188 3.871 m 124.207 3.781 124.324 3.699 124.512 3.633 c 125.086 3.402
+ 126.316 3.223 127.504 3.223 c 127.504 3.223 127.508 3.223 127.512 3.223
+ c 127.512 3.223 127.516 3.223 127.516 3.223 c 127.543 3.223 127.574 3.223
+ 127.602 3.223 c 127.605 3.223 127.605 3.223 127.605 3.223 c 127.609 3.223
+ 127.613 3.223 127.613 3.223 c 128.797 3.223 130.035 3.402 130.605 3.633
+ c 130.793 3.699 130.91 3.781 130.93 3.871 c 130.93 3.875 130.941 3.883
+130.941 3.891 c 124.172 3.891 l 124.172 3.883 124.188 3.875 124.188 3.871
+ c h
+133.273 11.211 m 133 11.375 l 132.996 11.52 l 122.125 11.52 l 122.121 11.375
+ l 121.848 11.211 l 121.82 11.109 121.789 10.895 121.84 10.664 c 121.871
+ 10.488 121.938 10.313 122.098 10.156 c 122.363 9.98 122.555 9.699 122.652
+ 9.375 c 132.469 9.375 l 132.566 9.699 132.758 9.98 133.023 10.156 c 133.184
+ 10.313 133.246 10.488 133.281 10.664 c 133.328 10.895 133.301 11.109 133.273
+ 11.211 c h
+118.621 10.105 m 120.078 9.75 l 120.094 9.746 120.172 9.715 120.301 9.684
+ c 120.406 9.879 120.555 10.043 120.727 10.156 c 120.887 10.313 120.953
+10.488 120.988 10.664 c 121.035 10.895 121.004 11.109 120.98 11.211 c 120.703
+ 11.375 l 120.699 11.52 l 114.07 19.215 l 141.047 19.215 l 134.418 11.52
+ l 134.414 11.375 l 134.141 11.211 l 134.117 11.109 134.086 10.895 134.133
+ 10.664 c 134.164 10.488 134.234 10.313 134.391 10.156 c 134.566 10.043
+134.711 9.879 134.816 9.684 c 134.949 9.715 135.023 9.746 135.043 9.75 c
+ 136.5 10.105 l 136.5 12.098 l 137.813 12.945 l 137.813 8.973 l 136.918
+8.746 l 136.859 8.73 l 135.934 8.488 l 135.934 5.102 l 134.039 3.891 l 134.008
+ 3.879 l 131.711 3.879 l 131.711 2.75 130.684 0.898 128.941 0.238 c 128.535
+ 0.09 128.09 0 127.609 0 c 127.594 0 127.527 0 127.512 0 c 127.031 0 126.586
+ 0.09 126.18 0.238 c 124.438 0.898 123.41 2.75 123.41 3.879 c 121.113 3.879
+ l 121.082 3.891 l 119.188 5.102 l 119.188 8.488 l 119.133 8.508 l 117.309
+ 8.973 l 117.309 12.945 l 118.621 12.09 l 118.621 10.105 l f
+119.883 11.73 m 117.25 13.555 l 112.773 16.664 l 108.504 19.625 l 113.035
+ 19.293 l 119.883 11.73 l f
+125.582 44.02 m 127.559 43.383 l 129.461 44.02 l h
+130.387 43.863 m 127.652 42.945 l 127.594 42.93 127.531 42.93 127.473 42.945
+ c 124.738 43.836 l 124.656 43.855 124.598 43.918 124.578 43.988 c 124.563
+ 44.059 124.582 44.133 124.641 44.188 c 124.863 44.391 l 124.914 44.434
+124.98 44.461 125.047 44.461 c 125.082 44.461 l 125.082 44.813 l 125.082
+ 44.934 125.191 45.031 125.332 45.031 c 125.469 45.031 125.582 44.934 125.582
+ 44.813 c 125.582 44.461 l 129.535 44.461 l 129.535 44.813 l 129.535 44.859
+ 129.551 44.898 129.578 44.934 c 129.625 44.996 129.703 45.031 129.789 45.031
+ c 129.926 45.031 130.039 44.934 130.039 44.813 c 130.039 44.461 l 130.074
+ 44.461 l 130.133 44.461 130.195 44.441 130.238 44.402 c 130.461 44.234
+l 130.527 44.184 130.559 44.102 130.543 44.031 c 130.527 43.957 130.465
+43.895 130.387 43.863 c f
+125.016 34.711 m 125.551 34.711 l 125.551 34.355 l 125.551 34.355 126.238
+ 33.895 127.559 33.895 c 128.879 33.895 129.57 34.355 129.57 34.355 c 129.57
+ 34.711 l 130.105 34.711 l 130.105 33.895 l 130.488 33.895 l 130.488 33.227
+ l 124.629 33.227 l 124.629 33.895 l 125.016 33.895 l 125.016 34.711 l f
+129.473 41.223 m 129.473 35.133 l 129.473 35.133 128.535 34.883 127.555
+ 34.836 c 126.57 34.883 125.648 35.133 125.648 35.133 c 125.648 41.223 l
+ 129.473 41.223 l f
+82.008 8.648 m 82.734 8.602 83.453 8.586 84.133 8.586 c 84.863 8.586 85.543
+ 8.602 86.227 8.648 c 86.18 8.523 86.168 8.414 86.168 8.246 c 86.168 8.086
+ 86.18 7.965 86.227 7.863 c 85.258 7.914 83.805 7.945 83.508 7.945 c 83.508
+ 4.863 l 84.031 4.863 84.566 4.879 85.09 4.887 c 85.375 4.898 85.668 4.922
+ 85.965 4.941 c 85.93 4.863 85.906 4.715 85.906 4.555 c 85.906 4.387 85.93
+ 4.273 85.965 4.145 c 85.359 4.215 84.09 4.227 83.508 4.227 c 83.508 1.555
+ l 84.555 1.555 84.668 1.555 85.09 1.582 c 86.16 1.637 l 86.121 1.547 86.102
+ 1.383 86.102 1.215 c 86.102 1.082 86.121 0.984 86.16 0.852 c 85.34 0.879
+ 84.59 0.922 84.066 0.922 c 83.453 0.922 82.566 0.883 82.008 0.852 c 82.09
+ 1.988 82.113 4.184 82.113 4.656 c 82.113 5.18 82.09 6.57 82.066 7.227 c
+ 82.055 7.711 82.031 8.172 82.008 8.648 c f
+91.445 8.809 m 92.535 8.809 93.777 8.523 94.742 8.012 c 94.719 7.695 94.711
+ 7.414 94.711 6.977 c 94.711 6.672 94.73 5.477 94.801 5.07 c 94.563 5.113
+ 94.402 5.148 94.082 5.148 c 93.789 5.148 93.527 5.102 93.277 5.07 c 93.313
+ 5.629 93.344 6.184 93.344 6.738 c 93.344 6.887 93.344 6.977 93.313 7.773
+ c 92.855 8.07 92.23 8.184 91.695 8.184 c 90.66 8.184 90.047 7.684 89.637
+ 7.148 c 89.105 6.457 88.945 5.637 88.945 4.773 c 88.945 2.629 89.957 1.375
+ 91.855 1.375 c 93.492 1.375 93.891 2.172 94.027 2.441 c 94.141 2.441 l
+94.48 1.332 l 93.574 0.922 92.754 0.758 91.824 0.758 c 88.785 0.758 87.387
+ 2.59 87.387 4.879 c 87.387 7.434 89.227 8.809 91.445 8.809 c f
+96.656 8.648 m 97.383 8.602 98.098 8.586 98.781 8.586 c 99.508 8.586 100.191
+ 8.602 100.875 8.648 c 100.828 8.523 100.816 8.414 100.816 8.246 c 100.816
+ 8.086 100.828 7.965 100.875 7.863 c 99.906 7.914 98.449 7.945 98.156 7.945
+ c 98.156 4.863 l 98.68 4.863 99.215 4.879 99.738 4.887 c 100.02 4.898 100.316
+ 4.922 100.613 4.941 c 100.578 4.863 100.555 4.715 100.555 4.555 c 100.555
+ 4.387 100.578 4.273 100.613 4.145 c 100.012 4.215 98.734 4.227 98.156 4.227
+ c 98.156 1.555 l 99.203 1.555 99.316 1.555 99.738 1.582 c 100.805 1.637
+ l 100.773 1.547 100.75 1.383 100.75 1.215 c 100.75 1.082 100.773 0.984
+100.805 0.852 c 99.988 0.879 99.234 0.922 98.711 0.922 c 98.098 0.922 97.211
+ 0.883 96.656 0.852 c 96.734 1.988 96.758 4.184 96.758 4.656 c 96.758 5.18
+ 96.734 6.57 96.711 7.227 c 96.699 7.711 96.676 8.172 96.652 8.648 c f
+103.934 1.465 m 104.105 1.457 104.523 1.406 104.742 1.406 c 105.117 1.406
+ 105.492 1.465 105.797 1.691 c 106.195 1.988 106.277 2.395 106.277 2.879
+ c 106.277 3.613 105.855 4.441 104.719 4.441 c 104.422 4.441 104.152 4.422
+ 103.934 4.414 c h
+103.219 8.586 m 103.5 8.586 103.75 8.629 103.98 8.648 c 103.98 8.352 103.934
+ 6.887 103.934 6.559 c 103.934 4.941 l 104.207 4.941 l 104.82 5.809 105.523
+ 6.809 106.105 7.711 c 106.277 7.965 106.527 8.387 106.695 8.648 c 107.039
+ 8.602 107.172 8.586 107.617 8.586 c 108.027 8.586 108.309 8.621 108.629
+ 8.648 c 107.914 7.754 107.605 7.355 106.707 6.09 c 106.535 5.852 106.285
+ 5.477 106.117 5.238 c 105.797 4.781 l 106.832 4.59 107.777 3.941 107.777
+ 2.68 c 107.777 2.207 107.594 1.738 107.254 1.406 c 106.766 0.941 106.207
+ 0.852 105.469 0.852 c 105.207 0.852 103.887 0.906 103.594 0.906 c 103.012
+ 0.906 102.715 0.879 102.457 0.852 c 102.535 2.316 102.535 2.477 102.535
+ 3.965 c 102.535 6.164 102.523 6.414 102.434 8.648 c 102.684 8.621 102.957
+ 8.586 103.219 8.586 c f
+152.746 2.129 m 152.746 4.227 l 152.746 7.219 152.723 7.465 152.609 8.559
+ c 152.801 8.547 153.141 8.496 153.406 8.496 c 153.664 8.496 153.984 8.547
+ 154.133 8.559 c 154.074 7.754 154.051 6.684 154.051 5.59 c 154.051 4.695
+ 154.063 1.805 154.18 0.84 c 154.051 0.758 l 153.824 0.906 153.098 1.332
+ 152.836 1.457 c 151.891 1.906 151.391 2.156 150.563 2.465 c 150.563 2.555
+ l 150.813 2.84 150.879 2.906 151.051 3.09 c 151.391 2.922 152.484 2.297
+ 152.746 2.129 c f
+156.418 8.477 m 156.441 8.559 l 156.656 8.523 156.805 8.496 156.996 8.496
+ c 157.238 8.496 157.422 8.523 157.613 8.559 c 158.262 7.273 158.887 6.129
+ 159.59 4.82 c 159.91 4.227 161.43 1.531 161.602 1.332 c 161.602 1.055 l
+ 159.672 1.055 157.328 1.055 156.488 0.965 c 156.512 1.215 156.543 1.465
+ 156.543 1.707 c 156.543 1.906 156.535 2.055 156.488 2.34 c 157.816 2.262
+ 158.168 2.262 158.684 2.262 c 160.238 2.262 l 159.773 3.133 157.387 7.113
+ 156.703 8.07 c 156.418 8.477 l f
+162.379 8.477 m 162.402 8.559 l 162.617 8.523 162.762 8.496 162.957 8.496
+ c 163.195 8.496 163.379 8.523 163.57 8.559 c 164.219 7.273 164.844 6.129
+ 165.547 4.82 c 165.867 4.227 167.391 1.531 167.563 1.332 c 167.563 1.055
+ l 165.629 1.055 163.289 1.055 162.445 0.965 c 162.469 1.215 162.504 1.465
+ 162.504 1.707 c 162.504 1.906 162.492 2.055 162.445 2.34 c 163.773 2.262
+ 164.129 2.262 164.641 2.262 c 166.199 2.262 l 165.73 3.133 163.344 7.113
+ 162.66 8.07 c 162.379 8.477 l f
+171.125 2.395 m 171.125 5.637 l 168.848 5.637 l h
+171.125 6.586 m 171.125 7.711 171.125 7.977 171.031 8.559 c 171.293 8.539
+ 171.543 8.496 171.805 8.496 c 171.996 8.496 172.18 8.523 172.441 8.559
+c 172.383 7.961 172.383 7.816 172.383 6.586 c 172.703 6.586 173.008 6.602
+ 173.352 6.613 c 173.305 6.422 173.293 6.344 173.293 6.137 c 173.293 5.914
+ 173.305 5.816 173.352 5.613 c 172.746 5.637 172.68 5.637 172.383 5.637
+c 172.383 4.637 172.418 1.715 172.449 0.965 c 172.316 1.004 172.156 1.031
+ 171.953 1.031 c 171.781 1.031 171.578 1.004 171.453 0.965 c 171.305 1.234
+ 171.246 1.316 170.738 2.039 c 169.098 4.352 l 168.836 4.727 168.59 5.113
+ 168.316 5.477 c 168.211 5.613 168.031 5.832 168.031 5.914 c 168.031 6.594
+ l 168.316 6.586 168.746 6.57 169.098 6.57 c 169.68 6.57 170.27 6.57 171.125
+ 6.586 c f
+Q q
+0 63.992 255.113 3 re W n
+q
+0 63 256 4 re W n
+ q
+0.0666667 0.247059 0.380392 rg
+0 64.801 255.004 1.238 re f
+ Q
+Q
+Q q
+0.0666667 0.247059 0.380392 rg
+192.387 61.988 3.605 0.227 re f
+186.027 61.988 3.605 0.227 re f
+175.137 61.996 m 175.137 62.215 l 178.742 62.215 l 178.742 61.988 l 175.137
+ 61.988 l 175.137 61.996 l f
+162.738 61.988 3.605 0.227 re f
+156.539 61.996 m 156.539 62.215 l 160.145 62.215 l 160.145 61.988 l 156.539
+ 61.988 l 156.539 61.996 l f
+150.34 61.996 m 150.34 62.215 l 153.945 62.215 l 153.945 61.988 l 150.34
+ 61.988 l 150.34 61.996 l f
+59.129 61.988 3.602 0.227 re f
+65.484 61.988 3.605 0.227 re f
+76.379 61.988 3.602 0.227 re f
+82.574 61.996 m 82.574 62.215 l 86.18 62.215 l 86.18 61.988 l 82.574 61.988
+ l 82.574 61.996 l f
+88.773 61.996 m 88.773 62.215 l 92.379 62.215 l 92.379 61.988 l 88.773
+61.988 l 88.773 61.996 l f
+94.973 61.996 m 94.973 62.215 l 98.574 62.215 l 98.574 61.988 l 94.973
+61.988 l 94.973 61.996 l f
+101.172 61.996 m 101.172 62.215 l 104.777 62.215 l 104.777 61.988 l 101.172
+ 61.988 l 101.172 61.996 l f
+107.711 61.98 2.566 0.23 re f
+144.84 61.98 2.566 0.227 re f
+168.965 61.996 m 168.965 62.215 l 172.57 62.215 l 172.57 61.988 l 168.965
+ 61.988 l 168.965 61.996 l f
+ Q
+Q
+ Q
+Q
Q Q
showpage
%%Trailer
diff --git a/macros/latex/contrib/thesis-ekf/eszterhazy-logo-hu.pdf b/macros/latex/contrib/thesis-ekf/eszterhazy-logo-hu.pdf
index 03f6eeadb0..fd63f23252 100644
--- a/macros/latex/contrib/thesis-ekf/eszterhazy-logo-hu.pdf
+++ b/macros/latex/contrib/thesis-ekf/eszterhazy-logo-hu.pdf
Binary files differ
diff --git a/macros/latex/contrib/thesis-ekf/thesis-ekf.dtx b/macros/latex/contrib/thesis-ekf/thesis-ekf.dtx
index dbd357d85e..6a4cb22b2d 100644
--- a/macros/latex/contrib/thesis-ekf/thesis-ekf.dtx
+++ b/macros/latex/contrib/thesis-ekf/thesis-ekf.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
-% Copyright (C) 2014-2020 by Tibor Tomacs
+% Copyright (C) 2014-2021 by Tibor Tomacs
%
% This file may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.2
@@ -20,7 +20,7 @@
\ProvidesFile{thesis-ekf.dtx}
%</driver>
%<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<class>\ProvidesClass{thesis-ekf}[2020/12/22 v4.1 Thesis class for Eszterhazy Karoly University (Eger, Hungary)]
+%<class>\ProvidesClass{thesis-ekf}[2021/08/12 v4.2 Thesis class for Eszterhazy Karoly Catholic University (Eger, Hungary)]
%<class>
%<*driver>
\documentclass{ltxdoc}
@@ -61,18 +61,18 @@
% Right brace \} Tilde \~}
%
% \GetFileInfo{thesis-ekf.cls}
-% \title{Thesis class for\\ Eszterházy Károly University\\\textsf{thesis-ekf.cls}\\[2mm]{\normalsize Version 4.1\\2020/12/22\\}}
+% \title{Thesis class for\\ Eszterházy Károly Catholic University\\\textsf{thesis-ekf.cls}\\[2mm]{\normalsize Version 4.2\\2021/08/12\\}}
% \author{Tibor Tómács\\{\small\ttfamily tomacs.tibor@uni-eszterhazy.hu}}
% \date{}
% \maketitle
% \def\abstractname{}
%\begin{abstract}
-% \selectlanguage{english}\noindent This is a class file for theses and dissertations at Eszterházy Károly University, Eger, Hungary (website: \texttt{https://uni-eszterhazy.hu}). The documentation is in Hungarian.
+% \selectlanguage{english}\noindent This is a class file for theses and dissertations at Eszterházy Károly Catholic University, Eger, Hungary (website: \texttt{https://uni-eszterhazy.hu}). The documentation is in Hungarian.
%\end{abstract}
%
% \section{Bevezető}
%
-% A \texttt{thesis-ekf} dokumentumosztály segítségével az Eszterházy Károly Egyetem szabályzatának megfelelő szakdolgozatokat lehet készíteni. A névben szereplő \texttt{ekf} az Eszterházy Károly Főiskola rövidítése, ugyanis ez a dokumentumosztály 2014-től létezik, amikor az intézmény még főiskola volt. A formai követelmények a következők:
+% A \texttt{thesis-ekf} dokumentumosztály segítségével az Eszterházy Károly Katolikus Egyetem szabályzatának megfelelő szakdolgozatokat lehet készíteni. Ez a dokumentumosztály 2014-től létezik, amikor az intézmény neve még Eszterházy Károly Főiskola volt. Ennek rövidítése a dokumentumosztály nevében szereplő \texttt{ekf}. A formai követelmények a következők:
%
% \medskip
% \begin{compactitem}
diff --git a/macros/latex/contrib/thesis-ekf/thesis-ekf.ins b/macros/latex/contrib/thesis-ekf/thesis-ekf.ins
index aa2c4df9c9..b33a89de30 100644
--- a/macros/latex/contrib/thesis-ekf/thesis-ekf.ins
+++ b/macros/latex/contrib/thesis-ekf/thesis-ekf.ins
@@ -1,5 +1,5 @@
-% Copyright (C) 2014-2020 by Tibor Tomacs
+% Copyright (C) 2014-2021 by Tibor Tomacs
% This file may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
% version 1.2 of this license or (at your option) any later
@@ -15,7 +15,7 @@
\usedir{tex/latex/thesis-ekf}
\preamble
This is a generated file.
-Copyright (C) 2014-2020 by Tibor Tomacs
+Copyright (C) 2014-2021 by Tibor Tomacs
This file may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
version 1.2 of this license or (at your option) any later
diff --git a/macros/latex/contrib/thesis-ekf/thesis-ekf.pdf b/macros/latex/contrib/thesis-ekf/thesis-ekf.pdf
index d6db7baca3..2c08a815cb 100644
--- a/macros/latex/contrib/thesis-ekf/thesis-ekf.pdf
+++ b/macros/latex/contrib/thesis-ekf/thesis-ekf.pdf
Binary files differ
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index 0fa6887299..9d23de7852 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,11 @@
+2021-08-12 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-ooffice.tex (ooffice.4ht): added support for SVG image inclusion.
+ * tex4ht-ooffice.tex (ooffice.4ht): fixed support for images created by
+ \Picture+{} and \Picture+{} commands.
+ * tex4ht-4ht.tex (graphics.4ht, graphicx.4ht): moved mapping to .xbb files
+ from graphicx.4ht to graphics.4ht, so they work with both packages.
+
2021-08-03 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (mdframed.4ht): correctly empty the frame title.
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index f409c9f06a..2f3aa6f0e1 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 969 2021-08-03 18:00:44Z michal_h21 $
+% $Id: tex4ht-4ht.tex 972 2021-08-12 20:24:34Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2021 TeX Users Group
@@ -25920,6 +25920,18 @@ Show dimensions only for pictures that have dimensions specified explicitly or u
\def\if:boundingbox#1#2{\ifdim\Gin@req@width=\Gin@nat@width\ifx\noBoundingBox\UnDefined#1\else#2\fi\else#1\fi}
>>>
+We need to find bounding boxes of images. Graphics support the .xbb file that contain this information.
+It is necessary to provide the DeclareGraphicsRule commands for supported image formats so
+the .xbb file works.
+
+\<fix graphics\><<<
+\DeclareGraphicsRule{.png}{bmp}{.xbb}{}
+\DeclareGraphicsRule{.jpg}{bmp}{.xbb}{}
+\DeclareGraphicsRule{.gif}{bmp}{.xbb}{}
+\DeclareGraphicsRule{.pdf}{bmp}{.xbb}{}
+\DeclareGraphicsRule{.svg}{bmp}{.xbb}{}
+>>>
+
%\expandafter\def\csname c:graphics-file:\endcsname#1{\Gin@drafttrue
% \def\Gin@setfile##1##2##3{%
% \def\:temp####1####2{#1}\:temp{##3}{\Gin@base}}}
@@ -26037,11 +26049,6 @@ dvips needs to be used instead
\fi
\Gin:esetsize
}
-\DeclareGraphicsRule{.png}{bmp}{.xbb}{}
-\DeclareGraphicsRule{.jpg}{bmp}{.xbb}{}
-\DeclareGraphicsRule{.gif}{bmp}{.xbb}{}
-\DeclareGraphicsRule{.pdf}{bmp}{.xbb}{}
-\DeclareGraphicsRule{.svg}{bmp}{.xbb}{}
\NewConfigure{rotatebox}{2}
\pend:def\Grot@box{\a:rotatebox}
@@ -26605,7 +26612,7 @@ We need to use dvips driver with XeLaTeX
\<mdframed.4ht\><<<
% mdframed.4ht (|version), generated from |jobname.tex
-% Copyright 2017 TeX Users Group
+% Copyright 2017-2021 TeX Users Group
|<TeX4ht license text|>
\NewConfigure{mdframed}{2}
diff --git a/support/TeX4ht/source/tex4ht-ooffice.tex b/support/TeX4ht/source/tex4ht-ooffice.tex
index 5a8a69ec0b..8286197a83 100644
--- a/support/TeX4ht/source/tex4ht-ooffice.tex
+++ b/support/TeX4ht/source/tex4ht-ooffice.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-ooffice.tex 904 2021-04-16 20:30:30Z karl $
+% $Id: tex4ht-ooffice.tex 971 2021-08-12 20:15:30Z michal_h21 $
% compile 3 times: latex tex4ht-ooffice
% htlatex tex4ht-ooffice "xhtml,4,sections+"
%
@@ -628,7 +628,7 @@ Commands for basic character styles:
\<graphics obj manifest\><<<
<manifest:file-entry
- manifest:full-path="Pictures/\PictureFile" manifest:media-type="\get:image:mime:type\Gin@ext"/>\Hnewline
+ manifest:full-path="Pictures/\PictureFile" manifest:media-type="\get:image:mime:type\filename@ext"/>\Hnewline
>>>
\<shared manifest\><<<
@@ -1083,6 +1083,9 @@ original paths to be able to copy pictures to correct location.
\Configure{graphics*}
{jpeg}
{|<save image name|>\Picture[IMG]{\imgBase.jpeg |<graphics dimensions|> }}
+\Configure{graphics*}
+ {svg}
+ {|<save image name|>\Picture[IMG]{\imgBase.svg |<graphics dimensions|> }}
|<graphics default extensions|>
@@ -1144,7 +1147,7 @@ original paths to be able to copy pictures to correct location.
Enable supported image extensions out of the box.
\<graphics default extensions\><<<
-\DeclareGraphicsExtensions{.png,.jpg,.eps,.pdf}
+\DeclareGraphicsExtensions{.png,.jpg,.eps,.pdf,.svg}
>>>
\<configure ooffice tex4ht\><<<
@@ -1162,12 +1165,13 @@ Enable supported image extensions out of the box.
\ht:special{t4ht=<draw:frame
draw:name="\PictureFile"
text:anchor-type="as-char" % "paragraph"
-% svg:width="...pt"
-% svg:height="...pt"
- % \ifx\noBoundingBox\UnDefined
- \string svg:width="\the\Gin@req@width"
- svg:height="\the\Gin@req@height"
- % \fi
+ % insert image dimension only if they really exist
+ \ifx\noBoundingBox\UnDefined
+ \ifx\Gin@req@width\undefined\else
+ \ifdim\Gin@req@width>0pt
+ \string svg:width="\the\Gin@req@width"
+ svg:height="\the\Gin@req@height"
+ \fi\fi\fi
draw:z-index="0"
>%
<draw:image\Hnewline
@@ -1228,13 +1232,22 @@ Enable supported image extensions out of the box.
>>>
+% we need to support both images inserted by \includegraphics,
+% and pictures created using \Picture*{}.
\<insert shadowing fig file\><<<
+% parse the image extension, will be used later
+\expandafter\filename@parse\expandafter{\PictureFile}%
+\ifx\Gin@base\@undefined
+\let\graphics:filename\PictureFile
+\else
+\def\graphics:filename{\Gin@base\Gin@ext}
+\fi
% \ht:special{t4ht>\PictureFile.4og}%
-\ht:special{t4ht>\Gin@base\Gin@ext.4og}%
+\ht:special{t4ht>\graphics:filename.4og}%
\ht:special{t4ht*>}%
% \ht:special{t4ht<\PictureFile.4og}%
-\ht:special{t4ht<\Gin@base\Gin@ext.4og}%
+\ht:special{t4ht<\graphics:filename.4og}%
\OOmanifest{|<graphics obj manifest|>}%
>>>
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 529d423211..aa9225077c 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/2021
-depend revision/60223
+depend revision/60231
name 00texlive.image
category TLCore
-revision 60211
+revision 60227
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
@@ -1886,6 +1886,7 @@ runfiles size=13899
tlpkg/tlpsrc/gentle.tlpsrc
tlpkg/tlpsrc/gentombow.tlpsrc
tlpkg/tlpsrc/geometry.tlpsrc
+ tlpkg/tlpsrc/geradwp.tlpsrc
tlpkg/tlpsrc/german.tlpsrc
tlpkg/tlpsrc/germbib.tlpsrc
tlpkg/tlpsrc/germkorr.tlpsrc
@@ -69705,7 +69706,7 @@ containerchecksum 653143f95761352dc349c66f618b01a77650b20bf8b2cf45137e72b2f05ba3
name collection-publishers
category Collection
-revision 60172
+revision 60227
shortdesc Publisher styles, theses, etc.
relocated 1
depend aastex
@@ -69783,6 +69784,7 @@ depend fei
depend ftc-notebook
depend gaceta
depend gammas
+depend geradwp
depend gradstudentresume
depend grant
depend gsemthesis
@@ -69954,8 +69956,8 @@ depend xmuthesis
depend yathesis
depend yazd-thesis
depend york-thesis
-containersize 1560
-containerchecksum 929e661aefe28c94e6197df02e5308ca1703d9673b347b1852de1f5f47f5a6442aa85c5e6b83da5137aeb2cd96491403141d22edd2ffbe128e433dac31689a33
+containersize 1564
+containerchecksum e769bd0e48531ae314086565dfb62616d288e1296164111b3e3a24c2416de7d73c568ec09411797c9f49ab3f56a6a120c3d9f2745574a0c79c86f2144d3d7067
name collection-texworks
category Collection
@@ -113082,7 +113084,7 @@ catalogue-version 1.8
name fancyvrb
category Package
-revision 57488
+revision 60226
shortdesc Sophisticated verbatim text
relocated 1
longdesc Flexible handling of verbatim text including: verbatim commands
@@ -113091,11 +113093,11 @@ longdesc parameters; ability to define new customized verbatim
longdesc environments; save and restore verbatim text and environments;
longdesc write and read files in verbatim mode; build "example"
longdesc environments (showing both result and verbatim source).
-containersize 11720
-containerchecksum cbbdd7c868e6d238b4e82e59f7e8b1917d64ceef2b75d7da7f95b823544b1fa0d05141a248ff449df52f784100d79ac8f609cf4025b9d3db5b24920dec3f0863
-doccontainersize 132784
-doccontainerchecksum 1de32c07f17b316e0ad8704f3c800d75ecab9a6e3cf80ce8c725c126e77353ed9685a1d8e9dcd61295f80b975814ea8c67c11b62fe5bfae71cc2ebeffb440d3e
-docfiles size=43
+containersize 11804
+containerchecksum 22ac1451e94e51d49441588d8080eaac1a4a717e823ffd1a496e22243cdc3ec0d0ac1acd3a2f226751ecb8d7e99a92dd76c945d9c6ff6d9c1e1ad3c2d4c1051b
+doccontainersize 146660
+doccontainerchecksum b4386a1009c46480bb318a7b4483d050a48ee8636ef322c61626051c510d92014e2a025ada915c50e03c87f2cb24d2497f467c21341585a2d55710d2135b72d4
+docfiles size=46
RELOC/doc/latex/fancyvrb/Changes
RELOC/doc/latex/fancyvrb/README details="Readme"
RELOC/doc/latex/fancyvrb/fancyvrb-doc.pdf details="Package documentation"
@@ -113108,7 +113110,7 @@ runfiles size=17
catalogue-ctan /macros/latex/contrib/fancyvrb
catalogue-license lppl1.3
catalogue-topics verbatim macro-demo
-catalogue-version 3.7
+catalogue-version 3.8
name fandol
category Package
@@ -127493,6 +127495,41 @@ catalogue-license lppl1.3c
catalogue-topics geometry
catalogue-version 5.9
+name geradwp
+category Package
+revision 60227
+shortdesc Document class for the Cahiers du GERAD series
+relocated 1
+longdesc This package provides the geradwp class, a class based on
+longdesc article and compatible with LaTeX. With this class, researchers
+longdesc at GERAD will be able to write their working paper while
+longdesc complying to all the presentation standards required by the
+longdesc Cahiers du GERAD series.
+containersize 5712
+containerchecksum 03eec24ca7e5152e83da1175ed9873cb3fec1d41ecadc5da4bfe5155b2d90985368f753b6ced659bd34630e3d909654571098ce2cdb679928b43914a140566f1
+doccontainersize 776584
+doccontainerchecksum e4460ac5eced7da09ad25c89257b47da638fefe95236660fa2a3f69089ead971f71c202c19c03df522670a444a0c0defffb73972e105bb61504ec3be15e970e0
+docfiles size=239
+ RELOC/doc/latex/geradwp/README.md details="Readme"
+ RELOC/doc/latex/geradwp/geradwp-fr.pdf details="Package documentation (French)" language="fr"
+ RELOC/doc/latex/geradwp/geradwp.pdf details="Package documentation (English)"
+ RELOC/doc/latex/geradwp/geradwp.tex
+srccontainersize 20972
+srccontainerchecksum 2b2215a676fd7238ce463bab55c1d71e7f02edaab6a3598fb3a48174e8edb6cfb98b45d971049cf1cd5e4ad247af5898a734530e3b870cff9570e9ae92562376
+srcfiles size=20
+ RELOC/source/latex/geradwp/geradwp.dtx
+ RELOC/source/latex/geradwp/geradwp.ins
+runfiles size=5
+ RELOC/tex/latex/geradwp/geradwp.cls
+catalogue-contact-bugs https://github.com/metalogueur/geradwp/issues
+catalogue-contact-home https://www.gerad.ca/fr/cahiers-definition
+catalogue-contact-repository https://github.com/metalogueur/geradwp
+catalogue-contact-support https://www.gerad.ca/fr/cahiers-procedure
+catalogue-ctan /macros/latex/contrib/geradwp
+catalogue-license lppl1.3c
+catalogue-topics class doc-templ misc-paper
+catalogue-version 1.0
+
name german
category Package
revision 42428
@@ -153275,17 +153312,17 @@ catalogue-topics labels
name jlreq
category Package
-revision 60109
+revision 60225
shortdesc Japanese document class based on requirements for Japanese text layout
relocated 1
longdesc This package provides a Japanese document class based on
longdesc requirements for Japanese text layout. The class file and the
longdesc JFM (Japanese font metric) files for LuaTeX-ja / pLaTeX /
longdesc upLaTeX are provided.
-containersize 137100
-containerchecksum 4efb3e1140d99a3dc85483b55859258c81b2939d1430bafa57faec61563d9d60c06b5d4b30a68c0ccbd8863165482e8d59adc955b796c8f45a4ef4387ea2d227
-doccontainersize 513076
-doccontainerchecksum e2cf35cb16527747e74560f231ef4950a98c5deed626c16d155ca714d7d1be499ca377592b084fe708f678f20acde1f18157f37c43aac2139f655f1279fb60ce
+containersize 136784
+containerchecksum b6479aa6dd2678b65ee03fd59890290255befd251b3589b0ebe1bb0690fc7b15d7d3d1c1b432e9e5ff98cf03e2cd539986196f4867491b9937a3efee71d2c43e
+doccontainersize 513700
+doccontainerchecksum c2e9989eec4ee112ffd7666f84559a5c2b916d38d001cac24282a0780403141c01f7b321b8bb6fc63dab65fcc8a1162329adcb3be3e1aa0c67f42e690d99ec38
docfiles size=164
RELOC/doc/latex/jlreq/LICENSE
RELOC/doc/latex/jlreq/README-ja.md details="Readme" language="ja"
@@ -153298,8 +153335,8 @@ docfiles size=164
RELOC/doc/latex/jlreq/jlreq-trimmarks.md
RELOC/doc/latex/jlreq/jlreq.html
RELOC/doc/latex/jlreq/jlreq.pdf details="Package documentation"
-srccontainersize 8212
-srccontainerchecksum 525bf04790a00cad861a40f616bbf065ac663feb56890f10e5ab2c73fbbce65681e046c74d5c7c36623fe7480bdb4680393b5f04ebbd65afa2a5b0684af3a8c7
+srccontainersize 8208
+srccontainerchecksum f80027237776c4f47ebb1cd06de0e744677e39e13b65b015671d0ac587f59ab6baae1d2274fc1e3e5b9772602af77058980f30ee0cb555304f3c115bae36472d
srcfiles size=10
RELOC/source/latex/jlreq/Makefile
RELOC/source/latex/jlreq/README-template.html
@@ -259282,7 +259319,7 @@ catalogue-version 1.0.1
name pwebmac
category Package
-revision 58478
+revision 60229
shortdesc Consolidated WEB macros for DVI and PDF output
relocated 1
longdesc The original WEB system by Donald Knuth has the macros
@@ -259304,25 +259341,25 @@ longdesc in the WEB sources. WEB programmers who want to use pwebmac.tex
longdesc instead of the default webmac.tex in their programs have to
longdesc change the first line in the TeX file created by weave. From
longdesc there, all depends on the "TeX engine" you use.
-containersize 7788
-containerchecksum 5b8b6825d84e6addce3491bdaaf30a6127d0becd26956066dbb2dc482d4942087b9423affe02654f28d5f7b1bd0e7743fd731ac2201b394630bf089deae8de59
-doccontainersize 9048
-doccontainerchecksum 6078a4a0263f3c342c9814f3ac8d5028f6d73871e89c64859e86a7c694a5a6392873e592f5daba7c6c2b89c3eaf6bdf1a745618999bf448edc8007d3d5a541a9
-docfiles size=10
+containersize 8200
+containerchecksum bb34067e0e0fefb1bf665810c08cc2e312076bda959e9f065f797bbcfab4582182138abd3c1c862b0df9189925a6587a5ba51f2a06e2bcee172eaec569629a7a
+doccontainersize 10512
+doccontainerchecksum 35f3fb780a4ebc76e4ff6258ab0a048f75d2a62041d2f78a8feaefbaf138abccdf322ae3e158e804c5f041493ab6223f0740ed0e7ced744f3bfec39eed3d1bb7
+docfiles size=11
RELOC/doc/plain/pwebmac/README.md details="Readme"
RELOC/doc/plain/pwebmac/Xerrorlog.tex
RELOC/doc/plain/pwebmac/index.md
RELOC/doc/plain/pwebmac/makeall
RELOC/doc/plain/pwebmac/trapman.ch
RELOC/doc/plain/pwebmac/webman.ch
-runfiles size=5
+runfiles size=6
RELOC/tex/plain/pwebmac/pwebmac.tex
catalogue-contact-repository https://github.com/ascherer/web
catalogue-contact-support https://lists.tug.org/tex-k
catalogue-ctan /web/pwebmac
catalogue-license pd
catalogue-topics litprog
-catalogue-version 4.6.2
+catalogue-version 4.6.3
name pxbase
category Package
@@ -292235,7 +292272,7 @@ binfiles arch=x86_64-solaris size=1
name tex4ht
category Package
-revision 60153
+revision 60231
shortdesc Convert (La)TeX to HTML/XML
longdesc A converter from TeX and LaTeX to SGML-based formats such as
longdesc (X)HTML, MathML, OpenDocument, and Docbook, providing a
@@ -292248,10 +292285,10 @@ longdesc helper DVI file that it can then process. This technique allows
longdesc TeX4ht to approach the robustness characteristic of
longdesc restricted-syntax systems such as gellmu.
depend tex4ht.ARCH
-containersize 907628
-containerchecksum be54b50dd91dab2f573caba94bb42b528cae1737a759a49865c5e7be0aabec052a6e0e68de2243da1d05289b57fcb228243e10956fc9fd9142e1c16650e4be4e
+containersize 907752
+containerchecksum 559f1b5ffdb964f3c5d4e508dc92392a26c89a80ee91e6c12b56f2f307ae248e71f67ea85b7c8f9bf593958da4e8daf0284c01727fd2a5a7c8b98b3cec436079
doccontainersize 136384
-doccontainerchecksum 37885ea77b4ac4a75679f8fd0aca046f29574fd17e3833d70d17e339eb94b9bb10510b2d53f031adb6871fa1cf4eb520ef5d54bc32d32a2403f1d06585aed016
+doccontainerchecksum 8c0445ba8c1ce97f3254d718cfa9641ad28d76fbc42f3c1cbcc4f33684b47070bc63b1277b691952f6fb79b772380639b88649c5adb410d919ada374f65cd621
docfiles size=260
texmf-dist/doc/generic/tex4ht/Makefile
texmf-dist/doc/generic/tex4ht/README details="Readme"
@@ -292323,8 +292360,8 @@ docfiles size=260
texmf-dist/doc/generic/tex4ht/mn56.html
texmf-dist/doc/generic/tex4ht/mn5x.png
texmf-dist/doc/generic/tex4ht/mn6x.png
-srccontainersize 1209480
-srccontainerchecksum f595667759b0b09f45aad733ff5d9da5713c002f0dc274a2f31a87a29c9b33403dbe45fc058010b5efda5795fe264af4e71f97da5cb2eeea9b33c28fddc9c7d3
+srccontainersize 1221384
+srccontainerchecksum bc9d2aeefb7c92e78b10132d71fcb48172d0b0700bfa3bfc223efa6f89ed168dc6632ff8be6e892008bb7e4474d6a249892036685b5bd6766c74eb8a1431d5b1
srcfiles size=3626
texmf-dist/source/generic/tex4ht/ChangeLog
texmf-dist/source/generic/tex4ht/Makefile
@@ -305607,25 +305644,25 @@ catalogue-topics label-ref maths-theorem
name thesis-ekf
category Package
-revision 57207
-shortdesc Thesis class for Eszterhazy Karoly University
+revision 60228
+shortdesc Thesis class for Eszterhazy Karoly Catholic University
relocated 1
longdesc This is a class file for theses and dissertations at the
-longdesc Eszterhazy Karoly University (Eger, Hungary). It is based on
-longdesc the report class. The documentation is in Hungarian.
-containersize 59556
-containerchecksum 34f9f72bd8ef813c0ef6a01956304ef99f8a0fecf17786f9aa51fc6aac4655f5a76aa030509379699f6dcbe6a7245cd1d01f2fd0df8fd3bc77e5f8ddaa0ffb8c
-doccontainersize 313284
-doccontainerchecksum 48989f4df56a2820c048651831b598fd3c956ffb2733a9d3e8a68891e7c410a72425ba3a32a4a0ecd6f7640f7054d85016c7c9dd129ad59849588cdc09547548
-docfiles size=78
+longdesc Eszterhazy Karoly Catholic University (Eger, Hungary). The
+longdesc documentation is in Hungarian.
+containersize 113096
+containerchecksum 7ef62e88cf25c1b7c37dcbdba00dca0fe522727cd6d1b5bf27cdea73e4638defd2430c2440879479427b2faea91315203179b8f45224d68067ad46810dfd6da0
+doccontainersize 322100
+doccontainerchecksum 50220e7cdded7a36703fe4e0965d19e18c6aca7a8f738b4808efc28d472f01522b456474bfb6c4d43ecc61d81173f0025918b302083829e849059fbcac5e096f
+docfiles size=81
RELOC/doc/latex/thesis-ekf/README details="Readme"
RELOC/doc/latex/thesis-ekf/thesis-ekf.pdf details="Package documentation" language="hu"
srccontainersize 9064
-srccontainerchecksum 45c2329fa7994a119e1c8c2d3e777b4ab1083496c538edcda3382d2321a4b7cea97daddde8efd75bad12b79d95d635f45bd79f1db682a384ef320d4b000c1ec1
+srccontainerchecksum a479e92491a962f549ba9a2863504efadfa5a1515d209eb26a541ad88a5bd8657ee3f3492e99068f3dca869e8394ca9008a074c17d139e2a22325364b0a7d89b
srcfiles size=10
RELOC/source/latex/thesis-ekf/thesis-ekf.dtx
RELOC/source/latex/thesis-ekf/thesis-ekf.ins
-runfiles size=43
+runfiles size=71
RELOC/tex/latex/thesis-ekf/eszterhazy-logo-de.eps
RELOC/tex/latex/thesis-ekf/eszterhazy-logo-de.pdf
RELOC/tex/latex/thesis-ekf/eszterhazy-logo-en.eps
@@ -305636,7 +305673,7 @@ runfiles size=43
catalogue-ctan /macros/latex/contrib/thesis-ekf
catalogue-license lppl1.2
catalogue-topics dissertation class hungarian
-catalogue-version 4.1
+catalogue-version 4.2
name thesis-gwu
category Package
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index e41133d18b..f3a6a958a0 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-a3b43823b4caa52fad838c021586f7d1 texlive.tlpdb
+45ddcf67a9afaa23660da89f3c9808a2 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 060fa3d45a..706bfff407 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-3676756a4c354c5f3bd3638f6461ba8ec3458207e29b1359aa3bfe4f10891e91c3aab86d3ccdf2da71c6a810b5ee719db75b21ac717d940be48cac06176d86d7 texlive.tlpdb
+357acc02475486836fcc4a02ed25cb459a4293ee10c114a1ff40dadbca67d8a1badd87a039359c3060814b9ef919806c6377ad38d7f0bd650e8aaa9127dab0cf texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index e5e002b413..e67d2df4d9 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-----
-iQEcBAEBCgAGBQJhFGKjAAoJEEzhh34ZQ4xww5kH/iGtMNgZx28lnj3ORIMTbESu
-1ftvcxItqMtzR+m/8E/Ikl3sKgfBrfVi0ZqiLRBqBB5WfUf2ktyrKFk/XRXLU+TN
-/cfUvNumdEpaKe9c373XQ8JT7cttExOzoEcJgxSD146AVmsPWdawYRRx9u0TRL5G
-Stn3rC/mEfqR0+4Dpa3W1K9vhE0rE0IHz65QfWJuDKFJwcSxD2r8nPvuit2EWUjr
-TaXu168veFn8+1BQRwcu2n7tD676R7kRVy5jY7EfUDSnH/OjCMwRDqWdfKQxtUju
-iwExrJSkpeS81CZvEqx85UiKwzY7VJ2/PxXqx07oSagU3r5Ihj0xwhDZ/OrkJ5U=
-=/lnR
+iQEcBAEBCgAGBQJhFbQlAAoJEEzhh34ZQ4xwknsH/10qDB2R6DukX9IPv8DCXdUT
+AUADgzYzS+9jrAXbbdwwDS4cKkBE9DwfkqghlkdZEXkciysVhWCgpDWZqq8JsU4x
+jpH9deam2X+kP393xNGwl4rgqZwsaV+u+bUTl7uVM9sTZhO/gO9flA2gfZLOgmWd
+rgFFiIzrODf1xS3vXr/RdVrBsDDMksx9Nqdxx6L1htYLgLMgknSOrdRYKoLNJMJh
+oaYev4djhCaiJ4kR7PUnaKBhXXSdlupsSvtaVlC18Q7J652maxZJRODsGAthqo1H
+MUkdpqkRcFUGhioWtsUgSD2xGHjgUgdjRt3NT54oZYqFTOKek+T1x0b8K6h0G0c=
+=b25Y
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index e16766f339..31c51e0e7c 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 7649a43aa8..c89a5ed818 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=1628712904
+date=1628799304
lastupd=miktex-arctrl-bin-2.9 miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-2.9 miktex-asymptote-bin-x64-2.9 miktex-autosp-bin-2.9 miktex-autosp-bin-x64-2.9 miktex-axohelp-bin-2.9 miktex-axohelp-bin-x64-2.9 miktex-bibarts-bin-2.9 miktex-bibarts-bin-x64-2.9 miktex-bibtex-bin-2.9 miktex-bibtex-bin-x64-2.9 miktex-bibtex8bit-bin-2.9 miktex-bibtex8bit-bin-x64-2.9 miktex-bzip2-bin-2.9 miktex-bzip2-bin-x64-2.9 miktex-cairo-bin-2.9 miktex-cairo-bin-x64-2.9 miktex-chktex-bin-2.9 miktex-chktex-bin-x64-2.9
-lstdigest=f6173776b8bf80661637d71bb94e21dd
+lstdigest=8f054a2c4a93f0159a7f73d90c45d823
numpkg=4656
relstate=next
-version=7893
+version=7894
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: qcQgUSgh1OjTl7HySNgbPVlldxwdX5A8OjaXkvvZjyr46rGTXEO9vqOfDHd5ciZW7T89NVOTxEK91Oi37kTgxrIQhsOrkx1FBOG2UI8XYIRYINsxf+C0w611wh80fq30l6QkUCzR9l6TC7uXG7k96PdGLPOPtkQFx+X/WbIZwTSLTZLA16imIfP2Ph7Yg/PuVJafPTwRvhj7mv51xRI31WLlbUBdtzoHzvvYOxi5Bvt7z6MxF59Rlfd0x2IcqD8Nxa49ptEr7ni0WZ+0Knk15Gk9G8t8TDVvDKacjFxvISCKG5eqa5WiZ3ZalQmv/IIEBkHIF3VA4SXoVljyXIE+cg==
+;;;; signature/miktex: g0t+PDq7BDDEGH7hwaPeepYFXk0FqQJXOLui7vlMrO8S09Ve1VhH/xhHQbAGbZ3pqZe0BG+BfehEqnFpCcz5wKyk5pVFdYomwkSE7PgvI0+K5oOvClIEncjn8Sp74AX3sYsAyaN7YoAGCxWHJ4LW39iqikL9sATBtK5DEzBtCySoFEz3ebFRLVmsiyM8KZ5UpWmAQjUQOKa89Pd0C/VCG+pw6ZfBTzBSXhuejb4FqmiVrDEn5MFh7FFbjIOy5abOTUm5OH4LXOvd+SLDlKrsHWXrfEdO+AmVcUJ9r6/6QFNJh8Ys+h5b91UFm0UEPLkwsb9qHT6cZBpBJ3Z0kL/nCA==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index 7bcd0e5ef0..89fc8fc42f 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1628712709
+date=1628799101
lastupd=beaulivre beaulivre__doc beaulivre__source colorist colorist__doc colorist__source cooltooltips cooltooltips__doc cooltooltips__source easybook easybook__doc easybook__source einfart einfart__doc einfart__source elpres elpres__doc elpres__source hep-paper hep-paper__doc
-lstdigest=87fc736cf5389f662e413374081a05d3
+lstdigest=93ab027e943d709257adf2f0ec3b4091
numpkg=4656
relstate=stable
-version=7893
+version=7894
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: w17O82P6iZFTdhshnEWOk6rNiVtYOOQNdkd7+SS66sSuCETtJbGem708nKCWSta2bZJ8+cX7jB9S8Fpf1DAAsZxeVzFHMYHUEsD/3OmgG6BZOwR1Vaq93olsY9yw7w8d0tHHb4K54ijttZgFcezpgjows45UaPVlnxcDEXr1eyZZT6D+V2s0bfl9YEvTF+PDDKx8mlSHBjMtxhTCwUCMFmIVcenvNoHlONJdcudIHjXzdx/+1PpDtr6Ct/1p4YyqzVodvI6X7dCzZLcXzmmglScfw7O6EToKwhnG3fSoWO0boF9udT/vYN4LWP53pBbiMNZd4z9qucGUkwGCD8QfjQ==
+;;;; signature/miktex: RI3r4eYyoajL0uGClD7QKvaVw4nauuhs6qpoK10O2i/1fK7EdELyV2vkjVv3hbQichXBG7I+biasBXPAn86uLck061yKSeEz4JvKHOVC8Uzjyos97DyGw1nX2Xqqbtx/5mmbEP4yo1jEAE8pA3NU/3agif1/fR0AdSr0eadijS4f9rb6F31NwUUJSBURMaU5/N90K08VVdqp3uZ+VtafBW/cAk5zx0CGy3+Hi5TA3L5J/+J4vaS5vJL6l6i92mOmTJcL+FHd+x/zVssMk+MJQNGJoZz47321xQjo36PMrSJrvtuwYYbAW4yVFwUngbmk97o9OIdlEW00DjNYySCnPA==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index 2ff54ceca9..ca6656c042 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:
-2021-08-12-02-02
+2021-08-13-02-02
diff --git a/usergrps/gutenberg/VERSION b/usergrps/gutenberg/VERSION
index deaa2d4be8..ffd172e3ae 100644
--- a/usergrps/gutenberg/VERSION
+++ b/usergrps/gutenberg/VERSION
@@ -1 +1 @@
-2021-05-03
+2021-08-12
diff --git a/usergrps/gutenberg/lettre/lettre40.pdf b/usergrps/gutenberg/lettre/lettre40.pdf
index f159c0e986..ea1c617283 100644
--- a/usergrps/gutenberg/lettre/lettre40.pdf
+++ b/usergrps/gutenberg/lettre/lettre40.pdf
Binary files differ
diff --git a/usergrps/gutenberg/lettre/lettre44.pdf b/usergrps/gutenberg/lettre/lettre44.pdf
new file mode 100644
index 0000000000..56d8d50d55
--- /dev/null
+++ b/usergrps/gutenberg/lettre/lettre44.pdf
Binary files differ
diff --git a/web/pwebmac/README.md b/web/pwebmac/README.md
index 59d5e38f99..030376e19d 100644
--- a/web/pwebmac/README.md
+++ b/web/pwebmac/README.md
@@ -3,11 +3,11 @@
The original [WEB](https://ctan.org/pkg/web) system by Donald Knuth has the
macros `webmac.tex` that produce DVI output only; for historic reasons, it
will never be modified (apart from catastrophic errors).
-Hàn Thế Thành has modified these macros in his (outdated?) `pdfwebmac.tex` for
+Hàn Thế Thành has extended these macros in his (outdated?) `pdfwebmac.tex` for
PDF output (only) with [pdfTeX](https://ctan.org/pkg/pdftex).
Jonathan Kew's [XeTeX](https://ctan.org/pkg/xetex) has similar macros
-`xewebmac.tex` by Khaled Hosny that _modify_ `webmac.tex` for PDF output;
-these macros can only be used with a specific “TeX engine” each.
+`xewebmac.tex` by Khaled Hosny that include and _modify_ `webmac.tex` for PDF
+output; all these macros can only be used with a specific “TeX engine” each.
The present `pwebmac` package integrates these three WEB macro files similar
to `cwebmac.tex` in Silvio Levy's and Don Knuth's
@@ -18,8 +18,8 @@ Its initial application is the production of PDF files for all major WEB
programs for “TeX and friends” as distributed in
[TeX Live](https://www.tug.org/texlive). For this purpose, the shell script
`makeall` was whipped together; it provides various commandline options and
-works around several “quirks” in the WEB sources. The resulting ``PDF
-library'' can be browsed in the `knuth-pdf` package.
+works around several “quirks” in the WEB sources. The resulting collection
+of PDF documents can be browsed in the `knuth-pdf` package.
WEB programmers who want to use `pwebmac.tex` instead of the default
`webmac.tex` in their programs have to change the first line in the TeX file
@@ -30,4 +30,4 @@ clickable links and bookmarks (depending on your PDF viewer).
The `pwebmac` package is free software and may be used without constraints.
-This is version “4.6.2” of the `pwebmac` package — 2021-03-17, Andreas Scherer.
+This is version “4.6.3” of the `pwebmac` package — 2021-08-12, Andreas Scherer.
diff --git a/web/pwebmac/index.md b/web/pwebmac/index.md
index 1554700c7d..0c9accb73e 100644
--- a/web/pwebmac/index.md
+++ b/web/pwebmac/index.md
@@ -14,9 +14,9 @@ Welcome to “All Things `WEB`” in “\TeX\ Live.”
Here you find the documented source code of all major `WEB` and `CWEB` programs
in readable format. The “named” entries represent the unmodified base sources
as written by their respective authors, the attached “`chg`” links point to
-“only the changed sections (or modules)” as applied for release in the “\TeX\
-Live” distribution, so you may want to study these pairs in parallel. Care has
-been taken to keep the section numbers for the main parts intact.
+“only the changed sections (or modules)” as applied for release in the
+“\TeX\ Live” distribution, so you may want to study these pairs in parallel.
+Care has been taken to keep the section numbers for the main parts intact.
Although not all the programs presented here are written or maintained by
Donald Knuth, it is more convenient for everything to be collected in one place
diff --git a/web/pwebmac/makeall b/web/pwebmac/makeall
index 5f817ea242..08347f321e 100755
--- a/web/pwebmac/makeall
+++ b/web/pwebmac/makeall
@@ -174,6 +174,8 @@ FI
r texmf-pdf.patch
}" $f.tex
+ $SED_I -e "s/{\\\\the\\\\pageno}}}\\\\next/{\\\\the\\\\pageno}{\\\\the\\\\toksE}}}\\\\next/" $f.tex
+
cat > texmf-pdf.patch << FI
\ifpdf\special{pdf: outline 0 << /Title (\the\toksE) /Dest
[ @thispage /FitH @ypos ] >>}\fi
diff --git a/web/pwebmac/pwebmac.tex b/web/pwebmac/pwebmac.tex
index 7f9972d21c..2eb713f8c0 100644
--- a/web/pwebmac/pwebmac.tex
+++ b/web/pwebmac/pwebmac.tex
@@ -160,8 +160,10 @@
\else\if\noexpand\nxt\relax % we have a control sequence; is it one we know?
\ifx\nxt~\addF\space
\else\ifx\nxt\onespace\addF\space
- \else\the\usersanitizer % if not recognised, skip it
- \fi\fi
+ \else\the\usersanitizer
+ \iftokprocessed\else\makeolproctokctl
+ \iftokprocessed\else\makeolproctokmath % if not recognised, skip it
+ \fi\fi\fi\fi
\else % we don't have a control sequence, it's an ordinary char
\ifx/\nxt \addF{\string\/}% quote chars special to PDF with backslash
\else\ifx(\nxt \addF{\string\(}\else\ifx)\nxt \addF{\string\)}%
@@ -170,6 +172,34 @@
\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi%\fi\fi
\next
}
+\def\makeolproctokctl{%
+ \ifx\nxt\PASCAL\addF{Pascal\space}\let\next\makeolgobbletok % \PASCAL/
+ \else\ifx\nxt\UNIX\addF{UNIX}\let\next\makeolgobbletok % \UNIX/
+ \else\ifx\nxt\TEX\addF{TeX}\let\next\makeolgobbletok % \TEX/
+ \else\ifx\nxt\TeX\addF{TeX}\else\ifx\nxt\LaTeX\addF{LaTeX}%
+ \else\ifx\nxt\CPLUSPLUS\addF{C++}\let\next\makeolgobbletok % \CPLUSPLUS/
+ \else\ifx\nxt\CEE\addF{C}\else\ifx\nxt\Cee\addF{C}%
+ \else\ifx\nxt\PB \let\next\makeolgobbletok \tokprocessedtrue % \PB{...}
+ \else\ifx\nxt\.\tokprocessedtrue\instrtrue % \.{...}
+ % skip \|
+ \else\ifx\nxt\\\ifinstr\addF{\bschar\bschar}\else\tokprocessedtrue\fi
+ \else\ifx\nxt\&\ifinstr\addF&\else\tokprocessedtrue\fi
+ \else\ifx\nxt\~\ifTnum\addF{0}\else\addF\tildechar\fi % 077->\T{\~77}
+ \else\ifx\nxt\_\ifTnum\addF{E}\else\addF_\fi % 0.1E5->\T{0.1\_5}
+ \else\ifx\nxt\^\ifTnum\addF{0x}\else\addF^\fi % 0x77 -> \T{\^77}
+ \else\ifx\nxt\$\ifTnum\tokprocessedtrue\else\addF$\fi % \T{77\$L} %$%
+ \else\ifx\nxt\{\addF\lbchar \else\ifx\nxt\}\addF\rbchar
+ \else\ifx\nxt\ \addF\space \else\ifx\nxt\#\addF{\string\#}%
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+}
+\def\makeolproctokmath{%
+ \ifx\nxt\alpha\addF{alpha}\else\ifx\nxt\beta\addF{beta}%
+ \else\ifx\nxt\gamma\addF{gamma}\else\ifx\nxt\delta\addF{delta}%
+ \else\ifx\nxt\theta\addF{theta}\else\ifx\nxt\psqrt\addF{root }%
+ \else\ifx\nxt\H\addF{"}\else\ifx\nxt\O\addF{'}%
+ \else\ifx\nxt\v\addF{|}\else\ifx\nxt\S\addF{==}%
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+}
\def\makeolproctokchar#1 #2 #3{\addF{#3}}
\def\outlinedone{\edef\outlinest{\global\noexpand\toksE={\the\toksF}}%
\outlinest\let\outlinedone=\relax}
@@ -184,7 +214,7 @@
\else \special{pdf: dest (\romannumeral\modstar)
[ @thispage /FitH @ypos ]}\fi}}\fi}
\let\startsection=\stsec
-\def\defin#1{\global\advance\ind by 2 \1\&{#1 } } % begin `define' or `format'
+\def\defin#1{\global\advance\ind by 2 \1\&{#1 }} % begin `define' or `format'
\def\A{\note{See also section}} % xref for doubly defined section name
\def\As{\note{See also sections}} % xref for multiply defined section name
\def\B{\mathopen{\.{@\{}}} % begin controlled comment
@@ -207,8 +237,10 @@
\ifacro{\toksF={}\makeoutlinetoks#2\outlinedone\outlinedone}\fi
\gtitle={#2}\MN#1.\vfil\eject % define running headline
\message{*\modno} % progress report
+ \def\stripprefix##1>{}\def\gtitletoks{#2}%
+ \edef\gtitletoks{\expandafter\stripprefix\meaning\gtitletoks}%
\edef\next{\write\cont{\Z{#2}{\modno}% write to contents file
- {\noexpand\the\pageno}}}\next % \Z{title}{sec}{page}
+ {\noexpand\the\pageno}{\the\toksE}}}\next % \Z{title}{sec}{page}{ss}
\ifpdf\special{pdf: outline 0 << /Title (\the\toksE) /Dest
[ @thispage /FitH @ypos ] >>}\fi
\ifon\startsection{\bf#2.\quad}\ignorespaces}
@@ -361,9 +393,9 @@
\else \csname#1\endcsname \fi} % Petr Olsak's macros from texinfo.tex
\def\advancenumber#1{\countA=\expnumber{#1}\relax \advance\countA by1
\expandafter\xdef\csname#1\endcsname{\the\countA}}
-\def\writebookmarkline#1#2#3{{%
+\def\writebookmarkline#1#2#3#4{{%
\let\(=\let \let\)=\let \let\[=\let \let\]=\let \let\/=\let
- \pdfoutline goto num #2{#1}}}
+ \pdfoutline goto num #2{#4}}}
\def\con{\par\vfill\eject % finish the section names
% \ifodd\pageno\else\titletrue\null\vfill\eject\fi % for duplex printers
\rightskip 0pt \hyphenpenalty 50 \tolerance 200
@@ -377,7 +409,7 @@
\let\Z=\contentsline
\readcontents\relax % read the contents info
\botofcontents \end} % print the contents page(s) and terminate
-\def\contentsline#1#2#3{%
+\def\contentsline#1#2#3#4{%
\line{\ignorespaces#1
\rm\leaders\hbox to .5em{.\hfil}\hfil
\ \ifacro\pdflink{#2}{\romannumeral#2}\else#2\fi\hbox to3em{\hss#3}}}
diff --git a/web/pwebmac/webman.ch b/web/pwebmac/webman.ch
index af8b2e88ff..074af792e7 100644
--- a/web/pwebmac/webman.ch
+++ b/web/pwebmac/webman.ch
@@ -121,6 +121,12 @@ This excerpt from \.{WEAVE.WEB} produced modules 55--59 in
\pdfURL{Appendix~D}{weave.pdf}.
@z
+@x l.1050
+ASCII codes is $c_1c_2\ldots c_m$, its hash value will be
+@y
+ASCII codes is $c_1c_2\ldots c_n$, its hash value will be
+@z
+
@x l.1061
\section Appendix B.
This excerpt from \.{WEAVE.TEX} corresponds to Appendix A.
@@ -130,6 +136,18 @@ This excerpt from \.{WEAVE.TEX} corresponds to Appendix A.
This excerpt from \.{WEAVE.TEX} corresponds to \Appendix A.
@z
+@x l.1129
+ASCII codes is $c_1c_2\ldots c_m$, its hash value will be
+@y
+ASCII codes is $c_1c_2\ldots c_n$, its hash value will be
+@z
+
+@x l.1139
+\U section~58.\fi
+@y
+\U58.\fi
+@z
+
@x l.1143
\section Appendix C.
@y
@@ -137,6 +155,153 @@ This excerpt from \.{WEAVE.TEX} corresponds to \Appendix A.
\section Appendix C.
@z
+@x l.1149
+those lines. There are 1559 lines in all; the notation
+@y
+those lines. There are 1585 lines in all; the notation
+@z
+
+@x l.1158
+{2:}{4:}{$C-,A+,D-}{[$C+,D+]}{:4}
+PROGRAM WEAVE(WEBFILE,CHANGEFILE,TEXFILE);LABEL 9999;CONST{8:}
+MAXBYTES=45000;MAXNAMES=5000;MAXMODULES=2000;HASHSIZE=353;BUFSIZE=100;
+@y
+{2:}{4:}{$C-,A+,D-}{[$C+,D+]}
+{:4}PROGRAM WEAVE(WEBFILE,CHANGEFILE,TEXFILE);LABEL 9999;
+CONST{8:}MAXBYTES=45000;MAXNAMES=5000;MAXMODULES=2000;HASHSIZE=353;
+@z
+
+@x l.1162
+TOKPTR:0..MAXTOKS;{MAXTOKPTR,MAXTXTPTR:0..MAXTOKS;}{:53}{55:}
+IDFIRST:0..LONGBUFSIZE;IDLOC:0..LONGBUFSIZE;
+@y
+TOKPTR:0..MAXTOKS;{MAXTOKPTR,MAXTXTPTR:0..MAXTOKS;}
+{:53}{55:}IDFIRST:0..LONGBUFSIZE;IDLOC:0..LONGBUFSIZE;
+@z
+
+@x l.1166
+PROCEDURE INITIALIZE;VAR{16:}I:0..127;{:16}{40:}WI:0..1;{:40}{56:}
+H:0..HASHSIZE;{:56}{247:}C:ASCIICODE;{:247}BEGIN{10:}HISTORY:=0;{:10}
+@y
+{:33}PROCEDURE INITIALIZE;VAR{16:}I:0..255;{:16}{40:}WI:0..1;
+{:40}{56:}H:0..HASHSIZE;{:56}{247:}C:ASCIICODE;
+@z
+
+@x l.1169
+TOKPTR:=1;TEXTPTR:=1;TOKSTART[0]:=1;TOKSTART[1]:=1;{MAXTOKPTR:=1;
+MAXTXTPTR:=1;}{:54}{57:}FOR H:=0 TO HASHSIZE-1 DO HASH[H]:=0;{:57}{94:}
+SCANNINGHEX:=FALSE;{:94}{102:}MODTEXT[0]:=32;{:102}{124:}OUTPTR:=1;
+@y
+{MAXTOKPTR:=1;MAXTXTPTR:=1;}
+{:54}{57:}FOR H:=0 TO HASHSIZE-1 DO HASH[H]:=0;
+{:57}{94:}SCANNINGHEX:=FALSE;{:94}{102:}MODTEXT[0]:=32;
+@z
+
+@x l.1173
+IF R=0 THEN XREF[P]:=XREFPTR ELSE XMEM[R].XLINKFIELD:=XREFPTR;END;{:51}
+{58:}FUNCTION IDLOOKUP(T:EIGHTBITS):NAMEPOINTER;LABEL 31;
+@y
+IF R=0 THEN XREF[P]:=XREFPTR ELSE XMEM[R].XLINKFIELD:=XREFPTR;END;
+{:51}{58:}FUNCTION IDLOOKUP(T:EIGHTBITS):NAMEPOINTER;LABEL 31;
+@z
+
+@x l.1176
+L:0..LONGBUFSIZE;P:NAMEPOINTER;BEGIN L:=IDLOC-IDFIRST;{59:}
+H:=BUFFER[IDFIRST];I:=IDFIRST+1;
+@y
+L:0..LONGBUFSIZE;P:NAMEPOINTER;BEGIN L:=IDLOC-IDFIRST;
+{59:}H:=BUFFER[IDFIRST];I:=IDFIRST+1;
+@z
+
+@x l.1184
+LINK[P]:=HASH[H];HASH[H]:=P;31:{:60};IF P=NAMEPTR THEN{62:}
+BEGIN W:=NAMEPTR MOD 2;
+@y
+LINK[P]:=HASH[H];HASH[H]:=P;31:{:60};
+IF P=NAMEPTR THEN{62:}BEGIN W:=NAMEPTR MOD 2;
+@z
+
+@x l.1194
+XREF[P]:=0;END{:62};IDLOOKUP:=P;END;{:58}{66:}
+FUNCTION MODLOOKUP(L:SIXTEENBITS):NAMEPOINTER;LABEL 31;VAR C:0..4;
+@y
+XREF[P]:=0;END{:62};IDLOOKUP:=P;END;
+{:58}{66:}FUNCTION MODLOOKUP(L:SIXTEENBITS):NAMEPOINTER;LABEL 31;
+@z
+
+@x l.1208
+\verbatim
+@y
+\begingroup \def\tt{\ninett} \baselineskip10pt
+\verbatim
+@z
+
+@x l.1210
+\xdef\fmtversion{\fmtversion+WEBMAC4.0} % identifies current set of macros
+@y
+\xdef\fmtversion{\fmtversion+WEBMAC4.2} % identifies current set of macros
+@z
+
+@x l.1218
+\font\tentex=cmtex10 % TeX extended character set (used in strings)
+@y
+\font\tentex=cmtex10 % TeX extended character set (used in strings)
+\fontdimen7\tentex=0pt % no extra space after punctuation
+@z
+
+@x l.1294
+ {\xdef\modstar{#1}\let\*=\empty\xdef\modno{#1}}
+ \ifx\modno\modstar \onmaybe \else\ontrue \fi \mark{\modno}}
+@y
+ {\xdef\modstar{#1}\let\*=\empty\xdef\modno{#1}}% remove \* from section name
+ \ifx\modno\modstar \onmaybe \else\ontrue \fi
+ \mark{{{\tensy x}\modno}{\rhead}}}
+ % each \mark is {section reference or null}{group title}
+@z
+
+@x l.1325
+\def\lheader{\mainfont\the\pageno\eightrm\qquad\rhead\hfill\title\qquad
+ \tensy x\mainfont\topmark} % top line on left-hand pages
+\def\rheader{\tensy x\mainfont\topmark\eightrm\qquad\title\hfill\rhead
+ \qquad\mainfont\the\pageno} % top line on right-hand pages
+@y
+\def\lheader{\mainfont\the\pageno\eightrm\qquad\rhead
+ \hfill\title\qquad\mainfont\topsecno} % top line on left-hand pages
+\def\rheader{\mainfont\topsecno\eightrm\qquad\title\hfill
+ \rhead\qquad\mainfont\the\pageno} % top line on right-hand pages
+\def\topsecno{\expandafter\takeone\topmark}
+\def\takeone#1#2{#1}
+\def\taketwo#1#2{#2}
+\def\nullsec{\eightrm\kern-2em} % the \kern-2em cancels \qquad in headers
+@z
+
+@x l.1336
+\def\rhead{\.{WEB} OUTPUT} % this running head is reset by starred sections
+@y
+\def\rhead{\.{WEB} OUTPUT} % this running head is reset by starred sections
+\mark{\noexpand\nullsec{\rhead}}
+@z
+
+@x l.1392
+ \def\rhead{NAMES OF THE SECTIONS}
+@y
+ \def\rhead{NAMES OF THE SECTIONS}
+ \let\topsecno=\nullsec
+@z
+
+@x l.1395
+ \def\note##1##2.{\hfil\penalty-1\hfilneg\quad{\eightrm##1 ##2.}}
+@y
+ \def\note##1##2.{\hfil\penalty-1\hfilneg\quad{\eightrm##1~##2.}}
+@z
+
+@x l.1414
+?endgroup
+@y
+?endgroup
+\endgroup
+@z
+
@x l.1425
in small caps. For example, Appendix~D was produced after saying
@y
@@ -172,6 +337,12 @@ dependencies'' in the index of \pdfURL{Appendix~E}{tangle.pdf} above,
and figure out what changes
@z
+@x l.1592
+first change files; then you can sure that your compiler will handle
+@y
+first change files; then you can be sure that your compiler will handle
+@z
+
@x l.1609
the index to Appendix~D.
@y