summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CTAN.sites4
-rw-r--r--FILES.byname759
-rw-r--r--FILES.byname.gzbin2440595 -> 2441356 bytes
-rw-r--r--FILES.last07days725
-rw-r--r--dviware/dvisirule/DEPENDS.txt (renamed from macros/latex/contrib/dvisirule/DEPENDS.txt)0
-rw-r--r--dviware/dvisirule/LICENSE (renamed from macros/latex/contrib/dvisirule/LICENSE)0
-rw-r--r--dviware/dvisirule/Makefile (renamed from macros/latex/contrib/dvisirule/Makefile)0
-rw-r--r--dviware/dvisirule/README.md (renamed from macros/latex/contrib/dvisirule/README.md)0
-rw-r--r--dviware/dvisirule/cmd.mk (renamed from macros/latex/contrib/dvisirule/cmd.mk)0
-rw-r--r--dviware/dvisirule/demo.tex (renamed from macros/latex/contrib/dvisirule/demo.tex)0
-rw-r--r--dviware/dvisirule/dvisirule-expg.mk (renamed from macros/latex/contrib/dvisirule/dvisirule-expg.mk)0
-rw-r--r--dviware/dvisirule/dvisirule-marker.awk (renamed from macros/latex/contrib/dvisirule/dvisirule-marker.awk)0
-rw-r--r--dviware/dvisirule/dvisirule-pgnum.awk (renamed from macros/latex/contrib/dvisirule/dvisirule-pgnum.awk)0
-rw-r--r--dviware/dvisirule/dvisirule.dtx (renamed from macros/latex/contrib/dvisirule/dvisirule.dtx)3
-rw-r--r--dviware/dvisirule/dvisirule.ins (renamed from macros/latex/contrib/dvisirule/dvisirule.ins)0
-rw-r--r--dviware/dvisirule/dvisirule.pdfbin0 -> 60243 bytes
-rw-r--r--dviware/dvisirule/dvisirule.sh (renamed from macros/latex/contrib/dvisirule/dvisirule.sh)0
-rw-r--r--dviware/dvisirule/fonts.tex (renamed from macros/latex/contrib/dvisirule/fonts.tex)0
-rw-r--r--dviware/dvisirule/reconf.sh (renamed from macros/latex/contrib/dvisirule/reconf.sh)0
-rw-r--r--dviware/dvisirule/src/Makefile (renamed from macros/latex/contrib/dvisirule/src/Makefile)6
-rw-r--r--dviware/dvisirule/src/Makefile.am (renamed from macros/latex/contrib/dvisirule/src/Makefile.am)0
-rw-r--r--dviware/dvisirule/src/Makefile.in (renamed from macros/latex/contrib/dvisirule/src/Makefile.in)0
-rw-r--r--dviware/dvisirule/src/aclocal.m4 (renamed from macros/latex/contrib/dvisirule/src/aclocal.m4)0
-rw-r--r--dviware/dvisirule/src/config.h (renamed from macros/latex/contrib/dvisirule/src/config.h)6
-rw-r--r--dviware/dvisirule/src/config.h.in (renamed from macros/latex/contrib/dvisirule/src/config.h.in)0
-rwxr-xr-xdviware/dvisirule/src/config/compile (renamed from macros/latex/contrib/dvisirule/src/config/compile)0
-rwxr-xr-xdviware/dvisirule/src/config/depcomp (renamed from macros/latex/contrib/dvisirule/src/config/depcomp)0
-rwxr-xr-xdviware/dvisirule/src/config/install-sh (renamed from macros/latex/contrib/dvisirule/src/config/install-sh)0
-rwxr-xr-xdviware/dvisirule/src/config/missing (renamed from macros/latex/contrib/dvisirule/src/config/missing)0
-rwxr-xr-xdviware/dvisirule/src/configure (renamed from macros/latex/contrib/dvisirule/src/configure)20
-rw-r--r--dviware/dvisirule/src/configure.ac (renamed from macros/latex/contrib/dvisirule/src/configure.ac)2
-rw-r--r--dviware/dvisirule/src/dvi.h (renamed from macros/latex/contrib/dvisirule/src/dvi.h)0
-rw-r--r--dviware/dvisirule/src/dvisirule-bin.c (renamed from macros/latex/contrib/dvisirule/src/dvisirule-bin.c)0
-rw-r--r--macros/generic/lt3luabridge/README.md2
-rw-r--r--macros/generic/lt3luabridge/docstrip.cfg5
-rw-r--r--macros/generic/lt3luabridge/lt3luabridge.dtx681
-rw-r--r--macros/generic/lt3luabridge/lt3luabridge.ins7
-rw-r--r--macros/generic/lt3luabridge/lt3luabridge.pdfbin0 -> 503613 bytes
-rw-r--r--macros/generic/lt3luabridge/lt3luabridge.sty8
-rw-r--r--macros/generic/lt3luabridge/lt3luabridge.tex407
-rw-r--r--macros/generic/lt3luabridge/t-lt3luabridge.tex4
-rw-r--r--macros/latex/contrib/asmejour/README.md11
-rw-r--r--macros/latex/contrib/asmejour/asmejour-template.pdfbin628626 -> 628945 bytes
-rw-r--r--macros/latex/contrib/asmejour/asmejour-template.tex15
-rw-r--r--macros/latex/contrib/asmejour/asmejour.cls45
-rw-r--r--macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.pdfbin2978593 -> 3048771 bytes
-rw-r--r--macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.tex8
-rw-r--r--macros/latex/contrib/asmejour/asmewide_example/asmewide.sty23
-rw-r--r--macros/latex/contrib/dvisirule/dvisirule.pdfbin60242 -> 0 bytes
-rw-r--r--macros/latex/contrib/familytree/DEPENDS.txt3
-rw-r--r--macros/latex/contrib/familytree/LICENSE339
-rw-r--r--macros/latex/contrib/familytree/Makefile51
-rw-r--r--macros/latex/contrib/familytree/README.md212
-rw-r--r--macros/latex/contrib/familytree/cmd.mk45
-rw-r--r--macros/latex/contrib/familytree/doc-ja/Makefile37
-rw-r--r--macros/latex/contrib/familytree/doc-ja/familytree-ja.tex287
-rw-r--r--macros/latex/contrib/familytree/doc-ja/figs/Makefile74
-rw-r--r--macros/latex/contrib/familytree/doc-ja/figs/fig-ja.tex23
-rw-r--r--macros/latex/contrib/familytree/doc-ja/figs/fig1Hidetada.tex5
-rw-r--r--macros/latex/contrib/familytree/doc-ja/figs/fig1Ieyasu.tex24
-rw-r--r--macros/latex/contrib/familytree/doc-ja/figs/fig1base.tex4
-rw-r--r--macros/latex/contrib/familytree/doc-ja/figs/fig2Hidetada.tex28
-rw-r--r--macros/latex/contrib/familytree/doc-ja/figs/fig2base-ja.tex9
-rw-r--r--macros/latex/contrib/familytree/doc-ja/figs/fig2cfg.tex6
-rw-r--r--macros/latex/contrib/familytree/doc-ja/figs/fig2ival-ja.tex5
-rw-r--r--macros/latex/contrib/familytree/doc-ja/figs/fig3Hidetada.tex29
-rw-r--r--macros/latex/contrib/familytree/doc-ja/figs/fig3Iemitsu.tex28
-rw-r--r--macros/latex/contrib/familytree/doc-ja/figs/fig3Ietsuna.tex16
-rw-r--r--macros/latex/contrib/familytree/doc-ja/figs/fig4Hidetada.tex31
-rw-r--r--macros/latex/contrib/familytree/doc-ja/figs/fig4Ogou.tex6
-rw-r--r--macros/latex/contrib/familytree/doc-ja/figs/figTY-ja.tex41
-rw-r--r--macros/latex/contrib/familytree/doc-ja/ft-gens-ja.tex305
-rw-r--r--macros/latex/contrib/familytree/doc-ja/ft-individual-ja.tex456
-rw-r--r--macros/latex/contrib/familytree/doc-ja/ft-lib-ja.tex86
-rw-r--r--macros/latex/contrib/familytree/doc-ja/ft-marriage-ja.tex219
-rw-r--r--macros/latex/contrib/familytree/doc-ja/ft-sibling-ja.tex181
-rw-r--r--macros/latex/contrib/familytree/familytree-ja.pdfbin0 -> 504083 bytes
-rw-r--r--macros/latex/contrib/familytree/familytree.dtx260
-rw-r--r--macros/latex/contrib/familytree/familytree.ins12
-rw-r--r--macros/latex/contrib/familytree/familytree.pdfbin0 -> 178069 bytes
-rw-r--r--macros/latex/contrib/familytree/figs/Makefile76
-rw-r--r--macros/latex/contrib/familytree/figs/fig.tex9
-rw-r--r--macros/latex/contrib/familytree/figs/fig1Robert1.tex19
-rw-r--r--macros/latex/contrib/familytree/figs/fig1Robert2.tex3
-rw-r--r--macros/latex/contrib/familytree/figs/fig2base.tex13
-rw-r--r--macros/latex/contrib/familytree/figs/fig2ival.tex5
-rw-r--r--macros/latex/contrib/familytree/figs/fig2sis.tex25
-rw-r--r--macros/latex/contrib/familytree/figs/fig3Lily1.tex16
-rw-r--r--macros/latex/contrib/familytree/figs/fig3Lily2.tex17
-rw-r--r--macros/latex/contrib/familytree/figs/fig3Lily3.tex20
-rw-r--r--macros/latex/contrib/familytree/figs/fig3Lily4.tex18
-rw-r--r--macros/latex/contrib/familytree/figs/fig3Robert1.tex12
-rw-r--r--macros/latex/contrib/familytree/figs/fig3Robert2.tex13
-rw-r--r--macros/latex/contrib/familytree/figs/fig3sis.tex11
-rw-r--r--macros/latex/contrib/familytree/figs/fig4HenryVIII.tex20
-rw-r--r--macros/latex/contrib/familytree/figs/fig4Lily1.tex10
-rw-r--r--macros/latex/contrib/familytree/figs/fig4Lily2.tex12
-rw-r--r--macros/latex/contrib/familytree/figs/fig4Lily3.tex12
-rw-r--r--macros/latex/contrib/familytree/figs/fig4Lily4.tex12
-rw-r--r--macros/latex/contrib/familytree/figs/fig4Robert.tex23
-rw-r--r--macros/latex/contrib/familytree/fonts.tex3
-rw-r--r--macros/latex/contrib/familytree/ft-gens.dtx365
-rw-r--r--macros/latex/contrib/familytree/ft-individual.dtx760
-rw-r--r--macros/latex/contrib/familytree/ft-lib.dtx247
-rw-r--r--macros/latex/contrib/familytree/ft-marriage.dtx374
-rw-r--r--macros/latex/contrib/familytree/ft-sibling.dtx333
-rw-r--r--macros/latex/contrib/familytree/samples/Asai.pdfbin0 -> 184895 bytes
-rw-r--r--macros/latex/contrib/familytree/samples/Asai/0Ichi.tex43
-rw-r--r--macros/latex/contrib/familytree/samples/Asai/0sis.tex77
-rw-r--r--macros/latex/contrib/familytree/samples/Asai/1Chacha.tex64
-rw-r--r--macros/latex/contrib/familytree/samples/Asai/2Hatsu.tex76
-rw-r--r--macros/latex/contrib/familytree/samples/Asai/3Gou.tex104
-rw-r--r--macros/latex/contrib/familytree/samples/Asai/Asai.tex53
-rw-r--r--macros/latex/contrib/familytree/samples/Asai/Makefile19
-rw-r--r--macros/latex/contrib/familytree/samples/Crawley.pdfbin0 -> 19860 bytes
-rw-r--r--macros/latex/contrib/familytree/samples/Crawley.tex258
-rw-r--r--macros/latex/contrib/familytree/samples/Makefile24
-rw-r--r--macros/latex/contrib/familytree/samples/Tokugawa.pdfbin0 -> 182522 bytes
-rw-r--r--macros/latex/contrib/familytree/samples/Tokugawa/Makefile20
-rw-r--r--macros/latex/contrib/familytree/samples/Tokugawa/Tokugawa.tex299
-rw-r--r--macros/latex/contrib/familytree/samples/Tokugawa/tg-10th.tex25
-rw-r--r--macros/latex/contrib/familytree/samples/Tokugawa/tg-11th.tex11
-rw-r--r--macros/latex/contrib/familytree/samples/Tokugawa/tg-12th.tex14
-rw-r--r--macros/latex/contrib/familytree/samples/Tokugawa/tg-13th.tex6
-rw-r--r--macros/latex/contrib/familytree/samples/Tokugawa/tg-14th.tex1
-rw-r--r--macros/latex/contrib/familytree/samples/Tokugawa/tg-15th.tex3
-rw-r--r--macros/latex/contrib/familytree/samples/Tokugawa/tg-1st.tex1
-rw-r--r--macros/latex/contrib/familytree/samples/Tokugawa/tg-2nd.tex10
-rw-r--r--macros/latex/contrib/familytree/samples/Tokugawa/tg-3rd.tex22
-rw-r--r--macros/latex/contrib/familytree/samples/Tokugawa/tg-4th.tex35
-rw-r--r--macros/latex/contrib/familytree/samples/Tokugawa/tg-5th.tex27
-rw-r--r--macros/latex/contrib/familytree/samples/Tokugawa/tg-6th.tex21
-rw-r--r--macros/latex/contrib/familytree/samples/Tokugawa/tg-7th.tex14
-rw-r--r--macros/latex/contrib/familytree/samples/Tokugawa/tg-8th.tex9
-rw-r--r--macros/latex/contrib/familytree/samples/Tokugawa/tg-9th.tex15
-rw-r--r--macros/latex/contrib/msu-thesis/README.md2
-rw-r--r--macros/latex/contrib/msu-thesis/msu-thesis.cls20
-rw-r--r--macros/latex/contrib/msu-thesis/msu-thesis.pdfbin247537 -> 247699 bytes
-rw-r--r--macros/latex/contrib/msu-thesis/msu-thesis.tex10
-rw-r--r--macros/latex/contrib/msu-thesis/samples/MSU-thesis-testfile.pdfbin196098 -> 160223 bytes
-rw-r--r--macros/latex/contrib/newpax/README.md2
-rw-r--r--macros/latex/contrib/newpax/doc-input1.pdf532
-rw-r--r--macros/latex/contrib/newpax/doc-input1.tex3
-rw-r--r--macros/latex/contrib/newpax/doc-input2.pdf526
-rw-r--r--macros/latex/contrib/newpax/doc-input2.tex3
-rw-r--r--macros/latex/contrib/newpax/doc-use-newpax.pdf1012
-rw-r--r--macros/latex/contrib/newpax/doc-use-newpax.tex6
-rw-r--r--macros/latex/contrib/newpax/doc-use-pax.pdfbin44937 -> 44965 bytes
-rw-r--r--macros/latex/contrib/newpax/doc-use-pax.tex4
-rw-r--r--macros/latex/contrib/newpax/newpax.dtx67
-rw-r--r--macros/latex/contrib/newpax/newpax.ins4
-rw-r--r--macros/latex/contrib/newpax/newpax.pdf2302
-rw-r--r--macros/latex/contrib/newpax/newpax.tex14
-rw-r--r--macros/xetex/latex/bidi/README4
-rw-r--r--macros/xetex/latex/bidi/bidi-doc-intro.ltx2
-rw-r--r--macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx8
-rw-r--r--macros/xetex/latex/bidi/bidi-doc-plain-basics.ltx6
-rw-r--r--macros/xetex/latex/bidi/bidi-doc-title.ltx4
-rw-r--r--macros/xetex/latex/bidi/bidi-doc.ltx2
-rw-r--r--macros/xetex/latex/bidi/bidi-doc.pdfbin178136 -> 177693 bytes
-rw-r--r--macros/xetex/latex/bidi/bidi.dtx498
-rw-r--r--macros/xetex/latex/bidi/bidi.pdfbin3393758 -> 3443872 bytes
-rw-r--r--macros/xetex/latex/xepersian/README4
-rw-r--r--macros/xetex/latex/xepersian/xepersian-doc-basics.ltx10
-rw-r--r--macros/xetex/latex/xepersian/xepersian-doc-intro.ltx2
-rw-r--r--macros/xetex/latex/xepersian/xepersian-doc-pkgs.ltx4
-rw-r--r--macros/xetex/latex/xepersian/xepersian-doc-title.ltx4
-rw-r--r--macros/xetex/latex/xepersian/xepersian-doc.ltx2
-rw-r--r--macros/xetex/latex/xepersian/xepersian-doc.pdfbin243591 -> 243608 bytes
-rw-r--r--macros/xetex/latex/xepersian/xepersian.dtx57
-rw-r--r--macros/xetex/latex/xepersian/xepersian.pdfbin776194 -> 775188 bytes
-rw-r--r--support/TeX4ht/source/ChangeLog5
-rw-r--r--support/TeX4ht/source/tex4ht-4ht.tex10
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl6
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb231
-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.xzbin2387780 -> 2388032 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
182 files changed, 11260 insertions, 3384 deletions
diff --git a/CTAN.sites b/CTAN.sites
index 607e8740bb..d3d43985ab 100644
--- a/CTAN.sites
+++ b/CTAN.sites
@@ -225,8 +225,8 @@ by country):
ctan.crest.fr (France)
URL: https://ctan.crest.fr/tex-archive/
- ctan.gutenberg.eu.org (France)
- URL: https://ctan.gutenberg.eu.org/
+ ctan.gutenberg-asso.fr (France)
+ URL: https://ctan.gutenberg-asso.fr/
ctan.mines-albi.fr (France)
URL: https://ctan.mines-albi.fr/
diff --git a/FILES.byname b/FILES.byname
index 4ec3f8404c..40a3871749 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -3663,6 +3663,36 @@
2006/05/11 | 1516 | dviware/dvipsconfig/config.usletter
2006/05/11 | 10268 | dviware/dvipsconfig/README
2006/08/07 | 35780 | dviware/dvipsconfig.zip
+2022/06/26 | 465 | dviware/dvisirule/cmd.mk
+2022/06/26 | 676 | dviware/dvisirule/demo.tex
+2022/06/26 | 5 | dviware/dvisirule/DEPENDS.txt
+2022/06/26 | 14894 | dviware/dvisirule/dvisirule.dtx
+2022/06/26 | 1002 | dviware/dvisirule/dvisirule-expg.mk
+2022/06/26 | 139 | dviware/dvisirule/dvisirule.ins
+2022/06/26 | 2155 | dviware/dvisirule/dvisirule-marker.awk
+2022/06/27 | 60243 | dviware/dvisirule/dvisirule.pdf
+2022/06/26 | 1231 | dviware/dvisirule/dvisirule-pgnum.awk
+2022/06/26 | 3622 | dviware/dvisirule/dvisirule.sh
+2022/06/26 | 154 | dviware/dvisirule/fonts.tex
+2022/06/26 | 18092 | dviware/dvisirule/LICENSE
+2022/06/26 | 2293 | dviware/dvisirule/Makefile
+2022/06/26 | 2570 | dviware/dvisirule/README.md
+2022/06/26 | 130 | dviware/dvisirule/reconf.sh
+2022/06/27 | 41888 | dviware/dvisirule/src/aclocal.m4
+2022/06/27 | 7383 | dviware/dvisirule/src/config/compile
+2022/06/27 | 23568 | dviware/dvisirule/src/config/depcomp
+2022/06/27 | 4133 | dviware/dvisirule/src/config.h
+2022/06/27 | 3850 | dviware/dvisirule/src/config.h.in
+2022/06/27 | 15368 | dviware/dvisirule/src/config/install-sh
+2022/06/27 | 6878 | dviware/dvisirule/src/config/missing
+2022/06/27 | 182744 | dviware/dvisirule/src/configure
+2022/06/27 | 836 | dviware/dvisirule/src/configure.ac
+2022/06/25 | 2683 | dviware/dvisirule/src/dvi.h
+2022/06/25 | 10277 | dviware/dvisirule/src/dvisirule-bin.c
+2022/06/27 | 24408 | dviware/dvisirule/src/Makefile
+2022/06/25 | 70 | dviware/dvisirule/src/Makefile.am
+2022/06/27 | 24525 | dviware/dvisirule/src/Makefile.in
+2022/06/27 | 182696 | dviware/dvisirule.zip
1990/10/02 | 6169 | dviware/dvisun/commands.h
1990/10/02 | 2488 | dviware/dvisun/dvisun.1
1990/10/02 | 41517 | dviware/dvisun/dvisun.c
@@ -5225,7 +5255,7 @@
1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp
1990/10/02 | 812 | dviware/vutex/vaxvms.ins
1990/10/02 | 127576 | dviware/vutex/vutex.web
-2022/06/26 | 114041 | FILES.last07days
+2022/06/27 | 138490 | 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
@@ -189147,11 +189177,11 @@
2020/01/31 | 1873940 | install/macros/unicodetex/latex/unicode-math.tds.zip
2016/05/14 | 185871 | install/macros/xetex/generic/zhspacing.tds.zip
2015/09/04 | 718623 | install/macros/xetex/latex/arabxetex.tds.zip
-2022/06/15 | 4618973 | install/macros/xetex/latex/bidi.tds.zip
+2022/06/27 | 4672946 | install/macros/xetex/latex/bidi.tds.zip
2015/02/17 | 92757 | install/macros/xetex/latex/interchar.tds.zip
2021/08/19 | 464024 | install/macros/xetex/latex/mynsfc.tds.zip
2022/06/04 | 1988408 | install/macros/xetex/latex/xecjk.tds.zip
-2022/06/10 | 1296090 | install/macros/xetex/latex/xepersian.tds.zip
+2022/06/27 | 1295701 | install/macros/xetex/latex/xepersian.tds.zip
2008/06/20 | 3954 | install/macros/xetex/plain/xetexfontinfo.tds.zip
2013/01/04 | 36361 | install/support/adhocfilelist.tds.zip
2021/11/27 | 2294905 | install/support/albatross.tds.zip
@@ -203105,16 +203135,16 @@
2015/04/18 | 4795 | macros/generic/lpform/lpform.sty
2014/07/14 | 902 | macros/generic/lpform/README
2015/04/18 | 271086 | macros/generic/lpform.zip
-2022/06/26 | 1481 | macros/generic/lt3luabridge/docstrip.cfg
-2022/06/26 | 95 | macros/generic/lt3luabridge/example.context
-2022/06/26 | 131 | macros/generic/lt3luabridge/example.latex
-2022/06/26 | 77 | macros/generic/lt3luabridge/example.plaintex
-2022/06/26 | 19105 | macros/generic/lt3luabridge/LICENSE
-2022/06/26 | 232 | macros/generic/lt3luabridge/lt3luabridge.sty
-2022/06/26 | 10791 | macros/generic/lt3luabridge/lt3luabridge.tex
-2022/06/26 | 895 | macros/generic/lt3luabridge/README.md
-2022/06/26 | 122 | macros/generic/lt3luabridge/t-lt3luabridge.tex
-2022/06/26 | 11449 | macros/generic/lt3luabridge.zip
+2022/06/27 | 1389 | macros/generic/lt3luabridge/docstrip.cfg
+2022/06/27 | 95 | macros/generic/lt3luabridge/example.context
+2022/06/27 | 131 | macros/generic/lt3luabridge/example.latex
+2022/06/27 | 77 | macros/generic/lt3luabridge/example.plaintex
+2022/06/27 | 19105 | macros/generic/lt3luabridge/LICENSE
+2022/06/27 | 19116 | macros/generic/lt3luabridge/lt3luabridge.dtx
+2022/06/27 | 253 | macros/generic/lt3luabridge/lt3luabridge.ins
+2022/06/27 | 503613 | macros/generic/lt3luabridge/lt3luabridge.pdf
+2022/06/27 | 896 | macros/generic/lt3luabridge/README.md
+2022/06/27 | 500017 | macros/generic/lt3luabridge.zip
2020/09/22 | 66128 | macros/generic/ltxcmds/ltxcmds.dtx
2020/09/22 | 397106 | macros/generic/ltxcmds/ltxcmds.pdf
2020/09/22 | 379 | macros/generic/ltxcmds/README.md
@@ -206559,20 +206589,20 @@
2019/07/08 | 91105 | macros/latex/contrib/asmeconf/sample-figure-2b.pdf
2022/03/15 | 4525847 | macros/latex/contrib/asmeconf.zip
2021/12/23 | 42691 | macros/latex/contrib/asmejour/asmejour.bst
-2022/01/11 | 44104 | macros/latex/contrib/asmejour/asmejour.cls
+2022/06/26 | 45987 | macros/latex/contrib/asmejour/asmejour.cls
2022/01/11 | 19974 | macros/latex/contrib/asmejour/asmejour-sample.bib
-2022/01/11 | 628626 | macros/latex/contrib/asmejour/asmejour-template.pdf
-2022/01/11 | 42846 | macros/latex/contrib/asmejour/asmejour-template.tex
-2022/01/11 | 2978593 | macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.pdf
-2022/01/11 | 16404 | macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.tex
-2022/01/10 | 5427 | macros/latex/contrib/asmejour/asmewide_example/asmewide.sty
+2022/06/26 | 628945 | macros/latex/contrib/asmejour/asmejour-template.pdf
+2022/06/26 | 43395 | macros/latex/contrib/asmejour/asmejour-template.tex
+2022/06/27 | 3048771 | macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.pdf
+2022/06/27 | 16478 | macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.tex
+2022/06/27 | 6012 | macros/latex/contrib/asmejour/asmewide_example/asmewide.sty
2022/01/04 | 1237557 | macros/latex/contrib/asmejour/asmewide_example/tesseral-harmonic.pdf
2022/01/04 | 1221215 | macros/latex/contrib/asmejour/asmewide_example/zonal-harmonic2.pdf
-2022/01/11 | 8179 | macros/latex/contrib/asmejour/README.md
+2022/06/26 | 8634 | macros/latex/contrib/asmejour/README.md
2019/03/24 | 17689 | macros/latex/contrib/asmejour/sample-figure-1.pdf
2019/07/08 | 95556 | macros/latex/contrib/asmejour/sample-figure-2a.pdf
2019/07/08 | 91105 | macros/latex/contrib/asmejour/sample-figure-2b.pdf
-2022/01/11 | 2641945 | macros/latex/contrib/asmejour.zip
+2022/06/27 | 2635203 | macros/latex/contrib/asmejour.zip
2008/02/08 | 3136 | macros/latex/contrib/aspectratio/amarbi.pfb
2008/02/08 | 144 | macros/latex/contrib/aspectratio/amarbi.tfm
2008/01/27 | 3138 | macros/latex/contrib/aspectratio/amarri.pfb
@@ -213617,36 +213647,6 @@
2013/02/13 | 205042 | macros/latex/contrib/dvgloss/dvgloss.pdf
2013/02/13 | 911 | macros/latex/contrib/dvgloss/README
2013/02/13 | 212927 | macros/latex/contrib/dvgloss.zip
-2022/06/25 | 465 | macros/latex/contrib/dvisirule/cmd.mk
-2022/06/25 | 676 | macros/latex/contrib/dvisirule/demo.tex
-2022/06/25 | 5 | macros/latex/contrib/dvisirule/DEPENDS.txt
-2022/06/25 | 14916 | macros/latex/contrib/dvisirule/dvisirule.dtx
-2022/06/25 | 1002 | macros/latex/contrib/dvisirule/dvisirule-expg.mk
-2022/06/25 | 139 | macros/latex/contrib/dvisirule/dvisirule.ins
-2022/06/25 | 2155 | macros/latex/contrib/dvisirule/dvisirule-marker.awk
-2022/06/25 | 60242 | macros/latex/contrib/dvisirule/dvisirule.pdf
-2022/06/25 | 1231 | macros/latex/contrib/dvisirule/dvisirule-pgnum.awk
-2022/06/25 | 3622 | macros/latex/contrib/dvisirule/dvisirule.sh
-2022/06/25 | 154 | macros/latex/contrib/dvisirule/fonts.tex
-2022/06/25 | 18092 | macros/latex/contrib/dvisirule/LICENSE
-2022/06/25 | 2293 | macros/latex/contrib/dvisirule/Makefile
-2022/06/25 | 2570 | macros/latex/contrib/dvisirule/README.md
-2022/06/25 | 130 | macros/latex/contrib/dvisirule/reconf.sh
-2022/06/25 | 41888 | macros/latex/contrib/dvisirule/src/aclocal.m4
-2022/06/25 | 7383 | macros/latex/contrib/dvisirule/src/config/compile
-2022/06/25 | 23568 | macros/latex/contrib/dvisirule/src/config/depcomp
-2022/06/25 | 4133 | macros/latex/contrib/dvisirule/src/config.h
-2022/06/25 | 3850 | macros/latex/contrib/dvisirule/src/config.h.in
-2022/06/25 | 15368 | macros/latex/contrib/dvisirule/src/config/install-sh
-2022/06/25 | 6878 | macros/latex/contrib/dvisirule/src/config/missing
-2022/06/25 | 182744 | macros/latex/contrib/dvisirule/src/configure
-2022/06/25 | 836 | macros/latex/contrib/dvisirule/src/configure.ac
-2022/06/25 | 2683 | macros/latex/contrib/dvisirule/src/dvi.h
-2022/06/25 | 10277 | macros/latex/contrib/dvisirule/src/dvisirule-bin.c
-2022/06/25 | 24408 | macros/latex/contrib/dvisirule/src/Makefile
-2022/06/25 | 70 | macros/latex/contrib/dvisirule/src/Makefile.am
-2022/06/25 | 24525 | macros/latex/contrib/dvisirule/src/Makefile.in
-2022/06/26 | 182704 | macros/latex/contrib/dvisirule.zip
2015/10/27 | 6815 | macros/latex/contrib/dynamicnumber/dynamicnumber.dtx
2015/10/27 | 1099 | macros/latex/contrib/dynamicnumber/dynamicnumber.ins
2015/10/27 | 158209 | macros/latex/contrib/dynamicnumber/dynamicnumber.pdf
@@ -215251,6 +215251,93 @@
2006/04/11 | 102352 | macros/latex/contrib/faktor/faktor.pdf
2006/04/11 | 3692 | macros/latex/contrib/faktor/README
2006/04/11 | 86898 | macros/latex/contrib/faktor.zip
+2022/06/26 | 910 | macros/latex/contrib/familytree/cmd.mk
+2022/06/26 | 43 | macros/latex/contrib/familytree/DEPENDS.txt
+2022/06/26 | 7759 | macros/latex/contrib/familytree/doc-ja/familytree-ja.tex
+2022/06/26 | 120 | macros/latex/contrib/familytree/doc-ja/figs/fig1base.tex
+2022/06/26 | 153 | macros/latex/contrib/familytree/doc-ja/figs/fig1Hidetada.tex
+2022/06/26 | 399 | macros/latex/contrib/familytree/doc-ja/figs/fig1Ieyasu.tex
+2022/06/26 | 166 | macros/latex/contrib/familytree/doc-ja/figs/fig2base-ja.tex
+2022/06/26 | 175 | macros/latex/contrib/familytree/doc-ja/figs/fig2cfg.tex
+2022/06/26 | 548 | macros/latex/contrib/familytree/doc-ja/figs/fig2Hidetada.tex
+2022/06/26 | 169 | macros/latex/contrib/familytree/doc-ja/figs/fig2ival-ja.tex
+2022/06/26 | 582 | macros/latex/contrib/familytree/doc-ja/figs/fig3Hidetada.tex
+2022/06/26 | 670 | macros/latex/contrib/familytree/doc-ja/figs/fig3Iemitsu.tex
+2022/06/26 | 403 | macros/latex/contrib/familytree/doc-ja/figs/fig3Ietsuna.tex
+2022/06/26 | 761 | macros/latex/contrib/familytree/doc-ja/figs/fig4Hidetada.tex
+2022/06/26 | 248 | macros/latex/contrib/familytree/doc-ja/figs/fig4Ogou.tex
+2022/06/26 | 417 | macros/latex/contrib/familytree/doc-ja/figs/fig-ja.tex
+2022/06/26 | 806 | macros/latex/contrib/familytree/doc-ja/figs/figTY-ja.tex
+2022/06/26 | 2097 | macros/latex/contrib/familytree/doc-ja/figs/Makefile
+2022/06/26 | 8878 | macros/latex/contrib/familytree/doc-ja/ft-gens-ja.tex
+2022/06/26 | 10897 | macros/latex/contrib/familytree/doc-ja/ft-individual-ja.tex
+2022/06/26 | 2080 | macros/latex/contrib/familytree/doc-ja/ft-lib-ja.tex
+2022/06/26 | 6158 | macros/latex/contrib/familytree/doc-ja/ft-marriage-ja.tex
+2022/06/26 | 4904 | macros/latex/contrib/familytree/doc-ja/ft-sibling-ja.tex
+2022/06/26 | 771 | macros/latex/contrib/familytree/doc-ja/Makefile
+2022/06/26 | 7392 | macros/latex/contrib/familytree/familytree.dtx
+2022/06/26 | 313 | macros/latex/contrib/familytree/familytree.ins
+2022/06/27 | 504083 | macros/latex/contrib/familytree/familytree-ja.pdf
+2022/06/27 | 178069 | macros/latex/contrib/familytree/familytree.pdf
+2022/06/26 | 376 | macros/latex/contrib/familytree/figs/fig1Robert1.tex
+2022/06/26 | 107 | macros/latex/contrib/familytree/figs/fig1Robert2.tex
+2022/06/26 | 234 | macros/latex/contrib/familytree/figs/fig2base.tex
+2022/06/26 | 195 | macros/latex/contrib/familytree/figs/fig2ival.tex
+2022/06/26 | 563 | macros/latex/contrib/familytree/figs/fig2sis.tex
+2022/06/26 | 341 | macros/latex/contrib/familytree/figs/fig3Lily1.tex
+2022/06/26 | 309 | macros/latex/contrib/familytree/figs/fig3Lily2.tex
+2022/06/26 | 474 | macros/latex/contrib/familytree/figs/fig3Lily3.tex
+2022/06/26 | 410 | macros/latex/contrib/familytree/figs/fig3Lily4.tex
+2022/06/26 | 408 | macros/latex/contrib/familytree/figs/fig3Robert1.tex
+2022/06/26 | 390 | macros/latex/contrib/familytree/figs/fig3Robert2.tex
+2022/06/26 | 323 | macros/latex/contrib/familytree/figs/fig3sis.tex
+2022/06/26 | 760 | macros/latex/contrib/familytree/figs/fig4HenryVIII.tex
+2022/06/26 | 284 | macros/latex/contrib/familytree/figs/fig4Lily1.tex
+2022/06/26 | 398 | macros/latex/contrib/familytree/figs/fig4Lily2.tex
+2022/06/26 | 392 | macros/latex/contrib/familytree/figs/fig4Lily3.tex
+2022/06/26 | 398 | macros/latex/contrib/familytree/figs/fig4Lily4.tex
+2022/06/26 | 512 | macros/latex/contrib/familytree/figs/fig4Robert.tex
+2022/06/26 | 140 | macros/latex/contrib/familytree/figs/fig.tex
+2022/06/26 | 1840 | macros/latex/contrib/familytree/figs/Makefile
+2022/06/26 | 112 | macros/latex/contrib/familytree/fonts.tex
+2022/06/26 | 11239 | macros/latex/contrib/familytree/ft-gens.dtx
+2022/06/26 | 20258 | macros/latex/contrib/familytree/ft-individual.dtx
+2022/06/26 | 6163 | macros/latex/contrib/familytree/ft-lib.dtx
+2022/06/26 | 11383 | macros/latex/contrib/familytree/ft-marriage.dtx
+2022/06/26 | 9253 | macros/latex/contrib/familytree/ft-sibling.dtx
+2022/06/26 | 18092 | macros/latex/contrib/familytree/LICENSE
+2022/06/26 | 1162 | macros/latex/contrib/familytree/Makefile
+2022/06/26 | 3708 | macros/latex/contrib/familytree/README.md
+2022/06/26 | 1190 | macros/latex/contrib/familytree/samples/Asai/0Ichi.tex
+2022/06/26 | 1837 | macros/latex/contrib/familytree/samples/Asai/0sis.tex
+2022/06/26 | 2088 | macros/latex/contrib/familytree/samples/Asai/1Chacha.tex
+2022/06/26 | 2210 | macros/latex/contrib/familytree/samples/Asai/2Hatsu.tex
+2022/06/26 | 3733 | macros/latex/contrib/familytree/samples/Asai/3Gou.tex
+2022/06/26 | 878 | macros/latex/contrib/familytree/samples/Asai/Asai.tex
+2022/06/26 | 328 | macros/latex/contrib/familytree/samples/Asai/Makefile
+2022/06/27 | 184895 | macros/latex/contrib/familytree/samples/Asai.pdf
+2022/06/27 | 19860 | macros/latex/contrib/familytree/samples/Crawley.pdf
+2022/06/26 | 7174 | macros/latex/contrib/familytree/samples/Crawley.tex
+2022/06/26 | 506 | macros/latex/contrib/familytree/samples/Makefile
+2022/06/26 | 369 | macros/latex/contrib/familytree/samples/Tokugawa/Makefile
+2022/06/27 | 182522 | macros/latex/contrib/familytree/samples/Tokugawa.pdf
+2022/06/26 | 628 | macros/latex/contrib/familytree/samples/Tokugawa/tg-10th.tex
+2022/06/26 | 269 | macros/latex/contrib/familytree/samples/Tokugawa/tg-11th.tex
+2022/06/26 | 459 | macros/latex/contrib/familytree/samples/Tokugawa/tg-12th.tex
+2022/06/26 | 155 | macros/latex/contrib/familytree/samples/Tokugawa/tg-13th.tex
+2022/06/26 | 63 | macros/latex/contrib/familytree/samples/Tokugawa/tg-14th.tex
+2022/06/26 | 112 | macros/latex/contrib/familytree/samples/Tokugawa/tg-15th.tex
+2022/06/26 | 54 | macros/latex/contrib/familytree/samples/Tokugawa/tg-1st.tex
+2022/06/26 | 322 | macros/latex/contrib/familytree/samples/Tokugawa/tg-2nd.tex
+2022/06/26 | 631 | macros/latex/contrib/familytree/samples/Tokugawa/tg-3rd.tex
+2022/06/26 | 866 | macros/latex/contrib/familytree/samples/Tokugawa/tg-4th.tex
+2022/06/26 | 618 | macros/latex/contrib/familytree/samples/Tokugawa/tg-5th.tex
+2022/06/26 | 525 | macros/latex/contrib/familytree/samples/Tokugawa/tg-6th.tex
+2022/06/26 | 369 | macros/latex/contrib/familytree/samples/Tokugawa/tg-7th.tex
+2022/06/26 | 225 | macros/latex/contrib/familytree/samples/Tokugawa/tg-8th.tex
+2022/06/26 | 414 | macros/latex/contrib/familytree/samples/Tokugawa/tg-9th.tex
+2022/06/26 | 7073 | macros/latex/contrib/familytree/samples/Tokugawa/Tokugawa.tex
+2022/06/27 | 1089276 | macros/latex/contrib/familytree.zip
2012/04/19 | 1957 | macros/latex/contrib/famt/CollegeNotice/CollegeNotice.cls
2012/04/24 | 1930 | macros/latex/contrib/famt/CollegeNotice/README.txt
2012/04/19 | 37877 | macros/latex/contrib/famt/CollegeNotice/Sample.pdf
@@ -222782,15 +222869,15 @@
2020/11/24 | 3537 | macros/latex/contrib/ms/multitoc.ins
2007/04/15 | 110362 | macros/latex/contrib/ms/multitoc.pdf
2021/01/17 | 401 | macros/latex/contrib/ms/README.md
-2022/04/19 | 34801 | macros/latex/contrib/msu-thesis/msu-thesis.cls
-2022/04/19 | 247537 | macros/latex/contrib/msu-thesis/msu-thesis.pdf
-2022/04/19 | 34210 | macros/latex/contrib/msu-thesis/msu-thesis.tex
-2022/04/19 | 1806 | macros/latex/contrib/msu-thesis/README.md
-2022/04/19 | 6886 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-template.tex
-2022/04/19 | 615 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-testfile.bib
-2022/04/19 | 196098 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-testfile.pdf
-2022/04/19 | 9510 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-testfile.tex
-2022/04/19 | 463323 | macros/latex/contrib/msu-thesis.zip
+2022/06/27 | 35384 | macros/latex/contrib/msu-thesis/msu-thesis.cls
+2022/06/27 | 247699 | macros/latex/contrib/msu-thesis/msu-thesis.pdf
+2022/06/27 | 34250 | macros/latex/contrib/msu-thesis/msu-thesis.tex
+2022/06/27 | 1807 | macros/latex/contrib/msu-thesis/README.md
+2022/06/27 | 6886 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-template.tex
+2022/06/27 | 615 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-testfile.bib
+2022/06/27 | 160223 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-testfile.pdf
+2022/06/27 | 9510 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-testfile.tex
+2022/06/27 | 427681 | macros/latex/contrib/msu-thesis.zip
2021/01/19 | 594454 | macros/latex/contrib/ms.zip
1999/07/29 | 5665 | macros/latex/contrib/mtgreek/mtgreek.dtx
1999/07/29 | 752 | macros/latex/contrib/mtgreek/mtgreek.ins
@@ -223355,22 +223442,22 @@
2003/01/11 | 122010 | macros/latex/contrib/newlfm/wine.eps
2004/10/30 | 29464 | macros/latex/contrib/newlfm/wine.pdf
2009/04/12 | 679892 | macros/latex/contrib/newlfm.zip
-2021/02/25 | 236 | macros/latex/contrib/newpax/doc-extract-newpax.tex
-2021/02/25 | 231 | macros/latex/contrib/newpax/doc-extract-pax.tex
-2021/03/07 | 30287 | macros/latex/contrib/newpax/doc-input1.pdf
-2021/02/25 | 1055 | macros/latex/contrib/newpax/doc-input1.tex
-2021/03/07 | 29999 | macros/latex/contrib/newpax/doc-input2.pdf
-2021/02/25 | 944 | macros/latex/contrib/newpax/doc-input2.tex
-2021/03/07 | 69324 | macros/latex/contrib/newpax/doc-use-newpax.pdf
-2021/02/25 | 1034 | macros/latex/contrib/newpax/doc-use-newpax.tex
-2021/03/07 | 44937 | macros/latex/contrib/newpax/doc-use-pax.pdf
-2021/02/25 | 659 | macros/latex/contrib/newpax/doc-use-pax.tex
-2021/03/07 | 35933 | macros/latex/contrib/newpax/newpax.dtx
-2021/02/25 | 1735 | macros/latex/contrib/newpax/newpax.ins
-2021/03/07 | 173857 | macros/latex/contrib/newpax/newpax.pdf
-2021/03/07 | 12919 | macros/latex/contrib/newpax/newpax.tex
-2021/03/07 | 853 | macros/latex/contrib/newpax/README.md
-2021/03/07 | 130749 | macros/latex/contrib/newpax.zip
+2022/06/27 | 236 | macros/latex/contrib/newpax/doc-extract-newpax.tex
+2022/06/27 | 231 | macros/latex/contrib/newpax/doc-extract-pax.tex
+2022/06/27 | 31084 | macros/latex/contrib/newpax/doc-input1.pdf
+2022/06/27 | 1007 | macros/latex/contrib/newpax/doc-input1.tex
+2022/06/27 | 30795 | macros/latex/contrib/newpax/doc-input2.pdf
+2022/06/27 | 896 | macros/latex/contrib/newpax/doc-input2.tex
+2022/06/27 | 70243 | macros/latex/contrib/newpax/doc-use-newpax.pdf
+2022/06/27 | 1093 | macros/latex/contrib/newpax/doc-use-newpax.tex
+2022/06/27 | 44965 | macros/latex/contrib/newpax/doc-use-pax.pdf
+2022/06/27 | 915 | macros/latex/contrib/newpax/doc-use-pax.tex
+2022/06/27 | 36942 | macros/latex/contrib/newpax/newpax.dtx
+2022/06/27 | 1745 | macros/latex/contrib/newpax/newpax.ins
+2022/06/27 | 181793 | macros/latex/contrib/newpax/newpax.pdf
+2022/06/27 | 13026 | macros/latex/contrib/newpax/newpax.tex
+2022/06/27 | 853 | macros/latex/contrib/newpax/README.md
+2022/06/27 | 142294 | macros/latex/contrib/newpax.zip
2006/03/21 | 8851 | macros/latex/contrib/newspaper/atom.jpg
2007/06/12 | 21704 | macros/latex/contrib/newspaper/Figure1.pdf
2007/06/17 | 55908 | macros/latex/contrib/newspaper/Figure2.pdf
@@ -245889,20 +245976,20 @@
2022/02/13 | 29260 | macros/xetex/latex/bidi-atbegshi/test-RTL.pdf
2022/02/13 | 586 | macros/xetex/latex/bidi-atbegshi/test-RTL.tex
2022/02/13 | 192092 | macros/xetex/latex/bidi-atbegshi.zip
-2022/06/15 | 2936 | macros/xetex/latex/bidi/bidi-bibitem.pdf
-2022/06/15 | 1396 | macros/xetex/latex/bidi/bidi-doc-intro.ltx
-2022/06/15 | 23945 | macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx
-2022/06/15 | 4547 | macros/xetex/latex/bidi/bidi-doc-latex-pkgs.ltx
-2022/06/15 | 6101 | macros/xetex/latex/bidi/bidi-doc-latex-pkgsupport.ltx
-2022/06/15 | 4497 | macros/xetex/latex/bidi/bidi-doc-latex-programming.ltx
-2022/06/15 | 534 | macros/xetex/latex/bidi/bidi-doc.ltx
-2022/06/15 | 178136 | macros/xetex/latex/bidi/bidi-doc.pdf
-2022/06/15 | 5939 | macros/xetex/latex/bidi/bidi-doc-plain-basics.ltx
-2022/06/15 | 1961 | macros/xetex/latex/bidi/bidi-doc-plain-programming.ltx
-2022/06/15 | 3596 | macros/xetex/latex/bidi/bidi-doc-preamble.ltx
-2022/06/15 | 2108 | macros/xetex/latex/bidi/bidi-doc-title.ltx
-2022/06/15 | 1002273 | macros/xetex/latex/bidi/bidi.dtx
-2022/06/15 | 3393758 | macros/xetex/latex/bidi/bidi.pdf
+2022/06/27 | 2936 | macros/xetex/latex/bidi/bidi-bibitem.pdf
+2022/06/27 | 1396 | macros/xetex/latex/bidi/bidi-doc-intro.ltx
+2022/06/27 | 23779 | macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx
+2022/06/27 | 4547 | macros/xetex/latex/bidi/bidi-doc-latex-pkgs.ltx
+2022/06/27 | 6101 | macros/xetex/latex/bidi/bidi-doc-latex-pkgsupport.ltx
+2022/06/27 | 4497 | macros/xetex/latex/bidi/bidi-doc-latex-programming.ltx
+2022/06/27 | 534 | macros/xetex/latex/bidi/bidi-doc.ltx
+2022/06/27 | 177693 | macros/xetex/latex/bidi/bidi-doc.pdf
+2022/06/27 | 5823 | macros/xetex/latex/bidi/bidi-doc-plain-basics.ltx
+2022/06/27 | 1961 | macros/xetex/latex/bidi/bidi-doc-plain-programming.ltx
+2022/06/27 | 3596 | macros/xetex/latex/bidi/bidi-doc-preamble.ltx
+2022/06/27 | 2108 | macros/xetex/latex/bidi/bidi-doc-title.ltx
+2022/06/27 | 1015543 | macros/xetex/latex/bidi/bidi.dtx
+2022/06/27 | 3443872 | macros/xetex/latex/bidi/bidi.pdf
2014/07/16 | 22035 | macros/xetex/latex/bidicontour/bidicontour-doc.pdf
2014/07/15 | 1803 | macros/xetex/latex/bidicontour/bidicontour-doc.tex
2014/07/15 | 7167 | macros/xetex/latex/bidicontour/bidicontour-example-copies.pdf
@@ -245912,7 +245999,7 @@
2014/07/15 | 4087 | macros/xetex/latex/bidicontour/bidicontour.sty
2014/07/15 | 1071 | macros/xetex/latex/bidicontour/README
2014/07/16 | 38915 | macros/xetex/latex/bidicontour.zip
-2022/06/15 | 761651 | macros/xetex/latex/bidi/gull.jpg
+2022/06/27 | 761651 | macros/xetex/latex/bidi/gull.jpg
2015/07/07 | 24129 | macros/xetex/latex/bidihl/bidihl-doc.pdf
2015/07/06 | 1029 | macros/xetex/latex/bidihl/bidihl-doc.tex
2015/07/06 | 7245 | macros/xetex/latex/bidihl/bidihl.sty
@@ -245925,7 +246012,7 @@
2014/07/15 | 13019 | macros/xetex/latex/bidipagegrid/bidipagegrid.sty
2014/07/15 | 1068 | macros/xetex/latex/bidipagegrid/README
2014/07/16 | 29164 | macros/xetex/latex/bidipagegrid.zip
-2022/06/15 | 1693 | macros/xetex/latex/bidi/picture.jpg
+2022/06/27 | 1693 | macros/xetex/latex/bidi/picture.jpg
2014/09/25 | 25208 | macros/xetex/latex/bidipresentation/bidiprescolors.cfg
2014/09/25 | 159986 | macros/xetex/latex/bidipresentation/bidipresentation.cls
2014/09/25 | 2479 | macros/xetex/latex/bidipresentation/fig-1.pdf
@@ -245933,14 +246020,14 @@
2014/09/26 | 75608 | macros/xetex/latex/bidipresentation/sample.pdf
2014/09/25 | 12758 | macros/xetex/latex/bidipresentation/sample.tex
2014/09/26 | 107612 | macros/xetex/latex/bidipresentation.zip
-2022/06/15 | 1323 | macros/xetex/latex/bidi/README
+2022/06/27 | 1323 | macros/xetex/latex/bidi/README
2014/07/16 | 18289 | macros/xetex/latex/bidishadowtext/bidishadowtext-demo.pdf
2014/07/16 | 1203 | macros/xetex/latex/bidishadowtext/bidishadowtext-demo.tex
2014/07/16 | 101629 | macros/xetex/latex/bidishadowtext/bidishadowtext-doc.pdf
2014/07/16 | 1667 | macros/xetex/latex/bidishadowtext/bidishadowtext-doc.tex
2014/07/16 | 2436 | macros/xetex/latex/bidishadowtext/bidishadowtext.sty
2014/07/16 | 120948 | macros/xetex/latex/bidishadowtext.zip
-2022/06/15 | 4208369 | macros/xetex/latex/bidi.zip
+2022/06/27 | 4256043 | macros/xetex/latex/bidi.zip
2018/08/15 | 10902 | macros/xetex/latex/businesscard-qrcode/businesscard-qrcode.cls
2018/08/15 | 51983 | macros/xetex/latex/businesscard-qrcode/examples/example.pdf
2018/08/15 | 932 | macros/xetex/latex/businesscard-qrcode/examples/example.tex
@@ -246448,9 +246535,9 @@
2014/12/05 | 4915 | macros/xetex/latex/xeindex/xeindex.sty
2014/12/05 | 19009 | macros/xetex/latex/xeindex/xeindex.tex
2014/12/05 | 79942 | macros/xetex/latex/xeindex.zip
-2022/06/10 | 15976 | macros/xetex/latex/xepersian/dkun-0.3.py
-2022/06/10 | 15867 | macros/xetex/latex/xepersian/dkun-0.4.py
-2022/06/10 | 38725 | macros/xetex/latex/xepersian/ftxe-0.12.py
+2022/06/27 | 15976 | macros/xetex/latex/xepersian/dkun-0.3.py
+2022/06/27 | 15867 | macros/xetex/latex/xepersian/dkun-0.4.py
+2022/06/27 | 38725 | macros/xetex/latex/xepersian/ftxe-0.12.py
2020/09/04 | 13130 | macros/xetex/latex/xepersian-hm/doc-ligature-xepersian-hm.pdf
2020/09/04 | 10104 | macros/xetex/latex/xepersian-hm/doc-ligature-xep.pdf
2020/09/04 | 63436 | macros/xetex/latex/xepersian-hm/doc-samples-glyph.pdf
@@ -246472,26 +246559,26 @@
2020/09/04 | 106056 | macros/xetex/latex/xepersian-hm/xepersian-XB.pdf
2020/09/04 | 2945 | macros/xetex/latex/xepersian-hm/xepersian-XB.tex
2020/09/04 | 2217805 | macros/xetex/latex/xepersian-hm.zip
-2022/06/10 | 18304 | macros/xetex/latex/xepersian/img/ireland.jpg
-2022/06/10 | 13088 | macros/xetex/latex/xepersian/img/weather/clouds.jpg
-2022/06/10 | 14616 | macros/xetex/latex/xepersian/img/weather/rain.jpg
-2022/06/10 | 10896 | macros/xetex/latex/xepersian/img/weather/sun.jpg
-2022/06/10 | 1390 | macros/xetex/latex/xepersian/README
-2022/06/10 | 13804 | macros/xetex/latex/xepersian/undk-0.6.py
-2022/06/10 | 12348 | macros/xetex/latex/xepersian/unldk-0.2.py
-2022/06/10 | 71644 | macros/xetex/latex/xepersian/xepersian-doc-basics.ltx
-2022/06/10 | 410 | macros/xetex/latex/xepersian/xepersian-doc-boolean.ltx
-2022/06/10 | 3099 | macros/xetex/latex/xepersian/xepersian-doc-captions.ltx
-2022/06/10 | 5447 | macros/xetex/latex/xepersian/xepersian-doc-envcs.ltx
-2022/06/10 | 2574 | macros/xetex/latex/xepersian/xepersian-doc-intro.ltx
-2022/06/10 | 454 | macros/xetex/latex/xepersian/xepersian-doc.ltx
-2022/06/10 | 243591 | macros/xetex/latex/xepersian/xepersian-doc.pdf
-2022/06/10 | 25946 | macros/xetex/latex/xepersian/xepersian-doc-pkgs.ltx
-2022/06/10 | 4149 | macros/xetex/latex/xepersian/xepersian-doc-preamble.ltx
-2022/06/10 | 2108 | macros/xetex/latex/xepersian/xepersian-doc-title.ltx
-2022/06/10 | 342598 | macros/xetex/latex/xepersian/xepersian.dtx
-2022/06/10 | 776194 | macros/xetex/latex/xepersian/xepersian.pdf
-2022/06/10 | 1130916 | macros/xetex/latex/xepersian.zip
+2022/06/27 | 18304 | macros/xetex/latex/xepersian/img/ireland.jpg
+2022/06/27 | 13088 | macros/xetex/latex/xepersian/img/weather/clouds.jpg
+2022/06/27 | 14616 | macros/xetex/latex/xepersian/img/weather/rain.jpg
+2022/06/27 | 10896 | macros/xetex/latex/xepersian/img/weather/sun.jpg
+2022/06/27 | 1390 | macros/xetex/latex/xepersian/README
+2022/06/27 | 13804 | macros/xetex/latex/xepersian/undk-0.6.py
+2022/06/27 | 12348 | macros/xetex/latex/xepersian/unldk-0.2.py
+2022/06/27 | 71387 | macros/xetex/latex/xepersian/xepersian-doc-basics.ltx
+2022/06/27 | 410 | macros/xetex/latex/xepersian/xepersian-doc-boolean.ltx
+2022/06/27 | 3099 | macros/xetex/latex/xepersian/xepersian-doc-captions.ltx
+2022/06/27 | 5447 | macros/xetex/latex/xepersian/xepersian-doc-envcs.ltx
+2022/06/27 | 2574 | macros/xetex/latex/xepersian/xepersian-doc-intro.ltx
+2022/06/27 | 454 | macros/xetex/latex/xepersian/xepersian-doc.ltx
+2022/06/27 | 243608 | macros/xetex/latex/xepersian/xepersian-doc.pdf
+2022/06/27 | 25876 | macros/xetex/latex/xepersian/xepersian-doc-pkgs.ltx
+2022/06/27 | 4149 | macros/xetex/latex/xepersian/xepersian-doc-preamble.ltx
+2022/06/27 | 2108 | macros/xetex/latex/xepersian/xepersian-doc-title.ltx
+2022/06/27 | 342951 | macros/xetex/latex/xepersian/xepersian.dtx
+2022/06/27 | 775188 | macros/xetex/latex/xepersian/xepersian.pdf
+2022/06/27 | 1130433 | macros/xetex/latex/xepersian.zip
2021/03/29 | 142 | macros/xetex/latex/xesoul/README
2021/03/29 | 3942 | macros/xetex/latex/xesoul/xesoul.dtx
2021/03/29 | 1517 | macros/xetex/latex/xesoul/xesoul.ins
@@ -280643,7 +280730,7 @@
2021/02/07 | 136588 | systems/texlive/tlnet/archive/babel-danish.doc.r57642.tar.xz
2021/02/07 | 2488 | systems/texlive/tlnet/archive/babel-danish.r57642.tar.xz
2021/02/07 | 5792 | systems/texlive/tlnet/archive/babel-danish.source.r57642.tar.xz
-2022/06/07 | 869308 | systems/texlive/tlnet/archive/babel.doc.r63498.tar.xz
+2022/06/27 | 871964 | systems/texlive/tlnet/archive/babel.doc.r63730.tar.xz
2021/08/30 | 157392 | systems/texlive/tlnet/archive/babel-dutch.doc.r60362.tar.xz
2021/08/30 | 2920 | systems/texlive/tlnet/archive/babel-dutch.r60362.tar.xz
2021/08/30 | 7968 | systems/texlive/tlnet/archive/babel-dutch.source.r60362.tar.xz
@@ -280729,7 +280816,7 @@
2021/07/10 | 146580 | systems/texlive/tlnet/archive/babel-portuges.doc.r59883.tar.xz
2021/07/10 | 2828 | systems/texlive/tlnet/archive/babel-portuges.r59883.tar.xz
2021/07/10 | 6692 | systems/texlive/tlnet/archive/babel-portuges.source.r59883.tar.xz
-2022/06/07 | 189624 | systems/texlive/tlnet/archive/babel.r63498.tar.xz
+2022/06/27 | 190888 | systems/texlive/tlnet/archive/babel.r63730.tar.xz
2021/04/07 | 113056 | systems/texlive/tlnet/archive/babel-romanian.doc.r58776.tar.xz
2021/04/07 | 2124 | systems/texlive/tlnet/archive/babel-romanian.r58776.tar.xz
2021/04/07 | 4308 | systems/texlive/tlnet/archive/babel-romanian.source.r58776.tar.xz
@@ -280760,7 +280847,7 @@
2021/11/07 | 209804 | systems/texlive/tlnet/archive/babel-sorbian.doc.r60975.tar.xz
2021/11/07 | 3156 | systems/texlive/tlnet/archive/babel-sorbian.r60975.tar.xz
2021/11/07 | 6328 | systems/texlive/tlnet/archive/babel-sorbian.source.r60975.tar.xz
-2022/06/07 | 718640 | systems/texlive/tlnet/archive/babel.source.r63498.tar.xz
+2022/06/27 | 717808 | systems/texlive/tlnet/archive/babel.source.r63730.tar.xz
2021/05/28 | 183140 | systems/texlive/tlnet/archive/babel-spanish.doc.r59367.tar.xz
2021/05/28 | 8876 | systems/texlive/tlnet/archive/babel-spanish.r59367.tar.xz
2021/05/28 | 29800 | systems/texlive/tlnet/archive/babel-spanish.source.r59367.tar.xz
@@ -282178,7 +282265,7 @@
2022/06/26 | 6660 | systems/texlive/tlnet/archive/collection-latexextra.r63722.tar.xz
2022/06/10 | 700 | systems/texlive/tlnet/archive/collection-latex.r63515.tar.xz
2022/06/12 | 736 | systems/texlive/tlnet/archive/collection-latexrecommended.r63547.tar.xz
-2022/06/12 | 900 | systems/texlive/tlnet/archive/collection-luatex.r63549.tar.xz
+2022/06/27 | 908 | systems/texlive/tlnet/archive/collection-luatex.r63732.tar.xz
2022/06/21 | 1616 | systems/texlive/tlnet/archive/collection-mathscience.r63667.tar.xz
2021/06/10 | 548 | systems/texlive/tlnet/archive/collection-metapost.r59531.tar.xz
2021/02/24 | 476 | systems/texlive/tlnet/archive/collection-music.r57878.tar.xz
@@ -286832,6 +286919,8 @@
2019/02/28 | 2268 | systems/texlive/tlnet/archive/lstfiracode.r49503.tar.xz
2019/02/28 | 576392 | systems/texlive/tlnet/archive/lt3graph.doc.r45913.tar.xz
2019/02/28 | 10864 | systems/texlive/tlnet/archive/lt3graph.r45913.tar.xz
+2022/06/27 | 7460 | systems/texlive/tlnet/archive/lt3luabridge.doc.r63732.tar.xz
+2022/06/27 | 2592 | systems/texlive/tlnet/archive/lt3luabridge.r63732.tar.xz
2019/02/28 | 233152 | systems/texlive/tlnet/archive/ltablex.doc.r34923.tar.xz
2019/02/28 | 2492 | systems/texlive/tlnet/archive/ltablex.r34923.tar.xz
2019/02/28 | 267928 | systems/texlive/tlnet/archive/ltabptch.doc.r17533.tar.xz
@@ -288187,9 +288276,9 @@
2019/02/28 | 7064 | systems/texlive/tlnet/archive/niceframe.source.r36086.tar.xz
2019/02/28 | 604 | systems/texlive/tlnet/archive/niceframe-type1.doc.r44671.tar.xz
2019/02/28 | 276328 | systems/texlive/tlnet/archive/niceframe-type1.r44671.tar.xz
-2022/06/26 | 2005980 | systems/texlive/tlnet/archive/nicematrix.doc.r63723.tar.xz
-2022/06/26 | 35192 | systems/texlive/tlnet/archive/nicematrix.r63723.tar.xz
-2022/06/26 | 114576 | systems/texlive/tlnet/archive/nicematrix.source.r63723.tar.xz
+2022/06/27 | 2005524 | systems/texlive/tlnet/archive/nicematrix.doc.r63729.tar.xz
+2022/06/27 | 35164 | systems/texlive/tlnet/archive/nicematrix.r63729.tar.xz
+2022/06/27 | 114628 | systems/texlive/tlnet/archive/nicematrix.source.r63729.tar.xz
2019/02/28 | 2473836 | systems/texlive/tlnet/archive/nicetext.doc.r38914.tar.xz
2019/02/28 | 54740 | systems/texlive/tlnet/archive/nicetext.r38914.tar.xz
2019/02/28 | 28908 | systems/texlive/tlnet/archive/nicetext.source.r38914.tar.xz
@@ -289829,8 +289918,8 @@
2019/02/28 | 340 | systems/texlive/tlnet/archive/purifyeps.x86_64-solaris.r18442.tar.xz
2020/12/30 | 201144 | systems/texlive/tlnet/archive/puyotikz.doc.r57254.tar.xz
2020/12/30 | 3968 | systems/texlive/tlnet/archive/puyotikz.r57254.tar.xz
-2022/06/07 | 11144 | systems/texlive/tlnet/archive/pwebmac.doc.r63501.tar.xz
-2022/06/07 | 8648 | systems/texlive/tlnet/archive/pwebmac.r63501.tar.xz
+2022/06/27 | 11340 | systems/texlive/tlnet/archive/pwebmac.doc.r63731.tar.xz
+2022/06/27 | 8644 | systems/texlive/tlnet/archive/pwebmac.r63731.tar.xz
2021/06/06 | 161900 | systems/texlive/tlnet/archive/pxbase.doc.r59473.tar.xz
2021/06/06 | 12356 | systems/texlive/tlnet/archive/pxbase.r59473.tar.xz
2021/06/04 | 322528 | systems/texlive/tlnet/archive/pxchfon.doc.r59449.tar.xz
@@ -290994,8 +291083,8 @@
2020/03/13 | 1512 | systems/texlive/tlnet/archive/swrule.r54267.tar.xz
2019/02/28 | 310384 | systems/texlive/tlnet/archive/syllogism.doc.r15878.tar.xz
2019/02/28 | 2728 | systems/texlive/tlnet/archive/syllogism.r15878.tar.xz
-2022/05/25 | 183672 | systems/texlive/tlnet/archive/symbats3.doc.r63394.tar.xz
-2022/05/25 | 6152 | systems/texlive/tlnet/archive/symbats3.r63394.tar.xz
+2022/06/27 | 188116 | systems/texlive/tlnet/archive/symbats3.doc.r63728.tar.xz
+2022/06/27 | 6152 | systems/texlive/tlnet/archive/symbats3.r63728.tar.xz
2022/01/24 | 36104 | systems/texlive/tlnet/archive/symbol.r61719.tar.xz
2020/12/08 | 1844 | systems/texlive/tlnet/archive/sympytexpackage.doc.r57090.tar.xz
2020/12/08 | 3636 | systems/texlive/tlnet/archive/sympytexpackage.r57090.tar.xz
@@ -291457,7 +291546,7 @@
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r55172.tar.xz
-2022/06/26 | 417280 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63718.tar.xz
+2022/06/27 | 417296 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63727.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
@@ -291481,7 +291570,7 @@
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r55172.tar.xz
-2022/06/26 | 113272 | systems/texlive/tlnet/archive/texlive-scripts.r63718.tar.xz
+2022/06/27 | 113284 | systems/texlive/tlnet/archive/texlive-scripts.r63727.tar.xz
2021/02/25 | 572 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r57908.tar.xz
2022/04/19 | 36296 | systems/texlive/tlnet/archive/texlive-scripts.win32.r63068.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
@@ -293294,16 +293383,16 @@
2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
2022/06/23 | 123973 | systems/texlive/tlnet/install-tl
-2022/06/26 | 5805901 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/06/26 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/06/26 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/06/27 | 5805911 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/06/27 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/06/27 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat
-2022/06/26 | 20460879 | systems/texlive/tlnet/install-tl-windows.exe
-2022/06/26 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/06/26 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/06/26 | 25489136 | systems/texlive/tlnet/install-tl.zip
-2022/06/26 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/06/26 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/06/27 | 20461159 | systems/texlive/tlnet/install-tl-windows.exe
+2022/06/27 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/06/27 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/06/27 | 25489147 | systems/texlive/tlnet/install-tl.zip
+2022/06/27 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/06/27 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2022/04/03 | 1229 | systems/texlive/tlnet/README.md
2022/04/03 | 0 | systems/texlive/tlnet/TEXLIVE_2022
2022/02/28 | 7791 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -293313,7 +293402,7 @@
2022/02/28 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2022/05/27 | 49794 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2022/06/25 | 7256 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2022/06/26 | 7348 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/04/27 | 215352 | 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
@@ -293355,12 +293444,12 @@
2021/05/16 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/12/21 | 5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2021/12/21 | 27582 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2022/06/26 | 17519872 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/06/26 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/06/27 | 17521918 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/06/27 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2022/04/18 | 86658 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2022/06/26 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/06/26 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/06/26 | 2386864 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/06/27 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/06/27 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/06/27 | 2387780 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/12/21 | 58848 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2022/04/18 | 42116 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2021/12/21 | 16130 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -298601,7 +298690,7 @@
2020/10/03 | 318630 | systems/win32/miktex/tm/packages/filehook.tar.lzma
2012/12/04 | 924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
2011/09/21 | 281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2022/06/26 | 657720 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/06/27 | 657720 | 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
@@ -300237,9 +300326,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2022/03/12 | 39680 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2022/03/29 | 43240 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/06/26 | 283824 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/06/26 | 1468067 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/06/26 | 1352954 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/06/27 | 283800 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/06/27 | 1468198 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/06/27 | 1353891 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2022/03/12 | 13516 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2022/03/29 | 14391 | 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
@@ -300475,191 +300564,191 @@
2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
2021/03/17 | 232249 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2022/06/26 | 657840 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/06/26 | 51558 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2022/06/26 | 57331 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/06/26 | 1021846 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2022/06/26 | 1156465 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/06/26 | 28799 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2022/06/26 | 31521 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/06/26 | 30147 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2022/06/26 | 35243 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/06/26 | 56619 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2022/06/26 | 65055 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/06/26 | 86759 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2022/06/26 | 95284 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/06/26 | 68872 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2022/06/26 | 77065 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/06/26 | 27248 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2022/06/26 | 31343 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/06/26 | 332416 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2022/06/26 | 394370 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/06/26 | 32955 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2022/06/26 | 37081 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2022/06/26 | 51484 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2022/06/26 | 57271 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/06/26 | 244961 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2022/06/26 | 270300 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/06/26 | 179878 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2022/06/26 | 196117 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2022/06/26 | 92917 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2022/06/26 | 103093 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/06/26 | 21314 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2022/06/26 | 24120 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/06/26 | 481497 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/06/26 | 46066 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2022/06/26 | 52093 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/06/26 | 285714 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2022/06/26 | 326659 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/06/26 | 41305 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2022/06/26 | 45827 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/06/26 | 120616 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2022/06/26 | 135376 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/06/26 | 1302485 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2022/06/26 | 1454762 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/06/26 | 99818 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2022/06/26 | 113052 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/06/26 | 43645 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2022/06/26 | 48826 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2022/06/26 | 25106 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2022/06/26 | 28569 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/06/26 | 56994 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2022/06/26 | 63311 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/06/26 | 135948 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2022/06/26 | 155497 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/06/26 | 73478 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2022/06/26 | 78975 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2022/06/26 | 72014 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2022/06/26 | 81461 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/06/26 | 259258 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2022/06/26 | 296040 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/06/26 | 22147 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2022/06/26 | 25060 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/06/26 | 97201 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2022/06/26 | 112589 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/06/26 | 64543 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2022/06/26 | 73148 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/06/26 | 96631 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2022/06/26 | 115656 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/06/26 | 38426 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2022/06/26 | 43825 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/06/26 | 484371 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2022/06/26 | 565930 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/06/26 | 203836 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
-2022/06/26 | 247333 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/06/26 | 152029 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2022/06/26 | 168819 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/06/26 | 95434 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2022/06/26 | 109479 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/06/26 | 16503 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2022/06/26 | 18369 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/06/26 | 28422 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2022/06/26 | 30542 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/06/26 | 631281 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2022/06/26 | 681940 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/06/26 | 532453 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2022/06/26 | 598231 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/06/26 | 477848 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2022/06/26 | 528019 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/06/26 | 93959 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2022/06/26 | 103339 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/06/26 | 1752148 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2022/06/26 | 1982086 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/06/26 | 68010 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2022/06/26 | 74069 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/06/26 | 27591 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2022/06/26 | 32134 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/06/26 | 7753 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2022/06/26 | 8784 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2022/06/26 | 190506 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2022/06/26 | 208809 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/06/26 | 251129 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2022/06/26 | 286412 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/06/26 | 99259 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2022/06/26 | 104556 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/06/26 | 126536 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2022/06/26 | 139103 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/06/26 | 288201 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2022/06/26 | 325271 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/06/26 | 199831 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2022/06/26 | 181514 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/06/26 | 49770 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2022/06/26 | 55568 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2022/06/26 | 31413 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2022/06/26 | 35168 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2022/06/26 | 38561 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2022/06/26 | 43916 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/06/26 | 43362 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2022/06/26 | 47923 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/06/26 | 45743 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2022/06/26 | 52327 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/06/26 | 197035 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2022/06/26 | 213279 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/06/26 | 36049 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2022/06/26 | 41182 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/06/26 | 755740 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2022/06/26 | 824370 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/06/26 | 200397 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2022/06/26 | 202837 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/06/26 | 210277 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2022/06/26 | 245096 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/06/26 | 79025 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2022/06/26 | 88152 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/06/26 | 1181127 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2022/06/26 | 1322743 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/06/26 | 20184 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2022/06/26 | 23945 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/06/26 | 31588 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2022/06/26 | 37375 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/06/26 | 64710 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2022/06/26 | 72887 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/06/26 | 50800 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2022/06/26 | 58662 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/06/26 | 693068 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
-2022/06/26 | 758956 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/06/26 | 1357070 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2022/06/26 | 1501239 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2022/06/26 | 42819 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2022/06/26 | 52480 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/06/26 | 57619 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2022/06/26 | 63740 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/06/26 | 25552 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2022/06/26 | 27637 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/06/26 | 16560 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2022/06/26 | 18493 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/06/26 | 64490 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2022/06/26 | 71004 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/06/26 | 156965 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2022/06/26 | 173008 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2022/06/26 | 58665 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2022/06/26 | 67253 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2022/06/26 | 100488 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2022/06/26 | 107705 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2022/06/26 | 2694877 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2022/06/26 | 2820687 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/06/26 | 55286 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2022/06/26 | 62381 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2022/06/26 | 37118 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2022/06/26 | 41202 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/06/26 | 28689 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2022/06/26 | 34053 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2022/06/26 | 67704 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2022/06/26 | 73530 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/06/26 | 316243 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2022/06/26 | 351697 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/06/26 | 55757 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2022/06/26 | 57526 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/06/26 | 591571 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2022/06/26 | 629431 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/06/26 | 39728 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2022/06/26 | 43226 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/06/26 | 283879 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/06/26 | 1468421 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/06/26 | 1352449 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/06/26 | 13514 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2022/06/26 | 14410 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/06/27 | 657840 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/06/27 | 51558 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2022/06/27 | 57330 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/06/27 | 1021847 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2022/06/27 | 1156464 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/06/27 | 28797 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2022/06/27 | 31521 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/06/27 | 30146 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2022/06/27 | 35241 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/06/27 | 56617 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2022/06/27 | 65054 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/06/27 | 86760 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2022/06/27 | 95284 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/06/27 | 68872 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2022/06/27 | 77068 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/06/27 | 27248 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2022/06/27 | 31342 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/06/27 | 332414 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2022/06/27 | 394369 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/06/27 | 32953 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2022/06/27 | 37080 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/06/27 | 51484 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2022/06/27 | 57269 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/06/27 | 244960 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2022/06/27 | 270301 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/06/27 | 179877 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2022/06/27 | 196116 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/06/27 | 92917 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2022/06/27 | 103093 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/06/27 | 21316 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2022/06/27 | 24121 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/06/27 | 481498 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/06/27 | 46068 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2022/06/27 | 52093 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/06/27 | 285715 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2022/06/27 | 326659 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/06/27 | 41306 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2022/06/27 | 45825 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/06/27 | 120617 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2022/06/27 | 135377 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/06/27 | 1302486 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2022/06/27 | 1454764 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/06/27 | 99817 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2022/06/27 | 113052 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/06/27 | 43646 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2022/06/27 | 48822 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/06/27 | 25107 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2022/06/27 | 28568 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/06/27 | 56992 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2022/06/27 | 63311 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/06/27 | 135949 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2022/06/27 | 155497 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/06/27 | 73479 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2022/06/27 | 78975 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/06/27 | 72014 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2022/06/27 | 81461 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/06/27 | 259258 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2022/06/27 | 296038 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/06/27 | 22147 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2022/06/27 | 25059 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/06/27 | 97199 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2022/06/27 | 112587 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/06/27 | 64542 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2022/06/27 | 73148 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/06/27 | 96633 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2022/06/27 | 115657 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/06/27 | 38426 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2022/06/27 | 43824 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/06/27 | 484370 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2022/06/27 | 565930 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/06/27 | 203838 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
+2022/06/27 | 247332 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/06/27 | 152030 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2022/06/27 | 168818 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/06/27 | 95433 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2022/06/27 | 109479 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/06/27 | 16502 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2022/06/27 | 18368 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/06/27 | 28422 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2022/06/27 | 30540 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/06/27 | 631277 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2022/06/27 | 681939 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/06/27 | 532454 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2022/06/27 | 598232 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/06/27 | 477846 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2022/06/27 | 528018 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/06/27 | 93961 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2022/06/27 | 103339 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/06/27 | 1752147 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2022/06/27 | 1982083 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/06/27 | 68009 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2022/06/27 | 74068 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/06/27 | 27591 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2022/06/27 | 32134 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/06/27 | 7753 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2022/06/27 | 8783 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/06/27 | 190505 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2022/06/27 | 208809 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/06/27 | 251129 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2022/06/27 | 286412 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/06/27 | 99258 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2022/06/27 | 104557 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/06/27 | 126535 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2022/06/27 | 139100 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/06/27 | 288199 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2022/06/27 | 325269 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/06/27 | 199832 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2022/06/27 | 181513 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/06/27 | 49770 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2022/06/27 | 55568 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/06/27 | 31412 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2022/06/27 | 35168 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/06/27 | 38560 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2022/06/27 | 43915 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/06/27 | 43362 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2022/06/27 | 47922 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/06/27 | 45742 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2022/06/27 | 52326 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/06/27 | 197036 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2022/06/27 | 213277 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/06/27 | 36048 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2022/06/27 | 41181 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/06/27 | 755744 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2022/06/27 | 824370 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/06/27 | 200396 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2022/06/27 | 202836 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/06/27 | 210273 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2022/06/27 | 245095 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/06/27 | 79024 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2022/06/27 | 88152 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/06/27 | 1181126 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2022/06/27 | 1322742 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/06/27 | 20184 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2022/06/27 | 23944 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/06/27 | 31588 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2022/06/27 | 37375 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/06/27 | 64709 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2022/06/27 | 72885 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/06/27 | 50798 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2022/06/27 | 58663 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/06/27 | 693068 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
+2022/06/27 | 758953 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/06/27 | 1357072 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2022/06/27 | 1501238 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/06/27 | 42818 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2022/06/27 | 52478 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/06/27 | 57618 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2022/06/27 | 63740 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/06/27 | 25552 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2022/06/27 | 27638 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/06/27 | 16559 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2022/06/27 | 18493 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/06/27 | 64490 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2022/06/27 | 71008 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/06/27 | 156967 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2022/06/27 | 173008 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/06/27 | 58665 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2022/06/27 | 67253 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/06/27 | 100488 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2022/06/27 | 107703 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/06/27 | 2694876 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2022/06/27 | 2820687 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/06/27 | 55286 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2022/06/27 | 62383 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/06/27 | 37115 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2022/06/27 | 41203 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/06/27 | 28690 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2022/06/27 | 34052 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/06/27 | 67705 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2022/06/27 | 73529 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/06/27 | 316242 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2022/06/27 | 351697 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/06/27 | 55758 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2022/06/27 | 57526 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/06/27 | 591566 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2022/06/27 | 629432 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/06/27 | 39728 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2022/06/27 | 43225 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/06/27 | 283818 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/06/27 | 1468099 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/06/27 | 1352691 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/06/27 | 13514 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2022/06/27 | 14411 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2019/03/12 | 1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma
-2022/06/26 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/06/27 | 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
@@ -301141,7 +301230,7 @@
2022/02/22 | 6917 | systems/win32/miktex/tm/packages/preview.tar.lzma
2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
2021/04/23 | 274028 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2022/06/26 | 980 | systems/win32/miktex/tm/packages/pr.ini
+2022/06/27 | 980 | 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
@@ -303039,7 +303128,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2022/06/27 | 186 | timestamp
+2022/06/28 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2022/02/28 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index cd8402388b..61a6358d14 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index c4be6fb907..e6609e25b6 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,37 +1,348 @@
+2022/06/27 | 99817 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2022/06/27 | 99258 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2022/06/27 | 980 | systems/win32/miktex/tm/packages/pr.ini
+2022/06/27 | 97199 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2022/06/27 | 96633 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2022/06/27 | 95 | macros/generic/lt3luabridge/example.context
+2022/06/27 | 95433 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2022/06/27 | 95284 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/06/27 | 9510 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-testfile.tex
+2022/06/27 | 93961 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2022/06/27 | 92917 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2022/06/27 | 915 | macros/latex/contrib/newpax/doc-use-pax.tex
+2022/06/27 | 908 | systems/texlive/tlnet/archive/collection-luatex.r63732.tar.xz
+2022/06/27 | 896 | macros/latex/contrib/newpax/doc-input2.tex
+2022/06/27 | 896 | macros/generic/lt3luabridge/README.md
+2022/06/27 | 88152 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/06/27 | 8783 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/06/27 | 871964 | systems/texlive/tlnet/archive/babel.doc.r63730.tar.xz
+2022/06/27 | 86760 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2022/06/27 | 8644 | systems/texlive/tlnet/archive/pwebmac.r63731.tar.xz
+2022/06/27 | 853 | macros/latex/contrib/newpax/README.md
+2022/06/27 | 836 | dviware/dvisirule/src/configure.ac
+2022/06/27 | 824370 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/06/27 | 81461 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/06/27 | 79024 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2022/06/27 | 78975 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/06/27 | 77 | macros/generic/lt3luabridge/example.plaintex
+2022/06/27 | 7753 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2022/06/27 | 775188 | macros/xetex/latex/xepersian/xepersian.pdf
+2022/06/27 | 77068 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/06/27 | 761651 | macros/xetex/latex/bidi/gull.jpg
+2022/06/27 | 758953 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/06/27 | 755744 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2022/06/27 | 7460 | systems/texlive/tlnet/archive/lt3luabridge.doc.r63732.tar.xz
+2022/06/27 | 74068 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/06/27 | 7383 | dviware/dvisirule/src/config/compile
+2022/06/27 | 73529 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/06/27 | 73479 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2022/06/27 | 73148 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/06/27 | 72885 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/06/27 | 72014 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2022/06/27 | 717808 | systems/texlive/tlnet/archive/babel.source.r63730.tar.xz
+2022/06/27 | 71387 | macros/xetex/latex/xepersian/xepersian-doc-basics.ltx
+2022/06/27 | 71008 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/06/27 | 70243 | macros/latex/contrib/newpax/doc-use-newpax.pdf
+2022/06/27 | 693068 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
+2022/06/27 | 68872 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2022/06/27 | 6886 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-template.tex
+2022/06/27 | 6878 | dviware/dvisirule/src/config/missing
+2022/06/27 | 681939 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/06/27 | 68009 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2022/06/27 | 67705 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2022/06/27 | 67253 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/06/27 | 657840 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/06/27 | 657720 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/06/27 | 65054 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/06/27 | 64709 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2022/06/27 | 64542 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2022/06/27 | 64490 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2022/06/27 | 63740 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/06/27 | 63311 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/06/27 | 631277 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2022/06/27 | 629432 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/06/27 | 62383 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/06/27 | 615 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-testfile.bib
+2022/06/27 | 6152 | systems/texlive/tlnet/archive/symbats3.r63728.tar.xz
+2022/06/27 | 6101 | macros/xetex/latex/bidi/bidi-doc-latex-pkgsupport.ltx
+2022/06/27 | 60243 | dviware/dvisirule/dvisirule.pdf
+2022/06/27 | 6012 | macros/latex/contrib/asmejour/asmewide_example/asmewide.sty
+2022/06/27 | 598232 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/06/27 | 591566 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2022/06/27 | 58665 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2022/06/27 | 58663 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/06/27 | 5823 | macros/xetex/latex/bidi/bidi-doc-plain-basics.ltx
+2022/06/27 | 5805911 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/06/27 | 57618 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2022/06/27 | 57526 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/06/27 | 57330 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/06/27 | 57269 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/06/27 | 56992 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2022/06/27 | 56617 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2022/06/27 | 565930 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/06/27 | 55758 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2022/06/27 | 55568 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/06/27 | 55286 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2022/06/27 | 5447 | macros/xetex/latex/xepersian/xepersian-doc-envcs.ltx
+2022/06/27 | 534 | macros/xetex/latex/bidi/bidi-doc.ltx
+2022/06/27 | 532454 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2022/06/27 | 528018 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/06/27 | 52478 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/06/27 | 52326 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/06/27 | 52093 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/06/27 | 51558 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2022/06/27 | 51484 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2022/06/27 | 50798 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2022/06/27 | 504083 | macros/latex/contrib/familytree/familytree-ja.pdf
+2022/06/27 | 503613 | macros/generic/lt3luabridge/lt3luabridge.pdf
+2022/06/27 | 500017 | macros/generic/lt3luabridge.zip
+2022/06/27 | 49770 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2022/06/27 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/06/27 | 48822 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/06/27 | 484370 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2022/06/27 | 481498 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/06/27 | 47922 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/06/27 | 477846 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2022/06/27 | 4672946 | install/macros/xetex/latex/bidi.tds.zip
+2022/06/27 | 46068 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2022/06/27 | 45825 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/06/27 | 45742 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2022/06/27 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/06/27 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/06/27 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/06/27 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/06/27 | 454 | macros/xetex/latex/xepersian/xepersian-doc.ltx
+2022/06/27 | 4547 | macros/xetex/latex/bidi/bidi-doc-latex-pkgs.ltx
+2022/06/27 | 4497 | macros/xetex/latex/bidi/bidi-doc-latex-programming.ltx
+2022/06/27 | 44965 | macros/latex/contrib/newpax/doc-use-pax.pdf
+2022/06/27 | 43915 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/06/27 | 43824 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/06/27 | 43646 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2022/06/27 | 43362 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2022/06/27 | 43225 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/06/27 | 42818 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2022/06/27 | 427681 | macros/latex/contrib/msu-thesis.zip
+2022/06/27 | 4256043 | macros/xetex/latex/bidi.zip
+2022/06/27 | 41888 | dviware/dvisirule/src/aclocal.m4
+2022/06/27 | 417296 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63727.tar.xz
+2022/06/27 | 4149 | macros/xetex/latex/xepersian/xepersian-doc-preamble.ltx
+2022/06/27 | 4133 | dviware/dvisirule/src/config.h
+2022/06/27 | 41306 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2022/06/27 | 41203 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/06/27 | 41181 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/06/27 | 410 | macros/xetex/latex/xepersian/xepersian-doc-boolean.ltx
+2022/06/27 | 39728 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2022/06/27 | 394369 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/06/27 | 38725 | macros/xetex/latex/xepersian/ftxe-0.12.py
+2022/06/27 | 38560 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2022/06/27 | 3850 | dviware/dvisirule/src/config.h.in
+2022/06/27 | 38426 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2022/06/27 | 37375 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/06/27 | 37115 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2022/06/27 | 37080 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/06/27 | 36942 | macros/latex/contrib/newpax/newpax.dtx
+2022/06/27 | 36048 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2022/06/27 | 3596 | macros/xetex/latex/bidi/bidi-doc-preamble.ltx
+2022/06/27 | 35384 | macros/latex/contrib/msu-thesis/msu-thesis.cls
+2022/06/27 | 35241 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/06/27 | 351697 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/06/27 | 35168 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/06/27 | 35164 | systems/texlive/tlnet/archive/nicematrix.r63729.tar.xz
+2022/06/27 | 3443872 | macros/xetex/latex/bidi/bidi.pdf
+2022/06/27 | 342951 | macros/xetex/latex/xepersian/xepersian.dtx
+2022/06/27 | 34250 | macros/latex/contrib/msu-thesis/msu-thesis.tex
+2022/06/27 | 34052 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/06/27 | 332414 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2022/06/27 | 32953 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2022/06/27 | 326659 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/06/27 | 325269 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/06/27 | 32134 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/06/27 | 316242 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2022/06/27 | 31588 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2022/06/27 | 31521 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/06/27 | 31412 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2022/06/27 | 31342 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/06/27 | 31084 | macros/latex/contrib/newpax/doc-input1.pdf
+2022/06/27 | 3099 | macros/xetex/latex/xepersian/xepersian-doc-captions.ltx
+2022/06/27 | 30795 | macros/latex/contrib/newpax/doc-input2.pdf
+2022/06/27 | 30540 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/06/27 | 3048771 | macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.pdf
+2022/06/27 | 30146 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2022/06/27 | 296038 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/06/27 | 2936 | macros/xetex/latex/bidi/bidi-bibitem.pdf
+2022/06/27 | 288199 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2022/06/27 | 28797 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2022/06/27 | 28690 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2022/06/27 | 286412 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/06/27 | 285715 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2022/06/27 | 28568 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/06/27 | 28422 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2022/06/27 | 283818 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/06/27 | 283800 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/06/27 | 2820687 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/06/27 | 27638 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/06/27 | 27591 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2022/06/27 | 27248 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2022/06/27 | 270301 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/06/27 | 2694876 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2022/06/27 | 2635203 | macros/latex/contrib/asmejour.zip
+2022/06/27 | 2592 | systems/texlive/tlnet/archive/lt3luabridge.r63732.tar.xz
+2022/06/27 | 259258 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2022/06/27 | 25876 | macros/xetex/latex/xepersian/xepersian-doc-pkgs.ltx
+2022/06/27 | 2574 | macros/xetex/latex/xepersian/xepersian-doc-intro.ltx
+2022/06/27 | 25552 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2022/06/27 | 25489147 | systems/texlive/tlnet/install-tl.zip
+2022/06/27 | 253 | macros/generic/lt3luabridge/lt3luabridge.ins
+2022/06/27 | 251129 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2022/06/27 | 25107 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2022/06/27 | 25059 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/06/27 | 247699 | macros/latex/contrib/msu-thesis/msu-thesis.pdf
+2022/06/27 | 247332 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/06/27 | 24525 | dviware/dvisirule/src/Makefile.in
+2022/06/27 | 245095 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/06/27 | 244960 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2022/06/27 | 24408 | dviware/dvisirule/src/Makefile
+2022/06/27 | 243608 | macros/xetex/latex/xepersian/xepersian-doc.pdf
+2022/06/27 | 24121 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/06/27 | 23944 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/06/27 | 2387780 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/06/27 | 23779 | macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx
+2022/06/27 | 236 | macros/latex/contrib/newpax/doc-extract-newpax.tex
+2022/06/27 | 23568 | dviware/dvisirule/src/config/depcomp
+2022/06/27 | 231 | macros/latex/contrib/newpax/doc-extract-pax.tex
+2022/06/27 | 22147 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2022/06/27 | 213277 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/06/27 | 21316 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2022/06/27 | 2108 | macros/xetex/latex/xepersian/xepersian-doc-title.ltx
+2022/06/27 | 2108 | macros/xetex/latex/bidi/bidi-doc-title.ltx
+2022/06/27 | 210273 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2022/06/27 | 208809 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/06/27 | 20461159 | systems/texlive/tlnet/install-tl-windows.exe
+2022/06/27 | 203838 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
+2022/06/27 | 202836 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/06/27 | 20184 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2022/06/27 | 2005524 | systems/texlive/tlnet/archive/nicematrix.doc.r63729.tar.xz
+2022/06/27 | 200396 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2022/06/27 | 199832 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2022/06/27 | 19860 | macros/latex/contrib/familytree/samples/Crawley.pdf
+2022/06/27 | 1982083 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/06/27 | 197036 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2022/06/27 | 1961 | macros/xetex/latex/bidi/bidi-doc-plain-programming.ltx
+2022/06/27 | 196116 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/06/27 | 19116 | macros/generic/lt3luabridge/lt3luabridge.dtx
+2022/06/27 | 19105 | macros/generic/lt3luabridge/LICENSE
+2022/06/27 | 190888 | systems/texlive/tlnet/archive/babel.r63730.tar.xz
+2022/06/27 | 190505 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2022/06/27 | 188116 | systems/texlive/tlnet/archive/symbats3.doc.r63728.tar.xz
+2022/06/27 | 18493 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/06/27 | 184895 | macros/latex/contrib/familytree/samples/Asai.pdf
+2022/06/27 | 18368 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/06/27 | 18304 | macros/xetex/latex/xepersian/img/ireland.jpg
+2022/06/27 | 182744 | dviware/dvisirule/src/configure
+2022/06/27 | 182696 | dviware/dvisirule.zip
+2022/06/27 | 182522 | macros/latex/contrib/familytree/samples/Tokugawa.pdf
+2022/06/27 | 181793 | macros/latex/contrib/newpax/newpax.pdf
+2022/06/27 | 181513 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/06/27 | 1807 | macros/latex/contrib/msu-thesis/README.md
+2022/06/27 | 179877 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2022/06/27 | 178069 | macros/latex/contrib/familytree/familytree.pdf
+2022/06/27 | 177693 | macros/xetex/latex/bidi/bidi-doc.pdf
+2022/06/27 | 17521918 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/06/27 | 1752147 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2022/06/27 | 1745 | macros/latex/contrib/newpax/newpax.ins
+2022/06/27 | 173008 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/06/27 | 1693 | macros/xetex/latex/bidi/picture.jpg
+2022/06/27 | 168818 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/06/27 | 16559 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2022/06/27 | 16502 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2022/06/27 | 16478 | macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.tex
+2022/06/27 | 160223 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-testfile.pdf
+2022/06/27 | 15976 | macros/xetex/latex/xepersian/dkun-0.3.py
+2022/06/27 | 15867 | macros/xetex/latex/xepersian/dkun-0.4.py
+2022/06/27 | 156967 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2022/06/27 | 155497 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/06/27 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/06/27 | 15368 | dviware/dvisirule/src/config/install-sh
+2022/06/27 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/06/27 | 152030 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2022/06/27 | 1501238 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/06/27 | 1468198 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/06/27 | 1468099 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/06/27 | 14616 | macros/xetex/latex/xepersian/img/weather/rain.jpg
+2022/06/27 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/06/27 | 1454764 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/06/27 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/06/27 | 14411 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/06/27 | 142294 | macros/latex/contrib/newpax.zip
+2022/06/27 | 1396 | macros/xetex/latex/bidi/bidi-doc-intro.ltx
+2022/06/27 | 139100 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/06/27 | 1390 | macros/xetex/latex/xepersian/README
+2022/06/27 | 1389 | macros/generic/lt3luabridge/docstrip.cfg
+2022/06/27 | 13804 | macros/xetex/latex/xepersian/undk-0.6.py
+2022/06/27 | 135949 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2022/06/27 | 1357072 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2022/06/27 | 1353891 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/06/27 | 135377 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/06/27 | 1352691 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/06/27 | 13514 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2022/06/27 | 1323 | macros/xetex/latex/bidi/README
+2022/06/27 | 1322742 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/06/27 | 131 | macros/generic/lt3luabridge/example.latex
+2022/06/27 | 13088 | macros/xetex/latex/xepersian/img/weather/clouds.jpg
+2022/06/27 | 13026 | macros/latex/contrib/newpax/newpax.tex
+2022/06/27 | 1302486 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2022/06/27 | 1295701 | install/macros/xetex/latex/xepersian.tds.zip
+2022/06/27 | 126535 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2022/06/27 | 12348 | macros/xetex/latex/xepersian/unldk-0.2.py
+2022/06/27 | 120617 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2022/06/27 | 1181126 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2022/06/27 | 115657 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/06/27 | 1156464 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/06/27 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/06/27 | 114628 | systems/texlive/tlnet/archive/nicematrix.source.r63729.tar.xz
+2022/06/27 | 11340 | systems/texlive/tlnet/archive/pwebmac.doc.r63731.tar.xz
+2022/06/27 | 113284 | systems/texlive/tlnet/archive/texlive-scripts.r63727.tar.xz
+2022/06/27 | 113052 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/06/27 | 1130433 | macros/xetex/latex/xepersian.zip
+2022/06/27 | 112587 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/06/27 | 109479 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/06/27 | 1093 | macros/latex/contrib/newpax/doc-use-newpax.tex
+2022/06/27 | 10896 | macros/xetex/latex/xepersian/img/weather/sun.jpg
+2022/06/27 | 1089276 | macros/latex/contrib/familytree.zip
+2022/06/27 | 107703 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/06/27 | 104557 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/06/27 | 103339 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/06/27 | 103093 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/06/27 | 1021847 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2022/06/27 | 1015543 | macros/xetex/latex/bidi/bidi.dtx
+2022/06/27 | 1007 | macros/latex/contrib/newpax/doc-input1.tex
+2022/06/27 | 100488 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
2022/06/26 | 9987 | systems/win32/miktex/tm/packages/ligtype.tar.lzma
-2022/06/26 | 99818 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2022/06/26 | 99259 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
2022/06/26 | 989020 | systems/win32/miktex/tm/packages/mcf2graph__doc.tar.lzma
2022/06/26 | 9876 | systems/win32/miktex/tm/packages/create-theorem.tar.lzma
2022/06/26 | 9842 | systems/win32/miktex/tm/packages/lithuanian__source.tar.lzma
-2022/06/26 | 980 | systems/win32/miktex/tm/packages/pr.ini
-2022/06/26 | 97201 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2022/06/26 | 96631 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2022/06/26 | 95 | macros/generic/lt3luabridge/example.context
2022/06/26 | 955 | systems/win32/miktex/tm/packages/beamertheme-arguelles__source.tar.lzma
-2022/06/26 | 95434 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2022/06/26 | 95284 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
2022/06/26 | 9426897 | systems/win32/miktex/tm/packages/kotex-utf__doc.tar.lzma
-2022/06/26 | 93959 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
2022/06/26 | 9351 | systems/win32/miktex/tm/packages/kotex-plain.tar.lzma
-2022/06/26 | 92917 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
2022/06/26 | 927736 | systems/win32/miktex/tm/packages/cyrillic__doc.tar.lzma
+2022/06/26 | 9253 | macros/latex/contrib/familytree/ft-sibling.dtx
2022/06/26 | 924449 | systems/win32/miktex/tm/packages/xcolor__doc.tar.lzma
2022/06/26 | 9178 | systems/win32/miktex/tm/packages/graphics-pln.tar.lzma
+2022/06/26 | 910 | macros/latex/contrib/familytree/cmd.mk
2022/06/26 | 90984 | systems/win32/miktex/tm/packages/hyperref.tar.lzma
-2022/06/26 | 895 | macros/generic/lt3luabridge/README.md
2022/06/26 | 89253 | systems/win32/miktex/tm/packages/psfrag__doc.tar.lzma
+2022/06/26 | 8878 | macros/latex/contrib/familytree/doc-ja/ft-gens-ja.tex
2022/06/26 | 885137 | macros/latex/required/babel/base/babel.pdf
2022/06/26 | 8825 | systems/win32/miktex/tm/packages/hypdoc__source.tar.lzma
2022/06/26 | 8821 | systems/win32/miktex/tm/packages/cjk-ko.tar.lzma
-2022/06/26 | 88152 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/06/26 | 8784 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/06/26 | 878 | macros/latex/contrib/familytree/samples/Asai/Asai.tex
2022/06/26 | 8717 | systems/win32/miktex/tm/packages/projlib__doc.tar.lzma
2022/06/26 | 86902 | systems/win32/miktex/tm/packages/eqexpl__doc.tar.lzma
2022/06/26 | 86853062 | systems/win32/miktex/tm/packages/biber-darwin-x86_64.tar.lzma
2022/06/26 | 867990 | systems/win32/miktex/tm/packages/yet-another-guide-latex2e.tar.lzma
-2022/06/26 | 86759 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2022/06/26 | 866 | macros/latex/contrib/familytree/samples/Tokugawa/tg-4th.tex
2022/06/26 | 863953 | systems/win32/miktex/tm/packages/kotex-utf__source.tar.lzma
+2022/06/26 | 8634 | macros/latex/contrib/asmejour/README.md
2022/06/26 | 85987 | systems/win32/miktex/tm/packages/ligtype__doc.tar.lzma
2022/06/26 | 8590978 | systems/win32/miktex/tm/packages/pdfmanagement-testphase__doc.tar.lzma
2022/06/26 | 852244 | systems/win32/miktex/tm/packages/beamertheme-arguelles__doc.tar.lzma
@@ -40,319 +351,247 @@
2022/06/26 | 840491 | systems/win32/miktex/tm/packages/biblatex-ext__doc.tar.lzma
2022/06/26 | 837636 | macros/latex/required/babel/base/locale.zip
2022/06/26 | 8255 | systems/win32/miktex/tm/packages/latexbug.tar.lzma
-2022/06/26 | 824370 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
2022/06/26 | 8227 | systems/win32/miktex/tm/packages/schwalbe-chess.tar.lzma
2022/06/26 | 8196 | systems/win32/miktex/tm/packages/kvoptions.tar.lzma
-2022/06/26 | 81461 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/06/26 | 79025 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2022/06/26 | 78975 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/06/26 | 806 | macros/latex/contrib/familytree/doc-ja/figs/figTY-ja.tex
2022/06/26 | 7832 | systems/win32/miktex/tm/packages/minimalist__source.tar.lzma
2022/06/26 | 78327 | systems/win32/miktex/tm/packages/dtk__doc.tar.lzma
-2022/06/26 | 77 | macros/generic/lt3luabridge/example.plaintex
2022/06/26 | 7799 | macros/latex/required/babel/base/babel.ins
2022/06/26 | 77773 | systems/win32/miktex/tm/packages/xcolor__source.tar.lzma
+2022/06/26 | 7759 | macros/latex/contrib/familytree/doc-ja/familytree-ja.tex
2022/06/26 | 7756 | systems/win32/miktex/tm/packages/colorist__source.tar.lzma
-2022/06/26 | 7753 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2022/06/26 | 77065 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/06/26 | 771 | macros/latex/contrib/familytree/doc-ja/Makefile
2022/06/26 | 7644 | systems/win32/miktex/tm/packages/beamer-rl.tar.lzma
-2022/06/26 | 758956 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/06/26 | 755740 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2022/06/26 | 761 | macros/latex/contrib/familytree/doc-ja/figs/fig4Hidetada.tex
+2022/06/26 | 760 | macros/latex/contrib/familytree/figs/fig4HenryVIII.tex
2022/06/26 | 751348 | systems/win32/miktex/tm/packages/verifiche__doc.tar.lzma
2022/06/26 | 750730 | systems/win32/miktex/tm/packages/lua-widow-control__doc.tar.lzma
2022/06/26 | 750004 | macros/latex/required/babel/base/babel.dtx
-2022/06/26 | 74069 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/06/26 | 7392 | macros/latex/contrib/familytree/familytree.dtx
2022/06/26 | 73845 | systems/win32/miktex/tm/packages/pdfmanagement-testphase.tar.lzma
-2022/06/26 | 73530 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/06/26 | 73478 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2022/06/26 | 7348 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/06/26 | 7330 | systems/win32/miktex/tm/packages/niceframe__source.tar.lzma
-2022/06/26 | 73148 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/06/26 | 72887 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
2022/06/26 | 72522 | systems/win32/miktex/tm/packages/create-theorem__doc.tar.lzma
-2022/06/26 | 72014 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2022/06/26 | 7174 | macros/latex/contrib/familytree/samples/Crawley.tex
2022/06/26 | 7170 | systems/win32/miktex/tm/packages/tikzlings__source.tar.lzma
2022/06/26 | 714648 | macros/latex/contrib/nicematrix/nicematrix.dtx
2022/06/26 | 712094 | systems/win32/miktex/tm/packages/latex-base-dev__source.tar.lzma
2022/06/26 | 711996 | systems/win32/miktex/tm/packages/ltxbase__source.tar.lzma
-2022/06/26 | 71004 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/06/26 | 7073 | macros/latex/contrib/familytree/samples/Tokugawa/Tokugawa.tex
2022/06/26 | 7073406 | systems/win32/miktex/tm/packages/biblatex__doc.tar.lzma
2022/06/26 | 7068 | systems/texlive/tlnet/archive/reverxii.source.r63725.tar.xz
2022/06/26 | 7062 | systems/win32/miktex/tm/packages/ut-thesis__source.tar.lzma
2022/06/26 | 6948 | systems/win32/miktex/tm/packages/hvextern.tar.lzma
-2022/06/26 | 693068 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
2022/06/26 | 69181 | systems/win32/miktex/tm/packages/latexindent.tar.lzma
-2022/06/26 | 68872 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
2022/06/26 | 686195 | systems/win32/miktex/tm/packages/tikzlings__doc.tar.lzma
2022/06/26 | 682245 | systems/win32/miktex/tm/packages/functional__doc.tar.lzma
-2022/06/26 | 681940 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/06/26 | 68010 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
2022/06/26 | 67765 | systems/win32/miktex/tm/packages/olsak-misc.tar.lzma
-2022/06/26 | 67704 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2022/06/26 | 676 | dviware/dvisirule/demo.tex
2022/06/26 | 67539 | systems/win32/miktex/tm/packages/lithuanian.tar.lzma
-2022/06/26 | 67253 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/06/26 | 670 | macros/latex/contrib/familytree/doc-ja/figs/fig3Iemitsu.tex
2022/06/26 | 6660 | systems/texlive/tlnet/archive/collection-latexextra.r63722.tar.xz
2022/06/26 | 6616 | systems/win32/miktex/tm/packages/diffcoeff.tar.lzma
2022/06/26 | 6606 | systems/win32/miktex/tm/packages/pbalance.tar.lzma
-2022/06/26 | 657840 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/06/26 | 657720 | systems/win32/miktex/tm/packages/files.csv.lzma
2022/06/26 | 655767 | systems/win32/miktex/tm/packages/diffcoeff__doc.tar.lzma
2022/06/26 | 6519 | systems/win32/miktex/tm/packages/create-theorem__source.tar.lzma
2022/06/26 | 651597 | systems/win32/miktex/tm/packages/xduts__doc.tar.lzma
-2022/06/26 | 65055 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
2022/06/26 | 64909 | systems/win32/miktex/tm/packages/siunitx.tar.lzma
-2022/06/26 | 64710 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2022/06/26 | 64543 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2022/06/26 | 64490 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2022/06/26 | 63740 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/06/26 | 63 | macros/latex/contrib/familytree/samples/Tokugawa/tg-14th.tex
2022/06/26 | 6344 | systems/win32/miktex/tm/packages/magicwatermark__source.tar.lzma
2022/06/26 | 634356 | systems/win32/miktex/tm/packages/europecv__doc.tar.lzma
2022/06/26 | 634040 | systems/win32/miktex/tm/packages/biblatex-sbl__doc.tar.lzma
-2022/06/26 | 63311 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/06/26 | 631281 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2022/06/26 | 629431 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/06/26 | 62381 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/06/26 | 631 | macros/latex/contrib/familytree/samples/Tokugawa/tg-3rd.tex
+2022/06/26 | 628 | macros/latex/contrib/familytree/samples/Tokugawa/tg-10th.tex
+2022/06/26 | 628945 | macros/latex/contrib/asmejour/asmejour-template.pdf
+2022/06/26 | 618 | macros/latex/contrib/familytree/samples/Tokugawa/tg-5th.tex
+2022/06/26 | 6163 | macros/latex/contrib/familytree/ft-lib.dtx
+2022/06/26 | 6158 | macros/latex/contrib/familytree/doc-ja/ft-marriage-ja.tex
2022/06/26 | 61560 | systems/win32/miktex/tm/packages/letgut__source.tar.lzma
2022/06/26 | 6132 | systems/win32/miktex/tm/packages/fgruler.tar.lzma
2022/06/26 | 60670 | systems/win32/miktex/tm/packages/moodle__source.tar.lzma
2022/06/26 | 6061 | systems/win32/miktex/tm/packages/symbats3.tar.lzma
2022/06/26 | 6052 | systems/win32/miktex/tm/packages/ligtype__source.tar.lzma
-2022/06/26 | 598231 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/06/26 | 5 | dviware/dvisirule/DEPENDS.txt
2022/06/26 | 5980 | systems/texlive/tlnet/archive/fgruler.r63721.tar.xz
-2022/06/26 | 591571 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
2022/06/26 | 588376 | systems/win32/miktex/tm/packages/l3kernel__source.tar.lzma
-2022/06/26 | 58665 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2022/06/26 | 58662 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/06/26 | 582 | macros/latex/contrib/familytree/doc-ja/figs/fig3Hidetada.tex
2022/06/26 | 582853 | systems/win32/miktex/tm/packages/luaotfload.tar.lzma
-2022/06/26 | 5805901 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/06/26 | 57619 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2022/06/26 | 57526 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/06/26 | 57331 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/06/26 | 57271 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
2022/06/26 | 57191 | systems/win32/miktex/tm/packages/latex-graphics-dev__source.tar.lzma
2022/06/26 | 57027 | systems/win32/miktex/tm/packages/showhyphenation__doc.tar.lzma
-2022/06/26 | 56994 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
2022/06/26 | 5673 | systems/win32/miktex/tm/packages/textcase__source.tar.lzma
-2022/06/26 | 56619 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2022/06/26 | 565930 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
2022/06/26 | 56404 | systems/win32/miktex/tm/packages/microtype.tar.lzma
-2022/06/26 | 55757 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2022/06/26 | 55568 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2022/06/26 | 55286 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2022/06/26 | 563 | macros/latex/contrib/familytree/figs/fig2sis.tex
+2022/06/26 | 54 | macros/latex/contrib/familytree/samples/Tokugawa/tg-1st.tex
2022/06/26 | 54934 | systems/win32/miktex/tm/packages/yathesis__source.tar.lzma
+2022/06/26 | 548 | macros/latex/contrib/familytree/doc-ja/figs/fig2Hidetada.tex
2022/06/26 | 548496 | systems/win32/miktex/tm/packages/luaotfload__doc.tar.lzma
2022/06/26 | 5376 | systems/win32/miktex/tm/packages/thalie.tar.lzma
2022/06/26 | 5357 | systems/win32/miktex/tm/packages/euro-ce.tar.lzma
-2022/06/26 | 532453 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
2022/06/26 | 5313928 | systems/win32/miktex/tm/packages/latex-tools-dev__doc.tar.lzma
-2022/06/26 | 528019 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/06/26 | 52480 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/06/26 | 52327 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/06/26 | 525 | macros/latex/contrib/familytree/samples/Tokugawa/tg-6th.tex
2022/06/26 | 523273 | systems/win32/miktex/tm/packages/xduts.tar.lzma
2022/06/26 | 5220 | systems/win32/miktex/tm/packages/verifiche.tar.lzma
2022/06/26 | 5211404 | systems/win32/miktex/tm/packages/yathesis__doc.tar.lzma
-2022/06/26 | 52093 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
2022/06/26 | 52002 | systems/win32/miktex/tm/packages/mcf2graph__source.tar.lzma
-2022/06/26 | 51558 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2022/06/26 | 51484 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
2022/06/26 | 513845 | systems/win32/miktex/tm/packages/emisa__doc.tar.lzma
-2022/06/26 | 50800 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2022/06/26 | 512 | macros/latex/contrib/familytree/figs/fig4Robert.tex
+2022/06/26 | 506 | macros/latex/contrib/familytree/samples/Makefile
2022/06/26 | 504452 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
2022/06/26 | 5008 | web/pwebmac/index.md
-2022/06/26 | 49770 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
2022/06/26 | 49619 | systems/win32/miktex/tm/packages/letgut.tar.lzma
2022/06/26 | 4929 | systems/win32/miktex/tm/packages/einfart.tar.lzma
2022/06/26 | 49186 | systems/win32/miktex/tm/packages/dtk-bibliography__source.tar.lzma
2022/06/26 | 4904 | systems/win32/miktex/tm/packages/simplivre.tar.lzma
-2022/06/26 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/06/26 | 4904 | macros/latex/contrib/familytree/doc-ja/ft-sibling-ja.tex
2022/06/26 | 48877 | systems/win32/miktex/tm/packages/emisa__source.tar.lzma
-2022/06/26 | 48826 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
2022/06/26 | 48635 | systems/win32/miktex/tm/packages/functional__source.tar.lzma
2022/06/26 | 4858395 | systems/win32/miktex/tm/packages/tcolorbox__doc.tar.lzma
2022/06/26 | 48472 | systems/win32/miktex/tm/packages/lua-widow-control__source.tar.lzma
2022/06/26 | 484426 | systems/win32/miktex/tm/packages/kvoptions__doc.tar.lzma
-2022/06/26 | 484371 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
2022/06/26 | 4816 | systems/win32/miktex/tm/packages/lebhart.tar.lzma
-2022/06/26 | 481497 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
2022/06/26 | 4804 | systems/win32/miktex/tm/packages/beaulivre.tar.lzma
2022/06/26 | 48011 | systems/win32/miktex/tm/packages/xkeyval__source.tar.lzma
-2022/06/26 | 47923 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/06/26 | 477848 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
2022/06/26 | 476981 | systems/win32/miktex/tm/packages/logix__doc.tar.lzma
2022/06/26 | 475261 | systems/win32/miktex/tm/packages/barracuda__source.tar.lzma
+2022/06/26 | 474 | macros/latex/contrib/familytree/figs/fig3Lily3.tex
2022/06/26 | 473706 | systems/win32/miktex/tm/packages/fgruler__doc.tar.lzma
2022/06/26 | 47349 | systems/win32/miktex/tm/packages/lithuanian__doc.tar.lzma
2022/06/26 | 471864 | systems/texlive/tlnet/archive/fgruler.doc.r63721.tar.xz
2022/06/26 | 471695 | systems/win32/miktex/tm/packages/thalie__doc.tar.lzma
2022/06/26 | 4703 | systems/win32/miktex/tm/packages/psfrag.tar.lzma
+2022/06/26 | 465 | dviware/dvisirule/cmd.mk
2022/06/26 | 46334 | systems/win32/miktex/tm/packages/l3packages__source.tar.lzma
2022/06/26 | 462621 | systems/win32/miktex/tm/packages/beaulivre__doc.tar.lzma
-2022/06/26 | 46066 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2022/06/26 | 45827 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/06/26 | 459 | macros/latex/contrib/familytree/samples/Tokugawa/tg-12th.tex
+2022/06/26 | 45987 | macros/latex/contrib/asmejour/asmejour.cls
2022/06/26 | 457805 | systems/win32/miktex/tm/packages/lwarp__source.tar.lzma
-2022/06/26 | 45743 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2022/06/26 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/06/26 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2022/06/26 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/06/26 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2022/06/26 | 446661 | systems/win32/miktex/tm/packages/simplivre__doc.tar.lzma
+2022/06/26 | 43 | macros/latex/contrib/familytree/DEPENDS.txt
2022/06/26 | 4399 | systems/win32/miktex/tm/packages/cjk-ko__source.tar.lzma
-2022/06/26 | 43916 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/06/26 | 43825 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
2022/06/26 | 43780 | systems/win32/miktex/tm/packages/gzt__source.tar.lzma
-2022/06/26 | 43645 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2022/06/26 | 43362 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2022/06/26 | 43226 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/06/26 | 42819 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2022/06/26 | 417280 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63718.tar.xz
+2022/06/26 | 43395 | macros/latex/contrib/asmejour/asmejour-template.tex
+2022/06/26 | 417 | macros/latex/contrib/familytree/doc-ja/figs/fig-ja.tex
2022/06/26 | 416738 | systems/win32/miktex/tm/packages/hyperref__source.tar.lzma
2022/06/26 | 416252 | systems/win32/miktex/tm/packages/xkeyval__doc.tar.lzma
+2022/06/26 | 414 | macros/latex/contrib/familytree/samples/Tokugawa/tg-9th.tex
2022/06/26 | 4143 | systems/win32/miktex/tm/packages/tabbing__source.tar.lzma
-2022/06/26 | 41305 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
2022/06/26 | 4129 | systems/win32/miktex/tm/packages/euro-ce__doc.tar.lzma
2022/06/26 | 4122 | systems/win32/miktex/tm/packages/showhyphenation__source.tar.lzma
-2022/06/26 | 41202 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/06/26 | 41182 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/06/26 | 410 | macros/latex/contrib/familytree/figs/fig3Lily4.tex
+2022/06/26 | 408 | macros/latex/contrib/familytree/figs/fig3Robert1.tex
+2022/06/26 | 403 | macros/latex/contrib/familytree/doc-ja/figs/fig3Ietsuna.tex
+2022/06/26 | 399 | macros/latex/contrib/familytree/doc-ja/figs/fig1Ieyasu.tex
+2022/06/26 | 398 | macros/latex/contrib/familytree/figs/fig4Lily4.tex
+2022/06/26 | 398 | macros/latex/contrib/familytree/figs/fig4Lily2.tex
2022/06/26 | 3987823 | systems/win32/miktex/tm/packages/bidi__doc.tar.lzma
-2022/06/26 | 39728 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
2022/06/26 | 396657 | systems/win32/miktex/tm/packages/europecv__source.tar.lzma
2022/06/26 | 39455 | systems/win32/miktex/tm/packages/biblatex-ext__source.tar.lzma
-2022/06/26 | 394370 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
2022/06/26 | 393624 | systems/win32/miktex/tm/packages/logix.tar.lzma
+2022/06/26 | 392 | macros/latex/contrib/familytree/figs/fig4Lily3.tex
2022/06/26 | 3920 | systems/win32/miktex/tm/packages/pgf-pie.tar.lzma
+2022/06/26 | 390 | macros/latex/contrib/familytree/figs/fig3Robert2.tex
2022/06/26 | 38878 | systems/win32/miktex/tm/packages/pbalance__doc.tar.lzma
2022/06/26 | 388547 | systems/win32/miktex/tm/packages/lebhart__doc.tar.lzma
-2022/06/26 | 38561 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
2022/06/26 | 38519 | systems/win32/miktex/tm/packages/biblatex-apa__source.tar.lzma
-2022/06/26 | 38426 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
2022/06/26 | 380960 | systems/win32/miktex/tm/packages/dtk-bibliography.tar.lzma
+2022/06/26 | 376 | macros/latex/contrib/familytree/figs/fig1Robert1.tex
2022/06/26 | 37551 | systems/win32/miktex/tm/packages/niceframe.tar.lzma
2022/06/26 | 3753 | systems/win32/miktex/tm/packages/hypdoc.tar.lzma
-2022/06/26 | 37375 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
2022/06/26 | 3734 | systems/win32/miktex/tm/packages/fullpict.tar.lzma
+2022/06/26 | 3733 | macros/latex/contrib/familytree/samples/Asai/3Gou.tex
2022/06/26 | 3729 | systems/win32/miktex/tm/packages/lua-visual-debug.tar.lzma
-2022/06/26 | 37118 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2022/06/26 | 37081 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/06/26 | 3708 | macros/latex/contrib/familytree/README.md
+2022/06/26 | 369 | macros/latex/contrib/familytree/samples/Tokugawa/tg-7th.tex
+2022/06/26 | 369 | macros/latex/contrib/familytree/samples/Tokugawa/Makefile
2022/06/26 | 369661 | systems/win32/miktex/tm/packages/einfart__doc.tar.lzma
2022/06/26 | 3679884 | systems/win32/miktex/tm/packages/hyperref__doc.tar.lzma
2022/06/26 | 364237 | systems/win32/miktex/tm/packages/lni__doc.tar.lzma
-2022/06/26 | 36049 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2022/06/26 | 3622 | dviware/dvisirule/dvisirule.sh
2022/06/26 | 36017 | systems/win32/miktex/tm/packages/barracuda.tar.lzma
2022/06/26 | 35616 | systems/win32/miktex/tm/packages/xduts__source.tar.lzma
2022/06/26 | 3526 | macros/latex/required/babel/base/bbidxglo.dtx
-2022/06/26 | 35243 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/06/26 | 35192 | systems/texlive/tlnet/archive/nicematrix.r63723.tar.xz
-2022/06/26 | 351697 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/06/26 | 35168 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
2022/06/26 | 35111 | systems/win32/miktex/tm/packages/nicematrix.tar.lzma
2022/06/26 | 34649 | systems/win32/miktex/tm/packages/gzt.tar.lzma
-2022/06/26 | 34053 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/06/26 | 341 | macros/latex/contrib/familytree/figs/fig3Lily1.tex
2022/06/26 | 33768 | systems/win32/miktex/tm/packages/tikzlings.tar.lzma
2022/06/26 | 33653 | systems/win32/miktex/tm/packages/yet-another-guide-latex2e__source.tar.lzma
2022/06/26 | 3358 | systems/win32/miktex/tm/packages/jigsaw__source.tar.lzma
-2022/06/26 | 332416 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2022/06/26 | 32955 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2022/06/26 | 326659 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/06/26 | 325271 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/06/26 | 328 | macros/latex/contrib/familytree/samples/Asai/Makefile
2022/06/26 | 324324 | systems/win32/miktex/tm/packages/hypdoc__doc.tar.lzma
+2022/06/26 | 323 | macros/latex/contrib/familytree/figs/fig3sis.tex
+2022/06/26 | 322 | macros/latex/contrib/familytree/samples/Tokugawa/tg-2nd.tex
2022/06/26 | 322904 | systems/texlive/tlnet/archive/biblatex-apa.doc.r63719.tar.xz
-2022/06/26 | 32134 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/06/26 | 316243 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2022/06/26 | 31588 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2022/06/26 | 31521 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
2022/06/26 | 3143 | systems/win32/miktex/tm/packages/showhyphenation.tar.lzma
-2022/06/26 | 31413 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
2022/06/26 | 314072 | systems/win32/miktex/tm/packages/moodle__doc.tar.lzma
-2022/06/26 | 31343 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/06/26 | 313 | macros/latex/contrib/familytree/familytree.ins
+2022/06/26 | 309 | macros/latex/contrib/familytree/figs/fig3Lily2.tex
2022/06/26 | 3068675 | systems/win32/miktex/tm/packages/lwarp__doc.tar.lzma
2022/06/26 | 305905 | systems/win32/miktex/tm/packages/chess-problem-diagrams__doc.tar.lzma
-2022/06/26 | 30542 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/06/26 | 30147 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
2022/06/26 | 3014165 | install/macros/latex/required/babel-base.tds.zip
2022/06/26 | 30013662 | systems/win32/miktex/tm/packages/ltxbase__doc.tar.lzma
2022/06/26 | 30008836 | systems/win32/miktex/tm/packages/latex-base-dev__doc.tar.lzma
2022/06/26 | 299480 | systems/texlive/tlnet/archive/cprotectinside.doc.r63720.tar.xz
2022/06/26 | 298784 | systems/win32/miktex/tm/packages/cprotectinside__doc.tar.lzma
2022/06/26 | 29604 | systems/win32/miktex/tm/packages/greek-fontenc__source.tar.lzma
-2022/06/26 | 296040 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
2022/06/26 | 29584 | systems/texlive/tlnet/archive/biblatex-apa.r63719.tar.xz
2022/06/26 | 29541 | systems/win32/miktex/tm/packages/moodle.tar.lzma
2022/06/26 | 29422 | systems/win32/miktex/tm/packages/biblatex-apa.tar.lzma
2022/06/26 | 29313 | systems/win32/miktex/tm/packages/greek-fontenc.tar.lzma
2022/06/26 | 29076 | systems/win32/miktex/tm/packages/biblatex-ext.tar.lzma
-2022/06/26 | 288201 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
2022/06/26 | 28803 | systems/win32/miktex/tm/packages/biblatex-sbl__source.tar.lzma
-2022/06/26 | 28799 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2022/06/26 | 28689 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2022/06/26 | 286412 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
2022/06/26 | 2857 | systems/win32/miktex/tm/packages/ut-thesis.tar.lzma
2022/06/26 | 285761 | systems/win32/miktex/tm/packages/biblatex-apa__doc.tar.lzma
-2022/06/26 | 285714 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2022/06/26 | 28569 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/06/26 | 28422 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2022/06/26 | 284 | macros/latex/contrib/familytree/figs/fig4Lily1.tex
2022/06/26 | 2841 | systems/win32/miktex/tm/packages/pgf-pie__source.tar.lzma
-2022/06/26 | 283879 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/06/26 | 283824 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/06/26 | 2820687 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
2022/06/26 | 2817243 | systems/win32/miktex/tm/packages/univie-ling__doc.tar.lzma
2022/06/26 | 280912 | systems/win32/miktex/tm/packages/biber-doc.tar.lzma
-2022/06/26 | 27637 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/06/26 | 27591 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
2022/06/26 | 2744 | systems/win32/miktex/tm/packages/simples-matrices.tar.lzma
-2022/06/26 | 27248 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
2022/06/26 | 2711 | systems/win32/miktex/tm/packages/cprotectinside__source.tar.lzma
2022/06/26 | 27031 | systems/win32/miktex/tm/packages/diffcoeff__source.tar.lzma
-2022/06/26 | 270300 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/06/26 | 269 | macros/latex/contrib/familytree/samples/Tokugawa/tg-11th.tex
2022/06/26 | 26974 | systems/win32/miktex/tm/packages/lni__source.tar.lzma
-2022/06/26 | 2694877 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
2022/06/26 | 2670 | systems/win32/miktex/tm/packages/graphics-pln__doc.tar.lzma
2022/06/26 | 2667240 | systems/win32/miktex/tm/packages/microtype__doc.tar.lzma
2022/06/26 | 259509 | systems/win32/miktex/tm/packages/biblatex.tar.lzma
-2022/06/26 | 259258 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2022/06/26 | 2570 | dviware/dvisirule/README.md
2022/06/26 | 2556 | systems/win32/miktex/tm/packages/magicwatermark.tar.lzma
-2022/06/26 | 25552 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
2022/06/26 | 25494 | systems/win32/miktex/tm/packages/projlib__source.tar.lzma
-2022/06/26 | 25489136 | systems/texlive/tlnet/install-tl.zip
-2022/06/26 | 251129 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2022/06/26 | 25106 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
2022/06/26 | 2506857 | systems/win32/miktex/tm/packages/latex-graphics-dev__doc.tar.lzma
-2022/06/26 | 25060 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
2022/06/26 | 2496 | systems/win32/miktex/tm/packages/fullpict__doc.tar.lzma
+2022/06/26 | 248 | macros/latex/contrib/familytree/doc-ja/figs/fig4Ogou.tex
2022/06/26 | 24800 | systems/win32/miktex/tm/packages/chess-problem-diagrams__source.tar.lzma
2022/06/26 | 2478 | macros/latex/required/babel/base/README.md
2022/06/26 | 24766 | systems/win32/miktex/tm/packages/projlib.tar.lzma
-2022/06/26 | 247333 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
2022/06/26 | 2454653 | systems/win32/miktex/tm/packages/logix__source.tar.lzma
-2022/06/26 | 245096 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/06/26 | 244961 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
2022/06/26 | 24476125 | systems/win32/miktex/tm/packages/biber-windows-x64.tar.lzma
2022/06/26 | 2441028 | systems/win32/miktex/tm/packages/greek-fontenc__doc.tar.lzma
2022/06/26 | 2438 | systems/win32/miktex/tm/packages/refenums.tar.lzma
2022/06/26 | 2421167 | systems/win32/miktex/tm/packages/latex-amsmath-dev__doc.tar.lzma
-2022/06/26 | 24120 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/06/26 | 23945 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
2022/06/26 | 2392 | systems/win32/miktex/tm/packages/eqexpl__source.tar.lzma
2022/06/26 | 2388 | systems/win32/miktex/tm/packages/refenums__source.tar.lzma
-2022/06/26 | 2386864 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2022/06/26 | 2384 | systems/win32/miktex/tm/packages/realhats.tar.lzma
2022/06/26 | 23804 | systems/win32/miktex/tm/packages/yathesis.tar.lzma
2022/06/26 | 23598670 | systems/win32/miktex/tm/packages/biber-linux-x86_64.tar.lzma
2022/06/26 | 23550 | systems/win32/miktex/tm/packages/psfrag__source.tar.lzma
+2022/06/26 | 234 | macros/latex/contrib/familytree/figs/fig2base.tex
2022/06/26 | 233 | web/pwebmac/trapman.ch
2022/06/26 | 2333 | systems/win32/miktex/tm/packages/beamertheme-arguelles.tar.lzma
-2022/06/26 | 232 | macros/generic/lt3luabridge/lt3luabridge.sty
2022/06/26 | 232749 | systems/win32/miktex/tm/packages/tcolorbox.tar.lzma
2022/06/26 | 23051 | systems/win32/miktex/tm/packages/miktex-misc.tar.lzma
2022/06/26 | 22986 | systems/win32/miktex/tm/packages/denisbdoc__source.tar.lzma
+2022/06/26 | 2293 | dviware/dvisirule/Makefile
2022/06/26 | 229332 | systems/texlive/tlnet/archive/reverxii.doc.r63725.tar.xz
2022/06/26 | 22919015 | systems/win32/miktex/tm/packages/biber-windows-x86.tar.lzma
2022/06/26 | 22829192 | systems/texlive/tlnet/archive/biber.win32.r63724.tar.xz
2022/06/26 | 226413 | systems/win32/miktex/tm/packages/ltxbase.tar.lzma
2022/06/26 | 22626 | web/pwebmac/pwebmac.tex
2022/06/26 | 226010 | systems/win32/miktex/tm/packages/latex-base-dev.tar.lzma
+2022/06/26 | 225 | macros/latex/contrib/familytree/samples/Tokugawa/tg-8th.tex
2022/06/26 | 223243 | systems/win32/miktex/tm/packages/arabtex.tar.lzma
2022/06/26 | 2222 | web/pwebmac/README.md
2022/06/26 | 221534 | systems/win32/miktex/tm/packages/pgf-pie__doc.tar.lzma
-2022/06/26 | 22147 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
2022/06/26 | 22113 | systems/win32/miktex/tm/packages/l3packages.tar.lzma
+2022/06/26 | 2210 | macros/latex/contrib/familytree/samples/Asai/2Hatsu.tex
2022/06/26 | 220093 | systems/win32/miktex/tm/packages/latexbug__doc.tar.lzma
2022/06/26 | 219542 | systems/win32/miktex/tm/packages/niceframe__doc.tar.lzma
2022/06/26 | 21890 | macros/latex/required/babel/base/bbcompat.dtx
@@ -362,50 +601,37 @@
2022/06/26 | 2169344 | macros/latex/contrib/nicematrix.zip
2022/06/26 | 216515 | systems/win32/miktex/tm/packages/magicwatermark__doc.tar.lzma
2022/06/26 | 216052 | systems/win32/miktex/tm/packages/textcase__doc.tar.lzma
+2022/06/26 | 2155 | dviware/dvisirule/dvisirule-marker.awk
2022/06/26 | 21435 | systems/win32/miktex/tm/packages/kvoptions__source.tar.lzma
2022/06/26 | 21389 | systems/win32/miktex/tm/packages/biblatex-sbl.tar.lzma
-2022/06/26 | 213279 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/06/26 | 21314 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
2022/06/26 | 21302 | systems/win32/miktex/tm/packages/kotex-utf.tar.lzma
2022/06/26 | 212169 | systems/win32/miktex/tm/packages/schwalbe-chess__doc.tar.lzma
2022/06/26 | 211771 | systems/win32/miktex/tm/packages/lwarp.tar.lzma
2022/06/26 | 21102 | web/pwebmac.zip
-2022/06/26 | 210277 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2022/06/26 | 208809 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/06/26 | 2097 | macros/latex/contrib/familytree/doc-ja/figs/Makefile
+2022/06/26 | 2088 | macros/latex/contrib/familytree/samples/Asai/1Chacha.tex
+2022/06/26 | 2080 | macros/latex/contrib/familytree/doc-ja/ft-lib-ja.tex
2022/06/26 | 205997 | systems/win32/miktex/tm/packages/lua-visual-debug__doc.tar.lzma
-2022/06/26 | 20460879 | systems/texlive/tlnet/install-tl-windows.exe
2022/06/26 | 20385 | systems/win32/miktex/tm/packages/thalie__source.tar.lzma
-2022/06/26 | 203836 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
-2022/06/26 | 202837 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/06/26 | 20184 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2022/06/26 | 2005980 | systems/texlive/tlnet/archive/nicematrix.doc.r63723.tar.xz
-2022/06/26 | 200397 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2022/06/26 | 199831 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2022/06/26 | 1982086 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/06/26 | 197035 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2022/06/26 | 20258 | macros/latex/contrib/familytree/ft-individual.dtx
2022/06/26 | 1966726 | systems/win32/miktex/tm/packages/nicematrix__doc.tar.lzma
-2022/06/26 | 196117 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/06/26 | 195 | macros/latex/contrib/familytree/figs/fig2ival.tex
2022/06/26 | 193290 | systems/win32/miktex/tm/packages/biblatex__source.tar.lzma
2022/06/26 | 193230 | macros/latex/contrib/nicematrix/nicematrix-french.tex
2022/06/26 | 1921487 | macros/latex/required/babel/base.zip
-2022/06/26 | 19105 | macros/generic/lt3luabridge/LICENSE
-2022/06/26 | 190506 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
2022/06/26 | 186994 | systems/win32/miktex/tm/packages/refenums__doc.tar.lzma
2022/06/26 | 1868491 | systems/win32/miktex/tm/packages/realhats__doc.tar.lzma
2022/06/26 | 1854627 | systems/win32/miktex/tm/packages/l3packages__doc.tar.lzma
2022/06/26 | 1852 | systems/win32/miktex/tm/packages/cprotectinside.tar.lzma
-2022/06/26 | 18493 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/06/26 | 18369 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/06/26 | 182704 | macros/latex/contrib/dvisirule.zip
+2022/06/26 | 1840 | macros/latex/contrib/familytree/figs/Makefile
+2022/06/26 | 1837 | macros/latex/contrib/familytree/samples/Asai/0sis.tex
2022/06/26 | 1819971 | systems/win32/miktex/tm/packages/realhats__source.tar.lzma
2022/06/26 | 1815 | systems/win32/miktex/tm/packages/textcase.tar.lzma
-2022/06/26 | 181514 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/06/26 | 179878 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2022/06/26 | 18092 | macros/latex/contrib/familytree/LICENSE
+2022/06/26 | 18092 | dviware/dvisirule/LICENSE
2022/06/26 | 17675 | systems/win32/miktex/tm/packages/xcolor.tar.lzma
-2022/06/26 | 1752148 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2022/06/26 | 17519872 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/06/26 | 175 | macros/latex/contrib/familytree/doc-ja/figs/fig2cfg.tex
2022/06/26 | 174582 | systems/win32/miktex/tm/packages/symbats3__doc.tar.lzma
-2022/06/26 | 173008 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
2022/06/26 | 17237 | systems/win32/miktex/tm/packages/schwalbe-chess__source.tar.lzma
2022/06/26 | 1719 | systems/win32/miktex/tm/packages/multiple-choice.tar.lzma
2022/06/26 | 171640 | systems/win32/miktex/tm/packages/l3kernel.tar.lzma
@@ -413,10 +639,9 @@
2022/06/26 | 1703717 | systems/win32/miktex/tm/packages/amscls-doc.tar.lzma
2022/06/26 | 17028 | systems/win32/miktex/tm/packages/verifiche__source.tar.lzma
2022/06/26 | 170119 | systems/win32/miktex/tm/packages/microtype__source.tar.lzma
-2022/06/26 | 168819 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/06/26 | 169 | macros/latex/contrib/familytree/doc-ja/figs/fig2ival-ja.tex
2022/06/26 | 16760 | systems/win32/miktex/tm/packages/lua-widow-control.tar.lzma
-2022/06/26 | 16560 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2022/06/26 | 16503 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2022/06/26 | 166 | macros/latex/contrib/familytree/doc-ja/figs/fig2base-ja.tex
2022/06/26 | 1643665 | systems/win32/miktex/tm/packages/csvsimple__doc.tar.lzma
2022/06/26 | 16390 | systems/win32/miktex/tm/packages/einfart__source.tar.lzma
2022/06/26 | 163112 | systems/win32/miktex/tm/packages/jigsaw__doc.tar.lzma
@@ -429,128 +654,91 @@
2022/06/26 | 15852 | systems/win32/miktex/tm/packages/dtk.tar.lzma
2022/06/26 | 15827 | systems/win32/miktex/tm/packages/denisbdoc.tar.lzma
2022/06/26 | 1580 | systems/win32/miktex/tm/packages/tabbing.tar.lzma
-2022/06/26 | 156965 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
2022/06/26 | 1564 | systems/win32/miktex/tm/packages/multiple-choice__source.tar.lzma
2022/06/26 | 1562 | systems/win32/miktex/tm/packages/kotex-plain__doc.tar.lzma
+2022/06/26 | 155 | macros/latex/contrib/familytree/samples/Tokugawa/tg-13th.tex
2022/06/26 | 15584 | systems/win32/miktex/tm/packages/emisa.tar.lzma
-2022/06/26 | 155497 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
2022/06/26 | 15539 | systems/win32/miktex/tm/packages/cyrillic.tar.lzma
2022/06/26 | 15525 | systems/win32/miktex/tm/packages/europecv.tar.lzma
2022/06/26 | 1551 | systems/win32/miktex/tm/packages/euro-ce__source.tar.lzma
+2022/06/26 | 154 | dviware/dvisirule/fonts.tex
2022/06/26 | 1544 | systems/texlive/tlnet/archive/multiple-choice.r63722.tar.xz
2022/06/26 | 1541554 | macros/latex/contrib/nicematrix/nicematrix.pdf
-2022/06/26 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/06/26 | 153 | macros/latex/contrib/familytree/doc-ja/figs/fig1Hidetada.tex
2022/06/26 | 15367 | systems/win32/miktex/tm/packages/beaulivre__source.tar.lzma
-2022/06/26 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/06/26 | 152029 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
2022/06/26 | 1514 | web/pwebmac/Xerrorlog.tex
2022/06/26 | 1502 | systems/win32/miktex/tm/packages/kotex-plain__source.tar.lzma
-2022/06/26 | 1501239 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
2022/06/26 | 14921 | systems/win32/miktex/tm/packages/hvextern__source.tar.lzma
+2022/06/26 | 14894 | dviware/dvisirule/dvisirule.dtx
2022/06/26 | 14879 | systems/win32/miktex/tm/packages/symbats3__source.tar.lzma
-2022/06/26 | 1481 | macros/generic/lt3luabridge/docstrip.cfg
2022/06/26 | 1480 | systems/texlive/tlnet/archive/cprotectinside.r63720.tar.xz
2022/06/26 | 146872 | systems/win32/miktex/tm/packages/nicematrix__source.tar.lzma
-2022/06/26 | 1468421 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/06/26 | 1468067 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/06/26 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
2022/06/26 | 145771 | systems/win32/miktex/tm/packages/bidi__source.tar.lzma
-2022/06/26 | 1454762 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/06/26 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/06/26 | 14410 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2022/06/26 | 1424 | systems/win32/miktex/tm/packages/eqexpl.tar.lzma
2022/06/26 | 14198 | systems/win32/miktex/tm/packages/denisbdoc__doc.tar.lzma
+2022/06/26 | 140 | macros/latex/contrib/familytree/figs/fig.tex
+2022/06/26 | 139 | dviware/dvisirule/dvisirule.ins
2022/06/26 | 139342 | systems/win32/miktex/tm/packages/ut-thesis__doc.tar.lzma
-2022/06/26 | 139103 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
2022/06/26 | 1387592 | systems/win32/miktex/tm/packages/simples-matrices__doc.tar.lzma
2022/06/26 | 13814 | systems/win32/miktex/tm/packages/simples-matrices__source.tar.lzma
2022/06/26 | 1377 | systems/win32/miktex/tm/packages/olsak-misc__doc.tar.lzma
2022/06/26 | 13616 | systems/win32/miktex/tm/packages/pbalance__source.tar.lzma
-2022/06/26 | 135948 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2022/06/26 | 1357070 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2022/06/26 | 135376 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/06/26 | 1352954 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2022/06/26 | 1352449 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/06/26 | 13514 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2022/06/26 | 1322743 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/06/26 | 131 | macros/generic/lt3luabridge/example.latex
2022/06/26 | 13168 | web/pwebmac/makeall
2022/06/26 | 131468 | systems/texlive/tlnet/archive/multiple-choice.doc.r63722.tar.xz
+2022/06/26 | 130 | dviware/dvisirule/reconf.sh
2022/06/26 | 130976 | systems/win32/miktex/tm/packages/multiple-choice__doc.tar.lzma
2022/06/26 | 13043 | systems/win32/miktex/tm/packages/latexbug__source.tar.lzma
-2022/06/26 | 1302485 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
2022/06/26 | 130109 | systems/win32/miktex/tm/packages/pdfmanagement-testphase__source.tar.lzma
2022/06/26 | 128499 | systems/win32/miktex/tm/packages/bidi.tar.lzma
-2022/06/26 | 126536 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
2022/06/26 | 12569 | systems/win32/miktex/tm/packages/functional.tar.lzma
2022/06/26 | 12512 | systems/win32/miktex/tm/packages/chess-problem-diagrams.tar.lzma
2022/06/26 | 124669 | systems/win32/miktex/tm/packages/latexindent__source.tar.lzma
2022/06/26 | 1245812 | systems/win32/miktex/tm/packages/siunitx__doc.tar.lzma
-2022/06/26 | 122 | macros/generic/lt3luabridge/t-lt3luabridge.tex
+2022/06/26 | 1231 | dviware/dvisirule/dvisirule-pgnum.awk
2022/06/26 | 12271 | systems/win32/miktex/tm/packages/fgruler__source.tar.lzma
2022/06/26 | 1224 | systems/texlive/tlnet/archive/reverxii.r63725.tar.xz
-2022/06/26 | 120616 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2022/06/26 | 120 | macros/latex/contrib/familytree/doc-ja/figs/fig1base.tex
2022/06/26 | 1204180 | systems/win32/miktex/tm/packages/letgut__doc.tar.lzma
2022/06/26 | 12024 | systems/texlive/tlnet/archive/fgruler.source.r63721.tar.xz
2022/06/26 | 12020 | systems/win32/miktex/tm/packages/lni.tar.lzma
2022/06/26 | 11915 | systems/win32/miktex/tm/packages/barracuda__doc.tar.lzma
+2022/06/26 | 1190 | macros/latex/contrib/familytree/samples/Asai/0Ichi.tex
2022/06/26 | 1182874 | systems/win32/miktex/tm/packages/gzt__doc.tar.lzma
-2022/06/26 | 1181127 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
2022/06/26 | 1178477 | systems/win32/miktex/tm/packages/arabtex__source.tar.lzma
2022/06/26 | 11770 | web/pwebmac/webman.ch
2022/06/26 | 116611 | systems/win32/miktex/tm/packages/siunitx__source.tar.lzma
-2022/06/26 | 115656 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/06/26 | 1156465 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/06/26 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/06/26 | 1162 | macros/latex/contrib/familytree/Makefile
2022/06/26 | 11533 | systems/win32/miktex/tm/packages/csvsimple.tar.lzma
-2022/06/26 | 114576 | systems/texlive/tlnet/archive/nicematrix.source.r63723.tar.xz
-2022/06/26 | 11449 | macros/generic/lt3luabridge.zip
2022/06/26 | 11444696 | systems/win32/miktex/tm/packages/l3kernel__doc.tar.lzma
-2022/06/26 | 113272 | systems/texlive/tlnet/archive/texlive-scripts.r63718.tar.xz
-2022/06/26 | 113052 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/06/26 | 112589 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/06/26 | 11383 | macros/latex/contrib/familytree/ft-marriage.dtx
+2022/06/26 | 112 | macros/latex/contrib/familytree/samples/Tokugawa/tg-15th.tex
+2022/06/26 | 112 | macros/latex/contrib/familytree/fonts.tex
2022/06/26 | 112561 | systems/win32/miktex/tm/packages/lshort-german__source.tar.lzma
+2022/06/26 | 11239 | macros/latex/contrib/familytree/ft-gens.dtx
2022/06/26 | 1115224 | systems/win32/miktex/tm/packages/hvextern__doc.tar.lzma
-2022/06/26 | 109479 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/06/26 | 10897 | macros/latex/contrib/familytree/doc-ja/ft-individual-ja.tex
2022/06/26 | 108457 | systems/win32/miktex/tm/packages/minimalist__doc.tar.lzma
-2022/06/26 | 10791 | macros/generic/lt3luabridge/lt3luabridge.tex
-2022/06/26 | 107705 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/06/26 | 107 | macros/latex/contrib/familytree/figs/fig1Robert2.tex
2022/06/26 | 106734 | systems/win32/miktex/tm/packages/colorist__doc.tar.lzma
2022/06/26 | 1062647 | systems/win32/miktex/tm/packages/latexindent__doc.tar.lzma
-2022/06/26 | 104556 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
2022/06/26 | 10363 | systems/win32/miktex/tm/packages/colorist.tar.lzma
-2022/06/26 | 103339 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/06/26 | 103093 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/06/26 | 1021846 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
2022/06/26 | 10065 | systems/win32/miktex/tm/packages/xkeyval.tar.lzma
-2022/06/26 | 100488 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2022/06/26 | 1002 | dviware/dvisirule/dvisirule-expg.mk
2022/06/26 | 10002 | systems/win32/miktex/tm/packages/minimalist.tar.lzma
2022/06/25 | 948564 | systems/texlive/tlnet/archive/tex4ht.r63716.tar.xz
-2022/06/25 | 836 | macros/latex/contrib/dvisirule/src/configure.ac
2022/06/25 | 809 | macros/latex/contrib/cprotectinside/README
2022/06/25 | 754 | macros/latex/contrib/multiple-choice/README
-2022/06/25 | 7383 | macros/latex/contrib/dvisirule/src/config/compile
-2022/06/25 | 7256 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/06/25 | 714548 | systems/texlive/tlnet/archive/latex.source.r63714.tar.xz
2022/06/25 | 7136 | systems/texlive/tlnet/archive/hvextern.r63711.tar.xz
-2022/06/25 | 70 | macros/latex/contrib/dvisirule/src/Makefile.am
-2022/06/25 | 6878 | macros/latex/contrib/dvisirule/src/config/missing
-2022/06/25 | 676 | macros/latex/contrib/dvisirule/demo.tex
-2022/06/25 | 60242 | macros/latex/contrib/dvisirule/dvisirule.pdf
-2022/06/25 | 5 | macros/latex/contrib/dvisirule/DEPENDS.txt
+2022/06/25 | 70 | dviware/dvisirule/src/Makefile.am
2022/06/25 | 5383 | fonts/symbats3/README.md
2022/06/25 | 52083 | fonts/symbats3/symbats3.sty
2022/06/25 | 4872752 | systems/texlive/tlnet/archive/tcolorbox.doc.r63713.tar.xz
2022/06/25 | 486281 | macros/latex/contrib/fgruler/fgruler.pdf
2022/06/25 | 485768 | macros/latex/contrib/fgruler.zip
2022/06/25 | 4697 | macros/latex/contrib/cprotectinside/cprotectinside.tex
-2022/06/25 | 465 | macros/latex/contrib/dvisirule/cmd.mk
2022/06/25 | 459588 | systems/texlive/tlnet/archive/lwarp.source.r63712.tar.xz
2022/06/25 | 41 | fonts/symbats3/VERSION
-2022/06/25 | 41888 | macros/latex/contrib/dvisirule/src/aclocal.m4
-2022/06/25 | 4133 | macros/latex/contrib/dvisirule/src/config.h
-2022/06/25 | 3850 | macros/latex/contrib/dvisirule/src/config.h.in
-2022/06/25 | 3622 | macros/latex/contrib/dvisirule/dvisirule.sh
2022/06/25 | 34999 | fonts/symbats3/codepoint.tex
2022/06/25 | 3065676 | systems/texlive/tlnet/archive/lwarp.doc.r63712.tar.xz
2022/06/25 | 30591560 | systems/texlive/tlnet/archive/latex.doc.r63714.tar.xz
@@ -559,41 +747,26 @@
2022/06/25 | 296928 | macros/latex/contrib/cprotectinside/cprotectinside.pdf
2022/06/25 | 27849 | fonts/symbats3/unicodename.tex
2022/06/25 | 27849 | fonts/symbats3/latexname.tex
-2022/06/25 | 2683 | macros/latex/contrib/dvisirule/src/dvi.h
-2022/06/25 | 2570 | macros/latex/contrib/dvisirule/README.md
+2022/06/25 | 2683 | dviware/dvisirule/src/dvi.h
2022/06/25 | 2566 | macros/latex/contrib/cprotectinside/cprotectinside.sty
2022/06/25 | 2561 | macros/latex/contrib/multiple-choice/doc/multiple-choice-doc.tex
-2022/06/25 | 24525 | macros/latex/contrib/dvisirule/src/Makefile.in
-2022/06/25 | 24408 | macros/latex/contrib/dvisirule/src/Makefile
2022/06/25 | 23894646 | biblio/biber/binaries/Windows/biber-MSWIN32.zip
-2022/06/25 | 23568 | macros/latex/contrib/dvisirule/src/config/depcomp
2022/06/25 | 23543476 | systems/texlive/tlnet/archive/biber.x86_64-linux.r63715.tar.xz
2022/06/25 | 232420 | systems/texlive/tlnet/archive/tcolorbox.r63713.tar.xz
-2022/06/25 | 2293 | macros/latex/contrib/dvisirule/Makefile
2022/06/25 | 227468 | systems/texlive/tlnet/archive/latex.r63714.tar.xz
-2022/06/25 | 2155 | macros/latex/contrib/dvisirule/dvisirule-marker.awk
2022/06/25 | 213224 | systems/texlive/tlnet/archive/lwarp.r63712.tar.xz
2022/06/25 | 208194 | fonts/symbats3.zip
2022/06/25 | 20758 | support/TeX4ht/source/tex4ht-jats.tex
2022/06/25 | 196317 | support/TeX4ht/source/ChangeLog
-2022/06/25 | 182744 | macros/latex/contrib/dvisirule/src/configure
-2022/06/25 | 18092 | macros/latex/contrib/dvisirule/LICENSE
2022/06/25 | 177339 | fonts/symbats3/symbats3.pdf
-2022/06/25 | 154 | macros/latex/contrib/dvisirule/fonts.tex
-2022/06/25 | 15368 | macros/latex/contrib/dvisirule/src/config/install-sh
-2022/06/25 | 14916 | macros/latex/contrib/dvisirule/dvisirule.dtx
2022/06/25 | 14013 | fonts/symbats3/symbats3.tex
-2022/06/25 | 139 | macros/latex/contrib/dvisirule/dvisirule.ins
2022/06/25 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r63716.tar.xz
2022/06/25 | 132611 | macros/latex/contrib/multiple-choice/doc/multiple-choice-doc.pdf
2022/06/25 | 132225 | macros/latex/contrib/multiple-choice.zip
-2022/06/25 | 130 | macros/latex/contrib/dvisirule/reconf.sh
2022/06/25 | 1259968 | systems/texlive/tlnet/archive/tex4ht.source.r63716.tar.xz
-2022/06/25 | 1231 | macros/latex/contrib/dvisirule/dvisirule-pgnum.awk
2022/06/25 | 1125232 | systems/texlive/tlnet/archive/hvextern.doc.r63711.tar.xz
2022/06/25 | 111 | fonts/symbats3/MANIFEST
-2022/06/25 | 10277 | macros/latex/contrib/dvisirule/src/dvisirule-bin.c
-2022/06/25 | 1002 | macros/latex/contrib/dvisirule/dvisirule-expg.mk
+2022/06/25 | 10277 | dviware/dvisirule/src/dvisirule-bin.c
2022/06/25 | 100113 | macros/latex/contrib/fgruler/fgruler.dtx
2022/06/24 | 99 | macros/latex/base/ltpara-code.tex
2022/06/24 | 9926 | macros/latex/base/ltnews21.tex
@@ -1693,57 +1866,3 @@
2022/06/21 | 1030 | macros/latex/contrib/hvextern/script/hvextern-checkfile.lua
2022/06/21 | 102215 | macros/latex/contrib/csvsimple/csvsimple-l3.tex
2022/06/21 | 1020 | language/korean/kotex-utf/tex/contrib/dhucs-ucshyper.sty
-2022/06/20 | 908 | macros/latex/contrib/hyperref/doc/hyperref-doc2.html
-2022/06/20 | 899385 | info/yet-another-guide-latex2e.zip
-2022/06/20 | 892678 | info/yet-another-guide-latex2e/Yet-Another-Guide-LaTeX2e_v1.pdf
-2022/06/20 | 878564 | macros/latex/contrib/hyperref/hyperref.dtx
-2022/06/20 | 858 | macros/latex/contrib/hyperref/doc/hyperref-doc5.html
-2022/06/20 | 8082 | support/TeX4ht/source/mktex4ht-cnf.tex
-2022/06/20 | 771 | macros/latex/contrib/hyperref/doc/hyperref-doc3.html
-2022/06/20 | 768 | macros/latex/contrib/hyperref/doc/hyperref-doc8.html
-2022/06/20 | 768 | macros/latex/contrib/hyperref/doc/hyperref-doc7.html
-2022/06/20 | 768 | macros/latex/contrib/hyperref/doc/hyperref-doc6.html
-2022/06/20 | 7543 | macros/latex/contrib/hyperref/hyperref-patches.dtx
-2022/06/20 | 727 | macros/latex/contrib/hvextern/lualatex/hvextern.lua
-2022/06/20 | 7144 | graphics/pgf/contrib/jigsaw/jigsaw-doc.tex
-2022/06/20 | 5736 | macros/latex/contrib/hyperref/xr-hyper.sty
-2022/06/20 | 517192 | macros/latex/contrib/hyperref/doc/hyperref-doc.html
-2022/06/20 | 5086 | macros/latex/contrib/hyperref/hyperref.ins
-2022/06/20 | 50187 | macros/latex/contrib/hyperref/hluatex.dtx
-2022/06/20 | 473 | graphics/pgf/contrib/jigsaw/README.md
-2022/06/20 | 4688 | systems/texlive/tlnet/archive/magicwatermark.source.r63656.tar.xz
-2022/06/20 | 4480542 | install/macros/latex/contrib/hyperref.tds.zip
-2022/06/20 | 4479 | macros/latex/contrib/hyperref/README.md
-2022/06/20 | 4299617 | macros/latex/contrib/hyperref.zip
-2022/06/20 | 404106 | macros/latex/contrib/hyperref/doc/hyperref-linktarget.pdf
-2022/06/20 | 384001 | macros/latex/contrib/hyperref/doc/slides.pdf
-2022/06/20 | 318190 | macros/latex/contrib/hyperref/doc/hyperref-doc.pdf
-2022/06/20 | 31788 | systems/texlive/tlnet/archive/jadetex.doc.r63654.tar.xz
-2022/06/20 | 3161 | macros/latex/contrib/hyperref/bmhydoc.sty
-2022/06/20 | 29924 | systems/texlive/tlnet/archive/jadetex.r63654.tar.xz
-2022/06/20 | 2869 | graphics/pgf/contrib/jigsaw/jigsaw.sty
-2022/06/20 | 28408 | macros/latex/contrib/hyperref/backref.dtx
-2022/06/20 | 279 | macros/latex/contrib/hyperref/ntheorem-hyper.sty
-2022/06/20 | 275 | macros/latex/contrib/hyperref/minitoc-hyper.sty
-2022/06/20 | 27164 | macros/latex/contrib/hyperref/nameref.dtx
-2022/06/20 | 266868 | macros/luatex/latex/beamer-rl.zip
-2022/06/20 | 247116 | macros/latex/contrib/hyperref/paperslides99.zip
-2022/06/20 | 2380 | systems/texlive/tlnet/archive/magicwatermark.r63656.tar.xz
-2022/06/20 | 2368225 | macros/latex/contrib/hyperref/doc/hyperref.pdf
-2022/06/20 | 217856 | systems/texlive/tlnet/archive/magicwatermark.doc.r63656.tar.xz
-2022/06/20 | 206288 | macros/latex/contrib/hyperref/doc/backref.pdf
-2022/06/20 | 19455 | macros/latex/contrib/hyperref/hyperref-linktarget.dtx
-2022/06/20 | 19312 | systems/texlive/tlnet/archive/jadetex.source.r63654.tar.xz
-2022/06/20 | 1929 | macros/latex/contrib/hyperref/manifest.txt
-2022/06/20 | 180063 | macros/latex/contrib/hyperref/doc/nameref.pdf
-2022/06/20 | 1702027 | macros/latex/contrib/simples-matrices.zip
-2022/06/20 | 167851 | graphics/pgf/contrib/jigsaw/jigsaw-doc.pdf
-2022/06/20 | 165612 | macros/latex/contrib/hyperref/doc/hyperref-doc.tex
-2022/06/20 | 165481 | graphics/pgf/contrib/jigsaw.zip
-2022/06/20 | 15322 | macros/latex/contrib/hyperref/doc/hyperref-doc.css
-2022/06/20 | 140748 | info/yet-another-guide-latex2e/Yet-Another-Guide-LaTeX2e_v1.tex
-2022/06/20 | 132446 | macros/latex/contrib/hyperref/doc/paper.pdf
-2022/06/20 | 1317750 | support/TeX4ht/source/tex4ht-fonts-cjk-utf8.tex
-2022/06/20 | 121484 | macros/latex/contrib/hyperref/ChangeLog.txt
-2022/06/20 | 1029 | info/yet-another-guide-latex2e/README
-2022/06/20 | 1006 | macros/latex/contrib/hyperref/doc/hyperref-doc4.html
diff --git a/macros/latex/contrib/dvisirule/DEPENDS.txt b/dviware/dvisirule/DEPENDS.txt
index c6fb1df540..c6fb1df540 100644
--- a/macros/latex/contrib/dvisirule/DEPENDS.txt
+++ b/dviware/dvisirule/DEPENDS.txt
diff --git a/macros/latex/contrib/dvisirule/LICENSE b/dviware/dvisirule/LICENSE
index d159169d10..d159169d10 100644
--- a/macros/latex/contrib/dvisirule/LICENSE
+++ b/dviware/dvisirule/LICENSE
diff --git a/macros/latex/contrib/dvisirule/Makefile b/dviware/dvisirule/Makefile
index 484b2c412e..484b2c412e 100644
--- a/macros/latex/contrib/dvisirule/Makefile
+++ b/dviware/dvisirule/Makefile
diff --git a/macros/latex/contrib/dvisirule/README.md b/dviware/dvisirule/README.md
index de818479e3..de818479e3 100644
--- a/macros/latex/contrib/dvisirule/README.md
+++ b/dviware/dvisirule/README.md
diff --git a/macros/latex/contrib/dvisirule/cmd.mk b/dviware/dvisirule/cmd.mk
index 6624f661cb..6624f661cb 100644
--- a/macros/latex/contrib/dvisirule/cmd.mk
+++ b/dviware/dvisirule/cmd.mk
diff --git a/macros/latex/contrib/dvisirule/demo.tex b/dviware/dvisirule/demo.tex
index a0e21cd7dd..a0e21cd7dd 100644
--- a/macros/latex/contrib/dvisirule/demo.tex
+++ b/dviware/dvisirule/demo.tex
diff --git a/macros/latex/contrib/dvisirule/dvisirule-expg.mk b/dviware/dvisirule/dvisirule-expg.mk
index e46d2c578f..e46d2c578f 100644
--- a/macros/latex/contrib/dvisirule/dvisirule-expg.mk
+++ b/dviware/dvisirule/dvisirule-expg.mk
diff --git a/macros/latex/contrib/dvisirule/dvisirule-marker.awk b/dviware/dvisirule/dvisirule-marker.awk
index a759fd3b4e..a759fd3b4e 100644
--- a/macros/latex/contrib/dvisirule/dvisirule-marker.awk
+++ b/dviware/dvisirule/dvisirule-marker.awk
diff --git a/macros/latex/contrib/dvisirule/dvisirule-pgnum.awk b/dviware/dvisirule/dvisirule-pgnum.awk
index 2e0e2ea2c0..2e0e2ea2c0 100644
--- a/macros/latex/contrib/dvisirule/dvisirule-pgnum.awk
+++ b/dviware/dvisirule/dvisirule-pgnum.awk
diff --git a/macros/latex/contrib/dvisirule/dvisirule.dtx b/dviware/dvisirule/dvisirule.dtx
index f65444d471..e1bf1f155b 100644
--- a/macros/latex/contrib/dvisirule/dvisirule.dtx
+++ b/dviware/dvisirule/dvisirule.dtx
@@ -16,7 +16,7 @@
%
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{dvisirule}%
-%<package>[2022/07/07 v0.1 dvisirule]
+%<package>[2022/06/27 v1.1 dvisirule]
%
%<*driver>
\documentclass[draft]{ltxdoc}
@@ -34,7 +34,6 @@
belowskip=\medskipamount}
\usepackage{multicol}
\usepackage{needspace}
-\usepackage{setspace}
%
% hyperref should come last
\usepackage[dvipdfmx,final,pdfusetitle]{hyperref}
diff --git a/macros/latex/contrib/dvisirule/dvisirule.ins b/dviware/dvisirule/dvisirule.ins
index 227b2178fc..227b2178fc 100644
--- a/macros/latex/contrib/dvisirule/dvisirule.ins
+++ b/dviware/dvisirule/dvisirule.ins
diff --git a/dviware/dvisirule/dvisirule.pdf b/dviware/dvisirule/dvisirule.pdf
new file mode 100644
index 0000000000..93103e28f9
--- /dev/null
+++ b/dviware/dvisirule/dvisirule.pdf
Binary files differ
diff --git a/macros/latex/contrib/dvisirule/dvisirule.sh b/dviware/dvisirule/dvisirule.sh
index 20969abf8f..20969abf8f 100644
--- a/macros/latex/contrib/dvisirule/dvisirule.sh
+++ b/dviware/dvisirule/dvisirule.sh
diff --git a/macros/latex/contrib/dvisirule/fonts.tex b/dviware/dvisirule/fonts.tex
index 6a93077f6c..6a93077f6c 100644
--- a/macros/latex/contrib/dvisirule/fonts.tex
+++ b/dviware/dvisirule/fonts.tex
diff --git a/macros/latex/contrib/dvisirule/reconf.sh b/dviware/dvisirule/reconf.sh
index bea0fa8b81..bea0fa8b81 100644
--- a/macros/latex/contrib/dvisirule/reconf.sh
+++ b/dviware/dvisirule/reconf.sh
diff --git a/macros/latex/contrib/dvisirule/src/Makefile b/dviware/dvisirule/src/Makefile
index b9251fbea3..4ea6cd6283 100644
--- a/macros/latex/contrib/dvisirule/src/Makefile
+++ b/dviware/dvisirule/src/Makefile
@@ -220,15 +220,15 @@ OBJEXT = o
PACKAGE = dvisirule
PACKAGE_BUGREPORT = jiro1010senju@gmail.com
PACKAGE_NAME = dvisirule
-PACKAGE_STRING = dvisirule v0.1
+PACKAGE_STRING = dvisirule v1.1
PACKAGE_TARNAME = dvisirule
PACKAGE_URL =
-PACKAGE_VERSION = v0.1
+PACKAGE_VERSION = v1.1
PATH_SEPARATOR = :
SET_MAKE =
SHELL = /bin/bash
STRIP =
-VERSION = v0.1
+VERSION = v1.1
abs_builddir = /proj/book/dvisirule.git/src
abs_srcdir = /proj/book/dvisirule.git/src
abs_top_builddir = /proj/book/dvisirule.git/src
diff --git a/macros/latex/contrib/dvisirule/src/Makefile.am b/dviware/dvisirule/src/Makefile.am
index b3fec218b9..b3fec218b9 100644
--- a/macros/latex/contrib/dvisirule/src/Makefile.am
+++ b/dviware/dvisirule/src/Makefile.am
diff --git a/macros/latex/contrib/dvisirule/src/Makefile.in b/dviware/dvisirule/src/Makefile.in
index 784dab3930..784dab3930 100644
--- a/macros/latex/contrib/dvisirule/src/Makefile.in
+++ b/dviware/dvisirule/src/Makefile.in
diff --git a/macros/latex/contrib/dvisirule/src/aclocal.m4 b/dviware/dvisirule/src/aclocal.m4
index 8c6b78f9d2..8c6b78f9d2 100644
--- a/macros/latex/contrib/dvisirule/src/aclocal.m4
+++ b/dviware/dvisirule/src/aclocal.m4
diff --git a/macros/latex/contrib/dvisirule/src/config.h b/dviware/dvisirule/src/config.h
index a5e54439ff..8d1527108b 100644
--- a/macros/latex/contrib/dvisirule/src/config.h
+++ b/dviware/dvisirule/src/config.h
@@ -76,7 +76,7 @@
#define PACKAGE_NAME "dvisirule"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "dvisirule v0.1"
+#define PACKAGE_STRING "dvisirule v1.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "dvisirule"
@@ -85,13 +85,13 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "v0.1"
+#define PACKAGE_VERSION "v1.1"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "v0.1"
+#define VERSION "v1.1"
/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
<pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
diff --git a/macros/latex/contrib/dvisirule/src/config.h.in b/dviware/dvisirule/src/config.h.in
index 574cc2f893..574cc2f893 100644
--- a/macros/latex/contrib/dvisirule/src/config.h.in
+++ b/dviware/dvisirule/src/config.h.in
diff --git a/macros/latex/contrib/dvisirule/src/config/compile b/dviware/dvisirule/src/config/compile
index 99e50524b3..99e50524b3 100755
--- a/macros/latex/contrib/dvisirule/src/config/compile
+++ b/dviware/dvisirule/src/config/compile
diff --git a/macros/latex/contrib/dvisirule/src/config/depcomp b/dviware/dvisirule/src/config/depcomp
index 65cbf7093a..65cbf7093a 100755
--- a/macros/latex/contrib/dvisirule/src/config/depcomp
+++ b/dviware/dvisirule/src/config/depcomp
diff --git a/macros/latex/contrib/dvisirule/src/config/install-sh b/dviware/dvisirule/src/config/install-sh
index 8175c640fe..8175c640fe 100755
--- a/macros/latex/contrib/dvisirule/src/config/install-sh
+++ b/dviware/dvisirule/src/config/install-sh
diff --git a/macros/latex/contrib/dvisirule/src/config/missing b/dviware/dvisirule/src/config/missing
index 625aeb1189..625aeb1189 100755
--- a/macros/latex/contrib/dvisirule/src/config/missing
+++ b/dviware/dvisirule/src/config/missing
diff --git a/macros/latex/contrib/dvisirule/src/configure b/dviware/dvisirule/src/configure
index ea4c790fbd..f0c2e8452d 100755
--- a/macros/latex/contrib/dvisirule/src/configure
+++ b/dviware/dvisirule/src/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dvisirule v0.1.
+# Generated by GNU Autoconf 2.69 for dvisirule v1.1.
#
# Report bugs to <jiro1010senju@gmail.com>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='dvisirule'
PACKAGE_TARNAME='dvisirule'
-PACKAGE_VERSION='v0.1'
-PACKAGE_STRING='dvisirule v0.1'
+PACKAGE_VERSION='v1.1'
+PACKAGE_STRING='dvisirule v1.1'
PACKAGE_BUGREPORT='jiro1010senju@gmail.com'
PACKAGE_URL=''
@@ -1278,7 +1278,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures dvisirule v0.1 to adapt to many kinds of systems.
+\`configure' configures dvisirule v1.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1345,7 +1345,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dvisirule v0.1:";;
+ short | recursive ) echo "Configuration of dvisirule v1.1:";;
esac
cat <<\_ACEOF
@@ -1436,7 +1436,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dvisirule configure v0.1
+dvisirule configure v1.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1913,7 +1913,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dvisirule $as_me v0.1, which was
+It was created by dvisirule $as_me v1.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2782,7 +2782,7 @@ fi
# Define the identity of the package.
PACKAGE='dvisirule'
- VERSION='v0.1'
+ VERSION='v1.1'
cat >>confdefs.h <<_ACEOF
@@ -5320,7 +5320,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by dvisirule $as_me v0.1, which was
+This file was extended by dvisirule $as_me v1.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5386,7 +5386,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-dvisirule config.status v0.1
+dvisirule config.status v1.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/macros/latex/contrib/dvisirule/src/configure.ac b/dviware/dvisirule/src/configure.ac
index 13ad03afec..8e61229304 100644
--- a/macros/latex/contrib/dvisirule/src/configure.ac
+++ b/dviware/dvisirule/src/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT(dvisirule, v0.1, jiro1010senju@gmail.com)
+AC_INIT(dvisirule, v1.1, jiro1010senju@gmail.com)
AC_CONFIG_SRCDIR([dvisirule-bin.c])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(config)
diff --git a/macros/latex/contrib/dvisirule/src/dvi.h b/dviware/dvisirule/src/dvi.h
index e0ce15ad21..e0ce15ad21 100644
--- a/macros/latex/contrib/dvisirule/src/dvi.h
+++ b/dviware/dvisirule/src/dvi.h
diff --git a/macros/latex/contrib/dvisirule/src/dvisirule-bin.c b/dviware/dvisirule/src/dvisirule-bin.c
index d5c06d419d..d5c06d419d 100644
--- a/macros/latex/contrib/dvisirule/src/dvisirule-bin.c
+++ b/dviware/dvisirule/src/dvisirule-bin.c
diff --git a/macros/generic/lt3luabridge/README.md b/macros/generic/lt3luabridge/README.md
index 5c4a3f50c3..a9257f4e09 100644
--- a/macros/generic/lt3luabridge/README.md
+++ b/macros/generic/lt3luabridge/README.md
@@ -9,7 +9,7 @@ the shell:
``` tex
\documentclass{standalone}
-\usepackage{l3luabridge}
+\usepackage{lt3luabridge}
\begin{document}
$ 1 + 2 = \luabridgeExecute{ print(1 + 2) } $
\end{document}
diff --git a/macros/generic/lt3luabridge/docstrip.cfg b/macros/generic/lt3luabridge/docstrip.cfg
index 06c65a3c2a..4e131f1849 100644
--- a/macros/generic/lt3luabridge/docstrip.cfg
+++ b/macros/generic/lt3luabridge/docstrip.cfg
@@ -3,15 +3,12 @@
Copyright (C) 2016-2022 Vít Novotný
This work may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either version 1.3
+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.3 or later is part of all distributions of LaTeX
-version 2005/12/01 or later.
-
This work has the LPPL maintenance status `maintained'.
The Current Maintainer of this work is Vít Novotný.
diff --git a/macros/generic/lt3luabridge/lt3luabridge.dtx b/macros/generic/lt3luabridge/lt3luabridge.dtx
new file mode 100644
index 0000000000..71db99dce5
--- /dev/null
+++ b/macros/generic/lt3luabridge/lt3luabridge.dtx
@@ -0,0 +1,681 @@
+% \iffalse
+%<*driver>
+\documentclass[full]{l3doc}
+\usepackage{hologo}
+\begin{filecontents}[overwrite,nosearch,noheader]{\jobname.bib}
+
+@online{expl3,
+ title = {expl3},
+ subtitle = {Wrapper package for experimental \LaTeX3},
+ author = {{The \LaTeX{} Team}},
+ publisher = {{CTAN}},
+ date = {2022-06-16},
+ urldate = {2022-06-26},
+ url = {https://ctan.org/pkg/expl3},
+}
+
+@online{markdown,
+ title = {Markdown},
+ subtitle = {A package for converting and rendering markdown documents inside \TeX},
+ author = {Vít Novotný},
+ publisher = {{CTAN}},
+ date = {2022-05-31},
+ urldate = {2022-06-26},
+ url = {https://ctan.org/pkg/markdown},
+ note = {Version 2.15.2-0-gb238dbc},
+}
+
+\end{filecontents}
+\usepackage{biblatex}
+\addbibresource{\jobname.bib}
+\begin{document}
+ \DocInput{\jobname.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \title{^^A
+% The \textsf{lt3luabridge} package: \Lua{} without \Lua\TeX^^A
+% }
+%
+% \author{^^A
+% Vít Novotný\thanks
+% {^^A
+% E-mail:
+% \href{mailto:witiko@mail.muni.cz}
+% {witiko@mail.muni.cz}^^A
+% }^^A
+% }
+%
+% \date{Released 2022-06-26}
+%
+% \maketitle
+%
+% \begin{documentation}
+%
+% The \pkg{lt3luabridge} expl3~\cite{expl3} package provides support for
+% executing \Lua{} code in \Lua\TeX{} or any other \TeX{} engine that exposes
+% the shell. The package provides interfaces to plain \TeX, \LaTeX, and
+% \Hologo{ConTeXt}
+% formats:
+% \begin{verbatim}
+% \documentclass{standalone}
+% \usepackage{lt3luabridge}
+% \begin{document}
+% $ 1 + 2 = \luabridgeExecute{ print(1 + 2) } $
+% \end{document}
+% \end{verbatim}
+% The package was previously part of the Markdown package~\cite{markdown},
+% where it has been battle-tested since 2016. Since 2022, lt3luabridge has
+% also been available as a separate package.
+%
+% \section{Loading the package}
+%
+% Use the |\input lt3luabridge\relax| command to load the package from plain \TeX,
+% use the |\usepackage{lt3luabridge}| command to load the package from \LaTeX, and
+% use the |\usemodule[t][lt3luabridge]| command to load the package from \Hologo{ConTeXt}.
+%
+% \section{Executing \Lua{} code}
+%
+% The interface for executing \Lua{} code mimics the \cs{lua_now:n} function
+% from \pkg{l3luatex}.
+%
+% \begin{function}[added = 2022-06-26]{\luabridge_now:n, \luabridge_now:e}
+% \begin{syntax}
+% \cs{luabridge_now:n} \Arg{token list}
+% \end{syntax}
+% The \meta{token list} is first tokenized by \TeX{}, which includes
+% converting line ends to spaces in the usual \TeX{} manner and which
+% respects currently-applicable \TeX{} category codes. The resulting
+% \meta{\Lua{} input} is passed to the \Lua{} interpreter for processing.
+% Each \cs{luabridge_now:n} block is treated by \Lua{} as a separate chunk.
+% The \Lua{} interpreter executes the \meta{\Lua{} input} immediately,
+% and in an expandable manner.
+%
+% Unlike \cs{lua_now:n}, \cs{luabridge_now:n} may execute \meta{\Lua{} input}
+% in a separate process from \TeX. Therefore, you should not interact with
+% \TeX{} from \meta{\Lua{} input}. The only exception is the standard output
+% produced by \meta{\Lua{} input} using for example the |print()| \Lua{}
+% function like in the example at the top of this page. The standard output
+% will be inserted into \TeX's input stream after \meta{\Lua{} input} has
+% been processed at the latest.
+% \end{function}
+%
+% \begin{function}[added = 2022-06-26]{\luabridgeExecute}
+% \begin{syntax}
+% \cs{luabridgeExecute} \Arg{token list}
+% \end{syntax}
+% The \cs{luabridgeExecute} document command aliases
+% the \cs{luabridge_now:e} function.
+% \end{function}
+%
+% \section{Setting and getting the method to execute \Lua{} code}
+%
+% There are several methods that can be used to execute \Lua{} code. This
+% section describes the interface that the package provides to set the
+% preferred method or to determine which method was used.
+%
+% \begin{variable}[added = 2022-06-26]{\g_luabridge_method_int}
+% This variable controls the method used to execute \Lua{} code.
+% The variable is set automatically when the package is loaded
+% and changing the value of the variable afterwards has no effect.
+% However, we can set the value of the variable before loading the
+% package to one of the constants described below.
+% \end{variable}
+%
+% \begin{variable}[added = 2022-06-26]{\c_luabridge_method_write_eighteen_int}
+% Use shell escape through the \cs{write18} \TeX{} command to execute \Lua{} code.
+% \end{variable}
+%
+% \begin{variable}[added = 2022-06-26]{\c_luabridge_method_os_execute_int}
+% Use shell escape through the |os.execute()| Lua function to execute \Lua{} code.
+% \end{variable}
+%
+% \begin{variable}[added = 2022-06-26]{\c_luabridge_method_directlua_int}
+% Use the \cs{directlua} primitive of Lua\TeX{} to execute \Lua{} code.
+% \end{variable}
+%
+% \section{Setting and getting the filenames of helper files}
+%
+% When shell escape is used to execute \Lua{} code, several helper files are
+% needed to shuffle around code and output. The following variables and
+% constants are undefined when the \cs{directlua} primitive of Lua\TeX{} is
+% used to execute \Lua{} code.
+%
+% \begin{variable}[added = 2022-06-26]{\g_luabridge_output_dirname_str}
+% This variable controls the output directory that will store the helper
+% files. The variable should be set to the same value as the
+% \texttt{-output-directory} parameter of the \TeX{} engine.
+% \end{variable}
+%
+% \begin{variable}[added = 2022-06-26]{\c_luabridge_default_output_dirname_str}
+% This constant is the default value of \cs{g_luabridge_output_dirname_str}.
+% \end{variable}
+%
+% \begin{variable}[added = 2022-06-26]{\g_luabridge_helper_script_filename_str}
+% This variable controls the filename of a helper \Lua{} script that will be
+% executed from the shell using the \TeX{} \Lua{} interpreter.
+% \end{variable}
+%
+% \begin{variable}[added = 2022-06-26]{\c_luabridge_default_helper_script_filename_str}
+% This constant is the default value of
+% \cs{g_luabridge_helper_script_filename_str}.
+% \end{variable}
+%
+% \begin{variable}[added = 2022-06-26]{\g_luabridge_standard_output_filename_str}
+% This variable controls the filename of a helper file that will contain the
+% standard output produced by the |texlua| interpreter (if any).
+% \end{variable}
+%
+% \begin{variable}[added = 2022-06-26]{\c_luabridge_default_standard_output_filename_str}
+% This constant is the default value of
+% \cs{g_luabridge_standard_output_filename_str}.
+% \end{variable}
+%
+% \begin{variable}[added = 2022-06-26]{\g_luabridge_error_output_filename_str}
+% This variable controls the filename of a helper file that will contain the
+% error output produced by the |texlua| interpreter (if any).
+% \end{variable}
+%
+% \begin{variable}[added = 2022-06-26]{\c_luabridge_default_error_output_filename_str}
+% This constant is the default value of
+% \cs{g_luabridge_error_output_filename_str}.
+% \end{variable}
+%
+% \end{documentation}
+%
+% \begin{implementation}
+%
+% \section{Plain \TeX{} implementation}
+%
+% This section contains the implementation for plain \TeX{} using generic expl3.
+%
+% \begin{macrocode}
+%<@@=luabridge>
+%<*generic-package>
+\ifx\ExplSyntaxOn\undefined
+ \input expl3-generic\relax
+\fi
+\ExplSyntaxOn
+\int_const:Nn
+ \c_luabridge_method_write_eighteen_int
+ { 0 }
+\int_const:Nn
+ \c_luabridge_method_os_execute_int
+ { 1 }
+\int_const:Nn
+ \c_luabridge_method_directlua_int
+ { 2 }
+\int_if_exist:NF
+ \g_luabridge_method_int
+ {
+ \int_new:N
+ \g_luabridge_method_int
+ \sys_if_engine_luatex:TF
+ {
+ \int_gset_eq:NN
+ \g_luabridge_method_int
+ \c_luabridge_method_directlua_int
+ }
+ {
+ \int_gset_eq:NN
+ \g_luabridge_method_int
+ \c_luabridge_method_write_eighteen_int
+ }
+ }
+\msg_new:nnn
+ { luabridge }
+ { unknown-method }
+ {
+ Unknown~bridging~method:~#1
+ }
+\msg_new:nnn
+ { luabridge }
+ { method-write-eighteen }
+ {
+ Using~shell~escape~via~write18~as~the~bridging~method
+ }
+\msg_new:nnn
+ { luabridge }
+ { method-os-execute }
+ {
+ Using~shell~escape~via~os.execute()~as~the~bridging~method
+ }
+\msg_new:nnn
+ { luabridge }
+ { method-directlua }
+ {
+ Using~direct~Lua~access~as~the~bridging~method
+ }
+\int_case:nnF
+ { \g_luabridge_method_int }
+ {
+ { \c_luabridge_method_write_eighteen_int }
+ {
+ \msg_info:nn
+ { luabridge }
+ { method-write-eighteen }
+ }
+ { \c_luabridge_method_os_execute_int }
+ {
+ \msg_info:nn
+ { luabridge }
+ { method-os-execute }
+ }
+ { \c_luabridge_method_directlua_int }
+ {
+ \msg_info:nn
+ { luabridge }
+ { method-directlua }
+ }
+ }
+ {
+ \cs_generate_variant:Nn
+ \msg_error:nnn
+ { nnV }
+ \msg_error:nnV
+ { luabridge }
+ { unknown-method }
+ \g_luabridge_method_int
+ }
+\bool_if:nTF
+ {
+ \int_compare_p:nNn
+ { \g_luabridge_method_int }
+ =
+ { \c_luabridge_method_write_eighteen_int } ||
+ \int_compare_p:nNn
+ { \g_luabridge_method_int }
+ =
+ { \c_luabridge_method_os_execute_int }
+ }
+ {
+ \int_const:Nn
+ \c_@@_level_disabled_int
+ { 0 }
+ \int_const:Nn
+ \c_@@_level_enabled_int
+ { 1 }
+ \int_const:Nn
+ \c_@@_level_restricted_int
+ { 2 }
+ \int_new:N
+ \l_@@_level_int
+ \cs_if_exist:NTF
+ \pdfshellescape
+ {
+ \int_gset:Nn
+ \l_@@_level_int
+ { \pdfshellescape }
+ }
+ {
+ \cs_if_exist:NTF
+ \shellescape
+ {
+ \int_gset:Nn
+ \l_@@_level_int
+ { \shellescape }
+ }
+ {
+ \int_case:nnF
+ { \g_luabridge_method_int }
+ {
+ { \c_luabridge_method_write_eighteen_int }
+ {
+ \int_gset_eq:NN
+ \l_@@_level_int
+ \c_@@_level_enabled_int
+ }
+ }
+ {
+ \int_gset:Nn
+ \l_@@_level_int
+ {
+ \lua_now:n
+ {
+ tex.sprint(status.shell_escape or "1")
+ }
+ }
+ }
+ }
+ }
+ \msg_new:nnn
+ { luabridge }
+ { unknown-level }
+ {
+ Unknown~shell~escape~level:~#1
+ }
+ \msg_new:nnnn
+ { luabridge }
+ { level-disabled }
+ {
+ Shell~escape~seems~to~be~disabled
+ }
+ {
+ You~may~need~to~run~TeX~with~the~--shell-escape~or~the~
+ --enable-write18~flag,~or~write~shell_escape=t~in~the~
+ texmf.cnf~file.
+ }
+ \msg_new:nnn
+ { luabridge }
+ { level-enabled }
+ {
+ Shell~escape~seems~to~be~enabled
+ }
+ \msg_new:nnnn
+ { luabridge }
+ { level-restricted }
+ {
+ Shell~escape~seems~to~be~restricted
+ }
+ {
+ You~may~need~to~run~TeX~with~the~--shell-escape~or~the~
+ --enable-write18~flag,~or~write~shell_escape=t~in~the~
+ texmf.cnf~file.
+ }
+ \str_const:Nn
+ \c_luabridge_default_output_dirname_str
+ { . }
+ \str_const:Nx
+ \c_luabridge_default_helper_script_filename_str
+ { \jobname.luabridge.lua }
+ \str_const:Nx
+ \c_luabridge_default_error_output_filename_str
+ { \jobname.luabridge.err }
+ \str_const:Nx
+ \c_luabridge_default_standard_output_filename_str
+ { \jobname.luabridge.out }
+ \int_case:nnF
+ { \l_@@_level_int }
+ {
+ { \c_@@_level_disabled_int }
+ {
+ \msg_warning:nn
+ { luabridge }
+ { level-disabled }
+ }
+ { \c_@@_level_enabled_int }
+ {
+ \msg_info:nn
+ { luabridge }
+ { level-enabled }
+ }
+ { \c_@@_level_restricted_int }
+ {
+ \msg_warning:nn
+ { luabridge }
+ { level-restricted }
+ }
+ }
+ {
+ \msg_error:nnx
+ { luabridge }
+ { unknown-level }
+ { \l_@@_level_int }
+ }
+ \cs_new:Nn
+ \_luabridge_assert_shell_escape:
+ {
+ \int_case:nnF
+ { \l_@@_level_int }
+ {
+ { \c_@@_level_disabled_int }
+ {
+ \msg_error:nn
+ { luabridge }
+ { level-disabled }
+ }
+ }
+ }
+ \int_case:nn
+ { \g_luabridge_method_int }
+ {
+ { \c_luabridge_method_write_eighteen_int }
+ {
+ \cs_new:Nn
+ \_luabridge_execute_shell:n
+ {
+ \_luabridge_assert_shell_escape:
+ \immediate
+ \write 18
+ { #1 }
+ }
+ }
+ { \c_luabridge_method_os_execute_int }
+ {
+ \cs_new:Nn
+ \_luabridge_execute_shell:n
+ {
+ \_luabridge_assert_shell_escape:
+ \lua_now:e
+ {
+ os.execute(
+ " \lua_escape:e { #1 } "
+ )
+ }
+ }
+ }
+ }
+ \str_if_exist:NF
+ \g_luabridge_output_dirname_str
+ {
+ \str_new:N
+ \g_luabridge_output_dirname_str
+ \tl_gset:Nn
+ \g_luabridge_output_dirname_str
+ \c_luabridge_default_output_dirname_str
+ }
+ \str_if_exist:NF
+ \g_luabridge_helper_script_filename_str
+ {
+ \str_gset_eq:NN
+ \g_luabridge_helper_script_filename_str
+ \c_luabridge_default_helper_script_filename_str
+ }
+ \str_if_exist:NF
+ \g_luabridge_error_output_filename_str
+ {
+ \str_gset_eq:NN
+ \g_luabridge_error_output_filename_str
+ \c_luabridge_default_error_output_filename_str
+ }
+ \str_if_exist:NF
+ \g_luabridge_standard_output_filename_str
+ {
+ \str_gset_eq:NN
+ \g_luabridge_standard_output_filename_str
+ \c_luabridge_default_standard_output_filename_str
+ }
+ \cs:w newwrite \cs_end:
+ \l_@@_output_stream
+ \cs_new:Nn
+ \luabridge_now:n
+ {
+ \immediate \openout
+ \l_@@_output_stream
+ \g_luabridge_helper_script_filename_str
+ \msg_info:nnV
+ { luabridge }
+ { writing-helper-script }
+ \g_luabridge_helper_script_filename_str
+ \tl_set:Nn
+ \l_tmpa_tl
+ { #1 }
+ \tl_set:Nx
+ \l_tmpb_tl
+ {
+ local~ran_ok,~error~=~pcall(function()~
+ local~ran_ok,~kpse~=~pcall(require,~"kpse")~
+ if~ran_ok~then~kpse.set_program_name("luatex")~end~
+ \exp_not:V \l_tmpa_tl~
+ end)~
+ if~not~ran_ok~then~
+ local~file~=~io.open("
+ \g_luabridge_output_dirname_str /
+ \g_luabridge_error_output_filename_str
+ ",~"w")~
+ if~file~then~
+ file:write(error~..~" \iow_char:N \\ n ")~
+ file:close()~
+ end~
+ print('
+ \iow_char:N \\ \iow_char:N \\ begingroup
+ \iow_char:N \\ \iow_char:N \\ ExplSyntaxOn
+ \iow_char:N \\ \iow_char:N \\ msg_error:nnvv
+ { luabridge }
+ { failed-to-execute }
+ { g_luabridge_output_dirname_str }
+ { g_luabridge_output_dirname_str }
+ \iow_char:N \\ \iow_char:N \\ endgroup
+ ')~
+ end
+ }
+ \immediate \write
+ \l_@@_output_stream
+ { \exp_not:V \l_tmpb_tl }
+ \immediate \closeout
+ \l_@@_output_stream
+ \msg_info:nnVV
+ { luabridge }
+ { executing-helper-script }
+ \g_luabridge_helper_script_filename_str
+ \g_luabridge_standard_output_filename_str
+ \tl_set:Nx
+ \l_tmpa_tl
+ {
+ texlua~"
+ \g_luabridge_output_dirname_str /
+ \g_luabridge_helper_script_filename_str
+ "~>~"
+ \g_luabridge_output_dirname_str /
+ \g_luabridge_standard_output_filename_str
+ "
+ }
+ \_luabridge_execute_shell:V
+ \l_tmpa_tl
+ \file_if_exist_input:VF
+ \g_luabridge_standard_output_filename_str
+ {
+ \msg_error:nn
+ { luabridge }
+ { level-disabled }
+ }
+ }
+ \cs_generate_variant:Nn
+ \msg_info:nnn
+ { nnV }
+ \cs_generate_variant:Nn
+ \msg_info:nnnn
+ { nnVV }
+ \cs_generate_variant:Nn
+ \msg_error:nnnn
+ { nnvv }
+ \cs_generate_variant:Nn
+ \_luabridge_execute_shell:n
+ { V }
+ \prg_generate_conditional_variant:Nnn
+ \file_if_exist_input:n
+ { V }
+ { F }
+ \msg_new:nnn
+ { luabridge }
+ { writing-helper-script }
+ {
+ Writing~a~helper~Lua~script~to~file~#1
+ }
+ \msg_new:nnn
+ { luabridge }
+ { executing-helper-script }
+ {
+ Executing~a~helper~Lua~script~from~file~#1~
+ and~storing~the~result~in~file~#2
+ }
+ \msg_new:nnnn
+ { luabridge }
+ { failed-to-execute }
+ {
+ An~error~was~encountered~while~executing~Lua~code
+ }
+ {
+ For further clues, examine file #1/#2
+ }
+ }
+ {
+ \cs_new:Nn
+ \luabridge_now:n
+ {
+ \tl_set:Nn
+ \l_tmpa_tl
+ { #1 }
+ \tl_set:Nx
+ \l_tmpb_tl
+ {
+ local~function~print(input)~
+ input~=~tostring(input)~
+ local~output~=~{}~
+ for~line~in~input:gmatch("[^
+ \iow_char:N \\ r
+ \iow_char:N \\ n
+ ]+")~do~
+ table.insert(output,~line)~
+ end~
+ tex.print(output)~
+ end~
+ \exp_not:V \l_tmpa_tl
+ }
+ \lua_now:V
+ \l_tmpb_tl
+ }
+ \cs_generate_variant:Nn
+ \lua_now:n
+ { V }
+ }
+\cs_new_protected:Npn
+ \luabridgeExecute
+ #1
+ {
+ \luabridge_now:e
+ { #1 }
+ }
+\cs_generate_variant:Nn
+ \luabridge_now:n
+ { e }
+\ExplSyntaxOff
+%</generic-package>
+% \end{macrocode}
+%
+% \section{\LaTeX{} implementation}
+%
+% This section contains the implementation for \LaTeX.
+%
+% \begin{macrocode}
+%<*latex-package>
+\RequirePackage{expl3}
+\ProvidesExplPackage
+ {lt3luabridge}%
+ {2022-06-26}%
+ {1.0.1}%
+ {An expl3 package that allows you to execute Lua code in LuaTeX or any other
+ TeX engine that exposes the shell}
+\input lt3luabridge\relax
+%</latex-package>
+% \end{macrocode}
+%
+% \section{\Hologo{ConTeXt} implementation}
+%
+% This section contains the implementation for \Hologo{ConTeXt}.
+% \Hologo{ConTeXt} MkII, MkIV, and later formats are supported.
+%
+% \begin{macrocode}
+%<*context-package>
+\writestatus{loading}{ConTeXt User Module / lt3luabridge}
+\startmodule[lt3luabridge]
+\unprotect
+\input lt3luabridge\relax
+%</context-package>
+% \end{macrocode}
+%
+% \end{implementation}
+%
+% \printbibliography
+% \PrintIndex
diff --git a/macros/generic/lt3luabridge/lt3luabridge.ins b/macros/generic/lt3luabridge/lt3luabridge.ins
new file mode 100644
index 0000000000..35c23c4a39
--- /dev/null
+++ b/macros/generic/lt3luabridge/lt3luabridge.ins
@@ -0,0 +1,7 @@
+\input l3docstrip.tex
+\generate{
+ \file{lt3luabridge.tex}{\from{lt3luabridge.dtx}{generic-package}}
+ \file{lt3luabridge.sty}{\from{lt3luabridge.dtx}{latex-package}}
+ \file{t-lt3luabridge.tex}{\from{lt3luabridge.dtx}{context-package}}
+}
+\endbatchfile
diff --git a/macros/generic/lt3luabridge/lt3luabridge.pdf b/macros/generic/lt3luabridge/lt3luabridge.pdf
new file mode 100644
index 0000000000..de17e2ed21
--- /dev/null
+++ b/macros/generic/lt3luabridge/lt3luabridge.pdf
Binary files differ
diff --git a/macros/generic/lt3luabridge/lt3luabridge.sty b/macros/generic/lt3luabridge/lt3luabridge.sty
deleted file mode 100644
index fc786140c6..0000000000
--- a/macros/generic/lt3luabridge/lt3luabridge.sty
+++ /dev/null
@@ -1,8 +0,0 @@
-\RequirePackage{expl3}
-\ProvidesExplPackage
- {lt3luabridge}%
- {2022-06-25}%
- {1.0.0}%
- {An expl3 package that allows you to execute Lua code in LuaTeX or any other
- TeX engine that exposes the shell}
-\input lt3luabridge\relax
diff --git a/macros/generic/lt3luabridge/lt3luabridge.tex b/macros/generic/lt3luabridge/lt3luabridge.tex
deleted file mode 100644
index 0c2b8f8ddd..0000000000
--- a/macros/generic/lt3luabridge/lt3luabridge.tex
+++ /dev/null
@@ -1,407 +0,0 @@
-\ifx\ExplSyntaxOn\undefined
- \input expl3-generic\relax
-\fi
-\ExplSyntaxOn
-\int_const:Nn \c__luabridge_method_write_eighteen_int { 0 }
-\int_const:Nn \c__luabridge_method_os_execute_int { 1 }
-\int_const:Nn \c__luabridge_method_directlua_int { 2 }
-\int_if_exist:NF
- \g__luabridge_method_int
- {
- \int_new:N
- \g__luabridge_method_int
- \cs_if_exist:NTF
- \directlua
- {
- \int_gset_eq:NN
- \g__luabridge_method_int
- \c__luabridge_method_directlua_int
- }
- {
- \int_gset_eq:NN
- \g__luabridge_method_int
- \c__luabridge_method_write_eighteen_int
- }
- }
-\msg_new:nnn
- { luabridge }
- { unknown-method }
- {
- Unknown~bridging~method:~#1
- }
-\msg_new:nnn
- { luabridge }
- { method-write-eighteen }
- {
- Using~shell~escape~via~write18~as~the~bridging~method
- }
-\msg_new:nnn
- { luabridge }
- { method-os-execute }
- {
- Using~shell~escape~via~os.execute()~as~the~bridging~method
- }
-\msg_new:nnn
- { luabridge }
- { method-directlua }
- {
- Using~direct~Lua~access~as~the~bridging~method
- }
-\int_case:nnF
- { \g__luabridge_method_int }
- {
- { \c__luabridge_method_write_eighteen_int }
- {
- \msg_info:nn
- { luabridge }
- { method-write-eighteen }
- }
- { \c__luabridge_method_os_execute_int }
- {
- \msg_info:nn
- { luabridge }
- { method-os-execute }
- }
- { \c__luabridge_method_directlua_int }
- {
- \msg_info:nn
- { luabridge }
- { method-directlua }
- }
- }
- {
- \msg_error:nnx
- { luabridge }
- { unknown-method }
- { \g__luabridge_method_int }
- }
-\bool_if:nTF
- {
- \int_compare_p:nNn
- { \g__luabridge_method_int }
- =
- { \c__luabridge_method_write_eighteen_int } ||
- \int_compare_p:nNn
- { \g__luabridge_method_int }
- =
- { \c__luabridge_method_os_execute_int }
- }
- {
- \int_const:Nn \c__luabridge_level_disabled_int { 0 }
- \int_const:Nn \c__luabridge_level_enabled_int { 1 }
- \int_const:Nn \c__luabridge_level_restricted_int { 2 }
- \int_new:N
- \g__luabridge_level_int
- \cs_if_exist:NTF
- \pdfshellescape
- {
- \int_gset:Nn
- \g__luabridge_level_int
- { \pdfshellescape }
- }
- {
- \cs_if_exist:NTF
- \shellescape
- {
- \int_gset:Nn
- \g__luabridge_level_int
- { \shellescape }
- }
- {
- \int_case:nnF
- { \g__luabridge_method_int }
- {
- { \c__luabridge_method_write_eighteen_int }
- {
- \int_gset_eq:NN
- \g__luabridge_level_int
- \c__luabridge_level_enabled_int
- }
- }
- {
- \int_gset:Nn
- \g__luabridge_level_int
- {
- \directlua
- {
- tex.sprint(status.shell_escape or "1")
- }
- }
- }
- }
- }
- \msg_new:nnn
- { luabridge }
- { unknown-level }
- {
- Unknown~shell~escape~level:~#1
- }
- \msg_new:nnnn
- { luabridge }
- { level-disabled }
- {
- Shell~escape~seems~to~be~disabled
- }
- {
- You~may~need~to~run~TeX~with~the~--shell-escape~or~the~
- --enable-write18~flag,~or~write~shell_escape=t~in~the~
- texmf.cnf~file.
- }
- \msg_new:nnn
- { luabridge }
- { level-enabled }
- {
- Shell~escape~seems~to~be~enabled
- }
- \msg_new:nnnn
- { luabridge }
- { level-restricted }
- {
- Shell~escape~seems~to~be~restricted
- }
- {
- You~may~need~to~run~TeX~with~the~--shell-escape~or~the~
- --enable-write18~flag,~or~write~shell_escape=t~in~the~
- texmf.cnf~file.
- }
- \str_const:Nn \c__luabridge_default_output_dirname_str { . }
- \str_const:Nx \c__luabridge_default_helper_script_filename_str { \jobname.luabridge.lua }
- \str_const:Nx \c__luabridge_default_error_output_filename_str { \jobname.luabridge.err }
- \str_const:Nx \c__luabridge_default_standard_output_filename_str { \jobname.luabridge.out }
- \int_case:nnF
- { \g__luabridge_level_int }
- {
- { \c__luabridge_level_disabled_int }
- {
- \msg_warning:nn
- { luabridge }
- { level-disabled }
- }
- { \c__luabridge_level_enabled_int }
- {
- \msg_info:nn
- { luabridge }
- { level-enabled }
- }
- { \c__luabridge_level_restricted_int }
- {
- \msg_warning:nn
- { luabridge }
- { level-restricted }
- }
- }
- {
- \msg_error:nnx
- { luabridge }
- { unknown-level }
- { \g__luabridge_level_int }
- }
- \cs_new:Nn
- \_luabridge_assert_shell_escape:
- {
- \int_case:nnF
- { \g__luabridge_level_int }
- {
- { \c__luabridge_level_disabled_int }
- {
- \msg_error:nn
- { luabridge }
- { level-disabled }
- }
- }
- }
- \int_case:nn
- { \g__luabridge_method_int }
- {
- { \c__luabridge_method_write_eighteen_int }
- {
- \cs_new:Nn
- \_luabridge_execute_shell:n
- {
- \_luabridge_assert_shell_escape:
- \immediate
- \write 18
- { #1 }
- }
- }
- { \c__luabridge_method_os_execute_int }
- {
- \cs_new:Nn
- \_luabridge_execute_shell:n
- {
- \_luabridge_assert_shell_escape:
- \directlua
- {
- os.execute(
- " \luaescapestring { #1 } "
- )
- }
- }
- }
- }
- \str_if_exist:NF
- \g__luabridge_output_dirname_str
- {
- \str_new:N
- \g__luabridge_output_dirname_str
- \tl_gset:Nn
- \g__luabridge_output_dirname_str
- \c__luabridge_default_output_dirname_str
- }
- \str_if_exist:NF
- \g__luabridge_helper_script_filename_str
- {
- \str_gset_eq:NN
- \g__luabridge_helper_script_filename_str
- \c__luabridge_default_helper_script_filename_str
- }
- \str_if_exist:NF
- \g__luabridge_error_output_filename_str
- {
- \str_gset_eq:NN
- \g__luabridge_error_output_filename_str
- \c__luabridge_default_error_output_filename_str
- }
- \str_if_exist:NF
- \g__luabridge_standard_output_filename_str
- {
- \str_gset_eq:NN
- \g__luabridge_standard_output_filename_str
- \c__luabridge_default_standard_output_filename_str
- }
- \cs:w newwrite \cs_end:
- \l__luabridge_output_stream
- \cs_new:Nn
- \_luabridge_execute:n
- {
- \immediate \openout
- \l__luabridge_output_stream
- \g__luabridge_helper_script_filename_str
- \msg_info:nnV
- { luabridge }
- { writing-helper-script }
- \g__luabridge_helper_script_filename_str
- \tl_set:Nx
- \l_tmpa_tl
- {
- local~ran_ok,~error~=~pcall(function()~
- local~ran_ok,~kpse~=~pcall(require,~"kpse")~
- if~ran_ok~then~kpse.set_program_name("luatex")~end~
- #1~
- end)~
- if~not~ran_ok~then~
- local~file~=~io.open("
- \g__luabridge_output_dirname_str /
- \g__luabridge_error_output_filename_str
- ",~"w")~
- if~file~then~
- file:write(error~..~" \iow_char:N \\ n ")~
- file:close()~
- end~
- print('
- \iow_char:N \\ \iow_char:N \\ begingroup
- \iow_char:N \\ \iow_char:N \\ ExplSyntaxOn
- \iow_char:N \\ \iow_char:N \\ msg_error:nnvv
- { luabridge }
- { failed-to-execute }
- { g__luabridge_output_dirname_str }
- { g__luabridge_output_dirname_str }
- \iow_char:N \\ \iow_char:N \\ endgroup
- ')~
- end
- }
- \immediate \write
- \l__luabridge_output_stream
- { \exp_not:V \l_tmpa_tl }
- \immediate \closeout
- \l__luabridge_output_stream
- \msg_info:nnVV
- { luabridge }
- { executing-helper-script }
- \g__luabridge_helper_script_filename_str
- \g__luabridge_standard_output_filename_str
- \tl_set:Nx
- \l_tmpa_tl
- {
- texlua~"
- \g__luabridge_output_dirname_str /
- \g__luabridge_helper_script_filename_str
- "~>~"
- \g__luabridge_output_dirname_str /
- \g__luabridge_standard_output_filename_str
- "
- }
- \_luabridge_execute_shell:V
- \l_tmpa_tl
- \file_if_exist_input:VF
- \g__luabridge_standard_output_filename_str
- {
- \msg_error:nn
- { luabridge }
- { level-disabled }
- }
- }
- \cs_generate_variant:Nn
- \msg_info:nnn
- { nnV }
- \cs_generate_variant:Nn
- \msg_info:nnnn
- { nnVV }
- \cs_generate_variant:Nn
- \msg_error:nnnn
- { nnvv }
- \cs_generate_variant:Nn
- \_luabridge_execute_shell:n
- { V }
- \prg_generate_conditional_variant:Nnn
- \file_if_exist_input:n
- { V }
- { F }
- \msg_new:nnn
- { luabridge }
- { writing-helper-script }
- {
- Writing~a~helper~Lua~script~to~file~#1
- }
- \msg_new:nnn
- { luabridge }
- { executing-helper-script }
- {
- Executing~a~helper~Lua~script~from~file~#1~
- and~storing~the~result~in~file~#2
- }
- \msg_new:nnnn
- { luabridge }
- { failed-to-execute }
- {
- An~error~was~encountered~while~executing~Lua~code
- }
- {
- For further clues, examine file #1/#2
- }
- }
- {
- \cs_new:Nn
- \_luabridge_execute:n
- {
- \directlua
- {
- local~function~print(input)~
- input~=~tostring(input)~
- local~output~=~{}~
- for~line~in~input:gmatch("[^
- \iow_char:N \\ r
- \iow_char:N \\ n
- ]+")~do~
- table.insert(output,~line)~
- end~
- tex.print(output)~
- end~
- #1
- }
- }
- }
-\cs_new_protected:Npn
- \luabridgeExecute
- { \_luabridge_execute:n }
-\ExplSyntaxOff
diff --git a/macros/generic/lt3luabridge/t-lt3luabridge.tex b/macros/generic/lt3luabridge/t-lt3luabridge.tex
deleted file mode 100644
index 12f8b18aff..0000000000
--- a/macros/generic/lt3luabridge/t-lt3luabridge.tex
+++ /dev/null
@@ -1,4 +0,0 @@
-\writestatus{loading}{ConTeXt User Module / lt3luabridge}
-\startmodule[lt3luabridge]
-\unprotect
-\input lt3luabridge\relax
diff --git a/macros/latex/contrib/asmejour/README.md b/macros/latex/contrib/asmejour/README.md
index 54c16035c7..4a7ab4d6a5 100644
--- a/macros/latex/contrib/asmejour/README.md
+++ b/macros/latex/contrib/asmejour/README.md
@@ -1,11 +1,11 @@
#asmejour: A template for ASME journal papers#
- Version 1.18 dated 2022/01/10.
+ Version 1.19 dated 2022/06/26.
####Overview####
This class provides a template to format preprints in the style of journal papers published by the American Society of Mechanical Engineers.
- The layout and reference formats follow the style of published papers in 2021.
+ The layout and reference formats follow the style of published papers in 2022.
This work is not a publication of ASME.
@@ -66,6 +66,13 @@
---
####Change log####
+v1.19 (2022/06/26)
+ - Correct typo in asmejour.cls (line 359): \\protec should be \\protect
+ - Force T1 encoding of qhvc font under LuaLaTeX (for title and author blocks)
+ - Update code for Inconsolata and Helvetica fonts under LuaLaTeX to ensure T1 encoding. Adjust scale factors.
+ - Scale Helvetica font to 0.91, to better match roman font.
+ - Add option to asmewide.sty to suppress final page column balancing, [raggedend], expand error message text.
+
v1.18 (2022/01/10)
- Introduce asmewide.sty, an experimental package for setting page-width equations in a two column format. A document with examples of use is included.
diff --git a/macros/latex/contrib/asmejour/asmejour-template.pdf b/macros/latex/contrib/asmejour/asmejour-template.pdf
index 5c79214158..ba72975507 100644
--- a/macros/latex/contrib/asmejour/asmejour-template.pdf
+++ b/macros/latex/contrib/asmejour/asmejour-template.pdf
Binary files differ
diff --git a/macros/latex/contrib/asmejour/asmejour-template.tex b/macros/latex/contrib/asmejour/asmejour-template.tex
index 28cebec8e2..df439b43fe 100644
--- a/macros/latex/contrib/asmejour/asmejour-template.tex
+++ b/macros/latex/contrib/asmejour/asmejour-template.tex
@@ -3,7 +3,7 @@
%%
%% This file is asmejour-template.tex, a template to format papers in the style of ASME journal papers.
%%
-%% This file is version 1.18 dated 2022/01/10
+%% This file is version 1.19 dated 2022/06/22
%%
%% Author: John H. Lienhard V
%% Department of Mechanical Engineering
@@ -79,6 +79,17 @@
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% New pdf management code (June 2021); with this, the class options for pdf-a can be omitted.
+%% This change to the LaTeX kernel is being phased-in by the LaTeX3 team. Can delete if it gives you trouble.
+%% Under LuaLaTeX, choose pdfstandard=A-3b.
+
+%\RequirePackage{pdfmanagement-testphase}%
+% \DocumentMetadata{%
+% pdfstandard=A-3b,% A-2b, A-2u, A-3b, or A-3u
+% }%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%% Class options are described above.
\documentclass[subscriptcorrection,upint,varvw,barcolor=Goldenrod3,mathalfa=cal=euler,balance,hyphenate,french,pdf-a]{asmejour} %
@@ -209,7 +220,7 @@ If you wish to override the default math format in a heading or caption, put \ve
Single-sentence captions should not end with a period. Multi-sentence captions do include periods.
\subsection{Subsection Headings}
-Section, subsection, and subsubsection headings should be in title case (first letter of primary words capitalized). ASME does not use \verb|\paragraph|, so the class file equates this command to \verb|\subsubsection|.
+Section, subsection, and subsubsection headings should be in title case (first letter of primary words capitalized). ASME does not use \verb|\paragraph|, so the class file equates this command to \verb|\subsubsection|. \textsf{Try some text for size scaling.} Try some text for size scaling.
%%%%%%%%%%%%% begin figure %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/macros/latex/contrib/asmejour/asmejour.cls b/macros/latex/contrib/asmejour/asmejour.cls
index b91e54f914..13b1c2a560 100644
--- a/macros/latex/contrib/asmejour/asmejour.cls
+++ b/macros/latex/contrib/asmejour/asmejour.cls
@@ -6,8 +6,8 @@
%%
%%
%% This file's version and date are:
- \def\versionno{1.18}
- \def\versiondate{2022/01/10\space}
+ \def\versionno{1.19}
+ \def\versiondate{2022/06/22\space}
%%
%% Author: John H. Lienhard V
%% Department of Mechanical Engineering
@@ -355,8 +355,8 @@
\RequirePackage[utf8]{inputenc}% for backward compatibility with pre-2018 LaTeX distributions
\else
\ifaj@setpdfa\ClassWarningNoLine{asmejour}{pdf-a option requires pdfLaTeX engine. Under LuaLaTeX, use %
- \protec\RequirePackage{pdfmanagement-testphase} %
- \protect\DeclareDocumentMetadata{pdfstandard=A-3b} before \protect\documentclass[..]{asmejour}}\fi%
+ \protect\RequirePackage{pdfmanagement-testphase} %
+ \protect\DocumentMetadata{pdfstandard=A-3b} before \protect\documentclass[..]{asmejour}}\fi%
\ifluatex
\directlua{
if pdf.getminorversion() \string~= 7 then
@@ -377,9 +377,30 @@
\RequirePackage{mathtools}% loads and extends amsmath
\RequirePackage[]{babel}
-\RequirePackage[]{newtxtext}
-\RequirePackage[varl,varqu]{inconsolata}% sans typewriter font; restored varl, varqu 2020/08/10
-\RequirePackage[]{newtxmath}
+\ifpdftex
+ \RequirePackage[helvratio=0.91]{newtxtext}% add this scaling 2022/06/26
+ \RequirePackage[varl,varqu]{inconsolata}% sans typewriter font; restored varl, varqu 2020/08/10
+ \RequirePackage[]{newtxmath}
+\else % use lualatex without font support for other languages (easier set-up and still enables luacode for numerics). Added 2022/06/26.
+ \renewcommand*\rmdefault{ntxtlf} % roman font for math
+ \RequirePackage[T1]{fontenc} % qhv and zi4 are not TU encoded, 2021/12/24
+ \DeclareFontFamily{T1}{\sfdefault}{} % sf for math
+ \DeclareFontShape{T1}{\sfdefault}{m}{n}{<-> s*[0.94] ec-qhvr}{} %% see t1qhv.fd; 0.9-->0.94 2022/01/15
+ \DeclareFontFamily{T1}{zi4}{}% typewriter (Inconsolata)
+ \DeclareFontShape{T1}{zi4}{m}{n}{<-> s*[1.0] t1-zi4r-5}{}% with options varl and var qu
+ \DeclareFontShape{T1}{zi4}{b}{n}{<-> s*[1.0] t1-zi4b-5}{}
+ \DeclareFontShape{T1}{zi4}{bx}{n}{<-> s*[1.0] t1-zi4b-5}{}
+ \RequirePackage[]{newtxmath} % options will be as passed from newtx
+ \RequirePackage[type1text,nofontspec,helvratio=0.91]{newtxtext}% will lose some accented characters this way ... better to use fontspec
+ \@ifpackagelater{newtxtext}{2022/02/28}{\relax}{%
+ \ClassWarning{asmeconf}{Your copy of the newtxtext package is older than 2022/02/28, so you will see error messages about unknown options 'type1text' and 'nofontspec'. You can click through these for now, but I recommend you update your LaTeX installation for best results.}
+ }
+ \providecommand*{\DeclareFontFamilySubstitution}[3]{\relax}% folks with old latex formats will get a different typewriter font...
+ \AtBeginDocument{%
+ \DeclareFontFamilySubstitution{T1}{\ttdefault}{zi4}
+ }
+\fi
+
%% override \textsu if using default superiors
\ifthenelse{\boolean{DefaultSups}}{\let\textsu\textsuperscript}{\relax}
@@ -406,9 +427,15 @@
\emergencystretch 3em
%% TeX Gyre Heros Condensed is qhvc (regular is qhv).
-\newcommand*{\CondSans}{\selectfont\fontfamily{qhvc}\selectfont}
+\ifluatex % 2022/05/08
+ \RequirePackage[T1]{fontenc} % qhvc is not TU encoded
+ \DeclareFontFamily{T1}{qhvc}{}
+ \DeclareFontShape{T1}{qhvc}{m}{n}{<-> s*[0.94] ec-qhvcr}{} %% see t1qhvc.fd; 0.9-->0.94 2022/01/15
+ \DeclareFontShape{T1}{qhvc}{b}{n}{<-> s*[0.94] ec-qhvcb}{} %% see t1qhvc.fd; 0.9-->0.94 2022/01/15
+\fi
+\newcommand*{\CondSans}{\fontencoding{T1}\selectfont\fontfamily{qhvc}\selectfont}
\renewcommand\huge{\@setfontsize\huge{14}{14}} %... for author names only
-\newcommand*{\CondSansBold}{\renewcommand\bfdefault{b}\selectfont\fontfamily{qhvc}\selectfont\bfseries}
+\newcommand*{\CondSansBold}{\renewcommand\bfdefault{b}\fontencoding{T1}\fontfamily{qhvc}\selectfont\bfseries}
\renewcommand\Huge{\@setfontsize\Huge{26.5}{26.5}} %... for title font only
\RequirePackage{metalogo,hologo}% Access to various LaTeX logos (for use in the documentation)
diff --git a/macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.pdf b/macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.pdf
index 5cd8ea6a86..278e3f0896 100644
--- a/macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.pdf
+++ b/macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.pdf
Binary files differ
diff --git a/macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.tex b/macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.tex
index 1efd910acc..63e91cf262 100644
--- a/macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.tex
+++ b/macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.tex
@@ -12,14 +12,14 @@
%%
%% NB: the strip environment from cuted is incompatible with the [lineno] option to asmejour!
%%
-\documentclass[nocopyright,nolists,balance,pdf-a]{asmejour}
+\documentclass[nocopyright,nolists,pdf-a]{asmejour}
%% This file's version and date are:
\def\AJwidetextversion{1.0}
\def\AJverdate{January 10, 2022}
%
\usepackage{asmewide}
-\usepackage{lipsum}% Latin filler text
+\usepackage{lipsum}% Latin filler text (lipsum generates a message about 'unused global options' - this can be ignored)
%
%%%% asmejour template inputs %%%%
\JourName{Applied Mechanics}
@@ -34,7 +34,7 @@
%
\begin{filecontents}{asme-wide-equations.bib}
@online{lienhard2021,
- author = {Lienhard, John H., V},
+ author = {Lienhard, V, John H.},
title = {Preprint Template for {ASME} Journal Papers: \texttt{asmejour.cls}},
organization = {Comprehensive \TeX\ Archive Network},
version = {{\versionno}},
@@ -103,7 +103,7 @@ in \textbf{red} in this document meant to be read---the rest is simply filler to
\end{abstract}
\maketitle
-
+
\section{Introduction}
\lipsum[1-3]
\section{Section}
diff --git a/macros/latex/contrib/asmejour/asmewide_example/asmewide.sty b/macros/latex/contrib/asmejour/asmewide_example/asmewide.sty
index b0c9a481f2..949da71852 100644
--- a/macros/latex/contrib/asmejour/asmewide_example/asmewide.sty
+++ b/macros/latex/contrib/asmejour/asmewide_example/asmewide.sty
@@ -1,7 +1,7 @@
%%
-%% This file is `asmewide.sty'.
+%% This file is `asmewide.sty'.
%%
-%% Copyright (c) 2022 John H. Lienhard. Use under the MIT license: https://ctan.org/license/mit
+%% Copyright (c) 2022 John H. Lienhard. Use under the MIT license: https://ctan.org/license/mit
%%
%% Defines a widetext environment within ASME dimensions
%% Use for material spanning both columns (i.e., for wide equations)
@@ -12,23 +12,32 @@
%% The modifications made were: follow ASME dimensions; remove revtex-specific macros; update/rework commands; adapt to most recent cuted.sty
%% (Leaders don't vanish at pagebreaks, as in revtex, evidently related to how cuted.sty handles strip construction. Have coded around this.)
%%
-%% Required packages: cuted.sty v2.0 and flushend.sty v4.0 [2021/10/04] or later; asmeconf.cls w/its required packages, esp. etoolbox, xparse
+%% Required packages: cuted.sty v2.0 and flushend.sty v4.0 [2021/10/04] or later; asmeconf.cls or asmejour.cls w/their required packages, esp. etoolbox, xparse
%%
-%% The widetext environment can only appear once per page. It clashes with floats and footnotes, requiring some hand-fitting of page layouts.
+%% The widetext environment can only appear once per page. It clashes with floats and footnotes, and often requires some hand-fitting of page layouts.
%%
%% USAGE: * \begin{widetext} ...wide material here... \end{widetext}
%% OPTIONAL ARGUMENTS:
%% * \begin{widetext[N] .. changes upper/lower separation of wide material from default Xpt to Npt (X = 5pt asmeconf.cls; X = 10pt asmejour.cls)
%% * \begin{widetext}[][tbn]: t = top line only; b = bottom line only; n = no lines. BOTH arguments are REQUIRED, even if first is left empty.
%%
+%% asmewide,sty supports one option, [raggedend], which suppresses final page column balancing: \usepackage[raggedend]{asmewide}
+%% NB: remove the option [balance] when using [raggedend]!
+%%
%% NB: the strip environment from cuted is incompatible with the [lineno] option to asmeconf and asmejour!
%%
\NeedsTeXFormat{LaTeX2e}
-\def\AW@versionno{1.0}
-\def\AW@versiondate{2021/12/26\space}
+\def\AW@versionno{1.1}
+\def\AW@versiondate{2022/06/26\space}
\ProvidesPackage{asmewide}[\AW@versiondate\space v\AW@versionno\space ASME wide equation environment (JHL)]
+\DeclareOption{raggedend}{% Added 2022/05/08, to suppressed flushend on last page, if desired
+ \AfterEndPreamble{\raggedend}
+}
+\DeclareOption*{}
+\ProcessOptions \relax
+
\ifdefined\NewDocumentCommand\else
\RequirePackage{xparse}
\fi
@@ -37,7 +46,7 @@
\@ifpackagelater{cuted}{2021/10/04}{%
\relax
}{%
- \PackageError{asmewide}{Your version of cuted.sty is too old. You can get an update at https://ctan.org/pkg/cuted}{You need an up-to-date version of cuted.sty to run asmewide.sty.}%
+ \PackageError{asmewide}{The asmewide package has detected that the version of cuted.sty you are using is too old to be compatible. You can get an update at https://ctan.org/pkg/sttools}{You need at least v2.0 of cuted.sty to run asmewide.sty. Without it, you will get more errors. See discussion of installation process here: https://github.com/John02139/asmeconf/issues/4}%
}
\RequirePackage{flushend}[2021/10/04]
diff --git a/macros/latex/contrib/dvisirule/dvisirule.pdf b/macros/latex/contrib/dvisirule/dvisirule.pdf
deleted file mode 100644
index c5819cb05e..0000000000
--- a/macros/latex/contrib/dvisirule/dvisirule.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/familytree/DEPENDS.txt b/macros/latex/contrib/familytree/DEPENDS.txt
new file mode 100644
index 0000000000..51174fac2f
--- /dev/null
+++ b/macros/latex/contrib/familytree/DEPENDS.txt
@@ -0,0 +1,3 @@
+# RequirePackage, CTAN pkgs
+relsize
+xparse
diff --git a/macros/latex/contrib/familytree/LICENSE b/macros/latex/contrib/familytree/LICENSE
new file mode 100644
index 0000000000..d159169d10
--- /dev/null
+++ b/macros/latex/contrib/familytree/LICENSE
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/macros/latex/contrib/familytree/Makefile b/macros/latex/contrib/familytree/Makefile
new file mode 100644
index 0000000000..bc30a5a3da
--- /dev/null
+++ b/macros/latex/contrib/familytree/Makefile
@@ -0,0 +1,51 @@
+
+Dir ?= /tmp
+export Dir
+InstallDir ?= ${Dir}/texmf-dist
+export InstallDir
+
+include cmd.mk
+Lo = '\def\Dir{'${Dir}'}'
+
+########################################
+
+Name = familytree
+export Name
+Tgt = $(addprefix ${Dir}/${Name}., sty pdf)
+Dtx = $(addsuffix .dtx, ${Name} $(addprefix ft-, \
+ lib individual sibling gens marriage))
+
+########################################
+
+all: ${Tgt}
+ ${MAKE} -C samples $@
+ ${MAKE} -C doc-ja $@
+
+clean:
+ ${RM} *~ ${Tgt}
+ ${MAKE} -C figs --no-print-directory $@
+ ${MAKE} -C samples --no-print-directory $@
+ ${MAKE} -C doc-ja --no-print-directory $@
+
+install: all
+ install -m 444 -pD ${Dir}/${Name}.sty \
+ ${InstallDir}/tex/latex/${Name}.sty
+ install -m 444 -pD ${Dir}/${Name}.pdf \
+ ${InstallDir}/source/latex/${Name}/${Name}.pdf
+ ${MAKE} -C samples --no-print-directory $@
+ ${MAKE} -C doc-ja --no-print-directory $@
+# install -m 444 -pD *.dtx *.tex sample/ \
+# ${InstallDir}/source/latex/${Name}/
+
+########################################
+
+sty: ${Dir}/${Name}.sty
+${Dir}/${Name}.sty: ${Name}.ins ${Dtx}
+ $(call Latex, $<)
+ ls -l $@
+
+${Dir}/${Name}.pdf: %.pdf: %.sty
+ ${MAKE} -C figs
+ $(call MakePdf,${Name},dtx)
+
+-include priv.mk
diff --git a/macros/latex/contrib/familytree/README.md b/macros/latex/contrib/familytree/README.md
new file mode 100644
index 0000000000..944c10aab8
--- /dev/null
+++ b/macros/latex/contrib/familytree/README.md
@@ -0,0 +1,212 @@
+
+# familytree package
+`jiro1010senju AT gmail DOT com`
+
+---
+```
+This package is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+any later version.
+
+This package is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this package. If not, see <http://www.gnu.org/licenses/>.
+```
+---
+
+Some LaTeX macros (or commands) to draw a family tree.
+
+
+# Install
+
+`$ make Dir=/tmp`
+
+You will get these files under `/tmp`.
+```
+familytree.sty
+familytree.pdf
+familytree-ja.pdf
+Crawley.pdf
+Asai.pdf
+Tokugawa.pdf
+```
+
+`$ make InstallDir=/tmp/texmf-dist install`
+
+You will get these under `/tmp/texmf-dist`.
+
+```
+tex/latex/familytree.sty
+source/latex/familytree/familytree.pdf
+source/latex/familytree/familytree-ja.pdf
+source/latex/familytree/Crawley.pdf
+source/latex/familytree/Asai.pdf
+source/latex/familytree/Tokugawa.pdf
+```
+
+
+# Usage
+
+1.
+```
+\indvdldef{Harry}{Harry}
+\indvdldef{Lily}{Lily}[\matrilineal]
+\pcdef{Potters}{Lily}{Harry}
+\fbox{\usebox{\Potters}}
+```
+
+2.
+```
+\indvdldef{Petunia}{Petunia}
+\indvdldef{Lily}{Lily}
+\sblngdef{sis}{Petunia,Lily}
+\fbox{\usebox{\sis}}
+```
+
+3.
+```
+\indvdldef{Lily}{Lily}
+\indvdldef[\blank]{James}{James Potter}[\haschild]
+\mrrgdef{Potters}{James}{Lily}{}
+\fbox{\usebox{\Potters}}
+```
+
+4.
+```
+\indvdldef{Petunia}{Petunia}
+\indvdldef[\blank]{Vernon}{Vernon Dursley}[\haschild]
+\mrrgdef{Dursleys}{Vernon}{Petunia}{}
+%\fbox{\usebox{\Dursleys}}
+
+\newsavebox{\boxA}
+\savebox{\boxA}{\hbox{Petunia}}
+\indvdldef{Lily}{\hbox to \wd\boxA{Lily}}
+\indvdldef[\blank]{James}{James Potter}[\haschild]
+\mrrgdef{Potters}{}{Lily}{James}[\dimexpr\wd\Vernon - \wd\James\relax]
+%\fbox{\usebox{\Potters}}
+
+\sblngdef{sis}{Dursleys,ivali,Potters}
+\fbox{\usebox{\sis}}
+```
+
+
+# Syntax
+
+To define an individual,
+```
+\indvdldef
+ [child mark]
+ {new box name}
+ [title]
+ {individual name}
+ [list of additional info or attributes]
+ [maleline xlength]
+```
+
+- child mark
+ + `\ftbiological`
+ + `\ftadopted`
+ + `\fttop`
+ + `\ftblank`
+
+- attribute
+ + `\fthaschild`
+ + `\ftprivate`
+ + `\ftmaleline, \ftfemaleline, \ftpatrilineal, \ftmatrilineal`
+
+---
+
+To define the siblings,
+```
+\sblngdef
+ {new box name}
+ {name list of individual boxes}
+```
+
+You can insert the "interval box" in the name list, to make the
+spaces between the siblings.
+
+To define the interval box,
+```
+\ivaldef
+ {box-name}
+ {length}
+```
+
+There are three pre-defined interval boxes, `\ival`, `\ivali`, and `\ivalii`.
+
+---
+
+To define a parent-child relationship,
+```
+\pcdef
+ {new box name}
+ {parent box name}
+ {child box name}
+```
+
+To define the generations,
+```
+\gensdef
+ {new box name}
+ {parent box name}
+ {list of connection-pair}
+```
+
+```
+connection-pair :=
+ {individual box name in the parent box}
+ {child box name}
+```
+
+---
+
+To define a married couple or the spouses,
+```
+\mrrgdef
+ {new box name}
+ {spouse list A}
+ {oneself}
+ {spouse list B}
+ [childline xlength]
+```
+
+
+Configuration
+-------------
+
+```
+\nameboxcfg
+ {space from the child mark}
+ {font}
+ {space to the maleline}
+ {maleline length}
+
+\cmarkboxcfg
+ {space between two lines, for adopted}
+ {line length}
+
+\titleboxcfg
+ {indent}
+ {font}
+ {linestretch}
+ {vspace to the individual name}
+
+\optboxcfg
+ {vspace from the individual name}
+ {indent}
+ {font}
+ {linestretch}
+
+\sblngboxcfg
+ {space-length}
+```
+
+
+For more details, refer to `*.dtx`, `familytree.pdf` or `familytree-ja.pdf`,
+and `samples/` sub-dir.
diff --git a/macros/latex/contrib/familytree/cmd.mk b/macros/latex/contrib/familytree/cmd.mk
new file mode 100644
index 0000000000..9c259d2dc5
--- /dev/null
+++ b/macros/latex/contrib/familytree/cmd.mk
@@ -0,0 +1,45 @@
+
+Lo =
+LATEX ?= latex
+define Latex # texsrc
+ tmp=/tmp/$${$$}; \
+ rc=0; \
+ { \
+ ${LATEX} \
+ -halt-on-error -interaction=nonstopmode \
+ -no-mktex tfm -file-line-error \
+ -output-directory ${Dir} \
+ ${Lo}'\input' ${1} > $${tmp} ||\
+ { rc=$${?}; tail -20 $${tmp}; }; \
+ ${RM} $${tmp}; \
+ test $${rc} -eq 0; \
+ }
+endef
+
+TEXINPUTS := ${Dir}:${TEXINPUTS}
+export TEXINPUTS
+DVIPDFMX ?= dvipdfmx -q -f erewhon.map -f newtx.map -f Chivo.map
+PDFCROP ?= pdfcrop --noverbose
+
+define MakePdf
+ $(call Latex, ${1}.${2})
+ $(call Latex, ${1}.${2})
+ cd ${Dir}; \
+ ${DVIPDFMX} -o ${1}.pdf ${1}.dvi
+ ls -l ${Dir}/${1}.pdf
+endef
+
+define MakeFigPdf # tgtname texname
+ $(call Latex, ${2}.tex) && \
+ cd ${Dir} && \
+ ${DVIPDFMX} ${2}.dvi && \
+ ${PDFCROP} ${2}.pdf $@ && \
+ mv ${2}.dvi ${1}.dvi
+endef
+
+define MakePrintTex # src
+ grep -v '^%[^%]' ${1} |\
+ tr '\n' '\r' |\
+ sed -e 's/^\r\r*//' -e 's/\r\r*$$/\r/' |\
+ tr '\r' '\n'
+endef
diff --git a/macros/latex/contrib/familytree/doc-ja/Makefile b/macros/latex/contrib/familytree/doc-ja/Makefile
new file mode 100644
index 0000000000..4cfc10f8c3
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/Makefile
@@ -0,0 +1,37 @@
+
+Dir ?= /tmp
+export Dir
+InstallDir ?= ${Dir}/texmf-dist
+
+LATEX ?= platex -kanji=euc
+include ../cmd.mk
+Lo = '\def\Dir{'${Dir}'}'
+
+########################################
+
+Name = familytree
+Tgt = ${Dir}/${Name}-ja.pdf
+Tex = $(addsuffix -ja.tex, ${Name} ${Name} $(addprefix ft-, \
+ lib individual sibling gens marriage))
+
+########################################
+
+all: ${Tgt}
+
+clean:
+ ${RM} *~ ${Tgt}
+ ${MAKE} -C figs $@
+
+install:
+ install -m 444 -pD ${Dir}/${Name}-ja.pdf \
+ ${InstallDir}/source/latex/${Name}/${Name}-ja.pdf
+
+# it should be already generated by upper make
+# ${Dir}/${Name}.sty:
+
+${Dir}/${Name}-ja.pdf: ${Tex} ${Dir}/${Name}.sty \
+ ${figPdf} ${figPrint} ${figLilyPdf} ${figLilyPrint}
+ ${MAKE} -C figs all
+ $(call MakePdf,${Name}-ja,tex)
+
+-include priv.mk
diff --git a/macros/latex/contrib/familytree/doc-ja/familytree-ja.tex b/macros/latex/contrib/familytree/doc-ja/familytree-ja.tex
new file mode 100644
index 0000000000..12c31edc33
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/familytree-ja.tex
@@ -0,0 +1,287 @@
+\iffalse
+Copyright 2022 Jiro Senju
+
+This package is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+any later version.
+
+This package is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this package. If not, see <http://www.gnu.org/licenses/>.
+\fi
+
+%\RequirePackage{plautopatch}
+% \documentclass[
+% draft,
+% jlreq_notes,open_bracket_pos=nibu_tentsuki
+% ]{jlreq}
+% jlreq and nameref don't co-work
+% \makeatletter
+% \show\section
+% \show\jlreq@headingcs@section
+% \patchcmd{\section}
+% {\@afterindenttrue}{\@afterindenttrue\def\@currentlabelname{#1}}
+% {}{\errmessage{patching section}}
+% \makeatother
+\documentclass[
+ draft
+]{jsarticle}
+\advance\evensidemargin 2zw
+\advance\oddsidemargin 2zw
+\advance\textwidth -2zw
+
+\usepackage{doc}
+\makeatletter
+% borrowd from ltxdoc.
+\def\cmd#1{\cs{\expandafter\cmd@to@cs\string#1}}
+\def\cmd@to@cs#1#2{\char\number`#2\relax}
+\makeatother
+\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
+\providecommand\marg[1]{%
+ {\ttfamily\char`\{}\meta{#1}{\ttfamily\char`\}}}
+\providecommand\oarg[1]{%
+ {\ttfamily[}\meta{#1}{\ttfamily]}}
+
+\input{../fonts}
+
+\usepackage[dvipdfmx,final]{graphicx}
+\usepackage[final]{listings}
+\usepackage{jlisting}
+\lstset{basicstyle=\small\ttfamily\mcfamily,
+ language=TeX,
+ columns=[c]flexible,
+ tabsize=4,
+ %frame=tb,
+ keepspaces=true,
+ lineskip=-.1em,
+ belowskip=\smallskipamount}
+\usepackage{multicol}
+\usepackage{needspace}
+%
+% hyperref should come last
+\usepackage[dvipdfmx,final,pdfusetitle]{hyperref}
+\usepackage{pxjahyper}
+% CJKbookmarks=true
+% bookmarksdepth=section
+% pdffitwindow=true
+% pdfpagetransition=Dissolve
+% pdfstartview=FitB
+\hypersetup{
+ hyperfootnotes=false,
+ colorlinks=true,
+ linkcolor=blue,
+ % anchorcolor=black,
+ % citecolor=black,
+ % urlcolor=black,
+ bookmarks=true,
+ bookmarksnumbered=true,
+ setpagesize=false,
+ %pdftitle={},
+ %pdfauthor={},
+ pdfpagelayout=SinglePage,
+ pdfpagemode=UseOutlines,
+ pdfstartview=FitH
+}
+
+\usepackage{familytree}
+
+\makeatletter
+\def\meta@font@select{\slshape}
+\def\fps@table{htbp}
+\makeatother
+
+%\xspcode`\\=3% it doesn't help
+
+\renewcommand{\contentsname}{ܼ}
+\renewcommand{\tablename}{ɽ}
+\newcommand{\parag}[1]{%
+ \allowbreak%
+ \paragraph{#1}\nopagebreak\hskip0pt\nopagebreak%
+ \medskip%
+}
+\newcounter{CS}[section]
+\newcommand{\CS}{%
+ \ifnum\theCS=0%
+ control sequence%
+ \stepcounter{CS}%
+ \else%
+ CS%
+ \fi%
+}
+\newcommand{\srcfig}[2][]{%
+ {%
+ \noautoxspacing%
+ %\inhibitxspcode`=2% is not helpful
+ \lstinputlisting{\Dir/#2print}%
+ \nopagebreak[4]%
+ }%
+ \nopagebreak[4]%
+ \hfil\includegraphics[#1]{\Dir/#2.pdf}%
+}
+\newcommand{\jslash}{~\slash{} \allowbreak}
+\newcommand{\IhadtoSplit}{%
+ Ĺʬ䤷Ϣ³¹ԤƤΡ褷ǤϤʤ¤%
+ globalѿ¿ѤƤꡢʤ%
+ Ĺɤߤˤʬ䤷%
+}
+\newcommand{\FamilyTree}{ȷϿ}
+\newcommand{\Patrilineal}{}
+\newcommand{\Matrilineal}{}
+\newcommand{\MaleLine}{˷}
+\newcommand{\FemaleLine}{}
+\newcommand{\InheritanceDiagram}{³ط}
+\let\tableautorefname=\tablename%
+\renewcommand{\subsectionautorefname}{}
+\newcommand{\refnm}[1]{%
+ \autoref{#1}\nameref{#1}%
+}
+
+\begin{document}
+\MakeShortVerb{\|}
+\GetFileInfo{familytree.sty}
+\title{{\spaceskip=1ex\textsf{familytree} package \fileversion}}
+\author{齻Ϻ\\\texttt{\small jiro1010senju AT gmail DOT com}}
+\date{\filedate}
+\maketitle
+
+\FamilyTree
+
+ƿͤboxȤơطǤĤʤ
+ʪ˾ղä\InheritanceDiagram ȤƤȤ
+
+\begin{itemize}
+\item \jslash Ϥб
+\item Ľ񤭤б|jlreq.cls|Τ߳ǧ
+\end{itemize}
+\bigskip
+
+ʸϱѸ|dtx|ʬȴФΤǤ
+\bigskip
+
+\setcounter{tocdepth}{4}
+\columnseprule=\arrayrulewidth
+\begin{multicols}{2}
+\tableofcontents
+\end{multicols}
+\bigskip
+
+\setcounter{secnumdepth}{0}
+\section{Ϥ}
+
+\FamilyTree Ϥޤįȶ̣
+ˤαƶ⤢ȻפΤǤϼʬϤξƤΤߤéꡢ
+֤¿2Τ٤ǿʪƹԤΤǸ
+ܤΥХ󥹤ϺΤƤ롣
+ǤϻĤϤ\Patrilineal
+\MaleLine ޡ
+¿褦˻פ\Patrilineal ΤߤéСޤŪñˤʤ뤬
+̣Ⱦ롣
+طΤߤʤ餺طޤȡ̣礤ˤޤˤ
+뤬ʣŪ礹롣
+
+Graphviz (|dot(1)|)ȤäƤޤ뤬䤹Τ񤷤
+ޤ|dot(1)|ϹѤľŪʲȷϿޤˤԸǤϤʤȻפ
+ʣ\FamilyTree ǤñʤȻΤܥѥåǤ롣
+ԤLatexηиϤۤ¿ʤ
+ܥѥåȷϿޤפΰˤʤйǤ롣
+Ȥ紿ޤǤ롣
+
+\subsection{ˤĤ}
+
+ŪƤ\CS ̾ˤprefix |ft|ղäƤ롣
+ǧˤʤ뤿ᡢ
+prefixalias/synonym|\let|롣
+ʤalias̤̾Ѥʾ˸¤롣
+
+\CS ̾aliasǤʤäϡ
+λ|\message|롣
+ʸǤprefixʤalias̾ͥŪ˻ѤϤ뤬
+\CS ̾prefixդ̾Ѥ롣
+\smallskip
+
+|dtx|ʣʬ䤷Ƥ뤬
+|sty|ϰĤǤ롣
+ʸǤ|ft-lib.dtx|Ǹ˺ܤ뤬|sty|ǤƬ˰֤롣
+
+|dtx|ˤϹֹղä뵡ǽ뤬٤Ƥ롣
+ʣ|dtx|νѹƤ뤿
+줾|dtx|Ƭǥ󥿤ͤľƤС餷
+ֹϽϤǤ뤬Τͤ򽦤ФΤ̵뤿ߤ᤿
+|ins||sty|ݤ|log|˹ԿĤ뤬Ƥˤʤʤ
+\smallskip
+
+|xparse|ѤƤ뤿optionƬ˸¤ʤϤ̤
+ŬȤʬɬפ롣
+\bigskip
+
+|\hbox||\vbox|⤷|tabular|ǽǤȻפäƤ
+θĤʤʳǺä
+glueˤ
+|platex|֤ĴƤΤ³ưƤޤ
+Ū\jslash ŪĤʤʤΤ
+TikZǤϺɸɸʬߤʤȤǤΤ
+ʬʤ
+Ĥʤ뤿ˤ|picture|򤻤
+ʤäȸ⡢Ĥʤ뤿
+layoutŪ
+
+depthΰˤ⺤äȸˤμи­ʤä
+ܥѥåǤboxʣ|picture|ˤ֤뤬
+depthռɬפä
+
+ĽбǤdepthϽפä񤭤ǤfontġѻƱͤ
+depthĽ񤭤Ǥ»Ⱦʬdepthˤʤ롣
+դñ˻䤬ΤʤäȸФޤǤʤΤ
+֤֤ä
+
+\subsection{¤}
+
+ޤboxȤ
+Ϣ뤹롣
+ʪ֤ǤĤʤ
+box³κɸƤ
+
+ޤιǤˤϼΤΤ롣
+
+\begin{enumerate}
+\needspace{2\baselineskip}
+\item ʪbox
+ \begin{itemize}
+ \item »ҡܻɽchild mark
+ \item
+ \item ʪ̾
+ \item \Patrilineal \jslash\Matrilineal ޤѤmaleline\slash femaleline
+ \item ղþ\par
+ ǯ̾ʤ
+ \end{itemize}
+
+\item box
+ \begin{itemize}
+ \item 줾child markĤʤ
+ \item ʪ̾δ֤˴ֳ֤ߤ뤿interval box
+ \end{itemize}
+
+\item box
+ \begin{itemize}
+ \item ԤĤʤmarriage line
+ \end{itemize}
+
+\item ƻҤޤbox
+\end{enumerate}
+\bigskip
+
+ʲ롣
+
+\setcounter{secnumdepth}{4}
+\include{ft-individual-ja}
+\include{ft-sibling-ja}
+\include{ft-gens-ja}
+\include{ft-marriage-ja}
+\include{ft-lib-ja}
+\end{document}
diff --git a/macros/latex/contrib/familytree/doc-ja/figs/Makefile b/macros/latex/contrib/familytree/doc-ja/figs/Makefile
new file mode 100644
index 0000000000..a145c5ccd1
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/figs/Makefile
@@ -0,0 +1,74 @@
+
+Dir ?= /tmp
+export Dir
+
+LATEX ?= platex -kanji=euc
+include ../../cmd.mk
+Lo = '\def\Dir{'${Dir}'}'
+
+Fig = fig1base fig1Ieyasu fig1Hidetada
+Fig += fig2base-ja fig2Hidetada fig2ival-ja fig2cfg
+Fig += fig3Hidetada fig3Ietsuna fig3Iemitsu
+Fig += fig4Hidetada fig4Ogou
+figLily = $(addprefix fig3Lily, 1 2 3 4) $(addprefix fig4Lily, 1 2 3 4)
+
+figTY = $(addsuffix T, ${Fig}) $(addsuffix Y, ${Fig})
+figTYPdf = $(addprefix ${Dir}/, $(addsuffix .pdf, ${figTY}))
+figPdf = $(addprefix ${Dir}/, $(addsuffix .pdf, ${Fig}))
+figPrint = $(addprefix ${Dir}/, $(addsuffix print.tex, ${Fig}))
+
+figLilyPdf = $(addprefix ${Dir}/, $(addsuffix .pdf, ${figLily}))
+figLilyPrint = $(addprefix ${Dir}/, $(addsuffix print.tex, ${figLily}))
+
+Tgt = ${figPdf} ${figPrint}
+
+########################################
+
+all: ${Tgt}
+
+clean:
+ ${RM} *~ ${Tgt}
+
+install:
+# do nothing
+
+########################################
+
+fig: ${figPdf}
+${figTYPdf}: Lo += '\def\figsrc{$(basename $<)}'
+${Dir}/%T.pdf: Lo += '\newif\ifmaketate\maketatetrue'
+${Dir}/%Y.pdf: Lo += '\newif\ifmaketate\maketatefalse'
+${Dir}/%T.pdf: %.tex figTY-ja.tex ${Dir}/${Name}.sty
+ $(call MakeFigPdf,$(basename $@),figTY-ja)
+ ebb $@
+${Dir}/%Y.pdf: %.tex figTY-ja.tex ${Dir}/${Name}.sty
+ $(call MakeFigPdf,$(basename $@),figTY-ja)
+ ebb $@
+
+${figPdf}: Lo = '\def\figsrc{$(notdir $(basename $@))}'
+${figPdf}: ${Dir}/%.pdf: fig-ja.tex ${Dir}/%T.pdf ${Dir}/%Y.pdf
+ $(call MakeFigPdf,$(basename $@),fig-ja)
+
+########################################
+
+untilComment = $(addprefix ${Dir}/, $(addsuffix print.tex, \
+ fig1Ieyasu fig2Hidetada fig3Hidetada fig4Hidetada))
+${untilComment}: ${Dir}/%print.tex: %.tex
+ sed -e '/^%$$/,$$d' $< | grep -v '^%' > $@
+
+noIndvdl = $(addprefix ${Dir}/, $(addsuffix print.tex, \
+ fig2ival-ja fig2cfg))
+${noIndvdl}: ${Dir}/%print.tex: %.tex
+ fgrep -vw indvdldef $< |\
+ fgrep -vx '' |\
+ $(call MakePrintTex, -) > $@
+
+# they should be already generated by upper make
+# ${figLilyPdf} ${figLilyPrint}:
+
+${Dir}/%Tprint.tex ${Dir}/%Yprint.tex: ${Dir}/%print.tex
+ cp -p $< $@
+${Dir}/%print.tex: %.tex
+ $(call MakePrintTex, $<) > $@
+
+-include priv.mk
diff --git a/macros/latex/contrib/familytree/doc-ja/figs/fig-ja.tex b/macros/latex/contrib/familytree/doc-ja/figs/fig-ja.tex
new file mode 100644
index 0000000000..8d01c647b1
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/figs/fig-ja.tex
@@ -0,0 +1,23 @@
+\documentclass[
+ %tate,
+ %landscape,
+ 12pt,
+ jlreq_notes,open_bracket_pos=nibu_tentsuki
+]{jlreq}
+\usepackage[dvipdfmx,final]{graphicx}
+%\renewcommand{\baselinestretch}{.5}
+\begin{document}
+\pagestyle{empty}
+\hfill
+%\begin{figure}
+\includegraphics{\figsrc T.pdf}
+%\caption{Ľ}
+%\end{figure}
+\hfill
+%\begin{figure}
+\includegraphics{\figsrc Y.pdf}
+%\caption{}
+%\end{figure}
+\hfill
+\hskip0pt
+\end{document}
diff --git a/macros/latex/contrib/familytree/doc-ja/figs/fig1Hidetada.tex b/macros/latex/contrib/familytree/doc-ja/figs/fig1Hidetada.tex
new file mode 100644
index 0000000000..e43769f8c8
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/figs/fig1Hidetada.tex
@@ -0,0 +1,5 @@
+\indvdldef{}[]{}[\maleline]
+\fbox{\usebox{\}}
+
+\indvdldef[\adopted]{˵}[]{˵}[ߤ,\maleline][3zw]
+\fbox{\usebox{\˵}}
diff --git a/macros/latex/contrib/familytree/doc-ja/figs/fig1Ieyasu.tex b/macros/latex/contrib/familytree/doc-ja/figs/fig1Ieyasu.tex
new file mode 100644
index 0000000000..755a217864
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/figs/fig1Ieyasu.tex
@@ -0,0 +1,24 @@
+\indvdldef[\fttop]{ȹ}[]{ȹ}
+\fbox{\usebox{\ȹ}}
+%
+\newcommand{\boxsz}[1]{%
+ \texttt{\textbackslash#1} & \nameuse{#1}\\%
+}
+\newcommand{\tblA}{%
+ {%
+ \footnotesize%
+ \noautoxspacing%
+ \begin{tabular}{l|l}%
+ \boxsz{ȹnameX}%
+ \boxsz{ȹnameCX}%
+ \boxsz{ȹnameCY}%
+ \end{tabular}%
+ }%
+}
+\ifmaketate
+ \tatechuyoko{\tblA}
+\else
+ \par
+ \bigskip
+ \tblA
+\fi
diff --git a/macros/latex/contrib/familytree/doc-ja/figs/fig1base.tex b/macros/latex/contrib/familytree/doc-ja/figs/fig1base.tex
new file mode 100644
index 0000000000..d5ca0c6299
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/figs/fig1base.tex
@@ -0,0 +1,4 @@
+\titleboxcfg{}{}{}{.1ex}
+\optboxcfg{1ex}{}{}{1}
+\indvdldef{A}[]{ʪ̾}[ɲþ,ɲþ]
+\fbox{\usebox{\A}}
diff --git a/macros/latex/contrib/familytree/doc-ja/figs/fig2Hidetada.tex b/macros/latex/contrib/familytree/doc-ja/figs/fig2Hidetada.tex
new file mode 100644
index 0000000000..4c6f428195
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/figs/fig2Hidetada.tex
@@ -0,0 +1,28 @@
+\indvdldef{ȸ}[]{ȸ}
+\indvdldef{Ĺ}{Ĺʽٲϡ}
+\indvdldef{Ƿ}{Ƿݲʡ}
+\sblngdef{λ}{ȸ,Ĺ,Ƿ}
+\fbox{\usebox{\λ}}
+%
+\newcommand{\boxsz}[1]{%
+ \texttt{\textbackslash#1} & \nameuse{#1}\\%
+}
+\newcommand{\tblA}{%
+ {%
+ \footnotesize%
+ \noautoxspacing%
+ \begin{tabular}{l|l}%
+ \boxsz{λnameCY}%
+ \boxsz{λҲȸnameCY}%
+ \boxsz{λĹnameCY}%
+ \boxsz{λǷnameCY}%
+ \end{tabular}%
+ }%
+}
+\ifmaketate
+ \tatechuyoko{\tblA}
+\else
+ \par
+ \bigskip
+ \tblA
+\fi
diff --git a/macros/latex/contrib/familytree/doc-ja/figs/fig2base-ja.tex b/macros/latex/contrib/familytree/doc-ja/figs/fig2base-ja.tex
new file mode 100644
index 0000000000..9a37de71c0
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/figs/fig2base-ja.tex
@@ -0,0 +1,9 @@
+\indvdldef{A}{ʪ̾}[\maleline]
+\fbox{\usebox{\A}}
+
+\indvdldef{B}{Ĺʪ̾}[\maleline]
+\fbox{\usebox{\B}}
+\bigskip
+
+\sblngdef{AB}{A,B}
+\fbox{\usebox{\AB}}
diff --git a/macros/latex/contrib/familytree/doc-ja/figs/fig2cfg.tex b/macros/latex/contrib/familytree/doc-ja/figs/fig2cfg.tex
new file mode 100644
index 0000000000..a862ea7836
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/figs/fig2cfg.tex
@@ -0,0 +1,6 @@
+\indvdldef{ȸ}[]{ȸ}
+\indvdldef{Ĺ}{Ĺʽٲϡ}
+\indvdldef{Ƿ}{Ƿݲʡ}
+\sblngboxcfg{4zh}
+\sblngdef{ȸη}{ȸ,Ĺ,Ƿ}
+\fbox{\usebox{\ȸη}}
diff --git a/macros/latex/contrib/familytree/doc-ja/figs/fig2ival-ja.tex b/macros/latex/contrib/familytree/doc-ja/figs/fig2ival-ja.tex
new file mode 100644
index 0000000000..199c14957a
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/figs/fig2ival-ja.tex
@@ -0,0 +1,5 @@
+\indvdldef{ȸ}[]{ȸ}
+\indvdldef{Ĺ}{Ĺʽٲϡ}
+\indvdldef{Ƿ}{Ƿݲʡ}
+\sblngdef{ȸη}{ȸ,ivalii,Ĺ,ival,Ƿ}
+\fbox{\usebox{\ȸη}}
diff --git a/macros/latex/contrib/familytree/doc-ja/figs/fig3Hidetada.tex b/macros/latex/contrib/familytree/doc-ja/figs/fig3Hidetada.tex
new file mode 100644
index 0000000000..fd35b56497
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/figs/fig3Hidetada.tex
@@ -0,0 +1,29 @@
+\indvdldef{ȸ}[]{ȸ}[\maleline]
+\indvdldef{Ĺ}{Ĺʽٲϡ}
+\indvdldef{Ƿ}{Ƿݲʡ}
+\sblngdef{λ}{ȸ,Ĺ,Ƿ}
+
+\indvdldef{}[]{}[\maleline]
+\pcdef{ƻ}{}{λ}
+\fbox{\usebox{\ƻ}}
+%
+\newcommand{\boxsz}[1]{%
+ \texttt{\textbackslash#1} & \nameuse{#1}\\%
+}
+\newcommand{\tblA}{%
+ {%
+ \footnotesize%
+ \noautoxspacing%
+ \begin{tabular}{l|l}%
+ \boxsz{ƻnameCY}%
+ \boxsz{ƻҽλY}%
+ \end{tabular}%
+ }%
+}
+\ifmaketate
+ \raisebox{6.5zh}{\tatechuyoko{\tblA}}
+\else
+ \par
+ \bigskip
+ \tblA
+\fi
diff --git a/macros/latex/contrib/familytree/doc-ja/figs/fig3Iemitsu.tex b/macros/latex/contrib/familytree/doc-ja/figs/fig3Iemitsu.tex
new file mode 100644
index 0000000000..17d3bf5e4c
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/figs/fig3Iemitsu.tex
@@ -0,0 +1,28 @@
+\indvdldef[\adopted]{˵}[]{˵}
+
+\indvdldef{˭}{˭ʸϻ }
+\indvdldef{}{ʾʿ}
+\sblngdef{˽Ťλ}{˭,}
+
+\indvdldef{ȹ}[]{ȹ}[\maleline]
+\indvdldef{˽}{˽šʹܡ}[\maleline]
+\indvdldef{}{ʸθ ˵ȡ}
+\sblngdef{ȸλ}{ȹ,ival,˽,}
+
+\gensdef{ȹ˹˵}{ȸλ}{%
+ {ȹ}{˵},%
+ {˽}{˽Ťλ}%
+}
+
+\indvdldef{ȸ}[]{ȸ}[\maleline]
+\indvdldef{Ĺ}{Ĺʽٲϡ}
+\indvdldef{Ƿ}{Ƿݲʡ}
+\sblngdef{λ}{ȸ,Ĺ,Ƿ}
+
+\gensdef{ȸȹ}{λ}{%
+ {ȸ}{ȹ˹˵}%
+}
+
+\indvdldef{}[]{}[\maleline]
+\pcdef{ȸ}{}{ȸȹ}
+\fbox{\usebox{\ȸ}}
diff --git a/macros/latex/contrib/familytree/doc-ja/figs/fig3Ietsuna.tex b/macros/latex/contrib/familytree/doc-ja/figs/fig3Ietsuna.tex
new file mode 100644
index 0000000000..504a92a740
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/figs/fig3Ietsuna.tex
@@ -0,0 +1,16 @@
+\indvdldef[\adopted]{˵}[]{˵}
+
+\indvdldef{˭}{˭ʸϻ }
+\indvdldef{}{ʾʿ}
+\sblngdef{˽Ťλ}{˭,}
+
+\indvdldef{ȹ}[]{ȹ}[\maleline]
+\indvdldef{˽}{˽šʹܡ}[\maleline]
+\indvdldef{}{ʸθ ˵ȡ}
+\sblngdef{ȸλ}{ȹ,ival,˽,}
+
+\gensdef{ȹ˹˵}{ȸλ}{%
+ {ȹ}{˵},%
+ {˽}{˽Ťλ}%
+}
+\fbox{\usebox{\ȹ˹˵}}
diff --git a/macros/latex/contrib/familytree/doc-ja/figs/fig4Hidetada.tex b/macros/latex/contrib/familytree/doc-ja/figs/fig4Hidetada.tex
new file mode 100644
index 0000000000..c7523c97b2
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/figs/fig4Hidetada.tex
@@ -0,0 +1,31 @@
+\indvdldef{}[]{}
+\indvdldef[\blank]{ɱ}{ɱʱơ}[Ҥ ǽα ]
+\indvdldef[\blank]{}{}[ Ϳ, ,\haschild]
+\indvdldef[\blank]{}{šʿ}[ ׸¦,\private,%
+ \haschild]
+\mrrgdef{}{}{}{ɱ,,}
+\fbox{\usebox{\}}
+%
+\newcommand{\boxsz}[1]{%
+ \texttt{\textbackslash#1} & \nameuse{#1}\\%
+}
+\newcommand{\tblA}{%
+ {%
+ \footnotesize%
+ \noautoxspacing%
+ \begin{tabular}{l|l}%
+ \boxsz{nameCY}%
+ \boxsz{ؽnameCY}%
+ \boxsz{ؾɱmrrgCY}%
+ \boxsz{عmrrgCY}%
+ \boxsz{رmrrgCY}%
+ \end{tabular}%
+ }%
+}
+\ifmaketate
+ \raisebox{6.5zh}{\tatechuyoko{\tblA}}
+\else
+ \par
+ \bigskip
+ \tblA
+\fi
diff --git a/macros/latex/contrib/familytree/doc-ja/figs/fig4Ogou.tex b/macros/latex/contrib/familytree/doc-ja/figs/fig4Ogou.tex
new file mode 100644
index 0000000000..a1e0967606
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/figs/fig4Ogou.tex
@@ -0,0 +1,6 @@
+\indvdldef{}{ʤ}
+\indvdldef[\blank]{}{}[ǽ]
+\indvdldef[\blank]{}{˭ý}[,\haschild]
+\indvdldef[\blank]{}{}[,\haschild]
+\mrrgdef{}{,,ivalii,}{}{}
+\fbox{\usebox{\}}
diff --git a/macros/latex/contrib/familytree/doc-ja/figs/figTY-ja.tex b/macros/latex/contrib/familytree/doc-ja/figs/figTY-ja.tex
new file mode 100644
index 0000000000..72863117b8
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/figs/figTY-ja.tex
@@ -0,0 +1,41 @@
+\ifmaketate
+\documentclass[
+ tate,
+ %landscape,
+ 12pt,
+ jlreq_notes,open_bracket_pos=nibu_tentsuki
+]{jlreq}
+\else
+\documentclass[
+ %tate,
+ %landscape,
+ 12pt,
+ jlreq_notes,open_bracket_pos=nibu_tentsuki
+]{jlreq}
+\fi
+
+\input{../../fonts}
+%\usepackage{plext}
+\usepackage{familytree}
+\makeatletter
+\let\nameuse=\@nameuse
+\let\stript=\strip@pt
+\makeatother
+\newlength{\len}
+\newsavebox{\abox}
+\newcommand{\nbox}[2][]{%
+ \savebox{\abox}{#2}%
+ \len=\ht\abox%
+ \advance\len \dp\abox%
+ \begin{picture}(\stript\wd\abox,\stript\ht\abox)%
+ \put(0,-\stript\dp\abox){\framebox(\stript\wd\abox,\stript\len){}}%
+ \put(0,0){\usebox{\abox}}%
+ #1%
+ \end{picture}%
+ H \the\ht\abox, D \the\dp\abox%
+}
+%\renewcommand{\baselinestretch}{.5}
+\begin{document}
+\pagestyle{empty}
+\input{\figsrc}
+\end{document}
diff --git a/macros/latex/contrib/familytree/doc-ja/ft-gens-ja.tex b/macros/latex/contrib/familytree/doc-ja/ft-gens-ja.tex
new file mode 100644
index 0000000000..b3784070cb
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/ft-gens-ja.tex
@@ -0,0 +1,305 @@
+\iffalse
+Copyright 2022 Jiro Senju
+
+This package is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+any later version.
+
+This package is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this package. If not, see <http://www.gnu.org/licenses/>.
+\fi
+
+\section{ƻҴط (\texttt{ft-gens.dtx})}
+
+\DescribeMacro{\pcdef}
+\cmd{\pcdef
+ \marg{new box name}
+ \marg{parent box name}
+ \marg{child box name}
+}
+\medskip
+
+ƻҴطparent-child relationshipˤ롣
+
+ꤵ줿\meta{parent box}\meta{child box}box
+\meta{new box name}롣
+
+\meta{parent box}˻ǤΤϡҤؤĤʤܤbox˸¤
+롣㤨С|\maleline|ˤ°Ϳ
+|\indvdldef|ǺboxǤ롣
+ޤ\meta{child box}˻ǤΤϿƤؤĤʤbox˸¤롣
+㤨Сchild mark|\biological|ꤷ|\indvdldef|ǺboxǤ롣
+
+|\pcdef|ϼ˵󤲤|\gensdef|δʰǤǤ롣
+\bigskip
+
+\DescribeMacro{\gensdef}
+\cmd{\gensdef
+ \marg{new box name}
+ \marg{parent box name}
+ \marg{list of connection-pair}
+}
+\smallskip
+
+\cmd{connection-pair :=\\
+\hspace{4em}\marg{individual box name in the parent box}\\
+\hspace{4em}\marg{child box name}
+}
+\medskip
+
+δطgenerationsˤ롣
+
+\meta{connection-pair}ȤϡʲΤΤȤˤΤǤ롣
+
+\begin{enumerate}
+\item
+ \marg{parant box}οʪbox̾
+\item
+ \marg{child box}̾
+\end{enumerate}
+
+Ĥbox\meta{box name}|nameCY|ƱΤ롣
+\smallskip
+
+\meta{child box}ˤϡҤ|\pcdef|ƱͤˡƤؤĤʤʰܡ˻
+boxǤʤ\meta{parent box}ˤϻҤؤĤʤʣ
+ĤΤǤǤ롣ɤȤɤ\meta{child box}Ĥʤꤹ
+Τ\meta{connection-pair}Ǥ롣
+
+boxchild markϿboxΤ˰פ롣
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\clearpage
+\subsection{}
+
+\begin{enumerate}
+\itemsep=\bigskipamount
+\item
+\srcfig{fig3Hidetada}
+
+\clearpage
+\item
+\srcfig{fig3Ietsuna}
+
+\clearpage
+\item
+ĤĤʤҲ𤷤Ƥ
+\begin{enumerate}
+\item
+ҤĤéʤ롣ʤ2θ1롣
+
+\item
+2ѹפǤ롣
+
+\item
+1
+
+\begin{lstlisting}[xleftmargin=1em]
+\pcdef{ƻ}{}{λ}
+\end{lstlisting}
+
+
+
+\begin{lstlisting}[xleftmargin=1em]
+\gensdef{ȸȹ}{λ}{%
+ {ȸ}{ȹ˹˵}%
+}
+\pcdef{ȸ}{}{ȸȹ}
+\end{lstlisting}
+
+ѹ롣
+\medskip
+
+\textgt{\texttt{\textbackslash\kern0pt λ}}box
+οʪbox
+\textgt{\texttt{\textbackslash\kern0pt ȸ}}
+ȡ2Ѥߤ
+\textgt{\texttt{\textbackslash\kern0pt ȹ˹˵}}box
+Ĥʤ
+\textgt{\texttt{\textbackslash\kern0pt ȸȹ}}box
+Ȥ롣
+
+\textgt{\texttt{\textbackslash\kern0pt }}box
+ȿƻҴط֤ΤϤ
+\textgt{\texttt{\textbackslash\kern0pt ȸȹ}}box
+Ǥ롣
+
+\item
+
+\textgt{\texttt{\textbackslash\kern0pt ȸ}}
+褹롣
+\end{enumerate}
+
+̤Թ塢񤭤η̤Τ󼨤롣
+\end{enumerate}
+\smallskip
+
+\noindent\includegraphics[scale=.95]{fig3IemitsuY.pdf}
+\medskip
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsection{ʣbox}
+\label{sec:Lily1}
+
+boxȤʣοʪboxƱ¤٤ΤȤȤ館ʤС
+ľ򤹤¤٤Τƻbox
+Ʊ¤夽줾줬ҤĤʤСƻҴطʣˤʤΤ
+ñ˿ƻҴطܥåȤϸƤӤŤ餯boxȸƤդ路
+
+Τ褦ʿޤκˡ̤ͤ롣ƻҴطʣƱΤ
+boxǤĤʤˡȡդ˿ηboxƤ顢줾
+˻ҤĤʤˡ
+ĤˡӤʤ顢ޤθ䤹ͤ롣ޤ޼롣
+
+\begin{enumerate}
+\needspace{2\baselineskip}
+\item
+ȤοƻҴط塢λط롣
+
+\srcfig{fig3Lily1}
+
+\needspace{3\baselineskip}
+\item
+ط塢줾οƻҴط롣
+
+\srcfig{fig3Lily2}
+\end{enumerate}
+
+ʬ̤ꡢ1ˡǤϻҤĤʤĹۤʤꡢ˻ΰ
+֤·ʤʤ뤿ᡢˤޤȤʤ롣
+ϻҤؤĤʤϤäȤĹΤ·Ȥ|\sblngdef|
+ǽƯʤä|\sblngdef|ΰϤ줿Ǵ
+ƻҴطƤ֤ǤꡢˤϿʪboxĤʤƤ롣
+ξ֤|\sblngdef|ФΤϤʤ
+
+2ˡǤ|\sblngdef|ΰ|\indvdldef|줿¾ˤϤĤʤƤʤ
+boxǤ롣Τᡢ夫Ĺ­ƤⳲ̵box
+ʤޤޡboxĤϰϤƱ⤵񤭤Ƥ롣
+
+1ˡΤäǤĹ·ˡϤ롣
+|\indvdldef|ĹǽѤ
+ޤLily|\femaleline||\matrilineal|ˤĹPetuniaΤƱ
+ˤɤ
+PetuniaLily̾Ĺκᡢ|\indvdldef|˥ץȤ
+ɲä롣
+̤Ͼ2ƱǤ롣
+\smallskip
+
+\srcfig{fig3Lily3}
+\medskip
+
+|\nameboxcfg|ˤϻҤĤʤĹѹ뵡ǽΤǡȤ
+ƤƱͤη̤뤳ȤǤ롣|\indvdldef|٤
+|\nameboxcfg|ΤǤϤʤ|\nameboxcfg|ϤäȹϰϤ
+ŬѤͤѹβ︺뤳ȤŪȤƤꡢ
+|\indvdldef|٤ѹ뤳ȤꤷƤʤʤǤʤϤʤˡ
+̤˻Ѥͤ|\indvdldef|ΥץѤؤ
+\bigskip
+
+⤦ĤˡȤLily̾ĹPetuniaΤ·ˡ⤢롣
+ˡǤLily̾δ֤Ĺ·
+\smallskip
+
+\srcfig{fig3Lily4}
+\medskip
+
+LilyοƻboxPetuniaƻboxȤϰ㤦̤ǻѤȡ̾θ
+˶뤳Ȥ⤢뤫⤷ʤξϡ
+ѲLily boxʣȤʬ뤳Ȥˤʤ
+\bigskip
+
+box\jslash ˤդɬפ
+ܥѥåǤboxȤͿ줿ʣbox¤ǤĤʤΤ
+κݤͿ줿box礭θ롣㤨зboxݡ
+˻¹ȤĤʤboxͿboxʤޤϹ⤵ˤäƤС
+δֳ֤Ȥ롣ʤinterval boxˤֳɬפˤʤ
+Τüδط
+ˤʤ롣boxǻҤȤĤʤϡ
+ֳĴǽȯʤ٤礦boxʤޤϹ⤵ˤС
+ŤʤäƤޤξϼưinterval boxʤ
+
+³ݥȤ\meta{box name}\meta{brabra}|nameCY|ʤɤ̾
+롣ϤޤǤ褦|\sblngdef|Ϸ夽줾̾
+ɽYɸ뤬nestnestޤǤʤ
+ʤƻbox֤줿ʪboxĤʤΤϡʤۤܡ˼ưŪˤǤ
+뤬ƻboxηbox֤줿ʪboxĤʤˤϡ桼
+ʬǺɸ򻻽ФʤФʤʤԲǽǤϤʤ֤Ϥ롣
+μ֤򤹤뤿ᡢϲ\jslash ƤΤɤȹͤ롣
+\iffalse
+\bigskip
+
+ǽŪˡ
+桼ɤΤ褦ʿޤߤˤꡢɤνboxĤʤ뤫
+ޤĴɤä뤫ꤹΤɤ
+\fi
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\iffalse
+% \subsubsection{box --- core}
+%
+% \iffalse
+% \parag{ޥ}
+%
+% \DescribeMacro{\ftgescfg}
+% \NoDescription
+% \begin{macrocode}
+% \newcommand{\ftgenscfg}[1]{%
+% }
+% \end{macrocode}
+% \fi
+%
+% \parag{connection pair}
+%
+% \DescribeMacro{\ft@getpair}
+% connection-pairФ
+% box³|\ft@cpoint|Ȥơޤbox̾|\ft@kids|Ȥ롣
+% ³Ϳ줿Τboxnest֤줿ˤб롣
+% nestϰʤޤǤбʤ
+%
+% \parag{;}
+%
+% \DescribeMacro{\def@calc@xtop}
+% boxɬפʾ;򻻽Фꤵ줿global̾롣
+%
+% \parag{;}
+%
+% \DescribeMacro{\ft@calc@xbottom}
+% boxɬפʲ;򻻽Фꤵ줿global̾롣
+% Ʊ|\ft@depth|롣
+%
+% \parag{box size}
+%
+% \DescribeMacro{\ft@gens@size}
+% box size򻻽Ф롣
+%
+% \parag{}
+%
+% \DescribeMacro{\ft@gens@layout}
+% boxȻbox֤롣
+% ֤box|nameCY|ɸ\meta{box name}|nameCY|Ȥ롣
+% ֤boxθʺĽ񤭤ʤˤ\meta{box
+% name}\meta{\kern0pt box name}|Y|Ȥ롣
+% packageȤǤפκɸ桼ɬפȤ뤫⤷ʤΤǡ
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsubsection{box --- interface}
+%
+% \DescribeMacro{\ftgensdef}
+% boxchild markϿboxΤ˰פ롣
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsubsection{ƻbox --- interface}
+%
+% \DescribeMacro{\ftpcdef}
+% ƻҴطbox롣
+% |\gensdef|δʰǡ
+% boxbox줾\meta{box name}|nameCY|ƱΤ롣
+\fi
diff --git a/macros/latex/contrib/familytree/doc-ja/ft-individual-ja.tex b/macros/latex/contrib/familytree/doc-ja/ft-individual-ja.tex
new file mode 100644
index 0000000000..a8b2ad3090
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/ft-individual-ja.tex
@@ -0,0 +1,456 @@
+\iffalse
+Copyright 2022 Jiro Senju
+
+This package is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+any later version.
+
+This package is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this package. If not, see <http://www.gnu.org/licenses/>.
+\fi
+
+\section{ʪ (\texttt{ft-individual.dtx})}
+
+\DescribeMacro{\indvdldef}
+\cmd{\indvdldef
+ \oarg{child mark}
+ \marg{new box name}
+ \oarg{title}
+ \marg{individual name}
+ \oarg{additonal info}
+ \oarg{maleline xlength}
+}
+\medskip
+
+Ϳ줿\jslash ֤box򡢻ꤵ줿\meta{new box name}롣
+
+\begin{enumerate}
+\item \oarg{child mark}
+\par
+ʪ̾μ̤ꤹ롣
+Ҥ|\ftbiological|
+|\ftadopted|
+|\fttop|
+|\ftblank|
+ΤŤ줫ꤹ
+
+\item \marg{new box name}
+\par
+box̾
+\CS ǤϤʤ
+baskslashդʤ
+
+\item \oarg{title}
+\par
+
+\par
+ʪ̾θ꾮ʥ|\relsize{-2}|ˤ֤
+
+\item \marg{individual name}
+\par
+ʪ̾
+
+\item \oarg{additonal info}
+\par
+ղþ
+\par
+ǯ̾ǤդξɲäǤ롣
+ʪ̾μʤ˰꾮ʥ|\relsize{-1}|ˤ֤롣
+˸Ҥ
+|\ftmaleline| (|\ftfemaleline|, |\ftpatrilineal|, |\ftmatrilineal|)
+|\fthaschild|
+|\ftprivate|
+°Ǥ
+
+\item \oarg{maleline xlength}
+\par
+ʪ̾Ҥؤ
+ʿޤ˺طޤʤˡ
+Ĺ롣
+âҤ뷻boxǤϼưŪĴᤵ뤿ᡢ
+̣򼺤
+\end{enumerate}
+
+˸ǻѤɸñ̤|pt|ˤɽ\CS 롣
+ǡʿʪ̾ˤ˴ؤɸθϤ줾졢
+񤭤ξbox
+Ľ񤭤ξboxǤ롣
+
+\begin{itemize}
+\item \meta{box name}|nameX|
+\par
+֤ʪ̾
+
+\item \meta{box name}|nameCX|
+\par
+֤ʪ̾
+ʽĽ񤭤ʤй⤵
+
+\item \meta{box name}|nameCY|
+\par
+֤ʪ̾ι⤵
+ʽĽ񤭤ʤ
+\end{itemize}
+\bigskip
+
+\needspace{4\baselineskip}
+\oarg{child mark}ˤϼͤΤŤ줫ꤹ롣
+
+\begin{itemize}
+\item |\biological|, |\ftbiological|
+\par
+ʪ̾˼»Ҥ̣
+
+\item |\adopted|, |\ftadopted|
+\par
+ʪܻ̾Ҥ̣
+
+\item |\fttop| (|\top|)
+\par
+ʤϿޤκǾ̤Ѥ롣
+
+\item |\blank|, |\ftblank|
+\par
+ʤˡƱζ롣Ҥ
+|\mrrgdef|˻ꤹ۶Ԥʤɤ˻Ѥ롣
+\end{itemize}
+\bigskip
+
+\oarg{additonal info}ˤϼ°ޤ롣
+
+\begin{itemize}
+\item |\haschild|, |\fthaschild|
+\par
+Ҥ⤦۶Ԥɽ
+\par
+Ҥ뺧ط˻Ѥȡ
+ط̣ľѤ˼
+
+\item |\private|, |\ftprivate|
+\par
+ˡŪʺطǤϤʤȤɽ
+\par
+Ҥ뺧ط˻Ѥ
+ȡط̣ˤ롣
+
+\item |\maleline|, |\ftmaleline|
+\par
+ʪ̾Ҥؤ
+\par
+Ĺϥץ\meta{maleline xlength}DzøǤ롣
+|\ftfemaleline|
+|\ftpatrilineal|
+|\ftmatrilineal|Ʊ
+\end{itemize}
+\bigskip
+
+boxȤϺʬ줿boxǤ롣
+\smallskip
+
+\begin{itemize}
+\item 񤭤ɽ|\ft@titlebox|
+\item ʪ̾ɽ|\ft@namebox|
+\par
+ˤϹ\meta{child mark}ɽ|\ft@cmarkbox|
+\meta{maleline}ɽ\allowbreak|\ft@malelinebox|롣
+\item ղþɽ|\ft@optbox|
+\end{itemize}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsection{ޥ}
+
+֤Ĵ뵡ǽ⤢롣
+ѹʤΤˤ϶ꤹɤ
+礷ȤϤƤʤΤɬפ˱\jslash Ѥ٤ɤ
+ܺ٤ϼ򻲾ȤΤȡ
+\medskip
+
+\needspace{1.5\baselineskip}
+\DescribeMacro{\nameboxcfg}
+\cmd{\nameboxcfg
+ \marg{space from the child mark}
+ \marg{font}
+ \marg{space to the maleline}
+ \marg{maleline length}
+}
+\smallskip
+
+\DescribeMacro{\cmarkboxcfg}
+\cmd{\cmarkboxcfg
+ \marg{space between two lines, for adopted}
+ \marg{line length}
+}
+\smallskip
+
+\DescribeMacro{\titleboxcfg}
+\cmd{\titleboxcfg
+ \marg{indent}
+ \marg{font}
+ \marg{linestretch}
+ \marg{vspace to the individual name}
+}
+\smallskip
+
+\DescribeMacro{\optboxcfg}
+\cmd{\optboxcfg
+ \marg{vspace from the individual name}
+ \marg{indent}
+ \marg{font}
+ \marg{linestretch}
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsection{}
+
+\begin{enumerate}
+\itemsep=\bigskipamount
+\item
+\srcfig{fig1base}
+
+\item
+\srcfig{fig1Ieyasu}
+
+\item
+\srcfig{fig1Hidetada}
+\end{enumerate}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\iffalse
+\subsectImpl
+
+\subsubsection{child-mark box}
+
+\parag{ޥ}
+
+\DescribeMacro{\ftcmarkboxcfg}
+\DescribeMacro{\cmarkboxcfg}
+child mark֤boxݤ˻Ѥ
+|\adopted|δֳ֡
+򥫥ޥǤ롣
+
+ѹʤΤˤ϶ꤹɤ
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\parag{box}
+
+\DescribeMacro{\fttop}
+\DescribeMacro{\top}
+\DescribeMacro{\ftbiological}
+\DescribeMacro{\biological}
+\DescribeMacro{\ftadopted}
+\DescribeMacro{\adopted}
+\DescribeMacro{\ftblank}
+\DescribeMacro{\blank}
+child markࡣ
+줾ΰ̣\refnm{table:cmark}򻲾ȡ
+
+\DescribeMacro{\ft@indvdl@nameH}
+\DescribeMacro{\ft@indvdl@nameD}
+\DescribeMacro{\ft@indvdl@nameCY}
+\DescribeMacro{\ft@do@cmarkdef}
+\DescribeMacro{\ft@cmarkdef}
+ꤵ줿\meta{cmark}box\meta{cmarkbox-name}˻ꤵ줿̾
+롣
+
+ʸȤȤ⸡ƤfontۤʤȤĤʤʤʤ붲줬
+뤿|picutre||line|ˤ
+
+|\ft@indvdl@nameH||\ft@indvdl@nameD||\ft@indvdl@nameCY|interface
+Ǥ|\indvdldef|롣
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsubsection{ղþbox}
+
+\parag{ޥ}
+
+\DescribeMacro{\ftoptboxcfg}
+\DescribeMacro{\optboxcfg}
+ղþ\meta{additional info}\jslash ֤|\ft@optbox|
+ݤ˻Ѥ롢
+ʪ̾ȤεΥ
+font
+linestretch
+򥫥ޥǤ롣
+
+ѹʤΤˤ϶ꤹɤ
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\parag{°ղþβ}
+
+\DescribeMacro{\ftmaleline}
+\DescribeMacro{\maleline}
+\DescribeMacro{\fthaschild}
+\DescribeMacro{\haschild}
+\DescribeMacro{\ftprivate}
+\DescribeMacro{\private}
+줾ΰ̣\refnm{table:attrib}򻲾ȡ
+
+\DescribeMacro{\ft@optlist}
+\meta{option-list}˻ꤵ줿ղþ\meta{additional info}°Ф
+\meta{box-name}ˤ̾global flag롣
+°ʳΤΤϸǰ뤿ᡢ
+̥ꥹ\meta{list}롣
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\parag{box}
+
+\DescribeMacro{\ft@opt}
+ղþ\meta{additional info}\jslash ֤|\ft@optbox|
+롣
+
+Ƭˤ\meta{child-mark}ʬ˲ä
+ʪ̾indent뤿;롣
+
+ǽԤdepthboxdepthȤ롣
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsubsection{ʪ̾box}
+
+\parag{ޥ}
+
+\DescribeMacro{\ftnameboxcfg}
+\DescribeMacro{\nameboxcfg}
+ʪ̾˻Ѥ롢
+font
+ʪ̾θmalelineοʪ̾ȤεΥ
+򥫥ޥǤ롣
+
+ѹʤΤˤ϶ꤹɤ
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\parag{box}
+
+\DescribeMacro{\ft@name}
+ʪ̾\jslash ֤|\@ft@namebox|롣
+
+Ȥ|\ft@cmarkbox|\meta{individual-name}
+|\ft@malelinebox|¤٤Ρ
+
+maleline硢defaultlengthȤλɤꤹ뤫
+硹ʤä
+ñ˿ʪ̾θȤ뤫Ȥ⸪񤭤ղþޤᡢ
+礭boxθȤ뤫ԤˤȿʪboxñȤǤθܤ
+ʤ롣ʤmalelineĹ롣Ҥ¾
+boxʤɤ¤٤ˡɤФ¾box·뤫
+򻻽ФΤ˼֤褦ˤʤ롣
+Ԥʬꡢñ˿ʪ̾sizeκ
+ä·롣
+Ժθ塢ԤȤdefault length
+|\ft@namebox@maleline@length|Ȥ롣
+ʤʪboxñȤѤ硢񤭤ɲþmaleline
+Ĺʤ뤳Ȥ롣
+
+Ƿ\jslash ƻ\jslash ط˺ɸȤѤǤ褦
+\meta{box name}|nameX|\meta{box name}|nameCX|롣
+
+ʪboxdepthϿʪ̾Τ˰פ롣
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsubsection{box}
+
+\parag{ޥ}
+
+\hyphenation{line-stretch}
+\DescribeMacro{\fttitleboxcfg}
+\DescribeMacro{\titleboxcfg}
+񤭤֤|\ft@titlebox|ݤ˻Ѥ
+font
+linestretch
+ʪ̾ȤεΥ򥫥ޥǤ롣
+
+ѹʤΤˤ϶ꤹɤ
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\parag{box}
+
+\DescribeMacro{\ft@title}
+񤭤\jslash ֤|\ft@titlebox|롣
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsubsection{boxϢ --- core}
+
+ꤵ줿ˡ
+񤭡|\ft@titlebox|ˡʪ̾|\ft@namebox|ˡղþ
+|\ft@optbox|ˤ줾롣
+¤ٿʪbox롣
+boxdepthϺǽԤΤ˰פ롣
+
+Ƿ\jslash \jslash ƻҴط˺ɸȤѤǤ褦
+\meta{box name}|nameCY|롣
+
+boxʪboxsizeС|picture|ˤlayoutλʳƧࡣ
+줾Ω뤬\IhadtoSplit
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\parag{box}
+
+\DescribeMacro{\ft@indvdlbox@gen}
+\NoDescription
+ \begin{macrocode}
+ \end{macrocode}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\parag{ʪboxsize}
+
+\DescribeMacro{\ft@indvdlbox@calc}
+\NoDescription
+ \begin{macrocode}
+ \end{macrocode}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\parag{\texttt{picture}ˤlayout}
+
+\DescribeMacro{\ft@indvdlbox@layout}
+\NoDescription
+ \begin{macrocode}
+ \end{macrocode}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\parag{boxϢmain}
+
+\DescribeMacro{\ft@indvdlbox}
+\NoDescription
+ \begin{macrocode}
+ \end{macrocode}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsubsection{ʪbox --- interface}
+
+\DescribeMacro{\ftindvdldef}
+\DescribeMacro{\indvdldef}
+ꤵ줿˽
+\meta{box name}Ȥ̾box롣
+
+\meta{individula name}ι⤵|\ft@indvdl@nameH|ᡢ
+depthθ|\ft@indvdl@nameCY|
+ʹߤ³κɸФѤ롣
+
+\meta{child mark}ϿʪboxƬ֤
+ƤιԤlayoutŪˤ¸ߤռɬפ뤿ᡢ
+¾ιܤ˷ꤷ
+|\ft@cmarkbox|
+Ӥɽ|\ft@cmarkW|롣
+
+\meta{cmark}|\ftblank|ʳξϡ
+child-mark¸ߤ뤳Ȥɽglobal flag
+\meta{containerbox-name}˻ꤵ줿̾롣
+
+|\ft@optlst|ˤ\meta{additional info}Ϥ
+°Τ|\ft@indvdl@opts|ˤޤȤ롣
+Ʊ|\ifft@maleline|ꤷ
+°|\maleline|ꤵƤ뤫ݤʹȽǤǤ褦ˤ롣
+
+ޤǤѤޤ|\ft@indvdlbox|ˤʪ̾box롣
+\fi
diff --git a/macros/latex/contrib/familytree/doc-ja/ft-lib-ja.tex b/macros/latex/contrib/familytree/doc-ja/ft-lib-ja.tex
new file mode 100644
index 0000000000..fc0e647c41
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/ft-lib-ja.tex
@@ -0,0 +1,86 @@
+\iffalse
+Copyright 2022 Jiro Senju
+
+This package is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+any later version.
+
+This package is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this package. If not, see <http://www.gnu.org/licenses/>.
+\fi
+
+\section{library (\texttt{ft-lib.dtx})}
+
+ʸǸξϤǤϤ뤬
+|ft-lib.dtx||sty|ǤƬ˰֤롣
+
+\iffalse
+% \DescribeMacro{\ft@unit}
+% ʸβɽбˡ
+%
+% \DescribeMacro{\if@tate}
+% |\if@tate|Ƥʤdocumentclassб롣
+% ̤̤ǧ
+%
+% \DescribeMacro{\ft@alias}
+% prefix |ft|alias롣̾Ȥʤ
+% |message|롣
+% ʤǤʤ|\expandafter|ɬפˤʤΤǤƤʤ
+\fi
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsection{utility}
+
+\DescribeMacro{\ftymd}
+\DescribeMacro{\ymd}
+\cmd{\ftymd
+ \marg{year}
+ \oarg{month}
+ \oarg{date}
+}
+
+ǯ롣Ľ񤭤ˤбƤ롣
+|\indvdldef|ղþǤѤꤷƤ롣
+\bigskip
+
+\DescribeMacro{\ftundef}
+\cmd{\ftundef
+ \marg{box name}
+}
+
+̾\meta{box name}ĤΤ̤Ȥ롣
+prefix |ft|ʤaliasߤʤ
+
+\iffalse
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsubsection{internal library}
+%
+% \parag{global variable}
+%
+% \parag{utility function}
+%
+% \DescribeMacro{\ft@namexdef}
+% \DescribeMacro{\ft@namexdefstrip}
+%
+% \DescribeMacro{\ft@savenamebox}
+% \DescribeMacro{\ft@newnamebox}
+%
+% \DescribeMacro{\ft@nameboxsz}
+% \DescribeMacro{\ft@boxsz}
+%
+% \DescribeMacro{\ft@list@append}
+%
+% \parag{debugging}
+%
+% \DescribeMacro{\ifftdbg}
+% \DescribeMacro{\ft@dbgmsg}
+% \DescribeMacro{\ft@dbgframe}
+% \DescribeMacro{\ft@dbgplot}
+% \DescribeMacro{\ft@dbgbox}
+\fi
diff --git a/macros/latex/contrib/familytree/doc-ja/ft-marriage-ja.tex b/macros/latex/contrib/familytree/doc-ja/ft-marriage-ja.tex
new file mode 100644
index 0000000000..1076439f99
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/ft-marriage-ja.tex
@@ -0,0 +1,219 @@
+\iffalse
+Copyright 2022 Jiro Senju
+
+This package is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+any later version.
+
+This package is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this package. If not, see <http://www.gnu.org/licenses/>.
+\fi
+
+\section{ط (\texttt{ft-marriage.dtx})}
+
+\DescribeMacro{\mrrgdef}
+\cmd{\mrrgdef
+ \marg{new box name}
+ \marg{spouse list A}
+ \marg{oneself}
+ \marg{spouse list B}
+ \oarg{childline xlength}
+}
+\medskip
+
+ꤵ줿\meta{new box name}box롣
+ƺ¦ʤɤˤб٤۶Ԥlistǻꤹ롣
+|\indvdldef|box̾򥫥޶ڤlistȤͿ롣
+\meta{spouse list A}ܿ͡\meta{oneself}ˤξ¦ʽĽ񤭤ʤбˤˡ
+\meta{spouse list B}ܿ͡\meta{oneself}ˤβ¦ʽĽ񤭤ʤкˤˡ
+줾֤롣
+Ť\CS ǤϤʤ
+Ƭbackslashޤޤʤˡ
+\smallskip
+
+Ʊ¤١ʺطżǡǤʤ
+|\private|°
+Ƿ֡
+ΰ֤\meta{oneself}οʪ̾Ȥ롣
+\smallskip
+
+Ҥ⤦
+۶Ԥ|\haschild|°ġ
+֤ϻҤĤʤ
+\smallskip
+
+|\sblngdef|Ʊͤ˴ֳ֤interval boxǤ롣
+\medskip
+
+|\indvdldef|ƱͤˡǻѤɸñ̤|pt|ˤɽ\CS 롣
+ɸθϤ줾졢
+񤭤ξbox
+Ľ񤭤ξboxǤ롣
+
+\begin{itemize}
+\item \meta{box name}|nameCY|
+\par
+طboxǤܿ͡\meta{oneself}ˤοʪ̾ι⤵
+ʽĽ񤭤ʤ
+
+\item \meta{box name}\meta{\kern0pt ʪbox name}|nameCY|
+\par
+طboxǤcmarkĿʪ̾ι⤵
+
+\item \meta{box name}\meta{\kern0pt ʪbox name}|mrrgCY|
+\par
+طboxǤ|\haschild|°Ŀʪ̾ȺȤ
+\end{itemize}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsection{ޥ}
+
+% ֤Ĵ뵡ǽ⤢롣
+% ѹʤΤˤ϶ꤹɤ
+% 礷ȤϤƤʤΤɬפ˱\jslash Ѥ٤ɤ
+% ܺ٤ϼ򻲾ȤΤȡ
+% \medskip
+
+\DescribeMacro{\mrrgboxcfg}
+\cmd{\mrrgboxcfg
+ \marg{space between two lines}
+ \marg{space between name and the line}
+ \marg{line length}
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\clearpage
+\subsection{}
+
+\begin{enumerate}
+\item
+\srcfig{fig4Hidetada}
+\clearpage
+
+\item
+\srcfig{fig4Ogou}
+\end{enumerate}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsection{Ʊ֤ȷ}
+
+Ĥ\FamilyTree ˤʤǤ⤫ǤͤΤ̵롣
+
+㤨ؤȤ˺ƺƤ硢Ʊ¤٤Ƥϸˤ
+ʤФ˵󤲤ĤοޤϽؤɽȸƱˤʤä
+ޤˤ뤫ˤ뤫ǿʬ㤦ޤˤʤ롣Ĥ
+ޤΤΤϤޤ̵
+פʪ򸺤餹ؤ줾͸ˤޤĤʬ뤷ʤ
+Ǥ⼫ȤĤ¹۶¦\jslash ¹ȴط
+ľ礬Сʬ䤻ʤ
+
+طȺطƱɽƱͤ
+ƱȿޤˤʤäƤޤ
+\refnm{sec:Lily1}ѤͤƤߤ롣
+
+Petunia -- Lily夬줾뺧硢طȺطƱˡ
+ɽǤ
+
+ޤȤؤ˻ط롣
+\bigskip
+
+\srcfig{fig4Lily1}
+\medskip
+
+ñ̤ǸϤʤ⤷ʤط֤ȸŤ餤ޤȤʤäƤ
+ޤˤʤꤦϼλĤ
+
+\begin{enumerate}
+\item طɽΰ֤·äƤʤ
+\item ҤĤʤĹۤʤäƤꡢξ֤ǻҤĤʤȸŤ餵
+ ֤롣
+\item JamesPetuniaLilyδ֤˳Ǥꡢط򸫤Ť餯
+롣
+\end{enumerate}
+
+ܤΰ֤·СܤĹ·⼫ưŪ˲ä롣
+ˤ\refnm{sec:Lily1}ǤҲ𤷤Lily boxPetunia boxΤ
+·ˡȤ롣
+ܤJamesΰ֤ޤϴֳ֤ȤƤߤ롣
+\bigskip
+
+\srcfig{fig4Lily2}
+\medskip
+
+ֳ֤ȤƤJames٤Ǥ뤳ȤѤʤŤ餵ϲ
+줿
+˲ˤJamesLilyνؤ뤷ʤ
+\bigskip
+
+\srcfig{fig4Lily3}
+\medskip
+
+ؤǴֳ֤ȤΤĤμ
+\bigskip
+
+\srcfig{fig4Lily4}
+\medskip
+
+줬best
+䤹\jslash ˤϼѤ乥ߤФ
+ĿŪˤؤνѤäƤ񹳤Ф롣˴
+֤\FamilyTree ʤСηͭǧᤶʤϿ¾
+ʬȤΥХ󥹤⤢ΤǡǽŪˤŪȽǤΤ
+طޤʤ\Matrilineal ޤѶŪ˸Ƥ
+
+\iffalse
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \parag{ޥ}
+%
+% \DescribeMacro{\ftmrrgboxcfg}
+% \DescribeMacro{\mrrgboxcfg}
+% boxݤ˻Ѥ
+% δֳ֡
+% ȿʪ̾ȤεΥ
+% Ĺ
+% 򥫥ޥǤ롣
+%
+% ѹʤΤˤ϶ꤹɤ
+%
+% \parag{}
+%
+% \DescribeMacro{\ft@mrrg@parse}
+% Ϥboxsize򻻽Ф롣
+%
+% ҤˤĤʤ硢ĹΤ
+% |\ft@namebox@maleline@length|äĹ·롣
+%
+% \parag{ط}
+%
+% \DescribeMacro{\ft@mrrg@line}
+% ܿͤ۶ԤǤĤʤ
+%
+% ۶Ԥ|\haschild|°äƤСҤؤĤʤ
+% κɸ\meta{box name}\meta{\kern0pt ʪbox name}|mrrgCY|
+% 롣
+%
+% \parag{ʪ̾}
+%
+% \DescribeMacro{\ft@mrrg@name}
+% child mark°Ŀʪboxξϡ\meta{box name}\meta{\kern0pt ʪbox
+% name}|nameCY|롣
+%
+% \subsubsection{ʪbox֤ȷ --- core}
+%
+% \DescribeMacro{\ft@mrrg@spouse}
+% ۶listǤ줾֤ط
+%
+% \subsubsection{box --- interface}
+%
+% \DescribeMacro{\ftmrrgdef}
+% \DescribeMacro{\mrrgdef}
+% ֤boxǤܿ͡\meta{oneself}ˤ|nameCY|\meta{box name}|nameCY|
+% 롣Ʊͤܿͤ|hascmark|򤽤Τޤ\meta{box
+% name}|hascmark|Ȥ롣
+\fi
diff --git a/macros/latex/contrib/familytree/doc-ja/ft-sibling-ja.tex b/macros/latex/contrib/familytree/doc-ja/ft-sibling-ja.tex
new file mode 100644
index 0000000000..00567f863a
--- /dev/null
+++ b/macros/latex/contrib/familytree/doc-ja/ft-sibling-ja.tex
@@ -0,0 +1,181 @@
+\iffalse
+Copyright 2022 Jiro Senju
+
+This package is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+any later version.
+
+This package is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this package. If not, see <http://www.gnu.org/licenses/>.
+\fi
+
+\section{ط (\texttt{ft-sibling.dtx})}
+
+\DescribeMacro{\sblngdef}
+\cmd{\sblngdef
+ \marg{new box name}
+ \marg{name list of individual boxes}
+}
+\medskip
+
+|\indvdldef|box̾򥫥޶ڤlistȤͿ롣
+Ʊ¤١֤ǤĤʤbox
+ꤵ줿\meta{new box name}롣
+Ť\CS ǤϤʤ
+Ƭbackslashޤޤʤˡ
+
+ꤵ줿⡢|\maleline|°ļԤʣߤСĹ
+ΤĹ·롣
+\smallskip
+
+|\indvdldef|ƱͤˡǻѤɸñ̤|pt|ˤɽ\CS 롣
+ɸθϤ줾졢
+񤭤ξbox
+Ľ񤭤ξboxǤ롣
+
+\begin{itemize}
+\item \meta{box name}|nameCY|
+\par
+ãĤʤ
+\par
+֤ĤʤȤϤʤ\meta{listƬbox}|nameCY|\meta{list
+box}|nameCY|ĤʤǤ롣
+
+\item \meta{box name}\meta{\kern0pt ʪbox name}|nameCY|
+\par
+boxǤοʪ̾줾ι⤵
+ʽĽ񤭤ʤ
+\par
+|\indvdldef|\meta{\kern0pt ʪbox name}|nameCY|
+boxǤοʪ̾˹碌ʿ԰ưȤ롣
+\end{itemize}
+\bigskip
+
+\DescribeMacro{\ivaldef}
+\cmd{\ivaldef
+ \marg{new box name}
+ \marg{length}
+}
+\medskip
+
+\FamilyTree ǤϷλ¹¿
+֤δֳ֤Ȥ롣
+Τ褦ʾˤ|\ivaldef| (interval box)
+Ȥboxư롣
+packageǤͽỰĤboxƤ롣
+|\ival||\ivali||\ivalii|Ǥꡢ
+Ȥ϶줾|0.5zw||1zw||2zw|length
+ʸ̩˸ȡбΤ|1zw||\ft@unit|ȤƺƤꡢ
+ Ǥ|.5\ft@unit||1\ft@unit||2\ft@unit|interval boxȤƤˡ
+
+|\ivaldef||\global\newsavebox|Τǡ
+ȯƤϻ񸻾ˤʤ붲줬롣
+ξϸҤ|\sblngboxcfg|Ƥη֤Ʊֳ֤ߤ
+Ǥ롣ޤϡʶʣϢ³뤳ȤǽǤ
+롣
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsection{ޥ}
+
+% ֤Ĵ뵡ǽ⤢롣
+% 礷ȤϤƤʤΤɬפ˱\jslash Ѥ٤ΤΡ
+% ܺ٤ϸҤ롣
+% \smallskip
+
+\DescribeMacro{\sblngboxcfg}
+\cmd{\sblngboxcfg
+ \marg{space between the siblings}
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsection{}
+
+\begin{enumerate}
+\itemsep=\bigskipamount
+\item
+\srcfig{fig2base}
+
+\item
+\srcfig{fig2Hidetada}
+
+\item
+\srcfig{fig2ival}
+
+\needspace{5\baselineskip}
+\item
+\srcfig{fig2cfg}
+\end{enumerate}
+
+\iffalse
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsubsection{interval box}
+%
+% \DescribeMacro{\ftivaldef}
+% \DescribeMacro{\ivaldef}
+% ϻĤȤbox롣
+% ֤˷֤Ȥݤ˻Ѥ롣
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \parag{pre-defined interval boxes}
+%
+% \DescribeMacro{\ftival}
+% \DescribeMacro{\ival}
+%
+% \DescribeMacro{\ftivali}
+% \DescribeMacro{\ivali}
+%
+% \DescribeMacro{\ftivalii}
+% \DescribeMacro{\ivalii}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \parag{ޥ}\
+%
+% \DescribeMacro{\ftsblngboxcfg}
+% \DescribeMacro{\sblngboxcfg}
+% \jslash ֤box
+% ݤ˻Ѥ뷻֤δֳ
+% 򥫥ޥǤ롣
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsubsection{box --- core}
+%
+% ꤵ줿Ʊ¤١ط֡
+% ꤵ줿̾box롣
+%
+% ꤵ줿⡢|\maleline|°ļԤʣߤС
+% ĹΤĹ·롣
+% ʪ̾δ֤ˤϤǤ|\ft@namebox@maleline@sp|ʬζߤ롣
+%
+% \IhadtoSplit
+%
+% \DescribeMacro{\ft@sblng@maleline}
+% |maleline|Ĺ·롣
+%
+% \DescribeMacro{\ft@sblng@connect}
+% ֤ǤĤʤ
+%
+% \meta{box-name}|nameCY|Ȥ롣
+%
+% \DescribeMacro{\ft@sblng@layout}
+% ֤ǤĤʤ
+%
+% ʪ֤̾⤵\meta{box name}\meta{\kern0pt ʪbox
+% name}|nameCY|Ȥ롣
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsubsection{box --- interface}
+%
+% \DescribeMacro{\ftsblngdef}
+% \DescribeMacro{\sblngdef}
+% ȤΥ򻻽ФcoreǤ|\ft@sblng@layout|¹Ԥ롣
+% member|\maleline|°ĤΤ뤱ɡ
+% äȤʪbox|\maleline|°äƤʤ硢
+% boxȤmalelineĹФ
+% Ф̤|\ft@namebox@maleline@length|Ǥ롣
+\fi
diff --git a/macros/latex/contrib/familytree/familytree-ja.pdf b/macros/latex/contrib/familytree/familytree-ja.pdf
new file mode 100644
index 0000000000..83fa88daac
--- /dev/null
+++ b/macros/latex/contrib/familytree/familytree-ja.pdf
Binary files differ
diff --git a/macros/latex/contrib/familytree/familytree.dtx b/macros/latex/contrib/familytree/familytree.dtx
new file mode 100644
index 0000000000..1cdc44159e
--- /dev/null
+++ b/macros/latex/contrib/familytree/familytree.dtx
@@ -0,0 +1,260 @@
+% \iffalse
+% Copyright 2022 Jiro Senju
+%
+% This package is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2 of the License, or
+% any later version.
+%
+% This package is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this package. If not, see <http://www.gnu.org/licenses/>.
+%
+%<package>\NeedsTeXFormat{LaTeX2e}
+%<package>\ProvidesPackage{familytree}%
+%<package>[2022/06/27 v3.1 familytree]
+%
+%<*driver>
+\documentclass[draft]{ltxdoc}
+\let\Ocmd=\cmd
+\renewcommand{\cmd}[1]{%
+ %\hskip-\parindent
+ \parbox{.95\textwidth}{\Ocmd{#1}}%
+}
+%
+\input{fonts}
+%
+\usepackage[dvipdfmx,final]{graphicx}
+\usepackage[final]{listings}
+\lstset{basicstyle=\small\ttfamily,
+ language=TeX,
+ columns=[c]flexible,
+ tabsize=4,
+ %frame=tb,
+ keepspaces=true,
+ %lineskip=-.1em,
+ belowskip=\medskipamount}
+\usepackage{multicol}
+\usepackage{needspace}
+%
+% hyperref should come last
+\usepackage[dvipdfmx,final,pdfusetitle]{hyperref}
+% bookmarksdepth=section
+% pdffitwindow=true
+% pdfpagetransition=Dissolve
+% pdfstartview=FitB
+\hypersetup{
+ hyperfootnotes=false,
+ colorlinks=true,
+ linkcolor=blue,
+ % anchorcolor=black,
+ % citecolor=black,
+ % urlcolor=black,
+ bookmarks=true,
+ bookmarksnumbered=true,
+ setpagesize=false,
+ %pdftitle={},
+ %pdfauthor={},
+ pdfpagelayout=SinglePage,
+ pdfpagemode=UseOutlines,
+ pdfstartview=FitH
+}
+%
+\usepackage{\jobname}
+%
+\makeatletter
+\def\meta@font@select{\slshape}
+\def\fps@table{htbp}
+\let\part=\@gobble
+%
+\newcount\ft@lastsection
+\newcommand{\subsectImpl}[1][\subsection]{%
+ \iftrue% debugging code
+ \@tempcnta=\numexpr\thesection + 1\relax%
+ \ifnum\@tempcnta>\ft@lastsection\else%
+ Jump to \hyperlink{section.\the\@tempcnta}{next section}%
+ \fi%
+ \fi%
+ \needspace{4\baselineskip}%
+ #1{Implementation}%
+}
+\makeatother
+%
+\newcommand{\parag}[1]{%
+ \allowbreak%
+ \paragraph{#1}\nopagebreak\hskip0pt\nopagebreak%
+ %\medskip%
+}
+\newcounter{CS}[section]
+\newcommand{\CS}{%
+ \ifnum\theCS=0%
+ control sequence%
+ \stepcounter{CS}%
+ \else%
+ CS%
+ \fi%
+}
+\newcommand{\srcfig}[2][]{%
+ \lstinputlisting{\Dir/#2print}%
+ \nopagebreak[4]%
+ \hfil\includegraphics[#1]{\Dir/#2.pdf}%
+}
+\newcommand{\NoDescription}{\vspace*{-.9\baselineskip}}
+\newcommand{\IhadtoSplit}{%
+ This is not a good structure since it bogusly splits a long code into
+ a few parts, and may global variables. Comparing to the non-split
+ version, the split one is just a little better.
+}
+\let\tableautorefname=\tablename%
+\renewcommand{\subsectionautorefname}{}
+\newcommand{\refnm}[1]{%
+ \autoref{#1} ``\nameref{#1}''%
+}
+%
+% \EnableCrossrefs
+\DisableCrossrefs
+% \PageIndex
+%\CodelineIndex
+\makeatletter
+\let\theCodelineNo=\reset@font
+\AtEndDocument{%
+ \immediate\write\@auxout{%
+ \string\global\string\ft@lastsection=\thesection%
+ }%
+}
+\makeatother
+%\RecordChanges
+%
+\begin{document}
+\MakeShortVerb{\|}
+\let\PrintIndexO=\PrintIndex
+\let\PrintIndex=\relax
+\DocInput{\jobname.dtx}
+\DocInclude{ft-individual}
+\DocInclude{ft-sibling}
+\DocInclude{ft-gens}
+\DocInclude{ft-marriage}
+\DocInclude{ft-lib}
+%\PrintChanges
+% \PrintIndexO
+\end{document}
+%</driver>
+% \fi
+%
+% \GetFileInfo{\jobname.sty}
+% \title{{\spaceskip=1ex\textsf{\jobname} package \fileversion}}
+% \author{Jiro Senju\\\texttt{\small jiro1010senju AT gmail DOT com}}
+% \date{\filedate}
+% \maketitle
+%
+% Draws a Family Tree.
+%
+% Defines a box describing an individual, and connects the multiple
+% boxes by lines.
+% The line represents the sibling, the parent-child relation ship, or
+% the marriage.
+%
+% \begin{itemize}
+% \item Excluding the marriage box, you can get a maleline\slash patrilineal
+% tree, or a femaleline\slash matrilineal tree.
+% \item For Japanese, |jlreq.cls| vertical option (|tate|) is supported.
+% \end{itemize}
+% \bigskip
+%
+% \setcounter{tocdepth}{2}
+% \columnseprule=\arrayrulewidth
+% \begin{multicols}{2}
+% \tableofcontents
+% \end{multicols}
+% \bigskip
+%
+% \setcounter{secnumdepth}{0}
+% \section{Introduction}
+%
+% Family Tree is interesting.
+% But also, it can be really complicated, especially including the
+% siblings and marriages.
+%
+% Graphviz (|dot(1)|) is a good tool to draw a family tree, but I want
+% more straightforward understandability.
+% Here I try developing some macros to draw a family tree easily.
+% I am not a TeXnician, but I hope it helps someone who wants to draw
+% and view a large family tree.
+% Tested on TeX Live 2019.
+% Any comments will be appreciated.
+%
+% \subsection{Development}
+%
+% Basically all \CS s have a prefix ``|ft|''.
+% But non-prefix names are also defined by |\let| as an alias\slash
+% synonym, to improve the usability and the visibility.
+% Obviously only when the name is undefined.
+% If \CS{} name is already defined and |familytree| pkg cannot define the alias,
+% |\message| is generated.
+% This document tries using the |ft|-less alias name, but a few are used
+% with the prefixed name.
+% \smallskip
+%
+% There are multiple |dtx| files, but the generated |sty| is only one.
+% |ft-lib.dtx| is described at last of this document, but it comes
+% first in |sty|.
+% \medskip
+%
+% In the beginning, I was going to implement using |\hbox| and |\vbox|
+% or |tabular| environment. I thought they would be enough.
+% After defining the boxes, I would connect them by lines, then I got a
+% trouble.
+% |latex| adjusts the position of the boxes by inserting a glue or
+% something, and their connection points are shifted. I could not find a
+% good universal solution.
+% Can TikZ or something define the absolute coordinates and the lines? I
+% don't know.
+% To connect the lines, I had to choose |picture| environment.
+%
+% The depth of a character was another trouble, or I don't have enough
+% experience and
+% knowledge. To layout the boxes in |picture|, I have to consider the
+% depth of the box.
+% To support the Japanese in vertical mode, the depth is very important. In
+% horizontal mode, the depth is very alike of the English alphabets. But
+% in vertical mode, the depth is a half size of a character.
+% I didn't know that, and it took very long time for me.
+%
+% \subsection{Structure}
+%
+% Defines every element as a box in the tree, and connects them by lines.
+% In defining a box, we also define its connection points which make the
+% box to be connectable later.
+%
+% These are the elements.
+%
+% \begin{enumerate}
+% \item individual box
+% \begin{itemize}
+% \item child mark to represent one is adopted or biological child
+% \item one's title
+% \item one's name
+% \item maleline\slash femaleline for the patrilineal\slash matrilineal tree
+% \item additional information\par
+% birth\slash death year-month-date, nickname, or anything
+% \end{itemize}
+%
+% \item sibling box
+% \begin{itemize}
+% \item a line between the child marks
+% \item interval box to make a space between individuals
+% \end{itemize}
+%
+% \item marriage box
+% \begin{itemize}
+% \item marriage line (double line) to connect the husband and the wife
+% \end{itemize}
+%
+% \item parent-child relationship or generations box
+% \end{enumerate}
+%
+% \setcounter{secnumdepth}{3}
diff --git a/macros/latex/contrib/familytree/familytree.ins b/macros/latex/contrib/familytree/familytree.ins
new file mode 100644
index 0000000000..452085b573
--- /dev/null
+++ b/macros/latex/contrib/familytree/familytree.ins
@@ -0,0 +1,12 @@
+\input docstrip.tex
+% \keepsilent
+\askforoverwritefalse
+\generate{\file{familytree.sty}{
+ \from{familytree.dtx}{package}
+ \from{ft-lib.dtx}{package}
+ \from{ft-individual.dtx}{package}
+ \from{ft-sibling.dtx}{package}
+ \from{ft-gens.dtx}{package}
+ \from{ft-marriage.dtx}{package}
+}}
+\endbatchfile
diff --git a/macros/latex/contrib/familytree/familytree.pdf b/macros/latex/contrib/familytree/familytree.pdf
new file mode 100644
index 0000000000..f9f413e737
--- /dev/null
+++ b/macros/latex/contrib/familytree/familytree.pdf
Binary files differ
diff --git a/macros/latex/contrib/familytree/figs/Makefile b/macros/latex/contrib/familytree/figs/Makefile
new file mode 100644
index 0000000000..15612d8f80
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/Makefile
@@ -0,0 +1,76 @@
+
+Dir ?= /tmp
+export Dir
+
+include ../cmd.mk
+Lo = '\def\Dir{'${Dir}'}'
+
+Fig = $(addprefix fig1Robert, 1 2)
+Fig += fig2base fig2sis fig2ival
+Fig += $(addprefix fig3Robert, 1 2) $(addprefix fig3Lily, 1 2 3 4)
+Fig += fig4Robert fig4HenryVIII $(addprefix fig4Lily, 1 2 3 4)
+
+figPdf = $(addprefix ${Dir}/, $(addsuffix .pdf, ${Fig}))
+figPrint = $(addprefix ${Dir}/, $(addsuffix print.tex, ${Fig}))
+Tgt = ${figPdf} ${figPrint}
+
+########################################
+
+all: ${Tgt}
+
+clean:
+ ${RM} *~ ${Tgt}
+
+install:
+# do nothing
+
+########################################
+
+fig: ${figPdf}
+${figPdf}: Lo = '\def\figsrc{$(notdir $(basename $@))}'
+${figPdf}: ${Dir}/%.pdf: fig.tex %.tex #${Dir}/${Name}.sty
+ $(call MakeFigPdf,$(basename $@),fig)
+
+########################################
+
+untilComment = $(addprefix ${Dir}/, $(addsuffix print.tex, \
+ fig1Robert1 fig2base fig2sis fig3Lily1 fig4Robert))
+${untilComment}: ${Dir}/%print.tex: %.tex
+ sed -e '/^%$$/,$$d' -e 's/.hfill//' $< | grep -v '^%' > $@
+
+noIndvdl = $(addprefix ${Dir}/, $(addsuffix print.tex, \
+ fig2ival fig3Robert2))
+${noIndvdl}: ${Dir}/%print.tex: %.tex
+ fgrep -vw indvdldef $< |\
+ fgrep -vx '' |\
+ $(call MakePrintTex, -) > $@
+
+${Dir}/fig3Lily2print.tex: ${Dir}/%print.tex: %.tex
+ { \
+ echo ...; \
+ fgrep -vw indvdldef $< |\
+ sed -e '/tabular/,$$d' |\
+ $(call MakePrintTex, -); \
+ } > $@
+
+$(addprefix ${Dir}/, $(addsuffix print.tex, \
+ fig3Lily3 fig3Lily4 fig4Lily2)): ${Dir}/%print.tex: %.tex
+ { \
+ echo ...; \
+ sed -e '0,/newsavebox/d' -e '/tabular/,$$d' $< |\
+ $(call MakePrintTex, -); \
+ } > $@
+
+${Dir}/fig4Lily3print.tex: n = 4
+${Dir}/fig4Lily4print.tex: n = 2
+$(addprefix ${Dir}/, $(addsuffix print.tex, \
+ fig4Lily3 fig4Lily4)): ${Dir}/%print.tex: %.tex
+ { \
+ echo ...; \
+ tail -${n} $<; \
+ } > $@
+
+${Dir}/%print.tex: %.tex
+ $(call MakePrintTex, $<) > $@
+
+-include priv.mk
diff --git a/macros/latex/contrib/familytree/figs/fig.tex b/macros/latex/contrib/familytree/figs/fig.tex
new file mode 100644
index 0000000000..19d0fceafb
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/fig.tex
@@ -0,0 +1,9 @@
+\documentclass[]{article}
+\usepackage{familytree}
+\begin{document}
+\pagestyle{empty}
+\hfill
+\input{\figsrc}
+\hfill
+\hskip0pt
+\end{document}
diff --git a/macros/latex/contrib/familytree/figs/fig1Robert1.tex b/macros/latex/contrib/familytree/figs/fig1Robert1.tex
new file mode 100644
index 0000000000..22adc5d1ab
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/fig1Robert1.tex
@@ -0,0 +1,19 @@
+\indvdldef[\fttop]{Robert}{Robert Crawley}[\maleline]
+\fbox{\usebox{\Robert}}\hfill
+%
+\makeatletter
+\let\nameuse=\@nameuse
+\makeatother
+\newcommand{\boxsz}[1]{%
+ \texttt{\textbackslash#1} & \nameuse{#1}\\%
+}
+\newcommand{\tblA}{%
+ \begin{tabular}{l|l}%
+ \boxsz{RobertnameX}%
+ \boxsz{RobertnameCX}%
+ \boxsz{RobertnameCY}%
+ \end{tabular}%
+}
+\par
+\bigskip
+\hfill\tblA
diff --git a/macros/latex/contrib/familytree/figs/fig1Robert2.tex b/macros/latex/contrib/familytree/figs/fig1Robert2.tex
new file mode 100644
index 0000000000..ab7c617a4b
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/fig1Robert2.tex
@@ -0,0 +1,3 @@
+\indvdldef{Robert}[7th]{Robert Crawley}
+ [7th Earl of Grantham,\maleline]
+\fbox{\usebox{\Robert}}
diff --git a/macros/latex/contrib/familytree/figs/fig2base.tex b/macros/latex/contrib/familytree/figs/fig2base.tex
new file mode 100644
index 0000000000..549aa5b8cc
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/fig2base.tex
@@ -0,0 +1,13 @@
+\indvdldef{A}{one's name}[\maleline]
+\indvdldef{B}{one's loooong name}[\maleline]
+\sblngdef{ABbro}{A,B}
+%
+{
+\def\arraystretch{1.5}
+\begin{tabular}{l}
+\fbox{\usebox{\A}}\\
+\fbox{\usebox{\B}}\\
+\\
+\fbox{\usebox{\ABbro}}
+\end{tabular}
+}
diff --git a/macros/latex/contrib/familytree/figs/fig2ival.tex b/macros/latex/contrib/familytree/figs/fig2ival.tex
new file mode 100644
index 0000000000..6f820195bc
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/fig2ival.tex
@@ -0,0 +1,5 @@
+\indvdldef{youngSybil}{Lady Sybil}
+\indvdldef{youngEdith}{Lady Edith}
+\indvdldef{youngMary}{Lady Mary}
+\sblngdef{youngSis}{youngMary,ivali,youngEdith,ivalii,youngSybil}
+\fbox{\usebox{\youngSis}}
diff --git a/macros/latex/contrib/familytree/figs/fig2sis.tex b/macros/latex/contrib/familytree/figs/fig2sis.tex
new file mode 100644
index 0000000000..aab069ead5
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/fig2sis.tex
@@ -0,0 +1,25 @@
+\sblngboxcfg{1ex}
+\indvdldef{youngSybil}{Lady Sybil}
+\indvdldef{youngEdith}{Lady Edith}
+\indvdldef{youngMary}{Lady Mary}
+\sblngdef{youngSis}{youngMary,youngEdith,youngSybil}
+\fbox{\usebox{\youngSis}}
+\hfill
+%
+\makeatletter
+\let\nameuse=\@nameuse
+\makeatother
+\newcommand{\boxsz}[1]{%
+ \texttt{\textbackslash#1} & \nameuse{#1}\\%
+}
+\newcommand{\tblA}{%
+ \begin{tabular}{l|l}%
+ \boxsz{youngSisnameCY}%
+ \boxsz{youngSisyoungMarynameCY}%
+ \boxsz{youngSisyoungEdithnameCY}%
+ \boxsz{youngSisyoungSybilnameCY}%
+ \end{tabular}%
+}
+\par
+\bigskip
+\hfill\tblA
diff --git a/macros/latex/contrib/familytree/figs/fig3Lily1.tex b/macros/latex/contrib/familytree/figs/fig3Lily1.tex
new file mode 100644
index 0000000000..41dbc8dc1c
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/fig3Lily1.tex
@@ -0,0 +1,16 @@
+\indvdldef{Dudly}{Dudly}
+\indvdldef{Petunia}{Petunia}[\matrilineal]
+\pcdef{Dursleys}{Petunia}{Dudly}
+
+\indvdldef{Harry}{Harry}
+\indvdldef{Lily}{Lily}[\matrilineal]
+\pcdef{Potters}{Lily}{Harry}
+
+\sblngdef{sis}{Dursleys,Potters}
+%
+\begin{tabular}{l}
+\fbox{\usebox{\Dursleys}}\\
+\fbox{\usebox{\Potters}}\\
+\\
+\fbox{\usebox{\sis}}
+\end{tabular}
diff --git a/macros/latex/contrib/familytree/figs/fig3Lily2.tex b/macros/latex/contrib/familytree/figs/fig3Lily2.tex
new file mode 100644
index 0000000000..6172ff1c98
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/fig3Lily2.tex
@@ -0,0 +1,17 @@
+\indvdldef{Dudly}{Dudly}
+\indvdldef{Petunia}{Petunia}[\matrilineal]
+
+\indvdldef{Harry}{Harry}
+\indvdldef{Lily}{Lily}[\matrilineal]
+
+\sblngdef{sis}{Petunia,Lily}
+\gensdef{twofam}{sis}{%
+ {Petunia}{Dudly},%
+ {Lily}{Harry}%
+}
+
+\begin{tabular}{l}
+\fbox{\usebox{\sis}}\\
+\\
+\fbox{\usebox{\twofam}}
+\end{tabular}
diff --git a/macros/latex/contrib/familytree/figs/fig3Lily3.tex b/macros/latex/contrib/familytree/figs/fig3Lily3.tex
new file mode 100644
index 0000000000..fd8a134b5d
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/fig3Lily3.tex
@@ -0,0 +1,20 @@
+\indvdldef{Dudly}{Dudly}
+\indvdldef{Petunia}{Petunia}[\matrilineal]
+\pcdef{Dursleys}{Petunia}{Dudly}
+
+\indvdldef{Harry}{Harry}
+\newsavebox{\boxA}
+\newsavebox{\boxB}
+\savebox{\boxA}{\hbox{Petunia}}
+\savebox{\boxB}{\hbox{Lily}}
+\indvdldef{Lily}{Lily}[\matrilineal][\dimexpr\wd\boxA - \wd\boxB\relax]
+\pcdef{Potters}{Lily}{Harry}
+
+\sblngdef{sis}{Dursleys,Potters}
+
+\begin{tabular}{l}
+\fbox{\usebox{\Dursleys}}\\
+\fbox{\usebox{\Potters}}\\
+\\
+\fbox{\usebox{\sis}}
+\end{tabular}
diff --git a/macros/latex/contrib/familytree/figs/fig3Lily4.tex b/macros/latex/contrib/familytree/figs/fig3Lily4.tex
new file mode 100644
index 0000000000..bcf9653fe8
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/fig3Lily4.tex
@@ -0,0 +1,18 @@
+\indvdldef{Dudly}{Dudly}
+\indvdldef{Petunia}{Petunia}[\matrilineal]
+\pcdef{Dursleys}{Petunia}{Dudly}
+
+\indvdldef{Harry}{Harry}
+\newsavebox{\boxA}
+\savebox{\boxA}{\hbox{Petunia}}
+\indvdldef{Lily}{\hbox to \wd\boxA{Lily}}[\matrilineal]
+\pcdef{Potters}{Lily}{Harry}
+
+\sblngdef{sis}{Dursleys,Potters}
+
+\begin{tabular}{l}
+\fbox{\usebox{\Dursleys}}\\
+\fbox{\usebox{\Potters}}\\
+\\
+\fbox{\usebox{\sis}}
+\end{tabular}
diff --git a/macros/latex/contrib/familytree/figs/fig3Robert1.tex b/macros/latex/contrib/familytree/figs/fig3Robert1.tex
new file mode 100644
index 0000000000..977e30e71d
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/fig3Robert1.tex
@@ -0,0 +1,12 @@
+\indvdldef{youngSybil}{Lady Sybil}
+\indvdldef{youngEdith}{Lady Edith}
+\indvdldef{youngMary}{Lady Mary}
+\sblngdef{youngSis}{youngMary,youngEdith,youngSybil}
+
+\indvdldef{Robert}{Robert Crawley}
+ [7th Earl of Grantham,\maleline][2em]
+\pcdef{RobertDaughters}{Robert}{youngSis}
+
+\indvdldef{Rosamund}{Rosamund Painswick}
+\sblngdef{RobertRosamund}{RobertDaughters,Rosamund}
+\fbox{\usebox{\RobertRosamund}}
diff --git a/macros/latex/contrib/familytree/figs/fig3Robert2.tex b/macros/latex/contrib/familytree/figs/fig3Robert2.tex
new file mode 100644
index 0000000000..82dd9b6c48
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/fig3Robert2.tex
@@ -0,0 +1,13 @@
+\indvdldef{youngSybil}{Lady Sybil}
+\indvdldef{youngEdith}{Lady Edith}
+\indvdldef{youngMary}{Lady Mary}
+\sblngdef{youngSis}{youngMary,youngEdith,youngSybil}
+
+\indvdldef{Robert}{Robert Crawley}[7th Earl of Grantham,\maleline]
+\indvdldef{Rosamund}{Rosamund Painswick}
+\sblngdef{RobertRosamund}{Robert,Rosamund}
+
+\gensdef{family}{RobertRosamund}{
+ {Robert}{youngSis}
+}
+\fbox{\usebox{\family}}
diff --git a/macros/latex/contrib/familytree/figs/fig3sis.tex b/macros/latex/contrib/familytree/figs/fig3sis.tex
new file mode 100644
index 0000000000..e5b2f57dac
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/fig3sis.tex
@@ -0,0 +1,11 @@
+\sblngboxcfg{1ex}
+\indvdldef{youngSybil}{Lady Sybil}
+\indvdldef{youngEdith}{Lady Edith}
+\indvdldef{youngMary}{Lady Mary}
+\sblngdef{youngSis}{youngMary,youngEdith,youngSybil}
+%\fbox{\usebox{\youngSis}}
+
+\indvdldef{Robert}{Robert Crawley}[7th Earl of Grantham]
+
+\pcdef{family}{Robert}{RobertRosamund}
+\fbox{\usebox{\family}}
diff --git a/macros/latex/contrib/familytree/figs/fig4HenryVIII.tex b/macros/latex/contrib/familytree/figs/fig4HenryVIII.tex
new file mode 100644
index 0000000000..afdbe83eba
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/fig4HenryVIII.tex
@@ -0,0 +1,20 @@
+\indvdldef{HenryVIII}{King Henry VIII}[]
+
+\indvdldef[\ftblank]{CatherineofAragon}{Catherine of Aragon}
+ [married in 1509,\haschild]
+\indvdldef[\ftblank]{Elizabeth}{Elizabeth Blount}
+ [mistress,\haschild,\private]
+\indvdldef[\ftblank]{AnneBoleyn}{Anne Boleyn}
+ [m. 1533,\haschild]
+\indvdldef[\ftblank]{Jane}{Jane Seymour}
+ [m. 1536,\haschild]
+\indvdldef[\ftblank]{AnneofCleves}{Anne of Cleves}
+ [m. 1540]
+\indvdldef[\ftblank]{CatherineHoward}{Catherine Howard}
+ [m. 1540]
+\indvdldef[\ftblank]{CatherineParr}{Catherine Parr}
+ [m. 1543]
+
+\mrrgdef{HenryVIIIWives}{}{HenryVIII}{CatherineofAragon,Elizabeth,%
+ AnneBoleyn,Jane,AnneofCleves,CatherineHoward,CatherineParr}
+\fbox{\usebox{\HenryVIIIWives}}
diff --git a/macros/latex/contrib/familytree/figs/fig4Lily1.tex b/macros/latex/contrib/familytree/figs/fig4Lily1.tex
new file mode 100644
index 0000000000..c8a36a7b03
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/fig4Lily1.tex
@@ -0,0 +1,10 @@
+\indvdldef{Petunia}{Petunia}
+\indvdldef[\blank]{Vernon}{Vernon Dursley}[\haschild]
+\mrrgdef{Dursleys}{Vernon}{Petunia}{}
+
+\indvdldef{Lily}{Lily}
+\indvdldef[\blank]{James}{James Potter}[\haschild]
+\mrrgdef{Potters}{James}{Lily}{}
+
+\sblngdef{sis}{Dursleys,Potters}
+\fbox{\usebox{\sis}}
diff --git a/macros/latex/contrib/familytree/figs/fig4Lily2.tex b/macros/latex/contrib/familytree/figs/fig4Lily2.tex
new file mode 100644
index 0000000000..04d1167de2
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/fig4Lily2.tex
@@ -0,0 +1,12 @@
+\indvdldef{Petunia}{Petunia}
+\indvdldef[\blank]{Vernon}{Vernon Dursley}[\haschild]
+\mrrgdef{Dursleys}{Vernon}{Petunia}{}
+
+\newsavebox{\boxA}
+\savebox{\boxA}{\hbox{Petunia}}
+\indvdldef{Lily}{\hbox to \wd\boxA{Lily}}
+\indvdldef[\blank]{James}{James Potter}[\haschild]
+\mrrgdef{Potters}{James}{Lily}{}[\dimexpr\wd\Vernon - \wd\James\relax]
+
+\sblngdef{sis}{Dursleys,ivali,Potters}
+\fbox{\usebox{\sis}}
diff --git a/macros/latex/contrib/familytree/figs/fig4Lily3.tex b/macros/latex/contrib/familytree/figs/fig4Lily3.tex
new file mode 100644
index 0000000000..5abc54e43b
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/fig4Lily3.tex
@@ -0,0 +1,12 @@
+\indvdldef{Petunia}{Petunia}
+\indvdldef[\blank]{Vernon}{Vernon Dursley}[\haschild]
+\mrrgdef{Dursleys}{Vernon}{Petunia}{}
+
+\newsavebox{\boxA}
+\savebox{\boxA}{\hbox{Petunia}}
+\indvdldef{Lily}{\hbox to \wd\boxA{Lily}}
+\indvdldef[\blank]{James}{James Potter}[\haschild]
+\mrrgdef{Potters}{}{Lily}{James}[\dimexpr\wd\Vernon - \wd\James\relax]
+
+\sblngdef{sis}{Dursleys,Potters}
+\fbox{\usebox{\sis}}
diff --git a/macros/latex/contrib/familytree/figs/fig4Lily4.tex b/macros/latex/contrib/familytree/figs/fig4Lily4.tex
new file mode 100644
index 0000000000..c310fe8b19
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/fig4Lily4.tex
@@ -0,0 +1,12 @@
+\indvdldef{Petunia}{Petunia}
+\indvdldef[\blank]{Vernon}{Vernon Dursley}[\haschild]
+\mrrgdef{Dursleys}{Vernon}{Petunia}{}
+
+\newsavebox{\boxA}
+\savebox{\boxA}{\hbox{Petunia}}
+\indvdldef{Lily}{\hbox to \wd\boxA{Lily}}
+\indvdldef[\blank]{James}{James Potter}[\haschild]
+\mrrgdef{Potters}{}{Lily}{James}[\dimexpr\wd\Vernon - \wd\James\relax]
+
+\sblngdef{sis}{Dursleys,ivali,Potters}
+\fbox{\usebox{\sis}}
diff --git a/macros/latex/contrib/familytree/figs/fig4Robert.tex b/macros/latex/contrib/familytree/figs/fig4Robert.tex
new file mode 100644
index 0000000000..0ce946757b
--- /dev/null
+++ b/macros/latex/contrib/familytree/figs/fig4Robert.tex
@@ -0,0 +1,23 @@
+\indvdldef{Robert}{Robert Crawley}[7th Earl of Grantham]
+\indvdldef[\ftblank]{Cora}{Cora Crawley}
+ [Countess of Grantham,\haschild]
+\mrrgdef{seven}{}{Robert}{Cora}
+\fbox{\usebox{\seven}}
+%
+\hfill\hskip0pt
+\makeatletter
+\let\nameuse=\@nameuse
+\makeatother
+\newcommand{\boxsz}[1]{%
+ \texttt{\textbackslash#1} & \nameuse{#1}\\%
+}
+\newcommand{\tblA}{%
+ \begin{tabular}{l|l}%
+ \boxsz{sevennameCY}%
+ \boxsz{sevenRobertnameCY}%
+ \boxsz{sevenCoramrrgCY}%
+ \end{tabular}%
+}
+\par
+\bigskip
+\hfill\tblA
diff --git a/macros/latex/contrib/familytree/fonts.tex b/macros/latex/contrib/familytree/fonts.tex
new file mode 100644
index 0000000000..7b005826ae
--- /dev/null
+++ b/macros/latex/contrib/familytree/fonts.tex
@@ -0,0 +1,3 @@
+\usepackage[scaled=.95]{erewhon}
+\usepackage[erewhon,vvarbb,bigdelims]{newtxmath}
+\usepackage[scale=.95]{Chivo}
diff --git a/macros/latex/contrib/familytree/ft-gens.dtx b/macros/latex/contrib/familytree/ft-gens.dtx
new file mode 100644
index 0000000000..f179f060ec
--- /dev/null
+++ b/macros/latex/contrib/familytree/ft-gens.dtx
@@ -0,0 +1,365 @@
+% \iffalse
+% Copyright 2022 Jiro Senju
+%
+% This package is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2 of the License, or
+% any later version.
+%
+% This package is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this package. If not, see <http://www.gnu.org/licenses/>.
+% \fi
+%
+% \newcommand{\tOne}{Parent-child Relationship Box or Generations Box}
+% \newcommand{\tTwo}{(\texttt{ft-gens.dtx})}
+% \section[\tOne{} \tTwo]{\tOne\\\tTwo}
+%
+% \DescribeMacro{\pcdef}
+% \cmd{\pcdef
+% \marg{new box name}
+% \marg{parent box name}
+% \marg{child box name}
+% }
+% \medskip
+%
+% Defines a parent-child relationship box.
+% Connects the given \meta{parent box} and \meta{child box} by a line,
+% and creates a new box \meta{new box name}.
+%
+% \meta{parent box} is a box who has only one line from an individual
+% name to one's child. For example, the box created by |\indvdldef| with
+% |\maleline| attribute (and equivalent) is specified.
+% Obviously, \meta{child box} is a box who has a line to one's parent.
+% For example, the box created by |\indvdldef| with |\biological| or
+% |\adopted| is specified as a child mark.
+%
+% |\pcdef| is a simplified version of |\gensdef|, which is discussed next.
+% \bigskip
+%
+% \noindent
+% \DescribeMacro{\gensdef}
+% \cmd{\gensdef
+% \marg{new box name}
+% \marg{parent box name}
+% \marg{list of connection-pair}
+% }
+%
+% \begin{tabbing}
+% \hspace{4em} \=\kill
+% \texttt{connection-pair :=}\\
+% \> \marg{individual box name in the parent box}\\
+% \> \marg{child box name}
+% \end{tabbing}
+% \medskip
+%
+% Defines a two-generations box.
+% Same to |\pcdef|, \meta{child box} is a box who has only one line to
+% the parent, but \meta{parent box} can have multiple lines to one's child.
+% It is \meta{connection-pair} that makes it clear which parent connects
+% to which child box.
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsection{Example}
+%
+% \begin{enumerate}
+% \item
+% |\sblngdef| for daughters, |\pcdef|, and then |\sblngdef| for their
+% parent generation.
+% \srcfig{fig3Robert1}
+%
+% \needspace{2\baselineskip}
+% \item
+% two |\sblngdef|, and then |\gensdef|. The result is essentially same.
+% One difference is the space between the siblings which was
+% automatically adjusted in previous example.
+% \srcfig{fig3Robert2}
+% \end{enumerate}
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsection{The order of connecting multiple boxes}
+% \label{sec:Lily1}
+%
+% If we get |\sblngdef| as a tool to align the individual boxes in
+% column, then |\pcdef| and |\gensdef| are the tool to align the boxes
+% in row.
+% When the siblings have their child for each, then there are multiple
+% parent-child relationships, so it is better to call it generations box
+% rather than parent-child box.
+%
+% There are two ways to draw such tree. One is to define parent-child
+% first and then define the siblings of the parent generation. The other
+% is in the reverse order, eg. to define the siblings of the parent
+% generation first and then define the parent-child relationship for each.
+%
+% Let's consider about these two ways.
+%
+% \begin{enumerate}
+% \needspace{2\baselineskip}
+% \item
+% define two parent-child relationships, and then define the siblings.
+%
+% \srcfig{fig3Lily1}
+%
+% \needspace{3\baselineskip}
+% \item
+% define the sisters, and then define the parent-child for each.
+%
+% \srcfig{fig3Lily2}
+% \end{enumerate}
+%
+% As you see, by the 1st method the length of two lines to their child
+% differs and the positions (in horizontal) of the child generation are
+% not equal. That makes the tree uneasy to understand straightforward.
+% It is because that the feature of |\sblngdef| to set the line length
+% to the longest one didn't work.
+% The argument passed to |\sblngdef| were already connected to the child,
+% so if |\sblngdef| extended the line it would be much worse result.
+%
+% On the other hand, by the 2nd method, the argument passed to
+% |\sblngdef| were not connected to the child. So it is harmless if
+% |\sblngdef| extends the line.
+% \smallskip
+%
+% Even if you took the 1st method, there still exists to make the line
+% length equal.
+% Using |\indvdldef| feature to adjust the line length, set the length
+% of Lily's |\femaleline| (|\matrilineal|) to the one of Petunia's.
+% To achieve this, calculate the difference of the name length of these
+% sisters and give an optional argument of |\indvdldef|.
+% The result should be same to above.
+% \medskip
+%
+% \srcfig{fig3Lily3}
+% \medskip
+%
+% You can get the same result if you use |\nameboxcfg| since it has a
+% feature to set the length of a line to child.
+% But it is not a good idea to use |\nameboxcfg| every time when you
+% |\indvdldef|. The value set by |\nameboxcfg| should be applied wider,
+% and it is not supposed to use for a single |\indvdldef|. It is better
+% to append an optional argument to |\indvdldef|.
+% \smallskip
+%
+% There is one more option. It is to set the length of Lily's name to Petunia's.
+% By this method, the space between Lily's name and the line to child
+% becomes wider and the length of lines become equal.
+% \medskip
+%
+% \srcfig{fig3Lily4}
+% \medskip
+%
+% The sequence or the order to define and connect the boxes is important.
+% In connecting the boxes, this package considers the size of the
+% being connected individual boxes. For example, the sibling box
+% considers the height of the
+% individual box and makes the boxes to be never overlapped.
+% But in connecting a child to the already defined sibling box, this
+% feature doesn't work. So the children of the siblings may be
+% overlapped. In this case, you need to insert the interval box between
+% the siblings manually.
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsectImpl
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsubsection{Generations box --- core}
+%
+% \iffalse
+% \parag{Customization}
+%
+% \DescribeMacro{\ftgenscfg}
+% \NoDescription
+% \begin{macrocode}
+% \newcommand{\ftgenscfg}[1]{%
+% }
+% \end{macrocode}
+% \fi
+%
+% \parag{Connection pair}
+%
+% \DescribeMacro{\ft@getpair}
+% Extracts a connection-pair from the given list,
+% defines the connection-point in the parent box (the former of the pair)
+% as |\ft@cpoint|, and defines the child box name (the latter of the
+% pair) as |\ft@kids|.
+% \smallskip
+%
+% \begin{macrocode}
+\def\ft@getpair#1#2#3{% connection-pair parent-box-name
+ \ft@dbgmsg{args #1, #2, #3}%
+ \@ifundefined{#3#1nameCY}{%
+ \@ifundefined{#3#1mrrgCY}{%
+ \xdef\ft@cpoint{#1nameCY}%
+ }{%
+ \xdef\ft@cpoint{#3#1mrrgCY}%
+ }%
+ }{%
+ \xdef\ft@cpoint{#3#1nameCY}%
+ }%
+ \xdef\ft@kids{#2}%
+}
+% \end{macrocode}
+%
+% \parag{Top margin}
+%
+% \DescribeMacro{\def@calc@xtop}
+%
+% \begin{macrocode}
+\newcommand{\ft@calc@xtop}[4]{% name parent cpoint kids
+ % top half of kids
+ \ft@len=\dimexpr\ht\@nameuse{#4} - \@nameuse{#4nameCY}pt\relax\relax%
+ % top half of parent cpoint
+ \@tempskipa=\dimexpr\ht\@nameuse{#2} - \@nameuse{#3}pt\relax\relax%
+ %
+ \ifdim\ft@len<\@tempskipa%
+ \ft@len=0pt%
+ \else%
+ \advance\ft@len -\@tempskipa%
+ \fi%
+ \global#1=\ft@len%
+}
+% \end{macrocode}
+%
+% \parag{Bottom margin}
+%
+% \DescribeMacro{\ft@calc@xbottom}
+%
+% \begin{macrocode}
+\newcommand{\ft@calc@xbottom}[4]{% name parent cpoint kids
+ % bottom half of kids
+ \ft@len=\@nameuse{#4nameCY}pt\relax%
+ % bottom half of parent cpoint
+ \@tempskipa=\@nameuse{#3}pt\relax%
+ %
+ \ifdim\ft@len=\@tempskipa%
+ \ft@len=0pt%
+ \global\setlength{\ft@depth}{\dp\@nameuse{#2}}%
+ \ifdim\ft@depth<\dp\@nameuse{#4}%
+ \global\setlength{\ft@depth}{\dp\@nameuse{#4}}%
+ \fi%
+ \else%
+ \ifdim\ft@len<\@tempskipa%
+ \ft@len=0pt%
+ \global\setlength{\ft@depth}{\dp\@nameuse{#2}}%
+ \else%
+ \advance\ft@len -\@tempskipa%
+ \global\setlength{\ft@depth}{\dp\@nameuse{#4}}%
+ \fi%
+ \fi%
+ \global#1=\ft@len%
+}
+% \end{macrocode}
+%
+% \parag{Calculate the box size}
+%
+% \DescribeMacro{\ft@gens@size}
+%
+% \begin{macrocode}
+\newlength{\ft@xtop}
+\newlength{\ft@xbottom}
+\newcommand{\ft@gens@size}[2]{% parent-box connect-pair-list
+ \@tempswatrue%
+ \ft@width=0pt%
+ \@for\@temptokena:=#2\do{%
+ \expandafter\ft@getpair\@temptokena{#1}%
+ \ft@dbgmsg{\ft@cpoint and \ft@kids}%
+ \if@tempswa%
+ \ft@calc@xtop{\ft@xtop}{#1}{\ft@cpoint}{\ft@kids}%
+ \@tempswafalse%
+ \fi%
+ \setlength{\ft@len}{\wd\@nameuse{\ft@kids}}%
+ \ifdim\ft@width<\ft@len%
+ \global\ft@width=\ft@len%
+ \fi%
+ }%
+ \ft@calc@xbottom{\ft@xbottom}{#1}{\ft@cpoint}{\ft@kids}%
+ \ft@dbgmsg{xtop \the\ft@xtop, xbottom \the\ft@xbottom}%
+ %
+ \ft@x=\dimexpr\wd\@nameuse{#1}% - \ft@cmarkbox@length\relax%
+ \ft@dbgmsg{x \the\ft@x}%
+ \advance\ft@width \ft@x%
+ \ft@dbgmsg{w \the\ft@width}%
+ \ft@height=\dimexpr\ht\@nameuse{#1} + \ft@xtop + \ft@xbottom\relax%
+ \ft@dbgmsg{kids H \the\ht\@nameuse{\ft@kids}}%
+ \ft@dbgmsg{H \strip@pt\ft@height, D \strip@pt\ft@depth}%
+}
+% \end{macrocode}
+%
+% \parag{Layout}
+%
+% \DescribeMacro{\ft@gens@layout}
+%
+% \begin{macrocode}
+\newcommand{\ft@gens@layout}[3]{%
+ % box-name parent-box-name {{parent-name} {child-name}, ...}
+ \ft@newnamebox{#1}{%
+ \edef\@w{\strip@pt\ft@width}%
+ \edef\@h{\strip@pt\ft@height}%
+ \begin{picture}(\@w,\@h)%
+ \ft@dbgframe{\@w,\@h}%
+ %
+ \ft@y=\ft@xbottom%
+ \ft@dbgplot{0,\strip@pt\ft@y}%
+ \put(0,\strip@pt\ft@y){\usebox{\@nameuse{#2}}}%
+ \advance\ft@y \@nameuse{#2nameCY}pt%
+ \ft@namexdefstrip{#1nameCY}{\ft@y}%
+ %\ft@namexdefstrip{#1#2nameCY}{\ft@y}%
+ %
+ \@for\@temptokena:=#3\do{%%
+ \expandafter\ft@getpair\@temptokena{#2}%
+ \ft@dbgmsg{\ft@cpoint and \ft@kids}%
+ %
+ \ft@y=\dimexpr\ft@xbottom + \@nameuse{\ft@cpoint}pt\relax%
+ \ft@dbgmsg{parent cpoint \the\ft@y}%
+ \ft@dbgplot{\strip@pt\ft@x,\strip@pt\ft@y}%
+ %
+ \advance\ft@y -\@nameuse{\ft@kids nameCY}pt%
+ \ft@dbgmsg{final child y \the\ft@y}%
+ \put(\strip@pt\ft@x,\strip@pt\ft@y){%
+ \usebox{\@nameuse{\ft@kids}}}%
+ \ft@namexdefstrip{#1\ft@kids Y}{\ft@y}%
+ }%
+ \end{picture}%
+ }%
+}
+% \end{macrocode}
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsubsection{Generations box --- interface}
+%
+% \DescribeMacro{\ftgensdef}
+%
+% \begin{macrocode}
+\newcommand{\ftgensdef}[3]{%
+ % box-name parent-box-name {{parent-name} {child-name}, ...}
+ %
+ % calculate the size of the new box
+ \ft@gens@size{#2}{#3}%
+ %
+ % draw them all
+ \ft@gens@layout{#1}{#2}{#3}%
+ %
+ \@ifundefined{#2hascmark}{}{%
+ \ft@namexdef{#1hascmark}{\@nameuse{#2hascmark}}%
+ }%
+ \ft@nameboxsz{#1}{\ft@height}{\ft@depth}%
+}
+\ft@alias{gensdef}
+% \end{macrocode}
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsubsection{Parent-child box --- interface}
+%
+% \DescribeMacro{\ftpcdef}
+%
+% \begin{macrocode}
+\newcommand{\ftpcdef}[3]{% box-name parent-box-name child-box-name
+ \ftgensdef{#1}{#2}{{#2}{#3}}%
+}
+\ft@alias{pcdef}
+% \end{macrocode}
diff --git a/macros/latex/contrib/familytree/ft-individual.dtx b/macros/latex/contrib/familytree/ft-individual.dtx
new file mode 100644
index 0000000000..a8b0e4eacf
--- /dev/null
+++ b/macros/latex/contrib/familytree/ft-individual.dtx
@@ -0,0 +1,760 @@
+% \iffalse
+% Copyright 2022 Jiro Senju
+%
+% This package is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2 of the License, or
+% any later version.
+%
+% This package is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this package. If not, see <http://www.gnu.org/licenses/>.
+% \fi
+%
+% \section{Individual Box (\texttt{ft-individual.dtx})}
+%
+% \DescribeMacro{\indvdldef}
+% \indent
+% \cmd{\indvdldef
+% \oarg{child mark}
+% \marg{new box name}
+% \oarg{title}
+% \marg{individual name}
+% \oarg{additional info}
+% \oarg{maleline xlength}
+% }
+% \medskip
+%
+% Defines a new box named \meta{new box name}, and layouts the
+% given arguments in that box.
+%
+% \begin{enumerate}
+% \item \oarg{child mark}
+% \par
+% The type of a line which is located ahead of the individual name.
+% \par
+% Specify one of |\ftbiological|,
+% |\ftadopted|,
+% |\fttop|,
+% or |\ftblank|.
+% Details are discussed later.
+%
+% \item \marg{new box name}
+% \par
+% The name of a new box.
+% \par
+% This is not a \CS{} (no backslash).
+%
+% \item \oarg{title}
+% \par
+% One's title.
+% \par
+% Put at the shoulder of the individual name with a smaller font
+% (|\relsize{-2}|).
+%
+% \item \marg{individual name}
+% \par
+% One's name.
+%
+% \item \oarg{additional info}
+% \par
+% Additional information.
+% \par
+% Anything can be added such as birth\slash death year-month-date and alias.
+% Put with a little smaller font (|\relsize{-1}|) at next to the individual name.
+% Also the attributes (discussed later),
+% |\ftmaleline| (|\ftfemaleline|, |\ftpatrilineal|, |\ftmatrilineal|),
+% \allowbreak|\fthaschild|,
+% |\ftprivate| are specified here.
+%
+% \item \oarg{maleline xlength}
+% \par
+% When you draw a line from an individual (instead of a marriage box) to
+% a child, the length of the line can be adjusted by this argument.
+% But in the sibling box, the line length will be adjusted automatically
+% regardless this argument.
+% \end{enumerate}
+%
+% Also |\indvdldef| defines some connection points as \CS. The origin is
+% left-bottom of the box and the unit is |pt|.
+%
+% \begin{table}
+% \hfil\begin{tabular}{ll}
+% \meta{box name}|nameX| &
+% the tail of the individual name
+% \\
+%
+% \meta{box name}|nameCX| &
+% the center of the width of individual name
+% \\
+%
+% \meta{box name}|nameCY| &
+% the center of the height of individual name
+% \end{tabular}
+% \end{table}
+%
+% For \oarg{child mark}, you can specify one of these values.
+%
+% \begin{itemize}
+% \item |\biological| or |\ftbiological|
+% \par
+% a single line to represent a biological\slash real child.
+%
+% \item |\adopted| or |\ftadopted|
+% \par
+% a double line to represent an adopted child.
+%
+% \item |\fttop| (or |\top|)
+% \par
+% no line at all.
+%
+% \item |\blank| or |\ftblank|
+% \par
+% put a space whose size is equal to the |\biological| or |\adopted| mark,
+% assuming used for the spouse in a marriage box.
+% \end{itemize}
+% \bigskip
+%
+% For \oarg{additional info}, you can specify any of these attributes.
+%
+% \begin{itemize}
+% \item |\haschild| or |\fthaschild|
+% \par
+% represents a spouse who has a child.
+% draws a line in a marriage box to their child from the center of the
+% double line which represents a marriage.
+%
+% \item |\private| or |\ftprivate|
+% \par
+% represents the marriage is not official.
+% draws a dashed double line.
+%
+% \item |\maleline| or |\ftmaleline|
+% \par
+% draws a line to a child from the individual name instead of the double
+% line in the marriage box.
+% |\ftfemaleline|,
+% |\ftpatrilineal|,
+% |\ftmatrilineal| are all equivalent.
+% \end{itemize}
+% \bigskip
+%
+% The individual box consists of a few smaller boxes.
+%
+% \begin{itemize}
+% \item |\ft@titlebox|
+% \item |\ft@namebox|
+% \par
+% In |\ft@namebox|, there are |\ft@cmarkbox| which represents the
+% \meta{child mark}
+% and |\ft@malelinebox| which represents \meta{maleline}.
+%
+% \item |\ft@optbox|
+% \end{itemize}
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsection{Customization}
+%
+% \DescribeMacro{\nameboxcfg}
+% \indent
+% \cmd{\nameboxcfg
+% \marg{space from the child mark}
+% \marg{font}
+% \marg{space to the maleline}
+% \marg{maleline length}
+% }
+% \medskip
+%
+% \DescribeMacro{\cmarkboxcfg}
+% \cmd{\cmarkboxcfg
+% \marg{space between two lines, for adopted}
+% \marg{line length}
+% }
+% \medskip
+%
+% \DescribeMacro{\titleboxcfg}
+% \cmd{\titleboxcfg
+% \marg{indent}
+% \marg{font}
+% \marg{linestretch}
+% \marg{vspace to the individual name}
+% }
+% \medskip
+%
+% \DescribeMacro{\optboxcfg}
+% \cmd{\optboxcfg
+% \marg{vspace from the individual name}
+% \marg{indent}
+% \marg{font}
+% \marg{linestretch}
+% }
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \needspace{12ex}
+% \subsection{Example}
+%
+% \begin{enumerate}
+% \item
+% \srcfig{fig1Robert1}
+%
+% \item
+% \srcfig{fig1Robert2}
+% \end{enumerate}
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsectImpl
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsubsection{Child-mark box}
+%
+% \parag{Customization}
+%
+% \DescribeMacro{\ftcmarkboxcfg}
+% \DescribeMacro{\cmarkboxcfg}
+%
+% \begin{macrocode}
+\newlength{\ft@cmarkbox@adopted@sep}
+\setlength{\ft@cmarkbox@adopted@sep}{4pt}
+\newlength{\ft@cmarkbox@length}
+\setlength{\ft@cmarkbox@length}{1\ft@unit}
+\newcommand{\ftcmarkboxcfg}[2]{% adopted-sep line-length
+ \ifx#1\empty\else%
+ \setlength{\ft@cmarkbox@adopted@sep}{#1}%
+ \fi%
+ \ifx#2\empty\else%
+ \setlength{\ft@cmarkbox@length}{#2}%
+ \fi%
+}
+\ft@alias{cmarkboxcfg}
+% \end{macrocode}
+%
+% \parag{Define a box}
+%
+% \DescribeMacro{\fttop}
+% \DescribeMacro{\top}
+% \DescribeMacro{\ftbiological}
+% \DescribeMacro{\biological}
+% \DescribeMacro{\ftadopted}
+% \DescribeMacro{\adopted}
+% \DescribeMacro{\ftblank}
+% \DescribeMacro{\blank}
+%
+% \begin{macrocode}
+\chardef\fttop=0
+\chardef\ftbiological=1
+\chardef\ftadopted=2
+\chardef\ftblank=3
+\ft@alias{top}
+\ft@alias{biological}
+\ft@alias{adopted}
+\ft@alias{blank}
+% \end{macrocode}
+%
+% \DescribeMacro{\ft@indvdl@nameH}
+% \DescribeMacro{\ft@indvdl@nameD}
+% \DescribeMacro{\ft@indvdl@nameCY}
+% \DescribeMacro{\ft@do@cmarkdef}
+% \DescribeMacro{\ft@cmarkdef}
+%
+% \begin{macrocode}
+\newsavebox{\ft@cmarkbox}
+\newlength{\ft@cmarkW}
+\newlength{\ft@indvdl@nameH}
+\newlength{\ft@indvdl@nameD}
+\newlength{\ft@indvdl@nameCY}
+\newcommand{\ft@do@cmarkdef}[4]{% cmarkbox-name cmark width line-length
+ \ft@savenamebox{#1}{%
+ \edef\@w{\strip@pt#3}%
+ \edef\@h{\strip@pt\ft@indvdl@nameH}%
+ \edef\@l{\strip@pt#4}%
+ \begin{picture}(\@w,\@h)%
+ \ft@dbgframe{\@w,\@h}%
+ \ifcase#2% fttop
+ \or% ftbiological
+ \put(0,\strip@pt\ft@indvdl@nameCY){\line(1,0){\@l}}%
+ \or% ftadopted
+ \ft@y=\dimexpr\ft@indvdl@nameCY%
+ + .5\ft@cmarkbox@adopted@sep\relax%
+ \put(0,\strip@pt\ft@y){\line(1,0){\@l}}%
+ \advance\ft@y -\ft@cmarkbox@adopted@sep%
+ \put(0,\strip@pt\ft@y){\line(1,0){\@l}}%
+ \or% \ftblank
+ \fi%
+ \end{picture}%
+ }%
+ \ft@nameboxsz{#1}{\ft@indvdl@nameH}{\ft@indvdl@nameD}%
+}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand{\ft@cmarkdef}[4]{%
+ % cmarkbox-name cmark cmark-xlength cmark-space
+ \ft@savenamebox{#1}{}% empty
+ \ifcase#2% fttop
+ \else%
+ \ft@len=\dimexpr\ft@cmarkbox@length + #3\relax\relax%
+ \ifdim\ft@len>0pt%
+ \ft@do@cmarkdef{#1}{#2}{\dimexpr\ft@len + #4\relax}{\ft@len}%
+ \fi%
+ \fi%
+ \ft@dbgbox{\@nameuse{#1}}%
+}
+% \end{macrocode}
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \needspace{3\baselineskip}
+% \subsubsection{Additional info box}
+% \nopagebreak
+%
+% \parag{Customization}
+%
+% \DescribeMacro{\ftoptboxcfg}
+% \DescribeMacro{\optboxcfg}
+%
+% \begin{macrocode}
+\newlength{\ft@optbox@vsp}
+\setlength{\ft@optbox@vsp}{.1\baselineskip}
+\newlength{\ft@optbox@indent}
+\setlength{\ft@optbox@indent}{1.1\ft@unit}
+\newcommand{\ft@optbox@font}{\relsize{-1}}%{\footnotesize}
+\newcommand{\ft@optbox@linestretch}{.75}
+\newcommand{\ftoptboxcfg}[4]{% vsp indent font linestretch
+ \ifx#1\empty\else%
+ \setlength{\ft@optbox@vsp}{#1}%
+ \fi%
+ \ifx#2\empty\else%
+ \setlength{\ft@optbox@indent}{#2}%
+ \fi%
+ \ifx#3\empty\else%
+ \renewcommand{\ft@optbox@font}{#3}%
+ \fi%
+ \ifx#4\empty\else%
+ \renewcommand{\ft@optbox@linestretch}{#4}%
+ \fi%
+}
+\ft@alias{optboxcfg}
+% \end{macrocode}
+%
+% \parag{Parsing}
+%
+% \DescribeMacro{\ftmaleline}
+% \DescribeMacro{\maleline}
+% \DescribeMacro{\fthaschild}
+% \DescribeMacro{\haschild}
+% \DescribeMacro{\ftprivate}
+% \DescribeMacro{\private}
+%
+% \begin{macrocode}
+\newcommand{\ftmaleline}{ft@attr0}
+\let\ftfemaleline=\ftmaleline
+\let\ftpatrilineal=\ftmaleline
+\let\ftmatrilineal=\ftmaleline
+\newcommand{\fthaschild}{ft@attr1}
+\newcommand{\ftprivate}{ft@attr2}
+\ft@alias{maleline}
+\ft@alias{femaleline}
+\ft@alias{patrilineal}
+\ft@alias{matrilineal}
+\ft@alias{haschild}
+\ft@alias{private}
+% \end{macrocode}
+%
+% \DescribeMacro{\ft@optlist}
+%
+% Extracts the attributes from \meta{option-list} (which is
+% \meta{additional info} itself) and sets a global flag whose name is
+% generated using \meta{box-name}.
+% Other than the attributes are appended another list, \meta{list} which
+% will be printed later.
+%
+% \begin{macrocode}
+\newcommand{\ft@optlist}[3]{% list box-name option-list
+ \edef\@male{\ftmaleline}%
+ \edef\@hasch{\fthaschild}%
+ \edef\@priv{\ftprivate}%
+ \@for\@temptokena:=#3\do{%
+ \edef\@opt{\@temptokena}%
+ \ft@dbgmsg{\@opt}%
+ \ifx\@opt\@male%
+ \global\ft@malelinetrue%
+ \ft@namexdef{#2hasmaleline}{\ftmaleline}%
+ \else%
+ \ifx\@opt\@hasch%
+ \ft@namexdef{#2haschild}{\fthaschild}%
+ \else%
+ \ifx\@opt\@priv%
+ \ft@namexdef{#2private}{\ftprivate}%
+ \else%
+ \ft@list@append{#1}{\@opt}%
+ \fi%
+ \fi%
+ \fi%
+ }%
+}
+% \end{macrocode}
+%
+% \parag{Define a box}
+%
+% \DescribeMacro{\ft@opt}
+%
+% \begin{macrocode}
+\newsavebox{\ft@optbox}
+\newcommand{\ft@opt}[1]{% option-list
+ \savebox{\ft@optbox}{%
+ \hspace{\ft@cmarkW}%
+ \hspace{\ft@optbox@indent}%
+ \vbox{%
+ \def\baselinestretch{\ft@optbox@linestretch}%
+ \ft@optbox@font%
+ \vspace{\ft@optbox@vsp}%
+ \@for\@temptokena:=#1\do{%
+ \vss%
+ \hbox{\@temptokena}%
+ \setbox\@tempboxa=\hbox{\@temptokena}%
+ \global\ft@depth=\dp\@tempboxa%
+ }%
+ }%
+ }%
+ \ft@len=\dimexpr\ht\ft@optbox + \dp\ft@optbox - \ft@depth\relax%
+ \ft@boxsz{\ft@optbox}{\ft@len}{\ft@depth}%
+ \ft@dbgbox{\ft@optbox}%
+}
+% \end{macrocode}
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsubsection{Name box}
+%
+% \parag{Customization}
+%
+% \DescribeMacro{\ftnameboxcfg}
+% \DescribeMacro{\nameboxcfg}
+%
+% \begin{macrocode}
+\newlength{\ft@namebox@sp}
+\setlength{\ft@namebox@sp}{.25\ft@unit}
+\newcommand{\ft@namebox@font}{}% empty
+\newlength{\ft@namebox@maleline@sp}
+\setlength{\ft@namebox@maleline@sp}{.25\ft@unit}
+\newlength{\ft@namebox@maleline@length}
+\setlength{\ft@namebox@maleline@length}{1.5\ft@unit}
+\newcommand{\ftnameboxcfg}[4]{% sp font maleline-sp maleline-length
+ \ifx#1\empty\else%
+ \setlength{\ft@namebox@sp}{#1}%
+ \fi%
+ \ifx#2\empty\else%
+ \renewcommand{\ft@namebox@font}{#2}%
+ \fi%
+ \ifx#3\empty\else%
+ \setlength{\ft@namebox@maleline@sp}{#3}%
+ \fi%
+ \ifx#4\empty\else%
+ \setlength{\ft@namebox@maleline@length}{#4}%
+ \fi%
+}
+\ft@alias{nameboxcfg}
+% \end{macrocode}
+%
+% \parag{Define a box}
+%
+% \DescribeMacro{\ft@name}
+%
+% Internally layouts |\ft@cmarkbox|, \meta{individual-name}, and
+% |\ft@malelinebox|.
+% It was difficult to set the length of |maleline|, ie. where to begin the
+% line. Which is better for the head of |maleline|, at the box end of the
+% \meta{individual-name} or at the box end including all the
+% \meta{title}, \meta{individual-name} and \meta{additional info}?
+%
+% The latter looks good, especially when the defined individual box is
+% used alone. But it makes hard for other box definitions to calculate the
+% extra line length to align equal.
+% For such calculation, the former is better since it just has to calculate
+% the difference of the length of names.
+% Finally, I decided to start the line at the end of
+% \meta{individual-name}, and the default length is
+% |\ft@namebox@maleline@length|.
+%
+% In other words, it can happen when an individual box is used alone, the
+% \meta{title} or the \meta{additional info} may be longer than |maleline|.
+%
+% \begin{macrocode}
+\newif\ifft@maleline
+\newsavebox{\ft@malelinebox}
+\newsavebox{\ft@namebox}
+\newcommand{\ft@name}[3]{% box-name individual-name maleline-xlength
+ \setbox\@tempboxa=\hbox{\ft@namebox@font#2}%
+ \ft@len=\dimexpr\wd\@tempboxa + \ft@cmarkW%
+ + \ft@namebox@maleline@sp\relax%
+ \ft@namexdefstrip{#1nameX}{\ft@len}%
+ %
+ \ft@len=\dimexpr\wd\@tempboxa/2 + \ft@cmarkW\relax%
+ \ft@namexdefstrip{#1nameCX}{\ft@len}%
+ %
+ \def\@nm{\ft@namebox@font#2}%
+ \ifft@maleline%
+ % why are two 'relax'es necessary?
+ \@tempskipb=\dimexpr\ft@namebox@maleline@length%
+ - \ft@cmarkbox@length + #3\relax\relax%
+ \ifdim\@tempskipb>0pt%
+ \ft@cmarkdef{ft@malelinebox}{\ftbiological}{\@tempskipb}{0pt}%
+ \def\@nm{%
+ {\ft@namebox@font#2}%
+ \hspace{\ft@namebox@maleline@sp}%
+ \usebox{\ft@malelinebox}%
+ }%
+ \fi%
+ \fi%
+ \ft@dbgmsg{H \the\ht\@tempboxa, D \the\dp\@tempboxa}%
+ \ft@dbgmsg{H \the\ht\ft@cmarkbox, D \the\dp\ft@cmarkbox}%
+ \savebox{\ft@namebox}{%
+ \usebox{\ft@cmarkbox}%
+ \@nm%
+ }%
+ \ft@boxsz{\ft@namebox}{\ht\@tempboxa}{\dp\@tempboxa}%
+ \ft@dbgbox{\ft@namebox}%
+}
+% \end{macrocode}
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \needspace{2\baselineskip}
+% \subsubsection{Title box}
+%
+% \parag{Customization}
+%
+% \hyphenation{line-stretch}
+% \DescribeMacro{\fttitleboxcfg}
+% \DescribeMacro{\titleboxcfg}
+%
+% \begin{macrocode}
+\newlength{\ft@titlebox@indent}
+\setlength{\ft@titlebox@indent}{-.25\ft@unit}
+\newcommand{\ft@titlebox@font}{\relsize{-2}}%{\scriptsize}
+\newcommand{\ft@titlebox@linestretch}{.25}
+\newlength{\ft@titlebox@vsp}
+\setlength{\ft@titlebox@vsp}{.1\baselineskip}
+\newcommand{\fttitleboxcfg}[4]{% indent font linestretch vsp
+ \ifx#1\empty\else%
+ \setlength{\ft@titlebox@indent}{#1}%
+ \fi%
+ \ifx#2\empty\else%
+ \renewcommand{\ft@titlebox@font}{#2}%
+ \fi%
+ \ifx#3\empty\else%
+ \renewcommand{\ft@titlebox@linestretch}{#3}%
+ \fi%
+ \ifx#4\empty\else%
+ \setlength{\ft@titlebox@vsp}{#4}%
+ \fi%
+}
+\ft@alias{titleboxcfg}
+% \end{macrocode}
+%
+% \parag{Define a box}
+%
+% \DescribeMacro{\ft@title}
+%
+% \begin{macrocode}
+\newsavebox{\ft@titlebox}
+\newcommand{\ft@title}[1]{% title
+ \ft@len=\dimexpr\ft@cmarkW + \ft@titlebox@indent\relax%
+ \savebox{\ft@titlebox}{%
+ \vbox{%
+ \def\baselinestretch{\ft@titlebox@linestretch}%
+ \ft@titlebox@font%
+ %
+ \setbox\@tempboxa=\hbox{#1}%
+ \ft@dbgmsg{H \the\ht\@tempboxa, D \the\dp\@tempboxa}%
+ \global\ft@depth=\dp\@tempboxa%
+ \hbox{\hspace{\ft@len}#1}%
+ \vspace{\ft@titlebox@vsp}%
+ \global\advance\ft@depth \ft@titlebox@vsp%
+ }%
+ }%
+ \ft@dbgmsg{H \the\ht\ft@titlebox, D \the\dp\ft@titlebox}%
+ \ft@len=\dimexpr\ht\ft@titlebox + \dp\ft@titlebox - \ft@depth\relax%
+ \ft@boxsz{\ft@titlebox}{\ft@len}{\ft@depth}%
+ \ft@dbgbox{\ft@titlebox}%
+}
+% \end{macrocode}
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsubsection{Combine the boxes --- core}
+%
+% \parag{Generate the boxes}
+%
+% \DescribeMacro{\ft@indvdlbox@gen}
+% \NoDescription
+% \begin{macrocode}
+\newcommand{\ft@indvdlbox@gen}[4]{%
+ % box-name title individual-name maleline-xlength
+ \ft@width=0pt%
+ \IfValueT{#2}{%
+ \ft@title{#2}%
+ \ft@width=\wd\ft@titlebox%
+ }%
+ \global\@tempswafalse%
+ \ifx\ft@indvdl@opts\empty\else%
+ \global\@tempswatrue%
+ \ft@opt{\ft@indvdl@opts}%
+ \ifdim\ft@width<\wd\ft@optbox%
+ \ft@width=\wd\ft@optbox%
+ \fi%
+ \fi%
+ \ft@name{#1}{#3}{#4}%
+}
+% \end{macrocode}
+%
+% \parag{Calculate the size of a name box}
+%
+% \DescribeMacro{\ft@indvdlbox@calc}
+% \NoDescription
+% \begin{macrocode}
+\newcommand{\ft@indvdlbox@calc}[2]{% box-name title
+ \global\ft@width=0pt%
+ \global\ft@height=0pt%
+ \global\ft@depth=0pt%
+ \def\ft@dpri##1{\ft@dbgmsg{##1 W \the\ft@width, H \the\ft@height,%
+ D \the\ft@depth}}%
+ \ft@dpri{h0}%
+ \IfValueT{#2}{%
+ \global\ft@width=\wd\ft@titlebox%
+ \global\ft@height=\dimexpr\ht\ft@titlebox + \dp\ft@titlebox\relax%
+ \ft@dpri{h1}%
+ }%
+ %
+ \global\advance\ft@height \ht\ft@namebox%
+ %
+ % mark this point of the height, to invert it later
+ \ft@y=\dimexpr\ft@height - \ft@indvdl@nameCY\relax%
+ %
+ \ifdim\ft@width<\wd\ft@namebox%
+ \global\ft@width=\wd\ft@namebox%
+ \fi%
+ \if@tempswa%
+ \global\advance\ft@height \dp\ft@namebox%
+ \else%
+ \global\ft@depth=\dp\ft@namebox%
+ \fi%
+ \ft@dpri{h2}%
+ %
+ \if@tempswa%
+ \ifdim\ft@width<\wd\ft@optbox%
+ \global\ft@width=\wd\ft@optbox%
+ \fi%
+ \global\advance\ft@height \ht\ft@optbox%
+ \global\ft@depth=\dp\ft@optbox%
+ \ft@dpri{h3}%
+ \fi%
+ \ft@dpri{h4}%
+ %
+ % invert the y
+ \ft@len=\dimexpr\ft@height - \ft@y\relax%
+ \ft@namexdefstrip{#1nameCY}{\ft@len}%
+}
+% \end{macrocode}
+%
+% \parag{Layout them by \texttt{picture}}
+%
+% \DescribeMacro{\ft@indvdlbox@layout}
+% \NoDescription
+% \begin{macrocode}
+\newcommand{\ft@indvdlbox@layout}[2]{% box-name title
+ \ft@newnamebox{#1}{%
+ \edef\@w{\strip@pt\ft@width}%
+ \edef\@h{\strip@pt\ft@height}%
+ \begin{picture}(\@w,\@h)%
+ \ft@dbgframe{\@w,\@h}%
+ \ft@dbgplot{0,\@nameuse{#1nameCY}}%
+ %
+ \IfValueT{#2}{%
+ \advance\ft@height -\dimexpr\ht\ft@titlebox%
+ + \dp\ft@titlebox\relax%
+ \put(0,\strip@pt\ft@height){\usebox{\ft@titlebox}}%
+ }%
+ \advance\ft@height -\ht\ft@namebox%
+ \put(0,\strip@pt\ft@height){\usebox{\ft@namebox}}%
+ \advance\ft@height -\dp\ft@namebox%
+ \if@tempswa%
+ \advance\ft@height -\ht\ft@optbox%
+ \put(0,\strip@pt\ft@height){\usebox{\ft@optbox}}%
+ \fi%
+ \end{picture}%
+ }%
+ % height should hold the original value
+ \ft@nameboxsz{#1}{\ft@height}{\ft@depth}%
+}
+% \end{macrocode}
+%
+% \parag{Main function to combine the boxes}
+%
+% \DescribeMacro{\ft@indvdlbox}
+% \NoDescription
+% \begin{macrocode}
+\newcommand{\ft@indvdlbox}[4]{%
+ % box-name title individual-name maleline-xlength
+ \ft@indvdlbox@gen{#1}{#2}{#3}{#4}%
+ \ft@indvdlbox@calc{#1}{#2}%
+ \ft@indvdlbox@layout{#1}{#2}%
+ %
+ \ft@dbgbox[\ft@dbgplot{0,\@nameuse{#1nameCY}}%
+ \ft@dbgplot{\@nameuse{#1nameCX},\strip@pt\ft@height}%
+ \ft@dbgplot{\@nameuse{#1nameX},\strip@pt\ft@height}%
+ ]{\@nameuse{#1}}%
+}
+% \end{macrocode}
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsubsection{Individual box --- interface}
+%
+% \DescribeMacro{\ftindvdldef}
+% \DescribeMacro{\indvdldef}
+%
+% \begin{macrocode}
+% [child-mark] box-name [title] individual-name
+% [option-list...] [maleline-xlength]
+\NewDocumentCommand{\ftindvdldef}{O{\ftbiological}momoO{0pt}}{%
+ \setbox\@tempboxa=\hbox{\ft@namebox@font#4}%
+ \global\ft@indvdl@nameH=\ht\@tempboxa%
+ \global\ft@indvdl@nameD=\dp\@tempboxa%
+ \if@tate%
+ \global\ft@indvdl@nameCY%
+ =\dimexpr(\ft@indvdl@nameH - \ft@indvdl@nameD)/2\relax%
+ \else%
+ \@ifundefined{jlreqsetup}{%
+ % not jlreq
+ \global\ft@indvdl@nameCY=\dimexpr(\ft@indvdl@nameH%
+ - \ft@indvdl@nameD) / 2\relax\relax%
+ }{%
+ % jlreq
+ % magic number! depends on font?
+ \global\ft@indvdl@nameCY=\dimexpr\ft@indvdl@nameH/2 - .66pt\relax%
+ }%
+ \fi%
+ \ft@dbgmsg{H \the\ft@indvdl@nameH, D \the\ft@indvdl@nameD,%
+ CY \the\ft@indvdl@nameCY}%
+ %
+ \ft@cmarkdef{ft@cmarkbox}{#1}{0pt}{\ft@namebox@sp}%
+ \ifcase#1% fttop
+ \ft@namexdef{#2hascmark}{#1}%
+ \or% ftbiological
+ \ft@namexdef{#2hascmark}{#1}%
+ \or% ftadopted
+ \ft@namexdef{#2hascmark}{#1}%
+ \fi%
+ \global\ft@cmarkW=\wd\ft@cmarkbox%
+ %
+ \global\ft@malelinefalse%
+ \xdef\ft@indvdl@opts{}%
+ \IfValueT{#5}{%
+ \ft@optlist{\ft@indvdl@opts}{#2}{#5}%
+ \ft@dbgmsg{opt \ft@indvdl@opts}%
+ }%
+ %
+ \ft@indvdlbox{#2}{#3}{#4}{#6}%
+}
+\ft@alias{indvdldef}
+% \end{macrocode}
diff --git a/macros/latex/contrib/familytree/ft-lib.dtx b/macros/latex/contrib/familytree/ft-lib.dtx
new file mode 100644
index 0000000000..2c54589f36
--- /dev/null
+++ b/macros/latex/contrib/familytree/ft-lib.dtx
@@ -0,0 +1,247 @@
+% \iffalse
+% Copyright 2022 Jiro Senju
+%
+% This package is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2 of the License, or
+% any later version.
+%
+% This package is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this package. If not, see <http://www.gnu.org/licenses/>.
+% \fi
+%
+% \section{Library (\texttt{ft-lib.dtx})}
+%
+% While this is the last section of this document, |ft-lib.dtx| is located
+% top of |sty|.
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsectImpl
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% \begin{macrocode}
+\RequirePackage{relsize}
+\RequirePackage{xparse}
+% \end{macrocode}
+%
+% \DescribeMacro{\ft@unit}
+% Represents a width of a single character.
+%
+% \DescribeMacro{\if@tate}
+% Supports Japanese vertical mode (|jlreq.cls|). Other than Japanese, this
+% dummy |\if@tate| is always false.
+% \medskip
+%
+% \begin{macrocode}
+\global\newlength{\ft@unit}%
+\@ifundefined{if@tate}{%
+ \global\newif\if@tate%
+ \global\ft@unit=1em%
+}{
+ \global\ft@unit=1zw%
+}%
+% \end{macrocode}
+%
+% \DescribeMacro{\ft@alias}
+% Makes an alias with prefix-less (|ft|).
+% I don't know why such many |\expandafter|s are necessary.
+% \medskip
+%
+% \begin{macrocode}
+\newcommand{\ft@alias}[1]{% ft-less-name
+ \@ifundefined{#1}{%
+ \global\expandafter\expandafter\expandafter%
+ \let\expandafter\expandafter\csname#1\endcsname\expandafter%
+ =\csname ft#1\endcsname%
+ }{%
+ \message{skip alias to ft#1}%
+ }%
+}
+% \end{macrocode}
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsubsection{utility}
+%
+% \DescribeMacro{\ftymd}
+% \DescribeMacro{\ymd}
+% \cmd{\ftymd
+% \marg{year}
+% \oarg{month}
+% \oarg{date}
+% }
+%
+% Arranges and prints year-month-date. Japanese vertical mode is supported.
+% Assumes to be used in \meta{additional info} of |\indvdldef|.
+% \medskip
+%
+% \begin{macrocode}
+\NewDocumentCommand{\ftymd}{moo}{% year [month] [date]
+ \if@tate%
+ \tatechuyoko{#1}%
+ \IfValueT{#2}{\tatechuyoko{#2}}%
+ \IfValueT{#3}{\tatechuyoko{#3}}%
+ \else%
+ #1%
+ \IfValueT{#2}{\slash#2}%
+ \IfValueT{#3}{\slash#3}%
+ \fi%
+}
+\ft@alias{ymd}
+% \end{macrocode}
+%
+% \noindent
+% \DescribeMacro{\ftundef}
+% \cmd{\ftundef
+% \marg{box name}
+% }
+%
+% Undefines all internal \CS es who has \meta{box name} in its name.
+% For this macro, we don't define the prefix-less alias.
+% \medskip
+%
+% \begin{macrocode}
+\newcommand{\ftundef}[1]{%
+ \@for\@temptokena:=#1\do{%
+ \global\expandafter\let\csname\@temptokena\endcsname=\relax%
+ \global\expandafter\let\csname\@temptokena nameCY\endcsname=\relax%
+ \global\expandafter\let\csname\@temptokena mrrgCY\endcsname=\relax%
+ \global\expandafter\let\csname\@temptokena hasmaleline\endcsname%
+ =\relax%
+ }%
+}
+% \end{macrocode}
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsubsection{internal library}
+%
+% \parag{global variable}
+%
+% \begin{macrocode}
+\newif\ifft@box@has@maleline
+\newif\ifft@widest@has@no@maleline
+\newlength{\ft@len}
+\newlength{\ft@width}
+\newlength{\ft@height}
+\newlength{\ft@depth}
+\newlength{\ft@theight}
+\newlength{\ft@x}
+\newlength{\ft@xx}
+\newlength{\ft@y}
+\newlength{\ft@yy}
+% \end{macrocode}
+%
+% \parag{utility function}
+%
+% \DescribeMacro{\ft@namexdef}
+% \DescribeMacro{\ft@namexdefstrip}
+% \NoDescription
+% \begin{macrocode}
+\newcommand{\ft@namexdef}[2]{% name value
+ \global\expandafter\edef\csname#1\endcsname{#2}%
+ %\expandafter\xdef\csname#1\endcsname{#2}%
+ \ft@dbgmsg{xdef #1 #2}%
+}
+\newcommand{\ft@namexdefstrip}[2]{% name length
+ \ft@namexdef{#1}{\strip@pt#2}%
+}
+% \end{macrocode}
+%
+% \DescribeMacro{\ft@savenamebox}
+% \DescribeMacro{\ft@newnamebox}
+% \NoDescription
+% \begin{macrocode}
+\newcommand{\ft@savenamebox}[2]{% name contents
+ \expandafter\savebox\expandafter{\csname#1\endcsname}{#2}%
+}
+\newcommand{\ft@newnamebox}[2]{% name contents
+ \global\expandafter\newsavebox\expandafter{\csname#1\endcsname}%
+ \ft@savenamebox{#1}{#2}%
+}
+% \end{macrocode}
+%
+% \DescribeMacro{\ft@nameboxsz}
+% \DescribeMacro{\ft@boxsz}
+% \NoDescription
+% \begin{macrocode}
+\newcommand{\ft@nameboxsz}[4][]{% [width] name ht-value dp-value
+ \ifx#1\empty\else%
+ \expandafter\wd\csname#2\endcsname=#1%
+ \fi%
+ \expandafter\ht\csname#2\endcsname=#3%
+ \expandafter\dp\csname#2\endcsname=#4%
+ \ft@dbgmsg{#2 box, W \the\wd\@nameuse{#2}, H \the\ht\@nameuse{#2},%
+ D \the\dp\@nameuse{#2}}%
+}
+\newcommand{\ft@boxsz}[3]{% box ht-value dp-value
+ \expandafter\ht#1=#2%
+ \expandafter\dp#1=#3%
+ \ft@dbgmsg{#2 box, W \the\wd#1, H \the\ht#1, D \the\dp#1}%
+}
+% \end{macrocode}
+%
+% \DescribeMacro{\ft@list@append}
+% \NoDescription
+% \begin{macrocode}
+\newcommand{\ft@list@append}[3]{% list element
+ \ifx#1\empty%
+ \xdef#1{#2}%
+ \else%
+ \xdef#1{#1,#2}%
+ \fi%
+}
+\iffalse
+\newcommand{\ft@detokenize}[1]{%
+ {%
+ \escapechar=`\ %
+ \catcode`\ =9%
+ %\string#1%
+ \detokenize{#1}%
+ }%
+}
+\fi
+% \end{macrocode}
+%
+% \parag{debugging}
+%
+% \DescribeMacro{\ifftdbg}
+% \DescribeMacro{\ft@dbgmsg}
+% \DescribeMacro{\ft@dbgframe}
+% \DescribeMacro{\ft@dbgplot}
+% \DescribeMacro{\ft@dbgbox}
+% \NoDescription
+% \begin{macrocode}
+\newif\ifftdbg
+\newcommand{\ft@dbgmsg}[1]{%
+ \ifftdbg%
+ \message{#1}%
+ \fi%
+}
+\newcommand{\ft@dbgframe}[2][0,0]{% [point x,y] width,height
+ \ifftdbg%
+ \put(#1){\framebox(#2){}}%
+ \fi%
+}
+\newcommand{\ft@dbgplot}[2][]{%
+ \ifftdbg%
+ \put(#2){\circle{1}{\tiny#1}}%
+ \fi%
+}%
+\newcommand{\ft@dbgbox}[2][]{% [extra-put] box
+ \ifftdbg%
+ \ft@len=\dimexpr\ht#2 + \dp#2\relax%
+ \begin{picture}(\strip@pt\wd#2,\strip@pt\ht#2)(0,-\strip@pt\dp#2)%
+ \ft@dbgframe[0,-\strip@pt\dp#2]{\strip@pt\wd#2,\strip@pt\ft@len}%
+ %\put(0,0){{\tiny\ft@detokenize{#2}}}%
+ %\put(0,-\strip@pt\dp#2){\usebox{#2}}%
+ \put(0,0){\usebox{#2}}%
+ #1%
+ \end{picture}%
+ \fi%
+}
+% \end{macrocode}
diff --git a/macros/latex/contrib/familytree/ft-marriage.dtx b/macros/latex/contrib/familytree/ft-marriage.dtx
new file mode 100644
index 0000000000..138f8f06f9
--- /dev/null
+++ b/macros/latex/contrib/familytree/ft-marriage.dtx
@@ -0,0 +1,374 @@
+% \iffalse
+% Copyright 2022 Jiro Senju
+%
+% This package is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2 of the License, or
+% any later version.
+%
+% This package is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this package. If not, see <http://www.gnu.org/licenses/>.
+% \fi
+%
+% \section{Marriage Box (\texttt{ft-marriage.dtx})}
+%
+% \DescribeMacro{\mrrgdef}
+% \cmd{\mrrgdef
+% \marg{new box name}
+% \marg{spouse list A}
+% \marg{oneself}
+% \marg{spouse list B}
+% \oarg{childline xlength}
+% }
+% \medskip
+%
+% Defines a marriage box with a specified name \meta{new box name}.
+% To support remarrying and the concubines, the spouses are specified by
+% a list. The element of the list is a box name defined by |\indvdldef|.
+% \meta{spouse list A} is placed upper side of \meta{oneself}, and
+% \meta{spouse list B} is lower side.
+% All box names are NOT \CS{} (no backslash).
+% \smallskip
+%
+% Aligns them in the same column, and connects them by a double line if the
+% marriage is official. If the marriage is not official (|\private|
+% attribute), uses a dashed double line.
+% Those double line is placed at the center of the length of the name of
+% \meta{oneself}.
+% \smallskip
+%
+% If a spouse has a child (|\haschild| attribute),
+% then the line to their child is drawn from the center of the
+% double line.
+% \smallskip
+%
+% Like |\sblngdef|, the interval box can be inserted if you want more
+% spaces.
+% \bigskip
+%
+% Like |\indvdldef|, some connection points are defined. Their origin
+% is left-bottom of the box and the unit is |pt|.
+%
+% \begin{itemize}
+% \item \meta{box name}|nameCY|
+%
+% the center of the height of the name of \meta{oneself}
+%
+% \item \meta{box name}\meta{individual box name}|nameCY|
+%
+% the center of the height of the name of who has any child-mark
+%
+% \item \meta{box name}\meta{individual box name}|mrrgCY|
+%
+% the center of the double line when any spouse has |\haschild| attribute
+% \end{itemize}
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsection{Customization}
+%
+% \DescribeMacro{\mrrgboxcfg}
+% \cmd{\mrrgboxcfg
+% \marg{space between two lines}
+% \marg{space between name and the line}
+% \marg{line length}
+% }
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \clearpage
+% \subsection{Example}
+%
+% \begin{enumerate}
+% \item
+% \srcfig{fig4Robert}
+%
+% \clearpage
+% \item
+% \srcfig{fig4HenryVIII}
+% \end{enumerate}
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsection{Layout and connecting in a same generation}
+%
+% It is not a good idea to put everything in a single family tree.
+%
+% For example, see King Henry VIII and his wives. Catherine of Aragon,
+% his first wife was actually a wife of Henry's brother, Arthur. If we
+% put King's siblings to this tree, how would it be looked? It's just
+% ugly and hard to understand in a glance. Let's think more using an
+% example from \refnm{sec:Lily1} again.
+%
+% How can we represent the Petunia -- Lily sisters tree including their husbands.
+% As a first step, define two marriage boxes, and then define the
+% sibling box.
+% \medskip
+%
+% \srcfig{fig4Lily1}
+% \medskip
+%
+% Why is this tree so ugly? There are three points to consider.
+% \begin{enumerate}
+% \item The position of two double lines differ from each other.
+% \item The length of a line to their child differs too. If we connected
+% the child, the ugliness would be improved.
+% \item James interrupts into between Petunia and Lily. It makes the
+% understandability worse.
+% \end{enumerate}
+%
+% On fixing the first point, the position of the double line, the second
+% point will be fixed automatically.
+% The solution is the one already suggested in \refnm{sec:Lily1}, set
+% the width of Lily box to Petunia's.
+% For the third point, the position of James, how about expanding the
+% space as a first step?
+% \medskip
+%
+% \srcfig{fig4Lily2}
+% \medskip
+%
+% Even spreading the space wider, James is still interrupting those two
+% sisters. Does it look better?
+% If we want more, the last way is to switch the position of James and Lily.
+% \medskip
+%
+% \srcfig{fig4Lily3}
+% \medskip
+%
+% Moreover spreading the blank is a good option.
+% \medskip
+%
+% \srcfig{fig4Lily4}
+% \medskip
+%
+% Is this best looking?
+% The easiness of looking is subject to one's opinion or taste.
+% Personally I feel resistance in the order of husband and wife. But also I
+% admit that as long as the main purpose of this tree is to represent those
+% sisters, this position of James is not bad.
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsectImpl
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% \parag{Customization}
+%
+% \DescribeMacro{\ftmrrgboxcfg}
+% \DescribeMacro{\mrrgboxcfg}
+%
+% \begin{macrocode}
+\newlength{\ft@mrrgline@sep}
+\setlength{\ft@mrrgline@sep}{4pt}
+\newlength{\ft@mrrgline@sp}
+\setlength{\ft@mrrgline@sp}{.5\ft@unit}
+\newlength{\ft@mrrgline@length}
+\setlength{\ft@mrrgline@length}{1.5\ft@unit}
+\newcommand{\ftmrrgboxcfg}[3]{% sep space length
+ \ifx#1\empty\else%
+ \setlength{\ft@mrrgline@sep}{#1}%
+ \fi%
+ \ifx#2\empty\else%
+ \setlength{\ft@mrrgline@sp}{#2}%
+ \fi%
+ \ifx#3\empty\else%
+ \setlength{\ft@mrrgline@length}{#3}%
+ \fi%
+}
+\ft@alias{mrrgboxcfg}
+% \end{macrocode}
+%
+% \parag{Parsing}
+%
+% \begin{macrocode}
+\newcommand{\ft@mrrg@parse}[1]{% spouse-list
+ \global\ft@height=0pt%
+ \global\ft@width=0pt%
+ \global\ft@box@has@malelinefalse%
+ \@for\@temptokena:=#1\do{%
+ \ifx\@temptokena\empty\else%
+ \xdef\ft@spouse{\@temptokena}%
+ \@ifundefined{\@temptokena ival}{%
+ \@ifundefined{\ft@spouse haschild}{}{%
+ \global\ft@box@has@malelinetrue%
+ }%
+ \setlength{\ft@len}{\wd\@nameuse{\ft@spouse}}%
+ \ifdim\ft@width<\ft@len%
+ \global\ft@width=\ft@len%
+ \fi%
+ \ft@dbgmsg{\ft@spouse, W \the\wd\@nameuse{\ft@spouse},%
+ H \the\ht\@nameuse{\ft@spouse},%
+ D \the\dp\@nameuse{\ft@spouse}}%
+ \global\advance\ft@height \dimexpr\ft@mrrgline@length%
+ + 2\ft@mrrgline@sp\relax%
+ \ft@dbgmsg{\ft@spouse, H \the\ft@height}%
+ }{}%
+ \global\advance\ft@height \dimexpr\ht\@nameuse{\ft@spouse}%
+ + \dp\@nameuse{\ft@spouse}\relax%
+ \ft@dbgmsg{\ft@spouse, h H \the\ft@height}%
+ \fi%
+ }%
+ %
+ \ifft@box@has@maleline%
+ \global\advance\ft@width \ft@namebox@maleline@length%
+ \fi%
+ %
+ \global\ft@depth=\dp\@nameuse{\ft@spouse}%
+ \global\advance\ft@height \dimexpr -2\ft@mrrgline@sp%
+ - \ft@mrrgline@length - \ft@depth\relax%
+ \ft@dbgmsg{final H \the\ft@height, D \the\ft@depth}%
+}
+% \end{macrocode}
+%
+% \parag{The double line}
+%
+% \DescribeMacro{\ft@mrrg@line}
+%
+% \begin{macrocode}
+\newlength{\ft@mrrg@chlen}
+\newcommand{\ft@mrrg@line}[5]{% box-name spouse cx sp length
+ \ft@x=#3%
+ \global\advance\ft@height -#4%
+ \@tempskipb=\dimexpr\ft@mrrgline@sep/2\relax%
+ \edef\@y{\strip@pt\ft@height}%
+ \@ifundefined{#2private}{%
+ \ft@len=#5\relax%
+ \edef\@l{\strip@pt\ft@len}%
+ \put(\strip@pt\dimexpr\ft@x - \@tempskipb, \@y){\line(0,-1){\@l}}%
+ \put(\strip@pt\dimexpr\ft@x + \@tempskipb, \@y){\line(0,-1){\@l}}%
+ }{%
+ % this divisor should match the delta_y for multiput
+ \ft@len=#5\relax%
+ \ft@len=\dimexpr\ft@len/2 + .5pt\relax%
+ \@tempcnta=\dimexpr\ft@len/65536\relax%
+ \multiput(\strip@pt\dimexpr\ft@x - \@tempskipb, \@y)%
+ (0,-2){\@tempcnta}{\line(0,-1){.5}}%
+ \multiput(\strip@pt\dimexpr\ft@x + \@tempskipb, \@y)%
+ (0,-2){\@tempcnta}{\line(0,-1){.5}}%
+ }%
+ \@ifundefined{#2haschild}{}{%
+ \ft@len=#5\relax%
+ \ft@y=\dimexpr\ft@height - \ft@len/2\relax%
+ \put(\strip@pt\dimexpr\ft@x + \@tempskipb,\strip@pt\ft@y)%
+ {\line(1,0){\strip@pt\ft@mrrg@chlen}}%
+ \ft@dbgplot{\strip@pt\ft@x,\strip@pt\ft@y}%
+ \ft@namexdefstrip{#1#2mrrgCY}{\ft@y}%
+ }%
+ \ft@len=#5\relax%
+ \@tempskipa=#4\relax%
+ \global\advance\ft@height \dimexpr -\ft@len - \@tempskipa\relax%
+ \ft@dbgmsg{line #2 H \the\ft@height}%
+}
+% \end{macrocode}
+%
+% \parag{Layout the names}
+%
+% \DescribeMacro{\ft@mrrg@name}
+%
+% \begin{macrocode}
+\newcommand{\ft@mrrg@name}[2]{% box-name individual-name
+ \global\advance\ft@height -\ht\@nameuse{#2}%
+ \put(0,\strip@pt\ft@height){\usebox{\@nameuse{#2}}}%
+ \ft@dbgframe[0,\strip@pt\ft@height]%
+ {\strip@pt\wd\@nameuse{#2},\strip@pt\ht\@nameuse{#2}}%
+ %
+ \@ifundefined{#2hasmaleline}{}{%
+ \ft@x=\@nameuse{#2nameX}pt%
+ \ft@y=\dimexpr\ft@height + \@nameuse{#2nameCY}pt\relax%
+ \ft@len=\dimexpr\ft@width - \@nameuse{#2nameX}pt%
+ %- \ft@namebox@maleline@sp%
+ \relax%
+ \put(\strip@pt\ft@x,\strip@pt\ft@y){\line(1,0){\strip@pt\ft@len}}%
+ \ft@namexdefstrip{#1#2nameCY}{\ft@y}%
+ }%
+ %
+ \@ifundefined{#2hascmark}{}{%
+ \ft@len=\dimexpr\ft@height + \@nameuse{#2nameCY}pt\relax%
+ \ft@namexdefstrip{#1#2nameCY}{\ft@len}%
+ \ft@dbgplot{0,\strip@pt\ft@len}%
+ }%
+ \global\advance\ft@height -\dp\@nameuse{#2}%
+ \ft@dbgmsg{name #2 H \the\ft@height}%
+}
+% \end{macrocode}
+%
+% \subsubsection{Layout and connect the individuals --- core}
+%
+% \DescribeMacro{\ft@mrrg@spouse}
+%
+% \begin{macrocode}
+\newlength{\ft@mrrg@ival}
+\newcommand{\ft@mrrg@spouse}[2]{% box-name list
+ \global\ft@mrrg@ival=0pt%
+ \@for\@temptokena:=#2\do{%
+ \@ifundefined{\@temptokena ival}{%
+ \@tempskipa=\dimexpr\ft@mrrgline@length + \ft@mrrg@ival\relax%
+ \if@tempswa%
+ \ft@mrrg@name{#1}{\@temptokena}%
+ \ft@mrrg@line{#1}{\@temptokena}{\ft@xx}{\ft@mrrgline@sp}%
+ {\@tempskipa}%
+ \else%
+ \ft@mrrg@line{#1}{\@temptokena}{\ft@xx}{\ft@mrrgline@sp}%
+ {\@tempskipa}%
+ \ft@mrrg@name{#1}{\@temptokena}%
+ \fi%
+ \global\ft@mrrg@ival=0pt%
+ }{%
+ \global\advance\ft@mrrg@ival%
+ \dimexpr\ht\@nameuse{\@temptokena}%
+ + \dp\@nameuse{\@temptokena}\relax%
+ }%
+ }%
+}
+% \end{macrocode}
+%
+% \subsubsection{Marriage box --- interface}
+%
+% \DescribeMacro{\ftmrrgdef}
+% \DescribeMacro{\mrrgdef}
+%
+% \begin{macrocode}
+\NewDocumentCommand{\ftmrrgdef}{mmmmO{0pt}}{%
+ % box-name spouse-listA oneself spouse-listB [xline]
+ \ft@xx=\@nameuse{#3nameCX}pt\relax%
+ \ft@mrrg@parse{#2,#3,#4}%
+ %
+ \advance\ft@width #5%
+ \global\ft@mrrg@chlen=\dimexpr\ft@width - \ft@xx%
+ - \ft@mrrgline@sep/2\relax%
+ %
+ \ft@theight=\ft@height%
+ \ft@newnamebox{#1}{%
+ \edef\@w{\strip@pt\ft@width}%
+ \edef\@h{\strip@pt\ft@height}%
+ \begin{picture}(\@w,\@h)%
+ \ft@dbgframe{\@w,\@h}%
+ %
+ \ifx#2\@nil\else%
+ \@tempswatrue%
+ \ft@mrrg@spouse{#1}{#2}%
+ \fi%
+ %
+ \ft@mrrg@name{#1}{#3}%
+ \@ifundefined{#1#3nameCY}{}{%
+ \ft@len=\@nameuse{#1#3nameCY}pt\relax%
+ \ft@dbgplot{1,\strip@pt\ft@len}%
+ \ft@namexdefstrip{#1nameCY}{\ft@len}%
+ }%
+ \@ifundefined{#3hascmark}{}{%
+ \ft@namexdef{#1hascmark}{\@nameuse{#3hascmark}}%
+ }%
+ %
+ \ifx#4\empty\else%
+ \@tempswafalse%
+ \ft@mrrg@spouse{#1}{#4}%
+ \fi%
+ \end{picture}%
+ }%
+ \ft@nameboxsz{#1}{\ft@theight}{\ft@depth}%
+}
+\ft@alias{mrrgdef}
+% \end{macrocode}
diff --git a/macros/latex/contrib/familytree/ft-sibling.dtx b/macros/latex/contrib/familytree/ft-sibling.dtx
new file mode 100644
index 0000000000..fcb6a3645d
--- /dev/null
+++ b/macros/latex/contrib/familytree/ft-sibling.dtx
@@ -0,0 +1,333 @@
+% \iffalse
+% Copyright 2022 Jiro Senju
+%
+% This package is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2 of the License, or
+% any later version.
+%
+% This package is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this package. If not, see <http://www.gnu.org/licenses/>.
+% \fi
+%
+% \section{Sibling Box (\texttt{ft-sibling.dtx})}
+%
+% \DescribeMacro{\sblngdef}
+% \cmd{\sblngdef
+% \marg{new box name}
+% \marg{name list of individual boxes}
+% }
+% \medskip
+%
+% \marg{name list of individual boxes} is the comma separated box names
+% which are defined by |\indvdldef|.
+% They are aligned and connected by a line.
+% All names are NOT \CS{} (no backslash).
+%
+% If any of the siblings has a |\maleline| attribute, then the length of
+% all lines are set to the longest one.
+% \medskip
+%
+% Like |\indvdldef|, |\sblngdef| defines a few connection points (\CS)
+% to be used later. The origin is left-bottom of the box and the unit is |pt|.
+%
+% \begin{itemize}
+% \item \meta{box name}|nameCY|
+% \par
+% Center of the line which connects all the siblings.
+% \par
+% The line begins at the head of the child-mark of the
+% first element of the given list, and ends at the last element.
+%
+% \item \meta{box name}\meta{individual box name}|nameCY|
+% \par
+% Center of the height for each individual name.
+% \par
+% In other words, shifted \meta{individual box name}|nameCY| which
+% |\indvdldef| defined.
+% \end{itemize}
+% \medskip
+%
+% \noindent
+% \DescribeMacro{\ivaldef}
+% \cmd{\ivaldef
+% \marg{new box name}
+% \marg{length}
+% }
+% \medskip
+%
+% Sometimes an extra space is necessary between the siblings who have
+% many descendants.
+% For such spaces, you can define an interval box by |\ivaldef|. It
+% defines an blank box who has a specified size. There are three
+% pre-defined interval boxes, |\ival|, |\ivali|, and |\ivalii|. They
+% have the size of |0.5em|, |1em|, |2em| for each.
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsection{Customization}
+%
+% \DescribeMacro{\sblngboxcfg}
+% \cmd{\sblngboxcfg
+% \marg{space between the siblings}
+% }
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsection{Example}
+%
+% \begin{enumerate}
+% \item
+% \srcfig{fig2base}
+%
+% \item
+% \srcfig{fig2sis}
+%
+% \item
+% \srcfig{fig2ival}
+% \end{enumerate}
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsectImpl
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsubsection{Interval box}
+%
+% \DescribeMacro{\ftivaldef}
+% \DescribeMacro{\ivaldef}
+%
+% \begin{macrocode}
+\newcommand{\ftivaldef}[2]{% box-name length
+ \ft@newnamebox{#1}{\vbox to #2{\hsize=1pt}}%
+ \ft@len=#2%
+ \ft@namexdefstrip{#1ival}{\ft@len}% just a flag
+ \divide\ft@len 2%
+ \ft@namexdefstrip{#1nameCY}{\ft@len}%
+}
+\ft@alias{ivaldef}
+% \end{macrocode}
+%
+% \parag{Pre-defined interval boxes}
+%
+% \DescribeMacro{\ftival}
+% \DescribeMacro{\ival}
+% \NoDescription
+% \begin{macrocode}
+\ftivaldef{ftival}{.5\ft@unit}
+\ft@alias{ival}
+\ft@alias{ivalnameCY}
+\ft@alias{ivalival}
+% \end{macrocode}
+%
+% \DescribeMacro{\ftivali}
+% \DescribeMacro{\ivali}
+% \NoDescription
+% \begin{macrocode}
+\ftivaldef{ftivali}{1\ft@unit}
+\ft@alias{ivali}
+\ft@alias{ivalinameCY}
+\ft@alias{ivaliival}
+% \end{macrocode}
+%
+% \DescribeMacro{\ftivalii}
+% \DescribeMacro{\ivalii}
+% \NoDescription
+% \begin{macrocode}
+\ftivaldef{ftivalii}{2\ft@unit}
+\ft@alias{ivalii}
+\ft@alias{ivaliinameCY}
+\ft@alias{ivaliiival}
+% \end{macrocode}
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \parag{Customization}
+%
+% \DescribeMacro{\ftsblngboxcfg}
+% \DescribeMacro{\sblngboxcfg}
+%
+% \begin{macrocode}
+\newlength{\ft@sblng@vsp}
+\setlength{\ft@sblng@vsp}{.5\baselineskip}%
+\newcommand{\ftsblngboxcfg}[1]{% space-length
+ \global\ft@sblng@vsp=#1%
+}
+\ft@alias{sblngboxcfg}
+% \end{macrocode}
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsubsection{Sibling box --- core}
+%
+% If any of the siblings has an attributes |\maleline| or alike, then
+% finds the longest one and sets its length to all others.
+% Between the name and |\maleline|, insert a space
+% |\ft@namebox@maleline@sp|.
+%
+% \begin{macrocode}
+\newcommand{\ft@sblng@maleline}[2]{% sibling y
+ \@ifundefined{#1hasmaleline}{}{%
+ \ft@x=\@nameuse{#1nameX}pt\relax%
+ \ifdim\ft@x<\ft@width%
+ \put(\strip@pt\ft@x,\strip@pt#2){%
+ \line(1,0){\strip@pt\dimexpr\ft@width - \ft@x}%
+ }%
+ \fi%
+ }%
+}
+% \end{macrocode}
+%
+% \DescribeMacro{\ft@sblng@connect}
+%
+% \begin{macrocode}
+\newlength{\ft@c}
+\newcommand{\ft@sblng@connect}[1]{% box-name
+ %
+ % draw a line to connect all the siblings
+ % length = eldest CY - youngest CY
+ % and calculate nameCY of the box
+ % nameCY = length/2 + youngest CY
+ %
+ \ft@y=\@nameuse{#1\ft@lastcmark nameCY}pt%
+ \ft@dbgplot{1,\strip@pt\ft@y}%
+ \ft@yy=\@nameuse{#1\ft@firstcmark nameCY}pt%
+ \ft@dbgplot{1,\strip@pt\ft@yy}%
+ \ft@len=\dimexpr\ft@yy - \ft@y\relax%
+ %
+ \ft@c=\dimexpr\ft@len/2 + \ft@y\relax%
+ \ft@namexdefstrip{#1nameCY}{\ft@c}%
+ \ft@dbgplot{1,\strip@pt\ft@c}%
+ %
+ \ifnum\@nameuse{\ft@lastcmark hascmark}=\ftadopted%
+ \advance\ft@y -\dimexpr\ft@cmarkbox@adopted@sep/2\relax%
+ \advance\ft@len \dimexpr\ft@cmarkbox@adopted@sep/2\relax%
+ \fi%
+ \ifnum\@nameuse{\ft@firstcmark hascmark}=\ftadopted%
+ \advance\ft@len \dimexpr\ft@cmarkbox@adopted@sep/2\relax%
+ \fi%
+ %
+ \ifdim\ft@len<2pt%
+ %\ft@len=\@nameuse{\ft@firstcmark nameCY}pt\relax%
+ \else%
+ \advance\ft@y -\dimexpr\arrayrulewidth/2\relax%
+ \advance\ft@len \arrayrulewidth%
+ \put(0,\strip@pt\ft@y){\line(0,1){\strip@pt\ft@len}}%
+ \fi%
+}
+% \end{macrocode}
+%
+% \DescribeMacro{\ft@sblng@layout}
+%
+% \begin{macrocode}
+\newcommand{\ft@sblng@layout}[2]{% box-name individual-name-list
+ \ft@newnamebox{#1}{%
+ \edef\@w{\strip@pt\ft@width}%
+ \edef\@h{\strip@pt\ft@height}%
+ \begin{picture}(\@w,\@h)%
+ \ft@dbgframe{\@w,\@h}%
+ %
+ \@for\@temptokena:=#2\do{%
+ \edef\ft@sblng@name{\@temptokena}%
+ \ft@dbgmsg{H \the\ft@height,%
+ \ft@sblng@name nameCY \@nameuse{\ft@sblng@name nameCY}pt,%
+ \the\ft@y}%
+ %
+ % calculate the nameCY for each
+ \advance\ft@height -\ht\@nameuse{\ft@sblng@name}%
+ \global\ft@y=\dimexpr\@nameuse{\ft@sblng@name nameCY}pt%
+ + \ft@height\relax%
+ \ft@dbgplot{0,\strip@pt\ft@y}%
+ \ft@namexdefstrip{#1\ft@sblng@name nameCY}{\ft@y}%
+ %
+ % align the malelines
+ \ft@sblng@maleline{\ft@sblng@name}{\ft@y}%
+ %
+ % place the individual boxes
+ \put(0,\strip@pt\ft@height){\usebox{\@nameuse{\ft@sblng@name}}}%
+ \advance\ft@height -\dimexpr\dp\@nameuse{\ft@sblng@name}%
+ + \ft@sblng@vsp\relax%
+ }%
+ %
+ % connect them
+ \ifx\ft@firstcmark\relax\else%
+ \ifx\ft@firstcmark\ft@lastcmark\else%
+ \ft@sblng@connect{#1}%
+ \fi%
+ \fi%
+ \end{picture}%
+ }%
+ % height should hold the original value
+ \ft@nameboxsz{#1}{\ft@height}{\ft@depth}%
+}
+% \end{macrocode}
+%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \subsubsection{Sibling box --- interface}
+%
+% \DescribeMacro{\ftsblngdef}
+% \DescribeMacro{\sblngdef}
+%
+% \begin{macrocode}
+\newcommand{\ftsblngdef}[2]{% box-name comma-separated-individuals
+ %
+ % calculate the size of the box
+ \ft@width=0pt%
+ \ft@height=0pt%
+ \ft@theight=0pt%
+ \ft@box@has@malelinefalse%
+ \@tempswatrue%
+ \let\ft@firstcmark=\relax%
+ \let\ft@lastcmark=\relax%
+ \def\ft@dpri##1{\ft@dbgmsg{##1 W \the\ft@width, H \the\ft@height,%
+ D \the\ft@depth}}%
+ \ft@dpri{h0}%
+ \@for\@temptokena:=#2\do{%
+ \if@tempswa%
+ \xdef\ft@eldest{\@temptokena}%
+ \@tempswafalse%
+ \fi%
+ \xdef\ft@youngest{\@temptokena}%
+ \@ifundefined{ft@firstcmark}{%
+ \@ifundefined{\ft@youngest hascmark}{}{%
+ \global\let\ft@firstcmark=\ft@youngest%
+ }%
+ }{%
+ \@ifundefined{\ft@youngest hascmark}{}{%
+ \global\let\ft@lastcmark=\ft@youngest%
+ }%
+ }%
+ \@ifundefined{\ft@youngest hasmaleline}{}{%
+ \global\ft@box@has@malelinetrue%
+ }%
+ %
+ \setlength{\ft@len}{\wd\@nameuse{\ft@youngest}}%
+ \ifdim\ft@width<\ft@len%
+ \global\ft@width=\ft@len%
+ \@ifundefined{\ft@youngest hasmaleline}{%
+ \global\ft@widest@has@no@malelinetrue%
+ }{%
+ \global\ft@widest@has@no@malelinefalse%
+ }%
+ \fi%
+ \global\advance\ft@theight \dimexpr\ht\@nameuse{\ft@youngest}%
+ + \dp\@nameuse{\ft@youngest} + \ft@sblng@vsp\relax%
+ \ft@dpri{\ft@youngest}%
+ }%
+ \advance\ft@theight -\ft@sblng@vsp%
+ \ft@depth=\dp\@nameuse{\ft@youngest}%
+ \ft@height=\ft@theight%
+ \advance\ft@height -\ft@depth%
+ \ifft@widest@has@no@maleline%
+ \ifft@box@has@maleline%
+ \global\advance\ft@width \dimexpr\ft@namebox@maleline@sp%
+ + \ft@namebox@maleline@length\relax%
+ \fi%
+ \fi%
+ %
+ % layout the all boxes
+ \ft@sblng@layout{#1}{#2}%
+ \ft@dbgbox{\@nameuse{#1}}%
+}
+\ft@alias{sblngdef}
+% \end{macrocode}
diff --git a/macros/latex/contrib/familytree/samples/Asai.pdf b/macros/latex/contrib/familytree/samples/Asai.pdf
new file mode 100644
index 0000000000..60cac91c67
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Asai.pdf
Binary files differ
diff --git a/macros/latex/contrib/familytree/samples/Asai/0Ichi.tex b/macros/latex/contrib/familytree/samples/Asai/0Ichi.tex
new file mode 100644
index 0000000000..248dc39fef
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Asai/0Ichi.tex
@@ -0,0 +1,43 @@
+\indvdldef{Ĺ}{ĿĹ}
+
+\indvdldef[\blank]{}{ľ}[ȤȤιǼ]
+
+\indvdldef{}{\fbox{}}[]
+\indvdldef[\blank]{}{ٶʿ}[\haschild]
+\indvdldef[\blank]{}{ʿɡ}[\haschild]
+\mrrgdef{}{,}{}{}[\dimexpr\wd\ - \wd\]
+
+\indvdldef{}{\fbox{}}[,ĹηѼ,Ȥ,Ȥ
+ Ȥ˼]
+\indvdldef[\blank]{Ĺ}{Ĺ}[ ,ĹȤιǼ
+ ,\haschild]
+\mrrgdef{}{Ĺ,}{}{}
+
+\sblngdef{Ĺ}{Ĺ,ival,,ival,}
+
+\savebox{\abox}{
+ \parbox{.5\textwidth}{
+ \small%
+ ʤǤ̾ʤΡ\par
+ ȸΤ֤Ȥơ\par
+ \smallskip
+
+ \begin{itemize}
+ \itemsep=\medskipamount
+
+ \item
+ ٷ뺧٤ȤҤ⤦
+ ٶ©Ҥо줹롣
+ \item
+ Ԥٷ뺧ǽη뺧̼򻰿ͻ
+ 줬͸
+ \item
+ Ԥʪˤ褯夲졢ͤäȤä
+ ȤǤ줿Ǥ襤ǤܤȤ塣
+ \end{itemize}
+ }
+}
+\hfil
+\fbox{\usebox{\Ĺ}}
+\hfil
+\raisebox{\dimexpr(\ht\Ĺ - \ht\abox)/2}{\usebox{\abox}}
diff --git a/macros/latex/contrib/familytree/samples/Asai/0sis.tex b/macros/latex/contrib/familytree/samples/Asai/0sis.tex
new file mode 100644
index 0000000000..00153205f2
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Asai/0sis.tex
@@ -0,0 +1,77 @@
+
+\indvdldef{}{}[ν,κǽס]
+%ͿϺ ʤˤϿĹ̼
+\indvdldef{}{١}
+\sblngdef{λ}{,}
+\indvdldef{}{ʺ}% λ
+
+\ftundef{,}
+\indvdldef{}{\fbox{}}[ 㡹θ師]
+\mrrgdef{}{ivalii,,ivalii,}{}{}
+\gensdef{ƻ}{}{%
+ {}{λ},%
+ {}{}%
+}
+
+\indvdldef{}{\fbox{㡹}}[Ȥ¦,\femaleline]
+\indvdldef{}{\fbox{}}[ ˹⼡,\femaleline]
+\indvdldef{}{\fbox{}}[ ,˭ý,η
+ ,\femaleline]
+\sblngdef{}{,,}
+
+\ftundef{,Ĺ,}
+\indvdldef{}{\fbox{}}
+\indvdldef[\blank]{Ĺ}{Ĺ}[\haschild]
+\mrrgdef{}{ivali,Ĺ}{}{}[\dimexpr\wd\ - \wd\Ĺ]
+\gensdef{Կƻ}{}{%
+ {Ĺ}{}%
+}
+
+\sblngdef{Ի}{ƻ,ival,Կƻ}
+\fbox{\usebox{\Ի}}
+\bigskip
+
+\begin{multicols}{2}
+\begin{itemize}
+\itemsep=\medskipamount
+\item
+λ塢뺧ϤȤȤΤ¿
+ 顢 ꤬
+
+\item
+Ĺ 㡹ݤߤꡢפȤ©ҤȻ
+
+
+㡹θ師ȤʤäƤ֤Ϥɤʤ ٶ
+% 1574
+
+²Ȥꡢƺ
+% 1577
+ޤǤδ֤ʤΤ Ȥ㡹
+% 1569
+޺ФȬФޤǤ
+Ԥ¸̿㡹ޤİ顢ۤɼƤȤ̵
+äΤǤϤʤ
+
+\item
+ĤκݤˤפȤ©ҤΩäǡƻɤä
+餷
+\end{itemize}
+\bigskip
+
+ʪäϰ뤬
+{\texttt{\textbackslash mrrgdef}}
+{interface}
+ηʬä
+ֳ֤ˤ
+{\texttt{ivalbox}}
+뤬
+{spouse}
+̾ʤФʤʤ
+
+ɤʤ᡹ľƤɤ
+
+{familytree}
+{pkg}
+κβȤ
+\end{multicols}
diff --git a/macros/latex/contrib/familytree/samples/Asai/1Chacha.tex b/macros/latex/contrib/familytree/samples/Asai/1Chacha.tex
new file mode 100644
index 0000000000..6037d27eda
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Asai/1Chacha.tex
@@ -0,0 +1,64 @@
+
+\indvdldef[\adopted]{}[ͱ]{\fbox{}}[,Ƚ̼,
+ Ȥ,ĹŷĤιĹˤˤĤʤ]
+
+\ftundef{}
+\indvdldef{}{\fbox{㡹}}
+ [\maleline,,\ymd{1569} \ymd{1615}]
+\indvdldef[\blank]{}{˭ý}[\haschild,\private]
+\mrrgdef{}{ivalv,ivalii,}{}{}
+
+\indvdldef{ι}{ι}[]
+\indvdldef{}{}[̼ ɱ]%
+\sblngdef{Ȥλ}{ι,}
+
+\gensdef{ƻ}{}{%
+ {}{Ȥλ},%
+ {}{}%
+}
+\fbox{\usebox{\ƻ}}
+\bigskip
+
+\begin{multicols}{2}
+\begin{itemize}
+\itemsep=\medskipamount
+
+\item
+ʪǤ褯뤬㡹ϿƤεؤνȤ¦ˤʤä¤ȸƤФ졢
+˴ζ֤ͭ̾ʤ˵Τʤ¦ˤʤݤ
+𤢤äΤǤϤʤ
+
+\item
+ȤϸԤ˹ƤꡢʬȤιǤԤˤ
+̼ 㡹¦ˤ
+ʿ˸Ϥͤबڤ֤ȤȤ
+Ǥ⽰ƻ̾ǡȤϤä˸⤷ʤä
+
+㡹ƻͤʤ齨Ȥ¦ˤˤȤ
+ȡǤʤȤäξ롣
+
+\item
+Ȥˤ桹Ҥʤä»Ҥ򻺤ȳǧǤƤΤ㡹
+ҤδӤ礭äʤΤä餷
+
+
+\item
+塢»Ҥᡢܻ ӽӤѼԸȤˡ ꤬
+˴򿦤Ƥ褦ˤʤꡢǽŪ
+ʢ줿ȤŪƻȤä⤢С򿦤֤
+ΩȤĵԹ԰٤ӤäȤä⤢롣
+
+⤦ͤθѼԸ Ӥϡ ͤͤαǤᤫä
+ȤܻҤ˽Ф줿ѼԸȤȤǽ̾ʬԤ
+κݤǤθ䤫鳰Ƥݤ³᤯饢
+륳ǤˤʤäƤ餷
+줬ξǤꡢ̾򽨵Ȼδإˤ礭Ĥ
+Ȥˤʤ롣
+
+\item
+㡹 κơ˹̼ ҤͱҤˤܻҤߤʤ
+
+äܰ餷餷ҤϸȤ˲ǤҤĤ¹ϸߤιļ
+ˤĤʤ롣
+\end{itemize}
+\end{multicols}
diff --git a/macros/latex/contrib/familytree/samples/Asai/2Hatsu.tex b/macros/latex/contrib/familytree/samples/Asai/2Hatsu.tex
new file mode 100644
index 0000000000..48b22476ef
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Asai/2Hatsu.tex
@@ -0,0 +1,76 @@
+
+\indvdldef{}{}[¦λ]
+\indvdldef[\adopted]{ɱ}{\fbox{ɱ}}[Ƚ̼,]
+\indvdldef[\adopted]{}{\fbox{}}[⼡̼]
+\sblngdef{λ}{ɱ,}
+%\fbox{\usebox{\λ}}
+\let\λnameCX=\ɱnameCX
+\mrrgdef{ɱ}{}{λ}{}
+%\fbox{\usebox{\ɱ}}
+
+\ftundef{}
+\indvdldef{}{\fbox{}}[\femaleline,\ymd{1570} \ymd{1633}]
+\indvdldef{⼡}{⼡}[\maleline]
+\mrrgdef{}{}{⼡}{ivalii,ivali,ival,}[1zw]
+
+\ftundef{ƻ}
+\let\ɱnameCY=\ɱnameCY
+\gensdef{ƻ}{}{%
+ {⼡}{ɱ}%
+}
+%\fbox{\usebox{\ƻ}}
+
+\indvdldef{ޥꥢ}{\fbox{ޥꥢ}}
+\ftundef{Ĺ}
+\indvdldef{Ĺ}{Ĺ}%[\maleline]
+\ftsblngboxcfg{\baselineskip}
+\sblngdef{Ĺ}{ޥꥢ,ival,Ĺ}
+\ftsblngboxcfg{.75\baselineskip}
+%\fbox{\usebox{\Ĺ}}
+\let\ĹnameCX=\ޥꥢnameCX
+
+\indvdldef[\blank]{}{˹}[\haschild]
+\mrrgdef{ޥꥢ}{}{Ĺ}{}
+\let\ޥꥢnameCY=\ޥꥢعmrrgCY
+%\fbox{\usebox{\ޥꥢ}}
+
+\gensdef{ޥꥢƻ}{ޥꥢ}{%
+ {}{ƻ}%
+}
+\fbox{\usebox{\ޥꥢƻ}}
+\bigskip
+
+\begin{multicols}{2}
+\begin{itemize}
+\itemsep=\medskipamount
+
+\item
+ λФλҡפ˽˲ǤҤϤʤܽͤȤä
+ͤϹ̼Ȥ̼ ɱνɱפ¦˻ޤҤ
+뺧롣ʡ졣»ҤǤϤʤȤϸ̼©ҡˤη뺧
+Ͻ餬ǤȤΤȤͥ˹ͤȤȤ
+
+Ǥɱη뺧ϹǤϤʤä餷ƤǤ 顢Ǥ뻰
+ ȸϷ뺧ФܤäȤä롣
+
+\item
+˭ää˽µĤ˿ϤȤ롣ʬλФ夽줾
+Ǥ¸ߴ礭ʤΤʤ䤫ʤΤȸ
+Ф夬ĤΤ⤷ʤפȻ̤ƤΤǼʬ
+ĥä餷
+
+\item
+ĹλФΥޥꥢȤ̾̾ʬʤ餷ʤļǤ
+äȤΤȤɤƤΤ
+
+\end{itemize}
+\bigskip
+
+{\spaceskip=1ex
+ʪäϰ뤬οޤlatexΤ񤷤äκ
+طȿƻҴط̩ܤfamilytree pkgεǽǤбڤ줺꡹
+ɸ̤ȤٹƤ롣
+
+familytree pkgκβȤ
+}
+\end{multicols}
diff --git a/macros/latex/contrib/familytree/samples/Asai/3Gou.tex b/macros/latex/contrib/familytree/samples/Asai/3Gou.tex
new file mode 100644
index 0000000000..4eca873b0f
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Asai/3Gou.tex
@@ -0,0 +1,104 @@
+
+\ftundef{}
+\indvdldef{}{\fbox{}}[㡹ͱ]
+
+\indvdldef{ɱ}{\fbox{ɱ}}[ ˭ý,¿]
+\indvdldef{ɱ}{\fbox{ɱ}}[ ]%˸޽
+\indvdldef{ɱ}{\fbox{ɱ}}[ ʿľ]
+% ĹˡĹ
+% Ĺǫ - ܽ⾾ܹοƲ
+% -ȸܽƻ˼
+\ftundef{ɱ}
+\indvdldef{ɱ}{\fbox{ɱ}}[˻ ܻ, ]
+\indvdldef{ȸ}{ȸ}
+\indvdldef{Ĺ}{Ĺ}
+\indvdldef{»}{\fbox{»}}[ŷĤιĹ,ŷĤ]
+\sblngdef{λ}{ɱ,ɱ,ɱ,ɱ,ȸ,Ĺ,»}
+\ftundef{}
+\indvdldef{}{\fbox{}}[\ymd{1573} \ymd{1626}]
+\ftundef{}
+\indvdldef[\blank]{}{}[λ ν,κǽס]
+\indvdldef[\blank]{}{˭ý}[\haschild,Ȥα]
+\indvdldef[\blank]{}{}[\haschild]
+\mrrgdef{}{ivali,,ivalx,ivalx,,ivalv,}{}{}
+\gensdef{ƻ}{}{%
+ {}{},%
+ {}{λ}%
+}
+
+\savebox{\abox}{
+ \parbox{\dimexpr\textwidth - \wd\ƻ - 3zw}{
+ \begin{itemize}
+ \itemsep=\medskipamount
+ \item
+ ϻҤ¿
+ ƺǰơ˸޽ҤϳΩäȸ
+ ĹϤǤʤä褦
+
+ դäĹ ȸ ζɴطǤ褯Ф뤬
+ ľϲȸĹ褬ɤ İ쾭
+ ͭ˾뤵Ƥɡ
+ ζɤȹľʤֻ̡ܤϲȸפȼΤ줿
+ Ĺ龾ʿѤ졢׸Ĺ˽ΩĤ
+ ˤʤ롣ȸϽϤǤ䤫˱󤶤Ƥɡǽ
+ ŪʢȤʤä
+
+ 󡢤ʤ󤫽νäߤ
+
+ \item
+ ȹ̼ Ҥ㡹˰졢Ȥ˲Ǥ
+
+ \item
+ ȹĹ ɱϲȹزİ줿Ȥä롣
+ Ǥ ԤκͳФƻѤѤȤά뺧˭ýꡢ
+ ¿ȷ뺧ϱäʡ
+
+ \item
+ ɱϲòĤ˲ǤǤͭ̾͡ϱ
+ ɱ줬;פʤȤ򤷤ƺǸϤᤷá
+ \end{itemize}
+ }
+}
+\hfil
+\fbox{\usebox{\ƻ}}
+\hfil
+\raisebox{\dimexpr(\ht\ƻ - \ht\abox)}{\usebox{\abox}}
+
+\begin{multicols}{2}
+\begin{itemize}
+\itemsep=\medskipamount
+\item
+ ɱǤǹäȻפ뤬פޤۤ
+ ᤯˱蘆줿ɱϤθ褯द뤵ۤä
+ 褦
+
+\item
+ ͽ ɱϹǤ ܻҤˤʤ롣
+
+\item
+ ޽ »ҤϸŷĤ˲ǤȻפ뤬
+ ŷĤȤδ֤˻Ҥ⤦ƤȤȯФä
+ ܤīФդ򶯲ϤƤꡢ»Ҥ
+ 郎ꡢŷĤܤʢΩƤΤ줹褦
+ İ̤ǡ̤ƤޤȸäƤ˻ҤϤ餺ν
+ ҤŷĤȤʤŷġˡΤȤ줬Ǹνŷ
+ ĤȤȤ
+ ĿŪˤϽϡϡˤǧơϰϤ̤ͥΤ
+ ɤȻפʤ
+
+ ϾĤȤʤäƱߤΤǡŷĤϤޤǤʤ
+ 褦Ǥ»Ҥפ򤷡ƱƤĤޤ귻Ǥ
+ ȸȤϤäΩ֤ä餷Τ»ҰʹߤĹ
+ Ϥʤʾ»ˤʤäƷĴ¹ŷĤ˲Ǥˡ
+ դŷIJȤؤι߲ǤϤꡢ줬ͭ̾ʽ Ф˲Ǥ
+ ܿƻҡʤˡ
+\end{itemize}
+
+ʪäϰ뤬οޤ򤢤ޤǤϤʤ
+طɽҤؤĤʤ硢
+ΤɤȹͤƤηϿޤǤϽȤλҤ¿ȤλҤ
+ͤŪ˽ΰ֤礭Υ뤳ȤˤʤäƤޤɤ
+
+familytree pkgκβȤ
+\end{multicols}
diff --git a/macros/latex/contrib/familytree/samples/Asai/Asai.tex b/macros/latex/contrib/familytree/samples/Asai/Asai.tex
new file mode 100644
index 0000000000..a0eb55af47
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Asai/Asai.tex
@@ -0,0 +1,53 @@
+\documentclass[
+ tate, landscape,
+ draft,
+ jlreq_notes,open_bracket_pos=nibu_tentsuki
+]{jlreq}
+\AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}}
+
+\makeatletter
+\let\iftate=\if@tate
+\makeatother
+
+\input{../../fonts}
+%\usepackage{otf}
+
+\usepackage{multicol}
+\columnseprule=\arrayrulewidth
+\usepackage{familytree}
+
+\ftoptboxcfg{}{}{}{1}
+\ftsblngboxcfg{.75\baselineskip}
+\ivaldef{ivalv}{5zh}
+\ivaldef{ivalx}{10zh}
+
+\newsavebox{\abox}
+\newcommand{\jslash}{~\tatechuyoko{{\large\slash}} \allowbreak}
+
+\ModifyPageStyle{plain}{nombre_position={bottom-center}}
+\begin{document}
+\pagestyle{plain}
+
+familytree sample
+
+\textgt{\large 滰ȷϿ}
+\bigskip
+
+\newcommand{\f}[1]{%
+ \iftate%
+ \tatechuyoko{\texttt{(#1)}}%
+ \else%
+ \texttt{(#1)}%
+ \fi%
+ \medskip%
+ %
+ \input{#1}%
+ \clearpage%
+}
+
+\f{0Ichi}
+\f{0sis}
+\f{1Chacha}
+\f{2Hatsu}
+\f{3Gou}
+\end{document}
diff --git a/macros/latex/contrib/familytree/samples/Asai/Makefile b/macros/latex/contrib/familytree/samples/Asai/Makefile
new file mode 100644
index 0000000000..1c5dfb956a
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Asai/Makefile
@@ -0,0 +1,19 @@
+
+Dir ?= /tmp
+Tgt = ${Dir}/Asai.pdf
+
+LATEX ?= platex -kanji=euc
+include ../../cmd.mk
+
+all: ${Tgt}
+
+clean:
+ ${RM} *~ ${Tgt}
+
+install:
+ install -m 444 -pD ${Tgt} \
+ ${InstallDir}/source/latex/${Name}/$(notdir ${Tgt})
+
+${Tgt}: ${Dir}/%.pdf: %.tex ${Dir}/familytree.sty
+ $(call Latex, $<)
+ cd ${Dir}; ${DVIPDFMX} $(basename $<).dvi
diff --git a/macros/latex/contrib/familytree/samples/Crawley.pdf b/macros/latex/contrib/familytree/samples/Crawley.pdf
new file mode 100644
index 0000000000..4b068ec33c
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Crawley.pdf
Binary files differ
diff --git a/macros/latex/contrib/familytree/samples/Crawley.tex b/macros/latex/contrib/familytree/samples/Crawley.tex
new file mode 100644
index 0000000000..8977c9ca33
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Crawley.tex
@@ -0,0 +1,258 @@
+\documentclass{article}
+\AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}}
+
+\makeatletter
+\let\stript=\strip@pt
+\makeatother
+
+\input{../fonts}
+\usepackage[dvipdfm,a4paper]{geometry}
+\usepackage{familytree}
+
+\newcommand{\nee}[1]{%
+ \\{\relsize{-1}(n\'{e}e #1)}%
+}
+
+\newcommand{\cname}[2][0]{%
+ \ifnum#1=1\let\mybox=\fbox\else\let\mybox=\mbox\fi%
+ \mybox{%
+ \begin{minipage}[b]{5em}%
+ \baselineskip=\dimexpr\baselineskip*10/15\relax%
+ \centering{#2}%
+ \end{minipage}%
+ }%
+}
+
+\NewDocumentCommand{\idef}{O{\ftbiological}mO{0}moO{0pt}}{%
+ % [cmark] id [fbox] name [opt] [xlen]
+ \indvdldef[#1]{#2}{\cname[#3]{#4}}[#5][#6]%
+}
+
+\begin{document}
+%\pagestyle{empty}
+
+familytree pkg sample
+
+\section*{\textsl{Inheritance Diagram}}
+
+Here, the Crawley family and their stories are borrowed from the
+famous British TV series \textsl{Downton Abbey\,.}
+I've borrowed it just to show how to use this familytree package.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\section*{Crawley sisters}
+
+\idef{youngSybil}{Lady Sybil}
+\idef{youngEdith}{Lady Edith}
+\idef{youngMary}{Lady Mary}
+\sblngdef{youngSis}{youngMary,ivali,youngEdith,ivali,youngSybil}
+
+\idef{Robert}[1]{Robert Crawley}[7th Earl of Grantham]
+\idef[\ftblank]{Cora}{Cora Crawley \nee{Levinson}}[Countess of
+ Grantham,\haschild]
+\mrrgdef{seven}{}{Robert}{Cora}
+
+\gensdef{RobertyoungSis}{seven}{%
+ {Cora}{youngSis}%
+}
+\fbox{\usebox{\RobertyoungSis}}
+\bigskip
+
+Under the fee tail or ``entail'', three daughters
+cannot inherit the title and the estate of Lord Grantham's,
+including the big amount of fortune (dowry) Cora had brought.
+The law requires a male heir.
+
+Fortunately Robert has a cousin James Crawley, and his son Patrick.
+They are good heir presumptive to the earldom.
+Actually, but not officially, the eldest daughter Lady Mary is engaged
+to Patrick so that the family will keep their assets.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\section*{Relationship between Robert, Matthew and cousin Patrick}
+\small
+
+\idef{youngMatthew}[1]{Matthew Crawley}
+\idef{Patrick}[1]{Patrick Crawley}[deceased\,?]
+
+\idef{Reginald}{Dr. Reginald Crawley}[(deceased)]
+\idef[\ftblank]{Isobel}{Isobel Crawley \nee{Turnbull}}[\haschild]
+\mrrgdef{ReginaldIsobel}{}{Reginald}{Isobel}[3em]
+\gensdef{IsobelMatthew}{ReginaldIsobel}{%
+ {Isobel}{youngMatthew}%
+}
+
+\ftundef{Robert}
+\idef{Robert}[1]{Robert Crawley}[7th Earl of Grantham,\maleline][2em]
+\pcdef{RobertMary}{Robert}{youngMary}
+
+\idef{James}[1]{James Crawley}[(deceased),\maleline][2em]
+\pcdef{JamesPatrick}{James}{Patrick}
+
+% \fbox{\vbox{%
+% \hbox{\usebox{\IsobelMatthew}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\RobertMary}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\JamesPatrick}}%
+% }}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\idef{sixMat}{{\relsize{-1} Mr. Crawley}}
+ [6th gen.,(deceased),\maleline][3em]
+\pcdef{sixMatpc}{sixMat}{IsobelMatthew}
+
+\idef{PatrickSix}{Patrick Crawley}
+ [6th Earl of Grantham,(deceased),\maleline][3em]
+\pcdef{sixRobpc}{PatrickSix}{RobertMary}
+
+\pcdef{sixPatpc}{sixMat}{JamesPatrick}
+
+\sblngdef{sixes}{sixRobpc,ival,sixPatpc}
+
+% \fbox{\vbox{
+% \hbox{\usebox{\sixMatpc}}
+% \vskip\baselineskip
+% \hbox{\usebox{\sixes}}
+% }}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\idef{fiveMat}{{\relsize{-1} Mr. Crawley}}[5th gen.,(deceased),\maleline]
+\pcdef{fiveMatpc}{fiveMat}{sixMatpc}
+
+\idef{fiveRob}{{\relsize{-1} 5th Earl of Grantham}}[(deceased),\maleline]
+\pcdef{fiveRobpc}{fiveRob}{sixes}
+
+% \fbox{\vbox{%
+% \hbox{\usebox{\fiveMatpc}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\fiveRobpc}}%
+% }}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\idef{fourMat}{{\relsize{-1} Mr. Crawley}}[4th gen.,(deceased),\maleline]
+\pcdef{fourMatpc}{fourMat}{fiveMatpc}
+\idef{fourRob}{{\relsize{-1} 4th Earl of Grantham}}[(deceased),\maleline]
+\pcdef{fourRobpc}{fourRob}{fiveRobpc}
+
+\sblngdef{fours}{fourRobpc,ival,fourMatpc}
+
+% \fbox{\usebox{\fours}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\idef[\fttop]{three}{{\relsize{-1} 3rd Earl of Grantham}}[(deceased),\maleline]
+\pcdef{threepc}{three}{fours}
+
+\fbox{\usebox{\threepc}}
+\bigskip
+
+\normalsize
+In 1912, James and Patrick have perished in the sinking of Titanic,
+and their body were not found. Not only Lady Mary lost her unofficial
+fianc\'{e}, but also the family lost the male heir.
+
+But Murray, Lord Grantham's business partner also a lawyer, discovered
+Robert's third cousin once removed, Matthew Crawley who is a son of an
+upper-middle-class doctor.
+Now Matthew has become the next heir presumptive out of the blue.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\section*{Family member of Robert Crawley}
+
+\idef{Sybbie}{Sybil ``Sybbie'' Branson}
+\idef[\ftblank]{Tom}{Tom Branson}[\haschild]
+\idef{Sybil}{Sybil Cora Branson \nee{Crawley}}[(deceased)]
+
+\idef{Marigold}{Marigold Crawley}
+\idef{Edith}{Edith Pelham \nee{Crawley}}[Marchioness of Hexham]
+\idef[\ftblank]{Bertie}{Herbert ``Bertie'' Pelham}[7th Marquess of Hexham]
+\idef[\ftblank]{Gregson}{Michael Gregson}[(deceased),\private,\haschild]
+
+\idef{George}[1]{George Crawley}[Heir presumptive of,Robert Crawley]
+\idef[\ftblank]{Matthew}{Matthew Crawley}[(deceased),\haschild]
+\idef{Mary}{Mary Josephine Crawley}%[ ]
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\mrrgdef{Bransons}{Tom}{Sybil}{}[\dimexpr\wd\Bertie-\wd\Sybil-2em\relax]
+\gensdef{TomSybbie}{Bransons}{%
+ {Tom}{Sybbie}%
+}
+% \fbox{\usebox{\TomSybbie}}
+
+\mrrgdef{EdithHus}{Gregson}{Edith}{Bertie}[-2em]
+\gensdef{EdithMarigold}{EdithHus}{%
+ {Gregson}{Marigold}%
+}
+% \fbox{\usebox{\EdithMarigold}}
+
+\mrrgdef{MatthewMary}{Matthew}{Mary}{}
+ [\dimexpr\wd\Bertie-\wd\Matthew-2em\relax]
+\gensdef{MaryGeorge}{MatthewMary}{%
+ {Matthew}{George}%
+}
+% \fbox{\usebox{\MaryGeorge}}
+
+\sblngdef{sis}{MaryGeorge,ivalii,EdithMarigold,ivalii,TomSybbie}
+% \fbox{\usebox{\sis}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\idef{Rosamund}{Rosamund Painswick \nee{Crawley}}
+\hyphenation{Marmaduke}
+\idef[\ftblank]{Marmaduke}{Sir Marmaduke Painswick}[(deceased)]
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\mrrgdef{Painswicks}{}{Rosamund}{Marmaduke}
+\sblngdef{RobertRosamund}{seven,ivalii,Painswicks}
+% \fbox{\usebox{\RobertRosamund}}
+
+\edef\RobertRosamundsevennameCY{%
+ \stript\dimexpr\sevenCoramrrgCY pt + \RobertRosamundsevennameCY pt%
+ - \sevennameCY pt%
+}
+\gensdef{Robertandsis}{RobertRosamund}{%
+ {seven}{sis}%
+}
+% \fbox{\usebox{\Robertandsis}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\ftundef{PatrickSix}
+\idef{PatrickSix}{Patrick Crawley}[6th Earl of Grantham (deceased)]
+\idef[\ftblank]{Violet}{Violet Crawley}
+ [Dowager Countess of Grantham,\haschild]
+
+\mrrgdef{six}{}{PatrickSix}{Violet}
+\gensdef{Crawleys}{six}{%
+ {Violet}{Robertandsis}%
+}
+
+\fbox{\usebox{\Crawleys}}
+
+\hfill (at the end of Season 7)
+
+\end{document}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\idef[\ftblank]{}{Isidore Levinson}[(deceased)]
+\idef{}{Martha Levinson}
+\mrrgdef{Levinsons}{}{Isidore}{Martha}
+\idef{}{Harold Levinson}
+
+\idef{}{Roberta}
+\idef[\ftblank]{}{husband}
+
+\idef{}{Susan MacClare}[Marchioness of Flintshire]
+\idef[\ftblank]{}{Hugh ``Shrimpie'' MacClare}[Marquess of Flintshire]
+\mrrgdef{MacClares}{}{Shrimpie}{Susan}
+\idef{}{Lady Rose MacClare}
diff --git a/macros/latex/contrib/familytree/samples/Makefile b/macros/latex/contrib/familytree/samples/Makefile
new file mode 100644
index 0000000000..61db41cab8
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Makefile
@@ -0,0 +1,24 @@
+
+Dir ?= /tmp
+Tgt = ${Dir}/Crawley.pdf
+
+include ../cmd.mk
+
+all: ${Tgt}
+ for i in Asai Tokugawa; \
+ do ${MAKE} -C ${CURDIR}/$${i} $@; done
+
+clean:
+ ${RM} *~ ${Tgt}
+ for i in Asai Tokugawa; \
+ do ${MAKE} -C ${CURDIR}/$${i} $@; done
+
+install: all
+ install -m 444 -pD ${Tgt} \
+ ${InstallDir}/source/latex/${Name}/$(notdir ${Tgt})
+ for i in Asai Tokugawa; \
+ do ${MAKE} -C ${CURDIR}/$${i} $@; done
+
+${Tgt}: ${Dir}/%.pdf: %.tex ${Dir}/familytree.sty
+ $(call Latex, $<)
+ cd ${Dir}; ${DVIPDFMX} $(basename $<).dvi
diff --git a/macros/latex/contrib/familytree/samples/Tokugawa.pdf b/macros/latex/contrib/familytree/samples/Tokugawa.pdf
new file mode 100644
index 0000000000..78b07ad266
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Tokugawa.pdf
Binary files differ
diff --git a/macros/latex/contrib/familytree/samples/Tokugawa/Makefile b/macros/latex/contrib/familytree/samples/Tokugawa/Makefile
new file mode 100644
index 0000000000..9c91482b6f
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Tokugawa/Makefile
@@ -0,0 +1,20 @@
+
+Dir ?= /tmp
+Tgt = ${Dir}/Tokugawa.pdf
+
+LATEX ?= platex -kanji=euc
+include ../../cmd.mk
+
+all: ${Tgt}
+
+clean:
+ ${RM} *~ ${Tgt}
+
+install:
+ install -m 444 -pD ${Tgt} \
+ ${InstallDir}/source/latex/${Name}/$(notdir ${Tgt})
+
+${Tgt}: ${Dir}/%.pdf: %.tex ${Dir}/familytree.sty
+ $(call Latex, $<)
+ cd ${Dir}; ${DVIPDFMX} -o a.pdf $(basename $<).dvi
+ ${PDFCROP} ${Dir}/a.pdf $@
diff --git a/macros/latex/contrib/familytree/samples/Tokugawa/Tokugawa.tex b/macros/latex/contrib/familytree/samples/Tokugawa/Tokugawa.tex
new file mode 100644
index 0000000000..dd71aa8e28
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Tokugawa/Tokugawa.tex
@@ -0,0 +1,299 @@
+\documentclass[
+ paper=a0,
+ tate,
+ %landscape,
+ %12pt,
+ jlreq_notes,open_bracket_pos=nibu_tentsuki
+]{jlreq}
+\AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}}
+
+\input{../../fonts}
+\usepackage[noreplace,expert]{otf}
+\usepackage{familytree}
+
+\newcommand{\Empty}{}
+\newcommand{\nm}{}
+\NewDocumentCommand{\idef}{O{\ftbiological}momoO{0pt}}{
+ % [cmark] xname [title] name [opt] [xlen]
+ \def\nm{#4}%
+ \if#2\Empty\else%
+ \def\nm{#4#2}%
+ \fi%
+ %
+ \indvdldef[#1]{#4}[#3]{\nm}[#5][#6]%
+}
+\let\sdef=\sblngdef
+%\nameboxcfg{}{}{}{4zw}
+
+\ivaldef{ivalv}{5zh}
+\ivaldef{ivalx}{10zh}
+
+\begin{document}
+\pagestyle{empty}
+
+familytree sample
+
+\textgt{\large Ͽ}
+
+\input{tg-15th}
+% \fbox{\usebox{\Фλ}}
+
+\input{tg-14th}
+\pcdef{зĴ}{}{Фλ}
+% \fbox{\usebox{\зĴ}}
+
+\input{tg-13th}
+\gensdef{}{ȷĤλ}{%
+ {}{зĴ}%
+}
+% \fbox{\usebox{\}}
+
+\input{tg-12th}
+\gensdef{ȷIJ}{Ƥλ}{%
+ {ȷ}{},%
+ {ƽ}{ʡ}%
+}
+% \fbox{\usebox{\ȷIJ}}
+
+\input{tg-11th}
+%\ftdbgtrue
+%\message{\the\ht\ȷIJ}
+\gensdef{Ʋȷ}{ȼλ}{%
+ {}{ȷIJ}%
+}
+%\message{\the\ht\Ʋȷ}
+% \fbox{\usebox{\Ʋȷ}}
+
+\input{tg-10th}
+\gensdef{ȼ}{ȽŤλ}{%
+ {ȼ}{Ʋȷ}%
+}
+\gensdef{ѿƻ}{λ}{%
+ {}{Ѥλ}%
+}
+% \fbox{%
+% \vbox{\hbox{\usebox{\ȼ}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\ѿƻ}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\ƾλ}}%
+% }}
+
+\input{tg-9th}
+\gensdef{ȽŲȼ}{Ƚλ}{%
+ {Ƚ}{ȼ},%
+ {}{ѿƻ}%
+}
+%\sdef{ؤλ}{,ʿ}
+\gensdef{ƾƻ}{λ}{%
+ {ƾ}{ƾλ}%
+}
+% \fbox{%
+% \vbox{\hbox{\usebox{\ȽŲȼ}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\ƾƻ}}%
+% }}
+
+\input{tg-8th}
+\pcdef{ȽȽ}{Ƚ}{ȽŲȼ}
+\pcdef{ؿƻ}{}{ؤλ}
+%\pcdef{근ƻ}{근}{}
+\gensdef{ƾ}{ݤλ}{%
+ {}{ƾƻ}%
+}
+% \fbox{%
+% \vbox{\hbox{\usebox{\ȽȽ}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\ؿƻ}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\ƾ}}%
+% }}
+
+\input{tg-7th}
+\pcdef{ȷѵȽ}{ȷ}{ȽȽ}
+\gensdef{근}{긬λ}{%
+ {근}{ؿƻ}%
+}
+\gensdef{ݼ}{ͤλ}{%
+ {}{ƾ}%
+}
+% \fbox{%
+% \vbox{\hbox{\usebox{\ȷѵȽ}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\근}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\ݼ}}%
+% }}
+
+\input{tg-6th}
+\pcdef{ȷ}{}{ȷѵȽ}
+\gensdef{긬근}{λ}{%
+ {긬}{근}%
+}
+%\sdef{˭λ}{Ϥ,꼣}
+\gensdef{ͼ}{λ}{%
+ {}{ݼ}%
+}
+% \fbox{\usebox{\λ}}\par
+% \fbox{\usebox{\˭λ}}\par
+% \fbox{\usebox{\λ}}\par
+% \fbox{%
+% \vbox{\hbox{\usebox{\ȷ}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\긬근}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\ͼ}}%
+% }}
+
+\input{tg-5th}
+\pcdef{˵Ȳ}{˵}{ȷ}
+\gensdef{긬}{ľλ}{%
+ {}{긬근}%
+}
+%\tokuone{}{}
+\gensdef{˭ƻ}{λ}{%
+ {˭}{˭λ}%
+}
+\gensdef{}{˾λ}{%
+ {}{ͼ}%
+}
+% \fbox{\usebox{\˵}}\par
+% \fbox{\usebox{\ľλ}}\par
+% \fbox{\usebox{\λ}}\par
+% \fbox{\usebox{\˾λ}}\par
+% \fbox{%
+% \vbox{\hbox{\usebox{\˵Ȳ}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\긬}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\˭ƻ}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\}}%
+% }}
+
+\input{tg-4th}
+\gensdef{ȹ˹˵}{ȸλ}{%
+ {ȹ}{˵Ȳ},%
+ {˽}{˽Ťλ}%
+}
+%\sdef{λ}{˶,꿦,}
+\gensdef{ľ}{λ}{%
+ {ľ}{긬}%
+}
+\gensdef{˭}{Ťλ}{%
+ {}{˭ƻ},%
+ {}{}%
+}
+%\let\˭=\˭
+\gensdef{˾}{λ}{%
+ {˾}{}%
+}
+% \fbox{\usebox{\ȸλ}}\par
+% \fbox{\usebox{\λ}}\par
+% \fbox{\usebox{\λ}}\par
+% \fbox{\usebox{\Ťλ}}\par
+% \fbox{\usebox{\λ}}\par
+% \fbox{%
+% \vbox{\hbox{\usebox{\ȹ˹˵}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\ľ}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\˭}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\˾}}%
+% }}
+
+\input{tg-3rd}
+\gensdef{ȸȹ}{λ}{%
+ {ȸ}{ȹ˹˵}%
+}
+\gensdef{}{λ}{%
+ {}{λ},%
+ {}{ľ}%
+}
+%\let\㽡ľ=\
+\gensdef{}{˼λ}{%
+ {}{˭},%
+ {}{˾}%
+}
+\let\˾=\
+% \fbox{%
+% \vbox{\hbox{\usebox{\ȸȹ}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\}}%
+% \vskip\baselineskip%
+% \hbox{\usebox{\}}%
+% }}
+
+\input{tg-2nd}
+\gensdef{ȸ}{ȹλ}{%
+ {}{ȸȹ},%
+ {}{},%
+ {˼}{}%
+}
+% \fbox{\usebox{\ȸ}}
+
+\input{tg-1st}
+\pcdef{ȹ}{ȹ}{ȸ}
+%\fbox{%
+\usebox{\ȹ}%
+%}
+
+% W \the\wd\ȹ, H \the\ht\ȹ, D \the\dp\ȹ
+
+\clearpage
+\begin{minipage}{16zw}
+\iffalse
+ŷIJȤϹİ̷ѾκݤܻҤȤ뤳ȤϤʤϹ²˻ҤȤȤ
+ʤΤ
+ȤɬܻҤˤƾѤƤ롣
+㤤ϲȼʬʤ˹ͤƤߤ
+
+ȤξϡֿפѤǤȤ̣ĤΤ
+⻺³ʤܻҤǤʤȤɤȻפΤϹͤ㤦Τ
+
+󡢤ɤ
+
+봱̤īäΤǡѾǤΤˤ˸¤
+ȤȤǡֲȡפ
+Ťϡ¢פȤꡢοƱȤǷѾƤʡ
+̾¢󡣿¢ϸ¢ʤˤĤʤ롣ŻȤ¢δ
+δΤ󤱤ɡ
+
+ѾǤʤ־ԡˤ뤷ʤȤȤ
+ʬ󤤿̤Ǥͥȸޤоˤդ路Ȥιͤ顢
+Ȥޤ礤ԤǤ⡢ܻҤǯǤ⡢
+ܻұȤƾѤȤȤʤΤ
+󡢰㤦ʡ
+
+Ǥ⡢ͥɤȤȽǤΤܻҤξǡ»Ҥ
+ľȤ¼ȤޤɤʤǤѤǤ롣»ҤȤ
+褦
+ܤ̵ǽ֤Ϥ褯뤬ͤƤʤ櫓ǤϤʤ
+ηѾϤȤ餫⤷ʤɡճȹͤƤ뤸ʤ
+Ȥݤ
+
+ĥ͡ˤϸ滰ȤȤäơȹλҤʬȤˤʤä餫
+齡Ȥ׷ѤԥˤʤäΥХååפȹͤƤ褦
+Ʈ򤱤Ū⤢ä
+ΥХååפͭ˵ǽĥͤϸ˽ȤܻҤФ
+ĥ龭ϽФƤʤյ̵櫓ǤϤʤ
+
+ιļϤɤ
+ܤŵʤɤν礭ѹˤŵ
+򤤤褤ѻߤؿʤ᤿
+ŷİʹߡŷĤϹĹȤҤ⤦Ƥʤ¦٤ʤ
+ߤιļŵϤǤλҤ²ǤϤʤȤƤ餷
+󡢥ХååפפΤ
+\bigskip
+
+Ͳϼ»ҤĹܻҤ˽ФޤĹλҤܻҤˤȤäꤷƤ롣
+ʤԼ˸뤬ˤμʬĤѤȤ˰ܤ򴶤Ƥ
+ʡϷλҤطѤäȤȤ
+\bigskip
+\fi
+
+οޤñ˿Ϳ¿ǤϤʤƱ⤵·Τ˼֤
+դfamilytree pkgκβͥ٤㤤ɤ⡣
+\end{minipage}
+\end{document}
diff --git a/macros/latex/contrib/familytree/samples/Tokugawa/tg-10th.tex b/macros/latex/contrib/familytree/samples/Tokugawa/tg-10th.tex
new file mode 100644
index 0000000000..b58df406e3
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Tokugawa/tg-10th.tex
@@ -0,0 +1,25 @@
+\idef{}[]{ȼ}[\ftmaleline,\ymd{1737}][4zw]
+\idef{}{Ź}
+\sdef{ȽŤλ}{ȼ,Ź}
+
+\idef{ʿ}{ž}
+\idef{ʿ}{}
+\idef{}{}[\ftmaleline][4zw]
+\idef{}{Ƿ}
+\sdef{λ}{ž,,,Ƿ}
+
+\idef{}{}[\ymd{1832}]
+\idef{}{}
+\idef{ʿ 춶 ν Ĵ}{}
+\idef{ʿ}{ľ}
+\idef{}{}
+\idef{ʿ}{}
+\idef{Ϣ}{}
+\idef{ʿ}{}
+%\idef{ʿ}{}
+\indvdldef{ƾ}{¡ʾʿ}
+\idef{ڲ}{ľ}
+\idef{}{}
+\idef{ʿ}{}
+\idef{ʿ}{Ƿ}[\ymd{1858}]
+\sdef{ƾλ}{,,,ľ,,,,,ƾ,ľ,,,Ƿ}
diff --git a/macros/latex/contrib/familytree/samples/Tokugawa/tg-11th.tex b/macros/latex/contrib/familytree/samples/Tokugawa/tg-11th.tex
new file mode 100644
index 0000000000..635339f898
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Tokugawa/tg-11th.tex
@@ -0,0 +1,11 @@
+\idef[\adopted]{}[]{}[\ftmaleline,\ymd{1773}][10zw]
+\idef{}{ȴ}
+\sdef{ȼλ}{ȴ,ival,}
+
+\idef{ν }{˭}
+\idef{}{}
+\idef{}{δ}
+\idef{}{ƶ}
+\idef{}{}
+\idef{ʿ}{}
+\sdef{Ѥλ}{˭,,δ,ƶ,,}
diff --git a/macros/latex/contrib/familytree/samples/Tokugawa/tg-12th.tex b/macros/latex/contrib/familytree/samples/Tokugawa/tg-12th.tex
new file mode 100644
index 0000000000..7468787721
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Tokugawa/tg-12th.tex
@@ -0,0 +1,14 @@
+\idef{}[]{ȷ}[\ftmaleline,\ymd{1793}][4zw]
+\idef{}{ƽ}[\ftmaleline,ʤ椭]
+\idef{}{}
+\idef{}{}%[ʤꤿ]
+\idef{}{ƽ}
+\idef{ʿ}{̱}
+\idef{ĥ}{Ʋ}%[ʤϤ]
+\idef{ʿ}{}%[ʤʤ]
+\idef{}{ƶ}%[ʤ꤫]
+\idef{ʿ}{}%[ʤꤵ]
+\idef{˪ܲ}{͵}%[ʤҤ]
+\idef{ʿ}{ƾ}%[ʤꤵ]
+\idef{ʿ}{}[\ymd{1825}]
+\sdef{Ƥλ}{ȷ,ival,ƽ,,,ƽ,̱,Ʋ,,ƶ,,͵,ƾ,}
diff --git a/macros/latex/contrib/familytree/samples/Tokugawa/tg-13th.tex b/macros/latex/contrib/familytree/samples/Tokugawa/tg-13th.tex
new file mode 100644
index 0000000000..c51f640176
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Tokugawa/tg-13th.tex
@@ -0,0 +1,6 @@
+\idef{}[]{}[\ymd{1824},\ftmaleline][4zw]
+\idef{춶}{ľ}
+\sdef{ȷĤλ}{,ival,ľ}
+
+\idef{ν }{ʡ}
+%\tokuone{ƽ}{ʡ}
diff --git a/macros/latex/contrib/familytree/samples/Tokugawa/tg-14th.tex b/macros/latex/contrib/familytree/samples/Tokugawa/tg-14th.tex
new file mode 100644
index 0000000000..54b864dbc9
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Tokugawa/tg-14th.tex
@@ -0,0 +1 @@
+\idef[\adopted]{}[]{}[\ftmaleline,\ymd{1846}][2zw]
diff --git a/macros/latex/contrib/familytree/samples/Tokugawa/tg-15th.tex b/macros/latex/contrib/familytree/samples/Tokugawa/tg-15th.tex
new file mode 100644
index 0000000000..1554a8a8bf
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Tokugawa/tg-15th.tex
@@ -0,0 +1,3 @@
+\idef[\adopted]{}{о}[Ĥ]
+\idef[\adopted]{}[]{Ĵ}[\ymd{1837}]
+\sdef{Фλ}{о,ival,Ĵ}
diff --git a/macros/latex/contrib/familytree/samples/Tokugawa/tg-1st.tex b/macros/latex/contrib/familytree/samples/Tokugawa/tg-1st.tex
new file mode 100644
index 0000000000..a04add5312
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Tokugawa/tg-1st.tex
@@ -0,0 +1 @@
+\idef[\fttop]{}[]{ȹ}[\ftmaleline,\ymd{1543}]
diff --git a/macros/latex/contrib/familytree/samples/Tokugawa/tg-2nd.tex b/macros/latex/contrib/familytree/samples/Tokugawa/tg-2nd.tex
new file mode 100644
index 0000000000..5b47172236
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Tokugawa/tg-2nd.tex
@@ -0,0 +1,10 @@
+\idef{ʿ}{}
+\idef{}{}
+\idef{}[]{}[\ftmaleline,\ymd{1579}][4zw]
+\idef{ʿ}{}
+\idef{}{}
+\idef{ʿ}{鵱}
+\idef{ĥ}{ľ}
+\idef{}{}[\ftmaleline]
+\idef{}{˼}[\ftmaleline]
+\sdef{ȹλ}{,,ival,,ival,,,鵱,ľ,ival,,ivalx,ivalx,ivalv,ivali,˼}
diff --git a/macros/latex/contrib/familytree/samples/Tokugawa/tg-3rd.tex b/macros/latex/contrib/familytree/samples/Tokugawa/tg-3rd.tex
new file mode 100644
index 0000000000..032ab8599f
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Tokugawa/tg-3rd.tex
@@ -0,0 +1,22 @@
+\idef{}[]{ȸ}[\ftmaleline,\ymd{1604}][4zw]
+\idef{ٲ}{Ĺ}
+\idef{ݲ}{Ƿ}
+\sdef{λ}{ȸ,Ĺ,Ƿ}
+
+\idef{}{}[\ftmaleline][4zw]
+\idef{ʿ}{}
+\idef{ʿ}{}[\ftmaleline]
+\sdef{λ}{,ivalii,,ivalii,}
+
+\idef{ʿ}{}[\ftmaleline,\ymd{1622}]
+\idef{}{}[\ftmaleline][4zw]
+\idef{ʿ}{긵}
+\idef{ʿ}{δ}
+\idef{ʿ}{}
+\idef{ʿ}{ͺ}
+\indvdldef{˼ͺ}{ͺʾʿ}
+\indvdldef{˼}{١ʾʿ}
+\idef{ʿ}{}
+\idef{ʿ}{˼}
+\idef{}{ŵ}[\ymd{1634}]
+\sdef{˼λ}{,ivalii,ivalii,,긵,δ,,˼ͺ,˼,,˼,ŵ}
diff --git a/macros/latex/contrib/familytree/samples/Tokugawa/tg-4th.tex b/macros/latex/contrib/familytree/samples/Tokugawa/tg-4th.tex
new file mode 100644
index 0000000000..033c12f4cd
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Tokugawa/tg-4th.tex
@@ -0,0 +1,35 @@
+
+\idef{}[]{ȹ}[\ftmaleline,\ymd{1641}][8zw]
+\idef{}{˽}[\ftmaleline]
+\idef{θ ˵}{}
+\sdef{ȸλ}{ȹ,ival,˽,}
+
+\idef{}{˶}
+\idef{}{꿦}
+\idef{Ȭ Ƚ}{}
+\sdef{λ}{˶,꿦,}
+
+\idef{}{}
+\idef{ʿ}{ϩ}
+\idef{ʿ}{}
+\indvdldef{ͺ}{ͺʾʿ}
+\idef{}{ľ}[\ftmaleline][8zw]
+\idef{}{}
+\idef{ʿ}{}
+\sdef{λ}{,ϩ,,ͺ,ľ,,}
+
+\idef{}{}%[]%
+\idef[\adopted]{}{}[\ftmaleline][8zw]
+\idef{˾}{}%
+\idef{}{}
+\idef{}{}[\ftmaleline]
+\idef{}{ľ}
+\idef{}{˧}
+\sdef{Ťλ}{,,,,,ľ,˧}
+
+%μ»
+\idef{ξʿ}{}%Ť
+%ܻ
+\idef[\adopted]{}{}
+\idef[\adopted]{}{˾}[\ftmaleline, Ĥʤ][8zw]
+\sdef{λ}{,,˾}
diff --git a/macros/latex/contrib/familytree/samples/Tokugawa/tg-5th.tex b/macros/latex/contrib/familytree/samples/Tokugawa/tg-5th.tex
new file mode 100644
index 0000000000..180ab0d48c
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Tokugawa/tg-5th.tex
@@ -0,0 +1,27 @@
+
+\idef[\adopted]{}[]{˵}[\ftmaleline,\ymd{1646}][4zw]
+
+\idef{ϻ }{˭}
+\idef{ʿ}{}
+\sdef{˽Ťλ}{˭,}
+
+\idef{}{}[\ftmaleline][4zw]
+\idef{}{}
+\idef{ʿ}{}
+\idef{ʿ}{ͭ}
+\idef{ƣ}{紴}
+\sdef{ľλ}{,,,ͭ,紴}
+
+\idef{˭}{}
+%\tokuone{}{}
+
+\indvdldef{}{}
+\idef{}{׾}
+\idef[\adopted]{}{˭}[\ftmaleline][4zw]
+\sdef{λ}{,׾,˭}
+
+\idef{}{}[褷]
+\indvdldef[\adopted]{tmp}{}[\ftmaleline,ͤ]
+\idef[\adopted]{}{}[\ftmaleline,ͤ][4zw]
+\ftundef{tmp}
+\sdef{˾λ}{,}
diff --git a/macros/latex/contrib/familytree/samples/Tokugawa/tg-6th.tex b/macros/latex/contrib/familytree/samples/Tokugawa/tg-6th.tex
new file mode 100644
index 0000000000..d3b9484d97
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Tokugawa/tg-6th.tex
@@ -0,0 +1,21 @@
+\idef[\adopted]{}[ϻ]{}[\ftmaleline,\ymd{1662}][4zw]
+
+\idef{}{}
+\idef{ƣ}{ʸ}
+\idef{ʿ}{궽}
+\idef{ʿ}{긬}[\ftmaleline,꤫]
+\idef{ʿ}{}
+\idef{}{}
+%\idef{ʿ}{}
+\indvdldef{}{¡ʾʿ}
+\idef{ƣ}{ƻ}
+\idef{}{ͳ}
+\sdef{λ}{,ʸ,궽,긬,,,,ƻ,ͳ}
+
+\idef{}{Ϥ}%
+\idef{}{꼣}
+\sdef{˭λ}{Ϥ,꼣}
+
+\idef{ʿ}{}%[椭]
+\idef{}{}[\ftmaleline,ͤ][4zw]
+\sdef{λ}{,}
diff --git a/macros/latex/contrib/familytree/samples/Tokugawa/tg-7th.tex b/macros/latex/contrib/familytree/samples/Tokugawa/tg-7th.tex
new file mode 100644
index 0000000000..6172b42760
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Tokugawa/tg-7th.tex
@@ -0,0 +1,14 @@
+\idef{}[]{ȷ}[\ftmaleline,\ymd{1709}][4zw]
+
+\idef{ʿ}{}
+\idef{¿}{鸲}
+\idef{ʿ}{근}[\ftmaleline,椭]
+\sdef{긬λ}{,鸲,근}
+
+\idef{}{}[\ftmaleline][4zw]
+\idef{ʿ}{}%ʿܻ
+\idef{ʿ}{}
+\idef{ʿ}{ݼ}
+\idef{ʿ}{ʡ}%ʿܻ
+\idef{滳}{}%滳ܻ
+\sdef{ͤλ}{,,,ݼ,ʡ,}
diff --git a/macros/latex/contrib/familytree/samples/Tokugawa/tg-8th.tex b/macros/latex/contrib/familytree/samples/Tokugawa/tg-8th.tex
new file mode 100644
index 0000000000..f65ce053fd
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Tokugawa/tg-8th.tex
@@ -0,0 +1,9 @@
+\idef[\adopted]{}[Ȭ]{Ƚ}[\ftmaleline,\ymd{1684}][4zw]
+
+\idef{ʿ}{}[\ftmaleline,ꤵ]
+%\tokuone{근}{}
+
+\idef{}{}[\ftmaleline][4zw]
+\idef{ʿ}{}
+\idef{ڲ}{ɧľ}
+\sdef{ݤλ}{,,ɧľ}
diff --git a/macros/latex/contrib/familytree/samples/Tokugawa/tg-9th.tex b/macros/latex/contrib/familytree/samples/Tokugawa/tg-9th.tex
new file mode 100644
index 0000000000..11edb126df
--- /dev/null
+++ b/macros/latex/contrib/familytree/samples/Tokugawa/tg-9th.tex
@@ -0,0 +1,15 @@
+\idef{}[]{Ƚ}[\ftmaleline,\ymd{1712}][4zw]
+\idef{İ}{}
+\idef{춶}{}[\ftmaleline,ͤ]
+\sdef{Ƚλ}{Ƚ,ivalii,,ivalii,}
+
+\idef{ʿ}{}
+\indvdldef{ʿ}{סʾʿ о}
+\sdef{ؤλ}{,ʿ}
+
+\idef{}{}
+\idef{ʿ}{}
+\idef{}{ƾ}[\ftmaleline][4zw]
+%\idef{ʿ}{Ҫ}
+\indvdldef{꤫}{\UTF{7b60}ʾʿ}
+\sdef{λ}{,,ƾ,꤫}
diff --git a/macros/latex/contrib/msu-thesis/README.md b/macros/latex/contrib/msu-thesis/README.md
index ce9c019137..029716d82d 100644
--- a/macros/latex/contrib/msu-thesis/README.md
+++ b/macros/latex/contrib/msu-thesis/README.md
@@ -1,4 +1,4 @@
-# MSU Thesis Class Version 3.3 2022/04/18
+# MSU Thesis Class Version 3.3b 2022/06/24
Copyright 2011-2022 by Alan Munn <amunn@msu.edu>
diff --git a/macros/latex/contrib/msu-thesis/msu-thesis.cls b/macros/latex/contrib/msu-thesis/msu-thesis.cls
index d6e194176c..d925844068 100644
--- a/macros/latex/contrib/msu-thesis/msu-thesis.cls
+++ b/macros/latex/contrib/msu-thesis/msu-thesis.cls
@@ -158,15 +158,18 @@
% Version 3.0b 2021/07/14 Added msu@hchap counter for hyperref targets in appendices (unreleased)
% Version 3.1 2022/03/03 Added support for List of Algorithms plus fixes for algorithm2e and algorithmicx etc
% Version 3.1b 2022/03/25 Fixed numbering problem for single global appendix
-% Version 3.2 2022/04/16 Fixed TOC formatting problem for per-chapter appendices
+% Version 3.2 2022/04/16 Fixed TOC formatting problem for per-chapter appendices
% Version 3.3 2022/04/18 New option bibassection to allow for thesis office inconsistencies.
% Also adjusted chapter title code so that Appendix chapters can have
% the extra blank line that the thesis office wants. More inconsistencies.
+% Version 3.3b 2022/06/24 Fixed secnumdepth problem when appendices are used;
+% Fixed numbering issue of subsequent chapters;
+% made TOC leaders all identical.
%
% Report bugs/problems/questions to <amunn@msu.edu>
%
-\def\msu@version{3.3}
-\def\msu@date{2022/04/18}
+\def\msu@version{3.3b}
+\def\msu@date{2022/06/24}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{msu-thesis}[\msu@date\space Michigan State University Thesis Class version \msu@version]
\newif\ifmsu@dissertation\msu@dissertationtrue % added v2.7 boolean for \msu@thesistype
@@ -345,6 +348,11 @@
\def\msu@tocfont{\normalfont}
\def\msu@chapfont{\bfseries}
\fi
+% In all cases make the leaders identical to section leaders
+% Thesis office sometimes complains about the fact that chapter leaders
+% are larger because they define “consistency” as what Word does
+% Added 6/24/2022
+\let\cftchapterleader\cftsectionleader
% Support for algorithm packages added v3.1
% If using the algorithm2e package, you must load it with the algo2e package option
@@ -408,9 +416,11 @@
\cftinsertcode{CHAPAPPR}{
\cftsetindents{section}{1.5em}{2.3em}
\setlength{\cftchapterindent}{0em}
+\setlength{\cftchapternumwidth}{3em} % added 6/24/2022
\setlength{\cftbeforechapterskip}{1.0em \@plus\p@}
\renewcommand\cftchapterfont{\msu@chapfont}
\renewcommand\cftchapterpagefont{\msu@chapfont}
+ \settocdepth{subsubsection} % added 6/24/2022
}
% This code resets the changes made in the APP code back to normal
% so that the bibliography will appear correctly in the TOC
@@ -639,13 +649,13 @@
\setcounter{chapter}{0}%
\renewcommand\@chapapp{\appendixname}%
\renewcommand\thechapter{\msuappendixnumformat}%
- \restoreapp
+% \restoreapp % removed 6/24/2022
}
% Don't save the appendix counters even for per-chapter appendices
-\let\restoreapp\relax
+%\let\restoreapp\relax % removed 6/24/2022
% make the bibliography page
diff --git a/macros/latex/contrib/msu-thesis/msu-thesis.pdf b/macros/latex/contrib/msu-thesis/msu-thesis.pdf
index fee00470b4..7a812b78a0 100644
--- a/macros/latex/contrib/msu-thesis/msu-thesis.pdf
+++ b/macros/latex/contrib/msu-thesis/msu-thesis.pdf
Binary files differ
diff --git a/macros/latex/contrib/msu-thesis/msu-thesis.tex b/macros/latex/contrib/msu-thesis/msu-thesis.tex
index 39195c067a..1f31bc87b0 100644
--- a/macros/latex/contrib/msu-thesis/msu-thesis.tex
+++ b/macros/latex/contrib/msu-thesis/msu-thesis.tex
@@ -2,8 +2,8 @@
\documentclass[11pt]{article}
-\def\msuversion{3.3}
-\def\msudate{2022/04/18}
+\def\msuversion{3.3b}
+\def\msudate{2022/06/24}
\title{\textbf{Using the MSU Thesis Class}}
\author{\textbf{Alan Munn}\\Department of Linguistics, Languages, and Cultures\\Michigan State University\\\texttt{\href{mailto:amunn@msu.edu}{amunn@msu.edu}}}
\date{Version \msuversion\\\msudate}
@@ -345,11 +345,11 @@ I'm happy to answer emails about formatting issues with the class, especially wh
\end{itemize}
\subsection{Archiving your thesis for the future}
Since the current version of the \pkg{msu-thesis} class satisfies the Graduate School requirements at any one time, as these requirements change, you may find that if you need to recompile your thesis after you have graduated that the formatting changes. To avoid this, I would recommend saving an archived version of the \pkg{msu-thesis.cls} file in the same folder as your thesis file. You only need to do this once you have completely finished your thesis however; there's no need to do it during the writing process.
-\subsection{Version history}
-Previous versions of \pkg{msu-thesis} (versions 1.0--1.4b) were created for non-electronic submission and should not be used. Versions 1.5--1.6 (the first electronic submission versions) contained a |\makeabstract| command and a separate |msuabstract| environment. These have been removed as of version 1.7. Users who are upgrading from earlier versions to version 1.7 do not need to change these commands however but their use will trigger a warning.) Version 2.0 implemented landscape pages; version 2.1 added support for \pkg{hyperref}. Versions 2.2--2.5 mainly accommodated to the ever changing whims of the MSU Graduate School. Version 2.6 fixed some appendix bugs introduced by the previous whim accommodation. Version 2.7 fixed various small spacing issues, fixed a bug which prevented a new chapter page to be a landscape page, added support for the \pkg{apacite} package, and updated degree options. Version 2.8 fixed some spacing and capitalization issues and added support for the public abstract. Version 2.9 removed subscript/superscript size restrictions, added font size options and made small spacing changes to appease the thesis office. Version 3.0 added full support for per-chapter bibliographies and appendices, and automated bibliography spacing for |natbib| and |biblatex| produced bibliographies. Version 3.1 added support for an |{algorithm}| environment and a list of algorithms to combat incompatibilities with the \pkg{algorithm} and \pkg{algorithm2e} packages. Version 3.2 fixed some lingering problems with per-chapter appendices. Version 3.2 added code to accommodate the insane inconsistencies in formatting requirements that the thesis office requires, including a new contents option which hopefully should never be used.
+\subsection{Major Version history}
+Previous versions of \pkg{msu-thesis} (versions 1.0--1.4b) were created for non-electronic submission and should not be used. Versions 1.5--1.6 (the first electronic submission versions) contained a |\makeabstract| command and a separate |msuabstract| environment. These have been removed as of version 1.7. Users who are upgrading from earlier versions to version 1.7 do not need to change these commands however but their use will trigger a warning.) Version 2.0 implemented landscape pages; version 2.1 added support for \pkg{hyperref}. Versions 2.2--2.5 mainly accommodated to the ever changing whims of the MSU Graduate School. Version 2.6 fixed some appendix bugs introduced by the previous whim accommodation. Version 2.7 fixed various small spacing issues, fixed a bug which prevented a new chapter page to be a landscape page, added support for the \pkg{apacite} package, and updated degree options. Version 2.8 fixed some spacing and capitalization issues and added support for the public abstract. Version 2.9 removed subscript/superscript size restrictions, added font size options and made small spacing changes to appease the thesis office. Version 3.0 added full support for per-chapter bibliographies and appendices, and automated bibliography spacing for |natbib| and |biblatex| produced bibliographies. Version 3.1 added support for an |{algorithm}| environment and a list of algorithms to combat incompatibilities with the \pkg{algorithm} and \pkg{algorithm2e} packages. Version 3.2 fixed some lingering problems with per-chapter appendices. Version 3.3 added code to accommodate the insane inconsistencies in formatting requirements that the thesis office requires, including a new contents option which hopefully should never be used.
\section{Acknowledgements}
-Thanks to Lars Madsen, Ulrike Fischer and Peter Wilson for help with setting up parts of the memoir code for versions 1.0--1.4 (now eliminated due to changed requirements). Thanks to Wolfgang Sternefeld for supplying the \pkg{linguex} spacing fix code, Leo Liu for the landscape page numbering code, which greatly simplified my original version, and Florent Chervet for the \pkg{hyperref} code. Thanks also to the following students who have reported problems over the years: Irina Agafonova, Ali Al-jiboory, Julian Blank, Dmitriy Bryndin, Greg Christian, Kyle Crayne, Ciaron Hamilton, Matt Husband, Changkuk Jung, Adam Liter, Vanessa Maldonado, William Muir, Alicia Parrish, Neil ver Planck, Adam Soliman, Erik Stitt, Eremey Valetov, Matthew Vincent, Michael Wojcik, Stephen Yowono, and Yisu Zhou. A special thank you to Non Thongprong who graciously provided a copy of his entire thesis which allowed me to debug some especially subtle spacing inconsistencies.
+Thanks to Lars Madsen, Ulrike Fischer and Peter Wilson for help with setting up parts of the memoir code for versions 1.0--1.4 (now eliminated due to changed requirements). Thanks to Wolfgang Sternefeld for supplying the \pkg{linguex} spacing fix code, Leo Liu for the landscape page numbering code, which greatly simplified my original version, and Florent Chervet for the \pkg{hyperref} code. Thanks also to the following students who have reported problems over the years: Irina Agafonova, Ali Al-jiboory, Julian Blank, Dmitriy Bryndin, Greg Christian, Kyle Crayne, Ciaron Hamilton, Matt Husband, Changkuk Jung, Adam Liter, Vanessa Maldonado, William Muir, Alicia Parrish, Neil ver Planck, Giacomo Romanini, William Sands, Adam Soliman, Erik Stitt, Eremey Valetov, Matthew Vincent, Michael Wojcik, Stephen Yowono, and Yisu Zhou. A special thank you to Non Thongprong who graciously provided a copy of his entire thesis which allowed me to debug some especially subtle spacing inconsistencies.
\appendix
\renewcommand{\thesection}{Appendix \Alph{section}}
diff --git a/macros/latex/contrib/msu-thesis/samples/MSU-thesis-testfile.pdf b/macros/latex/contrib/msu-thesis/samples/MSU-thesis-testfile.pdf
index d19cfa3677..82ab9f34a7 100644
--- a/macros/latex/contrib/msu-thesis/samples/MSU-thesis-testfile.pdf
+++ b/macros/latex/contrib/msu-thesis/samples/MSU-thesis-testfile.pdf
Binary files differ
diff --git a/macros/latex/contrib/newpax/README.md b/macros/latex/contrib/newpax/README.md
index 7b7ecc8248..67884fc915 100644
--- a/macros/latex/contrib/newpax/README.md
+++ b/macros/latex/contrib/newpax/README.md
@@ -7,7 +7,7 @@ a lua script first.
The package is based on and uses code from [pax](https://ctan.org/pkg/pax) by Heiko Oberdiek.
-Packageversion: 0.51
+Packageversion: 0.52
Packagedate: 2021-02-26
Author: Ulrike Fischer
diff --git a/macros/latex/contrib/newpax/doc-input1.pdf b/macros/latex/contrib/newpax/doc-input1.pdf
index 76e98f14e0..9ba17a7b81 100644
--- a/macros/latex/contrib/newpax/doc-input1.pdf
+++ b/macros/latex/contrib/newpax/doc-input1.pdf
@@ -1,263 +1,275 @@
%PDF-1.5
%
+10 0 obj
+<< /Type /Filespec /AFRelationship /Unspecified /Subtype /application#2Fpdf /F <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066> /UF <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066> >>
+endobj
+11 0 obj
+<< /Type /Action /S /GoToR /F 10 0 R /D (chapter.1) >>
+endobj
13 0 obj
-<< /Length 4811 >>
+<< /Type /Filespec /AFRelationship /Unspecified /Subtype /application#2Fpdf /F <FEFF006500780061006D0070006C0065002D0069006D006100670065002E007000640066> /UF <FEFF006500780061006D0070006C0065002D0069006D006100670065002E007000640066> >>
+endobj
+14 0 obj
+<< /Type /Action /S /GoToR /F 13 0 R /D [0/Fit] >>
+endobj
+17 0 obj
+<< /Length 4809 >>
stream
/opacity1 gs
BT
-/F23 9.96264 Tf
-1 0 0 1 148.712 707.125 Tm [<007400480042004D00460069003200740069>]TJ
-1 0 0 1 148.712 695.17 Tm [<0052>]TJ
-/F24 9.96264 Tf
-1 0 0 1 157.011 695.17 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
-/F23 9.96264 Tf
-1 0 0 1 148.712 683.215 Tm [<001B0062>-414<001C004D>27<0076>-413<002F0032002F0042002B001C00690032002F>-415<00600032001C002F00320060>-414<002B001C004D>-415<002B00480032001C006000480076>-414<006200320032002D>-435<0069003F0032>-414<0041002F0032001C0048>-415<00510037>-414<00540060001C002B00690042002B001C0048>-415<00600032001C00620051004D>-414<00420062>-415<001C>]TJ
-1 0 0 1 133.768 671.26 Tm [<0060003200540060003200620032004D>28<0069001C006900420051004D>-390<00510037002D>-406<001C0062>-391<0037001C0060>-391<001C0062>-390<0041>-391<0046004D0051>27<0072002D>-405<0069003F0032>-390<0069003F0042004D003B0062>-391<0042004D>-391<0069003F0032004B0062003200480070>27<003200620063>-419<001C0062>-391<0041>-391<003F001C>27<0070>28<0032>-390<0062003F0051>28<0072004D>]TJ
-1 0 0 1 133.768 659.304 Tm [<00320048006200320072003F003200600032002D>-264<0069003F0032>-247<0054003F0032004D0051004B0032004D001C>-247<0062003F0051006D0048002F>-247<0051004D00480076>-248<0023>-28<0032>-247<006D00620032002F>-247<001C0062>-247<001C>-247<002B001C004D0051004D>-247<003700510060>-247<0051006D0060>-248<006D004D002F0032006000620069001C004D002F0042004D003B0058>]TJ
-1 0 0 1 133.768 647.349 Tm [<0068003F0032>-329<0054001C0060001C00480051003B00420062004B0062>-329<00510037>-330<00540060001C002B00690042002B001C0048>-329<00600032001C00620051004D>-329<001C00600032>-330<0072003F001C0069>-329<007D006000620069>-329<003B00420070>27<0032>-329<0060004200620032>-329<00690051>-329<0069003F0032>-330<001C0060002B>28<003F004200690032002B00690051004D0042002B>]TJ
-1 0 0 1 133.768 635.394 Tm [<00510037>-383<00540060001C002B00690042002B001C0048>-383<00600032001C00620051004D0058>-595<001B0062>-383<0072004200480048>-383<0032001C0062004200480076>-383<0023>-28<0032>-384<0062003F0051>27<0072004D>-382<0042004D>-383<0069003F0032>-383<004D003200740069>-384<00620032002B006900420051004D002D>-395<00600032001C00620051004D>-384<0072>28<0051006D0048002F>]TJ
-1 0 0 1 133.768 623.439 Tm [<0069003F0032006000320023>28<0076>-260<0023>-28<0032>-260<004B001C002F0032>-261<00690051>-260<002B0051004D>27<00690060001C002F0042002B0069002D>-274<0042004D>-260<0070004200320072>-261<00510037>-260<0069003F003200620032>-261<002B0051004D00620042002F00320060001C006900420051004D0062002D>-274<0069003F0032>-261<0041002F0032001C0048>-260<00510037>-261<00540060001C002B0040>]TJ
-1 0 0 1 133.768 611.484 Tm [<00690042002B001C0048>-398<00600032001C00620051004D002D>-415<0076>27<00320069>-398<0069003F0032>-399<004B001C004D0042003700510048002F>-398<002F00320054>-28<0032004D002F0062>-399<0051004D>-398<0069003F0032>-399<0054003F0032004D0051004B0032004D001C0058>-641<004C0032002B00320062006200420069>27<0076>-398<002F00320054>-28<0032004D002F0062>]TJ
-1 0 0 1 133.768 599.529 Tm [<0051004D002D>-350<0072003F0032004D>-348<0069003F>27<006D0062>-346<006900600032001C00690032002F>-347<001C0062>-348<0069003F0032>-347<00540060001C002B00690042002B001C0048>-347<0032004B005400480051>27<0076004B0032004D>28<0069>-347<00510037>-347<0069003F0032>-347<004D00320070>27<0032006000400032004D002F0042004D003B>-347<00600032003B0060003200620062>]TJ
-1 0 0 1 133.768 587.573 Tm [<0042004D>-316<0069003F0032>-316<006200320060004200320062>-316<00510037>-316<0032004B0054004200600042002B001C0048>-317<002B0051004D002F0042006900420051004D0062002D>-319<00690042004B00320058>-439<003E006D004B001C004D>-316<00600032001C00620051004D>-316<002F00320054>-28<0032004D002F0062>-316<0051004D>-316<0051006D0060>-317<00620032004D00620032>]TJ
-1 0 0 1 133.768 575.618 Tm [<0054>-28<00320060002B00320054006900420051004D0062002D>-285<0023>27<0076>-273<004B0032001C004D0062>-274<00510037>-274<001C004D001C0048007600690042002B>-274<006D004D00420069>28<0076>83<0058>-424<0068003F003200600032>-274<002B001C004D>-273<0023>-28<0032>-274<004D0051>-274<002F0051006D00230069>-274<0069003F001C0069>-274<0069003F0032>-274<00510023>-28<00440032002B00690062>]TJ
-1 0 0 1 133.768 563.663 Tm [<0042004D>-333<00620054001C002B0032>-333<001C004D002F>-333<00690042004B0032>-333<001C00600032>-333<0072003F001C0069>-333<007D006000620069>-333<003B00420070>28<0032>-333<0060004200620032>-333<00690051>-333<003F>28<006D004B001C004D>-333<00600032001C00620051004D0058>]TJ
-1 0 0 1 148.712 551.708 Tm [<0054>-28<002F0037>]TJ
-/F36 14.3462 Tf
-1 0 0 1 133.768 518.747 Tm [<0052>-1000<001C0023>-31<002B>]TJ
-1 0 0 1 133.768 490.938 Tm [<006B>-1000<001C0023>-31<002B>]TJ
-1 0 0 1 133.768 463.129 Tm [<006A>-1000<001C0023>-31<002B>]TJ
-/F23 9.96264 Tf
-1 0 0 1 133.768 441.298 Tm [<007D00480032>]TJ
-1 0 0 1 303.133 139.255 Tm [<0052>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 657.235 Tm [<007400480042004D00460069003200740069>]TJ
+1 0 0 1 148.712 645.28 Tm [<0052>]TJ
+/F16 9.96264 Tf
+1 0 0 1 157.011 645.28 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 633.325 Tm [<001B0062>-414<001C004D>27<0076>-413<002F0032002F0042002B001C00690032002F>-415<00600032001C002F00320060>-414<002B001C004D>-415<002B00480032001C006000480076>-414<006200320032002D>-435<0069003F0032>-414<0041002F0032001C0048>-415<00510037>-414<00540060001C002B00690042002B001C0048>-415<00600032001C00620051004D>-414<00420062>-415<001C>]TJ
+1 0 0 1 133.768 621.37 Tm [<0060003200540060003200620032004D>28<0069001C006900420051004D>-390<00510037002D>-406<001C0062>-391<0037001C0060>-391<001C0062>-390<0041>-391<0046004D0051>27<0072002D>-405<0069003F0032>-390<0069003F0042004D003B0062>-391<0042004D>-391<0069003F0032004B0062003200480070>27<003200620063>-419<001C0062>-391<0041>-391<003F001C>27<0070>28<0032>-390<0062003F0051>28<0072004D>]TJ
+1 0 0 1 133.768 609.415 Tm [<00320048006200320072003F003200600032002D>-264<0069003F0032>-247<0054003F0032004D0051004B0032004D001C>-247<0062003F0051006D0048002F>-247<0051004D00480076>-248<0023>-28<0032>-247<006D00620032002F>-247<001C0062>-247<001C>-247<002B001C004D0051004D>-247<003700510060>-247<0051006D0060>-248<006D004D002F0032006000620069001C004D002F0042004D003B0058>]TJ
+1 0 0 1 133.768 597.46 Tm [<0068003F0032>-329<0054001C0060001C00480051003B00420062004B0062>-329<00510037>-330<00540060001C002B00690042002B001C0048>-329<00600032001C00620051004D>-329<001C00600032>-330<0072003F001C0069>-329<007D006000620069>-329<003B00420070>27<0032>-329<0060004200620032>-329<00690051>-329<0069003F0032>-330<001C0060002B>28<003F004200690032002B00690051004D0042002B>]TJ
+1 0 0 1 133.768 585.504 Tm [<00510037>-383<00540060001C002B00690042002B001C0048>-383<00600032001C00620051004D0058>-595<001B0062>-383<0072004200480048>-383<0032001C0062004200480076>-383<0023>-28<0032>-384<0062003F0051>27<0072004D>-382<0042004D>-383<0069003F0032>-383<004D003200740069>-384<00620032002B006900420051004D002D>-395<00600032001C00620051004D>-384<0072>28<0051006D0048002F>]TJ
+1 0 0 1 133.768 573.549 Tm [<0069003F0032006000320023>28<0076>-260<0023>-28<0032>-260<004B001C002F0032>-261<00690051>-260<002B0051004D>27<00690060001C002F0042002B0069002D>-274<0042004D>-260<0070004200320072>-261<00510037>-260<0069003F003200620032>-261<002B0051004D00620042002F00320060001C006900420051004D0062002D>-274<0069003F0032>-261<0041002F0032001C0048>-260<00510037>-261<00540060001C002B0040>]TJ
+1 0 0 1 133.768 561.594 Tm [<00690042002B001C0048>-398<00600032001C00620051004D002D>-415<0076>27<00320069>-398<0069003F0032>-399<004B001C004D0042003700510048002F>-398<002F00320054>-28<0032004D002F0062>-399<0051004D>-398<0069003F0032>-399<0054003F0032004D0051004B0032004D001C0058>-641<004C0032002B00320062006200420069>27<0076>-398<002F00320054>-28<0032004D002F0062>]TJ
+1 0 0 1 133.768 549.639 Tm [<0051004D002D>-350<0072003F0032004D>-348<0069003F>27<006D0062>-346<006900600032001C00690032002F>-347<001C0062>-348<0069003F0032>-347<00540060001C002B00690042002B001C0048>-347<0032004B005400480051>27<0076004B0032004D>28<0069>-347<00510037>-347<0069003F0032>-347<004D00320070>27<0032006000400032004D002F0042004D003B>-347<00600032003B0060003200620062>]TJ
+1 0 0 1 133.768 537.684 Tm [<0042004D>-316<0069003F0032>-316<006200320060004200320062>-316<00510037>-316<0032004B0054004200600042002B001C0048>-317<002B0051004D002F0042006900420051004D0062002D>-319<00690042004B00320058>-439<003E006D004B001C004D>-316<00600032001C00620051004D>-316<002F00320054>-28<0032004D002F0062>-316<0051004D>-316<0051006D0060>-317<00620032004D00620032>]TJ
+1 0 0 1 133.768 525.729 Tm [<0054>-28<00320060002B00320054006900420051004D0062002D>-285<0023>27<0076>-273<004B0032001C004D0062>-274<00510037>-274<001C004D001C0048007600690042002B>-274<006D004D00420069>28<0076>83<0058>-424<0068003F003200600032>-274<002B001C004D>-273<0023>-28<0032>-274<004D0051>-274<002F0051006D00230069>-274<0069003F001C0069>-274<0069003F0032>-274<00510023>-28<00440032002B00690062>]TJ
+1 0 0 1 133.768 513.773 Tm [<0042004D>-333<00620054001C002B0032>-333<001C004D002F>-333<00690042004B0032>-333<001C00600032>-333<0072003F001C0069>-333<007D006000620069>-333<003B00420070>28<0032>-333<0060004200620032>-333<00690051>-333<003F>28<006D004B001C004D>-333<00600032001C00620051004D0058>]TJ
+1 0 0 1 148.712 501.818 Tm [<0054>-28<002F0037>]TJ
+/F28 14.3462 Tf
+1 0 0 1 133.768 468.857 Tm [<0052>-1000<001C0023>-31<002B>]TJ
+1 0 0 1 133.768 441.048 Tm [<006B>-1000<001C0023>-31<002B>]TJ
+1 0 0 1 133.768 413.239 Tm [<006A>-1000<001C0023>-31<002B>]TJ
+/F15 9.96264 Tf
+1 0 0 1 133.768 391.408 Tm [<007D00480032>]TJ
+1 0 0 1 303.133 89.365 Tm [<0052>]TJ
ET
endstream
endobj
5 0 obj
-<< /Type /Page /Contents 13 0 R /Resources 12 0 R /MediaBox [ 0 0 595.276 841.89 ] /BleedBox [0 0 300 350]/TrimBox [0 0 300 350] /Parent 32 0 R /Annots 33 0 R >>
+<< /Type /Page /Contents 17 0 R /Resources 16 0 R /MediaBox [ 0 0 612 792 ] /BleedBox [0 0 300 350]/TrimBox [0 0 300 350] /Parent 36 0 R /Annots 37 0 R >>
endobj
-33 0 obj
-[ 6 0 R 7 0 R 8 0 R 9 0 R 18 0 R 19 0 R 20 0 R 21 0 R 22 0 R 23 0 R 24 0 R 25 0 R 26 0 R 27 0 R 10 0 R 11 0 R ]
+37 0 obj
+[ 6 0 R 7 0 R 8 0 R 9 0 R 22 0 R 23 0 R 24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 31 0 R 12 0 R 15 0 R ]
endobj
6 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 152.976 706.019 188.742 715.035 ]/A << /S /GoTo /D (section.2) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 152.976 656.13 188.742 665.146 ]/A << /S /GoTo /D (section.2) >> >>
endobj
7 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 147.716 691.892 154.69 703.08 ]/A << /S /GoTo /D (section.1) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 147.716 642.002 154.69 653.191 ]/A << /S /GoTo /D (section.1) >> >>
endobj
8 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) >> /Rect [ 156.015 691.892 310.187 703.08 ]
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) >> /Rect [ 156.015 642.002 310.187 653.191 ]
>>
endobj
9 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 147.716 680.176 478.476 691.344 ]
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 147.716 630.286 478.476 641.455 ]
>>
endobj
-18 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 668.211 478.476 679.28 ]
+22 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 618.321 478.476 629.39 ]
>>
endobj
-19 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 656.256 478.476 667.324 ]
+23 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 606.366 478.476 617.435 ]
>>
endobj
-20 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 644.301 478.476 655.369 ]
+24 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 594.411 478.476 605.479 ]
>>
endobj
-21 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 632.356 478.476 643.524 ]
+25 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 582.466 478.476 593.634 ]
>>
endobj
-22 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 620.4 478.476 631.459 ]
+26 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 570.511 478.476 581.569 ]
>>
endobj
-23 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 608.445 478.476 619.504 ]
+27 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 558.555 478.476 569.614 ]
>>
endobj
-24 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 596.48 478.476 607.549 ]
+28 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 546.59 478.476 557.659 ]
>>
endobj
-25 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 584.644 478.476 595.593 ]
+29 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 534.755 478.476 545.704 ]
>>
endobj
-26 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 572.58 478.476 583.638 ]
+30 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 522.69 478.476 533.748 ]
>>
endobj
-27 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 560.615 396.035 571.683 ]
+31 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 510.725 396.035 521.793 ]
>>
endobj
-10 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /BS <</S/U/W 1>> /A <</Type /Action /S /GoToR /F (/c/texlive/2020/texmf-dist/doc/latex/base/doc.pdf) /D (chapter.1) >> /Rect [ 147.716 548.779 164.115 559.728 ]
+12 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /BS <</S/U/W 1>> /A 11 0 R /Rect [ 147.716 498.889 164.115 509.838 ]
>>
endobj
-11 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /BS <</S/U/W 1>> /A <</Type /Action /S /GoToR /F (example-image.pdf) /D [0/Fit] >> /Rect [ 132.772 440.192 147.497 449.318 ]
+15 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /BS <</S/U/W 1>> /A 14 0 R /Rect [ 132.772 390.302 147.497 399.428 ]
>>
endobj
-14 0 obj
-<< /D [ 5 0 R /XYZ 132.768 754.95 null ] >>
+18 0 obj
+<< /D [ 5 0 R /XYZ 132.768 705.06 null ] >>
endobj
-15 0 obj
-<< /D [ 5 0 R /XYZ 133.768 717.088 null ] >>
+19 0 obj
+<< /D [ 5 0 R /XYZ 133.768 667.198 null ] >>
endobj
-28 0 obj
-<< /D [ 5 0 R /XYZ 133.768 534.747 null ] >>
+32 0 obj
+<< /D [ 5 0 R /XYZ 133.768 484.857 null ] >>
endobj
-30 0 obj
-<< /D [ 5 0 R /XYZ 133.768 508.785 null ] >>
+34 0 obj
+<< /D [ 5 0 R /XYZ 133.768 458.895 null ] >>
endobj
-31 0 obj
-<< /D [ 5 0 R /XYZ 133.768 480.976 null ] >>
+35 0 obj
+<< /D [ 5 0 R /XYZ 133.768 431.086 null ] >>
endobj
-12 0 obj
-<< /ExtGState 1 0 R /Font << /F23 16 0 R /F24 17 0 R /F36 29 0 R >> /ProcSet [ /PDF /Text ] >>
+16 0 obj
+<< /ExtGState 1 0 R /Font << /F15 20 0 R /F16 21 0 R /F28 33 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-40 0 obj
-<< /Length 303 >>
+44 0 obj
+<< /Length 302 >>
stream
/opacity1 gs
BT
-/F24 9.96264 Tf
-1 0 0 1 148.712 707.125 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
-/F23 9.96264 Tf
-1 0 0 1 148.712 695.17 Tm [<0052>-1333<006B>-1333<006A>]TJ
-1 0 0 1 303.133 139.255 Tm [<006B>]TJ
+/F16 9.96264 Tf
+1 0 0 1 148.712 657.235 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 645.28 Tm [<0052>-1333<006B>-1333<006A>]TJ
+1 0 0 1 303.133 89.365 Tm [<006B>]TJ
ET
endstream
endobj
-39 0 obj
-<< /Type /Page /Contents 40 0 R /Resources 38 0 R /MediaBox [ 0 0 595.276 841.89 ] /BleedBox [0 0 300 350]/TrimBox [0 0 300 350] /Parent 32 0 R /Annots 42 0 R >>
+43 0 obj
+<< /Type /Page /Contents 44 0 R /Resources 42 0 R /MediaBox [ 0 0 612 792 ] /BleedBox [0 0 300 350]/TrimBox [0 0 300 350] /Parent 36 0 R /Annots 46 0 R >>
endobj
-42 0 obj
-[ 34 0 R 35 0 R 36 0 R 37 0 R ]
+46 0 obj
+[ 38 0 R 39 0 R 40 0 R 41 0 R ]
endobj
-34 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) >> /Rect [ 147.716 703.847 301.888 715.035 ]
+38 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) >> /Rect [ 147.716 653.958 301.888 665.146 ]
>>
endobj
-35 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 147.716 693.955 154.69 702.801 ]/A << /S /GoTo /D (section.1) >> >>
-endobj
-36 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 165.978 693.955 172.951 702.801 ]/A << /S /GoTo /D (section.2) >> >>
+39 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 147.716 644.065 154.69 652.912 ]/A << /S /GoTo /D (section.1) >> >>
endobj
-37 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 184.239 693.955 191.213 702.801 ]/A << /S /GoTo /D (section.3) >> >>
+40 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 165.978 644.065 172.951 652.912 ]/A << /S /GoTo /D (section.2) >> >>
endobj
41 0 obj
-<< /D [ 39 0 R /XYZ 132.768 754.95 null ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 184.239 644.065 191.213 652.912 ]/A << /S /GoTo /D (section.3) >> >>
endobj
-38 0 obj
-<< /ExtGState 1 0 R /Font << /F24 17 0 R /F23 16 0 R >> /ProcSet [ /PDF /Text ] >>
+45 0 obj
+<< /D [ 43 0 R /XYZ 132.768 705.06 null ] >>
endobj
-46 0 obj
-<< /Length 173 >>
+42 0 obj
+<< /ExtGState 1 0 R /Font << /F16 21 0 R /F15 20 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+50 0 obj
+<< /Length 172 >>
stream
/opacity1 gs
BT
-/F23 9.96264 Tf
-1 0 0 1 148.712 707.125 Tm [<003A0051>-333<00690051>-333<007D006000620069>-333<0054001C003B0032>]TJ
-1 0 0 1 303.133 139.255 Tm [<006A>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 657.235 Tm [<003A0051>-333<00690051>-333<007D006000620069>-333<0054001C003B0032>]TJ
+1 0 0 1 303.133 89.365 Tm [<006A>]TJ
ET
endstream
endobj
-45 0 obj
-<< /Type /Page /Contents 46 0 R /Resources 44 0 R /MediaBox [ 0 0 595.276 841.89 ] /BleedBox [0 0 300 350]/TrimBox [0 0 300 350] /Parent 32 0 R /Annots 48 0 R >>
+49 0 obj
+<< /Type /Page /Contents 50 0 R /Resources 48 0 R /MediaBox [ 0 0 612 792 ] /BleedBox [0 0 300 350]/TrimBox [0 0 300 350] /Parent 36 0 R /Annots 52 0 R >>
endobj
-48 0 obj
-[ 43 0 R ]
+52 0 obj
+[ 47 0 R ]
endobj
-43 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4] /BS <</S/U/W 1>> /A <</Type /Action /S /Named /N /FirstPage >> /Rect [ 147.716 704.077 218.491 715.145 ]
+47 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4] /BS <</S/U/W 1>> /A <</Type /Action /S /Named /N /FirstPage >> /Rect [ 147.716 654.187 218.491 665.255 ]
>>
endobj
-47 0 obj
-<< /D [ 45 0 R /XYZ 132.768 754.95 null ] >>
-endobj
-44 0 obj
-<< /ExtGState 1 0 R /Font << /F23 16 0 R >> /ProcSet [ /PDF /Text ] >>
+51 0 obj
+<< /D [ 49 0 R /XYZ 132.768 705.06 null ] >>
endobj
-1 0 obj
-<< /opacity1 <</ca 1/CA 1>> >>
+48 0 obj
+<< /ExtGState 1 0 R /Font << /F15 20 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-51 0 obj
-<< /Length 123 >>
+55 0 obj
+<< /Length 122 >>
stream
/opacity1 gs
BT
-/F23 9.96264 Tf
-1 0 0 1 148.712 707.125 Tm [<00230048006D0023>]TJ
-1 0 0 1 303.133 139.255 Tm [<0039>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 657.235 Tm [<00230048006D0023>]TJ
+1 0 0 1 303.133 89.365 Tm [<0039>]TJ
ET
endstream
endobj
-50 0 obj
-<< /Type /Page /Contents 51 0 R /Resources 49 0 R /MediaBox [ 0 0 595.276 841.89 ] /BleedBox [0 0 300 350]/TrimBox [0 0 300 350] /Parent 32 0 R >>
-endobj
-52 0 obj
-<< /D [ 50 0 R /XYZ 132.768 754.95 null ] >>
+54 0 obj
+<< /Type /Page /Contents 55 0 R /Resources 53 0 R /MediaBox [ 0 0 612 792 ] /BleedBox [0 0 300 350]/TrimBox [0 0 300 350] /Parent 36 0 R >>
endobj
-49 0 obj
-<< /ExtGState 1 0 R /Font << /F23 16 0 R >> /ProcSet [ /PDF /Text ] >>
+56 0 obj
+<< /D [ 54 0 R /XYZ 132.768 705.06 null ] >>
endobj
53 0 obj
+<< /ExtGState 1 0 R /Font << /F15 20 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+1 0 obj
+<< /opacity1 <</ca 1/CA 1>> >>
+endobj
+57 0 obj
<< /S /GoTo /D (section.1) >>
endobj
-55 0 obj
+59 0 obj
(\376\377\000a\000b\000c)
endobj
-56 0 obj
+60 0 obj
<< /S /GoTo /D (section.2) >>
endobj
-58 0 obj
+62 0 obj
(\376\377\000a\000b\000c)
endobj
-59 0 obj
+63 0 obj
<< /S /GoTo /D (section.3) >>
endobj
-61 0 obj
+65 0 obj
(\376\377\000a\000b\000c)
endobj
-62 0 obj
+66 0 obj
[ 28 [ 547 ] 35 [ 625 ] 43 [ 500 ] 82 [ 563 ] 106 [ 563 563 ] ]
endobj
-64 0 obj
+68 0 obj
<< /Length 14 >>
stream
endstream
endobj
-65 0 obj
+69 0 obj
<< /Subtype /CIDFontType0C /Length 1193 >>
stream

@@ -268,10 +280,10 @@ stream
 
endstream
endobj
-63 0 obj
-<< /Type /FontDescriptor /FontName /FTRWGM+LMRoman12-Bold /Flags 4 /FontBBox [ -476 -289 1577 1137 ] /Ascent 1137 /CapHeight 686 /Descent -289 /ItalicAngle 0 /StemV 104 /XHeight 444 /FontFile3 65 0 R /CIDSet 64 0 R >>
+67 0 obj
+<< /Type /FontDescriptor /FontName /FTRWGM+LMRoman12-Bold /Flags 4 /FontBBox [ -476 -289 1577 1137 ] /Ascent 1137 /CapHeight 686 /Descent -289 /ItalicAngle 0 /StemV 104 /XHeight 444 /FontFile3 69 0 R /CIDSet 68 0 R >>
endobj
-66 0 obj
+70 0 obj
<< /Length 747 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -313,22 +325,22 @@ end
endstream
endobj
-29 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /FTRWGM+LMRoman12-Bold /DescendantFonts [ 67 0 R ] /ToUnicode 66 0 R >>
+33 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /FTRWGM+LMRoman12-Bold /DescendantFonts [ 71 0 R ] /ToUnicode 70 0 R >>
endobj
-67 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /FTRWGM+LMRoman12-Bold /FontDescriptor 63 0 R /W 62 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+71 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /FTRWGM+LMRoman12-Bold /FontDescriptor 67 0 R /W 66 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-68 0 obj
+72 0 obj
[ 28 [ 525 ] 43 [ 525 525 ] 50 [ 525 ] 59 [ 525 ] 63 [ 525 525 ] 68 [ 525 ] 72 [ 525 ] 81 [ 525 ] 84 [ 525 ] 88 [ 525 ] 96 [ 525 ] 98 [ 525 ] 102 [ 525 ] 105 [ 525 ] 114 [ 525 ] 116 [ 525 ] ]
endobj
-70 0 obj
+74 0 obj
<< /Length 15 >>
stream
endstream
endobj
-71 0 obj
+75 0 obj
<< /Subtype /CIDFontType0C /Length 2420 >>
stream

@@ -338,10 +350,10 @@ stream

endstream
endobj
-69 0 obj
-<< /Type /FontDescriptor /FontName /OGJFWH+LMMono10-Regular /Flags 4 /FontBBox [ -451 -316 731 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 71 0 R /CIDSet 70 0 R >>
+73 0 obj
+<< /Type /FontDescriptor /FontName /OGJFWH+LMMono10-Regular /Flags 4 /FontBBox [ -451 -316 731 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 75 0 R /CIDSet 74 0 R >>
endobj
-72 0 obj
+76 0 obj
<< /Length 926 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -395,22 +407,22 @@ end
endstream
endobj
-17 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OGJFWH+LMMono10-Regular /DescendantFonts [ 73 0 R ] /ToUnicode 72 0 R >>
+21 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OGJFWH+LMMono10-Regular /DescendantFonts [ 77 0 R ] /ToUnicode 76 0 R >>
endobj
-73 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OGJFWH+LMMono10-Regular /FontDescriptor 69 0 R /W 68 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+77 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OGJFWH+LMMono10-Regular /FontDescriptor 73 0 R /W 72 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-74 0 obj
+78 0 obj
[ 27 [ 750 500 ] 35 [ 556 ] 43 [ 444 ] 45 [ 278 ] 47 [ 556 ] 50 [ 444 ] 55 [ 306 ] 57 [ 500 785 500 ] 62 [ 750 556 333 361 278 ] 68 [ 306 ] 70 [ 528 ] 72 [ 278 ] 75 [ 833 750 556 ] 81 [ 500 500 ] 84 [ 556 ] 88 [ 278 ] 96 [ 392 ] 98 [ 394 278 ] 104 [ 722 389 500 500 ] 109 [ 556 ] 112 [ 528 ] 114 [ 722 ] 116 [ 528 ] 118 [ 528 ] 125 [ 556 ] ]
endobj
-76 0 obj
+80 0 obj
<< /Length 16 >>
stream
endstream
endobj
-77 0 obj
+81 0 obj
<< /Subtype /CIDFontType0C /Length 5208 >>
stream

@@ -423,10 +435,10 @@ O
endstream
endobj
-75 0 obj
-<< /Type /FontDescriptor /FontName /ZNAMJV+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 77 0 R /CIDSet 76 0 R >>
+79 0 obj
+<< /Type /FontDescriptor /FontName /ZNAMJV+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 81 0 R /CIDSet 80 0 R >>
endobj
-78 0 obj
+82 0 obj
<< /Length 1229 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -501,128 +513,132 @@ end
endstream
endobj
-16 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ZNAMJV+LMRoman10-Regular /DescendantFonts [ 79 0 R ] /ToUnicode 78 0 R >>
+20 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ZNAMJV+LMRoman10-Regular /DescendantFonts [ 83 0 R ] /ToUnicode 82 0 R >>
endobj
-79 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ZNAMJV+LMRoman10-Regular /FontDescriptor 75 0 R /W 74 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+83 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ZNAMJV+LMRoman10-Regular /FontDescriptor 79 0 R /W 78 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-32 0 obj
-<< /Type /Pages /Count 4 /Kids [ 5 0 R 39 0 R 45 0 R 50 0 R ] >>
+36 0 obj
+<< /Type /Pages /Count 4 /Kids [ 5 0 R 43 0 R 49 0 R 54 0 R ] >>
endobj
-80 0 obj
-<< /Type /Outlines /First 54 0 R /Last 60 0 R /Count 3 >>
+84 0 obj
+<< /Type /Outlines /First 58 0 R /Last 64 0 R /Count 3 >>
endobj
-60 0 obj
-<< /Title 61 0 R /A 59 0 R /Parent 80 0 R /Prev 57 0 R >>
+64 0 obj
+<< /Title 65 0 R /A 63 0 R /Parent 84 0 R /Prev 61 0 R >>
endobj
-57 0 obj
-<< /Title 58 0 R /A 56 0 R /Parent 80 0 R /Prev 54 0 R /Next 60 0 R >>
+61 0 obj
+<< /Title 62 0 R /A 60 0 R /Parent 84 0 R /Prev 58 0 R /Next 64 0 R >>
endobj
-54 0 obj
-<< /Title 55 0 R /A 53 0 R /Parent 80 0 R /Next 57 0 R >>
+58 0 obj
+<< /Title 59 0 R /A 57 0 R /Parent 84 0 R /Next 61 0 R >>
endobj
-81 0 obj
-<< /Names [ (Doc-Start) 15 0 R (page.1) 14 0 R (page.2) 41 0 R (page.3) 47 0 R (page.4) 52 0 R (section.1) 28 0 R (section.2) 30 0 R (section.3) 31 0 R ] /Limits [ (Doc-Start) (section.3) ] >>
+85 0 obj
+<< /Names [ (Doc-Start) 19 0 R (page.1) 18 0 R (page.2) 45 0 R (page.3) 51 0 R (page.4) 56 0 R (section.1) 32 0 R (section.2) 34 0 R (section.3) 35 0 R ] /Limits [ (Doc-Start) (section.3) ] >>
endobj
-82 0 obj
-<< /Dests 81 0 R >>
+86 0 obj
+<< /Dests 85 0 R >>
endobj
-83 0 obj
-<< /Type /Catalog /Pages 32 0 R /Outlines 80 0 R /Names 82 0 R /Lang (en-US)/PageMode /UseOutlines/OpenAction [5 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>> >>
+87 0 obj
+<< /Type /Catalog /Pages 36 0 R /Outlines 84 0 R /Names 86 0 R /Lang (en-US)/PageMode /UseOutlines/OpenAction [5 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>> >>
endobj
-84 0 obj
-<< /Creator <FEFF00630072006500610074006F0072>/Author <FEFF0041007500740068006F0072>/Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000558+01'00') /ModDate (D:20210307000558+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >>
+88 0 obj
+<< /Creator <FEFF00630072006500610074006F0072>/Author <FEFF0041007500740068006F0072>/Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.15.0) /CreationDate (D:20220627163845+02'00') /ModDate (D:20220627163845+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.15.0 (TeX Live 2022)) >>
endobj
xref
-0 85
+0 89
0000000002 65535 f
-0000011696 00000 n
+0000012914 00000 n
0000000003 00000 f
0000000004 00000 f
0000000000 00000 f
-0000004891 00000 n
-0000005196 00000 n
-0000005387 00000 n
-0000005576 00000 n
-0000005802 00000 n
-0000008436 00000 n
-0000008704 00000 n
-0000009240 00000 n
+0000005791 00000 n
+0000006089 00000 n
+0000006279 00000 n
+0000006469 00000 n
+0000006696 00000 n
0000000020 00000 n
-0000008936 00000 n
-0000008996 00000 n
-0000026935 00000 n
-0000019332 00000 n
-0000006041 00000 n
-0000006280 00000 n
-0000006520 00000 n
-0000006760 00000 n
-0000007000 00000 n
-0000007238 00000 n
-0000007478 00000 n
-0000007717 00000 n
-0000007957 00000 n
-0000008196 00000 n
-0000009057 00000 n
-0000014976 00000 n
-0000009118 00000 n
-0000009179 00000 n
-0000027289 00000 n
-0000005068 00000 n
-0000009940 00000 n
-0000010168 00000 n
-0000010359 00000 n
-0000010551 00000 n
-0000010804 00000 n
-0000009714 00000 n
-0000009351 00000 n
-0000010743 00000 n
-0000009892 00000 n
-0000011341 00000 n
-0000011609 00000 n
-0000011136 00000 n
-0000010903 00000 n
-0000011548 00000 n
-0000011314 00000 n
-0000012150 00000 n
-0000011926 00000 n
-0000011743 00000 n
-0000012089 00000 n
-0000012237 00000 n
-0000027606 00000 n
-0000012283 00000 n
-0000012326 00000 n
-0000027519 00000 n
-0000012372 00000 n
-0000012415 00000 n
-0000027445 00000 n
-0000012461 00000 n
-0000012504 00000 n
-0000013935 00000 n
-0000012584 00000 n
-0000012658 00000 n
-0000014169 00000 n
-0000015127 00000 n
-0000015324 00000 n
-0000018111 00000 n
-0000015532 00000 n
-0000015607 00000 n
-0000018346 00000 n
-0000019485 00000 n
-0000019684 00000 n
-0000025410 00000 n
-0000020042 00000 n
-0000020118 00000 n
-0000025646 00000 n
-0000027089 00000 n
-0000027371 00000 n
-0000027680 00000 n
-0000027889 00000 n
-0000027925 00000 n
-0000028099 00000 n
+0000000529 00000 n
+0000009332 00000 n
+0000000601 00000 n
+0000000854 00000 n
+0000009508 00000 n
+0000009988 00000 n
+0000000922 00000 n
+0000009684 00000 n
+0000009744 00000 n
+0000027659 00000 n
+0000020056 00000 n
+0000006935 00000 n
+0000007174 00000 n
+0000007414 00000 n
+0000007654 00000 n
+0000007894 00000 n
+0000008134 00000 n
+0000008374 00000 n
+0000008613 00000 n
+0000008853 00000 n
+0000009092 00000 n
+0000009805 00000 n
+0000015700 00000 n
+0000009866 00000 n
+0000009927 00000 n
+0000028013 00000 n
+0000005961 00000 n
+0000010680 00000 n
+0000010908 00000 n
+0000011099 00000 n
+0000011291 00000 n
+0000011544 00000 n
+0000010461 00000 n
+0000010099 00000 n
+0000011483 00000 n
+0000010632 00000 n
+0000012073 00000 n
+0000012341 00000 n
+0000011875 00000 n
+0000011643 00000 n
+0000012280 00000 n
+0000012046 00000 n
+0000012827 00000 n
+0000012610 00000 n
+0000012428 00000 n
+0000012766 00000 n
+0000012961 00000 n
+0000028330 00000 n
+0000013007 00000 n
+0000013050 00000 n
+0000028243 00000 n
+0000013096 00000 n
+0000013139 00000 n
+0000028169 00000 n
+0000013185 00000 n
+0000013228 00000 n
+0000014659 00000 n
+0000013308 00000 n
+0000013382 00000 n
+0000014893 00000 n
+0000015851 00000 n
+0000016048 00000 n
+0000018835 00000 n
+0000016256 00000 n
+0000016331 00000 n
+0000019070 00000 n
+0000020209 00000 n
+0000020408 00000 n
+0000026134 00000 n
+0000020766 00000 n
+0000020842 00000 n
+0000026370 00000 n
+0000027813 00000 n
+0000028095 00000 n
+0000028404 00000 n
+0000028613 00000 n
+0000028649 00000 n
+0000028823 00000 n
trailer
-<< /Size 85 /Root 83 0 R /Info 84 0 R /ID [ <8611558406E76F2AB0E7D61D137DC36E> <8611558406E76F2AB0E7D61D137DC36E> ] >>
+<< /Size 89 /Root 87 0 R /Info 88 0 R /ID [ <8091A6555AFCBE47ED7E10D281796E6F> <8091A6555AFCBE47ED7E10D281796E6F> ] >>
startxref
-28428
+29145
%%EOF
diff --git a/macros/latex/contrib/newpax/doc-input1.tex b/macros/latex/contrib/newpax/doc-input1.tex
index b6da05beae..04c23b4d91 100644
--- a/macros/latex/contrib/newpax/doc-input1.tex
+++ b/macros/latex/contrib/newpax/doc-input1.tex
@@ -1,6 +1,5 @@
% !Mode:: "TeX:UTF-8:Main"
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{uncompress}
+\DocumentMetadata{uncompress}
\documentclass{article}
\usepackage{hyperref}
diff --git a/macros/latex/contrib/newpax/doc-input2.pdf b/macros/latex/contrib/newpax/doc-input2.pdf
index 76ac16e226..37bc281ab1 100644
--- a/macros/latex/contrib/newpax/doc-input2.pdf
+++ b/macros/latex/contrib/newpax/doc-input2.pdf
@@ -1,259 +1,271 @@
%PDF-1.5
%
+9 0 obj
+<< /Type /Filespec /AFRelationship /Unspecified /Subtype /application#2Fpdf /F <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066> /UF <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066> >>
+endobj
+10 0 obj
+<< /Type /Action /S /GoToR /F 9 0 R /D (chapter.1) >>
+endobj
12 0 obj
-<< /Length 4742 >>
+<< /Type /Filespec /AFRelationship /Unspecified /Subtype /application#2Fpdf /F <FEFF006500780061006D0070006C0065002D0069006D006100670065002E007000640066> /UF <FEFF006500780061006D0070006C0065002D0069006D006100670065002E007000640066> >>
+endobj
+13 0 obj
+<< /Type /Action /S /GoToR /F 12 0 R /D [0/Fit] >>
+endobj
+16 0 obj
+<< /Length 4740 >>
stream
/opacity1 gs
BT
-/F23 9.96264 Tf
-1 0 0 1 148.712 707.125 Tm [<0052>]TJ
-/F24 9.96264 Tf
-1 0 0 1 157.011 707.125 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
-/F23 9.96264 Tf
-1 0 0 1 148.712 695.17 Tm [<001B0062>-414<001C004D>27<0076>-413<002F0032002F0042002B001C00690032002F>-415<00600032001C002F00320060>-414<002B001C004D>-415<002B00480032001C006000480076>-414<006200320032002D>-435<0069003F0032>-414<0041002F0032001C0048>-415<00510037>-414<00540060001C002B00690042002B001C0048>-415<00600032001C00620051004D>-414<00420062>-415<001C>]TJ
-1 0 0 1 133.768 683.215 Tm [<0060003200540060003200620032004D>28<0069001C006900420051004D>-390<00510037002D>-406<001C0062>-391<0037001C0060>-391<001C0062>-390<0041>-391<0046004D0051>27<0072002D>-405<0069003F0032>-390<0069003F0042004D003B0062>-391<0042004D>-391<0069003F0032004B0062003200480070>27<003200620063>-419<001C0062>-391<0041>-391<003F001C>27<0070>28<0032>-390<0062003F0051>28<0072004D>]TJ
-1 0 0 1 133.768 671.26 Tm [<00320048006200320072003F003200600032002D>-264<0069003F0032>-247<0054003F0032004D0051004B0032004D001C>-247<0062003F0051006D0048002F>-247<0051004D00480076>-248<0023>-28<0032>-247<006D00620032002F>-247<001C0062>-247<001C>-247<002B001C004D0051004D>-247<003700510060>-247<0051006D0060>-248<006D004D002F0032006000620069001C004D002F0042004D003B0058>]TJ
-1 0 0 1 133.768 659.304 Tm [<0068003F0032>-329<0054001C0060001C00480051003B00420062004B0062>-329<00510037>-330<00540060001C002B00690042002B001C0048>-329<00600032001C00620051004D>-329<001C00600032>-330<0072003F001C0069>-329<007D006000620069>-329<003B00420070>27<0032>-329<0060004200620032>-329<00690051>-329<0069003F0032>-330<001C0060002B>28<003F004200690032002B00690051004D0042002B>]TJ
-1 0 0 1 133.768 647.349 Tm [<00510037>-383<00540060001C002B00690042002B001C0048>-383<00600032001C00620051004D0058>-595<001B0062>-383<0072004200480048>-383<0032001C0062004200480076>-383<0023>-28<0032>-384<0062003F0051>27<0072004D>-382<0042004D>-383<0069003F0032>-383<004D003200740069>-384<00620032002B006900420051004D002D>-395<00600032001C00620051004D>-384<0072>28<0051006D0048002F>]TJ
-1 0 0 1 133.768 635.394 Tm [<0069003F0032006000320023>28<0076>-260<0023>-28<0032>-260<004B001C002F0032>-261<00690051>-260<002B0051004D>27<00690060001C002F0042002B0069002D>-274<0042004D>-260<0070004200320072>-261<00510037>-260<0069003F003200620032>-261<002B0051004D00620042002F00320060001C006900420051004D0062002D>-274<0069003F0032>-261<0041002F0032001C0048>-260<00510037>-261<00540060001C002B0040>]TJ
-1 0 0 1 133.768 623.439 Tm [<00690042002B001C0048>-398<00600032001C00620051004D002D>-415<0076>27<00320069>-398<0069003F0032>-399<004B001C004D0042003700510048002F>-398<002F00320054>-28<0032004D002F0062>-399<0051004D>-398<0069003F0032>-399<0054003F0032004D0051004B0032004D001C0058>-641<004C0032002B00320062006200420069>27<0076>-398<002F00320054>-28<0032004D002F0062>]TJ
-1 0 0 1 133.768 611.484 Tm [<0051004D002D>-350<0072003F0032004D>-348<0069003F>27<006D0062>-346<006900600032001C00690032002F>-347<001C0062>-348<0069003F0032>-347<00540060001C002B00690042002B001C0048>-347<0032004B005400480051>27<0076004B0032004D>28<0069>-347<00510037>-347<0069003F0032>-347<004D00320070>27<0032006000400032004D002F0042004D003B>-347<00600032003B0060003200620062>]TJ
-1 0 0 1 133.768 599.529 Tm [<0042004D>-316<0069003F0032>-316<006200320060004200320062>-316<00510037>-316<0032004B0054004200600042002B001C0048>-317<002B0051004D002F0042006900420051004D0062002D>-319<00690042004B00320058>-439<003E006D004B001C004D>-316<00600032001C00620051004D>-316<002F00320054>-28<0032004D002F0062>-316<0051004D>-316<0051006D0060>-317<00620032004D00620032>]TJ
-1 0 0 1 133.768 587.573 Tm [<0054>-28<00320060002B00320054006900420051004D0062002D>-285<0023>27<0076>-273<004B0032001C004D0062>-274<00510037>-274<001C004D001C0048007600690042002B>-274<006D004D00420069>28<0076>83<0058>-424<0068003F003200600032>-274<002B001C004D>-273<0023>-28<0032>-274<004D0051>-274<002F0051006D00230069>-274<0069003F001C0069>-274<0069003F0032>-274<00510023>-28<00440032002B00690062>]TJ
-1 0 0 1 133.768 575.618 Tm [<0042004D>-333<00620054001C002B0032>-333<001C004D002F>-333<00690042004B0032>-333<001C00600032>-333<0072003F001C0069>-333<007D006000620069>-333<003B00420070>28<0032>-333<0060004200620032>-333<00690051>-333<003F>28<006D004B001C004D>-333<00600032001C00620051004D0058>]TJ
-1 0 0 1 148.712 563.663 Tm [<0054>-28<002F0037>]TJ
-/F36 14.3462 Tf
-1 0 0 1 133.768 530.702 Tm [<0052>-1000<001C0023>-31<002B>]TJ
-1 0 0 1 133.768 502.893 Tm [<006B>-1000<001C0023>-31<002B>]TJ
-1 0 0 1 133.768 475.084 Tm [<006A>-1000<001C0023>-31<002B>]TJ
-/F23 9.96264 Tf
-1 0 0 1 133.768 453.253 Tm [<007D00480032>]TJ
-1 0 0 1 303.133 139.255 Tm [<0052>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 657.235 Tm [<0052>]TJ
+/F16 9.96264 Tf
+1 0 0 1 157.011 657.235 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 645.28 Tm [<001B0062>-414<001C004D>27<0076>-413<002F0032002F0042002B001C00690032002F>-415<00600032001C002F00320060>-414<002B001C004D>-415<002B00480032001C006000480076>-414<006200320032002D>-435<0069003F0032>-414<0041002F0032001C0048>-415<00510037>-414<00540060001C002B00690042002B001C0048>-415<00600032001C00620051004D>-414<00420062>-415<001C>]TJ
+1 0 0 1 133.768 633.325 Tm [<0060003200540060003200620032004D>28<0069001C006900420051004D>-390<00510037002D>-406<001C0062>-391<0037001C0060>-391<001C0062>-390<0041>-391<0046004D0051>27<0072002D>-405<0069003F0032>-390<0069003F0042004D003B0062>-391<0042004D>-391<0069003F0032004B0062003200480070>27<003200620063>-419<001C0062>-391<0041>-391<003F001C>27<0070>28<0032>-390<0062003F0051>28<0072004D>]TJ
+1 0 0 1 133.768 621.37 Tm [<00320048006200320072003F003200600032002D>-264<0069003F0032>-247<0054003F0032004D0051004B0032004D001C>-247<0062003F0051006D0048002F>-247<0051004D00480076>-248<0023>-28<0032>-247<006D00620032002F>-247<001C0062>-247<001C>-247<002B001C004D0051004D>-247<003700510060>-247<0051006D0060>-248<006D004D002F0032006000620069001C004D002F0042004D003B0058>]TJ
+1 0 0 1 133.768 609.415 Tm [<0068003F0032>-329<0054001C0060001C00480051003B00420062004B0062>-329<00510037>-330<00540060001C002B00690042002B001C0048>-329<00600032001C00620051004D>-329<001C00600032>-330<0072003F001C0069>-329<007D006000620069>-329<003B00420070>27<0032>-329<0060004200620032>-329<00690051>-329<0069003F0032>-330<001C0060002B>28<003F004200690032002B00690051004D0042002B>]TJ
+1 0 0 1 133.768 597.46 Tm [<00510037>-383<00540060001C002B00690042002B001C0048>-383<00600032001C00620051004D0058>-595<001B0062>-383<0072004200480048>-383<0032001C0062004200480076>-383<0023>-28<0032>-384<0062003F0051>27<0072004D>-382<0042004D>-383<0069003F0032>-383<004D003200740069>-384<00620032002B006900420051004D002D>-395<00600032001C00620051004D>-384<0072>28<0051006D0048002F>]TJ
+1 0 0 1 133.768 585.504 Tm [<0069003F0032006000320023>28<0076>-260<0023>-28<0032>-260<004B001C002F0032>-261<00690051>-260<002B0051004D>27<00690060001C002F0042002B0069002D>-274<0042004D>-260<0070004200320072>-261<00510037>-260<0069003F003200620032>-261<002B0051004D00620042002F00320060001C006900420051004D0062002D>-274<0069003F0032>-261<0041002F0032001C0048>-260<00510037>-261<00540060001C002B0040>]TJ
+1 0 0 1 133.768 573.549 Tm [<00690042002B001C0048>-398<00600032001C00620051004D002D>-415<0076>27<00320069>-398<0069003F0032>-399<004B001C004D0042003700510048002F>-398<002F00320054>-28<0032004D002F0062>-399<0051004D>-398<0069003F0032>-399<0054003F0032004D0051004B0032004D001C0058>-641<004C0032002B00320062006200420069>27<0076>-398<002F00320054>-28<0032004D002F0062>]TJ
+1 0 0 1 133.768 561.594 Tm [<0051004D002D>-350<0072003F0032004D>-348<0069003F>27<006D0062>-346<006900600032001C00690032002F>-347<001C0062>-348<0069003F0032>-347<00540060001C002B00690042002B001C0048>-347<0032004B005400480051>27<0076004B0032004D>28<0069>-347<00510037>-347<0069003F0032>-347<004D00320070>27<0032006000400032004D002F0042004D003B>-347<00600032003B0060003200620062>]TJ
+1 0 0 1 133.768 549.639 Tm [<0042004D>-316<0069003F0032>-316<006200320060004200320062>-316<00510037>-316<0032004B0054004200600042002B001C0048>-317<002B0051004D002F0042006900420051004D0062002D>-319<00690042004B00320058>-439<003E006D004B001C004D>-316<00600032001C00620051004D>-316<002F00320054>-28<0032004D002F0062>-316<0051004D>-316<0051006D0060>-317<00620032004D00620032>]TJ
+1 0 0 1 133.768 537.684 Tm [<0054>-28<00320060002B00320054006900420051004D0062002D>-285<0023>27<0076>-273<004B0032001C004D0062>-274<00510037>-274<001C004D001C0048007600690042002B>-274<006D004D00420069>28<0076>83<0058>-424<0068003F003200600032>-274<002B001C004D>-273<0023>-28<0032>-274<004D0051>-274<002F0051006D00230069>-274<0069003F001C0069>-274<0069003F0032>-274<00510023>-28<00440032002B00690062>]TJ
+1 0 0 1 133.768 525.729 Tm [<0042004D>-333<00620054001C002B0032>-333<001C004D002F>-333<00690042004B0032>-333<001C00600032>-333<0072003F001C0069>-333<007D006000620069>-333<003B00420070>28<0032>-333<0060004200620032>-333<00690051>-333<003F>28<006D004B001C004D>-333<00600032001C00620051004D0058>]TJ
+1 0 0 1 148.712 513.773 Tm [<0054>-28<002F0037>]TJ
+/F28 14.3462 Tf
+1 0 0 1 133.768 480.812 Tm [<0052>-1000<001C0023>-31<002B>]TJ
+1 0 0 1 133.768 453.003 Tm [<006B>-1000<001C0023>-31<002B>]TJ
+1 0 0 1 133.768 425.195 Tm [<006A>-1000<001C0023>-31<002B>]TJ
+/F15 9.96264 Tf
+1 0 0 1 133.768 403.363 Tm [<007D00480032>]TJ
+1 0 0 1 303.133 89.365 Tm [<0052>]TJ
ET
endstream
endobj
5 0 obj
-<< /Type /Page /Contents 12 0 R /Resources 11 0 R /MediaBox [ 0 0 595.276 841.89 ] /BleedBox [0 0 300 350]/TrimBox [0 0 300 350] /Parent 31 0 R /Annots 32 0 R >>
+<< /Type /Page /Contents 16 0 R /Resources 15 0 R /MediaBox [ 0 0 612 792 ] /BleedBox [0 0 300 350]/TrimBox [0 0 300 350] /Parent 35 0 R /Annots 36 0 R >>
endobj
-32 0 obj
-[ 6 0 R 7 0 R 8 0 R 17 0 R 18 0 R 19 0 R 20 0 R 21 0 R 22 0 R 23 0 R 24 0 R 25 0 R 26 0 R 9 0 R 10 0 R ]
+36 0 obj
+[ 6 0 R 7 0 R 8 0 R 21 0 R 22 0 R 23 0 R 24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 11 0 R 14 0 R ]
endobj
6 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 147.716 703.847 154.69 715.035 ]/A << /S /GoTo /D (section.1) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 147.716 653.958 154.69 665.146 ]/A << /S /GoTo /D (section.1) >> >>
endobj
7 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) >> /Rect [ 156.015 703.847 310.187 715.035 ]
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) >> /Rect [ 156.015 653.958 310.187 665.146 ]
>>
endobj
8 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 147.716 692.131 478.476 703.299 ]
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 147.716 642.242 478.476 653.41 ]
>>
endobj
-17 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 680.166 478.476 691.235 ]
+21 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 630.276 478.476 641.345 ]
>>
endobj
-18 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 668.211 478.476 679.28 ]
+22 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 618.321 478.476 629.39 ]
>>
endobj
-19 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 656.256 478.476 667.324 ]
+23 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 606.366 478.476 617.435 ]
>>
endobj
-20 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 644.311 478.476 655.479 ]
+24 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 594.421 478.476 605.589 ]
>>
endobj
-21 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 632.356 478.476 643.414 ]
+25 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 582.466 478.476 593.524 ]
>>
endobj
-22 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 620.4 478.476 631.459 ]
+26 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 570.511 478.476 581.569 ]
>>
endobj
-23 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 608.435 478.476 619.504 ]
+27 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 558.545 478.476 569.614 ]
>>
endobj
-24 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 596.6 478.476 607.549 ]
+28 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 546.71 478.476 557.659 ]
>>
endobj
-25 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 584.535 478.476 595.593 ]
+29 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 534.645 478.476 545.704 ]
>>
endobj
-26 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 572.57 396.035 583.638 ]
+30 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) /IsMap true >> /Rect [ 132.772 522.68 396.035 533.748 ]
>>
endobj
-9 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /BS <</S/U/W 1>> /A <</Type /Action /S /GoToR /F (/c/texlive/2020/texmf-dist/doc/latex/base/doc.pdf) /D (chapter.1) >> /Rect [ 147.716 560.734 164.115 571.683 ]
+11 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /BS <</S/U/W 1>> /A 10 0 R /Rect [ 147.716 510.844 164.115 521.793 ]
>>
endobj
-10 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /BS <</S/U/W 1>> /A <</Type /Action /S /GoToR /F (example-image.pdf) /D [0/Fit] >> /Rect [ 132.772 452.147 147.497 461.273 ]
+14 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /BS <</S/U/W 1>> /A 13 0 R /Rect [ 132.772 402.258 147.497 411.383 ]
>>
endobj
-13 0 obj
-<< /D [ 5 0 R /XYZ 132.768 754.95 null ] >>
+17 0 obj
+<< /D [ 5 0 R /XYZ 132.768 705.06 null ] >>
endobj
-14 0 obj
-<< /D [ 5 0 R /XYZ 133.768 717.088 null ] >>
+18 0 obj
+<< /D [ 5 0 R /XYZ 133.768 667.198 null ] >>
endobj
-27 0 obj
-<< /D [ 5 0 R /XYZ 133.768 546.702 null ] >>
+31 0 obj
+<< /D [ 5 0 R /XYZ 133.768 496.812 null ] >>
endobj
-29 0 obj
-<< /D [ 5 0 R /XYZ 133.768 520.74 null ] >>
+33 0 obj
+<< /D [ 5 0 R /XYZ 133.768 470.85 null ] >>
endobj
-30 0 obj
-<< /D [ 5 0 R /XYZ 133.768 492.931 null ] >>
+34 0 obj
+<< /D [ 5 0 R /XYZ 133.768 443.041 null ] >>
endobj
-11 0 obj
-<< /ExtGState 1 0 R /Font << /F23 15 0 R /F24 16 0 R /F36 28 0 R >> /ProcSet [ /PDF /Text ] >>
+15 0 obj
+<< /ExtGState 1 0 R /Font << /F15 19 0 R /F16 20 0 R /F28 32 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-39 0 obj
-<< /Length 303 >>
+43 0 obj
+<< /Length 302 >>
stream
/opacity1 gs
BT
-/F24 9.96264 Tf
-1 0 0 1 148.712 707.125 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
-/F23 9.96264 Tf
-1 0 0 1 148.712 695.17 Tm [<0052>-1333<006B>-1333<006A>]TJ
-1 0 0 1 303.133 139.255 Tm [<006B>]TJ
+/F16 9.96264 Tf
+1 0 0 1 148.712 657.235 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 645.28 Tm [<0052>-1333<006B>-1333<006A>]TJ
+1 0 0 1 303.133 89.365 Tm [<006B>]TJ
ET
endstream
endobj
-38 0 obj
-<< /Type /Page /Contents 39 0 R /Resources 37 0 R /MediaBox [ 0 0 595.276 841.89 ] /BleedBox [0 0 300 350]/TrimBox [0 0 300 350] /Parent 31 0 R /Annots 41 0 R >>
+42 0 obj
+<< /Type /Page /Contents 43 0 R /Resources 41 0 R /MediaBox [ 0 0 612 792 ] /BleedBox [0 0 300 350]/TrimBox [0 0 300 350] /Parent 35 0 R /Annots 45 0 R >>
endobj
-41 0 obj
-[ 33 0 R 34 0 R 35 0 R 36 0 R ]
+45 0 obj
+[ 37 0 R 38 0 R 39 0 R 40 0 R ]
endobj
-33 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) >> /Rect [ 147.716 703.847 301.888 715.035 ]
+37 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /BS <</S/U/W 1>> /A <</Type /Action /S /URI /URI (https://www.latex-project.org) >> /Rect [ 147.716 653.958 301.888 665.146 ]
>>
endobj
-34 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 147.716 693.955 154.69 702.801 ]/A << /S /GoTo /D (section.1) >> >>
-endobj
-35 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 165.978 693.955 172.951 702.801 ]/A << /S /GoTo /D (section.2) >> >>
+38 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 147.716 644.065 154.69 652.912 ]/A << /S /GoTo /D (section.1) >> >>
endobj
-36 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 184.239 693.955 191.213 702.801 ]/A << /S /GoTo /D (section.3) >> >>
+39 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 165.978 644.065 172.951 652.912 ]/A << /S /GoTo /D (section.2) >> >>
endobj
40 0 obj
-<< /D [ 38 0 R /XYZ 132.768 754.95 null ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /BS <</S/U/W 1>> /Rect [ 184.239 644.065 191.213 652.912 ]/A << /S /GoTo /D (section.3) >> >>
endobj
-37 0 obj
-<< /ExtGState 1 0 R /Font << /F24 16 0 R /F23 15 0 R >> /ProcSet [ /PDF /Text ] >>
+44 0 obj
+<< /D [ 42 0 R /XYZ 132.768 705.06 null ] >>
endobj
-45 0 obj
-<< /Length 173 >>
+41 0 obj
+<< /ExtGState 1 0 R /Font << /F16 20 0 R /F15 19 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+49 0 obj
+<< /Length 172 >>
stream
/opacity1 gs
BT
-/F23 9.96264 Tf
-1 0 0 1 148.712 707.125 Tm [<003A0051>-333<00690051>-333<007D006000620069>-333<0054001C003B0032>]TJ
-1 0 0 1 303.133 139.255 Tm [<006A>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 657.235 Tm [<003A0051>-333<00690051>-333<007D006000620069>-333<0054001C003B0032>]TJ
+1 0 0 1 303.133 89.365 Tm [<006A>]TJ
ET
endstream
endobj
-44 0 obj
-<< /Type /Page /Contents 45 0 R /Resources 43 0 R /MediaBox [ 0 0 595.276 841.89 ] /BleedBox [0 0 300 350]/TrimBox [0 0 300 350] /Parent 31 0 R /Annots 47 0 R >>
+48 0 obj
+<< /Type /Page /Contents 49 0 R /Resources 47 0 R /MediaBox [ 0 0 612 792 ] /BleedBox [0 0 300 350]/TrimBox [0 0 300 350] /Parent 35 0 R /Annots 51 0 R >>
endobj
-47 0 obj
-[ 42 0 R ]
+51 0 obj
+[ 46 0 R ]
endobj
-42 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4] /BS <</S/U/W 1>> /A <</Type /Action /S /Named /N /FirstPage >> /Rect [ 147.716 704.077 218.491 715.145 ]
+46 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4] /BS <</S/U/W 1>> /A <</Type /Action /S /Named /N /FirstPage >> /Rect [ 147.716 654.187 218.491 665.255 ]
>>
endobj
-46 0 obj
-<< /D [ 44 0 R /XYZ 132.768 754.95 null ] >>
-endobj
-43 0 obj
-<< /ExtGState 1 0 R /Font << /F23 15 0 R >> /ProcSet [ /PDF /Text ] >>
+50 0 obj
+<< /D [ 48 0 R /XYZ 132.768 705.06 null ] >>
endobj
-1 0 obj
-<< /opacity1 <</ca 1/CA 1>> >>
+47 0 obj
+<< /ExtGState 1 0 R /Font << /F15 19 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-50 0 obj
-<< /Length 123 >>
+54 0 obj
+<< /Length 122 >>
stream
/opacity1 gs
BT
-/F23 9.96264 Tf
-1 0 0 1 148.712 707.125 Tm [<00230048006D0023>]TJ
-1 0 0 1 303.133 139.255 Tm [<0039>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 657.235 Tm [<00230048006D0023>]TJ
+1 0 0 1 303.133 89.365 Tm [<0039>]TJ
ET
endstream
endobj
-49 0 obj
-<< /Type /Page /Contents 50 0 R /Resources 48 0 R /MediaBox [ 0 0 595.276 841.89 ] /BleedBox [0 0 300 350]/TrimBox [0 0 300 350] /Parent 31 0 R >>
-endobj
-51 0 obj
-<< /D [ 49 0 R /XYZ 132.768 754.95 null ] >>
+53 0 obj
+<< /Type /Page /Contents 54 0 R /Resources 52 0 R /MediaBox [ 0 0 612 792 ] /BleedBox [0 0 300 350]/TrimBox [0 0 300 350] /Parent 35 0 R >>
endobj
-48 0 obj
-<< /ExtGState 1 0 R /Font << /F23 15 0 R >> /ProcSet [ /PDF /Text ] >>
+55 0 obj
+<< /D [ 53 0 R /XYZ 132.768 705.06 null ] >>
endobj
52 0 obj
+<< /ExtGState 1 0 R /Font << /F15 19 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+1 0 obj
+<< /opacity1 <</ca 1/CA 1>> >>
+endobj
+56 0 obj
<< /S /GoTo /D (section.1) >>
endobj
-54 0 obj
+58 0 obj
(\376\377\000a\000b\000c)
endobj
-55 0 obj
+59 0 obj
<< /S /GoTo /D (section.2) >>
endobj
-57 0 obj
+61 0 obj
(\376\377\000a\000b\000c)
endobj
-58 0 obj
+62 0 obj
<< /S /GoTo /D (section.3) >>
endobj
-60 0 obj
+64 0 obj
(\376\377\000a\000b\000c)
endobj
-61 0 obj
+65 0 obj
[ 28 [ 547 ] 35 [ 625 ] 43 [ 500 ] 82 [ 563 ] 106 [ 563 563 ] ]
endobj
-63 0 obj
+67 0 obj
<< /Length 14 >>
stream
endstream
endobj
-64 0 obj
+68 0 obj
<< /Subtype /CIDFontType0C /Length 1193 >>
stream

@@ -264,10 +276,10 @@ stream
 
endstream
endobj
-62 0 obj
-<< /Type /FontDescriptor /FontName /FTRWGM+LMRoman12-Bold /Flags 4 /FontBBox [ -476 -289 1577 1137 ] /Ascent 1137 /CapHeight 686 /Descent -289 /ItalicAngle 0 /StemV 104 /XHeight 444 /FontFile3 64 0 R /CIDSet 63 0 R >>
+66 0 obj
+<< /Type /FontDescriptor /FontName /FTRWGM+LMRoman12-Bold /Flags 4 /FontBBox [ -476 -289 1577 1137 ] /Ascent 1137 /CapHeight 686 /Descent -289 /ItalicAngle 0 /StemV 104 /XHeight 444 /FontFile3 68 0 R /CIDSet 67 0 R >>
endobj
-65 0 obj
+69 0 obj
<< /Length 747 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -309,22 +321,22 @@ end
endstream
endobj
-28 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /FTRWGM+LMRoman12-Bold /DescendantFonts [ 66 0 R ] /ToUnicode 65 0 R >>
+32 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /FTRWGM+LMRoman12-Bold /DescendantFonts [ 70 0 R ] /ToUnicode 69 0 R >>
endobj
-66 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /FTRWGM+LMRoman12-Bold /FontDescriptor 62 0 R /W 61 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+70 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /FTRWGM+LMRoman12-Bold /FontDescriptor 66 0 R /W 65 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-67 0 obj
+71 0 obj
[ 28 [ 525 ] 43 [ 525 525 ] 50 [ 525 ] 59 [ 525 ] 63 [ 525 525 ] 68 [ 525 ] 72 [ 525 ] 81 [ 525 ] 84 [ 525 ] 88 [ 525 ] 96 [ 525 ] 98 [ 525 ] 102 [ 525 ] 105 [ 525 ] 114 [ 525 ] 116 [ 525 ] ]
endobj
-69 0 obj
+73 0 obj
<< /Length 15 >>
stream
endstream
endobj
-70 0 obj
+74 0 obj
<< /Subtype /CIDFontType0C /Length 2420 >>
stream

@@ -334,10 +346,10 @@ stream

endstream
endobj
-68 0 obj
-<< /Type /FontDescriptor /FontName /OGJFWH+LMMono10-Regular /Flags 4 /FontBBox [ -451 -316 731 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 70 0 R /CIDSet 69 0 R >>
+72 0 obj
+<< /Type /FontDescriptor /FontName /OGJFWH+LMMono10-Regular /Flags 4 /FontBBox [ -451 -316 731 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 74 0 R /CIDSet 73 0 R >>
endobj
-71 0 obj
+75 0 obj
<< /Length 926 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -391,22 +403,22 @@ end
endstream
endobj
-16 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OGJFWH+LMMono10-Regular /DescendantFonts [ 72 0 R ] /ToUnicode 71 0 R >>
+20 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OGJFWH+LMMono10-Regular /DescendantFonts [ 76 0 R ] /ToUnicode 75 0 R >>
endobj
-72 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OGJFWH+LMMono10-Regular /FontDescriptor 68 0 R /W 67 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+76 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OGJFWH+LMMono10-Regular /FontDescriptor 72 0 R /W 71 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-73 0 obj
+77 0 obj
[ 27 [ 750 500 ] 35 [ 556 ] 43 [ 444 ] 45 [ 278 ] 47 [ 556 ] 50 [ 444 ] 55 [ 306 ] 57 [ 500 785 500 ] 62 [ 750 556 333 361 278 ] 68 [ 306 ] 70 [ 528 ] 72 [ 278 ] 75 [ 833 750 556 ] 81 [ 500 500 ] 84 [ 556 ] 88 [ 278 ] 96 [ 392 ] 98 [ 394 278 ] 104 [ 722 389 500 500 ] 109 [ 556 ] 112 [ 528 ] 114 [ 722 ] 116 [ 528 ] 118 [ 528 ] 125 [ 556 ] ]
endobj
-75 0 obj
+79 0 obj
<< /Length 16 >>
stream
endstream
endobj
-76 0 obj
+80 0 obj
<< /Subtype /CIDFontType0C /Length 5208 >>
stream

@@ -419,10 +431,10 @@ O
endstream
endobj
-74 0 obj
-<< /Type /FontDescriptor /FontName /ZNAMJV+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 76 0 R /CIDSet 75 0 R >>
+78 0 obj
+<< /Type /FontDescriptor /FontName /ZNAMJV+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 80 0 R /CIDSet 79 0 R >>
endobj
-77 0 obj
+81 0 obj
<< /Length 1229 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -497,127 +509,131 @@ end
endstream
endobj
-15 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ZNAMJV+LMRoman10-Regular /DescendantFonts [ 78 0 R ] /ToUnicode 77 0 R >>
+19 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ZNAMJV+LMRoman10-Regular /DescendantFonts [ 82 0 R ] /ToUnicode 81 0 R >>
endobj
-78 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ZNAMJV+LMRoman10-Regular /FontDescriptor 74 0 R /W 73 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+82 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ZNAMJV+LMRoman10-Regular /FontDescriptor 78 0 R /W 77 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-31 0 obj
-<< /Type /Pages /Count 4 /Kids [ 5 0 R 38 0 R 44 0 R 49 0 R ] >>
+35 0 obj
+<< /Type /Pages /Count 4 /Kids [ 5 0 R 42 0 R 48 0 R 53 0 R ] >>
endobj
-79 0 obj
-<< /Type /Outlines /First 53 0 R /Last 59 0 R /Count 3 >>
+83 0 obj
+<< /Type /Outlines /First 57 0 R /Last 63 0 R /Count 3 >>
endobj
-59 0 obj
-<< /Title 60 0 R /A 58 0 R /Parent 79 0 R /Prev 56 0 R >>
+63 0 obj
+<< /Title 64 0 R /A 62 0 R /Parent 83 0 R /Prev 60 0 R >>
endobj
-56 0 obj
-<< /Title 57 0 R /A 55 0 R /Parent 79 0 R /Prev 53 0 R /Next 59 0 R >>
+60 0 obj
+<< /Title 61 0 R /A 59 0 R /Parent 83 0 R /Prev 57 0 R /Next 63 0 R >>
endobj
-53 0 obj
-<< /Title 54 0 R /A 52 0 R /Parent 79 0 R /Next 56 0 R >>
+57 0 obj
+<< /Title 58 0 R /A 56 0 R /Parent 83 0 R /Next 60 0 R >>
endobj
-80 0 obj
-<< /Names [ (Doc-Start) 14 0 R (page.1) 13 0 R (page.2) 40 0 R (page.3) 46 0 R (page.4) 51 0 R (section.1) 27 0 R (section.2) 29 0 R (section.3) 30 0 R ] /Limits [ (Doc-Start) (section.3) ] >>
+84 0 obj
+<< /Names [ (Doc-Start) 18 0 R (page.1) 17 0 R (page.2) 44 0 R (page.3) 50 0 R (page.4) 55 0 R (section.1) 31 0 R (section.2) 33 0 R (section.3) 34 0 R ] /Limits [ (Doc-Start) (section.3) ] >>
endobj
-81 0 obj
-<< /Dests 80 0 R >>
+85 0 obj
+<< /Dests 84 0 R >>
endobj
-82 0 obj
-<< /Type /Catalog /Pages 31 0 R /Outlines 79 0 R /Names 81 0 R /Lang (en-US)/PageMode /UseOutlines/OpenAction [5 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>> >>
+86 0 obj
+<< /Type /Catalog /Pages 35 0 R /Outlines 83 0 R /Names 85 0 R /Lang (en-US)/PageMode /UseOutlines/OpenAction [5 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>> >>
endobj
-83 0 obj
-<< /Creator <FEFF00630072006500610074006F0072>/Author <FEFF0041007500740068006F0072>/Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000706+01'00') /ModDate (D:20210307000706+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >>
+87 0 obj
+<< /Creator <FEFF00630072006500610074006F0072>/Author <FEFF0041007500740068006F0072>/Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.15.0) /CreationDate (D:20220627163915+02'00') /ModDate (D:20220627163915+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.15.0 (TeX Live 2022)) >>
endobj
xref
-0 84
+0 88
0000000002 65535 f
-0000011428 00000 n
+0000012645 00000 n
0000000003 00000 f
0000000004 00000 f
0000000000 00000 f
-0000004822 00000 n
-0000005120 00000 n
-0000005310 00000 n
-0000005537 00000 n
-0000008170 00000 n
-0000008437 00000 n
-0000008972 00000 n
+0000005720 00000 n
+0000006012 00000 n
+0000006202 00000 n
+0000006429 00000 n
0000000020 00000 n
-0000008669 00000 n
-0000008729 00000 n
-0000026667 00000 n
-0000019064 00000 n
-0000005776 00000 n
-0000006016 00000 n
-0000006255 00000 n
-0000006495 00000 n
-0000006735 00000 n
-0000006975 00000 n
-0000007213 00000 n
-0000007453 00000 n
-0000007691 00000 n
-0000007931 00000 n
-0000008790 00000 n
-0000014708 00000 n
-0000008851 00000 n
-0000008911 00000 n
-0000027021 00000 n
-0000004999 00000 n
-0000009672 00000 n
-0000009900 00000 n
-0000010091 00000 n
-0000010283 00000 n
-0000010536 00000 n
-0000009446 00000 n
-0000009083 00000 n
-0000010475 00000 n
-0000009624 00000 n
-0000011073 00000 n
-0000011341 00000 n
-0000010868 00000 n
-0000010635 00000 n
-0000011280 00000 n
-0000011046 00000 n
-0000011882 00000 n
-0000011658 00000 n
-0000011475 00000 n
-0000011821 00000 n
-0000011969 00000 n
-0000027338 00000 n
-0000012015 00000 n
-0000012058 00000 n
-0000027251 00000 n
-0000012104 00000 n
-0000012147 00000 n
-0000027177 00000 n
-0000012193 00000 n
-0000012236 00000 n
-0000013667 00000 n
-0000012316 00000 n
-0000012390 00000 n
-0000013901 00000 n
-0000014859 00000 n
-0000015056 00000 n
-0000017843 00000 n
-0000015264 00000 n
-0000015339 00000 n
-0000018078 00000 n
-0000019217 00000 n
-0000019416 00000 n
-0000025142 00000 n
-0000019774 00000 n
-0000019850 00000 n
-0000025378 00000 n
-0000026821 00000 n
-0000027103 00000 n
-0000027412 00000 n
-0000027621 00000 n
-0000027657 00000 n
-0000027831 00000 n
+0000000528 00000 n
+0000009064 00000 n
+0000000599 00000 n
+0000000852 00000 n
+0000009240 00000 n
+0000009719 00000 n
+0000000920 00000 n
+0000009416 00000 n
+0000009476 00000 n
+0000027390 00000 n
+0000019787 00000 n
+0000006667 00000 n
+0000006907 00000 n
+0000007146 00000 n
+0000007386 00000 n
+0000007626 00000 n
+0000007866 00000 n
+0000008106 00000 n
+0000008346 00000 n
+0000008585 00000 n
+0000008825 00000 n
+0000009537 00000 n
+0000015431 00000 n
+0000009598 00000 n
+0000009658 00000 n
+0000027744 00000 n
+0000005890 00000 n
+0000010411 00000 n
+0000010639 00000 n
+0000010830 00000 n
+0000011022 00000 n
+0000011275 00000 n
+0000010192 00000 n
+0000009830 00000 n
+0000011214 00000 n
+0000010363 00000 n
+0000011804 00000 n
+0000012072 00000 n
+0000011606 00000 n
+0000011374 00000 n
+0000012011 00000 n
+0000011777 00000 n
+0000012558 00000 n
+0000012341 00000 n
+0000012159 00000 n
+0000012497 00000 n
+0000012692 00000 n
+0000028061 00000 n
+0000012738 00000 n
+0000012781 00000 n
+0000027974 00000 n
+0000012827 00000 n
+0000012870 00000 n
+0000027900 00000 n
+0000012916 00000 n
+0000012959 00000 n
+0000014390 00000 n
+0000013039 00000 n
+0000013113 00000 n
+0000014624 00000 n
+0000015582 00000 n
+0000015779 00000 n
+0000018566 00000 n
+0000015987 00000 n
+0000016062 00000 n
+0000018801 00000 n
+0000019940 00000 n
+0000020139 00000 n
+0000025865 00000 n
+0000020497 00000 n
+0000020573 00000 n
+0000026101 00000 n
+0000027544 00000 n
+0000027826 00000 n
+0000028135 00000 n
+0000028344 00000 n
+0000028380 00000 n
+0000028554 00000 n
trailer
-<< /Size 84 /Root 82 0 R /Info 83 0 R /ID [ <A5EE8B29894F85D1657AE472529BBF66> <A5EE8B29894F85D1657AE472529BBF66> ] >>
+<< /Size 88 /Root 86 0 R /Info 87 0 R /ID [ <8C339DFA5623DC9F4AEEE574F747655E> <8C339DFA5623DC9F4AEEE574F747655E> ] >>
startxref
-28160
+28876
%%EOF
diff --git a/macros/latex/contrib/newpax/doc-input2.tex b/macros/latex/contrib/newpax/doc-input2.tex
index e0d96d307f..a1991db774 100644
--- a/macros/latex/contrib/newpax/doc-input2.tex
+++ b/macros/latex/contrib/newpax/doc-input2.tex
@@ -1,6 +1,5 @@
% !Mode:: "TeX:UTF-8:Main"
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{uncompress}
+\DocumentMetadata{uncompress}
\documentclass{article}
\usepackage{hyperref}
diff --git a/macros/latex/contrib/newpax/doc-use-newpax.pdf b/macros/latex/contrib/newpax/doc-use-newpax.pdf
index 0dc805a5f3..ba18d0ed87 100644
--- a/macros/latex/contrib/newpax/doc-use-newpax.pdf
+++ b/macros/latex/contrib/newpax/doc-use-newpax.pdf
@@ -1,6 +1,6 @@
%PDF-1.5
%
-58 0 obj
+56 0 obj
<< /Length 588 >>
stream
/opacity1 gs
@@ -8,7 +8,7 @@ stream
0 g 0 G
0 g 0 G
0 g 0 G
-1 0 0 1 148.712 501.372 cm
+1 0 0 1 148.712 526.316 cm
q
.5 0 0 .5 0 0 cm
q
@@ -18,7 +18,7 @@ Q
Q
0 g 0 G
0 g 0 G
-1 0 0 1 130.877 0 cm
+1 0 0 1 139.239 0 cm
q
.5 0 0 .5 0 0 cm
q
@@ -28,7 +28,7 @@ Q
Q
0 g 0 G
0 g 0 G
-1 0 0 1 -130.877 -166.823 cm
+1 0 0 1 -139.239 -141.877 cm
q
.5 0 0 .5 0 0 cm
q
@@ -38,7 +38,7 @@ Q
Q
0 g 0 G
0 g 0 G
-1 0 0 1 130.877 0 cm
+1 0 0 1 139.239 0 cm
q
.5 0 0 .5 0 0 cm
q
@@ -48,7 +48,7 @@ Q
Q
0 g 0 G
0 g 0 G
-1 0 0 1 -130.877 -166.823 cm
+1 0 0 1 -139.239 -141.878 cm
q
.5 0 0 .5 0 0 cm
q
@@ -58,9 +58,9 @@ Q
Q
0 g 0 G
0 g 0 G
-1 0 0 1 -148.712 -167.726 cm
+1 0 0 1 -148.712 -242.561 cm
BT
-/F23 9.96264 Tf
+/F15 9.96264 Tf
1 0 0 1 303.133 89.365 Tm [<0052>]TJ
0 g 0 G
ET
@@ -68,13 +68,13 @@ ET
endstream
endobj
5 0 obj
-<< /Type /Page /Contents 58 0 R /Resources 57 0 R /MediaBox [ 0 0 612 792 ] /Parent 72 0 R /Annots 73 0 R >>
+<< /Type /Page /Contents 56 0 R /Resources 55 0 R /MediaBox [ 0 0 612 792 ] /Parent 70 0 R /Annots 71 0 R >>
endobj
-73 0 obj
-[ 10 0 R 11 0 R 12 0 R 13 0 R 14 0 R 15 0 R 16 0 R 17 0 R 18 0 R 19 0 R 20 0 R 21 0 R 22 0 R 23 0 R 26 0 R 33 0 R 34 0 R 35 0 R 36 0 R 37 0 R 38 0 R 39 0 R 40 0 R 41 0 R 42 0 R 43 0 R 44 0 R 45 0 R 46 0 R 48 0 R 8 0 R 9 0 R 27 0 R 28 0 R 29 0 R 31 0 R 32 0 R 49 0 R 50 0 R 51 0 R ]
+71 0 obj
+[ 10 0 R 11 0 R 12 0 R 13 0 R 14 0 R 15 0 R 16 0 R 17 0 R 18 0 R 19 0 R 20 0 R 21 0 R 22 0 R 25 0 R 32 0 R 33 0 R 34 0 R 35 0 R 36 0 R 37 0 R 38 0 R 39 0 R 40 0 R 41 0 R 42 0 R 43 0 R 44 0 R 46 0 R 8 0 R 9 0 R 26 0 R 27 0 R 28 0 R 30 0 R 31 0 R 47 0 R 48 0 R 49 0 R ]
endobj
7 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 255.118 331.653 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 74 0 R /Length 41 >>
+<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 271.842 281.763 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 72 0 R /Length 41 >>
stream
q
1 0 0 1 -113.386 -425.196 cm
@@ -84,55 +84,55 @@ Q
endstream
endobj
6 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 1 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000558+01'00') /ModDate (D:20210307000558+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 75 0 R /Font << /F23 76 0 R /F24 77 0 R /F36 78 0 R >> /ProcSet [ /PDF /Text ] >> /Length 4811 >>
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 1 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.15.0) /CreationDate (D:20220627163845+02'00') /ModDate (D:20220627163845+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.15.0 (TeX Live 2022)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 73 0 R /Font << /F15 74 0 R /F16 75 0 R /F28 76 0 R >> /ProcSet [ /PDF /Text ] >> /Length 4809 >>
stream
/opacity1 gs
BT
-/F23 9.96264 Tf
-1 0 0 1 148.712 707.125 Tm [<007400480042004D00460069003200740069>]TJ
-1 0 0 1 148.712 695.17 Tm [<0052>]TJ
-/F24 9.96264 Tf
-1 0 0 1 157.011 695.17 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
-/F23 9.96264 Tf
-1 0 0 1 148.712 683.215 Tm [<001B0062>-414<001C004D>27<0076>-413<002F0032002F0042002B001C00690032002F>-415<00600032001C002F00320060>-414<002B001C004D>-415<002B00480032001C006000480076>-414<006200320032002D>-435<0069003F0032>-414<0041002F0032001C0048>-415<00510037>-414<00540060001C002B00690042002B001C0048>-415<00600032001C00620051004D>-414<00420062>-415<001C>]TJ
-1 0 0 1 133.768 671.26 Tm [<0060003200540060003200620032004D>28<0069001C006900420051004D>-390<00510037002D>-406<001C0062>-391<0037001C0060>-391<001C0062>-390<0041>-391<0046004D0051>27<0072002D>-405<0069003F0032>-390<0069003F0042004D003B0062>-391<0042004D>-391<0069003F0032004B0062003200480070>27<003200620063>-419<001C0062>-391<0041>-391<003F001C>27<0070>28<0032>-390<0062003F0051>28<0072004D>]TJ
-1 0 0 1 133.768 659.304 Tm [<00320048006200320072003F003200600032002D>-264<0069003F0032>-247<0054003F0032004D0051004B0032004D001C>-247<0062003F0051006D0048002F>-247<0051004D00480076>-248<0023>-28<0032>-247<006D00620032002F>-247<001C0062>-247<001C>-247<002B001C004D0051004D>-247<003700510060>-247<0051006D0060>-248<006D004D002F0032006000620069001C004D002F0042004D003B0058>]TJ
-1 0 0 1 133.768 647.349 Tm [<0068003F0032>-329<0054001C0060001C00480051003B00420062004B0062>-329<00510037>-330<00540060001C002B00690042002B001C0048>-329<00600032001C00620051004D>-329<001C00600032>-330<0072003F001C0069>-329<007D006000620069>-329<003B00420070>27<0032>-329<0060004200620032>-329<00690051>-329<0069003F0032>-330<001C0060002B>28<003F004200690032002B00690051004D0042002B>]TJ
-1 0 0 1 133.768 635.394 Tm [<00510037>-383<00540060001C002B00690042002B001C0048>-383<00600032001C00620051004D0058>-595<001B0062>-383<0072004200480048>-383<0032001C0062004200480076>-383<0023>-28<0032>-384<0062003F0051>27<0072004D>-382<0042004D>-383<0069003F0032>-383<004D003200740069>-384<00620032002B006900420051004D002D>-395<00600032001C00620051004D>-384<0072>28<0051006D0048002F>]TJ
-1 0 0 1 133.768 623.439 Tm [<0069003F0032006000320023>28<0076>-260<0023>-28<0032>-260<004B001C002F0032>-261<00690051>-260<002B0051004D>27<00690060001C002F0042002B0069002D>-274<0042004D>-260<0070004200320072>-261<00510037>-260<0069003F003200620032>-261<002B0051004D00620042002F00320060001C006900420051004D0062002D>-274<0069003F0032>-261<0041002F0032001C0048>-260<00510037>-261<00540060001C002B0040>]TJ
-1 0 0 1 133.768 611.484 Tm [<00690042002B001C0048>-398<00600032001C00620051004D002D>-415<0076>27<00320069>-398<0069003F0032>-399<004B001C004D0042003700510048002F>-398<002F00320054>-28<0032004D002F0062>-399<0051004D>-398<0069003F0032>-399<0054003F0032004D0051004B0032004D001C0058>-641<004C0032002B00320062006200420069>27<0076>-398<002F00320054>-28<0032004D002F0062>]TJ
-1 0 0 1 133.768 599.529 Tm [<0051004D002D>-350<0072003F0032004D>-348<0069003F>27<006D0062>-346<006900600032001C00690032002F>-347<001C0062>-348<0069003F0032>-347<00540060001C002B00690042002B001C0048>-347<0032004B005400480051>27<0076004B0032004D>28<0069>-347<00510037>-347<0069003F0032>-347<004D00320070>27<0032006000400032004D002F0042004D003B>-347<00600032003B0060003200620062>]TJ
-1 0 0 1 133.768 587.573 Tm [<0042004D>-316<0069003F0032>-316<006200320060004200320062>-316<00510037>-316<0032004B0054004200600042002B001C0048>-317<002B0051004D002F0042006900420051004D0062002D>-319<00690042004B00320058>-439<003E006D004B001C004D>-316<00600032001C00620051004D>-316<002F00320054>-28<0032004D002F0062>-316<0051004D>-316<0051006D0060>-317<00620032004D00620032>]TJ
-1 0 0 1 133.768 575.618 Tm [<0054>-28<00320060002B00320054006900420051004D0062002D>-285<0023>27<0076>-273<004B0032001C004D0062>-274<00510037>-274<001C004D001C0048007600690042002B>-274<006D004D00420069>28<0076>83<0058>-424<0068003F003200600032>-274<002B001C004D>-273<0023>-28<0032>-274<004D0051>-274<002F0051006D00230069>-274<0069003F001C0069>-274<0069003F0032>-274<00510023>-28<00440032002B00690062>]TJ
-1 0 0 1 133.768 563.663 Tm [<0042004D>-333<00620054001C002B0032>-333<001C004D002F>-333<00690042004B0032>-333<001C00600032>-333<0072003F001C0069>-333<007D006000620069>-333<003B00420070>28<0032>-333<0060004200620032>-333<00690051>-333<003F>28<006D004B001C004D>-333<00600032001C00620051004D0058>]TJ
-1 0 0 1 148.712 551.708 Tm [<0054>-28<002F0037>]TJ
-/F36 14.3462 Tf
-1 0 0 1 133.768 518.747 Tm [<0052>-1000<001C0023>-31<002B>]TJ
-1 0 0 1 133.768 490.938 Tm [<006B>-1000<001C0023>-31<002B>]TJ
-1 0 0 1 133.768 463.129 Tm [<006A>-1000<001C0023>-31<002B>]TJ
-/F23 9.96264 Tf
-1 0 0 1 133.768 441.298 Tm [<007D00480032>]TJ
-1 0 0 1 303.133 139.255 Tm [<0052>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 657.235 Tm [<007400480042004D00460069003200740069>]TJ
+1 0 0 1 148.712 645.28 Tm [<0052>]TJ
+/F16 9.96264 Tf
+1 0 0 1 157.011 645.28 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 633.325 Tm [<001B0062>-414<001C004D>27<0076>-413<002F0032002F0042002B001C00690032002F>-415<00600032001C002F00320060>-414<002B001C004D>-415<002B00480032001C006000480076>-414<006200320032002D>-435<0069003F0032>-414<0041002F0032001C0048>-415<00510037>-414<00540060001C002B00690042002B001C0048>-415<00600032001C00620051004D>-414<00420062>-415<001C>]TJ
+1 0 0 1 133.768 621.37 Tm [<0060003200540060003200620032004D>28<0069001C006900420051004D>-390<00510037002D>-406<001C0062>-391<0037001C0060>-391<001C0062>-390<0041>-391<0046004D0051>27<0072002D>-405<0069003F0032>-390<0069003F0042004D003B0062>-391<0042004D>-391<0069003F0032004B0062003200480070>27<003200620063>-419<001C0062>-391<0041>-391<003F001C>27<0070>28<0032>-390<0062003F0051>28<0072004D>]TJ
+1 0 0 1 133.768 609.415 Tm [<00320048006200320072003F003200600032002D>-264<0069003F0032>-247<0054003F0032004D0051004B0032004D001C>-247<0062003F0051006D0048002F>-247<0051004D00480076>-248<0023>-28<0032>-247<006D00620032002F>-247<001C0062>-247<001C>-247<002B001C004D0051004D>-247<003700510060>-247<0051006D0060>-248<006D004D002F0032006000620069001C004D002F0042004D003B0058>]TJ
+1 0 0 1 133.768 597.46 Tm [<0068003F0032>-329<0054001C0060001C00480051003B00420062004B0062>-329<00510037>-330<00540060001C002B00690042002B001C0048>-329<00600032001C00620051004D>-329<001C00600032>-330<0072003F001C0069>-329<007D006000620069>-329<003B00420070>27<0032>-329<0060004200620032>-329<00690051>-329<0069003F0032>-330<001C0060002B>28<003F004200690032002B00690051004D0042002B>]TJ
+1 0 0 1 133.768 585.504 Tm [<00510037>-383<00540060001C002B00690042002B001C0048>-383<00600032001C00620051004D0058>-595<001B0062>-383<0072004200480048>-383<0032001C0062004200480076>-383<0023>-28<0032>-384<0062003F0051>27<0072004D>-382<0042004D>-383<0069003F0032>-383<004D003200740069>-384<00620032002B006900420051004D002D>-395<00600032001C00620051004D>-384<0072>28<0051006D0048002F>]TJ
+1 0 0 1 133.768 573.549 Tm [<0069003F0032006000320023>28<0076>-260<0023>-28<0032>-260<004B001C002F0032>-261<00690051>-260<002B0051004D>27<00690060001C002F0042002B0069002D>-274<0042004D>-260<0070004200320072>-261<00510037>-260<0069003F003200620032>-261<002B0051004D00620042002F00320060001C006900420051004D0062002D>-274<0069003F0032>-261<0041002F0032001C0048>-260<00510037>-261<00540060001C002B0040>]TJ
+1 0 0 1 133.768 561.594 Tm [<00690042002B001C0048>-398<00600032001C00620051004D002D>-415<0076>27<00320069>-398<0069003F0032>-399<004B001C004D0042003700510048002F>-398<002F00320054>-28<0032004D002F0062>-399<0051004D>-398<0069003F0032>-399<0054003F0032004D0051004B0032004D001C0058>-641<004C0032002B00320062006200420069>27<0076>-398<002F00320054>-28<0032004D002F0062>]TJ
+1 0 0 1 133.768 549.639 Tm [<0051004D002D>-350<0072003F0032004D>-348<0069003F>27<006D0062>-346<006900600032001C00690032002F>-347<001C0062>-348<0069003F0032>-347<00540060001C002B00690042002B001C0048>-347<0032004B005400480051>27<0076004B0032004D>28<0069>-347<00510037>-347<0069003F0032>-347<004D00320070>27<0032006000400032004D002F0042004D003B>-347<00600032003B0060003200620062>]TJ
+1 0 0 1 133.768 537.684 Tm [<0042004D>-316<0069003F0032>-316<006200320060004200320062>-316<00510037>-316<0032004B0054004200600042002B001C0048>-317<002B0051004D002F0042006900420051004D0062002D>-319<00690042004B00320058>-439<003E006D004B001C004D>-316<00600032001C00620051004D>-316<002F00320054>-28<0032004D002F0062>-316<0051004D>-316<0051006D0060>-317<00620032004D00620032>]TJ
+1 0 0 1 133.768 525.729 Tm [<0054>-28<00320060002B00320054006900420051004D0062002D>-285<0023>27<0076>-273<004B0032001C004D0062>-274<00510037>-274<001C004D001C0048007600690042002B>-274<006D004D00420069>28<0076>83<0058>-424<0068003F003200600032>-274<002B001C004D>-273<0023>-28<0032>-274<004D0051>-274<002F0051006D00230069>-274<0069003F001C0069>-274<0069003F0032>-274<00510023>-28<00440032002B00690062>]TJ
+1 0 0 1 133.768 513.773 Tm [<0042004D>-333<00620054001C002B0032>-333<001C004D002F>-333<00690042004B0032>-333<001C00600032>-333<0072003F001C0069>-333<007D006000620069>-333<003B00420070>28<0032>-333<0060004200620032>-333<00690051>-333<003F>28<006D004B001C004D>-333<00600032001C00620051004D0058>]TJ
+1 0 0 1 148.712 501.818 Tm [<0054>-28<002F0037>]TJ
+/F28 14.3462 Tf
+1 0 0 1 133.768 468.857 Tm [<0052>-1000<001C0023>-31<002B>]TJ
+1 0 0 1 133.768 441.048 Tm [<006B>-1000<001C0023>-31<002B>]TJ
+1 0 0 1 133.768 413.239 Tm [<006A>-1000<001C0023>-31<002B>]TJ
+/F15 9.96264 Tf
+1 0 0 1 133.768 391.408 Tm [<007D00480032>]TJ
+1 0 0 1 303.133 89.365 Tm [<0052>]TJ
ET
endstream
endobj
-75 0 obj
+73 0 obj
<< /opacity1 << /ca 1 /CA 1 >> >>
endobj
+74 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ZNAMJV+LMRoman10-Regular /DescendantFonts [ 77 0 R ] /ToUnicode 78 0 R >>
+endobj
+75 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OGJFWH+LMMono10-Regular /DescendantFonts [ 79 0 R ] /ToUnicode 80 0 R >>
+endobj
76 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ZNAMJV+LMRoman10-Regular /DescendantFonts [ 79 0 R ] /ToUnicode 80 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /FTRWGM+LMRoman12-Bold /DescendantFonts [ 81 0 R ] /ToUnicode 82 0 R >>
endobj
77 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OGJFWH+LMMono10-Regular /DescendantFonts [ 81 0 R ] /ToUnicode 82 0 R >>
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ZNAMJV+LMRoman10-Regular /FontDescriptor 83 0 R /W 84 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
78 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /FTRWGM+LMRoman12-Bold /DescendantFonts [ 83 0 R ] /ToUnicode 84 0 R >>
-endobj
-79 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ZNAMJV+LMRoman10-Regular /FontDescriptor 85 0 R /W 86 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
-endobj
-80 0 obj
<< /Length 1229 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -207,10 +207,10 @@ end
endstream
endobj
-81 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OGJFWH+LMMono10-Regular /FontDescriptor 87 0 R /W 88 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+79 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OGJFWH+LMMono10-Regular /FontDescriptor 85 0 R /W 86 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-82 0 obj
+80 0 obj
<< /Length 926 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -264,10 +264,10 @@ end
endstream
endobj
-83 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /FTRWGM+LMRoman12-Bold /FontDescriptor 89 0 R /W 90 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+81 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /FTRWGM+LMRoman12-Bold /FontDescriptor 87 0 R /W 88 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-84 0 obj
+82 0 obj
<< /Length 747 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -309,25 +309,25 @@ end
endstream
endobj
-85 0 obj
-<< /Type /FontDescriptor /FontName /ZNAMJV+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 91 0 R /CIDSet 92 0 R >>
+83 0 obj
+<< /Type /FontDescriptor /FontName /ZNAMJV+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 89 0 R /CIDSet 90 0 R >>
endobj
-86 0 obj
+84 0 obj
[ 27 [ 750 500 ] 35 [ 556 ] 43 [ 444 ] 45 [ 278 ] 47 [ 556 ] 50 [ 444 ] 55 [ 306 ] 57 [ 500 785 500 ] 62 [ 750 556 333 361 278 ] 68 [ 306 ] 70 [ 528 ] 72 [ 278 ] 75 [ 833 750 556 ] 81 [ 500 500 ] 84 [ 556 ] 88 [ 278 ] 96 [ 392 ] 98 [ 394 278 ] 104 [ 722 389 500 500 ] 109 [ 556 ] 112 [ 528 ] 114 [ 722 ] 116 [ 528 ] 118 [ 528 ] 125 [ 556 ] ]
endobj
-87 0 obj
-<< /Type /FontDescriptor /FontName /OGJFWH+LMMono10-Regular /Flags 4 /FontBBox [ -451 -316 731 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 93 0 R /CIDSet 94 0 R >>
+85 0 obj
+<< /Type /FontDescriptor /FontName /OGJFWH+LMMono10-Regular /Flags 4 /FontBBox [ -451 -316 731 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 91 0 R /CIDSet 92 0 R >>
endobj
-88 0 obj
+86 0 obj
[ 28 [ 525 ] 43 [ 525 525 ] 50 [ 525 ] 59 [ 525 ] 63 [ 525 525 ] 68 [ 525 ] 72 [ 525 ] 81 [ 525 ] 84 [ 525 ] 88 [ 525 ] 96 [ 525 ] 98 [ 525 ] 102 [ 525 ] 105 [ 525 ] 114 [ 525 ] 116 [ 525 ] ]
endobj
-89 0 obj
-<< /Type /FontDescriptor /FontName /FTRWGM+LMRoman12-Bold /Flags 4 /FontBBox [ -476 -289 1577 1137 ] /Ascent 1137 /CapHeight 686 /Descent -289 /ItalicAngle 0 /StemV 104 /XHeight 444 /FontFile3 95 0 R /CIDSet 96 0 R >>
+87 0 obj
+<< /Type /FontDescriptor /FontName /FTRWGM+LMRoman12-Bold /Flags 4 /FontBBox [ -476 -289 1577 1137 ] /Ascent 1137 /CapHeight 686 /Descent -289 /ItalicAngle 0 /StemV 104 /XHeight 444 /FontFile3 93 0 R /CIDSet 94 0 R >>
endobj
-90 0 obj
+88 0 obj
[ 28 [ 547 ] 35 [ 625 ] 43 [ 500 ] 82 [ 563 ] 106 [ 563 563 ] ]
endobj
-91 0 obj
+89 0 obj
<< /Subtype /CIDFontType0C /Length 5208 >>
stream

@@ -340,13 +340,13 @@ O
endstream
endobj
-92 0 obj
+90 0 obj
<< /Length 16 >>
stream
endstream
endobj
-93 0 obj
+91 0 obj
<< /Subtype /CIDFontType0C /Length 2420 >>
stream

@@ -356,13 +356,13 @@ stream

endstream
endobj
-94 0 obj
+92 0 obj
<< /Length 15 >>
stream
endstream
endobj
-95 0 obj
+93 0 obj
<< /Subtype /CIDFontType0C /Length 1193 >>
stream

@@ -373,17 +373,17 @@ stream
 
endstream
endobj
-96 0 obj
+94 0 obj
<< /Length 14 >>
stream
endstream
endobj
-74 0 obj
+72 0 obj
<< /XObject << /Im1 6 0 R >> /ProcSet [ /PDF ] >>
endobj
-25 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 226.772 331.653 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 97 0 R /Length 41 >>
+24 0 obj
+<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 243.495 281.763 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 95 0 R /Length 41 >>
stream
q
1 0 0 1 -141.732 -425.196 cm
@@ -392,25 +392,25 @@ Q
endstream
endobj
-24 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 2 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000558+01'00') /ModDate (D:20210307000558+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 75 0 R /Font << /F24 77 0 R /F23 76 0 R >> /ProcSet [ /PDF /Text ] >> /Length 303 >>
+23 0 obj
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 2 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.15.0) /CreationDate (D:20220627163845+02'00') /ModDate (D:20220627163845+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.15.0 (TeX Live 2022)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 73 0 R /Font << /F16 75 0 R /F15 74 0 R >> /ProcSet [ /PDF /Text ] >> /Length 302 >>
stream
/opacity1 gs
BT
-/F24 9.96264 Tf
-1 0 0 1 148.712 707.125 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
-/F23 9.96264 Tf
-1 0 0 1 148.712 695.17 Tm [<0052>-1333<006B>-1333<006A>]TJ
-1 0 0 1 303.133 139.255 Tm [<006B>]TJ
+/F16 9.96264 Tf
+1 0 0 1 148.712 657.235 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 645.28 Tm [<0052>-1333<006B>-1333<006A>]TJ
+1 0 0 1 303.133 89.365 Tm [<006B>]TJ
ET
endstream
endobj
-97 0 obj
-<< /XObject << /Im2 24 0 R >> /ProcSet [ /PDF ] >>
+95 0 obj
+<< /XObject << /Im2 23 0 R >> /ProcSet [ /PDF ] >>
endobj
-30 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 255.118 331.653 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 98 0 R /Length 41 >>
+29 0 obj
+<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 271.842 281.763 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 96 0 R /Length 41 >>
stream
q
1 0 0 1 -113.386 -425.196 cm
@@ -419,11 +419,11 @@ Q
endstream
endobj
-98 0 obj
+96 0 obj
<< /XObject << /Im1 6 0 R >> /ProcSet [ /PDF ] >>
endobj
-47 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 226.772 331.653 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 99 0 R /Length 41 >>
+45 0 obj
+<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 243.495 281.763 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 97 0 R /Length 41 >>
stream
q
1 0 0 1 -141.732 -425.196 cm
@@ -432,11 +432,11 @@ Q
endstream
endobj
-99 0 obj
-<< /XObject << /Im2 24 0 R >> /ProcSet [ /PDF ] >>
+97 0 obj
+<< /XObject << /Im2 23 0 R >> /ProcSet [ /PDF ] >>
endobj
-52 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 255.118 331.653 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 100 0 R /Length 41 >>
+50 0 obj
+<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 271.842 281.763 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 98 0 R /Length 41 >>
stream
q
1 0 0 1 -113.386 -425.196 cm
@@ -445,176 +445,170 @@ Q
endstream
endobj
-100 0 obj
+98 0 obj
<< /XObject << /Im1 6 0 R >> /ProcSet [ /PDF ] >>
endobj
10 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 170.028 634.719 247.116 640.313 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 170.027 634.719 247.113 640.314 ] >>
endobj
11 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 165.878 628.861 276.275 634.445 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 165.877 628.861 284.634 634.446 ] >>
endobj
12 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 622.879 276.275 628.413 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 622.879 284.634 628.413 ] >>
endobj
13 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 616.901 276.275 622.435 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 616.901 284.634 622.436 ] >>
endobj
14 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 610.924 276.275 616.458 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 610.924 284.634 616.458 ] >>
endobj
15 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 604.951 276.275 610.535 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 604.951 284.634 610.535 ] >>
endobj
16 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 598.973 276.275 604.503 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 598.974 284.634 604.503 ] >>
endobj
17 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 592.996 276.275 598.525 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 592.996 284.634 598.525 ] >>
endobj
18 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 587.013 276.275 592.548 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 587.013 284.634 592.548 ] >>
endobj
19 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 581.095 276.275 586.57 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 581.096 284.634 586.57 ] >>
endobj
20 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 575.063 276.275 580.592 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 575.063 284.634 580.592 ] >>
endobj
21 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 569.081 276.275 574.615 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 569.081 284.634 574.615 ] >>
endobj
22 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F(/c/texlive/2020/texmf-dist/doc/latex/base/doc.pdf)/D(chapter.1)>> /BS <</S/U/W 1>> /Rect [ 165.878 563.163 174.078 568.637 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F<</UF <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>/F <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>/Subtype/application#2Fpdf/AFRelationship/Unspecified/Type/Filespec>>/D(chapter.1)>> /BS <</S/U/W 1>> /Rect [ 165.877 563.163 174.077 568.637 ] >>
endobj
-23 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F(example-image.pdf)/D[0 /Fit]>> /BS <</S/U/W 1>> /Rect [ 158.406 508.869 165.768 513.432 ] >>
+25 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 290.943 640.697 368.029 646.291 ] >>
endobj
-26 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 282.581 640.697 359.667 646.291 ] >>
+32 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 170.027 492.841 247.113 498.436 ] >>
endobj
33 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 170.028 467.896 247.116 473.49 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 165.877 486.983 284.634 492.568 ] >>
endobj
34 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 165.878 462.038 276.275 467.622 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 481.001 284.634 486.535 ] >>
endobj
35 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 456.056 276.275 461.59 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 475.023 284.634 480.558 ] >>
endobj
36 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 450.078 276.275 455.612 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 469.046 284.634 474.58 ] >>
endobj
37 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 444.101 276.275 449.635 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 463.073 284.634 468.657 ] >>
endobj
38 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 438.128 276.275 443.712 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 457.096 284.634 462.625 ] >>
endobj
39 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 432.15 276.275 437.68 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 451.118 284.634 456.647 ] >>
endobj
40 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 426.173 276.275 431.702 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 445.135 284.634 450.67 ] >>
endobj
41 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 420.19 276.275 425.725 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 439.218 284.634 444.692 ] >>
endobj
42 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 414.272 276.275 419.747 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 433.185 284.634 438.714 ] >>
endobj
43 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 408.24 276.275 413.769 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.405 427.203 284.634 432.737 ] >>
endobj
44 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 158.406 402.258 276.275 407.792 ] >>
-endobj
-45 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F(/c/texlive/2020/texmf-dist/doc/latex/base/doc.pdf)/D(chapter.1)>> /BS <</S/U/W 1>> /Rect [ 165.878 396.34 174.078 401.814 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F<</UF <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>/F <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>/Subtype/application#2Fpdf/AFRelationship/Unspecified/Type/Filespec>>/D(chapter.1)>> /BS <</S/U/W 1>> /Rect [ 165.877 421.285 174.077 426.759 ] >>
endobj
46 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F(example-image.pdf)/D[0 /Fit]>> /BS <</S/U/W 1>> /Rect [ 158.406 342.046 165.768 346.609 ] >>
-endobj
-48 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 282.581 473.874 359.667 479.468 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 290.943 498.819 368.029 504.413 ] >>
endobj
8 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 167.512 640.786 187.388 647.287 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@1@) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 167.511 640.787 187.387 647.287 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@1@) >> >>
endobj
9 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 164.882 633.723 170.361 641.309 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@2@) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 164.881 633.723 170.361 641.31 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@2@) >> >>
+endobj
+26 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 289.946 634.754 295.426 641.17 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@3@) >> >>
endobj
27 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 281.584 634.754 287.064 641.17 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@3@) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 299.077 634.754 304.556 641.17 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@4@) >> >>
endobj
28 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 290.715 634.754 296.194 641.17 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@4@) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 308.208 634.754 313.687 641.17 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@5@) >> >>
endobj
-29 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 299.846 634.754 305.325 641.17 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@5@) >> >>
+30 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 167.511 498.909 187.387 505.409 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@1@B) >> >>
endobj
31 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 167.512 473.964 187.388 480.464 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@1@B) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 164.881 491.845 170.361 499.432 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@2@B) >> >>
endobj
-32 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 164.882 466.9 170.361 474.487 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@2@B) >> >>
+47 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 289.946 492.876 295.426 499.292 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@3@B) >> >>
+endobj
+48 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 299.077 492.876 304.556 499.292 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@4@B) >> >>
endobj
49 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 281.584 467.932 287.064 474.347 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@3@B) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 308.208 492.876 313.687 499.292 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@5@B) >> >>
endobj
-50 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 290.715 467.932 296.194 474.347 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@4@B) >> >>
+57 0 obj
+<< /D [ 5 0 R /XYZ 132.768 705.06 null ] >>
endobj
-51 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 299.846 467.932 305.325 474.347 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@5@B) >> >>
+58 0 obj
+<< /D [ 5 0 R /XYZ 133.768 667.198 null ] >>
endobj
59 0 obj
-<< /D [ 5 0 R /XYZ 132.768 705.06 null ] >>
+<< /D [ 5 0 R /XYZ 182.126 543.166 null ] >>
endobj
60 0 obj
-<< /D [ 5 0 R /XYZ 133.768 667.198 null ] >>
+<< /D [ 5 0 R /XYZ 205.349 556.147 null ] >>
endobj
61 0 obj
-<< /D [ 5 0 R /XYZ 182.127 543.166 null ] >>
+<< /D [ 5 0 R /XYZ 228.572 556.147 null ] >>
endobj
62 0 obj
-<< /D [ 5 0 R /XYZ 205.35 556.147 null ] >>
+<< /D [ 5 0 R /XYZ 251.795 543.166 null ] >>
endobj
63 0 obj
-<< /D [ 5 0 R /XYZ 228.572 556.147 null ] >>
+<< /D [ 5 0 R /XYZ 275.018 529.261 null ] >>
endobj
64 0 obj
-<< /D [ 5 0 R /XYZ 251.795 543.166 null ] >>
+<< /D [ 5 0 R /XYZ 182.126 401.288 null ] >>
endobj
65 0 obj
-<< /D [ 5 0 R /XYZ 275.018 529.261 null ] >>
+<< /D [ 5 0 R /XYZ 205.349 414.269 null ] >>
endobj
66 0 obj
-<< /D [ 5 0 R /XYZ 182.127 376.343 null ] >>
+<< /D [ 5 0 R /XYZ 228.572 414.269 null ] >>
endobj
67 0 obj
-<< /D [ 5 0 R /XYZ 205.35 389.324 null ] >>
+<< /D [ 5 0 R /XYZ 251.795 401.288 null ] >>
endobj
68 0 obj
-<< /D [ 5 0 R /XYZ 228.572 389.324 null ] >>
-endobj
-69 0 obj
-<< /D [ 5 0 R /XYZ 251.795 376.343 null ] >>
+<< /D [ 5 0 R /XYZ 275.018 387.383 null ] >>
endobj
-70 0 obj
-<< /D [ 5 0 R /XYZ 275.018 362.438 null ] >>
+55 0 obj
+<< /ExtGState 1 0 R /Font << /F15 69 0 R >> /XObject << /Fm1 7 0 R /Fm2 24 0 R /Fm3 29 0 R /Fm4 45 0 R /Fm5 50 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-57 0 obj
-<< /ExtGState 1 0 R /Font << /F23 71 0 R >> /XObject << /Fm1 7 0 R /Fm2 25 0 R /Fm3 30 0 R /Fm4 47 0 R /Fm5 52 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-118 0 obj
-<< /Length 142 >>
+116 0 obj
+<< /Length 144 >>
stream
/opacity1 gs
0 g 0 G
-1 0 0 1 25.989 -0.016 cm
+1 0 0 1 -0.144 -0.186 cm
q
-.94078 0 0 .94078 0 0 cm
+1.00047 0 0 1.00047 0 0 cm
q
1 0 0 1 0 0 cm
/Im6 Do
@@ -628,61 +622,61 @@ Q
endstream
endobj
-117 0 obj
-<< /Type /Page /Contents 118 0 R /Resources 116 0 R /MediaBox [ 0 0 612 792 ] /Parent 72 0 R /Annots 124 0 R >>
+115 0 obj
+<< /Type /Page /Contents 116 0 R /Resources 114 0 R /MediaBox [ 0 0 612 792 ] /Parent 70 0 R /Annots 122 0 R >>
endobj
-124 0 obj
-[ 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 101 0 R ]
+122 0 obj
+[ 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 99 0 R ]
endobj
-56 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 1 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000706+01'00') /ModDate (D:20210307000706+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 125 0 R /Font << /F23 126 0 R /F24 127 0 R /F36 128 0 R >> /ProcSet [ /PDF /Text ] >> /Length 4742 >>
+54 0 obj
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 1 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.15.0) /CreationDate (D:20220627163915+02'00') /ModDate (D:20220627163915+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.15.0 (TeX Live 2022)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 123 0 R /Font << /F15 124 0 R /F16 125 0 R /F28 126 0 R >> /ProcSet [ /PDF /Text ] >> /Length 4740 >>
stream
/opacity1 gs
BT
-/F23 9.96264 Tf
-1 0 0 1 148.712 707.125 Tm [<0052>]TJ
-/F24 9.96264 Tf
-1 0 0 1 157.011 707.125 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
-/F23 9.96264 Tf
-1 0 0 1 148.712 695.17 Tm [<001B0062>-414<001C004D>27<0076>-413<002F0032002F0042002B001C00690032002F>-415<00600032001C002F00320060>-414<002B001C004D>-415<002B00480032001C006000480076>-414<006200320032002D>-435<0069003F0032>-414<0041002F0032001C0048>-415<00510037>-414<00540060001C002B00690042002B001C0048>-415<00600032001C00620051004D>-414<00420062>-415<001C>]TJ
-1 0 0 1 133.768 683.215 Tm [<0060003200540060003200620032004D>28<0069001C006900420051004D>-390<00510037002D>-406<001C0062>-391<0037001C0060>-391<001C0062>-390<0041>-391<0046004D0051>27<0072002D>-405<0069003F0032>-390<0069003F0042004D003B0062>-391<0042004D>-391<0069003F0032004B0062003200480070>27<003200620063>-419<001C0062>-391<0041>-391<003F001C>27<0070>28<0032>-390<0062003F0051>28<0072004D>]TJ
-1 0 0 1 133.768 671.26 Tm [<00320048006200320072003F003200600032002D>-264<0069003F0032>-247<0054003F0032004D0051004B0032004D001C>-247<0062003F0051006D0048002F>-247<0051004D00480076>-248<0023>-28<0032>-247<006D00620032002F>-247<001C0062>-247<001C>-247<002B001C004D0051004D>-247<003700510060>-247<0051006D0060>-248<006D004D002F0032006000620069001C004D002F0042004D003B0058>]TJ
-1 0 0 1 133.768 659.304 Tm [<0068003F0032>-329<0054001C0060001C00480051003B00420062004B0062>-329<00510037>-330<00540060001C002B00690042002B001C0048>-329<00600032001C00620051004D>-329<001C00600032>-330<0072003F001C0069>-329<007D006000620069>-329<003B00420070>27<0032>-329<0060004200620032>-329<00690051>-329<0069003F0032>-330<001C0060002B>28<003F004200690032002B00690051004D0042002B>]TJ
-1 0 0 1 133.768 647.349 Tm [<00510037>-383<00540060001C002B00690042002B001C0048>-383<00600032001C00620051004D0058>-595<001B0062>-383<0072004200480048>-383<0032001C0062004200480076>-383<0023>-28<0032>-384<0062003F0051>27<0072004D>-382<0042004D>-383<0069003F0032>-383<004D003200740069>-384<00620032002B006900420051004D002D>-395<00600032001C00620051004D>-384<0072>28<0051006D0048002F>]TJ
-1 0 0 1 133.768 635.394 Tm [<0069003F0032006000320023>28<0076>-260<0023>-28<0032>-260<004B001C002F0032>-261<00690051>-260<002B0051004D>27<00690060001C002F0042002B0069002D>-274<0042004D>-260<0070004200320072>-261<00510037>-260<0069003F003200620032>-261<002B0051004D00620042002F00320060001C006900420051004D0062002D>-274<0069003F0032>-261<0041002F0032001C0048>-260<00510037>-261<00540060001C002B0040>]TJ
-1 0 0 1 133.768 623.439 Tm [<00690042002B001C0048>-398<00600032001C00620051004D002D>-415<0076>27<00320069>-398<0069003F0032>-399<004B001C004D0042003700510048002F>-398<002F00320054>-28<0032004D002F0062>-399<0051004D>-398<0069003F0032>-399<0054003F0032004D0051004B0032004D001C0058>-641<004C0032002B00320062006200420069>27<0076>-398<002F00320054>-28<0032004D002F0062>]TJ
-1 0 0 1 133.768 611.484 Tm [<0051004D002D>-350<0072003F0032004D>-348<0069003F>27<006D0062>-346<006900600032001C00690032002F>-347<001C0062>-348<0069003F0032>-347<00540060001C002B00690042002B001C0048>-347<0032004B005400480051>27<0076004B0032004D>28<0069>-347<00510037>-347<0069003F0032>-347<004D00320070>27<0032006000400032004D002F0042004D003B>-347<00600032003B0060003200620062>]TJ
-1 0 0 1 133.768 599.529 Tm [<0042004D>-316<0069003F0032>-316<006200320060004200320062>-316<00510037>-316<0032004B0054004200600042002B001C0048>-317<002B0051004D002F0042006900420051004D0062002D>-319<00690042004B00320058>-439<003E006D004B001C004D>-316<00600032001C00620051004D>-316<002F00320054>-28<0032004D002F0062>-316<0051004D>-316<0051006D0060>-317<00620032004D00620032>]TJ
-1 0 0 1 133.768 587.573 Tm [<0054>-28<00320060002B00320054006900420051004D0062002D>-285<0023>27<0076>-273<004B0032001C004D0062>-274<00510037>-274<001C004D001C0048007600690042002B>-274<006D004D00420069>28<0076>83<0058>-424<0068003F003200600032>-274<002B001C004D>-273<0023>-28<0032>-274<004D0051>-274<002F0051006D00230069>-274<0069003F001C0069>-274<0069003F0032>-274<00510023>-28<00440032002B00690062>]TJ
-1 0 0 1 133.768 575.618 Tm [<0042004D>-333<00620054001C002B0032>-333<001C004D002F>-333<00690042004B0032>-333<001C00600032>-333<0072003F001C0069>-333<007D006000620069>-333<003B00420070>28<0032>-333<0060004200620032>-333<00690051>-333<003F>28<006D004B001C004D>-333<00600032001C00620051004D0058>]TJ
-1 0 0 1 148.712 563.663 Tm [<0054>-28<002F0037>]TJ
-/F36 14.3462 Tf
-1 0 0 1 133.768 530.702 Tm [<0052>-1000<001C0023>-31<002B>]TJ
-1 0 0 1 133.768 502.893 Tm [<006B>-1000<001C0023>-31<002B>]TJ
-1 0 0 1 133.768 475.084 Tm [<006A>-1000<001C0023>-31<002B>]TJ
-/F23 9.96264 Tf
-1 0 0 1 133.768 453.253 Tm [<007D00480032>]TJ
-1 0 0 1 303.133 139.255 Tm [<0052>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 657.235 Tm [<0052>]TJ
+/F16 9.96264 Tf
+1 0 0 1 157.011 657.235 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 645.28 Tm [<001B0062>-414<001C004D>27<0076>-413<002F0032002F0042002B001C00690032002F>-415<00600032001C002F00320060>-414<002B001C004D>-415<002B00480032001C006000480076>-414<006200320032002D>-435<0069003F0032>-414<0041002F0032001C0048>-415<00510037>-414<00540060001C002B00690042002B001C0048>-415<00600032001C00620051004D>-414<00420062>-415<001C>]TJ
+1 0 0 1 133.768 633.325 Tm [<0060003200540060003200620032004D>28<0069001C006900420051004D>-390<00510037002D>-406<001C0062>-391<0037001C0060>-391<001C0062>-390<0041>-391<0046004D0051>27<0072002D>-405<0069003F0032>-390<0069003F0042004D003B0062>-391<0042004D>-391<0069003F0032004B0062003200480070>27<003200620063>-419<001C0062>-391<0041>-391<003F001C>27<0070>28<0032>-390<0062003F0051>28<0072004D>]TJ
+1 0 0 1 133.768 621.37 Tm [<00320048006200320072003F003200600032002D>-264<0069003F0032>-247<0054003F0032004D0051004B0032004D001C>-247<0062003F0051006D0048002F>-247<0051004D00480076>-248<0023>-28<0032>-247<006D00620032002F>-247<001C0062>-247<001C>-247<002B001C004D0051004D>-247<003700510060>-247<0051006D0060>-248<006D004D002F0032006000620069001C004D002F0042004D003B0058>]TJ
+1 0 0 1 133.768 609.415 Tm [<0068003F0032>-329<0054001C0060001C00480051003B00420062004B0062>-329<00510037>-330<00540060001C002B00690042002B001C0048>-329<00600032001C00620051004D>-329<001C00600032>-330<0072003F001C0069>-329<007D006000620069>-329<003B00420070>27<0032>-329<0060004200620032>-329<00690051>-329<0069003F0032>-330<001C0060002B>28<003F004200690032002B00690051004D0042002B>]TJ
+1 0 0 1 133.768 597.46 Tm [<00510037>-383<00540060001C002B00690042002B001C0048>-383<00600032001C00620051004D0058>-595<001B0062>-383<0072004200480048>-383<0032001C0062004200480076>-383<0023>-28<0032>-384<0062003F0051>27<0072004D>-382<0042004D>-383<0069003F0032>-383<004D003200740069>-384<00620032002B006900420051004D002D>-395<00600032001C00620051004D>-384<0072>28<0051006D0048002F>]TJ
+1 0 0 1 133.768 585.504 Tm [<0069003F0032006000320023>28<0076>-260<0023>-28<0032>-260<004B001C002F0032>-261<00690051>-260<002B0051004D>27<00690060001C002F0042002B0069002D>-274<0042004D>-260<0070004200320072>-261<00510037>-260<0069003F003200620032>-261<002B0051004D00620042002F00320060001C006900420051004D0062002D>-274<0069003F0032>-261<0041002F0032001C0048>-260<00510037>-261<00540060001C002B0040>]TJ
+1 0 0 1 133.768 573.549 Tm [<00690042002B001C0048>-398<00600032001C00620051004D002D>-415<0076>27<00320069>-398<0069003F0032>-399<004B001C004D0042003700510048002F>-398<002F00320054>-28<0032004D002F0062>-399<0051004D>-398<0069003F0032>-399<0054003F0032004D0051004B0032004D001C0058>-641<004C0032002B00320062006200420069>27<0076>-398<002F00320054>-28<0032004D002F0062>]TJ
+1 0 0 1 133.768 561.594 Tm [<0051004D002D>-350<0072003F0032004D>-348<0069003F>27<006D0062>-346<006900600032001C00690032002F>-347<001C0062>-348<0069003F0032>-347<00540060001C002B00690042002B001C0048>-347<0032004B005400480051>27<0076004B0032004D>28<0069>-347<00510037>-347<0069003F0032>-347<004D00320070>27<0032006000400032004D002F0042004D003B>-347<00600032003B0060003200620062>]TJ
+1 0 0 1 133.768 549.639 Tm [<0042004D>-316<0069003F0032>-316<006200320060004200320062>-316<00510037>-316<0032004B0054004200600042002B001C0048>-317<002B0051004D002F0042006900420051004D0062002D>-319<00690042004B00320058>-439<003E006D004B001C004D>-316<00600032001C00620051004D>-316<002F00320054>-28<0032004D002F0062>-316<0051004D>-316<0051006D0060>-317<00620032004D00620032>]TJ
+1 0 0 1 133.768 537.684 Tm [<0054>-28<00320060002B00320054006900420051004D0062002D>-285<0023>27<0076>-273<004B0032001C004D0062>-274<00510037>-274<001C004D001C0048007600690042002B>-274<006D004D00420069>28<0076>83<0058>-424<0068003F003200600032>-274<002B001C004D>-273<0023>-28<0032>-274<004D0051>-274<002F0051006D00230069>-274<0069003F001C0069>-274<0069003F0032>-274<00510023>-28<00440032002B00690062>]TJ
+1 0 0 1 133.768 525.729 Tm [<0042004D>-333<00620054001C002B0032>-333<001C004D002F>-333<00690042004B0032>-333<001C00600032>-333<0072003F001C0069>-333<007D006000620069>-333<003B00420070>28<0032>-333<0060004200620032>-333<00690051>-333<003F>28<006D004B001C004D>-333<00600032001C00620051004D0058>]TJ
+1 0 0 1 148.712 513.773 Tm [<0054>-28<002F0037>]TJ
+/F28 14.3462 Tf
+1 0 0 1 133.768 480.812 Tm [<0052>-1000<001C0023>-31<002B>]TJ
+1 0 0 1 133.768 453.003 Tm [<006B>-1000<001C0023>-31<002B>]TJ
+1 0 0 1 133.768 425.195 Tm [<006A>-1000<001C0023>-31<002B>]TJ
+/F15 9.96264 Tf
+1 0 0 1 133.768 403.363 Tm [<007D00480032>]TJ
+1 0 0 1 303.133 89.365 Tm [<0052>]TJ
ET
endstream
endobj
-125 0 obj
+123 0 obj
<< /opacity1 << /ca 1 /CA 1 >> >>
endobj
+124 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ZNAMJV+LMRoman10-Regular /DescendantFonts [ 127 0 R ] /ToUnicode 128 0 R >>
+endobj
+125 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OGJFWH+LMMono10-Regular /DescendantFonts [ 129 0 R ] /ToUnicode 130 0 R >>
+endobj
126 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ZNAMJV+LMRoman10-Regular /DescendantFonts [ 129 0 R ] /ToUnicode 130 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /FTRWGM+LMRoman12-Bold /DescendantFonts [ 131 0 R ] /ToUnicode 132 0 R >>
endobj
127 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OGJFWH+LMMono10-Regular /DescendantFonts [ 131 0 R ] /ToUnicode 132 0 R >>
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ZNAMJV+LMRoman10-Regular /FontDescriptor 133 0 R /W 134 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
128 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /FTRWGM+LMRoman12-Bold /DescendantFonts [ 133 0 R ] /ToUnicode 134 0 R >>
-endobj
-129 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ZNAMJV+LMRoman10-Regular /FontDescriptor 135 0 R /W 136 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
-endobj
-130 0 obj
<< /Length 1229 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -757,10 +751,10 @@ end
endstream
endobj
-131 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OGJFWH+LMMono10-Regular /FontDescriptor 137 0 R /W 138 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+129 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OGJFWH+LMMono10-Regular /FontDescriptor 135 0 R /W 136 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-132 0 obj
+130 0 obj
<< /Length 926 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -814,10 +808,10 @@ end
endstream
endobj
-133 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /FTRWGM+LMRoman12-Bold /FontDescriptor 139 0 R /W 140 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+131 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /FTRWGM+LMRoman12-Bold /FontDescriptor 137 0 R /W 138 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-134 0 obj
+132 0 obj
<< /Length 747 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -859,25 +853,25 @@ end
endstream
endobj
-135 0 obj
-<< /Type /FontDescriptor /FontName /ZNAMJV+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 141 0 R /CIDSet 142 0 R >>
+133 0 obj
+<< /Type /FontDescriptor /FontName /ZNAMJV+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 139 0 R /CIDSet 140 0 R >>
endobj
-136 0 obj
+134 0 obj
[ 27 [ 750 500 ] 35 [ 556 ] 43 [ 444 ] 45 [ 278 ] 47 [ 556 ] 50 [ 444 ] 55 [ 306 ] 57 [ 500 785 500 ] 62 [ 750 556 333 361 278 ] 68 [ 306 ] 70 [ 528 ] 72 [ 278 ] 75 [ 833 750 556 ] 81 [ 500 500 ] 84 [ 556 ] 88 [ 278 ] 96 [ 392 ] 98 [ 394 278 ] 104 [ 722 389 500 500 ] 109 [ 556 ] 112 [ 528 ] 114 [ 722 ] 116 [ 528 ] 118 [ 528 ] 125 [ 556 ] ]
endobj
-137 0 obj
-<< /Type /FontDescriptor /FontName /OGJFWH+LMMono10-Regular /Flags 4 /FontBBox [ -451 -316 731 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 143 0 R /CIDSet 144 0 R >>
+135 0 obj
+<< /Type /FontDescriptor /FontName /OGJFWH+LMMono10-Regular /Flags 4 /FontBBox [ -451 -316 731 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 141 0 R /CIDSet 142 0 R >>
endobj
-138 0 obj
+136 0 obj
[ 28 [ 525 ] 43 [ 525 525 ] 50 [ 525 ] 59 [ 525 ] 63 [ 525 525 ] 68 [ 525 ] 72 [ 525 ] 81 [ 525 ] 84 [ 525 ] 88 [ 525 ] 96 [ 525 ] 98 [ 525 ] 102 [ 525 ] 105 [ 525 ] 114 [ 525 ] 116 [ 525 ] ]
endobj
-139 0 obj
-<< /Type /FontDescriptor /FontName /FTRWGM+LMRoman12-Bold /Flags 4 /FontBBox [ -476 -289 1577 1137 ] /Ascent 1137 /CapHeight 686 /Descent -289 /ItalicAngle 0 /StemV 104 /XHeight 444 /FontFile3 145 0 R /CIDSet 146 0 R >>
+137 0 obj
+<< /Type /FontDescriptor /FontName /FTRWGM+LMRoman12-Bold /Flags 4 /FontBBox [ -476 -289 1577 1137 ] /Ascent 1137 /CapHeight 686 /Descent -289 /ItalicAngle 0 /StemV 104 /XHeight 444 /FontFile3 143 0 R /CIDSet 144 0 R >>
endobj
-140 0 obj
+138 0 obj
[ 28 [ 547 ] 35 [ 625 ] 43 [ 500 ] 82 [ 563 ] 106 [ 563 563 ] ]
endobj
-141 0 obj
+139 0 obj
<< /Subtype /CIDFontType0C /Length 5208 >>
stream

@@ -890,13 +884,13 @@ O
endstream
endobj
-142 0 obj
+140 0 obj
<< /Length 16 >>
stream
endstream
endobj
-143 0 obj
+141 0 obj
<< /Subtype /CIDFontType0C /Length 2420 >>
stream

@@ -906,13 +900,13 @@ stream

endstream
endobj
-144 0 obj
+142 0 obj
<< /Length 15 >>
stream
endstream
endobj
-145 0 obj
+143 0 obj
<< /Subtype /CIDFontType0C /Length 1193 >>
stream

@@ -923,83 +917,83 @@ stream
 
endstream
endobj
-146 0 obj
+144 0 obj
<< /Length 14 >>
stream
endstream
endobj
+100 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 155.954 654.101 310.209 665.295 ] >>
+endobj
+101 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 147.651 642.379 478.588 653.553 ] >>
+endobj
102 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 172.765 662.182 317.807 672.708 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 132.699 630.407 478.588 641.482 ] >>
endobj
103 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 164.957 651.159 476.13 661.666 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 132.699 618.446 478.588 629.521 ] >>
endobj
104 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 639.902 476.13 650.316 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 132.699 606.485 478.588 617.56 ] >>
endobj
105 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 628.655 476.13 639.069 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 132.699 594.534 478.588 605.708 ] >>
endobj
106 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 617.407 476.13 627.82 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 132.699 582.573 478.588 593.636 ] >>
endobj
107 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 606.169 476.13 616.676 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 132.699 570.612 478.588 581.675 ] >>
endobj
108 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 594.921 476.13 605.325 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 132.699 558.64 478.588 569.714 ] >>
endobj
109 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 583.673 476.13 594.077 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 132.699 546.799 478.588 557.753 ] >>
endobj
110 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 572.416 476.13 582.83 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 132.699 534.728 478.588 545.792 ] >>
endobj
111 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 561.281 476.13 571.582 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 132.699 522.757 396.102 533.83 ] >>
endobj
112 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 549.93 476.13 560.334 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /A <</Type/Action/S/GoToR/F<</UF <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>/F <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>/Subtype/application#2Fpdf/AFRelationship/Unspecified/Type/Filespec>>/D(chapter.1)>> /Rect [ 147.651 510.915 164.059 521.869 ] >>
endobj
113 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 150.898 538.673 398.571 549.086 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /A <</Type/Action/S/GoToR/F<</UF <FEFF006500780061006D0070006C0065002D0069006D006100670065002E007000640066>/F <FEFF006500780061006D0070006C0065002D0069006D006100670065002E007000640066>/Subtype/application#2Fpdf/AFRelationship/Unspecified/Type/Filespec>>/D[0 /Fit]>> /Rect [ 132.699 402.274 147.432 411.404 ] >>
endobj
-114 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /A <</Type/Action/S/GoToR/F(/c/texlive/2020/texmf-dist/doc/latex/base/doc.pdf)/D(chapter.1)>> /Rect [ 164.957 527.537 180.385 537.838 ] >>
+99 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.0 0.0 1.0] /Rect [ 146.655 653.105 155.625 666.291 ]/A << /S /GoTo /D (NEWPAX@doc-input2.newpax@1@B) >> >>
endobj
-115 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /A <</Type/Action/S/GoToR/F(example-image.pdf)/D[0 /Fit]>> /Rect [ 150.898 425.376 164.751 433.962 ] >>
+117 0 obj
+<< /D [ 115 0 R /XYZ 156.918 496.876 null ] >>
endobj
-101 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.0 0.0 1.0] /Rect [ 163.961 661.186 172.514 673.704 ]/A << /S /GoTo /D (NEWPAX@doc-input2.newpax@1@B) >> >>
+118 0 obj
+<< /D [ 115 0 R /XYZ 180.141 496.876 null ] >>
endobj
119 0 obj
-<< /D [ 117 0 R /XYZ 175.058 514.336 null ] >>
+<< /D [ 115 0 R /XYZ 203.364 470.901 null ] >>
endobj
120 0 obj
-<< /D [ 117 0 R /XYZ 198.281 514.336 null ] >>
+<< /D [ 115 0 R /XYZ 226.587 443.078 null ] >>
endobj
121 0 obj
-<< /D [ 117 0 R /XYZ 221.504 489.91 null ] >>
-endobj
-122 0 obj
-<< /D [ 117 0 R /XYZ 244.727 463.747 null ] >>
+<< /D [ 115 0 R /XYZ 132.768 705.06 null ] >>
endobj
-123 0 obj
-<< /D [ 117 0 R /XYZ 132.768 705.06 null ] >>
-endobj
-116 0 obj
-<< /ExtGState 1 0 R /XObject << /Im6 56 0 R >> /ProcSet [ /PDF ] >>
+114 0 obj
+<< /ExtGState 1 0 R /XObject << /Im6 54 0 R >> /ProcSet [ /PDF ] >>
endobj
-154 0 obj
-<< /Length 142 >>
+152 0 obj
+<< /Length 144 >>
stream
/opacity1 gs
0 g 0 G
-1 0 0 1 25.989 -0.016 cm
+1 0 0 1 -0.144 -0.186 cm
q
-.94078 0 0 .94078 0 0 cm
+1.00047 0 0 1.00047 0 0 cm
q
1 0 0 1 0 0 cm
/Im7 Do
@@ -1013,52 +1007,52 @@ Q
endstream
endobj
-153 0 obj
-<< /Type /Page /Contents 154 0 R /Resources 152 0 R /MediaBox [ 0 0 612 792 ] /Parent 72 0 R /Annots 156 0 R >>
+151 0 obj
+<< /Type /Page /Contents 152 0 R /Resources 150 0 R /MediaBox [ 0 0 612 792 ] /Parent 70 0 R /Annots 154 0 R >>
endobj
-156 0 obj
-[ 148 0 R 149 0 R 150 0 R 151 0 R ]
+154 0 obj
+[ 146 0 R 147 0 R 148 0 R 149 0 R ]
endobj
-147 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 2 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000706+01'00') /ModDate (D:20210307000706+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 125 0 R /Font << /F24 127 0 R /F23 126 0 R >> /ProcSet [ /PDF /Text ] >> /Length 303 >>
+145 0 obj
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 2 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.15.0) /CreationDate (D:20220627163915+02'00') /ModDate (D:20220627163915+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.15.0 (TeX Live 2022)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 123 0 R /Font << /F16 125 0 R /F15 124 0 R >> /ProcSet [ /PDF /Text ] >> /Length 302 >>
stream
/opacity1 gs
BT
-/F24 9.96264 Tf
-1 0 0 1 148.712 707.125 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
-/F23 9.96264 Tf
-1 0 0 1 148.712 695.17 Tm [<0052>-1333<006B>-1333<006A>]TJ
-1 0 0 1 303.133 139.255 Tm [<006B>]TJ
+/F16 9.96264 Tf
+1 0 0 1 148.712 657.235 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 645.28 Tm [<0052>-1333<006B>-1333<006A>]TJ
+1 0 0 1 303.133 89.365 Tm [<006B>]TJ
ET
endstream
endobj
-148 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 164.957 662.182 309.999 672.708 ] >>
+146 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /Rect [ 147.651 654.101 301.905 665.295 ] >>
endobj
-149 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.0 0.0 1.0] /Rect [ 163.961 651.879 172.514 662.194 ]/A << /S /GoTo /D (NEWPAX@doc-input2.newpax@2@B) >> >>
+147 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.0 0.0 1.0] /Rect [ 146.655 643.207 155.625 654.051 ]/A << /S /GoTo /D (NEWPAX@doc-input2.newpax@2@B) >> >>
endobj
-150 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.0 0.0 1.0] /Rect [ 181.141 651.879 189.694 662.194 ]/A << /S /GoTo /D (NEWPAX@doc-input2.newpax@3@B) >> >>
+148 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.0 0.0 1.0] /Rect [ 164.926 643.207 173.896 654.051 ]/A << /S /GoTo /D (NEWPAX@doc-input2.newpax@3@B) >> >>
endobj
-151 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.0 0.0 1.0] /Rect [ 198.321 651.879 206.874 662.194 ]/A << /S /GoTo /D (NEWPAX@doc-input2.newpax@4@B) >> >>
+149 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.0 0.0 1.0] /Rect [ 183.197 643.207 192.167 654.051 ]/A << /S /GoTo /D (NEWPAX@doc-input2.newpax@4@B) >> >>
endobj
-155 0 obj
-<< /D [ 153 0 R /XYZ 132.768 705.06 null ] >>
+153 0 obj
+<< /D [ 151 0 R /XYZ 132.768 705.06 null ] >>
endobj
-152 0 obj
-<< /ExtGState 1 0 R /XObject << /Im7 147 0 R >> /ProcSet [ /PDF ] >>
+150 0 obj
+<< /ExtGState 1 0 R /XObject << /Im7 145 0 R >> /ProcSet [ /PDF ] >>
endobj
-161 0 obj
-<< /Length 142 >>
+159 0 obj
+<< /Length 144 >>
stream
/opacity1 gs
0 g 0 G
-1 0 0 1 25.989 -0.016 cm
+1 0 0 1 -0.144 -0.186 cm
q
-.94078 0 0 .94078 0 0 cm
+1.00047 0 0 1.00047 0 0 cm
q
1 0 0 1 0 0 cm
/Im8 Do
@@ -1072,44 +1066,41 @@ Q
endstream
endobj
-160 0 obj
-<< /Type /Page /Contents 161 0 R /Resources 159 0 R /MediaBox [ 0 0 612 792 ] /Parent 72 0 R /Annots 163 0 R >>
+158 0 obj
+<< /Type /Page /Contents 159 0 R /Resources 157 0 R /MediaBox [ 0 0 612 792 ] /Parent 70 0 R /Annots 161 0 R >>
endobj
-163 0 obj
-[ 158 0 R ]
+161 0 obj
+[ 156 0 R ]
endobj
-157 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 3 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000706+01'00') /ModDate (D:20210307000706+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 125 0 R /Font << /F23 126 0 R >> /ProcSet [ /PDF /Text ] >> /Length 173 >>
+155 0 obj
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 3 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.15.0) /CreationDate (D:20220627163915+02'00') /ModDate (D:20220627163915+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.15.0 (TeX Live 2022)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 123 0 R /Font << /F15 124 0 R >> /ProcSet [ /PDF /Text ] >> /Length 172 >>
stream
/opacity1 gs
BT
-/F23 9.96264 Tf
-1 0 0 1 148.712 707.125 Tm [<003A0051>-333<00690051>-333<007D006000620069>-333<0054001C003B0032>]TJ
-1 0 0 1 303.133 139.255 Tm [<006A>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 657.235 Tm [<003A0051>-333<00690051>-333<007D006000620069>-333<0054001C003B0032>]TJ
+1 0 0 1 303.133 89.365 Tm [<006A>]TJ
ET
endstream
endobj
-158 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4] /A <</Type/Action/S/Named/N/FirstPage>> /Rect [ 164.957 662.398 231.541 672.811 ] >>
-endobj
-162 0 obj
-<< /D [ 160 0 R /XYZ 132.768 705.06 null ] >>
+156 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4] /A <</Type/Action/S/Named/N/FirstPage>> /Rect [ 147.651 654.33 218.464 665.404 ] >>
endobj
-159 0 obj
-<< /ExtGState 1 0 R /XObject << /Im8 157 0 R >> /ProcSet [ /PDF ] >>
+160 0 obj
+<< /D [ 158 0 R /XYZ 132.768 705.06 null ] >>
endobj
-1 0 obj
-<< /opacity1 <</ca 1/CA 1>> >>
+157 0 obj
+<< /ExtGState 1 0 R /XObject << /Im8 155 0 R >> /ProcSet [ /PDF ] >>
endobj
-167 0 obj
-<< /Length 142 >>
+165 0 obj
+<< /Length 144 >>
stream
/opacity1 gs
0 g 0 G
-1 0 0 1 25.989 -0.016 cm
+1 0 0 1 -0.144 -0.186 cm
q
-.94078 0 0 .94078 0 0 cm
+1.00047 0 0 1.00047 0 0 cm
q
1 0 0 1 0 0 cm
/Im9 Do
@@ -1123,47 +1114,50 @@ Q
endstream
endobj
-166 0 obj
-<< /Type /Page /Contents 167 0 R /Resources 165 0 R /MediaBox [ 0 0 612 792 ] /Parent 72 0 R >>
-endobj
164 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 4 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000706+01'00') /ModDate (D:20210307000706+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 125 0 R /Font << /F23 126 0 R >> /ProcSet [ /PDF /Text ] >> /Length 123 >>
+<< /Type /Page /Contents 165 0 R /Resources 163 0 R /MediaBox [ 0 0 612 792 ] /Parent 70 0 R >>
+endobj
+162 0 obj
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 4 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.15.0) /CreationDate (D:20220627163915+02'00') /ModDate (D:20220627163915+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.15.0 (TeX Live 2022)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 123 0 R /Font << /F15 124 0 R >> /ProcSet [ /PDF /Text ] >> /Length 122 >>
stream
/opacity1 gs
BT
-/F23 9.96264 Tf
-1 0 0 1 148.712 707.125 Tm [<00230048006D0023>]TJ
-1 0 0 1 303.133 139.255 Tm [<0039>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 657.235 Tm [<00230048006D0023>]TJ
+1 0 0 1 303.133 89.365 Tm [<0039>]TJ
ET
endstream
endobj
-168 0 obj
-<< /D [ 166 0 R /XYZ 132.768 705.06 null ] >>
+166 0 obj
+<< /D [ 164 0 R /XYZ 132.768 705.06 null ] >>
endobj
-165 0 obj
-<< /ExtGState 1 0 R /XObject << /Im9 164 0 R >> /ProcSet [ /PDF ] >>
+163 0 obj
+<< /ExtGState 1 0 R /XObject << /Im9 162 0 R >> /ProcSet [ /PDF ] >>
endobj
-169 0 obj
+1 0 obj
+<< /opacity1 <</ca 1/CA 1>> >>
+endobj
+167 0 obj
[ 82 [ 500 ] ]
endobj
-171 0 obj
+169 0 obj
<< /Length 11 >>
stream
endstream
endobj
-172 0 obj
+170 0 obj
<< /Subtype /CIDFontType0C /Length 574 >>
stream

endstream
endobj
-170 0 obj
-<< /Type /FontDescriptor /FontName /JFRMQG+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 172 0 R /CIDSet 171 0 R >>
+168 0 obj
+<< /Type /FontDescriptor /FontName /JFRMQG+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 170 0 R /CIDSet 169 0 R >>
endobj
-173 0 obj
+171 0 obj
<< /Length 692 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -1200,210 +1194,208 @@ end
endstream
endobj
-71 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /JFRMQG+LMRoman10-Regular /DescendantFonts [ 174 0 R ] /ToUnicode 173 0 R >>
+69 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /JFRMQG+LMRoman10-Regular /DescendantFonts [ 172 0 R ] /ToUnicode 171 0 R >>
endobj
-174 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /JFRMQG+LMRoman10-Regular /FontDescriptor 170 0 R /W 169 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+172 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /JFRMQG+LMRoman10-Regular /FontDescriptor 168 0 R /W 167 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-72 0 obj
-<< /Type /Pages /Count 5 /Kids [ 5 0 R 117 0 R 153 0 R 160 0 R 166 0 R ] >>
+70 0 obj
+<< /Type /Pages /Count 5 /Kids [ 5 0 R 115 0 R 151 0 R 158 0 R 164 0 R ] >>
endobj
-175 0 obj
-<< /Names [ (Doc-Start) 60 0 R (NEWPAX@doc-input1.newpax@1@) 61 0 R (NEWPAX@doc-input1.newpax@1@B) 66 0 R (NEWPAX@doc-input1.newpax@2@) 62 0 R (NEWPAX@doc-input1.newpax@2@B) 67 0 R (NEWPAX@doc-input1.newpax@3@) 63 0 R (NEWPAX@doc-input1.newpax@3@B) 68 0 R (NEWPAX@doc-input1.newpax@4@) 64 0 R (NEWPAX@doc-input1.newpax@4@B) 69 0 R (NEWPAX@doc-input1.newpax@5@) 65 0 R (NEWPAX@doc-input1.newpax@5@B) 70 0 R (NEWPAX@doc-input2.newpax@1@B) 119 0 R (NEWPAX@doc-input2.newpax@2@B) 120 0 R (NEWPAX@doc-input2.newpax@3@B) 121 0 R (NEWPAX@doc-input2.newpax@4@B) 122 0 R (page.1) 59 0 R (page.2) 123 0 R (page.3) 155 0 R (page.4) 162 0 R (page.5) 168 0 R ] /Limits [ (Doc-Start) (page.5) ] >>
+173 0 obj
+<< /Names [ (Doc-Start) 58 0 R (NEWPAX@doc-input1.newpax@1@) 59 0 R (NEWPAX@doc-input1.newpax@1@B) 64 0 R (NEWPAX@doc-input1.newpax@2@) 60 0 R (NEWPAX@doc-input1.newpax@2@B) 65 0 R (NEWPAX@doc-input1.newpax@3@) 61 0 R (NEWPAX@doc-input1.newpax@3@B) 66 0 R (NEWPAX@doc-input1.newpax@4@) 62 0 R (NEWPAX@doc-input1.newpax@4@B) 67 0 R (NEWPAX@doc-input1.newpax@5@) 63 0 R (NEWPAX@doc-input1.newpax@5@B) 68 0 R (NEWPAX@doc-input2.newpax@1@B) 117 0 R (NEWPAX@doc-input2.newpax@2@B) 118 0 R (NEWPAX@doc-input2.newpax@3@B) 119 0 R (NEWPAX@doc-input2.newpax@4@B) 120 0 R (page.1) 57 0 R (page.2) 121 0 R (page.3) 153 0 R (page.4) 160 0 R (page.5) 166 0 R ] /Limits [ (Doc-Start) (page.5) ] >>
endobj
-176 0 obj
-<< /Dests 175 0 R >>
+174 0 obj
+<< /Dests 173 0 R >>
endobj
-177 0 obj
-<< /Type /Catalog /Pages 72 0 R /Names 176 0 R /Lang (en-US)/PageMode /UseOutlines/OpenAction [5 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>> >>
+175 0 obj
+<< /Type /Catalog /Pages 70 0 R /Names 174 0 R /Lang (en-US)/PageMode /UseOutlines/OpenAction [5 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>> >>
endobj
-178 0 obj
-<< /Creator <FEFF004C006100540065005800200077006900740068002000680079007000650072007200650066> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307001040+01'00') /ModDate (D:20210307001040+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >>
+176 0 obj
+<< /Creator <FEFF004C006100540065005800200077006900740068002000680079007000650072007200650066> /Producer (LuaTeX-1.15.0) /CreationDate (D:20220627164044+02'00') /ModDate (D:20220627164044+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.15.0 (TeX Live 2022)) >>
endobj
xref
-0 179
+0 177
0000000002 65535 f
-0000060968 00000 n
+0000063088 00000 n
0000000003 00000 f
0000000004 00000 f
-0000000053 00000 f
+0000000051 00000 f
0000000668 00000 n
-0000001304 00000 n
-0000001090 00000 n
-0000030271 00000 n
-0000030482 00000 n
-0000023537 00000 n
-0000023759 00000 n
-0000023981 00000 n
-0000024203 00000 n
-0000024425 00000 n
-0000024647 00000 n
-0000024869 00000 n
-0000025091 00000 n
-0000025313 00000 n
-0000025535 00000 n
-0000025756 00000 n
-0000025978 00000 n
-0000026200 00000 n
-0000026460 00000 n
-0000021746 00000 n
-0000021531 00000 n
-0000026685 00000 n
-0000030693 00000 n
-0000030904 00000 n
-0000031115 00000 n
-0000022691 00000 n
-0000031326 00000 n
-0000031539 00000 n
-0000026907 00000 n
-0000027128 00000 n
-0000027350 00000 n
-0000027571 00000 n
-0000027793 00000 n
-0000028015 00000 n
-0000028237 00000 n
-0000028457 00000 n
-0000028679 00000 n
-0000028900 00000 n
-0000029122 00000 n
-0000029343 00000 n
-0000029565 00000 n
-0000029824 00000 n
-0000022972 00000 n
-0000030049 00000 n
-0000031750 00000 n
-0000031963 00000 n
-0000032176 00000 n
-0000023254 00000 n
-0000000054 00000 f
-0000000055 00000 f
+0000001290 00000 n
+0000001076 00000 n
+0000030641 00000 n
+0000030852 00000 n
+0000023490 00000 n
+0000023712 00000 n
+0000023934 00000 n
+0000024156 00000 n
+0000024378 00000 n
+0000024600 00000 n
+0000024822 00000 n
+0000025044 00000 n
+0000025266 00000 n
+0000025488 00000 n
+0000025709 00000 n
+0000025931 00000 n
+0000026153 00000 n
+0000021716 00000 n
+0000021501 00000 n
+0000026844 00000 n
+0000031062 00000 n
+0000031273 00000 n
+0000031484 00000 n
+0000022646 00000 n
+0000031695 00000 n
+0000031908 00000 n
+0000027066 00000 n
+0000027288 00000 n
+0000027510 00000 n
+0000027732 00000 n
+0000027954 00000 n
+0000028175 00000 n
+0000028397 00000 n
+0000028619 00000 n
+0000028841 00000 n
+0000029062 00000 n
+0000029284 00000 n
+0000029506 00000 n
+0000029728 00000 n
+0000022927 00000 n
+0000030419 00000 n
+0000032121 00000 n
+0000032334 00000 n
+0000032547 00000 n
+0000023209 00000 n
+0000000052 00000 f
+0000000053 00000 f
0000000000 00000 f
-0000033752 00000 n
-0000033118 00000 n
+0000034126 00000 n
+0000033491 00000 n
0000000020 00000 n
-0000032389 00000 n
-0000032449 00000 n
-0000032510 00000 n
-0000032571 00000 n
-0000032631 00000 n
-0000032692 00000 n
-0000032753 00000 n
-0000032814 00000 n
-0000032875 00000 n
-0000032935 00000 n
-0000032996 00000 n
-0000033057 00000 n
-0000063924 00000 n
-0000064283 00000 n
+0000032760 00000 n
+0000032820 00000 n
+0000032881 00000 n
+0000032942 00000 n
+0000033003 00000 n
+0000033064 00000 n
+0000033125 00000 n
+0000033186 00000 n
+0000033247 00000 n
+0000033308 00000 n
+0000033369 00000 n
+0000033430 00000 n
+0000064890 00000 n
+0000065249 00000 n
0000000792 00000 n
-0000021465 00000 n
-0000006701 00000 n
-0000006751 00000 n
-0000006905 00000 n
-0000007058 00000 n
-0000007209 00000 n
-0000007409 00000 n
-0000008691 00000 n
-0000008890 00000 n
-0000009868 00000 n
-0000010065 00000 n
-0000010864 00000 n
-0000011100 00000 n
-0000011458 00000 n
-0000011693 00000 n
-0000011901 00000 n
-0000012135 00000 n
-0000012215 00000 n
-0000017500 00000 n
-0000017567 00000 n
-0000020064 00000 n
-0000020130 00000 n
-0000021400 00000 n
-0000022624 00000 n
-0000022906 00000 n
-0000023187 00000 n
-0000023470 00000 n
-0000056773 00000 n
-0000053889 00000 n
-0000054093 00000 n
-0000054296 00000 n
-0000054499 00000 n
-0000054702 00000 n
-0000054904 00000 n
-0000055107 00000 n
-0000055310 00000 n
-0000055513 00000 n
-0000055715 00000 n
-0000055918 00000 n
-0000056120 00000 n
-0000056324 00000 n
-0000056566 00000 n
-0000057276 00000 n
-0000033482 00000 n
-0000033279 00000 n
-0000056958 00000 n
-0000057022 00000 n
-0000057086 00000 n
-0000057149 00000 n
-0000057213 00000 n
-0000033611 00000 n
-0000039085 00000 n
-0000039136 00000 n
-0000039293 00000 n
-0000039449 00000 n
-0000039603 00000 n
-0000039806 00000 n
-0000041089 00000 n
-0000041291 00000 n
-0000042270 00000 n
-0000042470 00000 n
-0000043270 00000 n
-0000043509 00000 n
-0000043868 00000 n
-0000044106 00000 n
-0000044315 00000 n
-0000044552 00000 n
-0000044633 00000 n
-0000049919 00000 n
-0000049987 00000 n
-0000052485 00000 n
-0000052552 00000 n
-0000053823 00000 n
-0000057746 00000 n
-0000058628 00000 n
-0000058832 00000 n
-0000059017 00000 n
-0000059202 00000 n
-0000059450 00000 n
-0000057564 00000 n
-0000057361 00000 n
-0000059387 00000 n
-0000057693 00000 n
-0000059897 00000 n
-0000060636 00000 n
-0000060882 00000 n
-0000059739 00000 n
-0000059536 00000 n
-0000060819 00000 n
-0000059868 00000 n
-0000061331 00000 n
-0000062083 00000 n
-0000061218 00000 n
-0000061015 00000 n
-0000062020 00000 n
-0000062169 00000 n
-0000062932 00000 n
-0000062201 00000 n
-0000062273 00000 n
-0000063171 00000 n
-0000064080 00000 n
-0000064376 00000 n
-0000065077 00000 n
-0000065115 00000 n
-0000065274 00000 n
+0000021435 00000 n
+0000006671 00000 n
+0000006721 00000 n
+0000006875 00000 n
+0000007028 00000 n
+0000007179 00000 n
+0000007379 00000 n
+0000008661 00000 n
+0000008860 00000 n
+0000009838 00000 n
+0000010035 00000 n
+0000010834 00000 n
+0000011070 00000 n
+0000011428 00000 n
+0000011663 00000 n
+0000011871 00000 n
+0000012105 00000 n
+0000012185 00000 n
+0000017470 00000 n
+0000017537 00000 n
+0000020034 00000 n
+0000020100 00000 n
+0000021370 00000 n
+0000022579 00000 n
+0000022861 00000 n
+0000023142 00000 n
+0000023424 00000 n
+0000057779 00000 n
+0000054247 00000 n
+0000054451 00000 n
+0000054655 00000 n
+0000054859 00000 n
+0000055063 00000 n
+0000055266 00000 n
+0000055470 00000 n
+0000055674 00000 n
+0000055878 00000 n
+0000056081 00000 n
+0000056285 00000 n
+0000056489 00000 n
+0000056692 00000 n
+0000057365 00000 n
+0000058282 00000 n
+0000033857 00000 n
+0000033652 00000 n
+0000057963 00000 n
+0000058027 00000 n
+0000058091 00000 n
+0000058155 00000 n
+0000058219 00000 n
+0000033986 00000 n
+0000039443 00000 n
+0000039494 00000 n
+0000039651 00000 n
+0000039807 00000 n
+0000039961 00000 n
+0000040164 00000 n
+0000041447 00000 n
+0000041649 00000 n
+0000042628 00000 n
+0000042828 00000 n
+0000043628 00000 n
+0000043867 00000 n
+0000044226 00000 n
+0000044464 00000 n
+0000044673 00000 n
+0000044910 00000 n
+0000044991 00000 n
+0000050277 00000 n
+0000050345 00000 n
+0000052843 00000 n
+0000052910 00000 n
+0000054181 00000 n
+0000058754 00000 n
+0000059621 00000 n
+0000059825 00000 n
+0000060010 00000 n
+0000060195 00000 n
+0000060443 00000 n
+0000058572 00000 n
+0000058367 00000 n
+0000060380 00000 n
+0000058701 00000 n
+0000060892 00000 n
+0000061616 00000 n
+0000061861 00000 n
+0000060734 00000 n
+0000060529 00000 n
+0000061798 00000 n
+0000060863 00000 n
+0000062265 00000 n
+0000063002 00000 n
+0000062152 00000 n
+0000061947 00000 n
+0000062939 00000 n
+0000063135 00000 n
+0000063898 00000 n
+0000063167 00000 n
+0000063239 00000 n
+0000064137 00000 n
+0000065046 00000 n
+0000065342 00000 n
+0000066043 00000 n
+0000066081 00000 n
+0000066240 00000 n
trailer
-<< /Size 179 /Root 177 0 R /Info 178 0 R /ID [ <A68583ADE9E8F964D75771AE3B6D3F9F> <A68583ADE9E8F964D75771AE3B6D3F9F> ] >>
+<< /Size 177 /Root 175 0 R /Info 176 0 R /ID [ <1D6DF76B40BFDA4E6C32440AC8AB0AAA> <1D6DF76B40BFDA4E6C32440AC8AB0AAA> ] >>
startxref
-65581
+66540
%%EOF
diff --git a/macros/latex/contrib/newpax/doc-use-newpax.tex b/macros/latex/contrib/newpax/doc-use-newpax.tex
index dc23bcd842..c24ea392ef 100644
--- a/macros/latex/contrib/newpax/doc-use-newpax.tex
+++ b/macros/latex/contrib/newpax/doc-use-newpax.tex
@@ -1,7 +1,7 @@
% !Mode:: "TeX:UTF-8:Main"
-
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{uncompress}
+% The next command needs LaTeX 2022-06-01, for older formats see documentation
+% of pdfmanagement-testphase
+\DocumentMetadata{uncompress}
\documentclass{article}
\usepackage{pdfpages,xcolor}
diff --git a/macros/latex/contrib/newpax/doc-use-pax.pdf b/macros/latex/contrib/newpax/doc-use-pax.pdf
index b498d12e6b..90bae5fce7 100644
--- a/macros/latex/contrib/newpax/doc-use-pax.pdf
+++ b/macros/latex/contrib/newpax/doc-use-pax.pdf
Binary files differ
diff --git a/macros/latex/contrib/newpax/doc-use-pax.tex b/macros/latex/contrib/newpax/doc-use-pax.tex
index f5b6e695a6..08bfe5abe7 100644
--- a/macros/latex/contrib/newpax/doc-use-pax.tex
+++ b/macros/latex/contrib/newpax/doc-use-pax.tex
@@ -16,6 +16,10 @@
%correct a bug in pax affecting clipping
\makeatletter
\patchcmd\PAX@pdf@annot{\PAX@pagellx}{\PAX@page@llx}{}{\fail}
+%allow hashes and percent in the pax file
+\patchcmd\PAX@AddAnnots{\InputIfFileExists\PAX@file{}{\typeout{* Missing: \PAX@file}}}
+ {\begingroup \catcode`\#=12 \catcode`\%=12
+ \InputIfFileExists\PAX@file{}{\typeout{* Missing: \PAX@file}}\endgroup}{}{\fail}
\makeatother
\begin{document}
\includegraphics[scale=0.5,trim=5cm 15cm 8cm 3cm,clip,page=2]{doc-input1}
diff --git a/macros/latex/contrib/newpax/newpax.dtx b/macros/latex/contrib/newpax/newpax.dtx
index 44c6dbe16a..0d32683bd4 100644
--- a/macros/latex/contrib/newpax/newpax.dtx
+++ b/macros/latex/contrib/newpax/newpax.dtx
@@ -2,7 +2,7 @@
%
% File: newpax.dtx
% Copyright 2006-2008, 2011, 2012 Heiko Oberdiek (original pax.sty)
-% Copyright (C) 2021 Ulrike Fischer
+% Copyright (C) 2021, 2022 Ulrike Fischer
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -29,7 +29,7 @@
%<@@=newpax>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{newpax}%
- [2021-03-07 v0.51 Annotation support for PDF graphics based on pax.sty adapted by (UF)]%
+ [2022-06-27 v0.52 Annotation support for PDF graphics based on pax.sty adapted by (UF)]%
\ExplSyntaxOn
\bool_if:nF
{
@@ -493,12 +493,12 @@
\def\NEWPAX@htype@Named{link}
\def\NEWPAX@htype@URI{url}
+\ExplSyntaxOn
\def\NEWPAX@link@URI{%
\NEWPAX@pdf@annot{%
- /URI\NEWPAX@key@URI
+ /URI\tl_to_str:V\NEWPAX@key@URI
}%
}
-\ExplSyntaxOn
\def\NEWPAX@link@Named{%
\NEWPAX@pdf@annot{%
/N \pdf_name_from_unicode_e:n{\NEWPAX@key@Name} %the value is from a pdf so we can assume it is correctly escaped??
@@ -701,8 +701,8 @@
%<*lua>
local ProvidesLuaModule = {
name = "newpax",
- version = "0.51", --TAGVERSION
- date = "2021-03-07", --TAGDATE
+ version = "0.52", --TAGVERSION
+ date = "2022-06-27", --TAGDATE
description = "newpax lua code",
license = "The LATEX Project Public License 1.3c"
}
@@ -1031,15 +1031,48 @@ local function outputKV_N (pdfedict)
return a
end
+-- if a gotoR has a filespec filespec we use this
+-- to output the reference. It is rather crude and handles only names and strings
+local function outputDICT (dictionary)
+ local dict = DICTIONARYTOTABLE(dictionary)
+ local a = "<<"
+ for k,v in pairs (dict) do
+ a = a .. strNAME.. k
+ if v[1]== 5 then -- it is a name
+ b = string.gsub(v[2], "/", "#2F")
+ a = a .. strNAME .. b
+ elseif v[1] == 6 then -- it is a string
+ local b
+ if v[3] then
+ b = "<" .. v[2] .. ">"
+ else
+ b = "(" .. v[2] .. ")"
+ end
+ a = a ..strRECT_SEP .. b
+ -- everything else is ignored for now!
+ end
+ end
+ a = a .. ">>"
+ return a
+end
+
local function outputKV_gotor (pdfedict) -- action dictionary
local type, value, hex = GETFROMDICTIONARY(pdfedict,"F")
local desttype, destvalue, destdetail = GETFROMDICTIONARY(pdfedict,"D")
local a = strKV_BEG .. constKEY_FILE .. strVALUE_BEG
- a = strKV_BEG .. constKEY_FILE .. strVALUE_BEG
- if hex then
- a = a .. strHEX_STR_BEG .. value .. strHEX_STR_end
+ if TYPE(value) == "pdfe.reference" then
+ local x,dictionary = GETFROMREFERENCE(value)
+ if TYPE(dictionary) == "pdfe.dictionary" then
+ a = a .. outputDICT (dictionary)
+ else
+ print("ERROR!? this is not a dictionary!!")
+ end
else
- a = a .. strLIT_STR_BEG .. value .. strLIT_STR_END
+ if hex then
+ a = a .. strHEX_STR_BEG .. value .. strHEX_STR_END
+ else
+ a = a .. strLIT_STR_BEG .. value .. strLIT_STR_END
+ end
end
a = a .. strVALUE_END .. strKV_END
if desttype == 7 then
@@ -1071,35 +1104,35 @@ local function outputENTRY_dest (destcount,name,pagereftonum,destnamestoref,pdfe
a = a .. strARG_BEG .. data[2][2] .. strARG_END
a = a .. strKVS_BEG
if data[2][2] == constDEST_XYZ then
- if data[3][2] then
+ if data[3] and data[3][2] then
a = a .. strKV_BEG .. constKEY_DEST_X .. strVALUE_BEG .. data[3][2] .. strVALUE_END .. strKV_END
else
a = a .. strKV_BEG .. constKEY_DEST_X .. strVALUE_BEG .. mediabox[1] .. strVALUE_END .. strKV_END
end
- if data[4][2] then
+ if data[4] and data[4][2] then
a = a .. strKV_BEG .. constKEY_DEST_Y .. strVALUE_BEG .. data[4][2] .. strVALUE_END .. strKV_END
else
a = a .. strKV_BEG .. constKEY_DEST_X .. strVALUE_BEG .. mediabox[4] .. strVALUE_END .. strKV_END
end
- if data[5][2] then
+ if data[5] and data[5][2] then
a = a .. strKV_BEG .. constKEY_DEST_ZOOM .. strVALUE_BEG .. data[5][2] .. strVALUE_END .. strKV_END
end
elseif data[2][2] == constDEST_FIT then -- nothing to do
elseif data[2][2] == constDEST_FITB then -- nothing to do
elseif data[2][2] == constDEST_FITH then
- if data[3][2] then
+ if data[3] and data[3][2] then
a = a .. strKV_BEG .. constKEY_DEST_Y .. strVALUE_BEG .. data[3][2] .. strVALUE_END .. strKV_END
end
elseif data[2][2] == constDEST_FITBH then
- if data[3][2] then
+ if data[3] and data[3][2] then
a = a .. strKV_BEG .. constKEY_DEST_Y .. strVALUE_BEG .. data[3][2] .. strVALUE_END .. strKV_END
end
elseif data[2][2] == constDEST_FITV then
- if data[3][2] then
+ if data[3] and data[3][2] then
a = a .. strKV_BEG .. constKEY_DEST_X .. strVALUE_BEG .. data[3][2] .. strVALUE_END .. strKV_END
end
elseif data[2][2] == constDEST_FITBV then
- if data[3][2] then
+ if data[3] and data[3][2] then
a = a .. strKV_BEG .. constKEY_DEST_X .. strVALUE_BEG .. data[3][2] .. strVALUE_END .. strKV_END
end
elseif data[2][2] == constDEST_FITR and data[6] then
diff --git a/macros/latex/contrib/newpax/newpax.ins b/macros/latex/contrib/newpax/newpax.ins
index 62ec48b0c9..ccce1d73c0 100644
--- a/macros/latex/contrib/newpax/newpax.ins
+++ b/macros/latex/contrib/newpax/newpax.ins
@@ -2,7 +2,7 @@
File: newpax.ins
-Copyright (C) 2021 Ulrike Fischer
+Copyright (C) 2021,2022 Ulrike Fischer
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -34,7 +34,7 @@ for those people who are interested.
\let\MetaPrefix\relax
\preamble
-Copyright (C) 2021 Ulrike Fischer
+Copyright (C) 2021,2022 Ulrike Fischer
It may be distributed and/or modified under the conditions of
the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/macros/latex/contrib/newpax/newpax.pdf b/macros/latex/contrib/newpax/newpax.pdf
index d5a4ce65c0..fe3b9831a2 100644
--- a/macros/latex/contrib/newpax/newpax.pdf
+++ b/macros/latex/contrib/newpax/newpax.pdf
@@ -1,7 +1,7 @@
%PDF-1.7
%
7 0 obj
-<< /Length 12182 >>
+<< /Length 12146 >>
stream
/opacity1 gs
0 g 0 G
@@ -17,30 +17,30 @@ stream
0 g 0 G
0 g 0 G
BT
-/F54 20.66252 Tf
-1 0 0 1 168.673 714.049 Tm [<0068003F0032>]TJ
+/F46 20.66252 Tf
+1 0 0 1 168.394 714.049 Tm [<0068003F0032>]TJ
-/F55 20.66252 Tf
-1 0 0 1 213.552 714.049 Tm [<004D003200720054001C0074>]TJ
+/F47 20.66252 Tf
+1 0 0 1 213.273 714.049 Tm [<004D003200720054001C0074>]TJ
0 g 0 G
-/F54 20.66252 Tf
-1 0 0 1 286.222 714.049 Tm [<0054001C002B0046001C003B0032002D>-367<00700079005800380052>]TJ
+/F46 20.66252 Tf
+1 0 0 1 285.943 714.049 Tm [<0054001C002B0046001C003B0032002D>-367<0070007900580038006B>]TJ
0 g 0 G
0 g 0 G
-/F54 11.95517 Tf
+/F46 11.95517 Tf
1 0 0 1 172.204 694.646 Tm [<005F00320042004D00620032006000690042004D003B>-367<001C004D004D00510069001C006900420051004D0062>-367<003700600051004B>-367<0042004D002B0048006D002F0032002F>-367<0054>-31<002F0037>-367<007D00480032>]TJ
0 g 0 G
-/F57 14.3462 Tf
+/F49 14.3462 Tf
1 0 0 1 252.361 665.805 Tm [<0036>12<004D0053>-8<004A004C0046>-225<0027>10<004A00540044004900460053>]TJ
-/F57 12.95146 Tf
+/F49 12.95146 Tf
1 0 0 1 342.914 666.569 Tm [<000B>]TJ
-/F57 14.3462 Tf
-1 0 0 1 261.794 636.963 Tm [<0013001100130012000E00110014000E00110018>]TJ
+/F49 14.3462 Tf
+1 0 0 1 261.794 636.963 Tm [<0013001100130013000E00110017000E00130018>]TJ
0 g 0 G
-/F54 14.3462 Tf
+/F46 14.3462 Tf
1 0 0 1 74.008 559.773 Tm [<0052>-500<0041004D006900600051>-31<002F006D002B006900420051004D>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.014 0 0 1 74.409 527.155 Tm [<002D004A004F004C0054>-221<004A004F>-222<0042>-222<003100250027>-222<00420053>19<0046>-221<00440053>19<00460042005500460045>-220<0058004A00550049>-222<0042004F004F0050005500420055004A0050004F>-222<00500043004B0046004400550054>19<000F>-295<0034>23<005600440049>-221<0042004F>-221<00500043004B004600440055>-222<004A0054>-222<004F00500055>-222<00440050004F004F00460044005500460045>-222<00550050>-222<005500490046>]TJ
0.985 0 0 1 74.409 513.605 Tm [<00440050004F00550046004F0055>-229<00500053>-230<0055004600590055000D>-230<004300560055>-229<0054004A004E0051004D005A>-230<00450046005400440053>-8<004A004300460054>-230<0042004F>-229<00090053>19<0046004400550042004F00480056004D00420053000A>-228<00420053>19<00460042>-228<0050004F>-230<005500490046>-230<0051004200480046>-229<0042004F0045>-230<00450046056D004F00460054>-229<0042004F>-230<004200440055004A0050004F>]TJ
0.98 0 0 1 74.409 500.056 Tm [<004A0047>-226<005500490046>-226<004400560053005400500053>-226<004A0054>-226<004A004F>-226<005500490046>-227<00420053>20<00460042000F>-304<003500490046>-226<0044005000500053>20<0045004A004F0042005500460054>-226<00500047>-226<005500490046>-226<00420053>20<00460042>-225<00420053>20<0046>-226<0048004A0057>5<0046004F>-226<004A004F>-226<0042004300540050004D005600550046>-226<0051004200480046>-226<0044005000500053>20<0045004A004F0042005500460054>20<000F>]TJ
@@ -48,82 +48,81 @@ BT
1.02 0 0 1 74.409 472.958 Tm [<0034>24<005600440049>-265<0045004600540055004A004F00420055004A0050004F>-265<00420053>19<0046>-264<00500043004B0046004400550054>-265<00450046005400440053>-8<004A0043004A004F0048>-265<0042>-265<0051004200480046>-266<0042004F0045>-265<00540050004E0046>-265<004A004F005400550053>-8<005600440055004A0050004F0054>-265<00490050>29<0058>-264<00550050>-265<0045004A00540051004D0042005A>-265<005500490046>]TJ
1 0 0 1 74.409 459.409 Tm [<00510042004800460443004200480042004A004F>-225<00560054004A004F0048>-225<0042004300540050004D005600550046>-225<0044005000500053>20<0045004A004F0042005500460054>20<000F>]TJ
0.98 0 0 1 73.897 439.085 Tm [<003800490046004F>-153<0042>-153<003100250027>-153<004A0054>-153<004A004F0044004D0056004500460045>-153<004A004F>-153<0042004F00500055004900460053>-153<0031002500270443004E0042005A>-153<004A0055>-153<00430046>-153<0058004A00550049>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 338.225 439.085 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B0062>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.98 0 0 1 431.498 439.085 Tm [<00500053>-153<0058004A00550049>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 466.587 439.085 Tm [<00240042004D002B0048006D002F00320054002F0037>]TJ
-/F57 10.90909 Tf
-0.98 0 0 1 529.587 439.085 Tm [<0442005500490046>]TJ
-1.006 0 0 1 74.409 425.536 Tm [<0042004F004F0050005500420055004A0050004F>-225<0044005000500053>19<0045004A004F0042005500460054>-224<004F0050>-225<004D0050004F004800460053>-225<004E0042004C0046>-225<00540046004F00540046>-225<00420054>-226<005500490046005A>-225<00450050004F>81<0445>76<0055>-225<0053>20<0046004700460053>-224<00550050>-226<005500490046>-225<0053>20<004600440046004A0057004A004F0048>-225<0051004200480046>-225<00090042004F0045>]TJ
-0.98 0 0 1 74.409 411.987 Tm [<0050004700550046004F>-200<005500490046>-201<004200440055004A0050004F>-201<00500047>-200<0042004F>-201<0042004F004F0050005500420055004A0050004F>-200<0045005000460054004F>82<0445>78<0055>-200<004E0042004C0046>-200<00540046004F00540046>-201<0046004A0055004900460053000A000D>-207<00540050>-200<0042004D004D>-201<0035>103<00460039000E0046004F0048004A004F00460054>-199<0042004F0045>-201<004300420044004C0046004F00450054>]TJ
-1.011 0 0 1 74.409 398.437 Tm [<005400550053>-8<004A0051>-223<005500490046004E>-223<004200580042005A>-223<005800490046004F>-224<004A004F0044004D00560045004A004F0048>-223<0042>-223<003100250027001B>-224<005500490046>-223<004F00460055>-223<0046056C004600440055>-223<004A0054>-224<0055004900420055>-223<00460059005500460053>-8<004F0042004D>-223<0042004F0045>-223<004A004F005500460053>-8<004F0042004D>-223<004D004A004F004C0054>-224<00420053>20<0046>]TJ
-1 0 0 1 74.409 384.888 Tm [<004D005000540055000F>]TJ
+/F49 10.90909 Tf
+1 0 0 1 72.773 425.536 Tm [<0443005500490046>-226<0042004F004F0050005500420055004A0050004F>-227<0044005000500053>19<0045004A004F0042005500460054>-225<004F0050>-227<004D0050004F004800460053>-226<004E0042004C0046>-227<00540046004F00540046>-227<00420054>-226<005500490046005A>-227<00450050004F>81<0445>76<0055>-225<0053>19<0046004700460053>-225<00550050>-227<005500490046>-227<0053>20<004600440046004A0057004A004F0048>-226<0051004200480046>]TJ
+1.02 0 0 1 74.028 411.987 Tm [<00090042004F0045>-243<0050004700550046004F>-244<005500490046>-244<004200440055004A0050004F>-244<00500047>-244<0042004F>-243<0042004F004F0050005500420055004A0050004F>-244<0045005000460054004F>79<0445>75<0055>-243<004E0042004C0046>-244<00540046004F00540046>-244<0046004A0055004900460053000A000D>-249<00540050>-244<0042004D004D>-244<0035>99<00460039000E0046004F0048004A004F00460054>-243<0042004F0045>]TJ
+0.997 0 0 1 74.409 398.437 Tm [<004300420044004C0046004F00450054>-225<005400550053>-9<004A0051>-225<005500490046004E>-226<004200580042005A>-226<005800490046004F>-226<004A004F0044004D00560045004A004F0048>-226<0042>-225<003100250027001B>-226<005500490046>-226<004F00460055>-226<0046056C004600440055>-226<004A0054>-225<0055004900420055>-226<00460059005500460053>-8<004F0042004D>-226<0042004F0045>-226<004A004F005500460053>-8<004F0042004D>]TJ
+1 0 0 1 74.409 384.888 Tm [<004D004A004F004C0054>-225<00420053>20<0046>-225<004D005000540055000F>]TJ
1.02 0 0 1 74.071 364.564 Tm [<003500490046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 95.987 364.564 Tm [<0054001C0074>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 115.701 364.564 Tm [<005100420044004C004200480046>-227<00470053>5<0050004E>-227<0029>29<0046004A004C0050>-226<0030004300460053>19<0045004A0046004C>-227<0050056C004600530054>-227<0042>-228<00540050004D00560055004A0050004F>-228<004700500053>-227<00550049004A0054>-228<00510053>5<00500043004D0046004E001B>-307<004A0055>-227<0046005900550053>9<0042004400550054>-227<0042004D004D>-227<005500490046>]TJ
0.98 0 0 1 74.409 351.015 Tm [<0042004F004F0050005500420055004A0050004F0054>-159<0042004F0045>-160<0045004600540055004A004F00420055004A0050004F0054>-160<00500047>-160<005500490046>-159<004A004F0044004D0056004500460045>-160<003100250027>-160<004A004F>-159<0042>-160<0055004600590055>-160<056D004D0046>20<000D>-173<0045005000460054>-160<00540050004E0046>-159<0044004D00460057>4<00460053>-159<0053>20<004600440042004D00440056004D00420055004A0050004F0054>]TJ
1.02 0 0 1 74.409 337.466 Tm [<00500047>-298<005500490046004A0053>-299<0044005000500053>19<0045004A004F0042005500460054>-298<0042004F0045>-299<0053>19<0046004A004F005400460053>-7<00550054>-299<005500490046004E000F>-528<003500490046>-299<005100420044004C004200480046>-298<005800500053>5<004C0054>-298<004300420054004A00440042004D004D005A>-299<056D004F0046>-298<004300560055>-299<004900420054>-299<0042>-299<004700460058>]TJ
1.012 0 0 1 74.409 323.917 Tm [<00450053>10<00420058004300420044004C0054001B>-298<0035>100<0050>-222<00440050004D004D004600440055>-224<005500490046>-223<0042004F004F0050005500420055004A0050004F>-223<0050004F0046>-224<004900420054>-223<00550050>-223<0053>-8<0056004F>-223<0042004F>-224<00460059005500460053>-8<004F0042004D>-223<004B00420057>5<0042>-222<00510053>5<005000480053>10<0042004E>-222<00580049004A00440049>-224<0053>20<0046004D004A00460054>]TJ
1 0 0 1 74.409 310.368 Tm [<0050004F>-225<0042004F>-225<004F0050>30<0058>-225<00500056005500450042005500460045>-225<004D004A00430053>10<00420053>-18<005A>85<000D>-225<0042004F0045>-225<004A0055>-225<005800500053>6<004C0054>-225<0050004F004D005A>-225<0058004A00550049>-225<005100450047002D>]TJ
-/F57 7.63636 Tf
+/F49 7.63636 Tf
1 0 0 1 342.511 312.632 Tm [<0022>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1 0 0 1 345.724 310.368 Tm [<0035>]TJ
1 0 0 1 350.68 307.695 Tm [<0026>]TJ
1 0 0 1 355.927 310.368 Tm [<0039000F>]TJ
1.016 0 0 1 74.071 290.044 Tm [<003500490046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 95.822 290.044 Tm [<004D003200720054001C0074>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.016 0 0 1 132.629 290.044 Tm [<00550053>-8<004A00460054>-220<00550050>-221<0042004500450053>20<004600540054>-220<00550049004600540046>-220<00510053>5<00500043004D0046004E0054>20<000F>-294<002A>23<0055>-220<0050056C004600530054>-220<0042>-220<004D00560042>-221<005400440053>-8<004A00510055>-220<00550050>-221<0046005900550053>9<004200440055>-219<005500490046>-221<0042004F004F0050005500420055004A0050004F0054>19<000F>]TJ
0.982 0 0 1 74.071 276.495 Tm [<003500490046>-229<005400440053>-8<004A00510055>-230<00440042004F>-229<00430046>-230<0056005400460045>-230<0058004A00550049>-229<004D005600420009004D0042000A005500460059>-230<0042004F0045>-229<004F0050>-230<00460059005500460053>-8<004F0042004D>-229<005500500050004D0054>-230<00420053>20<0046>-229<004F00460046004500460045000F>-306<003500490046>-230<0042004F004F0050005500420055004A0050004F0054>-230<00440042004F>]TJ
0.989 0 0 1 74.409 262.945 Tm [<005500490046004F>-228<00430046>-228<0053>20<0046004A004F005400460053>-8<005500460045>-228<0046004A0055004900460053>-228<0058004A00550049>-228<005500490046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 239.425 262.945 Tm [<0054001C00740058006200690076>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.989 0 0 1 281.977 262.945 Tm [<00500053>-228<0058004A00550049>-228<005500490046>-228<004F00460058>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 360.248 262.945 Tm [<004D003200720054001C00740058006200690076>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.989 0 0 1 419.983 262.945 Tm [<00580049005000540046>-228<0044005000450046>-228<00430042005400460045>-228<004A004F>]TJ
1.02 0 0 1 74.409 249.396 Tm [<004D00420053>6<00480046>-229<005100420053>-8<00550054>-229<0050004F>-230<005500490046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 164.6 249.396 Tm [<0054001C0074>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 184.333 249.396 Tm [<005100420044004C004200480046001B>-311<004A0055>-230<0056005400460054>-229<004A00550054>-229<0045004200550042>-230<005400550053>-8<00560044005500560053>20<0046>-229<0042004F0045>-229<005500490046>-230<00500053>-8<004A0048004A004F0042004D>-229<0044005000450046>-229<00550050>-230<00440042004D00440056004D004200550046>]TJ
1.02 0 0 1 74.409 235.847 Tm [<005500490046>-231<0044005000500053>19<0045004A004F0042005500460054>-230<00090058004A00550049>-231<0042>-231<004700460058>-231<004E004A004F00500053>-231<004300560048>-231<0044005000530053>19<004600440055004A0050004F0054000A000D>-233<004300560055>-231<005500490046>-231<005100450047002D>]TJ
-/F57 7.63636 Tf
+/F49 7.63636 Tf
1 0 0 1 392.713 238.112 Tm [<0022>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 395.926 235.847 Tm [<0035>]TJ
1 0 0 1 401.017 233.174 Tm [<0026>]TJ
1.02 0 0 1 406.264 235.847 Tm [<0039>-231<00510053>-8<004A004E004A0055004A0057>4<00460054>-230<004900420057>4<0046>-230<004300460046004F>]TJ
1 0 0 1 74.409 222.298 Tm [<0053>20<00460051004D0042004400460045>-225<0043>25<005A>-225<00440050004E004E0042004F00450054>-225<00470053>5<0050004E>-225<005500490046>-225<004F00460058>-226<002D>]TJ
-/F57 7.63636 Tf
+/F49 7.63636 Tf
1 0 0 1 262.081 224.562 Tm [<0022>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1 0 0 1 265.294 222.298 Tm [<0035>]TJ
1 0 0 1 270.25 219.625 Tm [<0026>]TJ
1 0 0 1 275.497 222.298 Tm [<0039>-225<003100250027>-226<004E0042004F004200480046004E0046004F0055>-225<004A004F>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 389.139 222.298 Tm [<0054002F0037004B001C004D001C003B0032004B0032004D0069004000690032006200690054003F001C00620032>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1 0 0 1 74.409 208.749 Tm [<00540050>-225<004A0055>-225<0054004900500056004D0045>-225<005800500053>6<004C0054>-225<0058004A00550049>-225<0042004D004D>-225<004E0042004B00500053>-225<0046004F0048004A004F00460054>-225<0042004F0045>-225<004300420044004C0046004F00450054>-225<00090058004A00550049>-225<005500490046>-225<00460059>12<0044004600510055004A0050004F>-225<00500047>-225<00450057004A00510054000A000F>]TJ
0 g 0 G
ET
@@ -132,16 +131,16 @@ q
[] 0 d 0 J 0.398 w 0 0 m 178.58 0 l S
Q
BT
-/F57 7.77088 Tf
+/F49 7.77088 Tf
1 0 0 1 79.672 138.208 Tm [<000B>]TJ
-/F57 8.96638 Tf
+/F49 8.96638 Tf
1 0 0 1 83.376 137.619 Tm [<056D00540044004900460053002100550053>6<005000560043004D004600540049005000500055004A004F0048000E005500460059000F00450046>]TJ
0 g 0 G
0 g 0 G
0 g 0 G
0 g 0 G
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1 0 0 1 294.747 93.476 Tm [<0012>]TJ
0 g 0 G
0 g 0 G
@@ -166,7 +165,7 @@ endobj
<< /D [ 5 0 R /XYZ 74.409 584.308 null ] >>
endobj
6 0 obj
-<< /ExtGState 1 0 R /Font << /F54 10 0 R /F55 11 0 R /F57 12 0 R /F36 14 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /ExtGState 1 0 R /Font << /F46 10 0 R /F47 11 0 R /F49 12 0 R /F28 14 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
18 0 obj
<< /Length 13328 >>
@@ -182,14 +181,14 @@ stream
0 g 0 G
0 g 0 G
BT
-/F54 14.3462 Tf
+/F46 14.3462 Tf
1 0 0 1 74.409 760.773 Tm [<006B>-500<005A006D0042002B0046>-367<006D00620032>-367<0042004D006200690060006D002B006900420051004D0062>]TJ
0 g 0 G
0 g 0 G
-/F54 11.95517 Tf
+/F46 11.95517 Tf
1 0 0 1 74.409 727.757 Tm [<006B00580052>-500<0061006900320054>-367<0052002C>-489<0032007400690060001C002B0069>-367<001C004D002F>-367<002B0051004800480032002B0069>-367<0069003F0032>-367<001C004D004D00510069001C006900420051004D0062>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 74.071 699.415 Tm [<003500490046>-290<004D00560042>-290<005400440053>-8<004A00510055>-290<0050056C004600530054>-291<0042>-290<00470056004F00440055004A0050004F>-290<00580049004A00440049>-290<00550042004C0046>-291<00420054>-290<00420053>5<00480056004E0046004F0055>-289<005500490046>-291<004F0042004E0046>-290<00500047>-290<0042>-290<003100250027>-290<00090058004A00550049005000560055>-291<005500490046>]TJ
0.99 0 0 1 74.409 685.865 Tm [<0046005900550046004F0054004A0050004F000A000F>-302<003500490046>-227<00470056004F00440055004A0050004F>-227<00440042004F>-227<00430046>-227<0056005400460045>-226<004A004F>-227<00540050004E0046>-227<004D00560042>-227<005400440053>-8<004A005100550054>-227<004300560055>-226<0042004D00540050>-227<004A004F>-227<0042>-227<0045005000440056004E0046004F0055>-226<00580049004A00440049>-227<005500490046004F>]TJ
1 0 0 1 74.409 672.316 Tm [<004E005600540055>-225<00430046>-225<00440050004E0051004A004D00460045>-225<0058004A00550049>-225<004D00560042004D0042005500460059000F>]TJ
@@ -199,14 +198,14 @@ BT
0 g 0 G
1 0 0 1 262.98 649.801 Tm [<004500500044000E0046005900550053>10<004200440055000E004F00460058005100420059000F005500460059>]TJ
0 g 0 G
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 74.409 633.263 Tm [<0024>]TJ
-/F55 10.90909 Tf
+/F47 10.90909 Tf
1 0 0 1 80.137 633.263 Tm [<002F0051002B006D004B0032004D0069002B0048001C00620062>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 154.591 633.263 Tm [<0026001C006000690042002B004800320027>]TJ
0 0.5 0 rg 0 0.5 0 RG
-/F55 10.90909 Tf
+/F47 10.90909 Tf
1 0 0 1 74.409 619.714 Tm [<0057>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
@@ -229,10 +228,10 @@ BT
0 0.5 0 rg 0 0.5 0 RG
1 0 0 1 160.319 619.714 Tm [<002B0051002F0032>]TJ
0 g 0 G
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 74.409 606.164 Tm [<0024002F004200600032002B00690048006D001C002600600032005B006D0042006000320055005D004D003200720054001C0074005D00560027>]TJ
0 0.5 0 rg 0 0.5 0 RG
-/F55 10.90909 Tf
+/F47 10.90909 Tf
1 0 0 1 74.409 592.615 Tm [<0057>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
@@ -269,102 +268,102 @@ BT
0 0.5 0 rg 0 0.5 0 RG
1 0 0 1 263.409 592.615 Tm [<006200690076>]TJ
0 g 0 G
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 74.409 579.066 Tm [<0024002F004200600032002B00690048006D001C>]TJ
1 0 0 1 84.228 565.517 Tm [<0026>]TJ
1 0 0 1 94.046 551.968 Tm [<004D003200720054001C0074005800720060004200690032004D003200720054001C00740055005D002F0051002B00400042004D0054006D00690052005D0056>]TJ
1 0 0 1 94.046 538.418 Tm [<004D003200720054001C0074005800720060004200690032004D003200720054001C00740055005D002F0051002B00400042004D0054006D0069006B005D0056>]TJ
1 0 0 1 84.228 524.869 Tm [<0027>]TJ
1 0 0 1 74.409 511.32 Tm [<0024>]TJ
-/F55 10.90909 Tf
+/F47 10.90909 Tf
1 0 0 1 80.137 511.32 Tm [<00230032003B0042004D>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 108.773 511.32 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
1 0 0 1 74.409 497.771 Tm [<0024>]TJ
-/F55 10.90909 Tf
+/F47 10.90909 Tf
1 0 0 1 80.137 497.771 Tm [<0032004D002F>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 97.319 497.771 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
0 g 0 G
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1 0 0 1 74.409 471.469 Tm [<0033>12<0056004F004F004A004F0048>-225<00550049004A0054>-225<0045005000440056004E0046004F0055>-225<0058004A004D004D>-225<00440053>20<0046004200550046>-225<005500490046>-225<056D004D00460054>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 287.322 471.469 Tm [<002F0051002B00400042004D0054006D006900520058004D003200720054001C0074>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1 0 0 1 387.14 471.469 Tm [<0042004F0045>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 408.577 471.469 Tm [<002F0051002B00400042004D0054006D0069006B0058004D003200720054001C0074>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1 0 0 1 505.94 471.469 Tm [<000F>]TJ
0.993 0 0 1 74.071 451.146 Tm [<0035>102<0050>-225<056D004F0045>-226<005500490046>-226<00480053>9<004200510049004A00440054>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 173.206 451.146 Tm [<00460054001C0069003F00620032001C>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.993 0 0 1 221.473 451.146 Tm [<004A0054>-226<0056005400460045000F>-302<00350049004A0054>-226<004E00460042004F0054>-226<0055004900420055>-226<00480053>10<004200510049004A00440054>-226<004A004F>-226<005500460059004E0047>-226<00550053>20<004600460054>-225<0058004A004D004D>-226<005800500053>5<004C>-225<0042004F0045>]TJ
0.98 0 0 1 74.409 437.596 Tm [<005A>6<00500056>-224<00440042004F>-225<0042004D00540050>-225<005600540046>-225<00510042005500490054>-225<00550050>-225<0045004A0053>20<00460044005500500053>-7<004A00460054>9<000D>-225<004300560055>-225<0054004600550055004A004F00480054>-225<004A004F>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 324.833 437.596 Tm [<0024003B0060001C0054003F0042002B00620054001C0069003F>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.98 0 0 1 401.692 437.596 Tm [<00420053>20<0046>-224<004A0048004F00500053>20<00460045000F>-303<003500490046>-225<004F00460058005100420059>]TJ
1 0 0 1 74.409 424.047 Tm [<056D004D0046>-225<004A0054>-225<0044005600530053>20<0046004F0055004D005A>-224<00580053>-9<004A005500550046004F>-225<004A004F00550050>-225<005500490046>-225<0044005600530053>20<0046004F0055>-224<0045004A0053>19<00460044005500500053>-17<005A>86<000D>-225<00580049004A00440049>-225<004E00460042004F0054>-225<0055004900420055>-225<00480053>9<004200510049004A00440054>-224<0058004A00550049>-225<005500490046>-225<00540042004E0046>]TJ
0.993 0 0 1 74.409 410.498 Tm [<004F0042004E0046>-226<004A004F>-226<0045004A056C00460053>19<0046004F0055>-226<004D0050004400420055004A0050004F0054>-226<00580050004F>81<0445>77<0055>-225<005800500053>5<004C>-226<004600420054004A004D005A>-226<00090058004A00550049>-226<004D00560042004D0042005500460059>-227<005A>5<00500056>-225<004400500056004D0045>-227<00440053>20<0046004200550046>-225<005500490046>-227<004F00460058005100420059>-226<056D004D0046>]TJ
1.02 0 0 1 74.409 396.949 Tm [<004A004F>-233<005500490046>-234<0045005000440056004E0046004F0055>-233<004B005600540055>-234<00430046004700500053>19<0046>-233<004A0055>-233<004A0054>-234<004F00460046004500460045000A000F>-333<002D0042005500460053>-234<0057>4<004600530054004A0050004F0054>-232<00500047>-234<005500490046>-234<005100420044004C004200480046>-233<0058004A004D004D>-234<00510053>5<0050004300420043004D005A>-232<004200450045>]TJ
1 0 0 1 74.409 383.4 Tm [<00540050004E0046>-225<005000510055004A0050004F0054>-225<004700500053>-225<00550049004A0054>-225<0044004200540046>20<000D>-225<004300560055>-225<004700500053>-225<004F0050>30<0058>-225<005600540046>-225<00420055>-225<0043004600540055>-225<0045004A00540055004A004F00440055>-225<056D004D0046>-225<004F0042004E00460054>20<000F>]TJ
0 g 0 G
-/F54 11.95517 Tf
+/F46 11.95517 Tf
1 0 0 1 74.409 345.305 Tm [<006B0058006B>-500<0061006900320054>-367<006B002C>-489<006C00620042004D003B>-367<0069003F0032>]TJ
-/F55 11.95517 Tf
+/F47 11.95517 Tf
1 0 0 1 199.56 345.305 Tm [<0058004D003200720054001C0074>]TJ
-/F54 11.95517 Tf
+/F46 11.95517 Tf
1 0 0 1 243.495 345.305 Tm [<0040007D00480032>-367<007200420069003F>]TJ
-/F55 11.95517 Tf
+/F47 11.95517 Tf
1 0 0 1 296.325 345.305 Tm [<004D003200720054001C0074>]TJ
0 g 0 G
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 74.071 316.963 Tm [<003500490046>-230<005100420044004C004200480046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 139.842 316.963 Tm [<004D003200720054001C0074>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 176.769 316.963 Tm [<004A0054>-230<00430042005400460045>-230<0050004F>-231<005500490046>-230<005100420044004C004200480046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 298.244 316.963 Tm [<0054001C0074>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 317.99 316.963 Tm [<004300560055>-230<0046005900550046004F00450054>-230<004A0055>-231<004A004F>-230<0057>5<00420053>-7<004A005000560054>-230<00580042005A>94<000F>-323<002A>23<0055>-229<004A0054>-231<00540055004A004D004D>-230<0042004F>]TJ
0.98 0 0 1 74.409 303.413 Tm [<00460059005100460053>-8<004A004E0046004F00550042004D>-165<005100420044004C004200480046>20<000D>-177<0042004F0045>-165<004A0055>-165<0053>20<004600520056004A0053>21<00460054>-164<005500490046>-165<004F00460058>-165<002D>]TJ
-/F57 7.63636 Tf
+/F49 7.63636 Tf
1 0 0 1 296.373 305.678 Tm [<0022>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.98 0 0 1 299.586 303.413 Tm [<0035>]TJ
1 0 0 1 304.406 300.741 Tm [<0026>]TJ
0.98 0 0 1 309.654 303.413 Tm [<0039>-164<003100250027>-165<004E0042004F004200480046004E0046004F0055>-165<0044005000450046>-165<004A004F>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 443.553 303.413 Tm [<0054002F0037004B001C004D001C003B0032004B0032004D00690040>]TJ
1 0 0 1 74.409 289.864 Tm [<00690032006200690054003F001C00620032>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.994 0 0 1 128.409 289.864 Tm [<005100420044004C004200480046>20<000F>-301<00350049004A0054>-226<004F00460058>-226<0044005000450046>-227<004A0054044300420054>-226<005500490046>-226<004F0042004E0046>-226<004A004E0051004D004A0046005404430044005600530053>19<0046004F0055004D005A>-225<004A004F>-226<005500490046>-227<005500460054005500510049004200540046>-226<0042004F0045>]TJ
-/F89 10.90909 Tf
+/F81 10.90909 Tf
1 0 0 1 74.409 276.315 Tm [<004F00500055>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1 0 0 1 94.471 276.315 Tm [<00440050004E005100420055004A0043004D0046>-225<0058004A00550049>-225<00460057>5<00460053>-18<005A>-225<005100420044004C0042004800460002>]TJ
1 0 0 1 74.071 255.991 Tm [<003500490046>-225<00470050004D004D0050>30<0058004A004F0048>-225<004D004A00540055004A004F0048>-225<005400490050>30<00580054>-225<00490050>30<0058>-225<00550050>-225<005600540046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 264.86 255.991 Tm [<004D003200720054001C0074>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1 0 0 1 299.224 255.991 Tm [<000F>]TJ
0 g 0 G
1 0 0 1 91.766 232.679 Tm [<044C>]TJ
@@ -380,7 +379,7 @@ BT
0 g 0 G
1 0 0 1 91.766 151.383 Tm [<044C>]TJ
0 g 0 G
-0.98 0 0 1 101.682 151.383 Tm [<003A>93<00500056>-216<00440042004F>-217<004400490050005000540046>-218<004700500053>-217<00460057>4<00460053>-17<005A>-218<056D004D0046>-217<004A0047>-217<004300500053>19<004500460053>-216<00440050004D00500053>-217<0042004F0045>-217<00540055005A004D00460054>-218<00500047>-217<004D004A004F004C0054>-217<00420053>20<0046>-216<00550042004C0046004F>-218<00470053>6<0050004E>-217<005500490046>-217<0054005000560053>20<00440046>]TJ
+0.98 0 0 1 101.366 151.383 Tm [<003A>93<00500056>-218<00440042004F>-219<004400490050005000540046>-219<004700500053>-219<00460057>5<00460053>-18<005A>-219<056D004D0046>-219<004A0047>-219<004300500053>19<004500460053>-218<00440050004D00500053>-219<0042004F0045>-219<00540055005A004D00460054>-219<00500047>-219<004D004A004F004C0054>-219<00420053>20<0046>-218<00550042004C0046004F>-219<00470053>6<0050004E>-218<005500490046>-219<0054005000560053>20<00440046>]TJ
1 0 0 1 101.682 137.834 Tm [<003100250027>-225<00500053>-225<00470053>6<0050004E>-225<005500490046>-225<0049005A0051004600530053>20<00460047>-225<0054004600550055004A004F00480054>20<000F>-300<0023>12<00560055>-225<005A>6<00500056>-225<00440042004F>80<0445>75<0055>-225<00420045004B005600540055>-225<00500053>-225<004400490042004F00480046>-225<00440050004D00500053>20<00460045>-225<004D004A004F004C0054>20<000F>]TJ
0 g 0 G
0 g 0 G
@@ -449,10 +448,10 @@ endobj
<< /D [ 17 0 R /XYZ 74.409 363.518 null ] >>
endobj
16 0 obj
-<< /ExtGState 1 0 R /Font << /F54 10 0 R /F57 12 0 R /F36 14 0 R /F55 11 0 R /F89 35 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /ExtGState 1 0 R /Font << /F46 10 0 R /F49 12 0 R /F28 14 0 R /F47 11 0 R /F81 35 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
38 0 obj
-<< /Length 11037 >>
+<< /Length 12664 >>
stream
/opacity1 gs
0 g 0 G
@@ -465,15 +464,15 @@ stream
0 g 0 G
0 g 0 G
BT
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1 0 0 1 91.766 760.773 Tm [<044C>]TJ
0 g 0 G
-1 0 0 1 101.682 760.773 Tm [<003A>90<00500056>-225<00440042004F>-225<004200450045>-225<004200450045004A0055004A0050004F0042004D>-225<0054004600550055004A004F00480054>-225<00550050>-225<005500490046>-225<0042004F004F0050005500420055004A0050004F0054>10<000D>-225<004700500053>-225<004600590042004E0051004D0046>-225<0042004F>]TJ
-/F36 10.90909 Tf
-1 0 0 1 429.467 760.773 Tm [<00660036>]TJ
-/F57 10.90909 Tf
-1 0 0 1 443.377 760.773 Tm [<056E00420048000D>-225<0058004A00550049>]TJ
-/F36 10.90909 Tf
+1 0 0 1 101.366 760.773 Tm [<003A>90<00500056>-225<00440042004F>-225<004200450045>-225<004200450045004A0055004A0050004F0042004D>-225<0054004600550055004A004F00480054>-225<00550050>-225<005500490046>-225<0042004F004F0050005500420055004A0050004F0054>10<000D>-225<004700500053>-225<004600590042004E0051004D0046>-225<0042004F>]TJ
+/F28 10.90909 Tf
+1 0 0 1 429.151 760.773 Tm [<00660036>]TJ
+/F49 10.90909 Tf
+1 0 0 1 443.06 760.773 Tm [<056E00420048000D>-225<0058004A00550049>]TJ
+/F28 10.90909 Tf
1 0 0 1 101.682 741.987 Tm [<0024003100740054004800610076004D0069001C00740050004D>]TJ
1 0 0 1 101.682 728.438 Tm [<00240054002F0037001C004D004D00510069006E002F0042002B0069006E0054006D0069002C004D004D004D>-525<002600480042004D00460066006C005F00410027002600360027002600390027>]TJ
1 0 0 1 101.682 714.889 Tm [<0024003100740054004800610076004D0069001C0074005000370037>]TJ
@@ -481,37 +480,114 @@ BT
0 g 0 G
0 g 0 G
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1 0 0 1 224.263 685.628 Tm [<002D004A00540055004A004F0048>-225<0013001B>]TJ
0 g 0 G
1 0 0 1 271.325 685.628 Tm [<004500500044000E005600540046000E004F00460058005100420059000F005500460059>]TJ
0 g 0 G
-/F36 10.90909 Tf
-1 0 0 1 74.409 655.911 Tm [<0024005F0032005B006D0042006000320053001C002B0046001C003B003200260054002F0037004B001C004D001C003B0032004B0032004D0069004000690032006200690054003F001C006200320027>]TJ
-1 0 0 1 74.409 642.362 Tm [<0024002E0032002B0048001C00600032002E0051002B006D004B0032004D0069004A00320069001C002F001C0069001C0026006D004D002B0051004B005400600032006200620027>]TJ
+0 0.5 0 rg 0 0.5 0 RG
+/F47 10.90909 Tf
+1 0 0 1 74.409 669.46 Tm [<0057>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 85.864 669.46 Tm [<0068003F0032>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 108.773 669.46 Tm [<004D003200740069>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 137.409 669.46 Tm [<002B0051004B004B001C004D002F>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 183.228 669.46 Tm [<004D00320032002F0062>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 217.591 669.46 Tm [<0047001C006800320073>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 251.955 669.46 Tm [<006B0079006B006B004000790065004000790052002D>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 320.682 669.46 Tm [<003700510060>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 343.591 669.46 Tm [<00510048002F00320060>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 377.955 669.46 Tm [<003700510060004B001C00690062>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 423.773 669.46 Tm [<006200320032>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 446.682 669.46 Tm [<002F0051002B006D004B0032004D0069001C006900420051004D>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 74.409 655.911 Tm [<0057>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 85.864 655.911 Tm [<00510037>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 103.046 655.911 Tm [<0054002F0037004B001C004D001C003B0032004B0032004D0069>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 177.5 655.911 Tm [<0040>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 183.228 655.911 Tm [<00690032006200690054003F001C00620032>]TJ
+0 g 0 G
+/F28 10.90909 Tf
+1 0 0 1 74.409 642.362 Tm [<0024002E0051002B006D004B0032004D0069004A00320069001C002F001C0069001C0026006D004D002B0051004B005400600032006200620027>]TJ
1 0 0 1 74.409 628.812 Tm [<0024>]TJ
-/F55 10.90909 Tf
+/F47 10.90909 Tf
1 0 0 1 80.137 628.812 Tm [<002F0051002B006D004B0032004D0069002B0048001C00620062>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 154.591 628.812 Tm [<0026001C006000690042002B004800320027>]TJ
1 0 0 1 74.409 601.714 Tm [<0024>]TJ
-/F55 10.90909 Tf
+/F47 10.90909 Tf
1 0 0 1 80.137 601.714 Tm [<006D006200320054001C002B0046001C003B0032>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 137.409 601.714 Tm [<00260054002F00370054001C003B00320062002D0074002B00510048005100600027>]TJ
1 0 0 1 74.409 574.616 Tm [<0024>]TJ
-/F55 10.90909 Tf
+/F47 10.90909 Tf
1 0 0 1 80.137 574.616 Tm [<006D006200320054001C002B0046001C003B0032>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 137.409 574.616 Tm [<0026003F00760054003200600060003200370027>]TJ
1 0 0 1 74.409 561.066 Tm [<0024003F0076005400320060006200320069006D0054002600480042004D0046002300510060002F00320060002B0051004800510060003400230048006D00320027>]TJ
1 0 0 1 74.409 533.968 Tm [<0024>]TJ
-/F55 10.90909 Tf
+/F47 10.90909 Tf
1 0 0 1 80.137 533.968 Tm [<006D006200320054001C002B0046001C003B0032>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 137.409 533.968 Tm [<0026004D003200720054001C00740027>]TJ
0 0.5 0 rg 0 0.5 0 RG
-/F55 10.90909 Tf
+/F47 10.90909 Tf
1 0 0 1 74.409 506.87 Tm [<0057>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
@@ -588,17 +664,17 @@ BT
0 0.5 0 rg 0 0.5 0 RG
1 0 0 1 177.5 493.32 Tm [<002B00510048005100600062>]TJ
0 g 0 G
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 74.409 479.771 Tm [<0024004D003200720054001C0074006200320069006D00540026006D006200320037004200480032001C00690069006000420023006D006900320062003400690060006D00320027>]TJ
1 0 0 1 74.409 452.673 Tm [<0024>]TJ
-/F55 10.90909 Tf
+/F47 10.90909 Tf
1 0 0 1 80.137 452.673 Tm [<00230032003B0042004D>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 108.773 452.673 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
1 0 0 1 74.409 425.574 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B006200280062002B001C004800320034007900580038002D006900600042004B00340039002B004B>-525<00520038002B004B>-525<0033002B004B>-525<006A002B004B002D002B004800420054002D0054001C003B00320034005200290026002F0051002B00400042004D0054006D006900520027>]TJ
1 0 0 1 74.409 412.025 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B006200280062002B001C004800320034007900580038002D006900600042004B00340038002B004B>-525<00520038002B004B>-525<0033002B004B>-525<006A002B004B002D002B004800420054002D0054001C003B00320034006B00290026002F0051002B00400042004D0054006D006900520027>]TJ
0 0.5 0 rg 0 0.5 0 RG
-/F55 10.90909 Tf
+/F47 10.90909 Tf
1 0 0 1 74.409 384.927 Tm [<0057>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
@@ -649,12 +725,12 @@ BT
0 0.5 0 rg 0 0.5 0 RG
1 0 0 1 326.409 384.927 Tm [<006900720042002B0032>]TJ
0 g 0 G
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 74.409 371.378 Tm [<0024004D003200720054001C0074006200320069006D00540026002F0032006200690062006D0037003700420074003400220027>]TJ
1 0 0 1 74.409 357.829 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B006200280062002B001C004800320034007900580038002D006900600042004B00340039002B004B>-525<00520038002B004B>-525<0033002B004B>-525<006A002B004B002D002B004800420054002D0054001C003B00320034005200290026002F0051002B00400042004D0054006D006900520027>]TJ
1 0 0 1 74.409 344.279 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B006200280062002B001C004800320034007900580038002D006900600042004B00340038002B004B>-525<00520038002B004B>-525<0033002B004B>-525<006A002B004B002D002B004800420054002D0054001C003B00320034006B00290026002F0051002B00400042004D0054006D006900520027>]TJ
0 0.5 0 rg 0 0.5 0 RG
-/F55 10.90909 Tf
+/F47 10.90909 Tf
1 0 0 1 74.409 317.181 Tm [<0057>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
@@ -682,11 +758,11 @@ BT
0 0.5 0 rg 0 0.5 0 RG
1 0 0 1 217.591 317.181 Tm [<001C004D004D00510069001C006900420051004D0062>]TJ
0 g 0 G
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 74.409 303.632 Tm [<0024004D003200720054001C0074006200320069006D00540026001C002F002F001C004D004D00510069006200340037001C0048006200320027>]TJ
1 0 0 1 74.409 290.083 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B006200280062002B001C004800320034007900580038002D006900600042004B00340039002B004B>-525<00520038002B004B>-525<0033002B004B>-525<006A002B004B002D002B004800420054002D0054001C003B00320034005200290026002F0051002B00400042004D0054006D006900520027>]TJ
0 0.5 0 rg 0 0.5 0 RG
-/F55 10.90909 Tf
+/F47 10.90909 Tf
1 0 0 1 74.409 262.984 Tm [<0057>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
@@ -721,28 +797,28 @@ BT
0 0.5 0 rg 0 0.5 0 RG
1 0 0 1 234.773 262.984 Tm [<001C00690069006000420023006D006900320062>]TJ
0 g 0 G
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 74.409 249.435 Tm [<0024004D003200720054001C0074006200320069006D00540026001C002F002F001C004D004D005100690062003400690060006D0032002D006D006200320037004200480032001C00690069006000420023006D00690032006200340037001C0048006200320027>]TJ
1 0 0 1 74.409 235.886 Tm [<00240042004D002B0048006D002F00320054002F003700280054001C003B003200620034004000290026002F0051002B00400042004D0054006D0069006B0027>]TJ
1 0 0 1 74.409 222.337 Tm [<0024>]TJ
-/F55 10.90909 Tf
+/F47 10.90909 Tf
1 0 0 1 80.137 222.337 Tm [<0032004D002F>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 97.319 222.337 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
0 g 0 G
0 g 0 G
0 g 0 G
-/F54 11.95517 Tf
+/F46 11.95517 Tf
1 0 0 1 74.409 179.402 Tm [<006B0058006A>-500<002A0051004B00230042004D0042004D003B>-367<0069003F0032>-367<00620069003200540062>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.986 0 0 1 73.897 151.06 Tm [<003800490046004F>-229<00560054004A004F0048>-229<004D00560042004D0042005500460059>-229<0043005000550049>-229<0054005500460051>-229<00440042004F>-230<00430046>-229<0054004A004E0051004D005A>-229<004A004F>-229<005500490046>-229<00540042004E0046>-229<0045005000440056004E0046004F0055000F>-308<0038>10<004A00550049>-228<00500055004900460053>-230<0046004F0048004A004F00460054>-229<005A>6<00500056>]TJ
1 0 0 1 74.409 137.51 Tm [<00440042004F>-225<005600540046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 114.162 137.51 Tm [<004200370048006D001C006900320074>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1 0 0 1 159.98 137.51 Tm [<000F>]TJ
0 g 0 G
0 g 0 G
@@ -886,7 +962,7 @@ endobj
<< /D [ 37 0 R /XYZ 74.409 196.059 null ] >>
endobj
36 0 obj
-<< /ExtGState 1 0 R /Font << /F57 12 0 R /F36 14 0 R /F55 11 0 R /F54 10 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /ExtGState 1 0 R /Font << /F49 12 0 R /F28 14 0 R /F47 11 0 R /F46 10 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
82 0 obj
<< /Length 11751 >>
@@ -902,17 +978,17 @@ stream
0 g 0 G
0 g 0 G
BT
-/F54 14.3462 Tf
+/F46 14.3462 Tf
1 0 0 1 74.409 760.773 Tm [<006A>-500<006100320069006D0054>-367<00510054006900420051004D0062>]TJ
0 g 0 G
0 g 0 G
0 g 0 G
0 g 0 G
0 0.2 0.6 rg 0 0.2 0.6 RG
-/F55 10.90909 Tf
+/F47 10.90909 Tf
1 0 0 1 88.706 713.098 Tm [<0024004D003200720054001C0074006200320069006D0054>]TJ
0 g 0 G
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 157.433 713.098 Tm [<002600460032007600400070001C0048>-525<00510054006900420051004D>-525<00480042006200690027>]TJ
0 g 0 G
0 g 0 G
@@ -935,52 +1011,52 @@ q
Q
0 g 0 G
BT
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1 0 0 1 74.071 677.028 Tm [<00350049004A0054>-225<00440050004E004E0042004F0045>-225<0042004D004D0050>30<00580054>-225<00550050>-225<004400490042004F00480046>-225<005500490046>-225<00430046004900420057004A005000560053>-225<004A004F0044004D00560054004A0050004F000F>-300<002A>24<0055>-225<004C004F0050>30<00580054>-225<005500490046>-225<00470050004D004D0050>30<0058004A004F0048>-225<004C0046005A0054001B>]TJ
0 g 0 G
0 0.4 0.9 rg 0 0.4 0.9 RG
-/F55 10.90909 Tf
+/F47 10.90909 Tf
1 0 0 1 74.409 653.716 Tm [<006D006200320037004200480032001C00690069006000420023006D006900320062>]TJ
0 g 0 G
0 g 0 G
-/F57 10.90909 Tf
-1.007 0 0 1 177.228 653.716 Tm [<00350049004A0054>-224<004A0054>-224<0042>-224<004300500050004D00460042004F>-224<004C0046005A>96<000F>-299<002A>5<0047>-223<005400460055>-224<00550050>-224<00550053>-8<00560046>19<000D>-223<005500490046>-224<0053>19<0046004A004F005400460053>-7<005500460045>-224<0042004F004F0050005500420055004A0050004F0054>-224<0058004A004D004D>-224<005600540046>]TJ
+/F49 10.90909 Tf
+1.008 0 0 1 176.889 653.716 Tm [<00350049004A0054>-224<004A0054>-223<0042>-224<004300500050004D00460042004F>-224<004C0046005A>95<000F>-299<002A>5<0047>-223<005400460055>-224<00550050>-224<00550053>-8<00560046>19<000D>-223<005500490046>-224<0053>20<0046004A004F005400460053>-8<005500460045>-224<0042004F004F0050005500420055004A0050004F0054>-224<0058004A004D004D>-224<005600540046>]TJ
0.98 0 0 1 101.682 640.167 Tm [<005500490046>-226<004D004A004F004C004300500053>19<004500460053>-226<0054004600550055004A004F00480054>-227<000900440050004D00500053>-227<0042004F0045>-227<00540055005A004D0046000A>-227<00500047>-226<005500490046>-227<004A004F0044004D0056004500460045>-227<056D004D0046>20<000D>-227<004A0047>-227<005400460055>-227<00550050>-227<00470042004D00540046>20<000D>-226<005500490046>-227<0054004600550055004A004F00480054>-227<00500047>]TJ
1 0 0 1 101.682 626.617 Tm [<005500490046>-225<0053>20<004600440046004A0057004A004F0048>-225<003100250027>-225<0058004A004D004D>-225<00550042004C0046>-225<00510053>20<004600440046004F00450046004F00440046>20<000F>]TJ
0 g 0 G
0 0.4 0.9 rg 0 0.4 0.9 RG
-/F55 10.90909 Tf
+/F47 10.90909 Tf
1 0 0 1 74.409 606.294 Tm [<002F0032006200690062006D0037003700420074>]TJ
0 g 0 G
0 g 0 G
-/F57 10.90909 Tf
-0.991 0 0 1 137.137 606.294 Tm [<00350049004A0054>-226<0042004D004D0050>30<00580054>-226<00550050>-227<004200450045>-226<0042>-227<00540056056F0059>-226<00550050>-227<005500490046>-227<0045004600540055004A004F00420055004A0050004F>-226<004F0042004E00460054>19<000F>-301<00350049004A0054>-227<004A0054>-227<004F00460046004500460045>-226<004A0047>-227<0042>-227<056D004D0046>-226<0058004A00550049>]TJ
+/F49 10.90909 Tf
+0.992 0 0 1 136.799 606.294 Tm [<00350049004A0054>-226<0042004D004D0050>30<00580054>-225<00550050>-227<004200450045>-226<0042>-226<00540056056F0059>-227<00550050>-226<005500490046>-226<0045004600540055004A004F00420055004A0050004F>-227<004F0042004E00460054>20<000F>-302<00350049004A0054>-226<004A0054>-226<004F00460046004500460045>-227<004A0047>-226<0042>-226<056D004D0046>-227<0058004A00550049>]TJ
1 0 0 1 101.682 592.744 Tm [<0045004600540055004A004F00420055004A0050004F0054>-225<004A0054>-225<004A004F0044004D0056004500460045>-225<004E00500053>20<0046>-225<005500490042004F>-225<0050004F00440046>20<000D>-225<00550050>-225<00420057>5<0050004A0045>-225<00550050>-225<004800460055>-225<004E0056004D0055004A0051004D0046>-225<0045004600540055004A004F00420055004A0050004F0054>20<000F>]TJ
0 g 0 G
0 0.4 0.9 rg 0 0.4 0.9 RG
-/F55 10.90909 Tf
+/F47 10.90909 Tf
1 0 0 1 74.409 572.421 Tm [<001C002F002F001C004D004D005100690062>]TJ
0 g 0 G
0 g 0 G
-/F57 10.90909 Tf
-1.02 0 0 1 131.409 572.421 Tm [<00350049004A0054>-220<004A0054>-221<0042>-220<004300500050004D00460042004F>-221<004C0046005A>95<000F>-294<002A>23<0055>-219<0042004D004D0050>29<00580054>-220<00550050>-220<00540058004A005500440049>-221<0050004F>-220<0042004F0045>-221<0050056C>-220<005500490046>-220<0053>19<0046004A004F005400460053>-7<0055004A004F0048>-221<00500047>-220<005500490046>-221<0042004F004F0050000E>]TJ
+/F49 10.90909 Tf
+1.02 0 0 1 131.071 572.421 Tm [<00350049004A0054>-222<004A0054>-222<0042>-222<004300500050004D00460042004F>-222<004C0046005A>94<000F>-298<002A>23<0055>-221<0042004D004D0050>29<00580054>-222<00550050>-222<00540058004A005500440049>-222<0050004F>-222<0042004F0045>-222<0050056C>-223<005500490046>-222<0053>19<0046004A004F005400460053>-7<0055004A004F0048>-222<00500047>-222<005500490046>-222<0042004F004F0050000E>]TJ
1.012 0 0 1 101.682 558.871 Tm [<005500420055004A0050004F0054>20<000F>-297<003800490046004F>-223<005400460055>-223<00550050>-222<00470042004D00540046>-223<004A0055>-223<0042004D00540050>-222<00540056005100510053>19<004600540054>-222<005800420053>-8<004F004A004F00480054>-223<004A004F>-223<005500490046>-222<004D00500048>-223<004A0047>-223<005500490046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 432.882 558.871 Tm [<0058004D003200720054001C0074>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.012 0 0 1 475.431 558.871 Tm [<056D004D0046>-222<004A0054>-223<004F00500055>]TJ
1 0 0 1 101.682 545.322 Tm [<004700500056004F0045000F>-300<002A>24<0055>-225<004A0054>-225<0053>20<004600440050004E004E0046004F004500460045>-225<00550050>-225<005400460055>-225<004A0055>-225<00550050>-225<00470042004D00540046>-225<004700500053>-225<00480053>10<004200510049004A00440054>-225<00580049004A00440049>-225<00450050004F>80<0445>75<0055>-225<004900420057>5<0046>-225<004D004A004F004C0054>20<000F>]TJ
0 g 0 G
-/F54 14.3462 Tf
+/F46 14.3462 Tf
1 0 0 1 74.008 501.906 Tm [<0039>-500<004A0051>31<00600032>-367<0022001C002B0046003B00600051006D004D002F>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.999 0 0 1 74.409 469.287 Tm [<0024004D004A0044004C00420043004D0046>-226<004D004A004F004C0054>-226<004A004F>-226<0042>-227<003100250027>-226<00420053>20<0046>-226<0050004F0046>-226<004600590042004E0051004D0046>-226<00500047>-226<0042004F>-227<0042004F004F0050005500420055004A0050004F000F>-303<0022004F004F0050005500420055004A0050004F0054>-226<00420053>19<0046>-225<00420053>19<004600420054>-225<0050004F>-227<0042>-226<0051004200480046>]TJ
1.017 0 0 1 73.995 455.738 Tm [<00580049004A00440049>-221<00420053>19<0046>-221<00420054005400500044004A0042005500460045>-221<0058004A00550049>-222<0042004F>-221<004200440055004A0050004F000F>-296<0022>-222<0055005A0051004A00440042004D>-221<0042004F004F0050005500420055004A0050004F>-222<00500043004B004600440055>-221<004400500056004D0045>-222<004D00500050004C>-221<004D004A004C0046>-222<00550049004A0054>-221<004A004F>-222<005500490046>]TJ
1 0 0 1 74.409 442.189 Tm [<003100250027001B>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 74.409 422.662 Tm [<00520038>-525<0079>-525<005100230044>]TJ
1 0 0 1 74.409 409.113 Tm [<00490049>]TJ
1 0 0 1 74.409 395.564 Tm [<00660068007600540032>-525<0066001B004D004D00510069>]TJ
@@ -992,40 +1068,40 @@ BT
1 0 0 1 74.409 314.269 Tm [<0032004D002F005100230044>]TJ
0 g 0 G
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.994 0 0 1 74.071 287.967 Tm [<00350049004A0054>-227<004A0054>-227<0042004F>-227<00500043004B004600440055>-227<00500047>-227<0055005A00510046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 191.872 287.967 Tm [<001B004D004D00510069>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.994 0 0 1 222.971 287.967 Tm [<0042004F0045>-227<0054005600430055005A00510046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 285.931 287.967 Tm [<00470042004D0046>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.994 0 0 1 308.84 287.967 Tm [<000F>-304<003500490046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 336.363 287.967 Tm [<0066005F0032002B0069>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.994 0 0 1 367.462 287.967 Tm [<0057>6<0042004D00560046>-226<00450046005400440053>-9<004A004300460054>-227<005500490046>-227<0053>20<0046004400550042004F0048004D0046>-226<00500047>]TJ
1.013 0 0 1 74.409 274.418 Tm [<00550049004A0054>-222<0042004F004F0050005500420055004A0050004F000F>-296<003500490046>-223<0044005000500053>19<0045004A004F0042005500460054>-221<00420053>19<0046>-221<0042004300540050004D005600550046>-223<0044005000500053>19<0045004A004F0042005500460054>-221<0053>19<0046004D0042005500460045>-221<00550050>-223<005500490046>-222<0044005600530053>19<0046004F0055>-221<0051004200480046>19<000F>-295<002A>23<0055>-222<004A0054>]TJ
0.984 0 0 1 74.409 260.869 Tm [<004A004E005100500053>-8<00550042004F0055>-229<00550050>-229<0056004F004500460053005400550042004F0045>-228<0055004900420055>-229<0042004F>-229<0042004F004F0050005500420055004A0050004F>-229<004A0054>-229<004F00500055>-229<00440050004F004F00460044005500460045>-229<00550050>-229<00540050004E0046>-229<0051004200480046>-229<00440050004F00550046004F0055>-229<004300560055>-229<0050004F004D005A>]TJ
0.98 0 0 1 74.409 247.32 Tm [<00550050>-213<0042>-214<004D0050004400420055004A0050004F0002>-301<003500490046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 160.75 247.32 Tm [<0066002200510060002F00320060>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.98 0 0 1 203.126 247.32 Tm [<0054004600550055004A004F0048>-213<0042004F0045>-214<005500490046>-214<00500055004900460053>-214<0057>6<0042004D005600460054>-213<004A004F>-214<00550049004A0054>-213<004D004A004F0046>-214<00450046005400440053>-9<004A00430046>-213<005500490046>-214<004D00500050004C>-214<0042004F0045>-214<00440050004D00500053>]TJ
0.981 0 0 1 74.409 233.771 Tm [<00500047>-229<0042004F004F0050005500420055004A0050004F000F>-306<003500490046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 167.553 233.771 Tm [<0066001B>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.981 0 0 1 181.462 233.771 Tm [<0057>6<0042004D00560046>-229<00440050004F00550042004A004F0054>-229<005500490046>-229<004200440055004A0050004F000D>-230<004A004F>-229<00550049004A0054>-229<0044004200540046>-230<004A0055>-229<004A0054>-230<0042004F>-229<00560053004D>-229<00550050>-230<0042004F>-229<00460059005500460053>-8<004F0042004D>-229<0058>5<004600430054004A00550046>21<000F>]TJ
1 0 0 1 74.071 213.447 Tm [<0035>100<0050>-225<0447>50<0053>20<0046004200440055004A0057>6<004200550046>60<0448>-225<005500490046>-225<0042004F004F0050005500420055004A0050004F0054>-225<00500047>-225<0042004F>-225<004A004F0044004D0056004500460045>-225<005100450047>-225<0050004F0046>-225<004900420054>-225<00550050>-225<00450050>-225<0042>-225<004F0056004E004300460053>-225<00500047>-225<005500420054004C0054>20<000F>]TJ
0 g 0 G
1 0 0 1 91.766 193.123 Tm [<044C>]TJ
0 g 0 G
1.012 0 0 1 101.682 193.123 Tm [<0030>5<004F0046>-222<004E005600540055>]TJ
-/F89 10.90909 Tf
+/F81 10.90909 Tf
1.012 0 0 1 152.957 193.123 Tm [<0053>26<004600550053004A00460057>6<0046>-222<0042004F0045>-223<0054005500500053>26<0046>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.012 0 0 1 240.183 193.123 Tm [<005500490046>-222<0042004F004F0050005500420055004A0050004F0054>-223<00500047>-223<005500490046>-222<004A004F0044004D0056004500460045>-223<005100450047000F>-298<0027>35<00500053>-221<004D004A004F004C0054>-223<00550050>-223<00460059005500460053>-8<004F0042004D>]TJ
1.02 0 0 1 101.682 179.574 Tm [<00560053004D>10<0445>110<0054>-238<00550049004A0054>-238<0053>19<004600520056004A0053>20<00460054>-237<00550050>-238<056D004F0045>-238<0050004F004D005A>-238<0050004F0046>-238<00500043004B004600440055>-238<004D004A004C0046>-238<005500490046>-238<0050004F0046>-238<005400490050>29<0058004F>-237<004200430050>29<0057>5<0046>20<000F>-346<0023>11<00560055>-237<0046>19<000F0048000F>-345<004A004F005500460053>-8<004F0042004D>]TJ
1 0 0 1 101.682 166.025 Tm [<004D004A004F004C0054>-225<00510050004A004F0055>-225<00550050>-225<0045004600540055004A004F00420055004A0050004F>-225<00500043004B0046004400550054>-225<0042004F0045>-225<00550049004600540046>-225<004E005600540055>-225<00430046>-225<004700500056004F0045>-225<005500500050>40<000F>]TJ
@@ -1090,7 +1166,7 @@ endobj
<< /D [ 81 0 R /XYZ 74.409 327.818 null ] >>
endobj
80 0 obj
-<< /ExtGState 1 0 R /Font << /F54 10 0 R /F55 11 0 R /F36 14 0 R /F57 12 0 R /F89 35 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /ExtGState 1 0 R /Font << /F46 10 0 R /F47 11 0 R /F28 14 0 R /F49 12 0 R /F81 35 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
99 0 obj
<< /Length 15847 >>
@@ -1106,13 +1182,13 @@ stream
0 g 0 G
0 g 0 G
BT
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1 0 0 1 91.766 760.773 Tm [<044C>]TJ
0 g 0 G
1.02 0 0 1 101.682 760.773 Tm [<0030>5<004F0046>-220<004E005600540055>]TJ
-/F89 10.90909 Tf
+/F81 10.90909 Tf
1.02 0 0 1 153.314 760.773 Tm [<0053>26<004600440042004D00440056004D004200550046>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 210.61 760.773 Tm [<005500490046>-220<0053>19<0046004400550042004F0048004D0046>-220<0044005000500053>19<0045004A004F0042005500460054>-220<00550050>-220<056D0055>-221<00550050>-220<005500490046>-221<0044005000500053>19<0045004A004F004200550046>-220<0054005A005400550046004E>-220<00500047>-221<005500490046>]TJ
0.99 0 0 1 101.682 747.224 Tm [<005500420053>6<004800460055>-228<0051004200480046001B>-305<00420054>-229<005500490046>-228<004A004F0044004D0056004500460045>-228<005100450047>-229<00440042004F>-228<00430046>-229<0051004D0042004400460045>-228<00420055>-228<0057>5<00420053>-7<004A005000560054>-229<005100500054004A0055004A0050004F0054>10<000D>-228<005400440042004D00460045000D>-229<0053>6<005000550042005500460045>-228<0042004F0045>]TJ
1.02 0 0 1 101.682 733.675 Tm [<00460057>5<0046004F>-255<0044004D004A0051005100460045>-255<00550049004A0054>-255<004A0054>-255<004F00500055>-255<0042004F>-255<004600420054005A>-255<005500420054004C000F>-397<0025>5<004600540055004A004F00420055004A0050004F0054>-254<004900420057>4<0046>-254<0053>19<0046004400550042004F0048004D00460054>-254<005500500050>-255<0055004900420055>-255<004E005600540055>-255<00430046>]TJ
@@ -1121,22 +1197,22 @@ BT
1 0 0 1 91.766 699.802 Tm [<044C>]TJ
0 g 0 G
1.02 0 0 1 101.682 699.802 Tm [<0030>5<004F0046>-243<004E005600540055>]TJ
-/F89 10.90909 Tf
+/F81 10.90909 Tf
1.02 0 0 1 153.831 699.802 Tm [<0053>26<0046004A004F005400460053>-8<0055>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 195.185 699.802 Tm [<005500490046>-243<0042004F004F0050005500420055004A0050004F>-244<0042004F0045>-244<0053>19<0046004D0042005500460045>-243<00500043004B0046004400550054>19<000F>-362<00350049004A0054>-244<004900420054>-244<00550050>-244<00550042004C0046>-244<004A004F00550050>-243<00420044004400500056004F0055>]TJ
1 0 0 1 101.682 686.253 Tm [<0055004900420055>-226<0042>-226<005100450047>-227<004A0054>-226<005100460053>-6<0049004200510054>-226<004F00500055>-227<004A004F0044004D0056004500460045>-226<00440050004E0051004D004600550046004D005A>86<000D>-226<0042>-227<004D004A004F004C>-226<0054004900500056004D0045004F>81<0445>76<0055>-225<00510050004A004F0055>-227<00550050>-226<0042>-226<004E004A00540054004A004F0048>-227<0051004200480046>]TJ
1.006 0 0 1 101.682 672.704 Tm [<00500053>-223<0042>-223<0044004D004A0051005100460045>-223<0042004F004F0050005500420055004A0050004F000F>-298<002A>23<0055>-222<0042004D00540050>-224<004900420054>-223<00550050>-223<00550042004C0046>-224<004A004F00550050>-223<00420044004400500056004F0055>-223<0055004900420055>-223<0042>-224<005100450047>-223<004A0054>-223<005100460053>-6<0049004200510054>-223<004A004F005400460053>-9<005500460045>]TJ
1 0 0 1 101.682 659.154 Tm [<004E00500053>20<0046>-225<005500490042004F>-225<0050004F00440046>-225<00500053>-225<004A004F>-225<00540055004600510054>20<000F>]TJ
0 g 0 G
-/F54 11.95517 Tf
+/F46 11.95517 Tf
1 0 0 1 74.075 621.162 Tm [<003900580052>-500<005F0032006900600042003200700042004D003B>-367<001C004D002F>-367<006200690051>31<00600042004D003B>-367<001C004D004D00510069001C006900420051004D0062>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 74.071 592.82 Tm [<00350049004600500053>20<00460055004A00440042004D004D005A>-295<0050004F0046>-296<00440042004F>-296<00450050>-295<004A0055>-296<004E0042004F00560042004D004D005A>-10<001B>-444<0036>39<004F00440050004E00510053>20<004600540054>-295<005500490046>-296<003100250027>-295<000900500053>-296<005800490046004F>-296<00560054004A004F0048>-295<002D>]TJ
-/F57 7.63636 Tf
+/F49 7.63636 Tf
1 0 0 1 463.212 595.085 Tm [<0022>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 466.425 592.82 Tm [<0035>]TJ
1 0 0 1 471.516 590.147 Tm [<0026>]TJ
1.02 0 0 1 476.764 592.82 Tm [<0039000D>-314<00440053>19<0046004200550046>]TJ
@@ -1144,26 +1220,26 @@ BT
1 0 0 1 74.409 565.722 Tm [<0031>12<0053>10<004200440055004A00440042004D004D005A>-225<0050004F0046>-225<004F0042005500560053>10<0042004D004D005A>-225<00580042004F0055>-225<00540050004E0046>-225<005500500050004D000F>]TJ
0.98 0 0 1 74.071 545.398 Tm [<003500490046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 94.331 545.398 Tm [<0054001C0074>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.98 0 0 1 113.149 545.398 Tm [<005100420044004C004200480046>-153<00470053>6<0050004E>-152<0029>30<0046004A004C0050>-152<0030004300460053>20<0045004A0046004C>-153<00440050004F0054004A005400550054>-153<00500047>-153<0042>-153<005100460053004D>-153<005400440053>-8<004A00510055>-153<0042004F0045>-153<0042>-153<004B00420057>5<0042000E004B00420053>-152<056D004D0046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 447.043 545.398 Tm [<0053002E0036001B004D004D005100690031007400690060001C002B006900510060>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.988 0 0 1 73.995 531.849 Tm [<00580049004A00440049>-226<00440042004F>-227<0046005900550053>10<004200440055>-226<005500490046>-227<004F0046004400460054005400420053>-18<005A>-227<00500043004B0046004400550054>20<000F>-303<002A>24<0055>-226<00580053>-8<004A005500460054>-227<005500490046>-226<004A004F004700500053>-8<004E00420055004A0050004F>-227<00550050>-227<0042>-226<056D004D0046>-227<0058004A00550049>-227<005500490046>-226<0046005900550046004F0054004A0050004F>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 74.409 518.3 Tm [<0054001C0074>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.984 0 0 1 91.591 518.3 Tm [<000F>-304<003800490046004F>-228<004A0055>-227<004900420054>-228<004300460046004F>-228<005400560044004400460054005400470056004D004D005A>-227<004A004F005400550042004D004D00460045>-228<004A0055>-228<005800500053>6<004C0054>-227<00520056004A00550046>-228<056D004F0046>20<000F>-304<0031>12<0053>6<00500043004D0046004E0054>-227<0058004A00550049>-227<00550049004A0054>-228<0042005100510053>5<0050004200440049>]TJ
1 0 0 1 74.409 504.75 Tm [<00420053>20<0046>]TJ
0 g 0 G
1 0 0 1 91.766 484.427 Tm [<044C>]TJ
0 g 0 G
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 101.682 484.427 Tm [<0053002E0036001B004D004D005100690031007400690060001C002B006900510060>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.98 0 0 1 200.923 484.427 Tm [<0053>20<004600520056004A0053>21<00460054>-174<0042004F>-176<00460059005500460053>-8<004F0042004D000D>-187<0050004D0045>-175<0057>4<004600530054004A0050004F>-174<00500047>-176<005500490046>-176<004B00420057>6<0042>-175<004D004A00430053>10<00420053>-18<005A>-176<00500047>-175<00310025002700430050>17<0059>-174<00580049004A00440049>]TJ
1 0 0 1 101.682 470.877 Tm [<004E005600540055>-225<00430046>-225<004A004F005400550042004D004D00460045>-225<004E0042004F00560042004D004D005A>-10<001C>]TJ
0 g 0 G
@@ -1176,92 +1252,92 @@ BT
1 0 0 1 101.682 430.23 Tm [<004A0055>-225<004A0054>-225<004F00500055>-225<0046005900550046004F0054004A0043004D0046>20<000F>]TJ
1.02 0 0 1 74.071 409.906 Tm [<003500490046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 96.366 409.906 Tm [<004D003200720054001C0074>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 133.641 409.906 Tm [<005100420044004C004200480046>-261<00440050004E00460054>-262<0058004A00550049>-261<0042>-262<004D00560042000E056D004D0046>19<000F>-416<002A>23<0055>-261<0056005400460054>-262<005500490046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 345.167 409.906 Tm [<0054002F00370032>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 370.987 409.906 Tm [<004D004A00430053>10<00420053>-18<005A>-261<0046004E004300460045004500460045>-262<004A004F>-261<004D00560042005500460059>-262<00550050>]TJ
1.02 0 0 1 74.409 396.357 Tm [<0046005900550053>10<004200440055>-268<005500490046>-269<0042004F004F0050005500420055004A0050004F0054>-268<0042004F0045>-269<00500055004900460053>-268<004F00460046004500460045>-269<004A004F004700500053>-7<004E00420055004A0050004F000F>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 356.427 396.357 Tm [<004D003200720054001C0074>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 393.778 396.357 Tm [<00580053>-8<004A005500460054>-268<005500490046>-269<004A004F004700500053>-7<004E00420055004A0050004F>-269<00550050>]TJ
1.02 0 0 1 74.409 382.808 Tm [<0042>-251<056D004D0046>-251<0058004A00550049>-251<005500490046>-251<0046005900550046004F0054004A0050004F>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 197.444 382.808 Tm [<0054001C0074>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 217.422 382.808 Tm [<00500053>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 230.966 382.808 Tm [<004D003200720054001C0074>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 265.329 382.808 Tm [<000F>-386<003500490046>-251<00440050004F00550046004F0055>-251<00500047>-251<005500490046>-251<056D004D00460054>-252<004A0054>-251<0009004F004600420053004D005A000A>-251<004A00450046004F0055004A00440042004D>-251<00550050>-251<005500490046>]TJ
0.98 0 0 1 74.409 369.258 Tm [<00440050004F00550046004F0055>-214<00500047>-214<005500490046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 144.078 369.258 Tm [<0054001C0074>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.98 0 0 1 161.259 369.258 Tm [<000E056D004D0046>-214<00580053>-8<004A005500550046004F>-214<0043>25<005A>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 233.882 369.258 Tm [<0053002E0036001B004D004D005100690031007400690060001C002B006900510060>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.98 0 0 1 331.245 369.258 Tm [<000F>-301<003500490046>-214<004D00560042>-214<0044005000450046>-214<005800420054>-214<00580053>-9<004A005500550046004F>-214<0043>25<005A>-213<004D00500050004C004A004F0048>-214<00420055>]TJ
1.005 0 0 1 74.409 355.709 Tm [<004600590042004E0051004D0046>-223<0050005600550051005600550054>-224<00470053>5<0050004E>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 186.689 355.709 Tm [<0053002E0036001B004D004D005100690031007400690060001C002B006900510060>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.005 0 0 1 286.505 355.709 Tm [<0042004F0045>-223<0053>19<004600510053>6<0050004500560044004A004F0048>-223<004A0055>-223<004A004F>-224<004D00560042000F>-299<003500490046>-223<00500053>19<004500460053>-7<004A004F0048>-224<00500047>-224<00540050004E0046>]TJ
0.98 0 0 1 74.409 342.16 Tm [<0046004D0046004E0046004F00550054>-225<004A0054>-225<0042>-225<0043004A0055>-225<0045004A056C00460053>20<0046004F0055>-225<0042004F0045>-225<00540050004E0046>-225<005400550053>-8<004A004F00480054>-225<00420053>20<0046>-225<005000560055005100560055>-225<004A004F>-225<0042>-225<0045004A056C00460053>20<0046004F0055>-225<00580042005A>-225<004300560055>-225<004700500053>-225<005500490046>-225<004600590042004E0051004D00460054>]TJ
1.006 0 0 1 74.409 328.611 Tm [<002A>-223<0056005400460045>-223<005500490046>-224<0053>20<004600540056004D0055004A004F0048>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 171.413 328.611 Tm [<0054001C0074>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.006 0 0 1 188.595 328.611 Tm [<000E056D004D00460054>-223<00440042004F>-223<00430046>-223<0056005400460045>-224<00550050004800460055004900460053>-223<0058004A00550049>-223<005500490046>-224<00500053>-8<004A0048004A004F0042004D>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 404.822 328.611 Tm [<0054001C00740058006200690076>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.006 0 0 1 444.913 328.611 Tm [<000F>-298<0023>12<00560055>-223<004500560046>-223<00550050>-223<005500490046>]TJ
1.02 0 0 1 74.409 315.062 Tm [<0047004200440055>-253<0055004900420055>-254<005500490046>-254<0044005000450046>-254<005800420054>-254<00580053>-8<004A005500550046004F>-254<0058004A00550049005000560055>-254<0053>19<00460042004D>-253<0054005100460044>-254<0054004A004E0051004D005A>-254<0043>24<005A>-253<004D00500050004C004A004F0048>-253<00420055>-254<004600590042004E0051004D00460054>9<000D>-262<004A0055>-253<004A0054>-254<00520056004A00550046>]TJ
0.989 0 0 1 74.409 301.512 Tm [<00510053>6<0050004300420043004D005A>-227<0055004900420055>-228<005500490046>-228<004D00560042>-228<0044005000450046>-228<004A0054>-228<004F00500055>-228<005A>5<00460055>-227<00490042004F0045004D004A004F0048>-228<0042004D004D>-228<00500043004B0046004400550054>-228<00500053>-228<005000510055004A0050004F0054>-228<0055004900420055>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 423.786 301.512 Tm [<0053002E0036001B004D004D005100690031007400690060001C002B006900510060>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1 0 0 1 74.409 287.963 Tm [<0050005600550051005600550054>20<000F>-300<0023>12<00560055>-225<005500490046>-225<0044005000450046>-225<00440042004F>-225<0053>10<00420055004900460053>-225<004600420054004A004D005A>-225<00430046>-225<0046005900550046004F004500460045>-225<005800490046004F>-225<005500490046>-225<004F0046004600450054>-225<00420053>-8<004A005400460054>20<000F>]TJ
1.019 0 0 1 74.071 267.639 Tm [<003500490046>-220<0044005000450046>-221<0042004D00540050>-220<0045005000460054004F>79<0445>75<0055>-220<00490042004F0045004D0046>-220<005400550053>-8<00560044005500560053>19<0046>-220<0046004D0046004E0046004F00550054>9<000D>-220<004F0046004A0055004900460053>-220<00420055>-221<005500490046>-220<00460059005100500053>-8<0055>-221<004F00500053>-221<00420055>-220<005500490046>-221<004A004E005100500053>-8<0055000F>-294<002A>]TJ
0.98 0 0 1 74.409 254.09 Tm [<004900420057>5<0046>-189<005A>5<00460055>-189<004F0050>-189<0053>20<00460042004D>-189<004A004500460042>-190<0058004900420055>-190<005800500056004D0045>-189<00430046>-190<00540046004F0054004A0043004D0046>-190<004900460053>20<0046>-189<00090042004F0045>-189<002A0445>72<004E>-189<00520056004A00550046>-190<005400560053>20<0046>-189<0055004900420055>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 423.786 254.09 Tm [<0053002E0036001B004D004D005100690031007400690060001C002B006900510060>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1 0 0 1 74.409 240.541 Tm [<0045005000460054004F>80<0445>75<0055>-225<00490042004F0045004D0046>-225<00550049004A0054>-225<0046004A0055004900460053>60<000F000A>]TJ
0 g 0 G
-/F54 14.3462 Tf
+/F46 14.3462 Tf
1 0 0 1 74.409 197.227 Tm [<0038>-500<0041004B0054>-31<0051>31<006000690042004D003B>-367<001C004D004D00510069001C006900420051004D0062>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 74.071 164.609 Tm [<003500490046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 96.715 164.609 Tm [<0054001C0074>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 117.157 164.609 Tm [<005100420044004C004200480046>-293<00470053>6<0050004E>-293<0029>30<0046004A004C0050>-293<0030004300460053>20<0045004A0046004C>-293<0045005000460054>-293<005500490046>-293<004900420053>20<0045>-293<005800500053>5<004C>-292<00550050>-293<0053>19<004600440042004D00440056004D004200550046>-292<005500490046>-293<0042004F004F0050005500420055004A0050004F>]TJ
1.02 0 0 1 74.409 151.06 Tm [<0053>20<0046004400550042004F0048004D00460054>-315<0042004F0045>-316<00550050>-316<004500460044004A00450046>-315<00580049004A00440049>-316<0042004F004F0050005500420055004A0050004F>-315<0042004F0045>-316<00580049004A00440049>-316<0045004600540055004A004F00420055004A0050004F>-315<0054004900500056004D0045>-316<00430046>-316<0053>19<0046004A004F005400460053>-7<005500460045000F>]TJ
1.02 0 0 1 74.409 137.51 Tm [<002A>24<0055>-252<0042004D00540050>-253<0051004200550044004900460054>-252<005500490046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 168.853 137.51 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B0062>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 263.3 137.51 Tm [<00440050004E004E0042004F0045>-252<00550050>-253<0042005600550050004E004200550046>-252<00550049004A0054>19<000F>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 408.012 137.51 Tm [<004D003200720054001C0074>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 445.187 137.51 Tm [<0053>20<00460056005400460054>-252<005500490046>-253<004400500053>19<0046>]TJ
0 g 0 G
0 g 0 G
@@ -1291,10 +1367,10 @@ endobj
<< /D [ 98 0 R /XYZ 74.409 220.538 null ] >>
endobj
97 0 obj
-<< /ExtGState 1 0 R /Font << /F57 12 0 R /F89 35 0 R /F54 10 0 R /F36 14 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /ExtGState 1 0 R /Font << /F49 12 0 R /F81 35 0 R /F46 10 0 R /F28 14 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-129 0 obj
-<< /Length 7077 >>
+128 0 obj
+<< /Length 7073 >>
stream
/opacity1 gs
0 g 0 G
@@ -1306,22 +1382,22 @@ stream
0 g 0 G
0 g 0 G
BT
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.983 0 0 1 74.409 760.773 Tm [<00440050004E004E0042004F00450054>-229<00500047>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 143.574 760.773 Tm [<0054001C0074>]TJ
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
0.983 0 0 1 160.756 760.773 Tm [<000F>-306<002A>24<0055>-229<0050004F004D005A>-229<0042004500450054>-229<0042>-230<004F0056004E004300460053>-229<00500047>-230<00540058004A00550044004900460054>-229<0042004F0045>-229<004400490042004F004800460054>-230<00510053>-8<004A004E004A0055004A0057>4<0046>-228<00550050>-230<005400560051005100500053>-8<0055>-229<004E00500053>20<0046>]TJ
1 0 0 1 74.409 747.224 Tm [<0046004F0048004A004F00460054>-225<0042004F0045>-225<004300420044004C0046004F00450054>20<000F>]TJ
0 g 0 G
-/F54 14.3462 Tf
+/F46 14.3462 Tf
1 0 0 1 74.409 703.808 Tm [<0065>-500<00310074001C004B005400480032>-367<0042004D0054006D0069>]TJ
0 g 0 G
0 g 0 G
ET
-1 0 0 1 77.797 511.746 cm
+1 0 0 1 77.797 536.69 cm
q
.5 0 0 .5 0 0 cm
q
@@ -1335,23 +1411,23 @@ Q
0.0 0.0 1.0 rg 0.0 0.0 1.0 RG
0 g 0 G
q
-1 0 0 1 -3.388 169.014 cm
-[] 0 d 0 J 0.398 w 0 0 m 134.334 0 l S
+1 0 0 1 -3.388 144.07 cm
+[] 0 d 0 J 0.398 w 0 0 m 142.696 0 l S
Q
q
-1 0 0 1 -3.188 -3.189 cm
-[] 0 d 0 J 0.398 w 0 0 m 0 172.203 l S
+1 0 0 1 -3.188 -3.188 cm
+[] 0 d 0 J 0.398 w 0 0 m 0 147.258 l S
Q
q
-1 0 0 1 130.747 -3.189 cm
-[] 0 d 0 J 0.398 w 0 0 m 0 172.203 l S
+1 0 0 1 139.109 -3.188 cm
+[] 0 d 0 J 0.398 w 0 0 m 0 147.258 l S
Q
q
-1 0 0 1 -3.388 -3.189 cm
-[] 0 d 0 J 0.398 w 0 0 m 134.334 0 l S
+1 0 0 1 -3.388 -3.188 cm
+[] 0 d 0 J 0.398 w 0 0 m 142.696 0 l S
Q
0 g 0 G
-1 0 0 1 136.788 0 cm
+1 0 0 1 145.15 0 cm
q
.5 0 0 .5 0 0 cm
q
@@ -1367,169 +1443,169 @@ Q
0.0 0.0 1.0 rg 0.0 0.0 1.0 RG
0 g 0 G
q
-1 0 0 1 -3.387 169.014 cm
-[] 0 d 0 J 0.398 w 0 0 m 120.16 0 l S
+1 0 0 1 -3.387 144.07 cm
+[] 0 d 0 J 0.398 w 0 0 m 128.522 0 l S
Q
q
-1 0 0 1 -3.188 -3.189 cm
-[] 0 d 0 J 0.398 w 0 0 m 0 172.203 l S
+1 0 0 1 -3.188 -3.188 cm
+[] 0 d 0 J 0.398 w 0 0 m 0 147.258 l S
Q
q
-1 0 0 1 116.574 -3.189 cm
-[] 0 d 0 J 0.398 w 0 0 m 0 172.203 l S
+1 0 0 1 124.936 -3.188 cm
+[] 0 d 0 J 0.398 w 0 0 m 0 147.258 l S
Q
q
-1 0 0 1 -3.387 -3.189 cm
-[] 0 d 0 J 0.398 w 0 0 m 120.16 0 l S
+1 0 0 1 -3.387 -3.188 cm
+[] 0 d 0 J 0.398 w 0 0 m 128.522 0 l S
Q
-1 0 0 1 -214.585 -511.746 cm
+1 0 0 1 -222.947 -536.69 cm
BT
-/F57 10.90909 Tf
-1 0 0 1 74.409 491.422 Tm [<0024004900460044004C>-225<0042004D00540050>-225<005500490046>-225<005000560055005100560055>-225<00500047>-225<005500490046>-225<004D004A00540055004A004F0048>-225<004200430050>30<0057>5<0046>20<000D>]TJ
+/F49 10.90909 Tf
+1 0 0 1 74.409 516.367 Tm [<0024004900460044004C>-225<0042004D00540050>-225<005500490046>-225<005000560055005100560055>-225<00500047>-225<005500490046>-225<004D004A00540055004A004F0048>-225<004200430050>30<0057>5<0046>20<000D>]TJ
-/F36 10.90909 Tf
-1 0 0 1 282.304 491.422 Tm [<002F0051002B0040006D006200320040004D003200720054001C007400580054002F0037>]TJ
+/F28 10.90909 Tf
+1 0 0 1 282.304 516.367 Tm [<002F0051002B0040006D006200320040004D003200720054001C007400580054002F0037>]TJ
0 g 0 G
-/F57 10.90909 Tf
-1 0 0 1 385.395 491.422 Tm [<000F>]TJ
+/F49 10.90909 Tf
+1 0 0 1 385.395 516.367 Tm [<000F>]TJ
0 g 0 G
-/F54 14.3462 Tf
-1 0 0 1 74.008 448.005 Tm [<0064>-500<0061006D00540054>-31<0051>31<00600069>-367<00370051>31<0060>-367<0069003F0032>]TJ
+/F46 14.3462 Tf
+1 0 0 1 74.008 472.95 Tm [<0064>-500<0061006D00540054>-31<0051>31<00600069>-367<00370051>31<0060>-367<0069003F0032>]TJ
-/F55 14.3462 Tf
-1 0 0 1 195.577 448.005 Tm [<0054001C0074>]TJ
+/F47 14.3462 Tf
+1 0 0 1 195.577 472.95 Tm [<0054001C0074>]TJ
0 g 0 G
-/F54 14.3462 Tf
-1 0 0 1 223.438 448.005 Tm [<0054001C002B0046001C003B0032>]TJ
+/F46 14.3462 Tf
+1 0 0 1 223.438 472.95 Tm [<0054001C002B0046001C003B0032>]TJ
0 g 0 G
0 g 0 G
-/F54 11.95517 Tf
-1 0 0 1 74.075 414.988 Tm [<006400580052>-500<0061006900320054>-367<0052002C>-489<0031007400690060001C002B00690042004D003B>-367<0069003F0032>-367<001C004D004D00510069001C006900420051004D0062>]TJ
+/F46 11.95517 Tf
+1 0 0 1 74.075 439.933 Tm [<006400580052>-500<0061006900320054>-367<0052002C>-489<0031007400690060001C002B00690042004D003B>-367<0069003F0032>-367<001C004D004D00510069001C006900420051004D0062>]TJ
0 g 0 G
-/F57 10.90909 Tf
-0.981 0 0 1 74.071 386.647 Tm [<003500490046>-229<004D00560042>-230<005400440053>-9<004A00510055>-230<004A0054>-229<0042004D00540050>-230<00420043004D0046>-230<00550050>-230<00580053>-8<004A00550046>]TJ
-/F36 10.90909 Tf
-1 0 0 1 237.303 386.647 Tm [<0054001C0074>]TJ
-/F57 10.90909 Tf
-0.981 0 0 1 256.945 386.647 Tm [<056D004D00460054>-229<004700500053>-230<005500490046>]TJ
+/F49 10.90909 Tf
+0.981 0 0 1 74.071 411.591 Tm [<003500490046>-229<004D00560042>-230<005400440053>-9<004A00510055>-230<004A0054>-229<0042004D00540050>-230<00420043004D0046>-230<00550050>-230<00580053>-8<004A00550046>]TJ
+/F28 10.90909 Tf
+1 0 0 1 237.303 411.591 Tm [<0054001C0074>]TJ
+/F49 10.90909 Tf
+0.981 0 0 1 256.945 411.591 Tm [<056D004D00460054>-229<004700500053>-230<005500490046>]TJ
-/F36 10.90909 Tf
-1 0 0 1 313.436 386.647 Tm [<0054001C0074>]TJ
+/F28 10.90909 Tf
+1 0 0 1 313.436 411.591 Tm [<0054001C0074>]TJ
0 g 0 G
-/F57 10.90909 Tf
-0.981 0 0 1 333.078 386.647 Tm [<005100420044004C004200480046>-229<00090042004F0045>-230<00540050>-230<00440042004F>-230<00430046>-230<0056005400460045>-230<00550050>-230<0053>20<00460051004D004200440046>]TJ
-1 0 0 1 74.409 373.097 Tm [<005500490046>-225<004B00420057>6<0042>-225<004200510051004D004A004400420055004A0050004F000A000F>]TJ
-1 0 0 1 74.409 352.774 Tm [<0027>36<00500053>-225<00550049004A0054>-225<0046005900550053>10<004200440055>-225<005500490046>-225<0042004F004F0050005500420055004A0050004F0054>-225<004D004A004C0046>-225<00550049004A0054001B>]TJ
+/F49 10.90909 Tf
+0.981 0 0 1 333.078 411.591 Tm [<005100420044004C004200480046>-229<00090042004F0045>-230<00540050>-230<00440042004F>-230<00430046>-230<0056005400460045>-230<00550050>-230<0053>20<00460051004D004200440046>]TJ
+1 0 0 1 74.409 398.042 Tm [<005500490046>-225<004B00420057>6<0042>-225<004200510051004D004A004400420055004A0050004F000A000F>]TJ
+1 0 0 1 74.409 377.718 Tm [<0027>36<00500053>-225<00550049004A0054>-225<0046005900550053>10<004200440055>-225<005500490046>-225<0042004F004F0050005500420055004A0050004F0054>-225<004D004A004C0046>-225<00550049004A0054001B>]TJ
0 g 0 G
0 g 0 G
-1 0 0 1 226.287 330.258 Tm [<002D004A00540055004A004F0048>-225<0014001B>]TJ
+1 0 0 1 226.287 355.203 Tm [<002D004A00540055004A004F0048>-225<0014001B>]TJ
0 g 0 G
-1 0 0 1 273.349 330.258 Tm [<004500500044000E0046005900550053>10<004200440055000E005100420059000F005500460059>]TJ
+1 0 0 1 273.349 355.203 Tm [<004500500044000E0046005900550053>10<004200440055000E005100420059000F005500460059>]TJ
0 g 0 G
-/F36 10.90909 Tf
-1 0 0 1 74.409 313.72 Tm [<0024>]TJ
-/F55 10.90909 Tf
-1 0 0 1 80.137 313.72 Tm [<002F0051002B006D004B0032004D0069002B0048001C00620062>]TJ
-/F36 10.90909 Tf
-1 0 0 1 154.591 313.72 Tm [<0026001C006000690042002B004800320027>]TJ
+/F28 10.90909 Tf
+1 0 0 1 74.409 338.665 Tm [<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 80.137 338.665 Tm [<002F0051002B006D004B0032004D0069002B0048001C00620062>]TJ
+/F28 10.90909 Tf
+1 0 0 1 154.591 338.665 Tm [<0026001C006000690042002B004800320027>]TJ
0 0.5 0 rg 0 0.5 0 RG
-/F55 10.90909 Tf
-1 0 0 1 74.409 300.171 Tm [<0057>]TJ
+/F47 10.90909 Tf
+1 0 0 1 74.409 325.116 Tm [<0057>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 85.864 300.171 Tm [<00480051001C002F>]TJ
+1 0 0 1 85.864 325.116 Tm [<00480051001C002F>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 114.5 300.171 Tm [<0069003F0032>]TJ
+1 0 0 1 114.5 325.116 Tm [<0069003F0032>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 137.409 300.171 Tm [<0048006D001C>]TJ
+1 0 0 1 137.409 325.116 Tm [<0048006D001C>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 160.319 300.171 Tm [<002B0051002F0032>]TJ
+1 0 0 1 160.319 325.116 Tm [<002B0051002F0032>]TJ
0 g 0 G
-/F36 10.90909 Tf
-1 0 0 1 74.409 286.622 Tm [<0024002F004200600032002B00690048006D001C002600600032005B006D0042006000320055005D004D003200720054001C0074005D00560027>]TJ
+/F28 10.90909 Tf
+1 0 0 1 74.409 311.567 Tm [<0024002F004200600032002B00690048006D001C002600600032005B006D0042006000320055005D004D003200720054001C0074005D00560027>]TJ
0 0.5 0 rg 0 0.5 0 RG
-/F55 10.90909 Tf
-1 0 0 1 74.409 259.523 Tm [<0057>]TJ
+/F47 10.90909 Tf
+1 0 0 1 74.409 284.468 Tm [<0057>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 85.864 259.523 Tm [<001C004D002F>]TJ
+1 0 0 1 85.864 284.468 Tm [<001C004D002F>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 103.046 259.523 Tm [<0066>]TJ
+1 0 0 1 103.046 284.468 Tm [<0066>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 108.773 259.523 Tm [<00510060>]TJ
+1 0 0 1 108.773 284.468 Tm [<00510060>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 125.955 259.523 Tm [<00720060004200690032>]TJ
+1 0 0 1 125.955 284.468 Tm [<00720060004200690032>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 160.319 259.523 Tm [<0058>]TJ
+1 0 0 1 160.319 284.468 Tm [<0058>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 166.046 259.523 Tm [<0054001C0074>]TJ
+1 0 0 1 166.046 284.468 Tm [<0054001C0074>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 188.955 259.523 Tm [<00370042004800320062>]TJ
+1 0 0 1 188.955 284.468 Tm [<00370042004800320062>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 223.319 259.523 Tm [<003700510060>]TJ
+1 0 0 1 223.319 284.468 Tm [<003700510060>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 246.228 259.523 Tm [<0054001C0074>]TJ
+1 0 0 1 246.228 284.468 Tm [<0054001C0074>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 263.409 259.523 Tm [<0058>]TJ
+1 0 0 1 263.409 284.468 Tm [<0058>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 269.137 259.523 Tm [<006200690076>]TJ
+1 0 0 1 269.137 284.468 Tm [<006200690076>]TJ
0 g 0 G
-/F36 10.90909 Tf
-1 0 0 1 74.409 245.974 Tm [<0024002F004200600032002B00690048006D001C>]TJ
-1 0 0 1 84.228 232.425 Tm [<0026>]TJ
-1 0 0 1 94.046 218.876 Tm [<004D003200720054001C00740058007200600042006900320054001C00740055005D002F0051002B00400042004D0054006D0069005D0056>]TJ
-1 0 0 1 94.046 205.326 Tm [<004D003200720054001C00740058007200600042006900320054001C00740055005D002F0051002B00400042004D0054006D0069006B005D0056>]TJ
-1 0 0 1 84.228 191.777 Tm [<0027>]TJ
-1 0 0 1 74.409 178.228 Tm [<0024>]TJ
-/F55 10.90909 Tf
-1 0 0 1 80.137 178.228 Tm [<00230032003B0042004D>]TJ
-/F36 10.90909 Tf
-1 0 0 1 108.773 178.228 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
-1 0 0 1 74.409 164.679 Tm [<0024>]TJ
-/F55 10.90909 Tf
-1 0 0 1 80.137 164.679 Tm [<0032004D002F>]TJ
-/F36 10.90909 Tf
-1 0 0 1 97.319 164.679 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
+/F28 10.90909 Tf
+1 0 0 1 74.409 270.919 Tm [<0024002F004200600032002B00690048006D001C>]TJ
+1 0 0 1 84.228 257.37 Tm [<0026>]TJ
+1 0 0 1 94.046 243.821 Tm [<004D003200720054001C00740058007200600042006900320054001C00740055005D002F0051002B00400042004D0054006D0069005D0056>]TJ
+1 0 0 1 94.046 230.271 Tm [<004D003200720054001C00740058007200600042006900320054001C00740055005D002F0051002B00400042004D0054006D0069006B005D0056>]TJ
+1 0 0 1 84.228 216.722 Tm [<0027>]TJ
+1 0 0 1 74.409 203.173 Tm [<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 80.137 203.173 Tm [<00230032003B0042004D>]TJ
+/F28 10.90909 Tf
+1 0 0 1 108.773 203.173 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
+1 0 0 1 74.409 189.624 Tm [<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 80.137 189.624 Tm [<0032004D002F>]TJ
+/F28 10.90909 Tf
+1 0 0 1 97.319 189.624 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
0 g 0 G
0 g 0 G
0 g 0 G
0 g 0 G
0 g 0 G
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1 0 0 1 294.747 93.476 Tm [<0017>]TJ
0 g 0 G
0 g 0 G
@@ -1541,14 +1617,14 @@ ET
endstream
endobj
-128 0 obj
-<< /Type /Page /Contents 129 0 R /Resources 127 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 15 0 R /Annots 152 0 R >>
+127 0 obj
+<< /Type /Page /Contents 128 0 R /Resources 126 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 15 0 R /Annots 151 0 R >>
endobj
-152 0 obj
-[ 107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 116 0 R 117 0 R 118 0 R 119 0 R 120 0 R 123 0 R 105 0 R 106 0 R 124 0 R 125 0 R 126 0 R ]
+151 0 obj
+[ 107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 116 0 R 117 0 R 118 0 R 119 0 R 122 0 R 105 0 R 106 0 R 123 0 R 124 0 R 125 0 R ]
endobj
104 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 255.118 331.653 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 153 0 R /Length 41 >>
+<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 271.842 281.763 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 152 0 R /Length 41 >>
stream
q
1 0 0 1 -113.386 -425.196 cm
@@ -1558,55 +1634,55 @@ Q
endstream
endobj
103 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 1 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000558+01'00') /ModDate (D:20210307000558+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 154 0 R /Font << /F23 155 0 R /F24 156 0 R /F36 157 0 R >> /ProcSet [ /PDF /Text ] >> /Length 4811 >>
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 1 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.15.0) /CreationDate (D:20220627163845+02'00') /ModDate (D:20220627163845+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.15.0 (TeX Live 2022)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 153 0 R /Font << /F15 154 0 R /F16 155 0 R /F28 156 0 R >> /ProcSet [ /PDF /Text ] >> /Length 4809 >>
stream
/opacity1 gs
BT
-/F23 9.96264 Tf
-1 0 0 1 148.712 707.125 Tm [<007400480042004D00460069003200740069>]TJ
-1 0 0 1 148.712 695.17 Tm [<0052>]TJ
-/F24 9.96264 Tf
-1 0 0 1 157.011 695.17 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
-/F23 9.96264 Tf
-1 0 0 1 148.712 683.215 Tm [<001B0062>-414<001C004D>27<0076>-413<002F0032002F0042002B001C00690032002F>-415<00600032001C002F00320060>-414<002B001C004D>-415<002B00480032001C006000480076>-414<006200320032002D>-435<0069003F0032>-414<0041002F0032001C0048>-415<00510037>-414<00540060001C002B00690042002B001C0048>-415<00600032001C00620051004D>-414<00420062>-415<001C>]TJ
-1 0 0 1 133.768 671.26 Tm [<0060003200540060003200620032004D>28<0069001C006900420051004D>-390<00510037002D>-406<001C0062>-391<0037001C0060>-391<001C0062>-390<0041>-391<0046004D0051>27<0072002D>-405<0069003F0032>-390<0069003F0042004D003B0062>-391<0042004D>-391<0069003F0032004B0062003200480070>27<003200620063>-419<001C0062>-391<0041>-391<003F001C>27<0070>28<0032>-390<0062003F0051>28<0072004D>]TJ
-1 0 0 1 133.768 659.304 Tm [<00320048006200320072003F003200600032002D>-264<0069003F0032>-247<0054003F0032004D0051004B0032004D001C>-247<0062003F0051006D0048002F>-247<0051004D00480076>-248<0023>-28<0032>-247<006D00620032002F>-247<001C0062>-247<001C>-247<002B001C004D0051004D>-247<003700510060>-247<0051006D0060>-248<006D004D002F0032006000620069001C004D002F0042004D003B0058>]TJ
-1 0 0 1 133.768 647.349 Tm [<0068003F0032>-329<0054001C0060001C00480051003B00420062004B0062>-329<00510037>-330<00540060001C002B00690042002B001C0048>-329<00600032001C00620051004D>-329<001C00600032>-330<0072003F001C0069>-329<007D006000620069>-329<003B00420070>27<0032>-329<0060004200620032>-329<00690051>-329<0069003F0032>-330<001C0060002B>28<003F004200690032002B00690051004D0042002B>]TJ
-1 0 0 1 133.768 635.394 Tm [<00510037>-383<00540060001C002B00690042002B001C0048>-383<00600032001C00620051004D0058>-595<001B0062>-383<0072004200480048>-383<0032001C0062004200480076>-383<0023>-28<0032>-384<0062003F0051>27<0072004D>-382<0042004D>-383<0069003F0032>-383<004D003200740069>-384<00620032002B006900420051004D002D>-395<00600032001C00620051004D>-384<0072>28<0051006D0048002F>]TJ
-1 0 0 1 133.768 623.439 Tm [<0069003F0032006000320023>28<0076>-260<0023>-28<0032>-260<004B001C002F0032>-261<00690051>-260<002B0051004D>27<00690060001C002F0042002B0069002D>-274<0042004D>-260<0070004200320072>-261<00510037>-260<0069003F003200620032>-261<002B0051004D00620042002F00320060001C006900420051004D0062002D>-274<0069003F0032>-261<0041002F0032001C0048>-260<00510037>-261<00540060001C002B0040>]TJ
-1 0 0 1 133.768 611.484 Tm [<00690042002B001C0048>-398<00600032001C00620051004D002D>-415<0076>27<00320069>-398<0069003F0032>-399<004B001C004D0042003700510048002F>-398<002F00320054>-28<0032004D002F0062>-399<0051004D>-398<0069003F0032>-399<0054003F0032004D0051004B0032004D001C0058>-641<004C0032002B00320062006200420069>27<0076>-398<002F00320054>-28<0032004D002F0062>]TJ
-1 0 0 1 133.768 599.529 Tm [<0051004D002D>-350<0072003F0032004D>-348<0069003F>27<006D0062>-346<006900600032001C00690032002F>-347<001C0062>-348<0069003F0032>-347<00540060001C002B00690042002B001C0048>-347<0032004B005400480051>27<0076004B0032004D>28<0069>-347<00510037>-347<0069003F0032>-347<004D00320070>27<0032006000400032004D002F0042004D003B>-347<00600032003B0060003200620062>]TJ
-1 0 0 1 133.768 587.573 Tm [<0042004D>-316<0069003F0032>-316<006200320060004200320062>-316<00510037>-316<0032004B0054004200600042002B001C0048>-317<002B0051004D002F0042006900420051004D0062002D>-319<00690042004B00320058>-439<003E006D004B001C004D>-316<00600032001C00620051004D>-316<002F00320054>-28<0032004D002F0062>-316<0051004D>-316<0051006D0060>-317<00620032004D00620032>]TJ
-1 0 0 1 133.768 575.618 Tm [<0054>-28<00320060002B00320054006900420051004D0062002D>-285<0023>27<0076>-273<004B0032001C004D0062>-274<00510037>-274<001C004D001C0048007600690042002B>-274<006D004D00420069>28<0076>83<0058>-424<0068003F003200600032>-274<002B001C004D>-273<0023>-28<0032>-274<004D0051>-274<002F0051006D00230069>-274<0069003F001C0069>-274<0069003F0032>-274<00510023>-28<00440032002B00690062>]TJ
-1 0 0 1 133.768 563.663 Tm [<0042004D>-333<00620054001C002B0032>-333<001C004D002F>-333<00690042004B0032>-333<001C00600032>-333<0072003F001C0069>-333<007D006000620069>-333<003B00420070>28<0032>-333<0060004200620032>-333<00690051>-333<003F>28<006D004B001C004D>-333<00600032001C00620051004D0058>]TJ
-1 0 0 1 148.712 551.708 Tm [<0054>-28<002F0037>]TJ
-/F36 14.3462 Tf
-1 0 0 1 133.768 518.747 Tm [<0052>-1000<001C0023>-31<002B>]TJ
-1 0 0 1 133.768 490.938 Tm [<006B>-1000<001C0023>-31<002B>]TJ
-1 0 0 1 133.768 463.129 Tm [<006A>-1000<001C0023>-31<002B>]TJ
-/F23 9.96264 Tf
-1 0 0 1 133.768 441.298 Tm [<007D00480032>]TJ
-1 0 0 1 303.133 139.255 Tm [<0052>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 657.235 Tm [<007400480042004D00460069003200740069>]TJ
+1 0 0 1 148.712 645.28 Tm [<0052>]TJ
+/F16 9.96264 Tf
+1 0 0 1 157.011 645.28 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 633.325 Tm [<001B0062>-414<001C004D>27<0076>-413<002F0032002F0042002B001C00690032002F>-415<00600032001C002F00320060>-414<002B001C004D>-415<002B00480032001C006000480076>-414<006200320032002D>-435<0069003F0032>-414<0041002F0032001C0048>-415<00510037>-414<00540060001C002B00690042002B001C0048>-415<00600032001C00620051004D>-414<00420062>-415<001C>]TJ
+1 0 0 1 133.768 621.37 Tm [<0060003200540060003200620032004D>28<0069001C006900420051004D>-390<00510037002D>-406<001C0062>-391<0037001C0060>-391<001C0062>-390<0041>-391<0046004D0051>27<0072002D>-405<0069003F0032>-390<0069003F0042004D003B0062>-391<0042004D>-391<0069003F0032004B0062003200480070>27<003200620063>-419<001C0062>-391<0041>-391<003F001C>27<0070>28<0032>-390<0062003F0051>28<0072004D>]TJ
+1 0 0 1 133.768 609.415 Tm [<00320048006200320072003F003200600032002D>-264<0069003F0032>-247<0054003F0032004D0051004B0032004D001C>-247<0062003F0051006D0048002F>-247<0051004D00480076>-248<0023>-28<0032>-247<006D00620032002F>-247<001C0062>-247<001C>-247<002B001C004D0051004D>-247<003700510060>-247<0051006D0060>-248<006D004D002F0032006000620069001C004D002F0042004D003B0058>]TJ
+1 0 0 1 133.768 597.46 Tm [<0068003F0032>-329<0054001C0060001C00480051003B00420062004B0062>-329<00510037>-330<00540060001C002B00690042002B001C0048>-329<00600032001C00620051004D>-329<001C00600032>-330<0072003F001C0069>-329<007D006000620069>-329<003B00420070>27<0032>-329<0060004200620032>-329<00690051>-329<0069003F0032>-330<001C0060002B>28<003F004200690032002B00690051004D0042002B>]TJ
+1 0 0 1 133.768 585.504 Tm [<00510037>-383<00540060001C002B00690042002B001C0048>-383<00600032001C00620051004D0058>-595<001B0062>-383<0072004200480048>-383<0032001C0062004200480076>-383<0023>-28<0032>-384<0062003F0051>27<0072004D>-382<0042004D>-383<0069003F0032>-383<004D003200740069>-384<00620032002B006900420051004D002D>-395<00600032001C00620051004D>-384<0072>28<0051006D0048002F>]TJ
+1 0 0 1 133.768 573.549 Tm [<0069003F0032006000320023>28<0076>-260<0023>-28<0032>-260<004B001C002F0032>-261<00690051>-260<002B0051004D>27<00690060001C002F0042002B0069002D>-274<0042004D>-260<0070004200320072>-261<00510037>-260<0069003F003200620032>-261<002B0051004D00620042002F00320060001C006900420051004D0062002D>-274<0069003F0032>-261<0041002F0032001C0048>-260<00510037>-261<00540060001C002B0040>]TJ
+1 0 0 1 133.768 561.594 Tm [<00690042002B001C0048>-398<00600032001C00620051004D002D>-415<0076>27<00320069>-398<0069003F0032>-399<004B001C004D0042003700510048002F>-398<002F00320054>-28<0032004D002F0062>-399<0051004D>-398<0069003F0032>-399<0054003F0032004D0051004B0032004D001C0058>-641<004C0032002B00320062006200420069>27<0076>-398<002F00320054>-28<0032004D002F0062>]TJ
+1 0 0 1 133.768 549.639 Tm [<0051004D002D>-350<0072003F0032004D>-348<0069003F>27<006D0062>-346<006900600032001C00690032002F>-347<001C0062>-348<0069003F0032>-347<00540060001C002B00690042002B001C0048>-347<0032004B005400480051>27<0076004B0032004D>28<0069>-347<00510037>-347<0069003F0032>-347<004D00320070>27<0032006000400032004D002F0042004D003B>-347<00600032003B0060003200620062>]TJ
+1 0 0 1 133.768 537.684 Tm [<0042004D>-316<0069003F0032>-316<006200320060004200320062>-316<00510037>-316<0032004B0054004200600042002B001C0048>-317<002B0051004D002F0042006900420051004D0062002D>-319<00690042004B00320058>-439<003E006D004B001C004D>-316<00600032001C00620051004D>-316<002F00320054>-28<0032004D002F0062>-316<0051004D>-316<0051006D0060>-317<00620032004D00620032>]TJ
+1 0 0 1 133.768 525.729 Tm [<0054>-28<00320060002B00320054006900420051004D0062002D>-285<0023>27<0076>-273<004B0032001C004D0062>-274<00510037>-274<001C004D001C0048007600690042002B>-274<006D004D00420069>28<0076>83<0058>-424<0068003F003200600032>-274<002B001C004D>-273<0023>-28<0032>-274<004D0051>-274<002F0051006D00230069>-274<0069003F001C0069>-274<0069003F0032>-274<00510023>-28<00440032002B00690062>]TJ
+1 0 0 1 133.768 513.773 Tm [<0042004D>-333<00620054001C002B0032>-333<001C004D002F>-333<00690042004B0032>-333<001C00600032>-333<0072003F001C0069>-333<007D006000620069>-333<003B00420070>28<0032>-333<0060004200620032>-333<00690051>-333<003F>28<006D004B001C004D>-333<00600032001C00620051004D0058>]TJ
+1 0 0 1 148.712 501.818 Tm [<0054>-28<002F0037>]TJ
+/F28 14.3462 Tf
+1 0 0 1 133.768 468.857 Tm [<0052>-1000<001C0023>-31<002B>]TJ
+1 0 0 1 133.768 441.048 Tm [<006B>-1000<001C0023>-31<002B>]TJ
+1 0 0 1 133.768 413.239 Tm [<006A>-1000<001C0023>-31<002B>]TJ
+/F15 9.96264 Tf
+1 0 0 1 133.768 391.408 Tm [<007D00480032>]TJ
+1 0 0 1 303.133 89.365 Tm [<0052>]TJ
ET
endstream
endobj
-154 0 obj
+153 0 obj
<< /opacity1 << /ca 1 /CA 1 >> >>
endobj
+154 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ZNAMJV+LMRoman10-Regular /DescendantFonts [ 157 0 R ] /ToUnicode 158 0 R >>
+endobj
155 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ZNAMJV+LMRoman10-Regular /DescendantFonts [ 158 0 R ] /ToUnicode 159 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OGJFWH+LMMono10-Regular /DescendantFonts [ 159 0 R ] /ToUnicode 160 0 R >>
endobj
156 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OGJFWH+LMMono10-Regular /DescendantFonts [ 160 0 R ] /ToUnicode 161 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /FTRWGM+LMRoman12-Bold /DescendantFonts [ 161 0 R ] /ToUnicode 162 0 R >>
endobj
157 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /FTRWGM+LMRoman12-Bold /DescendantFonts [ 162 0 R ] /ToUnicode 163 0 R >>
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ZNAMJV+LMRoman10-Regular /FontDescriptor 163 0 R /W 164 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
158 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ZNAMJV+LMRoman10-Regular /FontDescriptor 164 0 R /W 165 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
-endobj
-159 0 obj
<< /Length 1229 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -1681,10 +1757,10 @@ end
endstream
endobj
-160 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OGJFWH+LMMono10-Regular /FontDescriptor 166 0 R /W 167 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+159 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OGJFWH+LMMono10-Regular /FontDescriptor 165 0 R /W 166 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-161 0 obj
+160 0 obj
<< /Length 926 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -1738,10 +1814,10 @@ end
endstream
endobj
-162 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /FTRWGM+LMRoman12-Bold /FontDescriptor 168 0 R /W 169 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+161 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /FTRWGM+LMRoman12-Bold /FontDescriptor 167 0 R /W 168 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-163 0 obj
+162 0 obj
<< /Length 747 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -1783,25 +1859,25 @@ end
endstream
endobj
+163 0 obj
+<< /Type /FontDescriptor /FontName /ZNAMJV+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 169 0 R /CIDSet 170 0 R >>
+endobj
164 0 obj
-<< /Type /FontDescriptor /FontName /ZNAMJV+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 170 0 R /CIDSet 171 0 R >>
+[ 27 [ 750 500 ] 35 [ 556 ] 43 [ 444 ] 45 [ 278 ] 47 [ 556 ] 50 [ 444 ] 55 [ 306 ] 57 [ 500 785 500 ] 62 [ 750 556 333 361 278 ] 68 [ 306 ] 70 [ 528 ] 72 [ 278 ] 75 [ 833 750 556 ] 81 [ 500 500 ] 84 [ 556 ] 88 [ 278 ] 96 [ 392 ] 98 [ 394 278 ] 104 [ 722 389 500 500 ] 109 [ 556 ] 112 [ 528 ] 114 [ 722 ] 116 [ 528 ] 118 [ 528 ] 125 [ 556 ] ]
endobj
165 0 obj
-[ 27 [ 750 500 ] 35 [ 556 ] 43 [ 444 ] 45 [ 278 ] 47 [ 556 ] 50 [ 444 ] 55 [ 306 ] 57 [ 500 785 500 ] 62 [ 750 556 333 361 278 ] 68 [ 306 ] 70 [ 528 ] 72 [ 278 ] 75 [ 833 750 556 ] 81 [ 500 500 ] 84 [ 556 ] 88 [ 278 ] 96 [ 392 ] 98 [ 394 278 ] 104 [ 722 389 500 500 ] 109 [ 556 ] 112 [ 528 ] 114 [ 722 ] 116 [ 528 ] 118 [ 528 ] 125 [ 556 ] ]
+<< /Type /FontDescriptor /FontName /OGJFWH+LMMono10-Regular /Flags 4 /FontBBox [ -451 -316 731 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 171 0 R /CIDSet 172 0 R >>
endobj
166 0 obj
-<< /Type /FontDescriptor /FontName /OGJFWH+LMMono10-Regular /Flags 4 /FontBBox [ -451 -316 731 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 172 0 R /CIDSet 173 0 R >>
+[ 28 [ 525 ] 43 [ 525 525 ] 50 [ 525 ] 59 [ 525 ] 63 [ 525 525 ] 68 [ 525 ] 72 [ 525 ] 81 [ 525 ] 84 [ 525 ] 88 [ 525 ] 96 [ 525 ] 98 [ 525 ] 102 [ 525 ] 105 [ 525 ] 114 [ 525 ] 116 [ 525 ] ]
endobj
167 0 obj
-[ 28 [ 525 ] 43 [ 525 525 ] 50 [ 525 ] 59 [ 525 ] 63 [ 525 525 ] 68 [ 525 ] 72 [ 525 ] 81 [ 525 ] 84 [ 525 ] 88 [ 525 ] 96 [ 525 ] 98 [ 525 ] 102 [ 525 ] 105 [ 525 ] 114 [ 525 ] 116 [ 525 ] ]
+<< /Type /FontDescriptor /FontName /FTRWGM+LMRoman12-Bold /Flags 4 /FontBBox [ -476 -289 1577 1137 ] /Ascent 1137 /CapHeight 686 /Descent -289 /ItalicAngle 0 /StemV 104 /XHeight 444 /FontFile3 173 0 R /CIDSet 174 0 R >>
endobj
168 0 obj
-<< /Type /FontDescriptor /FontName /FTRWGM+LMRoman12-Bold /Flags 4 /FontBBox [ -476 -289 1577 1137 ] /Ascent 1137 /CapHeight 686 /Descent -289 /ItalicAngle 0 /StemV 104 /XHeight 444 /FontFile3 174 0 R /CIDSet 175 0 R >>
-endobj
-169 0 obj
[ 28 [ 547 ] 35 [ 625 ] 43 [ 500 ] 82 [ 563 ] 106 [ 563 563 ] ]
endobj
-170 0 obj
+169 0 obj
<< /Subtype /CIDFontType0C /Length 5208 >>
stream

@@ -1814,13 +1890,13 @@ O
endstream
endobj
-171 0 obj
+170 0 obj
<< /Length 16 >>
stream
endstream
endobj
-172 0 obj
+171 0 obj
<< /Subtype /CIDFontType0C /Length 2420 >>
stream

@@ -1830,13 +1906,13 @@ stream

endstream
endobj
-173 0 obj
+172 0 obj
<< /Length 15 >>
stream
endstream
endobj
-174 0 obj
+173 0 obj
<< /Subtype /CIDFontType0C /Length 1193 >>
stream

@@ -1847,17 +1923,17 @@ stream
 
endstream
endobj
-175 0 obj
+174 0 obj
<< /Length 14 >>
stream
endstream
endobj
-153 0 obj
+152 0 obj
<< /XObject << /Im1 103 0 R >> /ProcSet [ /PDF ] >>
endobj
-122 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 226.772 331.653 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 176 0 R /Length 41 >>
+121 0 obj
+<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 243.495 281.763 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 175 0 R /Length 41 >>
stream
q
1 0 0 1 -141.732 -425.196 cm
@@ -1866,157 +1942,151 @@ Q
endstream
endobj
-121 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 2 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000558+01'00') /ModDate (D:20210307000558+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >> /BBox [ 0 0 595.276 841.89 ] /Resources << /ExtGState 154 0 R /Font << /F24 156 0 R /F23 155 0 R >> /ProcSet [ /PDF /Text ] >> /Length 303 >>
+120 0 obj
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 2 /PTEX.InfoDict << /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /Producer (LuaTeX-1.15.0) /CreationDate (D:20220627163845+02'00') /ModDate (D:20220627163845+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.15.0 (TeX Live 2022)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 153 0 R /Font << /F16 155 0 R /F15 154 0 R >> /ProcSet [ /PDF /Text ] >> /Length 302 >>
stream
/opacity1 gs
BT
-/F24 9.96264 Tf
-1 0 0 1 148.712 707.125 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
-/F23 9.96264 Tf
-1 0 0 1 148.712 695.17 Tm [<0052>-1333<006B>-1333<006A>]TJ
-1 0 0 1 303.133 139.255 Tm [<006B>]TJ
+/F16 9.96264 Tf
+1 0 0 1 148.712 657.235 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-50<00540060005100440032002B0069005800510060003B>]TJ
+/F15 9.96264 Tf
+1 0 0 1 148.712 645.28 Tm [<0052>-1333<006B>-1333<006A>]TJ
+1 0 0 1 303.133 89.365 Tm [<006B>]TJ
ET
endstream
endobj
-176 0 obj
-<< /XObject << /Im2 121 0 R >> /ProcSet [ /PDF ] >>
+175 0 obj
+<< /XObject << /Im2 120 0 R >> /ProcSet [ /PDF ] >>
endobj
107 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 99.112 645.093 176.2 650.687 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 99.111 645.093 176.197 650.688 ] >>
endobj
108 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 94.962 639.235 205.36 644.819 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 94.962 639.235 213.718 644.82 ] >>
endobj
109 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 633.253 205.36 638.787 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 633.253 213.718 638.787 ] >>
endobj
110 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 627.275 205.36 632.809 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 627.275 213.718 632.81 ] >>
endobj
111 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 621.298 205.36 626.832 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 621.298 213.718 626.832 ] >>
endobj
112 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 615.325 205.36 620.909 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 615.325 213.718 620.909 ] >>
endobj
113 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 609.347 205.36 614.877 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 609.348 213.718 614.877 ] >>
endobj
114 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 603.37 205.36 608.899 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 603.37 213.718 608.899 ] >>
endobj
115 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 597.387 205.36 602.922 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 597.387 213.718 602.922 ] >>
endobj
116 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 591.469 205.36 596.944 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 591.47 213.718 596.944 ] >>
endobj
117 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 585.437 205.36 590.966 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 585.437 213.718 590.966 ] >>
endobj
118 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 579.455 205.36 584.989 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 87.49 579.455 213.718 584.989 ] >>
endobj
119 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F(/c/texlive/2020/texmf-dist/doc/latex/base/doc.pdf)/D(chapter.1)>> /BS <</S/U/W 1>> /Rect [ 94.962 573.537 103.162 579.011 ] >>
-endobj
-120 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F(example-image.pdf)/D[0 /Fit]>> /BS <</S/U/W 1>> /Rect [ 87.49 519.243 94.853 523.806 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F<</UF <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>/F <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>/Subtype/application#2Fpdf/AFRelationship/Unspecified/Type/Filespec>>/D(chapter.1)>> /BS <</S/U/W 1>> /Rect [ 94.962 573.537 103.161 579.011 ] >>
endobj
-123 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 217.577 651.071 294.663 656.665 ] >>
+122 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>> /Rect [ 225.939 651.071 303.025 656.665 ] >>
endobj
105 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 96.596 651.16 116.472 657.661 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@1@) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 96.596 651.161 116.471 657.661 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@1@) >> >>
endobj
106 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 93.966 644.097 99.446 651.683 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@2@) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 93.966 644.097 99.445 651.684 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@2@) >> >>
+endobj
+123 0 obj
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 224.942 645.128 230.422 651.544 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@3@) >> >>
endobj
124 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 216.58 645.128 222.06 651.544 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@3@) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 234.073 645.128 239.552 651.544 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@4@) >> >>
endobj
125 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 225.711 645.128 231.19 651.544 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@4@) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 243.204 645.128 248.683 651.544 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@5@) >> >>
endobj
-126 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>> /Rect [ 234.842 645.128 240.321 651.544 ]/A << /S /GoTo /D (NEWPAX@doc-input1.newpax@5@) >> >>
+129 0 obj
+<< /D [ 127 0 R /XYZ 73.409 809.993 null ] >>
endobj
130 0 obj
-<< /D [ 128 0 R /XYZ 73.409 809.993 null ] >>
+<< /D [ 127 0 R /XYZ 74.409 725.875 null ] >>
endobj
131 0 obj
-<< /D [ 128 0 R /XYZ 74.409 725.875 null ] >>
+<< /D [ 127 0 R /XYZ 105.17 553.54 null ] >>
endobj
132 0 obj
-<< /D [ 128 0 R /XYZ 105.17 553.54 null ] >>
+<< /D [ 127 0 R /XYZ 122.351 566.521 null ] >>
endobj
133 0 obj
-<< /D [ 128 0 R /XYZ 122.352 566.521 null ] >>
+<< /D [ 127 0 R /XYZ 139.533 566.521 null ] >>
endobj
134 0 obj
-<< /D [ 128 0 R /XYZ 139.533 566.521 null ] >>
+<< /D [ 127 0 R /XYZ 156.715 553.54 null ] >>
endobj
135 0 obj
-<< /D [ 128 0 R /XYZ 156.715 553.54 null ] >>
+<< /D [ 127 0 R /XYZ 173.897 539.635 null ] >>
endobj
136 0 obj
-<< /D [ 128 0 R /XYZ 173.897 539.635 null ] >>
+<< /D [ 127 0 R /XYZ 74.409 495.018 null ] >>
endobj
137 0 obj
-<< /D [ 128 0 R /XYZ 74.409 470.073 null ] >>
+<< /D [ 127 0 R /XYZ 74.409 457.557 null ] >>
endobj
138 0 obj
-<< /D [ 128 0 R /XYZ 74.409 432.612 null ] >>
+<< /D [ 127 0 R /XYZ 74.409 371.61 null ] >>
endobj
139 0 obj
-<< /D [ 128 0 R /XYZ 74.409 346.665 null ] >>
+<< /D [ 127 0 R /XYZ 74.409 352.214 null ] >>
endobj
140 0 obj
-<< /D [ 128 0 R /XYZ 74.409 327.269 null ] >>
+<< /D [ 127 0 R /XYZ 74.409 338.665 null ] >>
endobj
141 0 obj
-<< /D [ 128 0 R /XYZ 74.409 313.72 null ] >>
+<< /D [ 127 0 R /XYZ 74.409 325.116 null ] >>
endobj
142 0 obj
-<< /D [ 128 0 R /XYZ 74.409 300.171 null ] >>
+<< /D [ 127 0 R /XYZ 74.409 311.567 null ] >>
endobj
143 0 obj
-<< /D [ 128 0 R /XYZ 74.409 286.622 null ] >>
+<< /D [ 127 0 R /XYZ 74.409 298.017 null ] >>
endobj
144 0 obj
-<< /D [ 128 0 R /XYZ 74.409 273.072 null ] >>
+<< /D [ 127 0 R /XYZ 74.409 284.468 null ] >>
endobj
145 0 obj
-<< /D [ 128 0 R /XYZ 74.409 259.523 null ] >>
+<< /D [ 127 0 R /XYZ 74.409 270.919 null ] >>
endobj
146 0 obj
-<< /D [ 128 0 R /XYZ 74.409 245.974 null ] >>
+<< /D [ 127 0 R /XYZ 74.409 257.37 null ] >>
endobj
147 0 obj
-<< /D [ 128 0 R /XYZ 74.409 232.425 null ] >>
+<< /D [ 127 0 R /XYZ 74.409 243.821 null ] >>
endobj
148 0 obj
-<< /D [ 128 0 R /XYZ 74.409 218.876 null ] >>
+<< /D [ 127 0 R /XYZ 74.409 230.271 null ] >>
endobj
149 0 obj
-<< /D [ 128 0 R /XYZ 74.409 205.326 null ] >>
+<< /D [ 127 0 R /XYZ 74.409 216.722 null ] >>
endobj
150 0 obj
-<< /D [ 128 0 R /XYZ 74.409 191.777 null ] >>
-endobj
-151 0 obj
-<< /D [ 128 0 R /XYZ 74.409 178.228 null ] >>
+<< /D [ 127 0 R /XYZ 74.409 203.173 null ] >>
endobj
-127 0 obj
-<< /ExtGState 1 0 R /Font << /F57 12 0 R /F36 14 0 R /F54 10 0 R /F55 11 0 R >> /XObject << /Fm1 104 0 R /Fm2 122 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-1 0 obj
-<< /opacity1 <</ca 1/CA 1>> >>
+126 0 obj
+<< /ExtGState 1 0 R /Font << /F49 12 0 R /F28 14 0 R /F46 10 0 R /F47 11 0 R >> /XObject << /Fm1 104 0 R /Fm2 121 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-179 0 obj
-<< /Length 11218 >>
+178 0 obj
+<< /Length 14099 >>
stream
/opacity1 gs
0 g 0 G
@@ -2029,28 +2099,28 @@ stream
0 g 0 G
0 g 0 G
BT
-/F54 11.95517 Tf
+/F46 11.95517 Tf
1 0 0 1 74.075 760.773 Tm [<00640058006B>-500<0061006900320054>-367<006B002C>-489<006C00620042004D003B>-367<0069003F0032>]TJ
-/F55 11.95517 Tf
+/F47 11.95517 Tf
1 0 0 1 199.225 760.773 Tm [<00580054001C0074>]TJ
-/F54 11.95517 Tf
+/F46 11.95517 Tf
1 0 0 1 224.331 760.773 Tm [<0040007D00480032>-367<007200420069003F>]TJ
-/F55 11.95517 Tf
+/F47 11.95517 Tf
1 0 0 1 277.161 760.773 Tm [<0054001C00740058006200690076>]TJ
0 g 0 G
0 g 0 G
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 74.409 732.431 Tm [<0026>4<004F005400560053>20<0046>-245<0055004900420055>-245<005500490046>]TJ
-/F36 10.90909 Tf
+/F28 10.90909 Tf
1 0 0 1 154.139 732.431 Tm [<00580054001C0074>]TJ
-/F57 10.90909 Tf
+/F49 10.90909 Tf
1.02 0 0 1 179.778 732.431 Tm [<056D004D0046>-245<00440053>19<00460042005500460045>-244<004A004F>-246<0054005500460051>-245<0012>-246<00440042004F>-245<00430046>-245<004700500056004F0045>-246<0043>24<005A>-244<005A>5<005000560053>-245<004E0042004A004F>-245<0045005000440056004E0046004F0055000F>-369<003A>90<00500056>-245<00440042004F>]TJ
1 0 0 1 74.409 718.882 Tm [<005500490046004F>-225<004A004F005400460053>-8<0055>-225<005A>6<005000560053>-225<003100250027>-225<056D004D00460054>-225<00550050004800460055004900460053>-225<0058004A00550049>-225<005500490046004A0053>-225<0042004F004F0050005500420055004A0050004F0054>-225<004D004A004C0046>-225<004A004F>-225<005500490046>-225<00470050004D004D0050>30<0058004A004F0048>-225<004D004A00540055004A004F0048000F>]TJ
0 g 0 G
1 0 0 1 91.766 695.57 Tm [<044C>]TJ
0 g 0 G
-1.01 0 0 1 101.682 695.57 Tm [<00350049004A0054>-222<005800500053>5<004C0054>-221<0058004A00550049>-222<00510045056E0042005500460059>-222<0042004F0045>-222<004D00560042004D0042005500460059000F>-297<004D00560042004D0042005500460059>-222<004F0046004600450054>-222<005500490046>-222<0046005900550053>9<0042>-221<0044005000450046>-222<00450046004E0050004F005400550053>9<0042005500460045>-221<004A004F>]TJ
+1.011 0 0 1 101.344 695.57 Tm [<00350049004A0054>-221<005800500053>5<004C0054>-221<0058004A00550049>-221<00510045056E0042005500460059>-222<0042004F0045>-221<004D00560042004D0042005500460059000F>-296<004D00560042004D0042005500460059>-222<004F0046004600450054>-221<005500490046>-222<0046005900550053>9<0042>-220<0044005000450046>-222<00450046004E0050004F005400550053>9<0042005500460045>-220<004A004F>]TJ
1 0 0 1 101.682 682.021 Tm [<005500490046>-225<0045005000440056004E0046004F0055000F>]TJ
0 g 0 G
1 0 0 1 91.766 661.697 Tm [<044C>]TJ
@@ -2059,214 +2129,289 @@ BT
0 g 0 G
1 0 0 1 91.766 641.373 Tm [<044C>]TJ
0 g 0 G
-1.008 0 0 1 101.682 641.373 Tm [<0035004900460053>20<0046>-222<004A0054>-223<0042>-223<0054004E0042004D004D>-223<0055005A00510050>-223<004A004F>]TJ
+1.009 0 0 1 101.344 641.373 Tm [<0035004900460053>20<0046>-222<004A0054>-223<0042>-222<0054004E0042004D004D>-223<0055005A00510050>-222<004A004F>]TJ
-/F36 10.90909 Tf
-1 0 0 1 218.21 641.373 Tm [<0054001C00740058006200690076>]TJ
+/F28 10.90909 Tf
+1 0 0 1 217.972 641.373 Tm [<0054001C00740058006200690076>]TJ
0 g 0 G
-/F57 10.90909 Tf
-1.008 0 0 1 260.751 641.373 Tm [<00580049004A00440049>-222<0042056C0046004400550054>-223<0044004D004A00510051004A004F0048000D>-223<005500490046>-223<00510042005500440049>-223<005400490050>29<0058004F>-221<004A004F>-223<005500490046>-223<004D004A00540055004A004F0048>]TJ
+/F49 10.90909 Tf
+1.009 0 0 1 260.514 641.373 Tm [<00580049004A00440049>-222<0042056C0046004400550054>-223<0044004D004A00510051004A004F0048000D>-222<005500490046>-223<00510042005500440049>-223<005400490050>30<0058004F>-222<004A004F>-223<005500490046>-222<004D004A00540055004A004F0048>]TJ
1 0 0 1 101.682 627.824 Tm [<0044005000530053>20<004600440055>-225<00550049004A0054>20<000F>]TJ
0 g 0 G
1 0 0 1 91.766 607.5 Tm [<044C>]TJ
0 g 0 G
-1.015 0 0 1 101.682 607.5 Tm [<00250050004F>80<0445>75<0055>-221<004A004F0044004D005600450046>-222<0031002500270054>-222<0058004A00550049>-222<0045004600540055004A004F00420055004A0050004F0054>-221<00550058004A00440046>-222<00420054>-222<00550049004A0054>-222<0058004A004D004D>-222<004D004600420045>-222<00550050>-222<004500560051004D004A0044004200550046>-222<0045004600540055004A004F00420055004A0050004F0054>]TJ
-1 0 0 1 101.682 593.951 Tm [<0042004F0045>-225<00510045056E0042005500460059>-225<0058004A004D004D>-225<00440050004E0051004D0042004A004F000F>]TJ
+1 0 0 1 101.682 607.5 Tm [<002A>18<004F>-225<00540050004E0046>-225<00440042005400460054>-225<005500490046>-225<0044004200550044005000450046>-225<00500047>-225<0004>-225<0042004F0045>-225<0006>-225<004E005600540055>-225<00430046>-225<005400460055>-225<00550050>-225<004D00460055005500460053>-225<00550050>-225<00420057>5<0050004A0045>-225<004600530053>6<005000530054>20<000F>]TJ
0 g 0 G
-1 0 0 1 91.766 573.627 Tm [<044C>]TJ
+1 0 0 1 91.766 587.176 Tm [<044C>]TJ
0 g 0 G
-1 0 0 1 101.682 573.627 Tm [<002A>6<0047>-225<0042004F004F0050005500420055004A0050004F0054>-225<0054004900500056004D0045>-225<004F00500055>-225<00430046>-225<0053>20<0046004A004F005400460053>-8<005500460045>-225<0053>20<0046004E0050>30<0057>5<0046>-225<005500490046>]TJ
-/F36 10.90909 Tf
-1 0 0 1 353.857 573.627 Tm [<00580054001C0074>]TJ
-/F57 10.90909 Tf
-1 0 0 1 376.766 573.627 Tm [<000E056D004D0046>20<000F>]TJ
+1.015 0 0 1 101.682 587.176 Tm [<00250050004F>80<0445>75<0055>-221<004A004F0044004D005600450046>-222<0031002500270054>-222<0058004A00550049>-222<0045004600540055004A004F00420055004A0050004F0054>-221<00550058004A00440046>-222<00420054>-222<00550049004A0054>-222<0058004A004D004D>-222<004D004600420045>-222<00550050>-222<004500560051004D004A0044004200550046>-222<0045004600540055004A004F00420055004A0050004F0054>]TJ
+1 0 0 1 101.682 573.627 Tm [<0042004F0045>-225<00510045056E0042005500460059>-225<0058004A004D004D>-225<00440050004E0051004D0042004A004F000F>]TJ
0 g 0 G
1 0 0 1 91.766 553.303 Tm [<044C>]TJ
0 g 0 G
-1.008 0 0 1 101.682 553.303 Tm [<002A>6<0047>]TJ
+1 0 0 1 101.682 553.303 Tm [<002A>6<0047>-225<0042004F004F0050005500420055004A0050004F0054>-225<0054004900500056004D0045>-225<004F00500055>-225<00430046>-225<0053>20<0046004A004F005400460053>-8<005500460045>-225<0053>20<0046004E0050>30<0057>5<0046>-225<005500490046>]TJ
+/F28 10.90909 Tf
+1 0 0 1 353.857 553.303 Tm [<00580054001C0074>]TJ
+/F49 10.90909 Tf
+1 0 0 1 376.766 553.303 Tm [<000E056D004D0046>20<000F>]TJ
+0 g 0 G
+1 0 0 1 91.766 532.979 Tm [<044C>]TJ
+0 g 0 G
+1.008 0 0 1 101.682 532.979 Tm [<002A>6<0047>]TJ
-/F36 10.90909 Tf
-1 0 0 1 111.415 553.303 Tm [<003F0076005400320060006000320037>]TJ
+/F28 10.90909 Tf
+1 0 0 1 111.415 532.979 Tm [<003F0076005400320060006000320037>]TJ
0 g 0 G
-/F57 10.90909 Tf
-1.008 0 0 1 159.688 553.303 Tm [<004A0054>-223<004D00500042004500460045>-223<005A>5<00500056>-222<00440042004F>-223<004400490042004F00480046>-223<005500490046>-224<00440050004D00500053>-223<0042004F0045>-223<00540055005A004D0046>-223<00500047>-223<004D004A004F004C>-224<004300500053>19<0045004600530054>-222<0058004A00550049>-223<0049005A0051004600530053>19<00460047>]TJ
-1 0 0 1 101.682 539.754 Tm [<005000510055004A0050004F0054>20<000F>]TJ
+/F49 10.90909 Tf
+1.008 0 0 1 159.688 532.979 Tm [<004A0054>-223<004D00500042004500460045>-223<005A>5<00500056>-222<00440042004F>-223<004400490042004F00480046>-223<005500490046>-224<00440050004D00500053>-223<0042004F0045>-223<00540055005A004D0046>-223<00500047>-223<004D004A004F004C>-224<004300500053>19<0045004600530054>-222<0058004A00550049>-223<0049005A0051004600530053>19<00460047>]TJ
+1 0 0 1 101.682 519.43 Tm [<005000510055004A0050004F0054>20<000F>]TJ
0 g 0 G
0 g 0 G
-1 0 0 1 234.632 514.25 Tm [<002D004A00540055004A004F0048>-225<0015001B>]TJ
+1 0 0 1 234.632 493.926 Tm [<002D004A00540055004A004F0048>-225<0015001B>]TJ
0 g 0 G
-1 0 0 1 281.694 514.25 Tm [<004500500044000E005600540046000E005100420059000F005500460059>]TJ
+1 0 0 1 281.694 493.926 Tm [<004500500044000E005600540046000E005100420059000F005500460059>]TJ
0 g 0 G
-/F36 10.90909 Tf
-1 0 0 1 74.409 497.712 Tm [<0024>]TJ
-/F55 10.90909 Tf
-1 0 0 1 80.137 497.712 Tm [<002F0051002B006D004B0032004D0069002B0048001C00620062>]TJ
-/F36 10.90909 Tf
-1 0 0 1 154.591 497.712 Tm [<0026001C006000690042002B004800320027>]TJ
-1 0 0 1 74.409 484.162 Tm [<0024>]TJ
-/F55 10.90909 Tf
-1 0 0 1 80.137 484.162 Tm [<006D006200320054001C002B0046001C003B0032>]TJ
-/F36 10.90909 Tf
-1 0 0 1 137.409 484.162 Tm [<0026004200370048006D001C006900320074002D003200690051005100480023005100740027>]TJ
-1 0 0 1 74.409 470.613 Tm [<0024>]TJ
-/F55 10.90909 Tf
-1 0 0 1 80.137 470.613 Tm [<006D006200320054001C002B0046001C003B0032>]TJ
-/F36 10.90909 Tf
-1 0 0 1 137.409 470.613 Tm [<00260054002F00370054001C003B003200620027>]TJ
+/F28 10.90909 Tf
+1 0 0 1 74.409 477.388 Tm [<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 80.137 477.388 Tm [<002F0051002B006D004B0032004D0069002B0048001C00620062>]TJ
+/F28 10.90909 Tf
+1 0 0 1 154.591 477.388 Tm [<0026001C006000690042002B004800320027>]TJ
+1 0 0 1 74.409 463.839 Tm [<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 80.137 463.839 Tm [<006D006200320054001C002B0046001C003B0032>]TJ
+/F28 10.90909 Tf
+1 0 0 1 137.409 463.839 Tm [<0026004200370048006D001C006900320074002D003200690051005100480023005100740027>]TJ
+1 0 0 1 74.409 450.289 Tm [<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 80.137 450.289 Tm [<006D006200320054001C002B0046001C003B0032>]TJ
+/F28 10.90909 Tf
+1 0 0 1 137.409 450.289 Tm [<00260054002F00370054001C003B003200620027>]TJ
0 0.5 0 rg 0 0.5 0 RG
-/F55 10.90909 Tf
-1 0 0 1 74.409 457.064 Tm [<0057>]TJ
+/F47 10.90909 Tf
+1 0 0 1 74.409 436.74 Tm [<0057>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 80.137 457.064 Tm [<0054001C0074>]TJ
+1 0 0 1 80.137 436.74 Tm [<0054001C0074>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 103.046 457.064 Tm [<004D00320032002F0062>]TJ
+1 0 0 1 103.046 436.74 Tm [<004D00320032002F0062>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 137.409 457.064 Tm [<0069003F00420062>]TJ
+1 0 0 1 137.409 436.74 Tm [<0069003F00420062>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 166.046 457.064 Tm [<00690051>]TJ
+1 0 0 1 166.046 436.74 Tm [<00690051>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 183.228 457.064 Tm [<0060006D004D>]TJ
+1 0 0 1 183.228 436.74 Tm [<0060006D004D>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 206.137 457.064 Tm [<007200420069003F>]TJ
+1 0 0 1 206.137 436.74 Tm [<007200420069003F>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 234.773 457.064 Tm [<0048006D001C0048001C006900320074>]TJ
+1 0 0 1 234.773 436.74 Tm [<0048006D001C0048001C006900320074>]TJ
0 g 0 G
-/F36 10.90909 Tf
-1 0 0 1 74.409 443.515 Tm [<0024004200370048006D001C006900320074>]TJ
-1 0 0 1 74.409 429.966 Tm [<0024>]TJ
-/F55 10.90909 Tf
-1 0 0 1 80.137 429.966 Tm [<006D006200320054001C002B0046001C003B0032>]TJ
-/F36 10.90909 Tf
-1 0 0 1 137.409 429.966 Tm [<00260054002F0037006900320074002B004B002F00620027>]TJ
-1 0 0 1 74.409 416.416 Tm [<0024>]TJ
-/F55 10.90909 Tf
-1 0 0 1 80.137 416.416 Tm [<004B001C00460032001C0069004800320069006900320060>]TJ
-/F36 10.90909 Tf
-1 0 0 1 74.409 402.867 Tm [<0024>]TJ
-/F55 10.90909 Tf
-1 0 0 1 80.137 402.867 Tm [<004800320069>]TJ
-/F36 10.90909 Tf
-1 0 0 1 97.319 402.867 Tm [<00240054002F0037006200690060002B004B005400240054002F00370021006200690060002B004B0054>]TJ
-1 0 0 1 74.409 389.318 Tm [<0024>]TJ
-/F55 10.90909 Tf
-1 0 0 1 80.137 389.318 Tm [<004800320069>]TJ
-/F36 10.90909 Tf
-1 0 0 1 97.319 389.318 Tm [<00240054002F003700320062002B001C00540032004D001C004B003200240054002F0037002100320062002B001C00540032004D001C004B0032>]TJ
-1 0 0 1 74.409 375.769 Tm [<0024>]TJ
-/F55 10.90909 Tf
-1 0 0 1 80.137 375.769 Tm [<004B001C00460032001C006900510069003F00320060>]TJ
-/F36 10.90909 Tf
-1 0 0 1 74.409 362.22 Tm [<0024>]TJ
-/F55 10.90909 Tf
-1 0 0 1 80.137 362.22 Tm [<006D006200320054001C002B0046001C003B0032>]TJ
-/F36 10.90909 Tf
-1 0 0 1 137.409 362.22 Tm [<00260048006D001C006900320074003300380027>]TJ
-1 0 0 1 74.409 348.67 Tm [<0024>]TJ
-/F55 10.90909 Tf
-1 0 0 1 80.137 348.67 Tm [<00370042>]TJ
+/F28 10.90909 Tf
+1 0 0 1 74.409 423.191 Tm [<0024004200370048006D001C006900320074>]TJ
+1 0 0 1 74.409 409.642 Tm [<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 80.137 409.642 Tm [<006D006200320054001C002B0046001C003B0032>]TJ
+/F28 10.90909 Tf
+1 0 0 1 137.409 409.642 Tm [<00260054002F0037006900320074002B004B002F00620027>]TJ
+1 0 0 1 74.409 396.093 Tm [<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 80.137 396.093 Tm [<004B001C00460032001C0069004800320069006900320060>]TJ
+/F28 10.90909 Tf
+1 0 0 1 74.409 382.543 Tm [<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 80.137 382.543 Tm [<004800320069>]TJ
+/F28 10.90909 Tf
+1 0 0 1 97.319 382.543 Tm [<00240054002F0037006200690060002B004B005400240054002F00370021006200690060002B004B0054>]TJ
+1 0 0 1 74.409 368.994 Tm [<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 80.137 368.994 Tm [<004800320069>]TJ
+/F28 10.90909 Tf
+1 0 0 1 97.319 368.994 Tm [<00240054002F003700320062002B001C00540032004D001C004B003200240054002F0037002100320062002B001C00540032004D001C004B0032>]TJ
+1 0 0 1 74.409 355.445 Tm [<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 80.137 355.445 Tm [<004B001C00460032001C006900510069003F00320060>]TJ
+/F28 10.90909 Tf
+1 0 0 1 74.409 341.896 Tm [<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 80.137 341.896 Tm [<006D006200320054001C002B0046001C003B0032>]TJ
+/F28 10.90909 Tf
+1 0 0 1 137.409 341.896 Tm [<00260048006D001C006900320074003300380027>]TJ
+1 0 0 1 74.409 328.347 Tm [<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 80.137 328.347 Tm [<00370042>]TJ
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 74.409 335.121 Tm [<0057>]TJ
+1 0 0 1 74.409 314.797 Tm [<0057>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 80.137 335.121 Tm [<00480051001C002F>]TJ
+1 0 0 1 80.137 314.797 Tm [<00480051001C002F>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 108.773 335.121 Tm [<0054001C0074>]TJ
+1 0 0 1 108.773 314.797 Tm [<0054001C0074>]TJ
0 g 0 G
-/F36 10.90909 Tf
-1 0 0 1 74.409 321.572 Tm [<0024>]TJ
-/F55 10.90909 Tf
-1 0 0 1 80.137 321.572 Tm [<006D006200320054001C002B0046001C003B0032>]TJ
-/F36 10.90909 Tf
-1 0 0 1 137.409 321.572 Tm [<00260054001C00740027>]TJ
+/F28 10.90909 Tf
+1 0 0 1 74.409 301.248 Tm [<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 80.137 301.248 Tm [<006D006200320054001C002B0046001C003B0032>]TJ
+/F28 10.90909 Tf
+1 0 0 1 137.409 301.248 Tm [<00260054001C00740027>]TJ
0 0.5 0 rg 0 0.5 0 RG
-/F55 10.90909 Tf
-1 0 0 1 74.409 308.023 Tm [<0057>]TJ
+/F47 10.90909 Tf
+1 0 0 1 74.409 287.699 Tm [<0057>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 80.137 308.023 Tm [<002B0051006000600032002B0069>]TJ
+1 0 0 1 80.137 287.699 Tm [<002B0051006000600032002B0069>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 125.955 308.023 Tm [<001C>]TJ
+1 0 0 1 125.955 287.699 Tm [<001C>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 137.409 308.023 Tm [<0023006D003B>]TJ
+1 0 0 1 137.409 287.699 Tm [<0023006D003B>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 160.319 308.023 Tm [<0042004D>]TJ
+1 0 0 1 160.319 287.699 Tm [<0042004D>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 177.5 308.023 Tm [<0054001C0074>]TJ
+1 0 0 1 177.5 287.699 Tm [<0054001C0074>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 200.409 308.023 Tm [<001C003700370032002B00690042004D003B>]TJ
+1 0 0 1 200.409 287.699 Tm [<001C003700370032002B00690042004D003B>]TJ
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
0 0.5 0 rg 0 0.5 0 RG
-1 0 0 1 257.682 308.023 Tm [<002B00480042005400540042004D003B>]TJ
+1 0 0 1 257.682 287.699 Tm [<002B00480042005400540042004D003B>]TJ
0 g 0 G
-/F36 10.90909 Tf
-1 0 0 1 74.409 294.474 Tm [<0024>]TJ
-/F55 10.90909 Tf
-1 0 0 1 80.137 294.474 Tm [<004B001C00460032001C0069004800320069006900320060>]TJ
-/F36 10.90909 Tf
-1 0 0 1 74.409 280.924 Tm [<00240054001C0069002B003F002B004B002F00240053001B007300210054002F00370021001C004D004D00510069002600240053001B007300210054001C003B00320048004800740027002600240053001B007300210054001C003B00320021004800480074002700260027002600240037001C004200480027>]TJ
-1 0 0 1 74.409 267.375 Tm [<0024>]TJ
-/F55 10.90909 Tf
-1 0 0 1 80.137 267.375 Tm [<004B001C00460032001C006900510069003F00320060>]TJ
-/F36 10.90909 Tf
-1 0 0 1 74.409 253.826 Tm [<0024>]TJ
-/F55 10.90909 Tf
-1 0 0 1 80.137 253.826 Tm [<00230032003B0042004D>]TJ
-/F36 10.90909 Tf
-1 0 0 1 108.773 253.826 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
-1 0 0 1 74.409 240.277 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B006200280062002B001C004800320034007900580038002D006900600042004B00340038002B004B>-525<00520038002B004B>-525<0033002B004B>-525<006A002B004B002D002B004800420054002D0054001C003B00320034006B00290026002F0051002B00400042004D0054006D006900520027>]TJ
-1 0 0 1 74.409 226.728 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B006200280062002B001C004800320034007900580038002D006900600042004B00340038002B004B>-525<00520038002B004B>-525<0033002B004B>-525<006A002B004B002D002B004800420054002D0054001C003B00320034005200290026002F0051002B00400042004D0054006D006900520027>]TJ
-1 0 0 1 74.409 199.629 Tm [<00240042004D002B0048006D002F00320054002F003700280054001C003B003200620034004000290026002F0051002B00400042004D0054006D0069006B0027>]TJ
-1 0 0 1 74.409 186.08 Tm [<0024>]TJ
-/F55 10.90909 Tf
-1 0 0 1 80.137 186.08 Tm [<0032004D002F>]TJ
-/F36 10.90909 Tf
-1 0 0 1 97.319 186.08 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
+/F28 10.90909 Tf
+1 0 0 1 74.409 274.15 Tm [<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 80.137 274.15 Tm [<004B001C00460032001C0069004800320069006900320060>]TJ
+/F28 10.90909 Tf
+1 0 0 1 74.409 260.601 Tm [<00240054001C0069002B003F002B004B002F00240053001B007300210054002F00370021001C004D004D00510069002600240053001B007300210054001C003B00320048004800740027002600240053001B007300210054001C003B00320021004800480074002700260027002600240037001C004200480027>]TJ
+0 0.5 0 rg 0 0.5 0 RG
+/F47 10.90909 Tf
+1 0 0 1 74.409 247.051 Tm [<0057>]TJ
0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 80.137 247.051 Tm [<001C0048004800510072>]TJ
0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 114.5 247.051 Tm [<003F001C0062003F00320062>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 154.591 247.051 Tm [<001C004D002F>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 177.5 247.051 Tm [<005400320060002B0032004D0069>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 223.319 247.051 Tm [<0042004D>]TJ
0 g 0 G
-/F57 10.90909 Tf
+0 0.5 0 rg 0 0.5 0 RG
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 240.5 247.051 Tm [<0069003F0032>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 263.409 247.051 Tm [<0054001C0074>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 286.319 247.051 Tm [<0037004200480032>]TJ
+0 g 0 G
+/F28 10.90909 Tf
+1 0 0 1 74.409 233.502 Tm [<00240054001C0069002B003F002B004B002F00240053001B00730021001B002F002F001B004D004D005100690062002600240041004D0054006D006900410037003600420048003200310074004200620069006200240053001B0073002100370042004800320026002700260024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 389.409 233.502 Tm [<00690076005400320051006D0069>]TJ
+/F28 10.90909 Tf
+1 0 0 1 429.5 233.502 Tm [<00260020>-525<004A0042006200620042004D003B002C>-525<00240053001B007300210037004200480032002700270027>]TJ
+1 0 0 1 79.319 219.953 Tm [<00260024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 90.773 219.953 Tm [<00230032003B0042004D003B00600051006D0054>]TJ
+/F28 10.90909 Tf
+1 0 0 1 153.773 219.953 Tm [<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 159.5 219.953 Tm [<002B001C0069002B0051002F0032>]TJ
+/F28 10.90909 Tf
+1 0 0 1 199.591 219.953 Tm [<003C0024004F00340052006B>-525<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 245.409 219.953 Tm [<002B001C0069002B0051002F0032>]TJ
+/F28 10.90909 Tf
+1 0 0 1 285.5 219.953 Tm [<003C0024>]TJ
+0 0.5 0 rg 0 0.5 0 RG
+/F47 10.90909 Tf
+1 0 0 1 296.955 219.953 Tm [<0057>]TJ
+0 g 0 G
+0 0.5 0 rg 0 0.5 0 RG
+1 0 0 1 302.682 219.953 Tm [<00340052006B>]TJ
+0 g 0 G
+/F28 10.90909 Tf
+1 0 0 1 84.228 206.404 Tm [<00240041004D0054006D006900410037003600420048003200310074004200620069006200240053001B0073002100370042004800320026002700260024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 261.773 206.404 Tm [<00690076005400320051006D0069>]TJ
+/F28 10.90909 Tf
+1 0 0 1 301.864 206.404 Tm [<00260020>-525<004A0042006200620042004D003B002C>-525<00240053001B007300210037004200480032002700270024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 439.318 206.404 Tm [<0032004D002F003B00600051006D0054>]TJ
+/F28 10.90909 Tf
+1 0 0 1 485.137 206.404 Tm [<002700260027002600240037001C004200480027>]TJ
+1 0 0 1 74.409 192.855 Tm [<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 80.137 192.855 Tm [<004B001C00460032001C006900510069003F00320060>]TJ
+/F28 10.90909 Tf
+1 0 0 1 74.409 179.305 Tm [<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 80.137 179.305 Tm [<00230032003B0042004D>]TJ
+/F28 10.90909 Tf
+1 0 0 1 108.773 179.305 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
+1 0 0 1 74.409 165.756 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B006200280062002B001C004800320034007900580038002D006900600042004B00340038002B004B>-525<00520038002B004B>-525<0033002B004B>-525<006A002B004B002D002B004800420054002D0054001C003B00320034006B00290026002F0051002B00400042004D0054006D006900520027>]TJ
+1 0 0 1 74.409 152.207 Tm [<00240042004D002B0048006D002F0032003B0060001C0054003F0042002B006200280062002B001C004800320034007900580038002D006900600042004B00340038002B004B>-525<00520038002B004B>-525<0033002B004B>-525<006A002B004B002D002B004800420054002D0054001C003B00320034005200290026002F0051002B00400042004D0054006D006900520027>]TJ
+1 0 0 1 74.409 125.109 Tm [<00240042004D002B0048006D002F00320054002F003700280054001C003B003200620034004000290026002F0051002B00400042004D0054006D0069006B0027>]TJ
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+/F49 10.90909 Tf
1 0 0 1 294.747 93.476 Tm [<0018>]TJ
0 g 0 G
0 g 0 G
@@ -2278,197 +2423,258 @@ ET
endstream
endobj
-178 0 obj
-<< /Type /Page /Contents 179 0 R /Resources 177 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 15 0 R >>
+177 0 obj
+<< /Type /Page /Contents 178 0 R /Resources 176 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 15 0 R >>
+endobj
+179 0 obj
+<< /D [ 177 0 R /XYZ 73.409 809.993 null ] >>
endobj
180 0 obj
-<< /D [ 178 0 R /XYZ 73.409 809.993 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 771.732 null ] >>
endobj
181 0 obj
-<< /D [ 178 0 R /XYZ 74.409 771.732 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 507.955 null ] >>
endobj
182 0 obj
-<< /D [ 178 0 R /XYZ 74.409 528.278 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 490.937 null ] >>
endobj
183 0 obj
-<< /D [ 178 0 R /XYZ 74.409 511.261 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 477.388 null ] >>
endobj
184 0 obj
-<< /D [ 178 0 R /XYZ 74.409 497.712 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 463.839 null ] >>
endobj
185 0 obj
-<< /D [ 178 0 R /XYZ 74.409 484.162 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 450.289 null ] >>
endobj
186 0 obj
-<< /D [ 178 0 R /XYZ 74.409 470.613 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 436.74 null ] >>
endobj
187 0 obj
-<< /D [ 178 0 R /XYZ 74.409 457.064 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 423.191 null ] >>
endobj
188 0 obj
-<< /D [ 178 0 R /XYZ 74.409 443.515 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 409.642 null ] >>
endobj
189 0 obj
-<< /D [ 178 0 R /XYZ 74.409 429.966 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 396.093 null ] >>
endobj
190 0 obj
-<< /D [ 178 0 R /XYZ 74.409 416.416 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 382.543 null ] >>
endobj
191 0 obj
-<< /D [ 178 0 R /XYZ 74.409 402.867 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 368.994 null ] >>
endobj
192 0 obj
-<< /D [ 178 0 R /XYZ 74.409 389.318 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 355.445 null ] >>
endobj
193 0 obj
-<< /D [ 178 0 R /XYZ 74.409 375.769 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 341.896 null ] >>
endobj
194 0 obj
-<< /D [ 178 0 R /XYZ 74.409 362.22 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 328.347 null ] >>
endobj
195 0 obj
-<< /D [ 178 0 R /XYZ 74.409 348.67 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 314.797 null ] >>
endobj
196 0 obj
-<< /D [ 178 0 R /XYZ 74.409 335.121 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 301.248 null ] >>
endobj
197 0 obj
-<< /D [ 178 0 R /XYZ 74.409 321.572 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 287.699 null ] >>
endobj
198 0 obj
-<< /D [ 178 0 R /XYZ 74.409 308.023 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 274.15 null ] >>
endobj
199 0 obj
-<< /D [ 178 0 R /XYZ 74.409 294.474 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 260.601 null ] >>
endobj
200 0 obj
-<< /D [ 178 0 R /XYZ 74.409 280.924 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 247.051 null ] >>
endobj
201 0 obj
-<< /D [ 178 0 R /XYZ 74.409 267.375 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 233.502 null ] >>
endobj
202 0 obj
-<< /D [ 178 0 R /XYZ 74.409 253.826 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 219.953 null ] >>
endobj
203 0 obj
-<< /D [ 178 0 R /XYZ 74.409 240.277 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 206.404 null ] >>
endobj
204 0 obj
-<< /D [ 178 0 R /XYZ 74.409 226.728 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 192.855 null ] >>
endobj
205 0 obj
-<< /D [ 178 0 R /XYZ 74.409 213.178 null ] >>
+<< /D [ 177 0 R /XYZ 74.409 179.305 null ] >>
endobj
206 0 obj
-<< /D [ 178 0 R /XYZ 74.409 199.629 null ] >>
-endobj
-177 0 obj
-<< /ExtGState 1 0 R /Font << /F54 10 0 R /F55 11 0 R /F57 12 0 R /F36 14 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /D [ 177 0 R /XYZ 74.409 165.756 null ] >>
endobj
207 0 obj
-<< /DisplayDocTitle true >>
+<< /D [ 177 0 R /XYZ 74.409 152.207 null ] >>
endobj
208 0 obj
-<< /S /GoTo /D (section.1) >>
+<< /D [ 177 0 R /XYZ 74.409 138.658 null ] >>
+endobj
+176 0 obj
+<< /ExtGState 1 0 R /Font << /F46 10 0 R /F47 11 0 R /F49 12 0 R /F28 14 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+211 0 obj
+<< /Length 439 >>
+stream
+/opacity1 gs
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+BT
+/F28 10.90909 Tf
+1 0 0 1 74.409 760.773 Tm [<0024>]TJ
+/F47 10.90909 Tf
+1 0 0 1 80.137 760.773 Tm [<0032004D002F>]TJ
+/F28 10.90909 Tf
+1 0 0 1 97.319 760.773 Tm [<0026002F0051002B006D004B0032004D00690027>]TJ
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+/F49 10.90909 Tf
+1 0 0 1 294.747 93.476 Tm [<0019>]TJ
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+0 g 0 G
+ET
+
+endstream
endobj
210 0 obj
+<< /Type /Page /Contents 211 0 R /Resources 209 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 15 0 R >>
+endobj
+212 0 obj
+<< /D [ 210 0 R /XYZ 73.409 809.993 null ] >>
+endobj
+213 0 obj
+<< /D [ 210 0 R /XYZ 74.409 774.323 null ] >>
+endobj
+209 0 obj
+<< /ExtGState 1 0 R /Font << /F28 14 0 R /F47 11 0 R /F49 12 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+1 0 obj
+<< /opacity1 <</ca 1/CA 1>> >>
+endobj
+214 0 obj
+<< /DisplayDocTitle true >>
+endobj
+215 0 obj
+<< /S /GoTo /D (section.1) >>
+endobj
+217 0 obj
(\376\377\000I\000n\000t\000r\000o\000d\000u\000c\000t\000i\000o\000n)
endobj
-211 0 obj
+218 0 obj
<< /S /GoTo /D (section.2) >>
endobj
-213 0 obj
+220 0 obj
(\376\377\000Q\000u\000i\000c\000k\000\040\000u\000s\000e\000\040\000i\000n\000s\000t\000r\000u\000c\000t\000i\000o\000n\000s)
endobj
-214 0 obj
+221 0 obj
<< /S /GoTo /D (subsection.2.1) >>
endobj
-216 0 obj
+223 0 obj
(\376\377\000S\000t\000e\000p\000\040\0001\000:\000\040\000e\000x\000t\000r\000a\000c\000t\000\040\000a\000n\000d\000\040\000c\000o\000l\000l\000e\000c\000t\000\040\000t\000h\000e\000\040\000a\000n\000n\000o\000t\000a\000t\000i\000o\000n\000s)
endobj
-217 0 obj
+224 0 obj
<< /S /GoTo /D (subsection.2.2) >>
endobj
-219 0 obj
+226 0 obj
(\376\377\000S\000t\000e\000p\000\040\0002\000:\000\040\000U\000s\000i\000n\000g\000\040\000t\000h\000e\000\040\000.\000n\000e\000w\000p\000a\000x\000-\000f\000i\000l\000e\000\040\000w\000i\000t\000h\000\040\000n\000e\000w\000p\000a\000x)
endobj
-220 0 obj
+227 0 obj
<< /S /GoTo /D (subsection.2.3) >>
endobj
-222 0 obj
+229 0 obj
(\376\377\000C\000o\000m\000b\000i\000n\000i\000n\000g\000\040\000t\000h\000e\000\040\000s\000t\000e\000p\000s)
endobj
-223 0 obj
+230 0 obj
<< /S /GoTo /D (section.3) >>
endobj
-225 0 obj
+232 0 obj
(\376\377\000S\000e\000t\000u\000p\000\040\000o\000p\000t\000i\000o\000n\000s)
endobj
-226 0 obj
+233 0 obj
<< /S /GoTo /D (section.4) >>
endobj
-228 0 obj
+235 0 obj
(\376\377\000M\000o\000r\000e\000\040\000B\000a\000c\000k\000g\000r\000o\000u\000n\000d)
endobj
-229 0 obj
+236 0 obj
<< /S /GoTo /D (subsection.4.1) >>
endobj
-231 0 obj
+238 0 obj
(\376\377\000R\000e\000t\000r\000i\000e\000v\000i\000n\000g\000\040\000a\000n\000d\000\040\000s\000t\000o\000r\000i\000n\000g\000\040\000a\000n\000n\000o\000t\000a\000t\000i\000o\000n\000s)
endobj
-232 0 obj
+239 0 obj
<< /S /GoTo /D (section.5) >>
endobj
-234 0 obj
+241 0 obj
(\376\377\000I\000m\000p\000o\000r\000t\000i\000n\000g\000\040\000a\000n\000n\000o\000t\000a\000t\000i\000o\000n\000s)
endobj
-235 0 obj
+242 0 obj
<< /S /GoTo /D (section.6) >>
endobj
-237 0 obj
+244 0 obj
(\376\377\000E\000x\000a\000m\000p\000l\000e\000\040\000i\000n\000p\000u\000t)
endobj
-238 0 obj
+245 0 obj
<< /S /GoTo /D (section.7) >>
endobj
-240 0 obj
+247 0 obj
(\376\377\000S\000u\000p\000p\000o\000r\000t\000\040\000f\000o\000r\000\040\000t\000h\000e\000\040\000p\000a\000x\000\040\000p\000a\000c\000k\000a\000g\000e)
endobj
-241 0 obj
+248 0 obj
<< /S /GoTo /D (subsection.7.1) >>
endobj
-243 0 obj
+250 0 obj
(\376\377\000S\000t\000e\000p\000\040\0001\000:\000\040\000E\000x\000t\000r\000a\000c\000t\000i\000n\000g\000\040\000t\000h\000e\000\040\000a\000n\000n\000o\000t\000a\000t\000i\000o\000n\000s)
endobj
-244 0 obj
+251 0 obj
<< /S /GoTo /D (subsection.7.2) >>
endobj
-246 0 obj
+253 0 obj
(\376\377\000S\000t\000e\000p\000\040\0002\000:\000\040\000U\000s\000i\000n\000g\000\040\000t\000h\000e\000\040\000.\000p\000a\000x\000-\000f\000i\000l\000e\000\040\000w\000i\000t\000h\000\040\000p\000a\000x\000.\000s\000t\000y)
endobj
-247 0 obj
+254 0 obj
[ 66 [ 561 ] 68 [ 441 587 453 ] 74 [ 317 ] 77 [ 306 ] 79 [ 618 537 ] 83 [ 402 389 341 618 510 ] ]
endobj
-249 0 obj
+256 0 obj
<< /Length 11 >>
stream
endstream
endobj
-250 0 obj
+257 0 obj
<< /Subtype /CIDFontType0C /Length 2094 >>
stream

@@ -2479,10 +2685,10 @@ Heuristica ItalicHeuristicaAdobeIdentity
ˏ 
endstream
endobj
-248 0 obj
-<< /Type /FontDescriptor /FontName /ZZHGJH+Heuristica-Italic /Flags 4 /FontBBox [ -500 -326 1205 1110 ] /Ascent 950 /CapHeight 692 /Descent -250 /ItalicAngle -13 /StemV 88 /XHeight 490 /FontFile3 250 0 R /CIDSet 249 0 R >>
+255 0 obj
+<< /Type /FontDescriptor /FontName /ZZHGJH+Heuristica-Italic /Flags 4 /FontBBox [ -500 -326 1205 1110 ] /Ascent 950 /CapHeight 692 /Descent -250 /ItalicAngle -13 /StemV 88 /XHeight 490 /FontFile3 257 0 R /CIDSet 256 0 R >>
endobj
-251 0 obj
+258 0 obj
<< /Length 861 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -2532,30 +2738,30 @@ end
endstream
endobj
35 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ZZHGJH+Heuristica-Italic /DescendantFonts [ 252 0 R ] /ToUnicode 251 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ZZHGJH+Heuristica-Italic /DescendantFonts [ 259 0 R ] /ToUnicode 258 0 R >>
endobj
-252 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ZZHGJH+Heuristica-Italic /FontDescriptor 248 0 R /W 247 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+259 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ZZHGJH+Heuristica-Italic /FontDescriptor 255 0 R /W 254 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-253 0 obj
-[ 27 [ 525 525 ] 33 [ 525 525 525 525 ] 38 [ 525 525 525 525 525 525 525 525 525 525 ] 49 [ 525 525 525 525 ] 54 [ 525 525 525 525 ] 59 [ 525 ] 61 [ 525 525 525 525 525 525 ] 68 [ 525 ] 70 [ 525 525 525 525 525 525 ] 77 [ 525 ] 80 [ 525 525 525 525 525 525 525 ] 88 [ 525 ] 91 [ 525 ] 93 [ 525 ] 95 [ 525 525 525 525 ] 100 [ 525 525 525 ] 104 [ 525 525 525 525 525 525 525 ] 112 [ 525 525 525 525 525 ] 118 [ 525 ] 121 [ 525 ] ]
+260 0 obj
+[ 27 [ 525 525 ] 32 [ 525 525 525 525 525 ] 38 [ 525 525 525 525 525 525 525 525 525 525 ] 49 [ 525 525 525 525 ] 54 [ 525 525 525 525 ] 59 [ 525 525 525 525 525 525 525 525 ] 68 [ 525 ] 70 [ 525 525 525 525 525 525 ] 77 [ 525 ] 79 [ 525 525 525 525 525 525 525 525 ] 88 [ 525 ] 91 [ 525 ] 93 [ 525 ] 95 [ 525 525 525 525 ] 100 [ 525 525 525 ] 104 [ 525 525 525 525 525 525 525 ] 112 [ 525 525 525 525 525 ] 118 [ 525 ] 121 [ 525 ] ]
endobj
-255 0 obj
+262 0 obj
<< /Length 16 >>
stream
-
+
endstream
endobj
-256 0 obj
-<< /Subtype /CIDFontType0C /Length 8164 >>
+263 0 obj
+<< /Subtype /CIDFontType0C /Length 8551 >>
stream
-
-POXPUQ+LMMono10-Regular2.004Copyright 2003, 2009 B. Jackowski and J. M. Nowacki (on behalf of TeX users groups). This work is released under the GUST Font License -- see http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt for details.LMMono10-RegularLMMono10NormalAdobeIdentity
->
-  ~ G M #VDFe)S#S nhRA!wOOu| }ln{e }t~mwg6#gwlm=XT{xr|alU$`%Bm{׿lDEY+FJɒ@l=tvdyzg^Mb%ȾȾEtozkhei
+
+NXAEHY+LMMono10-Regular2.004Copyright 2003, 2009 B. Jackowski and J. M. Nowacki (on behalf of TeX users groups). This work is released under the GUST Font License -- see http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt for details.LMMono10-RegularLMMono10NormalAdobeIdentity
+  F A d
+ _Do ]6yG7C$ Wz'aMA!wOOu| }ln{e }t~mwg6#gwlm=XT{xr|alU$`%Bm{׿lDEY+FJɒ@l=tvdyzg^Mb%y\jrGq
h_ubRs{jkytݸBJ;DO7oKotv|md8E
-
-}|ihwvF}q|6{slm}f{slm }xgs{i2{rlm}{rlmh~IIx{}c~x~e9``vk}5r|Sb}qH^gnn3r}S|rml}kvlmΪvkq]T~teqkvlmT vg2mb~do|ojkm}usܩwyk|qmlgvlmvgG䴺zJ}xrlmvgG䴺zJ}xrlmTTr{_|X<H^ixxЫcB{rlm_{rlm3r{_EձoOwd{rlm-hvMMvppMLFMDUSqv23rɋϖƘ֮T\@Ngl..(,F.M@AAMJ0wNs{0mxe6Wx{vor:0{slmLt@At|qml}m{rlmq|mLFV`F+!FVr/Tз |l2![^ylieB{rlm_{rlm3r{_baF+EJE=hB4AIUy]qn` 1YBS ]hV@srw|85J'f0||w`\mkerllfqr/Ts{ZihzepbR%,*ϹkZ|rml;2RZ99AJָ>Ii~xn__|v8`i~xn__|vjjIaПstmfzoʋt}Ͱȴ?
+
+}|ihwvF}q|6{slm}f{slm }xgs{i2{rlm}{rlmh~IIx{}c~x~e9``vk}5r|Sb}qH^gnn3r}S|rml}kvlmΪvkq]T~teqkvlmT vg2mb~do|ojkm}usܩwyk|qmlgvlmvgG䴺zJ}xrlmvgG䴺zJ}xrlmTTr{_|X<H^ixxЫcB{rlm_{rlm3r{_EձoOwd{rlm-v7&6w}ZhI&hes|ln| $s|ln| >hhhy&Zhhh{yz{yz:Iy&$&hvMMvppMLFMDUSqv23rɋϖƘ֮T\@Ngl..(,F.M@AAMJ0wNs{0mxe6Wx{vor:0{slmLt@At|qml}m{rlmq|mLFV`F+!FVr/Tз |l2![^ylieB{rlm_{rlm3r{_baF+EJE=hB4AIUy]qn` 1YBS ]hV@srw|85J'f0||w`\mkerllfqr/Ts{ZihzepbR%,*ϹkZ|rml;2RZ99AJָ>Ii~xn__|v8`i~xn__|vjjIaПstmfzoʋt}Ͱȴ?
E{slm}r{slm s{rjovuaJmkm{ʣͱ2Z^Q0CjP[T-Ћ0{ 8XKyLTتi|rml:|rmlq|$ swJкell:gbp=:ae
-lumszmbU^@<6HIspw4W`P<oZcakhvw{rm{_kGnGޙmqzzms}__x;t9g/z}~Vffj0\Srqhvw*{rg2޻vts{yiuxaxuALip}j-B9DWkU3WWzb^!yswg* ^B F5IRCJdwǽHAf'|wu|~F{yzF}8ijjBxu}W|rmlAs{W}Vxu-2UhjvzMRt>8s{8ihvw94{rlm+gܶZO
cntB\IïB E[Fj}ҋϽg^m|hpukqrgR|nlHQNSL0c>qxrtu|k2Qrnlihxoƾֶù &
@@ -2563,21 +2769,21 @@ h_ubRs{jkytݸBJ;DO7oKotv|md8E
YY$s{ |rmls{ {slmin444q|<{slm_NWo\Ztwu\\MW s{<|qlmh~^yr[[%syysmlY~yhxucwWtxysmlt|ȝ㌙W z}MBMWMAM0Mq|t!tq|#|rmlD&>&r|#|qml uu{slmstVVtulmZTZZLZq|c5(q| |rmlA&?r| |qlm
(5c|qlm vloulm xN_[YHFY$s{ |rmlCi~fyl.s{ {slm"r7~rnTg|@yrpzyqac/[nN%'JNJF(J
==J
-(&)'
+(&)'

endstream
endobj
-254 0 obj
-<< /Type /FontDescriptor /FontName /POXPUQ+LMMono10-Regular /Flags 4 /FontBBox [ -451 -316 731 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 256 0 R /CIDSet 255 0 R >>
+261 0 obj
+<< /Type /FontDescriptor /FontName /NXAEHY+LMMono10-Regular /Flags 4 /FontBBox [ -451 -316 731 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 263 0 R /CIDSet 262 0 R >>
endobj
-257 0 obj
-<< /Length 1654 >>
+264 0 obj
+<< /Length 1696 >>
stream
%!PS-Adobe-3.0 Resource-CMap
%%DocumentNeededResources: ProcSet (CIDInit)
%%IncludeResource: ProcSet (CIDInit)
-%%BeginResource: CMap (TeX-POXPUQ-LMMono10-Regular-0)
-%%Title: (TeX-POXPUQ-LMMono10-Regular-0 TeX POXPUQ-LMMono10-Regular 0)
+%%BeginResource: CMap (TeX-NXAEHY-LMMono10-Regular-0)
+%%Title: (TeX-NXAEHY-LMMono10-Regular-0 TeX NXAEHY-LMMono10-Regular 0)
%%Version: 1.000
%%EndComments
/CIDInit /ProcSet findresource begin
@@ -2585,19 +2791,20 @@ stream
begincmap
/CIDSystemInfo
<< /Registry (TeX)
-/Ordering (POXPUQ-LMMono10-Regular)
+/Ordering (NXAEHY-LMMono10-Regular)
/Supplement 0
>> def
-/CMapName /TeX-Identity-POXPUQ-LMMono10-Regular def
+/CMapName /TeX-Identity-NXAEHY-LMMono10-Regular def
/CMapType 2 def
1 begincodespacerange
<0000> <FFFF>
endcodespacerange
0 beginbfrange
endbfrange
-70 beginbfchar
+73 beginbfchar
<001B> <0041>
<001C> <0061>
+<0020> <002A>
<0021> <0040>
<0022> <0042>
<0023> <0062>
@@ -2621,6 +2828,7 @@ endbfrange
<0038> <0035>
<0039> <0034>
<003B> <0067>
+<003C> <0060>
<003D> <003E>
<003E> <0048>
<003F> <0068>
@@ -2635,6 +2843,7 @@ endbfrange
<004A> <004D>
<004B> <006D>
<004D> <006E>
+<004F> <0023>
<0050> <004F>
<0051> <006F>
<0052> <0031>
@@ -2677,54 +2886,55 @@ end
endstream
endobj
14 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /POXPUQ+LMMono10-Regular /DescendantFonts [ 258 0 R ] /ToUnicode 257 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /NXAEHY+LMMono10-Regular /DescendantFonts [ 265 0 R ] /ToUnicode 264 0 R >>
endobj
-258 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /POXPUQ+LMMono10-Regular /FontDescriptor 254 0 R /W 253 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+265 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /NXAEHY+LMMono10-Regular /FontDescriptor 261 0 R /W 260 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-259 0 obj
-[ 2 [ 242 ] 9 [ 350 350 412 ] 13 [ 265 392 265 460 530 530 530 530 530 530 530 530 ] 27 [ 265 265 ] 33 [ 793 635 646 684 779 606 580 ] 41 [ 798 349 ] 45 [ 568 ] 48 [ 762 600 ] 51 [ 644 541 621 791 ] 56 [ 940 624 588 ] 66 [ 523 598 496 598 514 319 520 607 291 280 524 279 923 619 577 608 591 389 436 344 606 504 768 486 506 ] 1090 [ 500 1000 ] 1093 [ 278 ] 1095 [ 458 458 ] 1100 [ 409 ] 1388 [ 638 610 610 929 ] ]
+266 0 obj
+[ 2 [ 242 ] 4 [ 530 ] 6 [ 838 ] 9 [ 350 350 412 ] 13 [ 265 392 265 460 530 530 530 530 530 530 530 530 530 ] 27 [ 265 265 ] 33 [ 793 635 646 684 779 606 580 ] 41 [ 798 349 ] 45 [ 568 ] 48 [ 762 600 ] 51 [ 644 541 621 791 ] 56 [ 940 624 588 ] 66 [ 523 598 496 598 514 319 520 607 291 280 524 279 923 619 577 608 591 389 436 344 606 504 768 486 506 ] 1091 [ 1000 ] 1093 [ 278 ] 1095 [ 458 458 ] 1100 [ 409 ] 1388 [ 638 610 610 929 ] ]
endobj
-261 0 obj
+268 0 obj
<< /Length 174 >>
stream
- wd?
+*wd?
endstream
endobj
-262 0 obj
-<< /Subtype /CIDFontType0C /Length 8513 >>
+269 0 obj
+<< /Subtype /CIDFontType0C /Length 8903 >>
stream
-
+
Copyright (c) 2008-2012 Andrey V. Panov (panov@canopus.iacp.dvo.ru).
-Heuristica RegularHeuristicaAdobeIdentity
-
-'
-   R S u|e%m2PY*jC[ ;G@H@'++*`'w
-CCTUu^gpsderof}NmCQ/ʘC^mN}C$rCmNN^mCr~5/6Q?WwC`{wfz+duwwy{x.tzx~F{u+z}w}>Jrrw-z?|y|u!x͋melysqgy`bqckhSllѾgpsderofvfw|΋ffHV\&99&\\P&99P&\7((77p(,,p(7Vwvܨ7vᆑbhrnyx7Vͮ2ovUwcո/"D8Wi{ϲɋ؋JB UO4> `Gx=VRj?`D!%Tⳋ4 J?`lzϱËڞESOv@6[p~yz>4 PaDI`xÅ}yhxgV'Nw\v%isKn^t$NB-B/0ӥ V9]G9 3 TPsknOφ⋁w\$a=4EgwĆ}wjwjVsl"*(7 <RVpjp勹dRZ 3*BȸR"bD74a Vv;gyQ:5R
-jɮ4=gpsderof
+Heuristica RegularHeuristicaAdobeIdentity
+
+U
+ 0 j '  Z ^TXK/jIrYvc7;@H@'++*`'w
+CCTUu^gpsderofVv|gw|Q|‹|Q||􋕹#􋕹#gVWggUWg!]j!4jkckw;
+pLTisiyrxi=t|pjX!XG󬺽\#+lTVWlGX !XG󬺽\#+lTVWl}NmCQ/ʘC^mN}C$rCmNN^mCr~5/6Q?WwC`{wfz+duwwy{x.tzx~F{u+z}w}>Jrrw-z?|y|u!x͋melysqgy`bqckhSllѾgpsderofvfw|΋ffHV\&99&\\P&99P&\7((77p(,,p(7Vwvܨ7vᆑbhrnyx7Vͮ2ovUwcո/"D8Wi{ϲɋ؋JB UO4> `Gx=VRj?`D!%Tⳋ4 J?`lzϱËڞESOv@6[p~yz>4 PaDI`xÅ}yhxgV'Nw\v%isKn^t$NB-B/0ӥ V9]G9 3 TPsknOφ⋁w\$a=4EgwĆ}wjwjVsl"*(7 <RVpjp勹dRZ 3*BȸR"bD74a Vv;gyQ:5R
+jɮ4Vϯ=d=J&.66KGț
gpsderof!q4`=gpsderofxx͋melysqgy`bqckhf|(/DlB%;ɋܖɭ^xIQuI4KD]"1;$D+Hu{Jx~tFA`AJyڋ㧽mrx\{
7*ŋ؋ucdQ;nㅍSS3QM! 9k5;{mp$)Ld#| O} -OMtۋ硻;mo#X?b`_ 88Na
0^?0(gOHRKi5XGG8B>nㅍSS3Qoh=H<4zƱAmt^{\gvvq sLgmMs6 r#8nㅍSS3$~ sKjmKs6 t%4nㅍSS3ḵ4S3n4ÎnㅍSppÎnㅍSS3~4ÎnㅍSS3|̩GmwT~"YgvvsÎnㅍSS3G| N/OLiݭǪlUS99iSLUOl/'GFFG''`GFF`G'
"T]*a| vAa4bxыE
; kHSNjԷߋዻZ&!iGG
'FٜYnĆ~y~P]6l`bb?glk
-a_ iFz|ztm|k|jyyxrpnso(FѝTnw|OW+_ ] cf􅝉y8qq5q|q||zw|{΋kjmyvpgvfeselgrUkjzY]GHDHUkjzY]GHDzw|{΋kjmyvpgvfeselgH{΋kjmyvpgvfeselgBT3CB54BB4‹9^wuܩVXCn:
+a_ iFz|ztm|k|jyyxrpnso(FѝTnw|OW+_ ] cf􅝉y5q|q||zw|{΋kjmyvpgvfeselgrUkjzY]GHDHUkjzY]GHDzw|{΋kjmyvpgvfeselgH{΋kjmyvpgvfeselgBT3CB54BB4‹9^wuܩVXCn:

endstream
endobj
-260 0 obj
-<< /Type /FontDescriptor /FontName /FMGWKE+Heuristica-Regular /Flags 4 /FontBBox [ -500 -448 1158 1110 ] /Ascent 950 /CapHeight 692 /Descent -250 /ItalicAngle 0 /StemV 88 /XHeight 490 /FontFile3 262 0 R /CIDSet 261 0 R >>
+267 0 obj
+<< /Type /FontDescriptor /FontName /JRDHBW+Heuristica-Regular /Flags 4 /FontBBox [ -500 -448 1158 1110 ] /Ascent 950 /CapHeight 692 /Descent -250 /ItalicAngle 0 /StemV 88 /XHeight 490 /FontFile3 269 0 R /CIDSet 268 0 R >>
endobj
-263 0 obj
-<< /Length 1712 >>
+270 0 obj
+<< /Length 1740 >>
stream
%!PS-Adobe-3.0 Resource-CMap
%%DocumentNeededResources: ProcSet (CIDInit)
%%IncludeResource: ProcSet (CIDInit)
-%%BeginResource: CMap (TeX-FMGWKE-Heuristica-Regular-0)
-%%Title: (TeX-FMGWKE-Heuristica-Regular-0 TeX FMGWKE-Heuristica-Regular 0)
+%%BeginResource: CMap (TeX-JRDHBW-Heuristica-Regular-0)
+%%Title: (TeX-JRDHBW-Heuristica-Regular-0 TeX JRDHBW-Heuristica-Regular 0)
%%Version: 1.000
%%EndComments
/CIDInit /ProcSet findresource begin
@@ -2732,18 +2942,20 @@ stream
begincmap
/CIDSystemInfo
<< /Registry (TeX)
-/Ordering (FMGWKE-Heuristica-Regular)
+/Ordering (JRDHBW-Heuristica-Regular)
/Supplement 0
>> def
-/CMapName /TeX-Identity-FMGWKE-Heuristica-Regular def
+/CMapName /TeX-Identity-JRDHBW-Heuristica-Regular def
/CMapType 2 def
1 begincodespacerange
<0000> <FFFF>
endcodespacerange
0 beginbfrange
endbfrange
-72 beginbfchar
+74 beginbfchar
<0002> <0021>
+<0004> <0023>
+<0006> <0025>
<0009> <0028>
<000A> <0029>
<000B> <002A>
@@ -2759,6 +2971,7 @@ endbfrange
<0016> <0035>
<0017> <0036>
<0018> <0037>
+<0019> <0038>
<001B> <003A>
<001C> <003B>
<0021> <0040>
@@ -2805,7 +3018,6 @@ endbfrange
<0058> <0077>
<0059> <0078>
<005A> <0079>
-<0442> <2013>
<0443> <2014>
<0445> <2019>
<0447> <201C>
@@ -2826,41 +3038,41 @@ end
endstream
endobj
12 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /FMGWKE+Heuristica-Regular /DescendantFonts [ 264 0 R ] /ToUnicode 263 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /JRDHBW+Heuristica-Regular /DescendantFonts [ 271 0 R ] /ToUnicode 270 0 R >>
endobj
-264 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /FMGWKE+Heuristica-Regular /FontDescriptor 260 0 R /W 259 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+271 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /JRDHBW+Heuristica-Regular /FontDescriptor 267 0 R /W 266 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-265 0 obj
-[ 28 [ 525 ] 35 [ 525 525 ] 43 [ 525 ] 45 [ 525 ] 47 [ 525 ] 50 [ 525 ] 55 [ 525 ] 59 [ 525 ] 63 [ 525 ] 66 [ 525 ] 70 [ 525 ] 72 [ 525 ] 75 [ 525 ] 77 [ 525 ] 81 [ 525 ] 84 [ 525 ] 87 [ 525 525 ] 91 [ 525 ] 94 [ 525 ] 96 [ 525 ] 98 [ 525 ] 102 [ 525 ] 105 [ 525 ] 109 [ 525 ] 112 [ 525 ] 114 [ 525 ] 116 [ 525 ] 118 [ 525 ] ]
+272 0 obj
+[ 28 [ 525 ] 35 [ 525 525 ] 43 [ 525 ] 45 [ 525 ] 47 [ 525 ] 50 [ 525 ] 52 [ 525 ] 55 [ 525 ] 59 [ 525 ] 63 [ 525 525 ] 66 [ 525 ] 70 [ 525 525 525 ] 75 [ 525 ] 77 [ 525 ] 81 [ 525 525 ] 84 [ 525 ] 87 [ 525 525 ] 91 [ 525 ] 94 [ 525 ] 96 [ 525 ] 98 [ 525 ] 101 [ 525 525 ] 104 [ 525 525 ] 107 [ 525 ] 109 [ 525 ] 112 [ 525 ] 114 [ 525 525 525 ] 118 [ 525 ] 121 [ 525 ] ]
endobj
-267 0 obj
-<< /Length 15 >>
+274 0 obj
+<< /Length 16 >>
stream
-
+
endstream
endobj
-268 0 obj
-<< /Subtype /CIDFontType0C /Length 3828 >>
+275 0 obj
+<< /Subtype /CIDFontType0C /Length 4658 >>
stream
-
-9
-   AFpnyn}aU&^#?iyͺrPA V,DGƒ@pJxxj|{iaTfکދ9|d~n0 `c}sj4cD0xnfg|ssʪk93KNJDlܷG;Ovwid5qsywu5x+kihxswaK=H߸c|!\AN2 $#V2a\_rjhap{\fvsxwFދދ~mzg|cDxnfglfe),)No;3Xb>EIUŷYY ghuu]wZrHHyI )&%5&ʛu4FL7y9=[1`1xngg0ymgfmy0pxʿ}os-ұHiݏߡ
-xnfgExgx .oejnzplnpytܡxylymhjgxjg{g;ۭ{Sovxkgzg;ۮ{SowxkgE\goxhnV9SctxsHdDxoggЯhxofg/nxh9ϮrVimxnfg)jn,,(+85REGGRO7lE]i)~n0 `b}rj$gDxngghxnfg/ŰnxhCj93KNJDlܷG;:rҷҷk`YXaP<:Ruyspv{2tx6bWWbO>=OfrphessfVjhapiicnlܳbGpxc"cilpeZ$,)ĵKcynhf7> W^?@GOϴDOvwd|ujYZyseE(4} 3[Q|WW c @ynhfDyngfmy'
+
+
+ ( ^  M X`AFpnyn}aU&^#?iyͺrPA V,DGƒ@pJxxj|{iaTfکދ9|d~n0 `c}sj4cD0xnfg|ssʪk93KNJDlܷG;Ovwid5qsywu5x+kihxswaK=H߸c|!\AN2 $#V2a\_rjhap{\fvsxwFދދ~mzg|cDxnfglfe),)No;3Xb>EIUŷYY ghuu]wZrHHyI )&%5&ʛu4R|b{{bcb(e}}ebcFL7y9=[1`1xngg0ymgfmy0pxʿ}os-ұHiݏߡ
+xnfgExgx .oejnzplnpytܡxylymhjgxjg{g;ۭ{Sovxkgzg;ۮ{SowxkgE\goxhnV9SctxsHdDxoggЯhxofg/nxh9ϮrVimxnfg)jn,,(+85REGGRO7 wQpx:ht}}i=[zxsjl:xofglE]i)~n0 `b}rj$gDxngghxnfg/ŰnxhCj93KNJDlܷG;:rҷҷk`YXaP<:Ruyspv{2tx6bWWbO>=OfrphessfVjhapiicnlܳbGpxc"cilpeZ$,)ĵKcynhf7> W^?@GOϴDOvwd|ujYZyseE(4} 3[Q|WW c @ynhfDyngfmy'
э 
endstream
endobj
-266 0 obj
-<< /Type /FontDescriptor /FontName /SRVENG+LMMonoLt10-Bold /Flags 4 /FontBBox [ -454 -308 734 1039 ] /Ascent 1039 /CapHeight 611 /Descent -308 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 268 0 R /CIDSet 267 0 R >>
+273 0 obj
+<< /Type /FontDescriptor /FontName /QFORMF+LMMonoLt10-Bold /Flags 4 /FontBBox [ -454 -308 734 1039 ] /Ascent 1039 /CapHeight 611 /Descent -308 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 275 0 R /CIDSet 274 0 R >>
endobj
-269 0 obj
-<< /Length 1089 >>
+276 0 obj
+<< /Length 1215 >>
stream
%!PS-Adobe-3.0 Resource-CMap
%%DocumentNeededResources: ProcSet (CIDInit)
%%IncludeResource: ProcSet (CIDInit)
-%%BeginResource: CMap (TeX-SRVENG-LMMonoLt10-Bold-0)
-%%Title: (TeX-SRVENG-LMMonoLt10-Bold-0 TeX SRVENG-LMMonoLt10-Bold 0)
+%%BeginResource: CMap (TeX-QFORMF-LMMonoLt10-Bold-0)
+%%Title: (TeX-QFORMF-LMMonoLt10-Bold-0 TeX QFORMF-LMMonoLt10-Bold 0)
%%Version: 1.000
%%EndComments
/CIDInit /ProcSet findresource begin
@@ -2868,17 +3080,17 @@ stream
begincmap
/CIDSystemInfo
<< /Registry (TeX)
-/Ordering (SRVENG-LMMonoLt10-Bold)
+/Ordering (QFORMF-LMMonoLt10-Bold)
/Supplement 0
>> def
-/CMapName /TeX-Identity-SRVENG-LMMonoLt10-Bold def
+/CMapName /TeX-Identity-QFORMF-LMMonoLt10-Bold def
/CMapType 2 def
1 begincodespacerange
<0000> <FFFF>
endcodespacerange
0 beginbfrange
endbfrange
-30 beginbfchar
+39 beginbfchar
<001C> <0061>
<0023> <0062>
<0024> <005C>
@@ -2886,15 +3098,19 @@ endbfrange
<002D> <002C>
<002F> <0064>
<0032> <0065>
+<0034> <003D>
<0037> <0066>
<003B> <0067>
<003F> <0068>
+<0040> <002D>
<0042> <0069>
<0046> <006B>
+<0047> <004C>
<0048> <006C>
<004B> <006D>
<004D> <006E>
<0051> <006F>
+<0052> <0031>
<0054> <0070>
<0057> <0025>
<0058> <002E>
@@ -2902,13 +3118,18 @@ endbfrange
<005E> <0027>
<0060> <0072>
<0062> <0073>
+<0065> <0036>
<0066> <002F>
+<0068> <0054>
<0069> <0074>
+<006B> <0032>
<006D> <0075>
<0070> <0076>
<0072> <0077>
+<0073> <0058>
<0074> <0078>
<0076> <0079>
+<0079> <0030>
endbfchar
endcmap
CMapName currentdict /CMap defineresource pop
@@ -2920,21 +3141,21 @@ end
endstream
endobj
11 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /SRVENG+LMMonoLt10-Bold /DescendantFonts [ 270 0 R ] /ToUnicode 269 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /QFORMF+LMMonoLt10-Bold /DescendantFonts [ 277 0 R ] /ToUnicode 276 0 R >>
endobj
-270 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /SRVENG+LMMonoLt10-Bold /FontDescriptor 266 0 R /W 265 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+277 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /QFORMF+LMMonoLt10-Bold /FontDescriptor 273 0 R /W 272 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-271 0 obj
+278 0 obj
[ 28 [ 525 ] 34 [ 733 561 ] 42 [ 703 489 306 306 ] 47 [ 561 ] 49 [ 642 511 ] 55 [ 336 550 550 ] 59 [ 550 ] 63 [ 561 367 331 256 ] 70 [ 531 ] 72 [ 256 ] 74 [ 978 867 ] 77 [ 561 ] 81 [ 550 550 ] 84 [ 561 ] 88 [ 306 ] 90 [ 794 ] 95 [ 703 372 611 422 ] 100 [ 550 550 ] 104 [ 733 404 550 550 764 561 ] 112 [ 500 ] 114 [ 744 ] 116 [ 500 ] 121 [ 550 ] 125 [ 586 ] ]
endobj
-273 0 obj
+280 0 obj
<< /Length 16 >>
stream
endstream
endobj
-274 0 obj
+281 0 obj
<< /Subtype /CIDFontType0C /Length 5732 >>
stream

@@ -2950,10 +3171,10 @@ w''+4y5bce~h7)nJl8bXgf4g:bB
 
endstream
endobj
-272 0 obj
-<< /Type /FontDescriptor /FontName /NIIVWO+LMSans10-Bold /Flags 4 /FontBBox [ -460 -297 1761 1134 ] /Ascent 1134 /CapHeight 694 /Descent -297 /ItalicAngle 0 /StemV 102 /XHeight 458 /FontFile3 274 0 R /CIDSet 273 0 R >>
+279 0 obj
+<< /Type /FontDescriptor /FontName /NIIVWO+LMSans10-Bold /Flags 4 /FontBBox [ -460 -297 1761 1134 ] /Ascent 1134 /CapHeight 694 /Descent -297 /ItalicAngle 0 /StemV 102 /XHeight 458 /FontFile3 281 0 R /CIDSet 280 0 R >>
endobj
-275 0 obj
+282 0 obj
<< /Length 1293 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -3035,370 +3256,381 @@ end
endstream
endobj
10 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /NIIVWO+LMSans10-Bold /DescendantFonts [ 276 0 R ] /ToUnicode 275 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /NIIVWO+LMSans10-Bold /DescendantFonts [ 283 0 R ] /ToUnicode 282 0 R >>
endobj
-276 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /NIIVWO+LMSans10-Bold /FontDescriptor 272 0 R /W 271 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+283 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /NIIVWO+LMSans10-Bold /FontDescriptor 279 0 R /W 278 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
15 0 obj
-<< /Type /Pages /Count 7 /Kids [ 5 0 R 17 0 R 37 0 R 81 0 R 98 0 R 128 0 R 178 0 R ] >>
+<< /Type /Pages /Count 8 /Kids [ 5 0 R 17 0 R 37 0 R 81 0 R 98 0 R 127 0 R 177 0 R 210 0 R ] >>
endobj
-277 0 obj
-<< /Type /Outlines /First 209 0 R /Last 239 0 R /Count 7 >>
+284 0 obj
+<< /Type /Outlines /First 216 0 R /Last 246 0 R /Count 7 >>
endobj
-245 0 obj
-<< /Title 246 0 R /A 244 0 R /Parent 239 0 R /Prev 242 0 R >>
+252 0 obj
+<< /Title 253 0 R /A 251 0 R /Parent 246 0 R /Prev 249 0 R >>
endobj
-242 0 obj
-<< /Title 243 0 R /A 241 0 R /Parent 239 0 R /Next 245 0 R >>
+249 0 obj
+<< /Title 250 0 R /A 248 0 R /Parent 246 0 R /Next 252 0 R >>
endobj
-239 0 obj
-<< /Title 240 0 R /A 238 0 R /Parent 277 0 R /Prev 236 0 R /First 242 0 R /Last 245 0 R /Count -2 >>
+246 0 obj
+<< /Title 247 0 R /A 245 0 R /Parent 284 0 R /Prev 243 0 R /First 249 0 R /Last 252 0 R /Count -2 >>
endobj
-236 0 obj
-<< /Title 237 0 R /A 235 0 R /Parent 277 0 R /Prev 233 0 R /Next 239 0 R >>
+243 0 obj
+<< /Title 244 0 R /A 242 0 R /Parent 284 0 R /Prev 240 0 R /Next 246 0 R >>
endobj
-233 0 obj
-<< /Title 234 0 R /A 232 0 R /Parent 277 0 R /Prev 227 0 R /Next 236 0 R >>
+240 0 obj
+<< /Title 241 0 R /A 239 0 R /Parent 284 0 R /Prev 234 0 R /Next 243 0 R >>
endobj
-230 0 obj
-<< /Title 231 0 R /A 229 0 R /Parent 227 0 R >>
+237 0 obj
+<< /Title 238 0 R /A 236 0 R /Parent 234 0 R >>
endobj
-227 0 obj
-<< /Title 228 0 R /A 226 0 R /Parent 277 0 R /Prev 224 0 R /Next 233 0 R /First 230 0 R /Last 230 0 R /Count -1 >>
+234 0 obj
+<< /Title 235 0 R /A 233 0 R /Parent 284 0 R /Prev 231 0 R /Next 240 0 R /First 237 0 R /Last 237 0 R /Count -1 >>
endobj
-224 0 obj
-<< /Title 225 0 R /A 223 0 R /Parent 277 0 R /Prev 212 0 R /Next 227 0 R >>
+231 0 obj
+<< /Title 232 0 R /A 230 0 R /Parent 284 0 R /Prev 219 0 R /Next 234 0 R >>
endobj
-221 0 obj
-<< /Title 222 0 R /A 220 0 R /Parent 212 0 R /Prev 218 0 R >>
+228 0 obj
+<< /Title 229 0 R /A 227 0 R /Parent 219 0 R /Prev 225 0 R >>
endobj
-218 0 obj
-<< /Title 219 0 R /A 217 0 R /Parent 212 0 R /Prev 215 0 R /Next 221 0 R >>
+225 0 obj
+<< /Title 226 0 R /A 224 0 R /Parent 219 0 R /Prev 222 0 R /Next 228 0 R >>
endobj
-215 0 obj
-<< /Title 216 0 R /A 214 0 R /Parent 212 0 R /Next 218 0 R >>
+222 0 obj
+<< /Title 223 0 R /A 221 0 R /Parent 219 0 R /Next 225 0 R >>
endobj
-212 0 obj
-<< /Title 213 0 R /A 211 0 R /Parent 277 0 R /Prev 209 0 R /Next 224 0 R /First 215 0 R /Last 221 0 R /Count -3 >>
+219 0 obj
+<< /Title 220 0 R /A 218 0 R /Parent 284 0 R /Prev 216 0 R /Next 231 0 R /First 222 0 R /Last 228 0 R /Count -3 >>
endobj
-209 0 obj
-<< /Title 210 0 R /A 208 0 R /Parent 277 0 R /Next 212 0 R >>
+216 0 obj
+<< /Title 217 0 R /A 215 0 R /Parent 284 0 R /Next 219 0 R >>
endobj
-278 0 obj
-<< /Names [ (Doc-Start) 9 0 R (NEWPAX@doc-input1.newpax@1@) 132 0 R (NEWPAX@doc-input1.newpax@2@) 133 0 R (NEWPAX@doc-input1.newpax@3@) 134 0 R (NEWPAX@doc-input1.newpax@4@) 135 0 R (NEWPAX@doc-input1.newpax@5@) 136 0 R (desc:newpaxsetup) 85 0 R (lstlisting.-1) 40 0 R (lstlisting.-2) 87 0 R (lstlisting.1) 22 0 R (lstlisting.2) 44 0 R (lstlisting.3) 139 0 R (lstlisting.4) 182 0 R (lstnumber.-1.1) 41 0 R (lstnumber.-1.2) 42 0 R (lstnumber.-1.3) 43 0 R (lstnumber.-2.1) 88 0 R (lstnumber.-2.2) 89 0 R (lstnumber.-2.3) 90 0 R (lstnumber.-2.4) 91 0 R (lstnumber.-2.5) 92 0 R (lstnumber.-2.6) 93 0 R (lstnumber.-2.7) 94 0 R (lstnumber.-2.8) 95 0 R (lstnumber.-2.9) 96 0 R (lstnumber.1.1) 23 0 R (lstnumber.1.10) 32 0 R (lstnumber.1.11) 33 0 R (lstnumber.1.2) 24 0 R (lstnumber.1.3) 25 0 R (lstnumber.1.4) 26 0 R (lstnumber.1.5) 27 0 R ] /Limits [ (Doc-Start) (lstnumber.1.5) ] >>
+285 0 obj
+<< /Names [ (Doc-Start) 9 0 R (NEWPAX@doc-input1.newpax@1@) 131 0 R (NEWPAX@doc-input1.newpax@2@) 132 0 R (NEWPAX@doc-input1.newpax@3@) 133 0 R (NEWPAX@doc-input1.newpax@4@) 134 0 R (NEWPAX@doc-input1.newpax@5@) 135 0 R (desc:newpaxsetup) 85 0 R (lstlisting.-1) 40 0 R (lstlisting.-2) 87 0 R (lstlisting.1) 22 0 R (lstlisting.2) 44 0 R (lstlisting.3) 138 0 R (lstlisting.4) 181 0 R (lstnumber.-1.1) 41 0 R (lstnumber.-1.2) 42 0 R (lstnumber.-1.3) 43 0 R (lstnumber.-2.1) 88 0 R (lstnumber.-2.2) 89 0 R (lstnumber.-2.3) 90 0 R (lstnumber.-2.4) 91 0 R (lstnumber.-2.5) 92 0 R (lstnumber.-2.6) 93 0 R (lstnumber.-2.7) 94 0 R (lstnumber.-2.8) 95 0 R (lstnumber.-2.9) 96 0 R (lstnumber.1.1) 23 0 R (lstnumber.1.10) 32 0 R (lstnumber.1.11) 33 0 R (lstnumber.1.2) 24 0 R (lstnumber.1.3) 25 0 R (lstnumber.1.4) 26 0 R (lstnumber.1.5) 27 0 R ] /Limits [ (Doc-Start) (lstnumber.1.5) ] >>
endobj
-279 0 obj
+286 0 obj
<< /Names [ (lstnumber.1.6) 28 0 R (lstnumber.1.7) 29 0 R (lstnumber.1.8) 30 0 R (lstnumber.1.9) 31 0 R (lstnumber.2.1) 45 0 R (lstnumber.2.10) 54 0 R (lstnumber.2.11) 55 0 R (lstnumber.2.12) 56 0 R (lstnumber.2.13) 57 0 R (lstnumber.2.14) 58 0 R (lstnumber.2.15) 59 0 R (lstnumber.2.16) 60 0 R (lstnumber.2.17) 61 0 R (lstnumber.2.18) 62 0 R (lstnumber.2.19) 63 0 R (lstnumber.2.2) 46 0 R (lstnumber.2.20) 64 0 R (lstnumber.2.21) 65 0 R (lstnumber.2.22) 66 0 R (lstnumber.2.23) 67 0 R (lstnumber.2.24) 68 0 R (lstnumber.2.25) 69 0 R (lstnumber.2.26) 70 0 R (lstnumber.2.27) 71 0 R (lstnumber.2.28) 72 0 R (lstnumber.2.29) 73 0 R (lstnumber.2.3) 47 0 R (lstnumber.2.30) 74 0 R (lstnumber.2.31) 75 0 R (lstnumber.2.32) 76 0 R (lstnumber.2.33) 77 0 R (lstnumber.2.34) 78 0 R ] /Limits [ (lstnumber.1.6) (lstnumber.2.34) ] >>
endobj
-280 0 obj
-<< /Names [ (lstnumber.2.4) 48 0 R (lstnumber.2.5) 49 0 R (lstnumber.2.6) 50 0 R (lstnumber.2.7) 51 0 R (lstnumber.2.8) 52 0 R (lstnumber.2.9) 53 0 R (lstnumber.3.1) 140 0 R (lstnumber.3.10) 149 0 R (lstnumber.3.11) 150 0 R (lstnumber.3.12) 151 0 R (lstnumber.3.2) 141 0 R (lstnumber.3.3) 142 0 R (lstnumber.3.4) 143 0 R (lstnumber.3.5) 144 0 R (lstnumber.3.6) 145 0 R (lstnumber.3.7) 146 0 R (lstnumber.3.8) 147 0 R (lstnumber.3.9) 148 0 R (lstnumber.4.1) 183 0 R (lstnumber.4.10) 192 0 R (lstnumber.4.11) 193 0 R (lstnumber.4.12) 194 0 R (lstnumber.4.13) 195 0 R (lstnumber.4.14) 196 0 R (lstnumber.4.15) 197 0 R (lstnumber.4.16) 198 0 R (lstnumber.4.17) 199 0 R (lstnumber.4.18) 200 0 R (lstnumber.4.19) 201 0 R (lstnumber.4.2) 184 0 R (lstnumber.4.20) 202 0 R (lstnumber.4.21) 203 0 R ] /Limits [ (lstnumber.2.4) (lstnumber.4.21) ] >>
+287 0 obj
+<< /Names [ (lstnumber.2.4) 48 0 R (lstnumber.2.5) 49 0 R (lstnumber.2.6) 50 0 R (lstnumber.2.7) 51 0 R (lstnumber.2.8) 52 0 R (lstnumber.2.9) 53 0 R (lstnumber.3.1) 139 0 R (lstnumber.3.10) 148 0 R (lstnumber.3.11) 149 0 R (lstnumber.3.12) 150 0 R (lstnumber.3.2) 140 0 R (lstnumber.3.3) 141 0 R (lstnumber.3.4) 142 0 R (lstnumber.3.5) 143 0 R (lstnumber.3.6) 144 0 R (lstnumber.3.7) 145 0 R (lstnumber.3.8) 146 0 R (lstnumber.3.9) 147 0 R (lstnumber.4.1) 182 0 R (lstnumber.4.10) 191 0 R (lstnumber.4.11) 192 0 R (lstnumber.4.12) 193 0 R (lstnumber.4.13) 194 0 R (lstnumber.4.14) 195 0 R (lstnumber.4.15) 196 0 R (lstnumber.4.16) 197 0 R (lstnumber.4.17) 198 0 R (lstnumber.4.18) 199 0 R (lstnumber.4.19) 200 0 R (lstnumber.4.2) 183 0 R (lstnumber.4.20) 201 0 R (lstnumber.4.21) 202 0 R ] /Limits [ (lstnumber.2.4) (lstnumber.4.21) ] >>
endobj
-281 0 obj
-<< /Names [ (lstnumber.4.22) 204 0 R (lstnumber.4.23) 205 0 R (lstnumber.4.24) 206 0 R (lstnumber.4.3) 185 0 R (lstnumber.4.4) 186 0 R (lstnumber.4.5) 187 0 R (lstnumber.4.6) 188 0 R (lstnumber.4.7) 189 0 R (lstnumber.4.8) 190 0 R (lstnumber.4.9) 191 0 R (page.1) 8 0 R (page.2) 19 0 R (page.3) 39 0 R (page.4) 83 0 R (page.5) 100 0 R (page.6) 130 0 R (page.7) 180 0 R (section.1) 13 0 R (section.2) 20 0 R (section.3) 84 0 R (section.4) 86 0 R (section.5) 102 0 R (section.6) 131 0 R (section.7) 137 0 R (subsection.2.1) 21 0 R (subsection.2.2) 34 0 R (subsection.2.3) 79 0 R (subsection.4.1) 101 0 R (subsection.7.1) 138 0 R (subsection.7.2) 181 0 R ] /Limits [ (lstnumber.4.22) (subsection.7.2) ] >>
+288 0 obj
+<< /Names [ (lstnumber.4.22) 203 0 R (lstnumber.4.23) 204 0 R (lstnumber.4.24) 205 0 R (lstnumber.4.25) 206 0 R (lstnumber.4.26) 207 0 R (lstnumber.4.27) 208 0 R (lstnumber.4.28) 213 0 R (lstnumber.4.3) 184 0 R (lstnumber.4.4) 185 0 R (lstnumber.4.5) 186 0 R (lstnumber.4.6) 187 0 R (lstnumber.4.7) 188 0 R (lstnumber.4.8) 189 0 R (lstnumber.4.9) 190 0 R (page.1) 8 0 R (page.2) 19 0 R (page.3) 39 0 R (page.4) 83 0 R (page.5) 100 0 R (page.6) 129 0 R (page.7) 179 0 R (page.8) 212 0 R (section.1) 13 0 R (section.2) 20 0 R (section.3) 84 0 R (section.4) 86 0 R (section.5) 102 0 R (section.6) 130 0 R (section.7) 136 0 R (subsection.2.1) 21 0 R (subsection.2.2) 34 0 R (subsection.2.3) 79 0 R ] /Limits [ (lstnumber.4.22) (subsection.2.3) ] >>
endobj
-282 0 obj
-<< /Kids [ 278 0 R 279 0 R 280 0 R 281 0 R ] /Limits [ (Doc-Start) (subsection.7.2) ] >>
+289 0 obj
+<< /Names [ (subsection.4.1) 101 0 R (subsection.7.1) 137 0 R (subsection.7.2) 180 0 R ] /Limits [ (subsection.4.1) (subsection.7.2) ] >>
endobj
-283 0 obj
-<< /Dests 282 0 R >>
+290 0 obj
+<< /Kids [ 285 0 R 286 0 R 287 0 R 288 0 R 289 0 R ] /Limits [ (Doc-Start) (subsection.7.2) ] >>
endobj
-284 0 obj
-<< /Type /Catalog /Pages 15 0 R /Outlines 277 0 R /Names 283 0 R /ViewerPreferences 207 0 R/Lang (en-UK)/PageMode /UseOutlines/OpenAction [5 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>> >>
+291 0 obj
+<< /Dests 290 0 R >>
endobj
-285 0 obj
-<< /Creator <FEFF004C006100540065005800200077006900740068002000680079007000650072007200650066>/Title <FEFF0054006800650020006E006500770070006100780020007000610063006B006100670065>/Author <FEFF0055006C00720069006B006500200046006900730063006800650072> /Producer (LuaTeX-1.13.0) /CreationDate (D:20210307000911+01'00') /ModDate (D:20210307000911+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.13.0 (TeX Live 2021/W32TeX)) >>
+292 0 obj
+<< /Type /Catalog /Pages 15 0 R /Outlines 284 0 R /Names 291 0 R /ViewerPreferences 214 0 R/Lang (en-UK)/PageMode /UseOutlines/OpenAction [5 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>> >>
+endobj
+293 0 obj
+<< /Creator <FEFF004C006100540065005800200077006900740068002000680079007000650072007200650066>/Title <FEFF0054006800650020006E006500770070006100780020007000610063006B006100670065>/Author <FEFF0055006C00720069006B006500200046006900730063006800650072> /Producer (LuaTeX-1.15.0) /CreationDate (D:20220627164005+02'00') /ModDate (D:20220627164005+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.15.0 (TeX Live 2022)) >>
endobj
xref
-0 286
+0 294
0000000002 65535 f
-0000105447 00000 n
+0000124366 00000 n
0000000003 00000 f
0000000004 00000 f
0000000000 00000 f
-0000012261 00000 n
-0000012553 00000 n
+0000012225 00000 n
+0000012517 00000 n
0000000020 00000 n
-0000012375 00000 n
-0000012434 00000 n
-0000162106 00000 n
-0000153891 00000 n
-0000147810 00000 n
-0000012493 00000 n
-0000136178 00000 n
-0000162457 00000 n
-0000027154 00000 n
-0000026063 00000 n
-0000012675 00000 n
-0000026180 00000 n
-0000026241 00000 n
-0000026302 00000 n
-0000026363 00000 n
-0000026423 00000 n
-0000026484 00000 n
-0000026545 00000 n
-0000026606 00000 n
-0000026667 00000 n
-0000026728 00000 n
-0000026789 00000 n
-0000026850 00000 n
-0000026911 00000 n
-0000026972 00000 n
-0000027033 00000 n
-0000027093 00000 n
-0000125094 00000 n
-0000041003 00000 n
-0000038386 00000 n
-0000027289 00000 n
-0000038503 00000 n
-0000038564 00000 n
-0000038625 00000 n
-0000038687 00000 n
-0000038749 00000 n
-0000038811 00000 n
-0000038872 00000 n
-0000038933 00000 n
-0000038993 00000 n
-0000039054 00000 n
-0000039115 00000 n
-0000039176 00000 n
-0000039237 00000 n
-0000039298 00000 n
-0000039359 00000 n
-0000039420 00000 n
-0000039481 00000 n
-0000039542 00000 n
-0000039603 00000 n
-0000039664 00000 n
-0000039724 00000 n
-0000039784 00000 n
-0000039845 00000 n
-0000039906 00000 n
-0000039967 00000 n
-0000040028 00000 n
-0000040089 00000 n
-0000040150 00000 n
-0000040211 00000 n
-0000040272 00000 n
-0000040333 00000 n
-0000040394 00000 n
-0000040455 00000 n
-0000040515 00000 n
-0000040576 00000 n
-0000040637 00000 n
-0000040698 00000 n
-0000040759 00000 n
-0000040820 00000 n
-0000040881 00000 n
-0000040942 00000 n
-0000053907 00000 n
-0000052937 00000 n
-0000041126 00000 n
-0000053054 00000 n
-0000053115 00000 n
-0000053176 00000 n
-0000053236 00000 n
-0000053297 00000 n
-0000053358 00000 n
-0000053419 00000 n
-0000053480 00000 n
-0000053541 00000 n
-0000053602 00000 n
-0000053663 00000 n
-0000053724 00000 n
-0000053785 00000 n
-0000053846 00000 n
-0000070252 00000 n
-0000069949 00000 n
-0000054042 00000 n
-0000070066 00000 n
-0000070128 00000 n
-0000070190 00000 n
-0000078047 00000 n
-0000077830 00000 n
-0000102837 00000 n
-0000103048 00000 n
-0000099491 00000 n
-0000099711 00000 n
-0000099932 00000 n
-0000100152 00000 n
-0000100372 00000 n
-0000100592 00000 n
-0000100812 00000 n
-0000101032 00000 n
-0000101251 00000 n
-0000101471 00000 n
-0000101691 00000 n
-0000101911 00000 n
-0000102131 00000 n
-0000102391 00000 n
-0000098540 00000 n
-0000098323 00000 n
-0000102614 00000 n
-0000103259 00000 n
-0000103470 00000 n
-0000103682 00000 n
-0000105282 00000 n
-0000077513 00000 n
-0000070375 00000 n
-0000103895 00000 n
-0000103958 00000 n
-0000104021 00000 n
-0000104083 00000 n
-0000104147 00000 n
-0000104211 00000 n
-0000104274 00000 n
-0000104338 00000 n
-0000104401 00000 n
-0000104464 00000 n
-0000104527 00000 n
-0000104590 00000 n
-0000104652 00000 n
-0000104715 00000 n
-0000104778 00000 n
-0000104841 00000 n
-0000104904 00000 n
-0000104967 00000 n
-0000105030 00000 n
-0000105093 00000 n
-0000105156 00000 n
-0000105219 00000 n
-0000077649 00000 n
-0000098254 00000 n
-0000083450 00000 n
-0000083501 00000 n
-0000083658 00000 n
-0000083814 00000 n
-0000083968 00000 n
-0000084171 00000 n
-0000085454 00000 n
-0000085656 00000 n
-0000086635 00000 n
-0000086835 00000 n
-0000087635 00000 n
-0000087874 00000 n
-0000088233 00000 n
-0000088471 00000 n
-0000088680 00000 n
-0000088917 00000 n
-0000088998 00000 n
-0000094284 00000 n
-0000094352 00000 n
-0000096850 00000 n
-0000096917 00000 n
-0000098188 00000 n
-0000099422 00000 n
-0000118592 00000 n
-0000116773 00000 n
-0000105494 00000 n
-0000116893 00000 n
-0000116956 00000 n
-0000117019 00000 n
-0000117082 00000 n
-0000117145 00000 n
-0000117208 00000 n
-0000117271 00000 n
-0000117334 00000 n
-0000117397 00000 n
-0000117460 00000 n
-0000117523 00000 n
-0000117586 00000 n
-0000117649 00000 n
-0000117712 00000 n
-0000117775 00000 n
-0000117837 00000 n
-0000117899 00000 n
-0000117962 00000 n
-0000118025 00000 n
-0000118088 00000 n
-0000118151 00000 n
-0000118214 00000 n
-0000118277 00000 n
-0000118340 00000 n
-0000118403 00000 n
-0000118466 00000 n
-0000118529 00000 n
-0000118716 00000 n
-0000118762 00000 n
-0000163774 00000 n
-0000118809 00000 n
-0000118898 00000 n
-0000163642 00000 n
-0000118945 00000 n
-0000119090 00000 n
-0000163563 00000 n
-0000119142 00000 n
-0000119404 00000 n
-0000163470 00000 n
-0000119456 00000 n
-0000119713 00000 n
-0000163391 00000 n
-0000119765 00000 n
-0000119895 00000 n
-0000163298 00000 n
-0000119942 00000 n
-0000120039 00000 n
-0000163166 00000 n
-0000120086 00000 n
-0000120193 00000 n
-0000163101 00000 n
-0000120245 00000 n
-0000120453 00000 n
-0000163008 00000 n
-0000120500 00000 n
-0000120637 00000 n
-0000162915 00000 n
-0000120684 00000 n
-0000120781 00000 n
-0000162797 00000 n
-0000120828 00000 n
-0000121004 00000 n
-0000162718 00000 n
-0000121056 00000 n
-0000121267 00000 n
-0000162639 00000 n
-0000121319 00000 n
-0000121566 00000 n
-0000123932 00000 n
-0000121681 00000 n
-0000121753 00000 n
-0000124172 00000 n
-0000125250 00000 n
-0000125453 00000 n
-0000134225 00000 n
-0000125899 00000 n
-0000125976 00000 n
-0000134463 00000 n
-0000136333 00000 n
-0000136535 00000 n
-0000145798 00000 n
-0000136965 00000 n
-0000137200 00000 n
-0000146037 00000 n
-0000147967 00000 n
-0000148171 00000 n
-0000152504 00000 n
-0000148515 00000 n
-0000148591 00000 n
-0000152741 00000 n
-0000154045 00000 n
-0000154246 00000 n
-0000160516 00000 n
-0000154622 00000 n
-0000154699 00000 n
-0000160752 00000 n
-0000162258 00000 n
-0000162562 00000 n
-0000163853 00000 n
-0000164748 00000 n
-0000165588 00000 n
-0000166444 00000 n
-0000167164 00000 n
-0000167270 00000 n
-0000167308 00000 n
-0000167511 00000 n
+0000012339 00000 n
+0000012398 00000 n
+0000169676 00000 n
+0000161461 00000 n
+0000154379 00000 n
+0000012457 00000 n
+0000142309 00000 n
+0000170027 00000 n
+0000027118 00000 n
+0000026027 00000 n
+0000012639 00000 n
+0000026144 00000 n
+0000026205 00000 n
+0000026266 00000 n
+0000026327 00000 n
+0000026387 00000 n
+0000026448 00000 n
+0000026509 00000 n
+0000026570 00000 n
+0000026631 00000 n
+0000026692 00000 n
+0000026753 00000 n
+0000026814 00000 n
+0000026875 00000 n
+0000026936 00000 n
+0000026997 00000 n
+0000027057 00000 n
+0000130791 00000 n
+0000042594 00000 n
+0000039977 00000 n
+0000027253 00000 n
+0000040094 00000 n
+0000040155 00000 n
+0000040216 00000 n
+0000040278 00000 n
+0000040340 00000 n
+0000040402 00000 n
+0000040463 00000 n
+0000040524 00000 n
+0000040584 00000 n
+0000040645 00000 n
+0000040706 00000 n
+0000040767 00000 n
+0000040828 00000 n
+0000040889 00000 n
+0000040950 00000 n
+0000041011 00000 n
+0000041072 00000 n
+0000041133 00000 n
+0000041194 00000 n
+0000041255 00000 n
+0000041315 00000 n
+0000041375 00000 n
+0000041436 00000 n
+0000041497 00000 n
+0000041558 00000 n
+0000041619 00000 n
+0000041680 00000 n
+0000041741 00000 n
+0000041802 00000 n
+0000041863 00000 n
+0000041924 00000 n
+0000041985 00000 n
+0000042046 00000 n
+0000042106 00000 n
+0000042167 00000 n
+0000042228 00000 n
+0000042289 00000 n
+0000042350 00000 n
+0000042411 00000 n
+0000042472 00000 n
+0000042533 00000 n
+0000055498 00000 n
+0000054528 00000 n
+0000042717 00000 n
+0000054645 00000 n
+0000054706 00000 n
+0000054767 00000 n
+0000054827 00000 n
+0000054888 00000 n
+0000054949 00000 n
+0000055010 00000 n
+0000055071 00000 n
+0000055132 00000 n
+0000055193 00000 n
+0000055254 00000 n
+0000055315 00000 n
+0000055376 00000 n
+0000055437 00000 n
+0000071843 00000 n
+0000071540 00000 n
+0000055633 00000 n
+0000071657 00000 n
+0000071719 00000 n
+0000071781 00000 n
+0000079626 00000 n
+0000079409 00000 n
+0000104603 00000 n
+0000104815 00000 n
+0000101039 00000 n
+0000101261 00000 n
+0000101482 00000 n
+0000101703 00000 n
+0000101923 00000 n
+0000102144 00000 n
+0000102365 00000 n
+0000102586 00000 n
+0000102806 00000 n
+0000103027 00000 n
+0000103247 00000 n
+0000103468 00000 n
+0000103689 00000 n
+0000100103 00000 n
+0000099886 00000 n
+0000104380 00000 n
+0000105026 00000 n
+0000105239 00000 n
+0000105452 00000 n
+0000107051 00000 n
+0000079100 00000 n
+0000071966 00000 n
+0000105665 00000 n
+0000105728 00000 n
+0000105791 00000 n
+0000105853 00000 n
+0000105917 00000 n
+0000105981 00000 n
+0000106044 00000 n
+0000106108 00000 n
+0000106171 00000 n
+0000106234 00000 n
+0000106296 00000 n
+0000106359 00000 n
+0000106422 00000 n
+0000106485 00000 n
+0000106548 00000 n
+0000106611 00000 n
+0000106674 00000 n
+0000106737 00000 n
+0000106799 00000 n
+0000106862 00000 n
+0000106925 00000 n
+0000106988 00000 n
+0000079236 00000 n
+0000099817 00000 n
+0000085013 00000 n
+0000085064 00000 n
+0000085221 00000 n
+0000085377 00000 n
+0000085531 00000 n
+0000085734 00000 n
+0000087017 00000 n
+0000087219 00000 n
+0000088198 00000 n
+0000088398 00000 n
+0000089198 00000 n
+0000089437 00000 n
+0000089796 00000 n
+0000090034 00000 n
+0000090243 00000 n
+0000090480 00000 n
+0000090561 00000 n
+0000095847 00000 n
+0000095915 00000 n
+0000098413 00000 n
+0000098480 00000 n
+0000099751 00000 n
+0000100970 00000 n
+0000123384 00000 n
+0000121376 00000 n
+0000107216 00000 n
+0000121496 00000 n
+0000121559 00000 n
+0000121622 00000 n
+0000121685 00000 n
+0000121748 00000 n
+0000121811 00000 n
+0000121874 00000 n
+0000121937 00000 n
+0000121999 00000 n
+0000122062 00000 n
+0000122125 00000 n
+0000122188 00000 n
+0000122251 00000 n
+0000122314 00000 n
+0000122377 00000 n
+0000122440 00000 n
+0000122503 00000 n
+0000122566 00000 n
+0000122629 00000 n
+0000122692 00000 n
+0000122754 00000 n
+0000122817 00000 n
+0000122880 00000 n
+0000122943 00000 n
+0000123006 00000 n
+0000123069 00000 n
+0000123132 00000 n
+0000123195 00000 n
+0000123258 00000 n
+0000123321 00000 n
+0000124254 00000 n
+0000124008 00000 n
+0000123508 00000 n
+0000124128 00000 n
+0000124191 00000 n
+0000124413 00000 n
+0000124459 00000 n
+0000171352 00000 n
+0000124506 00000 n
+0000124595 00000 n
+0000171220 00000 n
+0000124642 00000 n
+0000124787 00000 n
+0000171141 00000 n
+0000124839 00000 n
+0000125101 00000 n
+0000171048 00000 n
+0000125153 00000 n
+0000125410 00000 n
+0000170969 00000 n
+0000125462 00000 n
+0000125592 00000 n
+0000170876 00000 n
+0000125639 00000 n
+0000125736 00000 n
+0000170744 00000 n
+0000125783 00000 n
+0000125890 00000 n
+0000170679 00000 n
+0000125942 00000 n
+0000126150 00000 n
+0000170586 00000 n
+0000126197 00000 n
+0000126334 00000 n
+0000170493 00000 n
+0000126381 00000 n
+0000126478 00000 n
+0000170375 00000 n
+0000126525 00000 n
+0000126701 00000 n
+0000170296 00000 n
+0000126753 00000 n
+0000126964 00000 n
+0000170217 00000 n
+0000127016 00000 n
+0000127263 00000 n
+0000129629 00000 n
+0000127378 00000 n
+0000127450 00000 n
+0000129869 00000 n
+0000130947 00000 n
+0000131150 00000 n
+0000140314 00000 n
+0000131601 00000 n
+0000131678 00000 n
+0000140552 00000 n
+0000142464 00000 n
+0000142666 00000 n
+0000152339 00000 n
+0000143116 00000 n
+0000143351 00000 n
+0000152578 00000 n
+0000154536 00000 n
+0000154740 00000 n
+0000159948 00000 n
+0000155128 00000 n
+0000155205 00000 n
+0000160185 00000 n
+0000161615 00000 n
+0000161816 00000 n
+0000168086 00000 n
+0000162192 00000 n
+0000162269 00000 n
+0000168322 00000 n
+0000169828 00000 n
+0000170140 00000 n
+0000171431 00000 n
+0000172326 00000 n
+0000173166 00000 n
+0000174022 00000 n
+0000174784 00000 n
+0000174939 00000 n
+0000175053 00000 n
+0000175091 00000 n
+0000175294 00000 n
trailer
-<< /Size 286 /Root 284 0 R /Info 285 0 R /ID [ <9358EBB714BBBB1865E4E2230D91F5A4> <9358EBB714BBBB1865E4E2230D91F5A4> ] >>
+<< /Size 294 /Root 292 0 R /Info 293 0 R /ID [ <DAB8C069065EB93ED7E8589ED45CC436> <DAB8C069065EB93ED7E8589ED45CC436> ] >>
startxref
-167973
+175749
%%EOF
diff --git a/macros/latex/contrib/newpax/newpax.tex b/macros/latex/contrib/newpax/newpax.tex
index 3267edf128..7ebe4e0137 100644
--- a/macros/latex/contrib/newpax/newpax.tex
+++ b/macros/latex/contrib/newpax/newpax.tex
@@ -1,10 +1,9 @@
% !Mode:: "TeX:UTF-8:Main"
\makeatletter
-\def\UlrikeFischer@package@version{0.51}
-\def\UlrikeFischer@package@date{2021-03-07}
+\def\UlrikeFischer@package@version{0.52}
+\def\UlrikeFischer@package@date{2022-06-27}
\makeatother
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{pdfversion=1.7,lang=en-UK, uncompress}
+\DocumentMetadata{pdfversion=1.7,lang=en-UK, uncompress}
\documentclass[DIV=12,parskip=half-,bibliography=totoc]{scrartcl}
\usepackage{scrlayer-scrpage}
@@ -53,7 +52,7 @@ cursor is in the area. The coordinates of the area are given in absolute page co
The action of such an annotation can be an external URL, but also an internal destination.
Such destination are objects describing a page and some instructions how to display the page---again using absolute coordinates.
-When a PDF is included in another PDF---may it be with \cs{includegraphics} or with \cs{includepdf}--the annotation coordinates no longer make sense as they don't refer to the receiving page (and often the action of an annotation doesn't make sense either), so all TeX-engines and backends strip them away when including a PDF: the net effect is that external and internal links are lost.
+When a PDF is included in another PDF---may it be with \cs{includegraphics} or with \cs{includepdf}\hspace{0pt}---\hspace{0pt}the annotation coordinates no longer make sense as they don't refer to the receiving page (and often the action of an annotation doesn't make sense either), so all TeX-engines and backends strip them away when including a PDF: the net effect is that external and internal links are lost.
The \pkg{pax} package from Heiko Oberdiek offers a solution for this problem: it extracts all the annotations
and destinations of the included PDF in a text file, does some clever recalculations of their coordinates and reinserts them.
@@ -209,11 +208,12 @@ Ensure that the \texttt{.pax} file created in step 1 can be found by your main d
\item This works with pdflatex and lualatex. lualatex needs the extra code demonstrated in the document.
\item It needs two or three compilations until every reference is correct.
\item There is a small typo in \pkg{pax.sty} which affects clipping, the patch shown in the listing correct this.
+\item In some cases the catcode of \# and \% must be set to letter to avoid errors.
\item Don't include PDFs with destinations twice as this will lead to duplicate destinations and pdflatex will complain.
\item If annotations should not be reinserted remove the \texttt{.pax}-file.
\item If \pkg{hyperref} is loaded you can change the color and style of link borders with hyperref options.
\end{itemize}
-
-\lstinputlisting[firstline=2,caption=doc-use-pax.tex]{doc-use-pax.tex}
+\enlargethispage{\baselineskip}
+\lstinputlisting[firstline=2,caption=doc-use-pax.tex,escapechar={}]{doc-use-pax.tex}
\end{document}
diff --git a/macros/xetex/latex/bidi/README b/macros/xetex/latex/bidi/README
index 08339c6c5c..3ce3ac0e43 100644
--- a/macros/xetex/latex/bidi/README
+++ b/macros/xetex/latex/bidi/README
@@ -1,6 +1,6 @@
___________________
The bidi package
-v38.3
+v38.4
This package provides a convenient interface for typesetting
bidirectional texts in Plain TeX and LaTeX, using XeTeX engine.
@@ -25,7 +25,7 @@ The announcements for the new releases of the package will
also appear in the Discussions space under the Announcements
category.
-Current version release date: 2022/06/15
+Current version release date: 2022/06/27
___________________________________________
Vafa Khalighi
diff --git a/macros/xetex/latex/bidi/bidi-doc-intro.ltx b/macros/xetex/latex/bidi/bidi-doc-intro.ltx
index 855f62b299..379a7d228a 100644
--- a/macros/xetex/latex/bidi/bidi-doc-intro.ltx
+++ b/macros/xetex/latex/bidi/bidi-doc-intro.ltx
@@ -20,7 +20,7 @@ If you use \textsf{bidi} package to write any input \TeX\ document, and then run
* Copyright (c) 2007--2022 Vafa Khalighi
* Copyright (c) 2018--2020 bidi-tex GitHub Organization
*
-* v38.3, 2022/06/15
+* v38.4, 2022/06/27
*
* License: LaTeX Project Public License, version
* 1.3c or higher (your choice)
diff --git a/macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx b/macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx
index d796aab54d..09d98a40b1 100644
--- a/macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx
+++ b/macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx
@@ -102,7 +102,7 @@ There is also \texttt{extrafootnotefeatures} option that allows footnotes to be
\item With any of the commands in the first row, you can typeset LTR paragraphs.
\item With any of the commands in the second row, you can typeset RTL paragraphs.
\end{itemize}
-\begin{lstlisting}[morekeywords={newfontfamily,Parsifont}]
+\begin{lstlisting}
\documentclass{article}
\usepackage{bidi}
\begin{document}
@@ -221,7 +221,7 @@ Also please note that in \texttt{twocolumn} documents, the width of the \Lcs{foo
\Lcs{text}\Largb{\Larga{main}}
\end{BDef}
\Lcs{RTLcases} is defined in bidi for typesetting RTL cases. \Lcs{text} is defined in \textsf{amsmath} package, so this means that you need to load \textsf{amsmath} package too.
-\begin{lstlisting}[morekeywords={RTLcases,text}]
+\begin{lstlisting}
\documentclass{article}
\usepackage{amsmath}
\usepackage{bidi}
@@ -242,7 +242,7 @@ Also please note that in \texttt{twocolumn} documents, the width of the \Lcs{foo
\Lcs{SepMark}\Largb{\Larga{mark}}\quad\Lcs{@SepMark}
\end{BDef}
Generally in Standard \LaTeX, dot is used for separation between section numbers, equation numbers any anything else which needs to be seperated. You can use \Lcs{SepMark} to use any other mark as the seperation mark instead a dot.
-\begin{lstlisting}[morekeywords={SepMark,subsection,subsubsection}]
+\begin{lstlisting}
\documentclass{article}
\usepackage{bidi}
\SepMark{-}
@@ -255,7 +255,7 @@ Generally in Standard \LaTeX, dot is used for separation between section numbers
If you decide to change the numbering of chapters, sections, subsections, equations, figures and \ldots, you should either load \textsf{amsmath} package and use \Lcs{numberwithin} macro to do this or do the ordinary way, but instead dot write \Lcs{@SepMark}. Using dot instead \Lcs{@SepMark} will certainly make trouble.
-\begin{lstlisting}[morekeywords={theequation,thesection,SepMark}]
+\begin{lstlisting}
\documentclass{article}
\usepackage{bidi}
\SepMark{-}
diff --git a/macros/xetex/latex/bidi/bidi-doc-plain-basics.ltx b/macros/xetex/latex/bidi/bidi-doc-plain-basics.ltx
index b14374307a..6b2d419469 100644
--- a/macros/xetex/latex/bidi/bidi-doc-plain-basics.ltx
+++ b/macros/xetex/latex/bidi/bidi-doc-plain-basics.ltx
@@ -41,7 +41,7 @@ The bidirectional typesetting in \XeTeX{} is based on TeX-{-}XeT algorithm and \
\item With any of the commands in the first row, you can typeset LTR paragraphs.
\item With any of the commands in the second row, you can typeset RTL paragraphs.
\end{itemize}
-\begin{lstlisting}[morekeywords={newfontfamily,Parsifont}]
+\begin{lstlisting}
\input bidi
\setRTL%
Anyone who reads Old and Middle English literary texts will be
@@ -63,7 +63,7 @@ Anyone who reads Old and Middle English literary texts will be
\item With \texttt{LTR} environment, you can typeset LTR paragraphs.
\item With \texttt{RTL} environment, you can typeset RTL paragraphs.
\end{itemize}
-\begin{lstlisting}[morekeywords={RTL,endRTL,LTR,endLTR}]
+\begin{lstlisting}
\input bidi
\RTL
Anyone who reads Old and Middle English literary texts will be familiar
@@ -87,7 +87,7 @@ And we are still typesetting right to left.
\item With any of the commands in the first row, you can typeset short LTR text inside RTL paragraphs.
\item With any of the commands in the second row, you can typeset short RTL text inside LTR paragraphs.
\end{itemize}
-\begin{lstlisting}[morekeywords={RTL,endRTL,LTR,endLTR}]
+\begin{lstlisting}
\input bidi
\RTL
Anyone who reads Old and Middle English \LRE{Short left to right text} literary texts will be familiar
diff --git a/macros/xetex/latex/bidi/bidi-doc-title.ltx b/macros/xetex/latex/bidi/bidi-doc-title.ltx
index cd3c3998c9..0cbab0ad64 100644
--- a/macros/xetex/latex/bidi/bidi-doc-title.ltx
+++ b/macros/xetex/latex/bidi/bidi-doc-title.ltx
@@ -3,7 +3,7 @@
\begin{document}
\title{\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}\\
\LARGE Bidirectional typesetting in plain \TeX{} and \LaTeX, using \XeTeX{} engine\\[5pt]
-\large User documentation for \textcolor{blue!65!black}{version 38.3}}
+\large User documentation for \textcolor{blue!65!black}{version 38.4}}
\author{Vafa Khalighi\thanks{Thanks to the bidi-tex GitHub organization consisted of David Carlisle and other members of the {\LaTeX} team to maintain the package in the period 2018--2020.}}
\setcounter{page}{0}
\thispagestyle{empty}
@@ -13,7 +13,7 @@
\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}
\Large
-User documentation for \textcolor{blue!65!black}{version 38.3}}
+User documentation for \textcolor{blue!65!black}{version 38.4}}
\vskip 0pt plus 3fill
\textit{\large to my Master, \textbf{Ferdowsi The Great}}
diff --git a/macros/xetex/latex/bidi/bidi-doc.ltx b/macros/xetex/latex/bidi/bidi-doc.ltx
index 075b4e8f0b..1bc2374333 100644
--- a/macros/xetex/latex/bidi/bidi-doc.ltx
+++ b/macros/xetex/latex/bidi/bidi-doc.ltx
@@ -1,7 +1,7 @@
\documentclass{ltxdoc}
\input{bidi-doc-preamble.ltx}
\hypersetup{%
- pdftitle={User documentation for version 38.3 of the bidi
+ pdftitle={User documentation for version 38.4 of the bidi
package}%
}
\begin{document}
diff --git a/macros/xetex/latex/bidi/bidi-doc.pdf b/macros/xetex/latex/bidi/bidi-doc.pdf
index fd24f5bf16..5cb7980c26 100644
--- a/macros/xetex/latex/bidi/bidi-doc.pdf
+++ b/macros/xetex/latex/bidi/bidi-doc.pdf
Binary files differ
diff --git a/macros/xetex/latex/bidi/bidi.dtx b/macros/xetex/latex/bidi/bidi.dtx
index efe01e23bf..c6e8d6b681 100644
--- a/macros/xetex/latex/bidi/bidi.dtx
+++ b/macros/xetex/latex/bidi/bidi.dtx
@@ -5,7 +5,7 @@
%<*readme>
___________________
The bidi package
-v38.3
+v38.4
This package provides a convenient interface for typesetting
bidirectional texts in Plain TeX and LaTeX, using XeTeX engine.
@@ -30,7 +30,7 @@ The announcements for the new releases of the package will
also appear in the Discussions space under the Announcements
category.
-Current version release date: 2022/06/15
+Current version release date: 2022/06/27
___________________________________________
Vafa Khalighi
@@ -87,8 +87,11 @@ by Vafa Khalighi.
\generate{\file{beamerbaseauxtemplates-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerbaseauxtemplates-xetex-bidi.def}}}
\generate{\file{beamerbaseboxes-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerbaseboxes-xetex-bidi.def}}}
\generate{\file{beamerbasecolor-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerbasecolor-xetex-bidi.def}}}
+\generate{\file{beamerbasecompatibility-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerbasecompatibility-xetex-bidi.def}}}
\generate{\file{beamerbaseframecomponents-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerbaseframecomponents-xetex-bidi.def}}}
+\generate{\file{beamerbaseframesize-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerbaseframesize-xetex-bidi.def}}}
\generate{\file{beamerbaselocalstructure-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerbaselocalstructure-xetex-bidi.def}}}
+\generate{\file{beamerbasemisc-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerbasemisc-xetex-bidi.def}}}
\generate{\file{beamerbasenavigation-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerbasenavigation-xetex-bidi.def}}}
\generate{\file{beamerbaseoverlay-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerbaseoverlay-xetex-bidi.def}}}
\generate{\file{beamerinnerthemedefault-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerinnerthemedefault-xetex-bidi.def}}}
@@ -263,7 +266,7 @@ by Vafa Khalighi.
\documentclass{ltxdoc}
\input{bidi-doc-preamble.ltx}
\hypersetup{%
- pdftitle={Source documentation for version 38.3 of the bidi
+ pdftitle={Source documentation for version 38.4 of the bidi
package}%
}
\EnableCrossrefs
@@ -282,7 +285,7 @@ by Vafa Khalighi.
% \GetFileInfo{\jobname.dtx}
% \title{\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}\\
%\LARGE Bidirectional typesetting in plain \TeX{} and \LaTeX, using \XeTeX{} engine\\[5pt]
-%\large Source documentation for \textcolor{blue!65!black}{version 38.3}}
+%\large Source documentation for \textcolor{blue!65!black}{version 38.4}}
% \author{Vafa Khalighi\thanks{Thanks to the bidi-tex GitHub organization consisted of David Carlisle and other members of the {\LaTeX} team to maintain the package in the period 2018--2020.}}
%\setcounter{page}{0}
%\thispagestyle{empty}
@@ -292,7 +295,7 @@ by Vafa Khalighi.
%\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}
%
%\Large
-%Source documentation for \textcolor{blue!65!black}{version 38.3}}
+%Source documentation for \textcolor{blue!65!black}{version 38.4}}
%
%\vskip 0pt plus 3fill
%\textit{\large to my Master, \textbf{Ferdowsi The Great}}
@@ -341,7 +344,7 @@ by Vafa Khalighi.
%\iffalse
%<*table>
%\fi
-%% \CheckSum{54385}
+%% \CheckSum{55044}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -2411,6 +2414,17 @@ by Vafa Khalighi.
% \end{macrocode}
% \iffalse
%</beamerbasecolor-xetex-bidi.def>
+%<*beamerbasecompatibility-xetex-bidi.def>
+%\fi
+% \section{File \texttt{beamerbasecompatibility-xetex-bidi.def}}
+% \begin{macrocode}
+\ProvidesFile{beamerbasecompatibility-xetex-bidi.def}[2022/06/27 v0.1 bidi adaptations for beamerbasecompatibility package for XeTeX engine]
+\def\insertvrule#1#2{\hbox{{\color{#2}\hskip-\Gm@lmargin\vrule width \paperwidth height #1\hskip-\Gm@rmargin}}}
+
+
+% \end{macrocode}
+% \iffalse
+%</beamerbasecompatibility-xetex-bidi.def>
%<*beamerbaseframecomponents-xetex-bidi.def>
%\fi
% \section{File \texttt{beamerbaseframecomponents-xetex-bidi.def}}
@@ -2816,6 +2830,136 @@ by Vafa Khalighi.
% \end{macrocode}
% \iffalse
%</beamerbaseframecomponents-xetex-bidi.def>
+%<*beamerbaseframesize-xetex-bidi.def>
+%\fi
+% \section{File \texttt{beamerbaseframesize-xetex-bidi.def}}
+% \begin{macrocode}
+\ProvidesFile{beamerbaseframesize-xetex-bidi.def}[2022/06/27 v0.1 bidi adaptations for beamerbaseframesize package for XeTeX engine]
+\def\beamer@framezoom<#1><#2>[#3](#4,#5)(#6,#7){%
+ \par\nointerlineskip%
+ \global\beamer@slidehaszoomtrue%
+ \advance\beamer@zoomcount by1\relax%
+ \def\beamer@zoomborderwidth{0}%
+ \edef\beamer@labelzoomed{beamer@labelzoomed@\the\beamer@zoomframecount @\the\beamer@zoomcount}%
+ \setkeys{beamerzoom}{#3}%
+ \only<#1>{%
+ {\hypersetup{pdfhighlight={/P},pdfborder={0 0 \beamer@zoomborderwidth}}%
+ \global\setbox\@tempboxa=\vbox{\hyperlink{\beamer@labelzoomed}{%
+ \expandafter\ifx\csname XeTeXrevision\endcsname\relax
+ \vbox to #7{%
+ \hbox to#6{\hfil}%
+ \vfil%
+ }%
+ \else%
+ \begingroup%
+ \normalsize%
+ \begin{pgfpicture}{0pt}{0pt}{#6}{#7}%
+ \pgfsetfillopacity{0}
+ \pgftext[x=0cm,y=3pt]{.}
+ \pgftext[x=#6,y=\dimexpr#7-\baselineskip+3pt]{.}
+ \end{pgfpicture}%
+ \endgroup%
+ \fi%
+ }}}%
+ \ht\@tempboxa=0pt%
+ \wd\@tempboxa=0pt%
+ \dp\@tempboxa=0pt%
+ \setbox\@tempboxa=\vbox{\if@RTL\moveleft\else\moveright\fi#4\hbox{\lower#5\vbox{\box\@tempboxa}}}%
+ \ht\@tempboxa=0pt%
+ \wd\@tempboxa=0pt%
+ \dp\@tempboxa=0pt%
+ \global\setbox\beamer@zoombox=\vbox to0pt{\unvbox\beamer@zoombox\box\@tempboxa}%
+ }%
+ \only<#2>{%
+ \@ifundefined{\beamer@labelzoomed}%
+ {%
+ \hypertarget{\beamer@labelzoomed}{}%
+ \expandafter\gdef\csname\beamer@labelzoomed\endcsname{}%
+ }{}%
+ \gdef\beamer@zoomer{%
+ % compute zoom factor
+ \@tempdima=\beamer@frametextheight%
+ \@tempdimb=#7\relax%
+ \@tempcnta=\@tempdimb%
+ \divide\@tempcnta by4096\relax%
+ \multiply\@tempdima by16\relax%
+ \divide\@tempdima by\@tempcnta%
+ \@tempdimb=\paperwidth%
+ \ifbeamer@plainframe%
+ \else%
+ \advance\@tempdimb by-\beamer@leftsidebar%
+ \advance\@tempdimb by-\beamer@rightsidebar\relax%
+ \fi%
+ \@tempdimc=#6\relax%
+ \@tempcntb=\@tempdimc%
+ \divide\@tempcntb by4096\relax%
+ \multiply\@tempdimb by16\relax%
+ \divide\@tempdimb by\@tempcntb%
+ \ifdim\@tempdimb<\@tempdima%
+ \@tempdima=\@tempdimb%
+ \fi%
+ \edef\beamer@temp{\strip@pt\@tempdima}%
+ \@tempdimc=\beamer@frametextheight%
+ \advance\@tempdimc by4pt%
+ \@tempdimb=\paperwidth%
+ \ifbeamer@plainframe%
+ \else%
+ \advance\@tempdimb by-\beamer@leftsidebar%
+ \advance\@tempdimb by-\beamer@rightsidebar\relax%
+ \fi%
+ \setbox\@tempboxa=\vbox{\hsize=\@tempdimb\Acrobatmenu{GoBack}{\vbox to
+ \beamer@frametextheight{\hbox to\@tempdimb{\hfil}\vfil}}}%
+ \ht\@tempboxa=0pt%
+ \wd\@tempboxa=0pt%
+ \dp\@tempboxa=0pt%
+ \setbox\beamer@framebox=\vbox to\beamer@frametextheight{{%
+ \ifbeamer@plainframe\beamer@leftmargin=\Gm@lmargin\fi%
+ \if@RTL
+ \begin{pgfpicture}{\paperwidth-\beamer@leftmargin}{-\beamer@frametextheight}{\paperwidth-\beamer@leftmargin}{0pt}
+ \pgftext[right,top]{\box\@tempboxa}
+ \pgfpathrectangle{\pgfpoint{0pt}{-\@tempdimc}}{\pgfpoint{\@tempdimb}{\@tempdimc}}%
+ \pgfusepath{clip}
+ \begingroup
+ \pgftransformscale{\beamer@temp}
+ \@tempdima=#4\relax%
+ \@tempdimb=#5\relax%
+ {\pgftransformshift{\pgfpoint{\@tempdima+#6}{\@tempdimb}}%
+ \pgftext[right,top]{\vbox{\vbox{}\nointerlineskip\unvbox\beamer@framebox}}}
+ \endgroup
+ \end{pgfpicture}%
+ \else
+ \begin{pgfpicture}{\beamer@leftmargin}{-\beamer@frametextheight}{\beamer@leftmargin}{0pt}
+ \pgftext[left,top]{\box\@tempboxa}
+ \pgfpathrectangle{\pgfpoint{0pt}{-\@tempdimc}}{\pgfpoint{\@tempdimb}{\@tempdimc}}%
+ \pgfusepath{clip}
+ \begingroup
+ \pgftransformscale{\beamer@temp}
+ \@tempdima=#4\relax%
+ \@tempdimb=#5\relax%
+ {\pgftransformshift{\pgfpoint{-\@tempdima}{\@tempdimb}}%
+ \pgftext[left,top]{\vbox{\vbox{}\nointerlineskip\unvbox\beamer@framebox}}}
+ \endgroup
+ \end{pgfpicture}%
+ \fi
+ }}%
+ \setbox\beamer@framebox=\vbox{%
+ \nobreak\vbox{}\nobreak\par\nobreak\beamer@entrycode\nobreak%
+ \nointerlineskip\unvbox\beamer@frametitlebox%
+ \nobreak%
+ \box\beamer@framebox%
+ \nobreak%
+ \vss%
+ \beamer@exitcode%
+ }%
+ \global\setbox\beamer@footins=\box\voidb@x% no footnotes in zoomed slides
+ }%
+ }%
+}
+
+
+% \end{macrocode}
+% \iffalse
+%</beamerbaseframesize-xetex-bidi.def>
%<*beamerbaselocalstructure-xetex-bidi.def>
%\fi
% \section{File \texttt{beamerbaselocalstructure-xetex-bidi.def}}
@@ -2909,11 +3053,29 @@ by Vafa Khalighi.
% \end{macrocode}
% \iffalse
%</beamerbaselocalstructure-xetex-bidi.def>
+%<*beamerbasemisc-xetex-bidi.def>
+%\fi
+% \section{File \texttt{beamerbasemisc-xetex-bidi.def}}
+% \begin{macrocode}
+\ProvidesFile{beamerbasemisc-xetex-bidi.def}[2022/06/27 v0.1 bidi adaptations for beamerbasemisc package for XeTeX engine]
+\define@key{beamerst}{width}{%
+ \def\beamer@ststart{%
+ \begin{minipage}[t]{#1}%
+ \bidi@beamer@ragged
+ \beamer@stalign
+ \beamer@stlinebreakrule
+ }%
+ \def\beamer@stend{\end{minipage}}}
+
+
+% \end{macrocode}
+% \iffalse
+%</beamerbasemisc-xetex-bidi.def>
%<*beamerbasenavigation-xetex-bidi.def>
%\fi
% \section{File \texttt{beamerbasenavigation-xetex-bidi.def}}
% \begin{macrocode}
-\ProvidesFile{beamerbasenavigation-xetex-bidi.def}[2022/06/09 v0.1 bidi adaptations for beamerbasenavigation package for XeTeX engine]
+\ProvidesFile{beamerbasenavigation-xetex-bidi.def}[2022/06/27 v0.2 bidi adaptations for beamerbasenavigation package for XeTeX engine]
\def\slideentry#1#2#3#4#5#6{%
%section number, subsection number, slide number, first/last frame, page number, part number
\ifnum#6=\c@part\ifnum#1>0\ifnum#3>0%
@@ -2965,6 +3127,70 @@ by Vafa Khalighi.
\fakeslideentry{#1}{#2}{#3}{#4}{#5}{#6}%
\fi\ignorespaces
}
+
+\pgfdefobject{bidi@beamer@RTL@gotosymbol}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{5pt}{5pt}}
+{
+ \pgfpathqmoveto{3.5bp}{0.5bp}
+ \pgfpathqlineto{1.5bp}{2bp}
+ \pgfpathqlineto{3.5bp}{3.5bp}
+ \pgfusepathqfill
+}
+
+\def\insertgotosymbol{%
+\if@RTL
+ \begin{pgfpicture}{-1pt}{0pt}{4pt}{5pt}
+ \pgfuseobject{bidi@beamer@RTL@gotosymbol}%
+ \end{pgfpicture}%
+\else
+ \begin{pgfpicture}{1pt}{0pt}{6pt}{5pt}
+ \pgfuseobject{beamergotosymbol}%
+ \end{pgfpicture}%
+\fi
+}
+
+\pgfdefobject{bidi@beamer@RTL@skipsymbol}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{7pt}{5pt}}
+{
+ \pgfpathqmoveto{5.5bp}{0.5bp}
+ \pgfpathqlineto{3.5bp}{2bp}
+ \pgfpathqlineto{5.5bp}{3.5bp}
+ \pgfpathqmoveto{3.5bp}{0.5bp}
+ \pgfpathqlineto{1.5bp}{2bp}
+ \pgfpathqlineto{3.5bp}{3.5bp}
+ \pgfusepathqfill
+}
+
+\def\insertskipsymbol{%
+\if@RTL
+ \begin{pgfpicture}{-1pt}{0pt}{6pt}{5pt}
+ \pgfuseobject{bidi@beamer@RTL@skipsymbol}%
+ \end{pgfpicture}%
+\else
+ \begin{pgfpicture}{1pt}{0pt}{8pt}{5pt}
+ \pgfuseobject{beamerskipsymbol}%
+ \end{pgfpicture}%
+\fi
+}
+
+\pgfdefobject{bidi@beamer@RTL@returnsymbol}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{5pt}{5pt}}
+{
+ \pgfpathqmoveto{1.5bp}{0.5bp}
+ \pgfpathqlineto{3.5bp}{2bp}
+ \pgfpathqlineto{1.5bp}{3.5bp}
+ \pgfusepathqfill
+}
+
+\def\insertreturnsymbol{%
+\if@RTL
+ \begin{pgfpicture}{-1pt}{0pt}{4pt}{5pt}
+ \pgfuseobject{bidi@beamer@RTL@returnsymbol}%
+ \end{pgfpicture}%
+\else
+ \begin{pgfpicture}{1pt}{0pt}{6pt}{5pt}
+ \pgfuseobject{beamerreturnsymbol}%
+ \end{pgfpicture}%
+\fi
+}
+
% \end{macrocode}
% \iffalse
@@ -2984,7 +3210,7 @@ by Vafa Khalighi.
%\fi
% \section{File \texttt{beamerinnerthemedefault-xetex-bidi.def}}
% \begin{macrocode}
-\ProvidesFile{beamerinnerthemedefault-xetex-bidi.def}[2022/06/10 v0.5 bidi adaptations for beamerinnerthemedefault package for XeTeX engine]
+\ProvidesFile{beamerinnerthemedefault-xetex-bidi.def}[2022/06/27 v0.6 bidi adaptations for beamerinnerthemedefault package for XeTeX engine]
\newcommand*{\bidi@beamer@leftskip}{%
\if@RTL
\rightskip
@@ -3124,6 +3350,65 @@ by Vafa Khalighi.
\defbeamertemplate*{abstract begin}{default}
{\beamercolorbox[vmode]{abstract}\bidi@beamer@leftskip2em\bidi@beamer@rightskip2em plus 1fill\usebeamerfont*{abstract}}
+\bidi@undef\beamer@@tmpop@button@default
+
+\defbeamertemplate*{button}{default}
+{%
+ \setbox\beamer@tempbox=\hbox{{\insertbuttontext}}%
+ \ht\beamer@tempbox=6pt%
+ \dp\beamer@tempbox=0pt%
+ \setbox\beamer@tempbox=\vbox{\box\beamer@tempbox\vskip2pt}%
+ \beamer@tempdim=\wd\beamer@tempbox%
+ \beamer@dima=\beamer@tempdim\advance\beamer@dima by2.2pt
+ \beamer@dimb=\beamer@tempdim\advance\beamer@dimb by4pt
+ \if@RTL
+ \kern4pt%
+ \box\beamer@tempbox%
+ \hskip-\beamer@tempdim%
+ \fi
+ \begin{pgfpicture}{-4pt}{0pt}{\the\beamer@tempdim}{8pt}
+ \color{bg}
+ \pgfsetlinewidth{0.8pt}
+ \pgfpathqmoveto{0pt}{0pt}
+ \pgfpathqcurveto{-2.2pt}{0pt}{-4pt}{1.8pt}{-4pt}{4pt}
+ \pgfpathqcurveto{-4pt}{6.2pt}{-2.2pt}{8pt}{0pt}{8pt}
+ \pgfpathlineto{\pgfpoint{\the\beamer@tempdim}{8pt}}
+ \pgfpathcurveto%
+ {\pgfpoint{\the\beamer@dima}{8pt}}%
+ {\pgfpoint{\the\beamer@dimb}{6.2pt}}%
+ {\pgfpoint{\the\beamer@dimb}{4pt}}
+ \pgfpathcurveto%
+ {\pgfpoint{\the\beamer@dimb}{1.8pt}}%
+ {\pgfpoint{\the\beamer@dima}{0pt}}%
+ {\pgfpoint{\the\beamer@tempdim}{0pt}}
+ \pgfpathclose
+ \pgfusepathqfill
+ \colorlet{bg}{parent.bg}
+ \usebeamercolor[fg]{button border}
+ \pgfpathqmoveto{0pt}{0pt}
+ \pgfpathqcurveto{-2.2pt}{0pt}{-4pt}{1.8pt}{-4pt}{4pt}
+ \pgfpathqcurveto{-4pt}{6.2pt}{-2.2pt}{8pt}{0pt}{8pt}
+ \pgfpathlineto{\pgfpoint{\the\beamer@tempdim}{8pt}}
+ \pgfpathcurveto%
+ {\pgfpoint{\the\beamer@dima}{8pt}}%
+ {\pgfpoint{\the\beamer@dimb}{6.2pt}}%
+ {\pgfpoint{\the\beamer@dimb}{4pt}}
+ \pgfpathcurveto%
+ {\pgfpoint{\the\beamer@dimb}{1.8pt}}%
+ {\pgfpoint{\the\beamer@dima}{0pt}}%
+ {\pgfpoint{\the\beamer@tempdim}{0pt}}
+ \pgfpathclose
+ \pgfusepathqstroke
+ \end{pgfpicture}%
+ \if@RTL
+ \else
+ \hskip-\beamer@tempdim%
+ \box\beamer@tempbox%
+ \kern4pt%
+ \fi
+}
+
+
% \end{macrocode}
% \iffalse
%</beamerinnerthemedefault-xetex-bidi.def>
@@ -3472,7 +3757,7 @@ by Vafa Khalighi.
%\fi
% \section{File \texttt{beamerouterthemedefault-xetex-bidi.def}}
% \begin{macrocode}
-\ProvidesFile{beamerouterthemedefault-xetex-bidi.def}[2022/06/07 v0.1 bidi adaptations for beamerouterthemedefault package for XeTeX engine]
+\ProvidesFile{beamerouterthemedefault-xetex-bidi.def}[2022/06/27 v0.2 bidi adaptations for beamerouterthemedefault package for XeTeX engine]
\def\beamer@fteleft{\if@RTLmain\vskip0.35cm\advance\leftskip by 1.7cm\advance\rightskip by1.7cm\else\fi}
\def\beamer@fteright{\if@RTLmain\else\vskip0.35cm\advance\leftskip by 1.7cm\advance\rightskip by1.7cm\fi}
@@ -3483,6 +3768,84 @@ by Vafa Khalighi.
\fi
}
+\bidi@csundef{beamer@@tmpop@note page@default}
+
+\newcommand*{\bidi@beamer@today}{%
+\the\year-\ifnum\month<10\relax0\fi\the\month-\ifnum\day<10\relax0\fi\the\day}
+
+\defbeamertemplate*{note page}{default}
+{%
+ {%
+ \scriptsize
+ \usebeamerfont{note title}\usebeamercolor[fg]{note title}%
+ \ifbeamercolorempty[bg]{note title}{}{%
+ \insertvrule{.25\paperheight}{note title.bg}%
+ \vskip-.25\paperheight%
+ \nointerlineskip%
+ }%
+ \vbox{
+ \hfill\insertslideintonotes{0.25}\hskip-\Gm@rmargin\hskip0pt%
+ \vskip-0.25\paperheight%
+ \nointerlineskip
+ \if@RTL
+ \begin{pgfpicture}{-\textwidth}{0cm}{-\textwidth}{0cm}
+ \begin{pgflowlevelscope}{\pgftransformrotate{-90}}
+ {\pgftransformshift{\pgfpoint{2cm}{0.2cm}}%
+ \pgftext[base,right]{\usebeamerfont{note date}\usebeamercolor[fg]{note date}\bidi@beamer@today}}
+ \end{pgflowlevelscope}
+ \end{pgfpicture}%
+ \else
+ \begin{pgfpicture}{0cm}{0cm}{0cm}{0cm}
+ \begin{pgflowlevelscope}{\pgftransformrotate{90}}
+ {\pgftransformshift{\pgfpoint{-2cm}{0.2cm}}%
+ \pgftext[base,left]{\usebeamerfont{note date}\usebeamercolor[fg]{note date}\bidi@beamer@today}}
+ \end{pgflowlevelscope}
+ \end{pgfpicture}%
+ \fi}
+ \nointerlineskip
+ \vbox to .25\paperheight{\vskip0.5em
+ \if@RTL
+ \moveright0.25\textwidth
+ \fi
+ \hbox{\insertshorttitle[width=0.75\textwidth]}%
+ \setbox\beamer@tempbox=\hbox{\insertsection}%
+
+\if@RTL
+ \moveright\dimexpr0.29\textwidth-14pt\relax
+\fi
+\hbox{\if@RTL\beginR\fi\ifdim\wd\beamer@tempbox>1pt{\hskip4pt\raise3pt\hbox{\vrule
+ width0.4pt height7pt\vrule width 9pt
+ height0.4pt}}\hskip1pt\hbox{\begin{minipage}[t]{0.71\textwidth}\def\breakhere{}\insertsection\end{minipage}}\fi%
+ \if@RTL\endR\fi}%
+ \setbox\beamer@tempbox=\hbox{\insertsubsection}%
+
+\if@RTL
+ \moveright\dimexpr0.29\textwidth-27.4pt\relax
+\fi \hbox{\if@RTL\beginR\fi\ifdim\wd\beamer@tempbox>1pt{\hskip17.4pt\raise3pt\hbox{\vrule
+ width0.4pt height7pt\vrule width 9pt
+ height0.4pt}}\hskip1pt\hbox{\begin{minipage}[t]{0.71\textwidth}\def\breakhere{}\insertsubsection\end{minipage}}\fi%
+ \if@RTL\endR\fi}%
+ \setbox\beamer@tempbox=\hbox{\insertshortframetitle}%
+
+\if@RTL
+ \moveright\dimexpr0.33\textwidth-40.8pt\relax
+\fi \hbox{\if@RTL\beginR\fi\ifdim\wd\beamer@tempbox>1pt{\hskip30.8pt\raise3pt\hbox{\vrule
+ width0.4pt height7pt\vrule width 9pt
+ height0.4pt}}\hskip1pt\hbox{\insertshortframetitle[width=0.67\textwidth]}\fi%
+ \if@RTL\endR\fi}%
+ \vfil}%
+ }%
+ \ifbeamercolorempty[bg]{note page}{}{%
+ \nointerlineskip%
+ \insertvrule{.75\paperheight}{note page.bg}%
+ \vskip-.75\paperheight%
+ }%
+ \vskip.25em
+ \nointerlineskip
+ \insertnote
+}
+
+
% \end{macrocode}
% \iffalse
@@ -4225,8 +4588,8 @@ by Vafa Khalighi.
% \section{File \texttt{bidi.sty}}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\def\bididate{2022/06/15}
-\def\bidi@version{38.3}
+\def\bididate{2022/06/27}
+\def\bidi@version{38.4}
\ProvidesPackage{bidi}[\bididate\space v\bidi@version\space
Bidirectional typesetting in plain TeX and LaTeX]
\edef\@bidi@info{****************************************************^^J%
@@ -4314,7 +4677,7 @@ Bidirectional typesetting in plain TeX and LaTeX]
}
\newcommand*{\@bidi@pdfcustomproperties}{%
This is the bidi package, Version \bidi@version,
- Released June 15, 2022.
+ Released June 27, 2022.
}
\newcommand*{\bidi@beamer@ragged}{}
\@RTLmainfalse
@@ -4558,9 +4921,9 @@ Bidirectional typesetting in plain TeX and LaTeX]
%\fi
% \section{File \texttt{bidi.tex}}
% \begin{macrocode}
-\def\bididate{2022/06/15}
+\def\bididate{2022/06/27}
\catcode`@=11
-\def\bidi@version{38.3}
+\def\bidi@version{38.4}
\let \protect \relax
\newlinechar`\^^J
\edef\@bidi@info{****************************************************^^J%
@@ -4662,7 +5025,7 @@ Bidirectional typesetting in plain TeX and LaTeX]
}
\def\@bidi@pdfcustomproperties{%
This is the bidi package, Version \bidi@version,
- Released June 15, 2022.
+ Released June 27, 2022.
}
\def\bidi@pdfm@mark{%
\special{pdf:%
@@ -4758,37 +5121,83 @@ Bidirectional typesetting in plain TeX and LaTeX]
\RequirePackage{showexpl}
\definecolor{hellgelb}{rgb}{1,1,0.85}
\definecolor{colKeys}{rgb}{0,0,1}
+\definecolor{colCS}{rgb}{0,0,1}
\definecolor{colIdentifier}{rgb}{0,0,0}
\definecolor{colComments}{rgb}{1,0,0}
\definecolor{colString}{rgb}{0,0.5,0}
-\lstset{
- language=[LaTeX]TEX,
- float=hbp,
- basicstyle=\ttfamily\small,
- identifierstyle=\color{colIdentifier},
- keywordstyle=\color{colKeys},
- stringstyle=\color{colString},
- commentstyle=\color{colComments},
- backgroundcolor=\color{hellgelb},
- columns=flexible,
- tabsize=4,
- extendedchars=true,
- showspaces=false,
- showstringspaces=false,
- numbers=left,
- numbersep=0.9em,
- numberstyle=\tiny, %
- frame=single,
- captionpos=b,
- xleftmargin=1em,
- breaklines=true,
- breakautoindent=false,
- breakindent=0pt,
- escapeinside=**,
- pos=r,
+\lstset{%
+ language=TeX,%
+ float=hbp,%
+ basicstyle=\ttfamily\small,%
+ identifierstyle=\color{colIdentifier},%
+ keywordstyle=\color{colKeys},%
+ texcsstyle=*\color{colCS},%
+ stringstyle=\color{colString},%
+ commentstyle=\color{colComments},%
+ backgroundcolor=\color{hellgelb},%
+ columns=flexible,%
+ tabsize=4,%
+ extendedchars=true,%
+ showspaces=false,%
+ showstringspaces=false,%
+ numbers=left,%
+ numbersep=0.9em,%
+ numberstyle=\tiny,%
+ frame=single,%
+ captionpos=b,%
+ xleftmargin=1em,%
+ breaklines=true,%
+ breakautoindent=false,%
+ breakindent=0pt,%
+ escapeinside=**,%
+ pos=r,%
explpreset={%
- xleftmargin=1em,columns=flexible,language=[LaTeX]TEX},
- morekeywords={setLTR,setLR,setRTL,setRL,LRE,LR,RLE,RL,lr,bidiversion,bididate}
+ xleftmargin=1em,%
+ columns=flexible,%
+ language=TeX%
+ },%
+ moretexcs={%
+ bididate,%
+ bidiversion,%
+ deflatinfont,%
+ defpersianfont,%
+ ding,%
+ endLTR,%
+ endRTL,%
+ false,%
+ falsesymbol,%
+ junicode,%
+ lr,%
+ LR,%
+ LRE,%
+ LTR,%
+ maketitle,%
+ Nastaliq,%
+ newfontfamily,%
+ Parsifont,%
+ part,%
+ RL,%
+ RLE,%
+ RTL,%
+ RTLcases,%
+ SepMark,%
+ setLR,%
+ setLTR,%
+ setRL,%
+ setRTL,%
+ settextfont,%
+ subsection,%
+ subsubsection,%
+ tableofcontents,%
+ text,%
+ theequation,%
+ thesection,%
+ true,%
+ truesymbol,%
+ XePersian,%
+ xepersiandate,%
+ xepersianversion%
+ }%
}
\newcommand\HLON{%
\gdef\lst@alloverstyle##1{%
@@ -25120,7 +25529,7 @@ to\rtside{\box\bslice\hfil}}
%\fi
% \section{File \texttt{latex-xetex-bidi.def}}
% \begin{macrocode}
-\ProvidesFile{latex-xetex-bidi.def}[2022/06/13 v1.4.7 bidi adaptations for `latex.ltx' for XeTeX engine]
+\ProvidesFile{latex-xetex-bidi.def}[2022/06/27 v1.4.8 bidi adaptations for `latex.ltx' for XeTeX engine]
\newcommand{\TeXXeTOn}{\TeXXeTstate\@ne}
\newcommand{\TeXXeTOff}{\TeXXeTstate\z@}
\TeXXeTOn
@@ -26076,8 +26485,11 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
\@ifpackageloaded{beamerbaseauxtemplates}{\input{beamerbaseauxtemplates-xetex-bidi.def}}{}
\@ifpackageloaded{beamerbaseboxes}{\input{beamerbaseboxes-xetex-bidi.def}}{}
\@ifpackageloaded{beamerbasecolor}{\input{beamerbasecolor-xetex-bidi.def}}{}
+\@ifpackageloaded{beamerbasecompatibility}{\input{beamerbasecompatibility-xetex-bidi.def}}{}
\@ifpackageloaded{beamerbaseframecomponents}{\input{beamerbaseframecomponents-xetex-bidi.def}}{}
+\@ifpackageloaded{beamerbaseframesize}{\input{beamerbaseframesize-xetex-bidi.def}}{}
\@ifpackageloaded{beamerbaselocalstructure}{\input{beamerbaselocalstructure-xetex-bidi.def}}{}
+\@ifpackageloaded{beamerbasemisc}{\input{beamerbasemisc-xetex-bidi.def}}{}
\@ifpackageloaded{beamerbasenavigation}{\input{beamerbasenavigation-xetex-bidi.def}}{}
\@ifpackageloaded{beamerbaseoverlay}{\input{beamerbaseoverlay-xetex-bidi.def}}{}
\@ifpackageloaded{beamerinnerthemedefault}{\input{beamerinnerthemedefault-xetex-bidi.def}}{}
diff --git a/macros/xetex/latex/bidi/bidi.pdf b/macros/xetex/latex/bidi/bidi.pdf
index b75475e211..48ebe485f8 100644
--- a/macros/xetex/latex/bidi/bidi.pdf
+++ b/macros/xetex/latex/bidi/bidi.pdf
Binary files differ
diff --git a/macros/xetex/latex/xepersian/README b/macros/xetex/latex/xepersian/README
index 5dd73bb034..a54f34410f 100644
--- a/macros/xetex/latex/xepersian/README
+++ b/macros/xetex/latex/xepersian/README
@@ -1,6 +1,6 @@
____________________
The XePersian package
-v24.5
+v24.6
The xepersian package provides a convenient interface for
typesetting Persian and English texts in LaTeX, using XeTeX
@@ -25,7 +25,7 @@ The announcements for the new releases of the package will
also appear in the Discussions space under the Announcements
category.
-Current version release date: 2022/06/10
+Current version release date: 2022/06/27
___________________________________________
Vafa Khalighi
diff --git a/macros/xetex/latex/xepersian/xepersian-doc-basics.ltx b/macros/xetex/latex/xepersian/xepersian-doc-basics.ltx
index 44452ea407..a84137fb8b 100644
--- a/macros/xetex/latex/xepersian/xepersian-doc-basics.ltx
+++ b/macros/xetex/latex/xepersian/xepersian-doc-basics.ltx
@@ -17,7 +17,7 @@ When loading the package, it is important to know that:
If you load \textsf{\XePersian} before any of these packages, then you will get an error saying that you should load \textsf{\XePersian} or \textsf{bidi} as your last package. When it says that you should load \textsf{bidi} package as your last package, it really means that you should load \textsf{\XePersian} as your last package as \textsf{bidi} package is loaded automatically by \textsf{\XePersian} package.
For instance, consider the following minimal example:
-\begin{lstlisting}[morekeywords={settextfont}]
+\begin{lstlisting}
\documentclass{minimal}
\usepackage{xepersian}
\usepackage{enumerate}
@@ -50,7 +50,7 @@ l.5 \begin{document}
\item \Lcs{xepersianversion} gives the current version of the package.
\item \Lcs{xepersiandate} gives the current date of the package.
\end{itemize}
-\begin{lstlisting}[morekeywords={settextfont,XePersian,xepersianversion,xepersiandate}]
+\begin{lstlisting}
\documentclass{article}
\usepackage{xepersian}
\settextfont{XB Niloofar}
@@ -1374,7 +1374,7 @@ The equivalent Persian font features and font feature options is shown in \autor
\end{supertabular}
\end{center}
\subsection{A Sample Input \TeX\ File}
-\begin{lstlisting}[morekeywords={settextfont,maketitle,tableofcontents,subsection,subsubsection,part}]
+\begin{lstlisting}
\documentclass{article}
\usepackage{xepersian}
\settextfont{XB Niloofar}
@@ -1417,12 +1417,12 @@ The equivalent Persian font features and font feature options is shown in \autor
\end{BDef}
\begin{itemize}
\item With \Lcs{defpersianfont}, you can define extra Persian fonts.
-\begin{lstlisting}[numbers=none,morekeywords={defpersianfont,Nastaliq}]
+\begin{lstlisting}[numbers=none]
\defpersianfont\Nastaliq[Scale=1]{IranNastaliq}
\end{lstlisting}
In this example, we define \Lcs{Nastaliq} to stand for IranNastaliq font.
\item With \Lcs{deflatinfont}, you can define extra Latin fonts.
-\begin{lstlisting}[numbers=none,morekeywords={deflatinfont,junicode}]
+\begin{lstlisting}[numbers=none]
\deflatinfont\junicode[Scale=1]{Junicode}
\end{lstlisting}
In this example, we define \Lcs{junicode} to stand for Junicode font.
diff --git a/macros/xetex/latex/xepersian/xepersian-doc-intro.ltx b/macros/xetex/latex/xepersian/xepersian-doc-intro.ltx
index 20952dce6c..03277cfa11 100644
--- a/macros/xetex/latex/xepersian/xepersian-doc-intro.ltx
+++ b/macros/xetex/latex/xepersian/xepersian-doc-intro.ltx
@@ -25,7 +25,7 @@ If you use \textsf{\XePersian} package to write any input \TeX\ document, and th
* Copyright (c) 2008--2022 Vafa Khalighi
* Copyright (c) 2018--2020 bidi-tex GitHub Organization
*
-* v24.5, 2022/06/10
+* v24.6, 2022/06/27
*
* License: LaTeX Project Public License, version
* 1.3c or higher (your choice)
diff --git a/macros/xetex/latex/xepersian/xepersian-doc-pkgs.ltx b/macros/xetex/latex/xepersian/xepersian-doc-pkgs.ltx
index 328d53d617..30dc622bb4 100644
--- a/macros/xetex/latex/xepersian/xepersian-doc-pkgs.ltx
+++ b/macros/xetex/latex/xepersian/xepersian-doc-pkgs.ltx
@@ -263,7 +263,7 @@ The available options are described along the text,
where appropriate.
\subsubsection{Creating Questions}
Here's a simple example demonstrating how to produce a new question:
-\begin{lstlisting}[morekeywords={false,true}]
+\begin{lstlisting}
\begin{question}{*\parsitext{سؤال}*}
\false *\parsitext{جواب ۱}*
\true *\parsitext{جواب ۲}*
@@ -381,7 +381,7 @@ arrow are used. You can change these symbols by using the \Lcs{truesymbol} and
\Lcs{falsesymbol} macros. For instance, you could give a fancier look to your correction
by using the \textsf{pifont} package and issuing:
-\begin{lstlisting}[numbers=none,morekeywords={truesymbol,ding,falsesymbol}]
+\begin{lstlisting}[numbers=none]
\truesymbol{\ding{'063}~}
\falsesymbol{\ding{'067}~}
\end{lstlisting}
diff --git a/macros/xetex/latex/xepersian/xepersian-doc-title.ltx b/macros/xetex/latex/xepersian/xepersian-doc-title.ltx
index 27590643b5..7e2ad0e9cc 100644
--- a/macros/xetex/latex/xepersian/xepersian-doc-title.ltx
+++ b/macros/xetex/latex/xepersian/xepersian-doc-title.ltx
@@ -3,7 +3,7 @@
\begin{document}
\title{\textcolor{blue!65!black}{\Huge The \textsf{\XePersian} \textit{Package}}\\
\LARGE Persian for \LaTeXe, using {\XeTeX} engine\\[5pt]
-\large User documentation for \textcolor{blue!65!black}{version 24.5}}
+\large User documentation for \textcolor{blue!65!black}{version 24.6}}
\author{Vafa Khalighi\thanks{Thanks to the bidi-tex GitHub organization consisted of David Carlisle and other members of the {\LaTeX} team to maintain the package in the period 2018--2020.}}
\setcounter{page}{0}
\thispagestyle{empty}
@@ -13,7 +13,7 @@
\textcolor{blue!65!black}{\Huge The \textsf{\XePersian} \textit{Package}}
\Large
-User documentation for \textcolor{blue!65!black}{version 24.5}}
+User documentation for \textcolor{blue!65!black}{version 24.6}}
\vskip 0pt plus 3fill
\textit{\large to my Master, \textbf{Ferdowsi The Great}}
diff --git a/macros/xetex/latex/xepersian/xepersian-doc.ltx b/macros/xetex/latex/xepersian/xepersian-doc.ltx
index 2d6f17fa5d..927cd9f52c 100644
--- a/macros/xetex/latex/xepersian/xepersian-doc.ltx
+++ b/macros/xetex/latex/xepersian/xepersian-doc.ltx
@@ -1,7 +1,7 @@
\documentclass{ltxdoc}
\input{xepersian-doc-preamble.ltx}
\hypersetup{%
- pdftitle={User documentation for version 24.5 of the XePersian
+ pdftitle={User documentation for version 24.6 of the XePersian
package}%
}
\begin{document}
diff --git a/macros/xetex/latex/xepersian/xepersian-doc.pdf b/macros/xetex/latex/xepersian/xepersian-doc.pdf
index 3a84cf8abe..10565c9a34 100644
--- a/macros/xetex/latex/xepersian/xepersian-doc.pdf
+++ b/macros/xetex/latex/xepersian/xepersian-doc.pdf
Binary files differ
diff --git a/macros/xetex/latex/xepersian/xepersian.dtx b/macros/xetex/latex/xepersian/xepersian.dtx
index 2cc18044a3..0a3b09193b 100644
--- a/macros/xetex/latex/xepersian/xepersian.dtx
+++ b/macros/xetex/latex/xepersian/xepersian.dtx
@@ -5,7 +5,7 @@
%<*readme>
____________________
The XePersian package
-v24.5
+v24.6
The xepersian package provides a convenient interface for
typesetting Persian and English texts in LaTeX, using XeTeX
@@ -31,7 +31,7 @@ also appear in the Discussions space under the Announcements
category.
-Current version release date: 2022/06/10
+Current version release date: 2022/06/27
___________________________________________
Vafa Khalighi
@@ -168,7 +168,7 @@ by Vafa Khalighi.
\documentclass{ltxdoc}
\input{xepersian-doc-preamble.ltx}
\hypersetup{%
- pdftitle={Source documentation for version 24.5 of the XePersian
+ pdftitle={Source documentation for version 24.6 of the XePersian
package}%
}
\EnableCrossrefs
@@ -187,7 +187,7 @@ by Vafa Khalighi.
% \GetFileInfo{\jobname.dtx}
% \title{\textcolor{blue!65!black}{\Huge The \textsf{\XePersian} \textit{Package}}\\
%\LARGE Persian for \LaTeXe, using {\XeTeX} engine\\[5pt]
-%\large Source documentation for \textcolor{blue!65!black}{version 24.5}}
+%\large Source documentation for \textcolor{blue!65!black}{version 24.6}}
% \author{Vafa Khalighi\thanks{Thanks to the bidi-tex GitHub organization consisted of David Carlisle and other members of the {\LaTeX} team to maintain the package in the period 2018--2020.}}
%\setcounter{page}{0}
%\thispagestyle{empty}
@@ -197,7 +197,7 @@ by Vafa Khalighi.
%\textcolor{blue!65!black}{\Huge The \textsf{\XePersian} \textit{Package}}
%
%\Large
-%Source documentation for \textcolor{blue!65!black}{version 24.5}}
+%Source documentation for \textcolor{blue!65!black}{version 24.6}}
%
%\vskip 0pt plus 3fill
%\textit{\large to my Master, \textbf{Ferdowsi The Great}}
@@ -245,7 +245,7 @@ by Vafa Khalighi.
%\iffalse
%<*table>
%\fi
-%% \CheckSum{11155}
+%% \CheckSum{11173}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -422,8 +422,13 @@ by Vafa Khalighi.
%\fi
% \section{File \texttt{beamer-xepersian.def}}
% \begin{macrocode}
-\ProvidesFile{beamer-xepersian.def}[2022/05/24 v0.1 xepersian changes to beamer class]
+\ProvidesFile{beamer-xepersian.def}[2022/06/27 v0.2 xepersian changes to beamer class]
\usefonttheme[stillsansserifmath]{serif}
+
+\renewcommand*{\bidi@beamer@today}{%
+\the\persianyear-\ifnum\persianmonth<10\relax0\fi\the\persianmonth-\ifnum\persianday<10\relax0\fi\the\persianday}
+
+
% \end{macrocode}
% \iffalse
%</beamer-xepersian.def>
@@ -431,24 +436,26 @@ by Vafa Khalighi.
%\fi
% \section{File \texttt{beamerbasetranslator-xepersian.def}}
% \begin{macrocode}
-\ProvidesFile{beamerbasetranslator-xepersian.def}[2022/06/09 v0.2 xepersian changes to beamerbasetranslator package]
-\newcommand*{\ProvideTranslation}[2]{%
+\ProvidesFile{beamerbasetranslator-xepersian.def}[2022/06/27 v0.3 xepersian changes to beamerbasetranslator package]
+\newcommand*{\ProvidePersianTranslation}[2]{%
\providetranslation{#1}{\ifRtoL{#2}{#1}}%
}
-\ProvideTranslation{Theorem}{قضیه}
-\ProvideTranslation{Corollary}{نتیجه}
-\ProvideTranslation{Fact}{حقیقت}
-\ProvideTranslation{Lemma}{لما}
-\ProvideTranslation{Problem}{مساله}
-\ProvideTranslation{Solution}{راه‌حل}
-\ProvideTranslation{Definition}{تعریف}
-\ProvideTranslation{Definitions}{تعریف‌ها}
-\ProvideTranslation{Example}{مثال}
-\ProvideTranslation{Examples}{مثال‌ها}
-\ProvideTranslation{Who?}{ارایه‌دهنده}
-\ProvideTranslation{From?}{از}
-\ProvideTranslation{When?}{زمان}
+\ProvidePersianTranslation{Corollary}{نتیجه}
+\ProvidePersianTranslation{Definition}{تعریف}
+\ProvidePersianTranslation{Definitions}{تعریف‌ها}
+\ProvidePersianTranslation{Example}{مثال}
+\ProvidePersianTranslation{Examples}{مثال‌ها}
+\ProvidePersianTranslation{Fact}{حقیقت}
+\ProvidePersianTranslation{From?}{از}
+\ProvidePersianTranslation{Lemma}{لما}
+\ProvidePersianTranslation{Problem}{مساله}
+\ProvidePersianTranslation{Section}{قسمت}
+\ProvidePersianTranslation{Solution}{راه‌حل}
+\ProvidePersianTranslation{Subsection}{زیرقسمت}
+\ProvidePersianTranslation{Theorem}{قضیه}
+\ProvidePersianTranslation{When?}{زمان}
+\ProvidePersianTranslation{Who?}{ارایه‌دهنده}
% \end{macrocode}
@@ -3585,8 +3592,8 @@ U+003E U+003E <> U+00BB ; >> -> RIGHT POINTING GUILLEMET
% \section{File \texttt{xepersian.sty}}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\def\xepersian@version{24.5}
-\def\xepersiandate{2022/06/10}
+\def\xepersian@version{24.6}
+\def\xepersiandate{2022/06/27}
\ProvidesPackage{xepersian}[\xepersiandate\space v\xepersian@version\space
Persian typesetting in XeLaTeX]
\RequirePackage{fontspec}
@@ -4435,7 +4442,7 @@ Persian typesetting in XeLaTeX]
\newcommand*{\@xepersian@pdfcustomproperties}{%
This is the xepersian package, Version \xepersian@version,
- Released June 10, 2022.
+ Released June 27, 2022.
}
\newcommand\twocolumnstableofcontents{%
diff --git a/macros/xetex/latex/xepersian/xepersian.pdf b/macros/xetex/latex/xepersian/xepersian.pdf
index 256aef7592..d660ce4234 100644
--- a/macros/xetex/latex/xepersian/xepersian.pdf
+++ b/macros/xetex/latex/xepersian/xepersian.pdf
Binary files differ
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index 6322e06c8e..8960d20452 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,8 @@
+2022-06-27 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (nameref.4ht): disable \index and \label inside
+ \caption, to prevent fatal errors.
+
2022-06-24 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-jats.4ht (jats.4ht): added support for pictures.
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index 0c2bd00913..f99c6fbd42 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1158 2022-06-21 15:56:07Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1161 2022-06-27 10:03:53Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
@@ -3475,9 +3475,15 @@ definitions.
% \NR:Type threw an undefined control sequence error. I think
% \@currenvir is safe, there is nothing special about \@captype.
%
+% use of \index and \label inside caption results in a fatal error
+% we need to disable them in \NR:Title
\long\def\@caption#1[#2]{%
\gdef\NR:Type{\@currenvir}%
- \gdef\NR:Title{\a:newlabel{#2}}%
+ \begingroup%
+ \let\index\:gobble%
+ \let\label\:gobble%
+ \xdef\NR:Title{\a:newlabel{#2}}%
+ \endgroup%
\o:NR@@caption{#1}[{#2}]%
}
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 2b88b24d20..172242e431 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -1,8 +1,5 @@
$mirrors = {
'Africa' => {
- 'Morocco' => {
- 'https://mirror.marwan.ma/ctan/' => 1,
- },
'South Africa' => {
'http://ftp.sun.ac.za/ftp/CTAN/' => 1,
'https://mirror.ufs.ac.za/ctan/' => 1,
@@ -59,9 +56,6 @@ $mirrors = {
'Singapore' => {
'https://download.nus.edu.sg/mirror/ctan/' => 1,
},
- 'Taiwan' => {
- 'https://ftp.ntou.edu.tw/ctan/' => 1,
- },
'Thailand' => {
'https://mirror.kku.ac.th/CTAN/' => 1,
},
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 22eb667fe8..edb3e6d343 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,11 +26,11 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2022
-depend revision/63732
+depend revision/63740
name 00texlive.image
category TLCore
-revision 63732
+revision 63739
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
@@ -1722,6 +1722,7 @@ runfiles size=12909
tlpkg/tlpsrc/facture-belge-simple-sans-tva.tlpsrc
tlpkg/tlpsrc/facture.tlpsrc
tlpkg/tlpsrc/faktor.tlpsrc
+ tlpkg/tlpsrc/familytree.tlpsrc
tlpkg/tlpsrc/fancybox.tlpsrc
tlpkg/tlpsrc/fancyhandout.tlpsrc
tlpkg/tlpsrc/fancyhdr-it.tlpsrc
@@ -4587,7 +4588,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 63727
+revision 63734
shortdesc TeX Live standalone installer package
longdesc This package defines the files to go into the installer
longdesc archives (install-tl-unx.tar.gz, install-tl.zip) built by the
@@ -24744,7 +24745,7 @@ catalogue-version 1.30
name asmejour
category Package
-revision 61568
+revision 63736
shortdesc A template for ASME journal papers
relocated 1
longdesc The asmejour class provides a template to format preprints
@@ -24759,11 +24760,11 @@ longdesc column balancing, various math options, government copyright,
longdesc and archivability (PDF/A). The class is compatible with
longdesc pdfLaTeX or LuaLaTeX. This package is not a publication of
longdesc ASME.
-containersize 22020
-containerchecksum e1d44c716073b655008511d509367926ae8e8a239859b398e776f647b85b154e043694ccaad634a6e127c7e502c0c05b9eb48fb68beab9cd592d88d1c35c9741
-doccontainersize 1802920
-doccontainerchecksum 407cfa6903607440d5ffb47eec384fe198d2aed77aa3662157d31d7fed84f3b30f7e648178401ee44feda016044a3fe5697fedc0f4e6e2a0fe9487c713f7fde8
-docfiles size=1561
+containersize 22568
+containerchecksum 73960398a0c3f7b29550bfe881c7c155662cecc0cfc70eb618c802ddbd20fc83416aaeaa5cfa16910b6dad106d362deebf73db803111a7520433549367ae1cfe
+doccontainersize 1811540
+doccontainerchecksum 510bc20b673d32b8d6831f21d22564de26f14318f4adcbe7dc759a2cc3e77089c06be0133d4f76b05cac0854592ff8f1b8d65487e5356078125307d986141cc8
+docfiles size=1579
RELOC/doc/latex/asmejour/README.md details="Readme"
RELOC/doc/latex/asmejour/asmejour-sample.bib
RELOC/doc/latex/asmejour/asmejour-template.pdf details="Example of use"
@@ -24776,13 +24777,13 @@ docfiles size=1561
RELOC/doc/latex/asmejour/sample-figure-1.pdf
RELOC/doc/latex/asmejour/sample-figure-2a.pdf
RELOC/doc/latex/asmejour/sample-figure-2b.pdf
-runfiles size=22
+runfiles size=23
RELOC/bibtex/bst/asmejour/asmejour.bst
RELOC/tex/latex/asmejour/asmejour.cls
catalogue-ctan /macros/latex/contrib/asmejour
catalogue-license mit
catalogue-topics class journalpub scientific-docs bibtex-sty engineering
-catalogue-version 1.18
+catalogue-version 1.19
name aspectratio
category Package
@@ -40639,17 +40640,17 @@ catalogue-version 2.2
name bidi
category Package
-revision 63607
+revision 63737
shortdesc Bidirectional typesetting in plain TeX and LaTeX, using XeTeX
relocated 1
longdesc A convenient interface for typesetting bidirectional texts with
longdesc plain TeX and LaTeX. The package includes adaptations for use
longdesc with many other commonly-used packages.
-containersize 128812
-containerchecksum 11c06a5842ff5d96e40a6e817dde4963bceecb4e95103a10eb49df0045c70453132a8e0917690e542258010c3de5295f3d4261b2e8d6324cb37667021cb72769
-doccontainersize 3983432
-doccontainerchecksum fbb17e498f436e7eca5fa189d9add29561ca3803dad0094b0fca52db52c2391b54436aee1034513c13a854cb9f5da6050c73300c2abcff57e43e70a166e05430
-docfiles size=1096
+containersize 130916
+containerchecksum ba202ef924e82294d011eb4b101c7aec6ae0dfbd0b583c8d0dff92800786fc1d2462393c6f379b57738f82d06a926a8495023b862a33dfc274a37927a60478f5
+doccontainersize 4027740
+doccontainerchecksum 339a9d0fa3905d6296e4a756d87fc5b52433fee3a07a88ea157bc1d688f2eee3a378fd45fea6a04f15c38495ce3516575434297a0339e2d7cf639cf63871fe23
+docfiles size=1108
RELOC/doc/xelatex/bidi/README details="Readme"
RELOC/doc/xelatex/bidi/bidi-bibitem.pdf
RELOC/doc/xelatex/bidi/bidi-doc.pdf details="Package user documentation"
@@ -40674,9 +40675,9 @@ docfiles size=1096
RELOC/doc/xelatex/bidi/test2-colortbl.tex
RELOC/doc/xelatex/bidi/test2-wrapfig.tex
RELOC/doc/xelatex/bidi/test3-wrapfig.tex
-srccontainersize 145664
-srccontainerchecksum f0295285e1433f9aa8134c814cc5b4b3b4114a00a24d9af67c6672f239eff747fbd7d61f08330465335703453afc5fa897dc1d00696669d7ad7bd0f6663d176a
-srcfiles size=269
+srccontainersize 147572
+srccontainerchecksum 7e866393fcd1931c4e7cfdccbe9e0e96b79938dde041b63ebe89f228ee3e47868e9747dc962023303727154ba83bcd8dfbc9837bbce9618a5c14edae1392fdd8
+srcfiles size=272
RELOC/source/xelatex/bidi/bidi-doc-intro.ltx
RELOC/source/xelatex/bidi/bidi-doc-latex-basics.ltx
RELOC/source/xelatex/bidi/bidi-doc-latex-pkgs.ltx
@@ -40689,7 +40690,7 @@ srcfiles size=269
RELOC/source/xelatex/bidi/bidi-doc.ltx
RELOC/source/xelatex/bidi/bidi.dtx
RELOC/source/xelatex/bidi/bidi.ins
-runfiles size=346
+runfiles size=352
RELOC/tex/xelatex/bidi/adjmulticol-xetex-bidi.def
RELOC/tex/xelatex/bidi/algorithm2e-xetex-bidi.def
RELOC/tex/xelatex/bidi/amsart-xetex-bidi.def
@@ -40707,8 +40708,11 @@ runfiles size=346
RELOC/tex/xelatex/bidi/beamerbaseauxtemplates-xetex-bidi.def
RELOC/tex/xelatex/bidi/beamerbaseboxes-xetex-bidi.def
RELOC/tex/xelatex/bidi/beamerbasecolor-xetex-bidi.def
+ RELOC/tex/xelatex/bidi/beamerbasecompatibility-xetex-bidi.def
RELOC/tex/xelatex/bidi/beamerbaseframecomponents-xetex-bidi.def
+ RELOC/tex/xelatex/bidi/beamerbaseframesize-xetex-bidi.def
RELOC/tex/xelatex/bidi/beamerbaselocalstructure-xetex-bidi.def
+ RELOC/tex/xelatex/bidi/beamerbasemisc-xetex-bidi.def
RELOC/tex/xelatex/bidi/beamerbasenavigation-xetex-bidi.def
RELOC/tex/xelatex/bidi/beamerbaseoverlay-xetex-bidi.def
RELOC/tex/xelatex/bidi/beamerinnerthemecircles-xetex-bidi.def
@@ -40857,7 +40861,7 @@ catalogue-contact-support https://github.com/kvafa/bidi/discussions
catalogue-ctan /macros/xetex/latex/bidi
catalogue-license lppl1.3c
catalogue-topics typesetting xetex bidi class
-catalogue-version 38.3
+catalogue-version 38.4
name bidi-atbegshi
category Package
@@ -68948,7 +68952,7 @@ containerchecksum c73220abd1545907a1d8de37cb534d2c6bd2534f1b55f03c069f39f535c326
name collection-latexextra
category Collection
-revision 63722
+revision 63739
shortdesc LaTeX additional packages
relocated 1
longdesc A very large collection of add-on packages for LaTeX.
@@ -69420,6 +69424,7 @@ depend exsol
depend extract
depend facsimile
depend factura
+depend familytree
depend fancyhandout
depend fancylabel
depend fancynum
@@ -70392,8 +70397,8 @@ depend zref-clever
depend zref-vario
depend zwgetfdate
depend zwpagelayout
-containersize 6660
-containerchecksum c9f0be9f3dbd959d6b2b1dc9d30324db53ae437424ece4b05a7c8a4a8c2b0fc4d43a49fafdf9b6f8d54212fc9e6edf391ab261d0ca55ddb181da84291186e27d
+containersize 6676
+containerchecksum 24e47c79003974884003bf56b91fbee4d7a565b5e1f6c85d2b3d6da8106424a22f992d353ee5089d9a68e656ae526362e10ab8a39a47e6970de6cc7d0676eb1d
name collection-latexrecommended
category Collection
@@ -115040,6 +115045,118 @@ catalogue-license lppl
catalogue-topics maths
catalogue-version 0.1b
+name familytree
+category Package
+revision 63739
+shortdesc Draw family trees
+relocated 1
+longdesc Boxes describe individuals; lines connecting boxes represent
+longdesc sibling or parent-child relationships, or marriages. Excluding
+longdesc the marriage box, you can get a maleline/patrilineal tree, or a
+longdesc femaleline/matrilineal tree. For Japanese, the jlreq.cls
+longdesc vertical option (tate) is supported.
+containersize 6324
+containerchecksum 2f3cbff39c42d0d6414b372c165bbbf3a4dbafa28bf16ca47a89445066480317caedc9b371f9deb348ba986de2c14b71b1820aa731e74d72a4b0b39a413bf9a5
+doccontainersize 932844
+doccontainerchecksum 55f035425d11f070870cdd8ccd555447861823754a91b0a31f54403013a6427197b3ea893fa7e75e63577635a5896288f29ef052c9431aff3f1a9c2038ccdb1a
+docfiles size=349
+ RELOC/doc/latex/familytree/DEPENDS.txt
+ RELOC/doc/latex/familytree/LICENSE
+ RELOC/doc/latex/familytree/README.md details="Readme"
+ RELOC/doc/latex/familytree/doc-ja/Makefile
+ RELOC/doc/latex/familytree/doc-ja/familytree-ja.tex
+ RELOC/doc/latex/familytree/doc-ja/figs/Makefile
+ RELOC/doc/latex/familytree/doc-ja/figs/fig-ja.tex
+ RELOC/doc/latex/familytree/doc-ja/figs/fig1Hidetada.tex
+ RELOC/doc/latex/familytree/doc-ja/figs/fig1Ieyasu.tex
+ RELOC/doc/latex/familytree/doc-ja/figs/fig1base.tex
+ RELOC/doc/latex/familytree/doc-ja/figs/fig2Hidetada.tex
+ RELOC/doc/latex/familytree/doc-ja/figs/fig2base-ja.tex
+ RELOC/doc/latex/familytree/doc-ja/figs/fig2cfg.tex
+ RELOC/doc/latex/familytree/doc-ja/figs/fig2ival-ja.tex
+ RELOC/doc/latex/familytree/doc-ja/figs/fig3Hidetada.tex
+ RELOC/doc/latex/familytree/doc-ja/figs/fig3Iemitsu.tex
+ RELOC/doc/latex/familytree/doc-ja/figs/fig3Ietsuna.tex
+ RELOC/doc/latex/familytree/doc-ja/figs/fig4Hidetada.tex
+ RELOC/doc/latex/familytree/doc-ja/figs/fig4Ogou.tex
+ RELOC/doc/latex/familytree/doc-ja/figs/figTY-ja.tex
+ RELOC/doc/latex/familytree/doc-ja/ft-gens-ja.tex
+ RELOC/doc/latex/familytree/doc-ja/ft-individual-ja.tex
+ RELOC/doc/latex/familytree/doc-ja/ft-lib-ja.tex
+ RELOC/doc/latex/familytree/doc-ja/ft-marriage-ja.tex
+ RELOC/doc/latex/familytree/doc-ja/ft-sibling-ja.tex
+ RELOC/doc/latex/familytree/familytree-ja.pdf details="Package documentation (Japanese)" language="ja"
+ RELOC/doc/latex/familytree/familytree.pdf details="Package documentation (English)"
+ RELOC/doc/latex/familytree/figs/Makefile
+ RELOC/doc/latex/familytree/figs/fig.tex
+ RELOC/doc/latex/familytree/figs/fig1Robert1.tex
+ RELOC/doc/latex/familytree/figs/fig1Robert2.tex
+ RELOC/doc/latex/familytree/figs/fig2base.tex
+ RELOC/doc/latex/familytree/figs/fig2ival.tex
+ RELOC/doc/latex/familytree/figs/fig2sis.tex
+ RELOC/doc/latex/familytree/figs/fig3Lily1.tex
+ RELOC/doc/latex/familytree/figs/fig3Lily2.tex
+ RELOC/doc/latex/familytree/figs/fig3Lily3.tex
+ RELOC/doc/latex/familytree/figs/fig3Lily4.tex
+ RELOC/doc/latex/familytree/figs/fig3Robert1.tex
+ RELOC/doc/latex/familytree/figs/fig3Robert2.tex
+ RELOC/doc/latex/familytree/figs/fig3sis.tex
+ RELOC/doc/latex/familytree/figs/fig4HenryVIII.tex
+ RELOC/doc/latex/familytree/figs/fig4Lily1.tex
+ RELOC/doc/latex/familytree/figs/fig4Lily2.tex
+ RELOC/doc/latex/familytree/figs/fig4Lily3.tex
+ RELOC/doc/latex/familytree/figs/fig4Lily4.tex
+ RELOC/doc/latex/familytree/figs/fig4Robert.tex
+ RELOC/doc/latex/familytree/fonts.tex
+ RELOC/doc/latex/familytree/samples/Asai.pdf details="Example of use (1)" language="ja"
+ RELOC/doc/latex/familytree/samples/Asai/0Ichi.tex
+ RELOC/doc/latex/familytree/samples/Asai/0sis.tex
+ RELOC/doc/latex/familytree/samples/Asai/1Chacha.tex
+ RELOC/doc/latex/familytree/samples/Asai/2Hatsu.tex
+ RELOC/doc/latex/familytree/samples/Asai/3Gou.tex
+ RELOC/doc/latex/familytree/samples/Asai/Asai.tex
+ RELOC/doc/latex/familytree/samples/Asai/Makefile
+ RELOC/doc/latex/familytree/samples/Crawley.pdf details="Example of use (3)"
+ RELOC/doc/latex/familytree/samples/Crawley.tex
+ RELOC/doc/latex/familytree/samples/Makefile
+ RELOC/doc/latex/familytree/samples/Tokugawa.pdf details="Example of use (2)" language="ja"
+ RELOC/doc/latex/familytree/samples/Tokugawa/Makefile
+ RELOC/doc/latex/familytree/samples/Tokugawa/Tokugawa.tex
+ RELOC/doc/latex/familytree/samples/Tokugawa/tg-10th.tex
+ RELOC/doc/latex/familytree/samples/Tokugawa/tg-11th.tex
+ RELOC/doc/latex/familytree/samples/Tokugawa/tg-12th.tex
+ RELOC/doc/latex/familytree/samples/Tokugawa/tg-13th.tex
+ RELOC/doc/latex/familytree/samples/Tokugawa/tg-14th.tex
+ RELOC/doc/latex/familytree/samples/Tokugawa/tg-15th.tex
+ RELOC/doc/latex/familytree/samples/Tokugawa/tg-1st.tex
+ RELOC/doc/latex/familytree/samples/Tokugawa/tg-2nd.tex
+ RELOC/doc/latex/familytree/samples/Tokugawa/tg-3rd.tex
+ RELOC/doc/latex/familytree/samples/Tokugawa/tg-4th.tex
+ RELOC/doc/latex/familytree/samples/Tokugawa/tg-5th.tex
+ RELOC/doc/latex/familytree/samples/Tokugawa/tg-6th.tex
+ RELOC/doc/latex/familytree/samples/Tokugawa/tg-7th.tex
+ RELOC/doc/latex/familytree/samples/Tokugawa/tg-8th.tex
+ RELOC/doc/latex/familytree/samples/Tokugawa/tg-9th.tex
+srccontainersize 15544
+srccontainerchecksum b6f8e0cfa54b13a95b4ab39e8a249d50f5d09fd325ed8acde8b7fca736d6aa05432fe3a40554f3c289a678c1349db542c6f321e8a35f5bd486ce6b0675450911
+srcfiles size=21
+ RELOC/source/latex/familytree/Makefile
+ RELOC/source/latex/familytree/cmd.mk
+ RELOC/source/latex/familytree/familytree.dtx
+ RELOC/source/latex/familytree/familytree.ins
+ RELOC/source/latex/familytree/ft-gens.dtx
+ RELOC/source/latex/familytree/ft-individual.dtx
+ RELOC/source/latex/familytree/ft-lib.dtx
+ RELOC/source/latex/familytree/ft-marriage.dtx
+ RELOC/source/latex/familytree/ft-sibling.dtx
+runfiles size=8
+ RELOC/tex/latex/familytree/familytree.sty
+catalogue-contact-repository https://github.com/jiro1010/familytree
+catalogue-ctan /macros/latex/contrib/familytree
+catalogue-license gpl2+
+catalogue-topics genealogy tree diagram
+catalogue-version 3.1
+
name fancybox
category Package
revision 18304
@@ -188284,35 +188401,41 @@ catalogue-version 0.1.9
name lt3luabridge
category Package
-revision 63732
+revision 63735
shortdesc Execute Lua code in any TeX engine that exposes the shell
relocated 1
longdesc This is an expl3(-generic) package for plain TeX, LaTeX, and
longdesc ConTeXt that allows you to execute Lua code in LuaTeX or any
longdesc other TeX engine that exposes the shell.
-containersize 2592
-containerchecksum fc12040197780f40eb1ff9affefe73b518c2e23301d048d5f1022fa9258638635d0c230aea1bfb8ca1ad13e52f32788e6d1c46c636f14a8b76e32e59271467dd
-doccontainersize 7460
-doccontainerchecksum 185e770b2167ac815071ce697fbf2b1d86895690f913e963fd605fb10cd2013462a75b78fd29c58cf8dad47a79309942b921fb8a877540413621a37419b5c7c8
-docfiles size=10
+containersize 3432
+containerchecksum 1c661b7e4c21f5763bb087174cac61cea909820247a5c725d0ca1045164e4962cfb9b933d99af5f577cdd0ec3a0688d8aa727bcdf2b0e7fd9023207fa8f58cb8
+doccontainersize 495380
+doccontainerchecksum cb4d7351e1a685bc73ab3a13c4b71f363a794fa8fb6c9e79c791be104de7ef65e9893fb589e546297bc1e2d5c37bfbb1dd2e55f22401badb8e7c6b0bed2c4d6d
+docfiles size=133
RELOC/doc/generic/lt3luabridge/LICENSE
RELOC/doc/generic/lt3luabridge/README.md details="Readme"
RELOC/doc/generic/lt3luabridge/docstrip.cfg
RELOC/doc/generic/lt3luabridge/example.context
RELOC/doc/generic/lt3luabridge/example.latex
RELOC/doc/generic/lt3luabridge/example.plaintex
-runfiles size=5
+ RELOC/doc/generic/lt3luabridge/lt3luabridge.pdf details="Package documentation"
+srccontainersize 4536
+srccontainerchecksum 2bac4ab8da26cf7a2038fa8037c8bf96247560dba13fa548bf73acb67d52f1ff89af61c3e9c2c5e386c43eba66cdd49749378e6e6841ebcdbb52fe7a14c8eba2
+srcfiles size=6
+ RELOC/source/generic/lt3luabridge/lt3luabridge.dtx
+ RELOC/source/generic/lt3luabridge/lt3luabridge.ins
+runfiles size=6
RELOC/tex/generic/lt3luabridge/lt3luabridge.sty
RELOC/tex/generic/lt3luabridge/lt3luabridge.tex
RELOC/tex/generic/lt3luabridge/t-lt3luabridge.tex
-catalogue-contact-announce https://github.com/Witiko/lt3luabridge/releases
+catalogue-contact-announce https://github.com/witiko/lt3luabridge/releases
catalogue-contact-bugs https://github.com/witiko/lt3luabridge/issues
-catalogue-contact-development https://github.com/Witiko/lt3luabridge/discussions
+catalogue-contact-development https://github.com/witiko/lt3luabridge/discussions
catalogue-contact-repository https://github.com/witiko/lt3luabridge
catalogue-ctan /macros/generic/lt3luabridge
catalogue-license lppl1.3c
catalogue-topics exec-foreign expl3
-catalogue-version 1.0.0
+catalogue-version 1.0.1
name ltablex
category Package
@@ -294758,7 +294881,7 @@ binfiles arch=x86_64-solaris size=1
name tex4ht
category Package
-revision 63716
+revision 63740
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
@@ -294779,10 +294902,10 @@ longdesc files from them is nontrivial, and generally done with the
longdesc Makefile in development, from which the TeX4ht package in TeX
longdesc Live is updated.
depend tex4ht.ARCH
-containersize 948564
-containerchecksum 16797fec756fc636a796a303f646b260cb164f7e0fc8cc5bedc32044ee36f42237883b428c6d3c8989000828ad936054783b5855c166d712896e928adba95b36
+containersize 948612
+containerchecksum 5eb9af16786f0616fde10e9922551d26fcaa5710e833093771706951865732c36527e3733601077ae67971e09c274329d7daba4f279ca902ac76f5fb88dc0e71
doccontainersize 136384
-doccontainerchecksum 5c2e4f216126e6a2408dc01686fd315c215f96949faa89852ee312b023fb1413b89ac1f4a15e2dbcbfec5d50ac7ec1a74a4a59e46b607dda2366ce62dc589d8b
+doccontainerchecksum 6c48b48479a88a6d1a970ff1fd94da1e2a105fdc4338fc24751ca566fa36d25e1341260e62fd7c579c1c004d79e8cf2a4115c34e4502e2b2bc19b787d187c99a
docfiles size=260
texmf-dist/doc/generic/tex4ht/Makefile
texmf-dist/doc/generic/tex4ht/README details="Readme"
@@ -294854,8 +294977,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 1259968
-srccontainerchecksum ed7709159154afd451d82200c8daa8f2b106bc26a2da5676473c73dc47c5f7f8e6f583665969137367f5f7c29399835b464a43c2602aab8fbda4793fa3447b48
+srccontainersize 1263400
+srccontainerchecksum c708370efd13efe32d9f7215986f3d6060edca791cafc35bdf0745f04e493b9e6b7a3979a4bede3c73e7c1e4c7d6bd1186344c1017c3a2c27847fb8993cfa813
srcfiles size=3818
texmf-dist/source/generic/tex4ht/ChangeLog
texmf-dist/source/generic/tex4ht/Makefile
@@ -305215,7 +305338,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 63727
+revision 63734
shortdesc TeX Live infrastructure programs
longdesc Includes install-tl, tl-portable, rungs, etc.; not needed for
longdesc tlmgr to run but still ours. Not included in tlcritical.
@@ -305223,10 +305346,10 @@ depend texlive-scripts.ARCH
depend texlive.infra
execute addMap mathpple.map
postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat
-containersize 113284
-containerchecksum da8631fe023717f2f20d9218e7f7da0fc707c9a7f3dccdda39bc398d0ff8201c2f917c5a85d618cf8fa80e47aa5b774b99d90329df9e2ac906b38d56e8f371ae
-doccontainersize 417296
-doccontainerchecksum 2dd9cbfc1c5a7cc7c53e11dc373062415a933af73f127318c3d56ac730f889b849aff1c534bb49cedf0265fa44f57992291a1f12d946c2afe09712df9bc5dccb
+containersize 113256
+containerchecksum 371e5193615c807030d7baf2760d8d5028e96738c520980219e5194648f275b9b4120b480bf3880bec01c9b92836a6179b7a052941e1930860e6bf8072727f1a
+doccontainersize 417348
+doccontainerchecksum 59db5244cec61043e31262a7cc919d0f6305803f39c920f551edac5fc0a7afda0a75f8d4fe99b45118c286b60d4dc05b7f157eb4f596a39d5950b127a1176a26
docfiles size=513
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
@@ -342615,15 +342738,15 @@ catalogue-version 2.0
name xepersian
category Package
-revision 63540
+revision 63738
shortdesc Persian for LaTeX, using XeTeX
relocated 1
longdesc This package provides a convenient interface for typesetting
longdesc Persian and English texts in LaTeX, using the XeTeX engine.
-containersize 60172
-containerchecksum d8f6ef0cabe707773a2cb5fe0d21a4934981d4f1e66a43f7761d65be73b8c7d6a60e02f6d9c71618879c95ce16e6e36398ecada31236d7dc442f8fd1efa22bcc
-doccontainersize 1012124
-doccontainerchecksum 7a3db3b9f40aa1bdf5a2b7d24f033293400aac64a46222541b7455dde7ecc3cf7e10b38fdb8938cbb69e532caa78ef7cbf40a86892d00a1d17fabb69026aed9c
+containersize 60236
+containerchecksum ca6c88dbabe4ae7b71c81de2d0a57a26b17435d8a8889c2e945e75865e17fe47b9906bd903c2b2b060fa4da59b9cbf8485c160b5d3f7392904d98db0bd8ec315
+doccontainersize 1011752
+doccontainerchecksum cf196810e7f11a19081992bc155c1f54470928817918eb83b90db9458a5235cddceac2a52ba9be5ec11a9b63831ba74ebd5fa294df43e5b148ac0ddc5fda2aa6
docfiles size=322
RELOC/doc/xelatex/xepersian/README details="Readme"
RELOC/doc/xelatex/xepersian/dkun-0.3.py
@@ -342643,8 +342766,8 @@ docfiles size=322
RELOC/doc/xelatex/xepersian/xepersian-doc.pdf details="Package user documentation"
RELOC/doc/xelatex/xepersian/xepersian-logo.tex
RELOC/doc/xelatex/xepersian/xepersian.pdf details="Package source documentation"
-srccontainersize 75408
-srccontainerchecksum cfa48ebe6d1e566c1b52a27fa1119f689e5c9977152ba9f8678ae3e9ab75f3f2070d2ac6a5d74a7ab7c494aa184247ae7cbac521598c50de30f417975d42ebda
+srccontainersize 75312
+srccontainerchecksum 1319a5c20f04e0fcf45d54020149a9a9e2ebb0006c7ac5bcfdf72dec121e9638b7eb7d612ed99dce9b0f27a3349f80ef1fcfc34362385a1b45b5b40f9d733424
srcfiles size=120
RELOC/source/xelatex/xepersian/xepersian-doc-basics.ltx
RELOC/source/xelatex/xepersian/xepersian-doc-boolean.ltx
@@ -342733,7 +342856,7 @@ catalogue-contact-support https://github.com/kvafa/xepersian/discussions
catalogue-ctan /macros/xetex/latex/xepersian
catalogue-license lppl1.3c
catalogue-topics persian xetex class
-catalogue-version 24.5
+catalogue-version 24.6
name xepersian-hm
category Package
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 248c271359..f0ed541c2c 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-59f7fdd9cdaf6e2dda4c2d3bbef25716 texlive.tlpdb
+ba5baeef401a2d5ef307472e38f85f93 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index d2c518a139..ee85db767e 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-066a28ee1ef27fce27473a626df9592b8f01e6c5759a3ed6a14bd71e47995b1a95903ee87584807fc58bda8f0510a62f414087a865b43461f3fa6f7c1f3bc3c2 texlive.tlpdb
+f4a24b63da1c43076a3b15622e68bd3d6fc15bd02af5f3fd30f68faf3f737fae6de126c7d72dd3739b51963ac7b091e0cf7c657012088cd69c32f155872b72a4 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 4930ca7cdd..0323c51812 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-----
-iQEcBAEBCgAGBQJiuPFwAAoJEEzhh34ZQ4xwQN4IAJargYPU0+nW1obcPj9fd/q4
-Ksg4tEHLIJCR87YZDtO/TPqy+vI5bi8GqsC9cr4TrgSKPOG8gg+4HKgQRDiqugik
-7xpnsxffBmhVm/73UJK+5Ne5BHLwtHbGI3o9lcXqQl1200XbuG+NQlv8G+OFzMIl
-QfUJNaO8xu0yOlQpe7u7BgFm4RNpxXO3u3D8BjelaD0l5EuJNsYyHQPaQCPc+gZU
-CXiPrGq3fxV7jRQBH90Ddwosm/4w1A/aYzFY15sKuCfr1xZhXPALueUuEs3YaVE4
-0HqE+ACwNt7WyHQCrWfVW77pVGGQ5bZTTOBxl7SSmPe2PGeiee+H22pwpfFkop8=
-=bjr+
+iQEcBAEBCgAGBQJiukMTAAoJEEzhh34ZQ4xw8i0IAJ0+A+SQsQutyerwAI8aWhXf
+gFF09x0wjo+4uFSu13G/guGbgsxnkXWr8kymOAu5dpY8qP7qaClMXlsZvybcEpwl
+HksTn2TDWsfiiqczD76TdyiZL2GNFRaV251M2zM/T2JPExnHuRlVgyjGNm41k1E6
+FP9a+yjsGXpO8tQW0dqTJ2U/z9HoGez7q6AQcKKRFHvnRbwKZVHc/ROF+ktRSBRr
+eaS86/M0IKR+v3P6Bp6hieipXZL0B0bZAr8kb8tGXeiBqK2KMq9rQQO8j3+F6Erb
+kIzSv6+YCES5z19vCgxdicIklduEScwmo+ppVLiysOYnurVfzwXEe4kHJFY9o3Y=
+=/FmZ
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index b1ff7d4829..aa3f46051d 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 9a9bb24bfa..4ae54b55e7 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=1656275247
+date=1656361134
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=12a9314636e6d0132002a5a323e6bad7
+lstdigest=89dceb985e03a13ea07feae4b34dca91
numpkg=5745
relstate=next
-version=8212
+version=8213
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: Tz3w3EC9i+W85QrsOj/g/ijvJqc6n3VmDHzdkbxgmGtmbOm4h2OVUA2F7vgIbZDRfJC58j3bIuqUn5HT2nfaXlS3a7fbdFu2TLMbIpuMXF6Ji+yKX8t72MdSay5mLNPJuQftdgLnx84tC46DoMt6pYGZLJaBOt0BYrrrVo4379+WAJhQPJvqw4R4C5SzPys4w2PxYi2OAcyMshXqof3QZ6RPXV7FLqejuD1L8w2IC+Ahkq8OnGRXZLB07p5W62uXFPkjA9rQQeNHFD2PNv5EPzrOxrYB6P48sSMAJl3SM2chq9+gs3GqWkcAO8Es+NcrvPyXsXnOZiiG9dX6v4J1dw==
+;;;; signature/miktex: md/9iDTLPlQ6s6rklUMmktHGackiGKC9FOa+9yqno6FqC9ffuPDLw2dEyZ4Vvm+QPvJouRHGt79jH/734cllc2VGKbiSzMn61WMVgMNY+3TdbmDDXGJk6KB1qhI5wHkGDmUXe0mj0apGTRxLzKOHtS7g/jXOm81Vu0Y3lmu9gqQFOnY3toSWkr6Jf3Z7IGOcqQYiW0qAkqInNHac1bxgF++fv/E/6hyQXik75C+NE+vk1j4pRYSURPBR8bCf8TnJGl0Fi7zY5/kghBd1giY9oNaZKrV5sobsTjuKzmpB3n3YMEguECc0GwGHLFpGoo2HHga6WscNmAyf5rLaroCZ0A==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index f0145f2960..001c983c93 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1656274315
+date=1656360707
lastupd=amscls-doc arabtex arabtex__source barracuda barracuda__doc barracuda__source beamer-rl beamer-rl__doc beamertheme-arguelles beamertheme-arguelles__doc beamertheme-arguelles__source beaulivre beaulivre__doc beaulivre__source biber-darwin-x86_64 biber-doc biber-linux-x86_64 biber-windows-x64 biber-windows-x86 biblatex
-lstdigest=0cfe43a632f44f0aa20e79a0ac2fc02f
+lstdigest=e388eb8ffbaa78d84be7b736bb32e061
numpkg=5745
relstate=stable
-version=8212
+version=8213
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: lluVM/x3TQdSE8scPY3bZXy/bEZi1m+g/MU1AK91r2oV2tovdJ7xO/PkDfqBTyu/pW3VVjbVr+f28p8IzMvtQtbQ5CTu5671s05oQ13U2hVmm8Ss4Lyu45eLpdZ1g2bFRvmiW6UwF+7UhzwYRLMLI8N62j3xXgV4l1vSc28/xCe039dN8zWM/is43B0T5R0ox/5oDWnkdzLK3qhhImWa/IwtEwEQN0Sjm0X/a0zxCjeJCqi0eGxLSvGtUJpOZVLwOlFemZo8yoafN8c9JaztDgfA+DOHloRXi3LPJyalImWyFQW3nc5R+R+hzAFw92n2PD5QrYV3E+mzfdqcsAkq3w==
+;;;; signature/miktex: myM8F6KE0xij7szAeORaxZ8Wxv+dLKslG/r5gXDHhmrbdPqxYU8iPG/8wDbyeJrxLV2zXiINbgwq8pVmcHoc5S2zEJCSm+RgDBujNjSBfQlf4JNOz5fN4kQnNLvq7KjzQMREuhNSACGSmF3QRSDxC7dKBdigftqwrCBbBGr4f9JZo2du/7lLIkxZGmxyxZnubYhSyPnCHZ5Cgrk1TTQMb4pLbZUqrHrhWqXq8MQEH3flinQHRfOJmduKiZfW3G7W/WtdydAsyC6Z9hLwbf+8XSflbF6in2BNnzfXsd8KR0nrExAHA5cUoGBiA0OWwz3yCLhHPhqwy8FAfGR0h3XXPg==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index 1c63f63cff..0066d86af8 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2022-06-27-02-02
+2022-06-28-02-02