summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-07-21 03:00:45 +0000
committerNorbert Preining <norbert@preining.info>2022-07-21 03:00:45 +0000
commit5cf5182b44c08dfb2bc977ce5aa5ca6d03b36923 (patch)
treeb32d29c9fb1289ccc994ee099b27c4a45b621a0a
parent2773132ea593028dafe764f7560fd94ecb827d3d (diff)
CTAN sync 202207210300
-rw-r--r--CTAN.sites7
-rw-r--r--FILES.byname950
-rw-r--r--FILES.byname.gzbin2443962 -> 2444360 bytes
-rw-r--r--FILES.last07days635
-rw-r--r--fonts/feyn/README8
-rw-r--r--fonts/feyn/VERSION2
-rw-r--r--fonts/feyn/exercise-font.pdfbin161614 -> 161626 bytes
-rw-r--r--fonts/feyn/feyn.dtx34
-rw-r--r--fonts/feyn/feyn.html27
-rw-r--r--fonts/feyn/feyn.mf4
-rw-r--r--fonts/feyn/feyn.pdfbin325984 -> 326102 bytes
-rw-r--r--fonts/feyn/feyn10.mf4
-rw-r--r--fonts/feyn/feyn11.mf4
-rw-r--r--fonts/feyn/feyn12.mf4
-rw-r--r--fonts/feyn/feyn18.mf4
-rw-r--r--fonts/feyn/feyn24.mf4
-rw-r--r--fonts/feyn/feynmac.mf2
-rw-r--r--fonts/feyn/feyntext10.mf4
-rw-r--r--fonts/feyn/feyntext11.mf4
-rw-r--r--fonts/feyn/feyntext12.mf4
-rw-r--r--fonts/feyn/feyntext18.mf4
-rw-r--r--fonts/feyn/feyntext24.mf4
-rw-r--r--fonts/feyn/feynx10.mf4
-rw-r--r--fonts/feyn/feynx11.mf4
-rw-r--r--fonts/feyn/feynx12.mf4
-rw-r--r--fonts/feyn/feynx18.mf4
-rw-r--r--fonts/feyn/feynx24.mf4
-rw-r--r--fonts/feyn/overheads.pdfbin55977 -> 67965 bytes
-rw-r--r--fonts/feyn/overheads.tex9
-rw-r--r--fonts/feyn/release-notes.html5
-rw-r--r--fonts/greek/gfs/gfsneohellenic/VERSION1
-rw-r--r--fonts/greek/gfs/gfsneohellenic/doc/VERSION1
-rw-r--r--fonts/greek/gfs/gfsneohellenic/opentype/GFSNeohellenic.otfbin122504 -> 122288 bytes
-rw-r--r--graphics/pgf/contrib/bodeplot/README.md12
-rw-r--r--graphics/pgf/contrib/bodeplot/bodeplot.dtx384
-rw-r--r--graphics/pgf/contrib/bodeplot/bodeplot.pdfbin992859 -> 1007326 bytes
-rw-r--r--graphics/pgf/contrib/tikzfill/CHANGES.md23
-rw-r--r--graphics/pgf/contrib/tikzfill/README.md56
-rw-r--r--graphics/pgf/contrib/tikzfill/tikzfill-common.sty56
-rw-r--r--graphics/pgf/contrib/tikzfill/tikzfill-doc.sty130
-rw-r--r--graphics/pgf/contrib/tikzfill/tikzfill.hexagon.sty24
-rw-r--r--graphics/pgf/contrib/tikzfill/tikzfill.image.sty24
-rw-r--r--graphics/pgf/contrib/tikzfill/tikzfill.pdfbin0 -> 721265 bytes
-rw-r--r--graphics/pgf/contrib/tikzfill/tikzfill.rhombus.sty24
-rw-r--r--graphics/pgf/contrib/tikzfill/tikzfill.sty24
-rw-r--r--graphics/pgf/contrib/tikzfill/tikzfill.tex1385
-rw-r--r--graphics/pgf/contrib/tikzfill/tikzlibraryfill.hexagon.code.tex315
-rw-r--r--graphics/pgf/contrib/tikzfill/tikzlibraryfill.image.code.tex400
-rw-r--r--graphics/pgf/contrib/tikzfill/tikzlibraryfill.rhombus.code.tex159
-rw-r--r--language/japanese/README.CJK5
-rw-r--r--macros/jptex/generic/fixjfm/README (renamed from macros/generic/fixjfm/README)0
-rw-r--r--macros/jptex/generic/fixjfm/fixjfm-doc.pdf (renamed from macros/generic/fixjfm/fixjfm-doc.pdf)bin281286 -> 281286 bytes
-rw-r--r--macros/jptex/generic/fixjfm/fixjfm-doc.tex (renamed from macros/generic/fixjfm/fixjfm-doc.tex)0
-rw-r--r--macros/jptex/generic/fixjfm/fixjfm.sty (renamed from macros/generic/fixjfm/fixjfm.sty)0
-rw-r--r--macros/jptex/latex/gentombow/LICENSE (renamed from macros/latex/contrib/gentombow/LICENSE)0
-rw-r--r--macros/jptex/latex/gentombow/README.md (renamed from macros/latex/contrib/gentombow/README.md)0
-rw-r--r--macros/jptex/latex/gentombow/bounddvi-en.pdf (renamed from macros/latex/contrib/gentombow/bounddvi-en.pdf)bin49397 -> 49397 bytes
-rw-r--r--macros/jptex/latex/gentombow/bounddvi-en.tex (renamed from macros/latex/contrib/gentombow/bounddvi-en.tex)0
-rw-r--r--macros/jptex/latex/gentombow/bounddvi.pdf (renamed from macros/latex/contrib/gentombow/bounddvi.pdf)bin102475 -> 102475 bytes
-rw-r--r--macros/jptex/latex/gentombow/bounddvi.sty (renamed from macros/latex/contrib/gentombow/bounddvi.sty)0
-rw-r--r--macros/jptex/latex/gentombow/bounddvi.tex (renamed from macros/latex/contrib/gentombow/bounddvi.tex)0
-rw-r--r--macros/jptex/latex/gentombow/gentombow-ja.pdf (renamed from macros/latex/contrib/gentombow/gentombow-ja.pdf)bin174085 -> 174085 bytes
-rw-r--r--macros/jptex/latex/gentombow/gentombow-ja.tex (renamed from macros/latex/contrib/gentombow/gentombow-ja.tex)0
-rw-r--r--macros/jptex/latex/gentombow/gentombow.pdf (renamed from macros/latex/contrib/gentombow/gentombow.pdf)bin150209 -> 150209 bytes
-rw-r--r--macros/jptex/latex/gentombow/gentombow.sty (renamed from macros/latex/contrib/gentombow/gentombow.sty)0
-rw-r--r--macros/jptex/latex/gentombow/gentombow.tex (renamed from macros/latex/contrib/gentombow/gentombow.tex)0
-rw-r--r--macros/jptex/latex/gentombow/pxesopic.sty (renamed from macros/latex/contrib/gentombow/pxesopic.sty)0
-rw-r--r--macros/jptex/latex/gentombow/pxgentombow.pdf (renamed from macros/latex/contrib/gentombow/pxgentombow.pdf)bin23109 -> 23109 bytes
-rw-r--r--macros/jptex/latex/gentombow/pxgentombow.sty (renamed from macros/latex/contrib/gentombow/pxgentombow.sty)0
-rw-r--r--macros/jptex/latex/gentombow/pxgentombow.tex (renamed from macros/latex/contrib/gentombow/pxgentombow.tex)0
-rw-r--r--macros/jptex/latex/gentombow/pxpdfpages.sty (renamed from macros/latex/contrib/gentombow/pxpdfpages.sty)0
-rw-r--r--macros/jptex/latex/gentombow/pxtextpos.sty (renamed from macros/latex/contrib/gentombow/pxtextpos.sty)0
-rw-r--r--macros/jptex/latex/jsclasses/LICENSE (renamed from macros/latex/contrib/jsclasses/LICENSE)0
-rw-r--r--macros/jptex/latex/jsclasses/Makefile (renamed from macros/latex/contrib/jsclasses/Makefile)0
-rw-r--r--macros/jptex/latex/jsclasses/README.md (renamed from macros/latex/contrib/jsclasses/README.md)0
-rw-r--r--macros/jptex/latex/jsclasses/jsclasses.dtx (renamed from macros/latex/contrib/jsclasses/jsclasses.dtx)0
-rw-r--r--macros/jptex/latex/jsclasses/jsclasses.ins (renamed from macros/latex/contrib/jsclasses/jsclasses.ins)0
-rw-r--r--macros/jptex/latex/jsclasses/jsclasses.pdf (renamed from macros/latex/contrib/jsclasses/jsclasses.pdf)bin412473 -> 412473 bytes
-rw-r--r--macros/jptex/latex/jsclasses/jslogo.dtx (renamed from macros/latex/contrib/jsclasses/jslogo.dtx)0
-rw-r--r--macros/jptex/latex/jsclasses/jslogo.ins (renamed from macros/latex/contrib/jsclasses/jslogo.ins)0
-rw-r--r--macros/jptex/latex/jsclasses/jslogo.pdf (renamed from macros/latex/contrib/jsclasses/jslogo.pdf)bin76779 -> 76779 bytes
-rw-r--r--macros/jptex/latex/jsclasses/jsverb.dtx (renamed from macros/latex/contrib/jsclasses/jsverb.dtx)0
-rw-r--r--macros/jptex/latex/jsclasses/jsverb.ins (renamed from macros/latex/contrib/jsclasses/jsverb.ins)0
-rw-r--r--macros/jptex/latex/jsclasses/jsverb.pdf (renamed from macros/latex/contrib/jsclasses/jsverb.pdf)bin75649 -> 75649 bytes
-rw-r--r--macros/jptex/latex/jsclasses/okumacro.dtx (renamed from macros/latex/contrib/jsclasses/okumacro.dtx)0
-rw-r--r--macros/jptex/latex/jsclasses/okumacro.ins (renamed from macros/latex/contrib/jsclasses/okumacro.ins)0
-rw-r--r--macros/jptex/latex/jsclasses/okumacro.pdf (renamed from macros/latex/contrib/jsclasses/okumacro.pdf)bin175557 -> 175557 bytes
-rw-r--r--macros/jptex/latex/jsclasses/okuverb.dtx (renamed from macros/latex/contrib/jsclasses/okuverb.dtx)0
-rw-r--r--macros/jptex/latex/jsclasses/okuverb.ins (renamed from macros/latex/contrib/jsclasses/okuverb.ins)0
-rw-r--r--macros/jptex/latex/jsclasses/okuverb.pdf (renamed from macros/latex/contrib/jsclasses/okuverb.pdf)bin59902 -> 59902 bytes
-rw-r--r--macros/jptex/latex/pxcjkcat/LICENSE (renamed from macros/latex/contrib/pxcjkcat/LICENSE)0
-rw-r--r--macros/jptex/latex/pxcjkcat/README-ja.md (renamed from macros/latex/contrib/pxcjkcat/README-ja.md)0
-rw-r--r--macros/jptex/latex/pxcjkcat/README.md (renamed from macros/latex/contrib/pxcjkcat/README.md)0
-rw-r--r--macros/jptex/latex/pxcjkcat/pxcjkcat.pdf (renamed from macros/latex/contrib/pxcjkcat/pxcjkcat.pdf)bin197668 -> 197668 bytes
-rw-r--r--macros/jptex/latex/pxcjkcat/pxcjkcat.sty (renamed from macros/latex/contrib/pxcjkcat/pxcjkcat.sty)0
-rw-r--r--macros/jptex/latex/pxcjkcat/pxcjkcat.tex (renamed from macros/latex/contrib/pxcjkcat/pxcjkcat.tex)0
-rw-r--r--macros/jptex/latex/pxtatescale/LICENSE (renamed from macros/latex/contrib/pxtatescale/LICENSE)0
-rw-r--r--macros/jptex/latex/pxtatescale/README (renamed from macros/latex/contrib/pxtatescale/README)0
-rw-r--r--macros/jptex/latex/pxtatescale/pxtatescale.sty (renamed from macros/latex/contrib/pxtatescale/pxtatescale.sty)0
-rw-r--r--macros/latex/contrib/hvfloat/Changes2
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdfbin80294 -> 79855 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/after1s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdfbin86722 -> 86559 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/after2s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/capPos.pdfbin95389 -> 98061 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/capVPos.inc32
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdfbin81991 -> 81685 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/default1s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdfbin83275 -> 83180 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/default1s2c.tex6
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdfbin79445 -> 78954 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/default2s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdfbin85824 -> 85642 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/default2s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/doublefullpage2s2c.pdfbin0 -> 1759143 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/doublefullpage2s2c.tex802
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdfbin2314853 -> 2317480 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.tex7
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdfbin619030 -> 616570 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdfbin77658 -> 77202 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/even1s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdfbin86404 -> 86195 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/even1s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdfbin84813 -> 84135 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/even2s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdfbin85098 -> 84895 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/even2s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/fullpage1s1c.pdfbin0 -> 86549 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/fullpage1s1c.tex64
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdfbin86773 -> 87033 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdfbin84020 -> 83734 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/inner1s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdfbin83977 -> 83699 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/inner2s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdfbin84013 -> 83924 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/inner2s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdfbin85512 -> 85326 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/left2s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdfbin142624 -> 142146 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdfbin146172 -> 145886 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdfbin94586 -> 102871 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdfbin146343 -> 146064 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdfbin92182 -> 100507 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdfbin89784 -> 98070 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdfbin92984 -> 101319 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdfbin145736 -> 145453 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdfbin77805 -> 77375 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/odd1s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdfbin86523 -> 86322 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/odd1s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdfbin174218 -> 173604 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/odd2s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdfbin85566 -> 85385 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/odd2s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdfbin86318 -> 86224 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/outer1s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdfbin84292 -> 84006 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/outer2s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdfbin84680 -> 84587 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/outer2s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdfbin79267 -> 78903 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.pdfbin0 -> 89620 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.tex81
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdfbin79967 -> 81195 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.tex13
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdfbin90508 -> 90436 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdfbin87935 -> 87873 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.tex8
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdfbin90332 -> 90257 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.pdfbin0 -> 87165 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.tex81
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdfbin87855 -> 87776 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.pdfbin0 -> 87061 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.tex81
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdfbin80290 -> 81371 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-twocolcaption-after2s2c.pdfbin0 -> 1615381 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-twocolcaption-after2s2c.tex81
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/preamble.ltx3
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdfbin80126 -> 79681 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/right1s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdfbin89340 -> 89151 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/right1s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdfbin81033 -> 78955 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/right2s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdfbin85585 -> 85418 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/right2s2c.tex10
-rwxr-xr-xmacros/latex/contrib/hvfloat/doc/examples/runAll.sh2
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdfbin143952 -> 143688 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdfbin144771 -> 144612 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdfbin144003 -> 143725 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdfbin144217 -> 144030 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdfbin143517 -> 143328 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdfbin143873 -> 143611 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdfbin144879 -> 144711 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdfbin144315 -> 144144 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.tex10
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdfbin120949 -> 120832 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdfbin121917 -> 121819 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/hvfloat.pdfbin5039170 -> 5037834 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/hvfloat.tex8
-rw-r--r--macros/latex/contrib/hvfloat/latex/hvfloat.sty59
-rw-r--r--macros/latex/contrib/wrapstuff/README.md50
-rw-r--r--macros/latex/contrib/wrapstuff/wrapstuff.dtx3011
-rw-r--r--macros/latex/contrib/wrapstuff/wrapstuff.pdfbin0 -> 422157 bytes
-rw-r--r--macros/latex/required/babel/base/README.md26
-rw-r--r--macros/latex/required/babel/base/babel.dtx62
-rw-r--r--macros/latex/required/babel/base/babel.ins2
-rw-r--r--macros/latex/required/babel/base/babel.pdfbin885137 -> 883440 bytes
-rw-r--r--macros/latex/required/babel/base/bbcompat.dtx2
-rw-r--r--obsolete/language/japanese/jtex/00NEWS (renamed from language/japanese/jtex/00NEWS)0
-rw-r--r--obsolete/language/japanese/jtex/00README (renamed from language/japanese/jtex/00README)0
-rw-r--r--obsolete/language/japanese/jtex/README (renamed from language/japanese/jtex/README)0
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl1
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb171
-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.xzbin2392992 -> 2394032 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
241 files changed, 8501 insertions, 1406 deletions
diff --git a/CTAN.sites b/CTAN.sites
index 287af66234..c2e3986c22 100644
--- a/CTAN.sites
+++ b/CTAN.sites
@@ -102,9 +102,10 @@ by country):
URL: http://repo.ugm.ac.id/ctan/
- ctan.asis.ai (Iran)
- URL: rsync://ctan.asis.ai/ctan/
- URL: https://ctan.asis.ai/
+ ctan.asis.sh (Iran)
+ URL: http://ctan.asis.ai/
+ URL: rsync://ctan.asis.sh/CTAN/
+ URL: https://ctan.asis.sh/
ctan.um.ac.ir (Iran)
URL: https://ctan.um.ac.ir/
diff --git a/FILES.byname b/FILES.byname
index 5a57bf8d93..a54ab4f67e 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -5260,7 +5260,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/07/19 | 145431 | FILES.last07days
+2022/07/20 | 123676 | 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
@@ -41294,42 +41294,42 @@
2017/04/07 | 54743 | fonts/fetamont/type1/ffmw10.pfb
2017/04/07 | 51873 | fonts/fetamont/type1/ffmwo10.pfb
2017/04/15 | 5956694 | fonts/fetamont.zip
-2022/07/18 | 161614 | fonts/feyn/exercise-font.pdf
-2022/07/18 | 5939 | fonts/feyn/exercise-font.tex
-2022/07/18 | 1378 | fonts/feyn/feyn10.mf
-2022/07/18 | 1382 | fonts/feyn/feyn11.mf
-2022/07/18 | 1377 | fonts/feyn/feyn12.mf
-2022/07/18 | 1377 | fonts/feyn/feyn18.mf
-2022/07/18 | 1378 | fonts/feyn/feyn24.mf
-2022/07/18 | 56836 | fonts/feyn/feyn.dtx
-2022/07/18 | 6895 | fonts/feyn/feyn.html
-2022/07/18 | 231 | fonts/feyn/feyn.ins
-2022/07/18 | 4422 | fonts/feyn/feynmac.mf
-2022/07/18 | 23442 | fonts/feyn/feyn.mf
-2022/07/18 | 325984 | fonts/feyn/feyn.pdf
-2022/07/18 | 1373 | fonts/feyn/feyntext10.mf
-2022/07/18 | 1379 | fonts/feyn/feyntext11.mf
-2022/07/18 | 1374 | fonts/feyn/feyntext12.mf
-2022/07/18 | 1373 | fonts/feyn/feyntext18.mf
-2022/07/18 | 1374 | fonts/feyn/feyntext24.mf
-2022/07/18 | 1410 | fonts/feyn/feynx10.mf
-2022/07/18 | 1414 | fonts/feyn/feynx11.mf
-2022/07/18 | 1408 | fonts/feyn/feynx12.mf
-2022/07/18 | 1409 | fonts/feyn/feynx18.mf
-2022/07/18 | 1410 | fonts/feyn/feynx24.mf
-2022/07/18 | 1333 | fonts/feyn/LICENCE
-2022/07/18 | 55977 | fonts/feyn/overheads.pdf
-2022/07/18 | 582 | fonts/feyn/overheads.tex
-2022/07/18 | 2422 | fonts/feyn/README
-2022/07/18 | 4579 | fonts/feyn/release-notes.html
-2022/07/18 | 3920 | fonts/feyn/sample-massive.png
-2022/07/18 | 3981 | fonts/feyn/sample-phi4.png
-2022/07/18 | 4935 | fonts/feyn/sample-two-loop-annotated.png
-2022/07/18 | 3928 | fonts/feyn/sample-two-loop.png
-2022/07/18 | 3319 | fonts/feyn/sample-vertex.png
-2022/07/18 | 6729 | fonts/feyn/style.css
-2022/07/18 | 11 | fonts/feyn/VERSION
-2022/07/19 | 594397 | fonts/feyn.zip
+2022/07/20 | 161626 | fonts/feyn/exercise-font.pdf
+2022/07/20 | 5939 | fonts/feyn/exercise-font.tex
+2022/07/20 | 1378 | fonts/feyn/feyn10.mf
+2022/07/20 | 1382 | fonts/feyn/feyn11.mf
+2022/07/20 | 1377 | fonts/feyn/feyn12.mf
+2022/07/20 | 1377 | fonts/feyn/feyn18.mf
+2022/07/20 | 1378 | fonts/feyn/feyn24.mf
+2022/07/20 | 57404 | fonts/feyn/feyn.dtx
+2022/07/20 | 7057 | fonts/feyn/feyn.html
+2022/07/20 | 231 | fonts/feyn/feyn.ins
+2022/07/20 | 4422 | fonts/feyn/feynmac.mf
+2022/07/20 | 23442 | fonts/feyn/feyn.mf
+2022/07/20 | 326102 | fonts/feyn/feyn.pdf
+2022/07/20 | 1373 | fonts/feyn/feyntext10.mf
+2022/07/20 | 1379 | fonts/feyn/feyntext11.mf
+2022/07/20 | 1374 | fonts/feyn/feyntext12.mf
+2022/07/20 | 1373 | fonts/feyn/feyntext18.mf
+2022/07/20 | 1374 | fonts/feyn/feyntext24.mf
+2022/07/20 | 1410 | fonts/feyn/feynx10.mf
+2022/07/20 | 1414 | fonts/feyn/feynx11.mf
+2022/07/20 | 1408 | fonts/feyn/feynx12.mf
+2022/07/20 | 1409 | fonts/feyn/feynx18.mf
+2022/07/20 | 1410 | fonts/feyn/feynx24.mf
+2022/07/20 | 1333 | fonts/feyn/LICENCE
+2022/07/20 | 67965 | fonts/feyn/overheads.pdf
+2022/07/20 | 675 | fonts/feyn/overheads.tex
+2022/07/20 | 2399 | fonts/feyn/README
+2022/07/20 | 4857 | fonts/feyn/release-notes.html
+2022/07/20 | 3920 | fonts/feyn/sample-massive.png
+2022/07/20 | 3981 | fonts/feyn/sample-phi4.png
+2022/07/20 | 4935 | fonts/feyn/sample-two-loop-annotated.png
+2022/07/20 | 3928 | fonts/feyn/sample-two-loop.png
+2022/07/20 | 3319 | fonts/feyn/sample-vertex.png
+2022/07/20 | 6729 | fonts/feyn/style.css
+2022/07/20 | 11 | fonts/feyn/VERSION
+2022/07/20 | 606752 | fonts/feyn.zip
2015/05/20 | 2997 | fonts/fge/fgebase.mf
2015/05/20 | 12 | fonts/fge/fge.cfg
2015/05/20 | 136906 | fonts/fge/fge-doc.pdf
@@ -50888,7 +50888,6 @@
2013/05/23 | 391171 | fonts/greek/gfs/gfsneohellenic/doc/NeohellenicSpecimen.pdf
2013/05/23 | 23824 | fonts/greek/gfs/gfsneohellenic/doc/OFL-FAQ.txt
2013/05/23 | 4441 | fonts/greek/gfs/gfsneohellenic/doc/OFL.txt
-2013/05/23 | 52 | fonts/greek/gfs/gfsneohellenic/doc/VERSION
2013/10/23 | 3042 | fonts/greek/gfs/gfsneohellenic/enc/neohellenicdenomnums.enc
2013/10/23 | 3355 | fonts/greek/gfs/gfsneohellenic/enc/neohellenicec.enc
2013/10/23 | 3461 | fonts/greek/gfs/gfsneohellenic/enc/neohellenicecsc.enc
@@ -50903,7 +50902,7 @@
2007/04/15 | 103688 | fonts/greek/gfs/gfsneohellenic/opentype/GFSNeohellenicBoldIt.otf
2007/04/15 | 91984 | fonts/greek/gfs/gfsneohellenic/opentype/GFSNeohellenicBold.otf
2007/04/15 | 102424 | fonts/greek/gfs/gfsneohellenic/opentype/GFSNeohellenicIt.otf
-2007/04/15 | 122504 | fonts/greek/gfs/gfsneohellenic/opentype/GFSNeohellenic.otf
+2009/09/18 | 122288 | fonts/greek/gfs/gfsneohellenic/opentype/GFSNeohellenic.otf
2013/05/23 | 209 | fonts/greek/gfs/gfsneohellenic/README
2013/05/23 | 12140 | fonts/greek/gfs/gfsneohellenic/tex/gfsneohellenic.sty
2013/05/23 | 1251 | fonts/greek/gfs/gfsneohellenic/tex/lgrneohellenic.fd
@@ -50971,6 +50970,7 @@
2013/05/23 | 166767 | fonts/greek/gfs/gfsneohellenic/type1/GFSNeohellenic-Bold.pfb
2013/05/23 | 171954 | fonts/greek/gfs/gfsneohellenic/type1/GFSNeohellenic-Italic.pfb
2013/05/23 | 198724 | fonts/greek/gfs/gfsneohellenic/type1/GFSNeohellenic-Regular.pfb
+2022/07/20 | 53 | fonts/greek/gfs/gfsneohellenic/VERSION
2013/10/23 | 1036 | fonts/greek/gfs/gfsneohellenic/vf/gfsneohellenicmath8a.vf
2013/10/23 | 1668 | fonts/greek/gfs/gfsneohellenic/vf/gneohellenicb6a.vf
2013/10/23 | 1688 | fonts/greek/gfs/gfsneohellenic/vf/gneohellenicbi6a.vf
@@ -50999,7 +50999,7 @@
2013/10/23 | 1628 | fonts/greek/gfs/gfsneohellenic/vf/neohellenicsco8a.vf
2013/10/23 | 1756 | fonts/greek/gfs/gfsneohellenic/vf/neohellenicsco9a.vf
2013/10/23 | 592 | fonts/greek/gfs/gfsneohellenic/vf/neohellenictabnums8a.vf
-2013/10/23 | 1561833 | fonts/greek/gfs/gfsneohellenic.zip
+2022/07/20 | 1562087 | fonts/greek/gfs/gfsneohellenic.zip
2007/10/22 | 19796 | fonts/greek/gfs/gfsporson/afm/GFSPorson-Regular.afm
2007/05/16 | 30843 | fonts/greek/gfs/gfsporson/doc/gfsporson.pdf
2007/10/22 | 3424 | fonts/greek/gfs/gfsporson/doc/gfsporson.tex
@@ -158206,11 +158206,11 @@
2010/10/10 | 82 | graphics/pgf/contrib/bodegraph/gnuplot/bodegraph/9.table
2010/10/10 | 473 | graphics/pgf/contrib/bodegraph/README
2010/10/10 | 421558 | graphics/pgf/contrib/bodegraph.zip
-2022/07/06 | 83672 | graphics/pgf/contrib/bodeplot/bodeplot.dtx
-2022/07/06 | 1416 | graphics/pgf/contrib/bodeplot/bodeplot.ins
-2022/07/06 | 992859 | graphics/pgf/contrib/bodeplot/bodeplot.pdf
-2022/07/06 | 3281 | graphics/pgf/contrib/bodeplot/README.md
-2022/07/06 | 765182 | graphics/pgf/contrib/bodeplot.zip
+2022/07/20 | 85685 | graphics/pgf/contrib/bodeplot/bodeplot.dtx
+2022/07/20 | 1416 | graphics/pgf/contrib/bodeplot/bodeplot.ins
+2022/07/20 | 1007326 | graphics/pgf/contrib/bodeplot/bodeplot.pdf
+2022/07/20 | 3629 | graphics/pgf/contrib/bodeplot/README.md
+2022/07/20 | 776733 | graphics/pgf/contrib/bodeplot.zip
2019/05/07 | 70256 | graphics/pgf/contrib/braids/braids_code.dtx
2019/05/07 | 410835 | graphics/pgf/contrib/braids/braids_code.pdf
2019/04/04 | 314455 | graphics/pgf/contrib/braids/braids.pdf
@@ -159297,6 +159297,20 @@
2016/02/05 | 68192 | graphics/pgf/contrib/tikz-feynman/tikz-feynman.tex
2016/02/05 | 11610 | graphics/pgf/contrib/tikz-feynman/tikzlibraryfeynman.code.tex
2016/02/05 | 351538 | graphics/pgf/contrib/tikz-feynman.zip
+2022/07/20 | 402 | graphics/pgf/contrib/tikzfill/CHANGES.md
+2022/07/20 | 2450 | graphics/pgf/contrib/tikzfill/README.md
+2022/07/20 | 1891 | graphics/pgf/contrib/tikzfill/tikzfill-common.sty
+2022/07/20 | 4680 | graphics/pgf/contrib/tikzfill/tikzfill-doc.sty
+2022/07/20 | 1101 | graphics/pgf/contrib/tikzfill/tikzfill.hexagon.sty
+2022/07/20 | 1083 | graphics/pgf/contrib/tikzfill/tikzfill.image.sty
+2022/07/20 | 721265 | graphics/pgf/contrib/tikzfill/tikzfill.pdf
+2022/07/20 | 1101 | graphics/pgf/contrib/tikzfill/tikzfill.rhombus.sty
+2022/07/20 | 1109 | graphics/pgf/contrib/tikzfill/tikzfill.sty
+2022/07/20 | 42108 | graphics/pgf/contrib/tikzfill/tikzfill.tex
+2022/07/20 | 12043 | graphics/pgf/contrib/tikzfill/tikzlibraryfill.hexagon.code.tex
+2022/07/20 | 11652 | graphics/pgf/contrib/tikzfill/tikzlibraryfill.image.code.tex
+2022/07/20 | 6563 | graphics/pgf/contrib/tikzfill/tikzlibraryfill.rhombus.code.tex
+2022/07/20 | 637842 | graphics/pgf/contrib/tikzfill.zip
2019/04/30 | 500 | graphics/pgf/contrib/tikz-imagelabels/Makefile
2019/06/24 | 518323 | graphics/pgf/contrib/tikz-imagelabels/pleiades.jpg
2019/04/30 | 224 | graphics/pgf/contrib/tikz-imagelabels/README.md
@@ -188807,6 +188821,7 @@
2014/06/15 | 843875 | install/graphics/pgf/contrib/logicpuzzle.tds.zip
2021/05/15 | 17583452 | install/graphics/pgf/contrib/pgfplots.tds.zip
2013/12/11 | 491125 | install/graphics/pgf/contrib/rulercompass.tds.zip
+2022/07/20 | 637204 | install/graphics/pgf/contrib/tikzfill.tds.zip
2014/01/23 | 77120 | install/graphics/pgf/contrib/tikz-opm.tds.zip
2012/09/16 | 256432 | install/graphics/pgf/contrib/tikzpagenodes.tds.zip
2017/04/22 | 533244 | install/graphics/pgf/contrib/tikzpeople.tds.zip
@@ -188844,6 +188859,7 @@
2020/06/30 | 1215011 | install/macros/generic/tracklang.tds.zip
2021/09/15 | 585368 | install/macros/generic/unicode-data.tds.zip
2022/06/11 | 4242531 | install/macros/generic/xint.tds.zip
+2021/07/01 | 946668 | install/macros/jptex/latex/jsclasses.tds.zip
2016/05/15 | 295442 | install/macros/latex/contrib/abc.tds.zip
2018/11/24 | 6522794 | install/macros/latex/contrib/abntex2.tds.zip
2009/09/02 | 160216 | install/macros/latex/contrib/abstract.tds.zip
@@ -188989,7 +189005,6 @@
2019/12/15 | 441325 | install/macros/latex/contrib/intcalc.tds.zip
2008/07/31 | 81728 | install/macros/latex/contrib/inversepath.tds.zip
2022/02/09 | 1035078 | install/macros/latex/contrib/jmlr.tds.zip
-2021/07/01 | 946668 | install/macros/latex/contrib/jsclasses.tds.zip
2022/07/04 | 9745376 | install/macros/latex/contrib/koma-script.tds.zip
2015/12/09 | 171418 | install/macros/latex/contrib/ksp-thesis.tds.zip
2019/12/19 | 302191 | install/macros/latex/contrib/kvdefinekeys.tds.zip
@@ -189157,7 +189172,7 @@
2022/06/16 | 7338999 | install/macros/latex-dev/required/latex-tools-dev.tds.zip
2022/07/05 | 38317838 | install/macros/latex/latex-base.tds.zip
2020/06/01 | 1578753 | install/macros/latex/required/amscls.tds.zip
-2022/06/26 | 3014165 | install/macros/latex/required/babel-base.tds.zip
+2022/07/20 | 3013535 | install/macros/latex/required/babel-base.tds.zip
2022/06/08 | 2794804 | install/macros/latex/required/latex-amsmath.tds.zip
2022/06/14 | 242625 | install/macros/latex/required/latexbug.tds.zip
2022/06/16 | 1352652 | install/macros/latex/required/latex-cyrillic.tds.zip
@@ -198284,16 +198299,6 @@
2019/04/01 | 3094 | language/japanese/jlreq/README-template.html
2022/01/07 | 3315 | language/japanese/jlreq/README-template.tex
2022/07/13 | 603041 | language/japanese/jlreq.zip
-1995/08/05 | 7067 | language/japanese/jtex/00NEWS
-1995/07/26 | 1558 | language/japanese/jtex/00README
-1995/06/21 | 1825 | language/japanese/jtex/jlatex2e-add1.tar.gz
-1995/06/21 | 51373 | language/japanese/jtex/jlatex2e.tar.gz
-1995/06/21 | 2627 | language/japanese/jtex/jlib-add1.tar.gz
-1995/06/21 | 150730 | language/japanese/jtex/jlib.tar.gz
-1995/06/18 | 1751 | language/japanese/jtex/README
-1995/07/26 | 1091 | language/japanese/jtex/web2c-6.1j-add1.tar.gz
-1995/08/05 | 19100 | language/japanese/jtex/web2c-6.1j-add2.tar.gz
-1995/08/05 | 259455 | language/japanese/jtex/web2c-6.1j.tar.gz
2021/12/11 | 137664 | language/japanese/platex/exppl2e.pdf
2021/12/11 | 13656 | language/japanese/platex/exppl2e.sty
2021/12/11 | 158330 | language/japanese/platex/jclasses.dtx
@@ -199110,7 +199115,6 @@
2020/02/08 | 663404 | language/japanese/pxufont/vf/zu-uprubyminr-h.vf
2020/02/08 | 663432 | language/japanese/pxufont/vf/zu-uprubyminr-v.vf
2020/02/08 | 18511157 | language/japanese/pxufont.zip
-1995/12/03 | 222 | language/japanese/README.CJK
2021/05/31 | 1586 | language/japanese/uplatex/LICENSE
2021/05/31 | 4410 | language/japanese/uplatex/Makefile
2021/05/31 | 626 | language/japanese/uplatex/README.md
@@ -202968,11 +202972,6 @@
2011/11/18 | 8382 | macros/generic/fenixpar/fenixtok.sty
2011/11/18 | 312 | macros/generic/fenixpar/README
2011/11/18 | 4082 | macros/generic/fenixpar.zip
-2018/03/24 | 281286 | macros/generic/fixjfm/fixjfm-doc.pdf
-2018/03/24 | 13012 | macros/generic/fixjfm/fixjfm-doc.tex
-2018/03/24 | 8252 | macros/generic/fixjfm/fixjfm.sty
-2018/03/24 | 349 | macros/generic/fixjfm/README
-2018/03/24 | 286272 | macros/generic/fixjfm.zip
2004/11/12 | 61180 | macros/generic/fltpoint/fltpoint.dtx
2004/11/12 | 292 | macros/generic/fltpoint/fltpoint.ins
2004/11/12 | 206320 | macros/generic/fltpoint/fltpoint.pdf
@@ -203963,6 +203962,60 @@
1991/09/17 | 33043 | macros/inrstex/texgraph/texgraph.tex
1991/09/06 | 352326 | macros/inrstex/texgraph/thgraph.ps
2004/11/23 | 103137 | macros/jadetex/jadetex-3.13.tar.gz
+2018/03/24 | 281286 | macros/jptex/generic/fixjfm/fixjfm-doc.pdf
+2018/03/24 | 13012 | macros/jptex/generic/fixjfm/fixjfm-doc.tex
+2018/03/24 | 8252 | macros/jptex/generic/fixjfm/fixjfm.sty
+2018/03/24 | 349 | macros/jptex/generic/fixjfm/README
+2018/03/24 | 286272 | macros/jptex/generic/fixjfm.zip
+2020/10/14 | 49397 | macros/jptex/latex/gentombow/bounddvi-en.pdf
+2020/10/14 | 5322 | macros/jptex/latex/gentombow/bounddvi-en.tex
+2020/10/14 | 102475 | macros/jptex/latex/gentombow/bounddvi.pdf
+2020/10/14 | 3986 | macros/jptex/latex/gentombow/bounddvi.sty
+2020/10/14 | 7664 | macros/jptex/latex/gentombow/bounddvi.tex
+2020/10/14 | 174085 | macros/jptex/latex/gentombow/gentombow-ja.pdf
+2020/10/14 | 21595 | macros/jptex/latex/gentombow/gentombow-ja.tex
+2020/10/14 | 150209 | macros/jptex/latex/gentombow/gentombow.pdf
+2020/10/14 | 26436 | macros/jptex/latex/gentombow/gentombow.sty
+2020/10/14 | 10362 | macros/jptex/latex/gentombow/gentombow.tex
+2020/10/14 | 1500 | macros/jptex/latex/gentombow/LICENSE
+2020/10/14 | 7762 | macros/jptex/latex/gentombow/pxesopic.sty
+2020/10/14 | 23109 | macros/jptex/latex/gentombow/pxgentombow.pdf
+2020/10/14 | 457 | macros/jptex/latex/gentombow/pxgentombow.sty
+2020/10/14 | 728 | macros/jptex/latex/gentombow/pxgentombow.tex
+2020/10/14 | 2144 | macros/jptex/latex/gentombow/pxpdfpages.sty
+2020/10/14 | 3412 | macros/jptex/latex/gentombow/pxtextpos.sty
+2020/10/14 | 1965 | macros/jptex/latex/gentombow/README.md
+2020/10/14 | 523053 | macros/jptex/latex/gentombow.zip
+2021/07/01 | 197349 | macros/jptex/latex/jsclasses/jsclasses.dtx
+2021/07/01 | 561 | macros/jptex/latex/jsclasses/jsclasses.ins
+2021/07/01 | 412473 | macros/jptex/latex/jsclasses/jsclasses.pdf
+2021/07/01 | 11305 | macros/jptex/latex/jsclasses/jslogo.dtx
+2021/07/01 | 233 | macros/jptex/latex/jsclasses/jslogo.ins
+2021/07/01 | 76779 | macros/jptex/latex/jsclasses/jslogo.pdf
+2021/07/01 | 8623 | macros/jptex/latex/jsclasses/jsverb.dtx
+2021/07/01 | 232 | macros/jptex/latex/jsclasses/jsverb.ins
+2021/07/01 | 75649 | macros/jptex/latex/jsclasses/jsverb.pdf
+2021/07/01 | 1392 | macros/jptex/latex/jsclasses/LICENSE
+2021/07/01 | 2811 | macros/jptex/latex/jsclasses/Makefile
+2021/07/01 | 40908 | macros/jptex/latex/jsclasses/okumacro.dtx
+2021/07/01 | 240 | macros/jptex/latex/jsclasses/okumacro.ins
+2021/07/01 | 175557 | macros/jptex/latex/jsclasses/okumacro.pdf
+2021/07/01 | 6087 | macros/jptex/latex/jsclasses/okuverb.dtx
+2021/07/01 | 236 | macros/jptex/latex/jsclasses/okuverb.ins
+2021/07/01 | 59902 | macros/jptex/latex/jsclasses/okuverb.pdf
+2021/07/01 | 1432 | macros/jptex/latex/jsclasses/README.md
+2021/07/01 | 860614 | macros/jptex/latex/jsclasses.zip
+2022/05/25 | 1091 | macros/jptex/latex/pxcjkcat/LICENSE
+2022/06/03 | 197668 | macros/jptex/latex/pxcjkcat/pxcjkcat.pdf
+2022/06/03 | 40123 | macros/jptex/latex/pxcjkcat/pxcjkcat.sty
+2022/06/03 | 50755 | macros/jptex/latex/pxcjkcat/pxcjkcat.tex
+2022/06/03 | 1658 | macros/jptex/latex/pxcjkcat/README-ja.md
+2022/06/03 | 3204 | macros/jptex/latex/pxcjkcat/README.md
+2022/06/08 | 223926 | macros/jptex/latex/pxcjkcat.zip
+2017/01/21 | 1196 | macros/jptex/latex/pxtatescale/LICENSE
+2017/01/21 | 1443 | macros/jptex/latex/pxtatescale/pxtatescale.sty
+2017/01/21 | 1181 | macros/jptex/latex/pxtatescale/README
+2017/01/21 | 2360 | macros/jptex/latex/pxtatescale.zip
2011/06/14 | 65070577 | macros/lamstex/doc/The_LAmS-TeX_Wizards_Manual.pdf
1991/06/29 | 92364 | macros/lamstex/doc/wiz1.tex
1991/06/18 | 46550 | macros/lamstex/doc/wiz2.tex
@@ -216950,25 +217003,6 @@
2006/09/16 | 86371 | macros/latex/contrib/genmpage/genmpage.pdf
2006/09/16 | 269 | macros/latex/contrib/genmpage/README
2006/09/16 | 79510 | macros/latex/contrib/genmpage.zip
-2020/10/14 | 49397 | macros/latex/contrib/gentombow/bounddvi-en.pdf
-2020/10/14 | 5322 | macros/latex/contrib/gentombow/bounddvi-en.tex
-2020/10/14 | 102475 | macros/latex/contrib/gentombow/bounddvi.pdf
-2020/10/14 | 3986 | macros/latex/contrib/gentombow/bounddvi.sty
-2020/10/14 | 7664 | macros/latex/contrib/gentombow/bounddvi.tex
-2020/10/14 | 174085 | macros/latex/contrib/gentombow/gentombow-ja.pdf
-2020/10/14 | 21595 | macros/latex/contrib/gentombow/gentombow-ja.tex
-2020/10/14 | 150209 | macros/latex/contrib/gentombow/gentombow.pdf
-2020/10/14 | 26436 | macros/latex/contrib/gentombow/gentombow.sty
-2020/10/14 | 10362 | macros/latex/contrib/gentombow/gentombow.tex
-2020/10/14 | 1500 | macros/latex/contrib/gentombow/LICENSE
-2020/10/14 | 7762 | macros/latex/contrib/gentombow/pxesopic.sty
-2020/10/14 | 23109 | macros/latex/contrib/gentombow/pxgentombow.pdf
-2020/10/14 | 457 | macros/latex/contrib/gentombow/pxgentombow.sty
-2020/10/14 | 728 | macros/latex/contrib/gentombow/pxgentombow.tex
-2020/10/14 | 2144 | macros/latex/contrib/gentombow/pxpdfpages.sty
-2020/10/14 | 3412 | macros/latex/contrib/gentombow/pxtextpos.sty
-2020/10/14 | 1965 | macros/latex/contrib/gentombow/README.md
-2020/10/14 | 523053 | macros/latex/contrib/gentombow.zip
2020/01/02 | 15887 | macros/latex/contrib/geometry/changes.txt
2020/01/02 | 159890 | macros/latex/contrib/geometry/geometry-de.dtx
2020/01/02 | 465858 | macros/latex/contrib/geometry/geometry-de.pdf
@@ -218608,123 +218642,135 @@
2022/05/27 | 713 | macros/latex/contrib/hvextern/README
2022/06/21 | 1030 | macros/latex/contrib/hvextern/script/hvextern-checkfile.lua
2022/06/24 | 1371984 | macros/latex/contrib/hvextern.zip
-2022/05/01 | 4066 | macros/latex/contrib/hvfloat/Changes
-2021/06/26 | 80294 | macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf
-2021/05/17 | 2374 | macros/latex/contrib/hvfloat/doc/examples/after1s1c.tex
-2021/06/26 | 86722 | macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf
-2021/05/17 | 2457 | macros/latex/contrib/hvfloat/doc/examples/after2s2c.tex
+2022/07/20 | 4199 | macros/latex/contrib/hvfloat/Changes
+2022/07/20 | 79855 | macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf
+2021/11/20 | 2379 | macros/latex/contrib/hvfloat/doc/examples/after1s1c.tex
+2022/07/20 | 86559 | macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf
+2021/11/20 | 2462 | macros/latex/contrib/hvfloat/doc/examples/after2s2c.tex
2021/06/17 | 2956 | macros/latex/contrib/hvfloat/doc/examples/capPos.inc
-2021/06/26 | 95389 | macros/latex/contrib/hvfloat/doc/examples/capPos.pdf
-2021/06/17 | 1568 | macros/latex/contrib/hvfloat/doc/examples/capPos.tex
-2021/06/17 | 3471 | macros/latex/contrib/hvfloat/doc/examples/capVPos.inc
-2021/06/26 | 81991 | macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf
-2021/05/17 | 2388 | macros/latex/contrib/hvfloat/doc/examples/default1s1c.tex
-2021/06/26 | 83275 | macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf
-2021/05/17 | 1885 | macros/latex/contrib/hvfloat/doc/examples/default1s2c.tex
-2021/06/26 | 79445 | macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf
-2021/05/17 | 2314 | macros/latex/contrib/hvfloat/doc/examples/default2s1c.tex
-2021/06/26 | 85824 | macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf
-2021/05/17 | 2455 | macros/latex/contrib/hvfloat/doc/examples/default2s2c.tex
-2021/06/26 | 2314853 | macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf
-2021/05/30 | 35031 | macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.tex
-2021/06/26 | 619030 | macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf
-2021/05/30 | 37908 | macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.tex
-2021/06/26 | 77658 | macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf
-2021/05/17 | 2378 | macros/latex/contrib/hvfloat/doc/examples/even1s1c.tex
-2021/06/26 | 86404 | macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf
-2021/05/17 | 2512 | macros/latex/contrib/hvfloat/doc/examples/even1s2c.tex
-2021/06/26 | 84813 | macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf
-2021/05/17 | 2502 | macros/latex/contrib/hvfloat/doc/examples/even2s1c.tex
-2021/06/26 | 85098 | macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf
-2021/05/17 | 2521 | macros/latex/contrib/hvfloat/doc/examples/even2s2c.tex
-2021/06/26 | 86773 | macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf
-2021/05/17 | 1276 | macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.tex
-2021/06/26 | 84020 | macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf
-2021/05/17 | 2116 | macros/latex/contrib/hvfloat/doc/examples/inner1s2c.tex
-2021/06/26 | 83977 | macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf
-2021/05/17 | 2093 | macros/latex/contrib/hvfloat/doc/examples/inner2s1c.tex
-2021/06/26 | 84013 | macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf
-2021/05/17 | 2135 | macros/latex/contrib/hvfloat/doc/examples/inner2s2c.tex
-2021/06/26 | 85512 | macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf
-2021/05/17 | 2500 | macros/latex/contrib/hvfloat/doc/examples/left2s2c.tex
-2021/06/26 | 142624 | macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf
-2021/06/17 | 5902 | macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.tex
-2021/06/26 | 146172 | macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf
-2021/05/17 | 5867 | macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.tex
-2021/06/26 | 94586 | macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf
-2021/05/17 | 4677 | macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.tex
-2021/06/26 | 146343 | macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf
-2021/05/17 | 5875 | macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.tex
-2021/06/26 | 92182 | macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf
-2021/05/17 | 4687 | macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.tex
-2021/06/26 | 89784 | macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf
-2021/06/17 | 4793 | macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.tex
-2021/06/26 | 92984 | macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf
-2021/06/17 | 4794 | macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.tex
-2021/06/26 | 145736 | macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf
-2021/06/17 | 5905 | macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.tex
-2021/06/26 | 77805 | macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf
-2021/06/20 | 2421 | macros/latex/contrib/hvfloat/doc/examples/odd1s1c.tex
-2021/06/26 | 86523 | macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf
-2021/05/17 | 2517 | macros/latex/contrib/hvfloat/doc/examples/odd1s2c.tex
-2021/06/26 | 174218 | macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf
-2021/06/17 | 2492 | macros/latex/contrib/hvfloat/doc/examples/odd2s1c.tex
-2021/06/26 | 85566 | macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf
-2021/05/17 | 2525 | macros/latex/contrib/hvfloat/doc/examples/odd2s2c.tex
-2021/06/26 | 86318 | macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf
-2021/05/17 | 2114 | macros/latex/contrib/hvfloat/doc/examples/outer1s2c.tex
-2021/06/26 | 84292 | macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf
-2021/05/17 | 2081 | macros/latex/contrib/hvfloat/doc/examples/outer2s1c.tex
-2021/06/26 | 84680 | macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf
-2021/05/17 | 2122 | macros/latex/contrib/hvfloat/doc/examples/outer2s2c.tex
-2021/06/26 | 79267 | macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf
-2021/05/17 | 2506 | macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.tex
-2021/06/26 | 79967 | macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf
-2021/05/17 | 2456 | macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.tex
-2021/06/26 | 90508 | macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf
-2021/05/17 | 2457 | macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.tex
-2021/06/26 | 87935 | macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf
-2021/05/28 | 2446 | macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.tex
-2021/06/26 | 90332 | macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf
-2021/05/17 | 2457 | macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.tex
-2021/06/26 | 87855 | macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf
-2021/05/17 | 2515 | macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.tex
-2021/06/26 | 80290 | macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf
-2021/05/17 | 2511 | macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.tex
-2021/06/17 | 2226 | macros/latex/contrib/hvfloat/doc/examples/preamble.ltx
+2022/07/20 | 98061 | macros/latex/contrib/hvfloat/doc/examples/capPos.pdf
+2021/11/11 | 1568 | macros/latex/contrib/hvfloat/doc/examples/capPos.tex
+2022/03/19 | 3601 | macros/latex/contrib/hvfloat/doc/examples/capVPos.inc
+2022/07/20 | 81685 | macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf
+2021/11/20 | 2393 | macros/latex/contrib/hvfloat/doc/examples/default1s1c.tex
+2022/07/20 | 83180 | macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf
+2021/11/20 | 1888 | macros/latex/contrib/hvfloat/doc/examples/default1s2c.tex
+2022/07/20 | 78954 | macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf
+2021/11/20 | 2319 | macros/latex/contrib/hvfloat/doc/examples/default2s1c.tex
+2022/07/20 | 85642 | macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf
+2021/11/20 | 2460 | macros/latex/contrib/hvfloat/doc/examples/default2s2c.tex
+2022/07/20 | 1759143 | macros/latex/contrib/hvfloat/doc/examples/doublefullpage2s2c.pdf
+2022/05/30 | 23950 | macros/latex/contrib/hvfloat/doc/examples/doublefullpage2s2c.tex
+2022/07/20 | 2317480 | macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf
+2021/11/11 | 35041 | macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.tex
+2022/07/20 | 616570 | macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf
+2021/11/11 | 37908 | macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.tex
+2022/07/20 | 77202 | macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf
+2021/11/20 | 2383 | macros/latex/contrib/hvfloat/doc/examples/even1s1c.tex
+2022/07/20 | 86195 | macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf
+2021/11/20 | 2517 | macros/latex/contrib/hvfloat/doc/examples/even1s2c.tex
+2022/07/20 | 84135 | macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf
+2021/11/20 | 2507 | macros/latex/contrib/hvfloat/doc/examples/even2s1c.tex
+2022/07/20 | 84895 | macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf
+2021/11/20 | 2526 | macros/latex/contrib/hvfloat/doc/examples/even2s2c.tex
+2022/07/20 | 86549 | macros/latex/contrib/hvfloat/doc/examples/fullpage1s1c.pdf
+2022/06/09 | 1265 | macros/latex/contrib/hvfloat/doc/examples/fullpage1s1c.tex
+2022/07/20 | 87033 | macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf
+2021/11/11 | 1276 | macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.tex
+2022/07/20 | 83734 | macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf
+2021/11/20 | 2121 | macros/latex/contrib/hvfloat/doc/examples/inner1s2c.tex
+2022/07/20 | 83699 | macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf
+2021/11/20 | 2098 | macros/latex/contrib/hvfloat/doc/examples/inner2s1c.tex
+2022/07/20 | 83924 | macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf
+2021/11/20 | 2140 | macros/latex/contrib/hvfloat/doc/examples/inner2s2c.tex
+2022/07/20 | 85326 | macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf
+2021/11/20 | 2505 | macros/latex/contrib/hvfloat/doc/examples/left2s2c.tex
+2022/07/20 | 142146 | macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf
+2021/11/20 | 5906 | macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.tex
+2022/07/20 | 145886 | macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf
+2021/11/20 | 5872 | macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.tex
+2022/07/20 | 102871 | macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf
+2021/11/20 | 4682 | macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.tex
+2022/07/20 | 146064 | macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf
+2021/11/20 | 5880 | macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.tex
+2022/07/20 | 100507 | macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf
+2021/11/20 | 4692 | macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.tex
+2022/07/20 | 98070 | macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf
+2021/11/20 | 4797 | macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.tex
+2022/07/20 | 101319 | macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf
+2021/11/20 | 4798 | macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.tex
+2022/07/20 | 145453 | macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf
+2021/11/20 | 5909 | macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.tex
+2022/07/20 | 77375 | macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf
+2021/11/20 | 2425 | macros/latex/contrib/hvfloat/doc/examples/odd1s1c.tex
+2022/07/20 | 86322 | macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf
+2021/11/20 | 2522 | macros/latex/contrib/hvfloat/doc/examples/odd1s2c.tex
+2022/07/20 | 173604 | macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf
+2021/11/20 | 2496 | macros/latex/contrib/hvfloat/doc/examples/odd2s1c.tex
+2022/07/20 | 85385 | macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf
+2021/11/20 | 2530 | macros/latex/contrib/hvfloat/doc/examples/odd2s2c.tex
+2022/07/20 | 86224 | macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf
+2021/11/20 | 2119 | macros/latex/contrib/hvfloat/doc/examples/outer1s2c.tex
+2022/07/20 | 84006 | macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf
+2021/11/20 | 2086 | macros/latex/contrib/hvfloat/doc/examples/outer2s1c.tex
+2022/07/20 | 84587 | macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf
+2021/11/20 | 2127 | macros/latex/contrib/hvfloat/doc/examples/outer2s2c.tex
+2022/07/20 | 78903 | macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf
+2021/11/20 | 2511 | macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.tex
+2022/07/20 | 89620 | macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.pdf
+2022/02/28 | 2514 | macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.tex
+2022/07/20 | 81195 | macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf
+2022/07/20 | 2462 | macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.tex
+2022/07/20 | 90436 | macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf
+2021/11/20 | 2462 | macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.tex
+2022/07/20 | 87873 | macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf
+2021/11/11 | 2450 | macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.tex
+2022/07/20 | 90257 | macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf
+2021/11/20 | 2462 | macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.tex
+2022/07/20 | 87165 | macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.pdf
+2021/11/11 | 2435 | macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.tex
+2022/07/20 | 87776 | macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf
+2021/11/20 | 2520 | macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.tex
+2022/07/20 | 87061 | macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.pdf
+2021/11/11 | 2506 | macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.tex
+2022/07/20 | 81371 | macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf
+2021/11/20 | 2516 | macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.tex
+2022/07/20 | 1615381 | macros/latex/contrib/hvfloat/doc/examples/paper-twocolcaption-after2s2c.pdf
+2022/02/28 | 2722 | macros/latex/contrib/hvfloat/doc/examples/paper-twocolcaption-after2s2c.tex
+2022/03/19 | 2306 | macros/latex/contrib/hvfloat/doc/examples/preamble.ltx
2021/05/17 | 649 | macros/latex/contrib/hvfloat/doc/examples/README.exa
-2021/06/26 | 80126 | macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf
-2021/05/17 | 2374 | macros/latex/contrib/hvfloat/doc/examples/right1s1c.tex
-2021/06/26 | 89340 | macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf
-2021/05/17 | 2501 | macros/latex/contrib/hvfloat/doc/examples/right1s2c.tex
-2021/06/26 | 81033 | macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf
-2021/05/17 | 2375 | macros/latex/contrib/hvfloat/doc/examples/right2s1c.tex
-2021/06/26 | 85585 | macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf
-2021/05/17 | 2456 | macros/latex/contrib/hvfloat/doc/examples/right2s2c.tex
-2021/06/19 | 651 | macros/latex/contrib/hvfloat/doc/examples/runAll.sh
+2022/07/20 | 79681 | macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf
+2021/11/20 | 2379 | macros/latex/contrib/hvfloat/doc/examples/right1s1c.tex
+2022/07/20 | 89151 | macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf
+2021/11/20 | 2506 | macros/latex/contrib/hvfloat/doc/examples/right1s2c.tex
+2022/07/20 | 78955 | macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf
+2021/11/20 | 2380 | macros/latex/contrib/hvfloat/doc/examples/right2s1c.tex
+2022/07/20 | 85418 | macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf
+2021/11/20 | 2461 | macros/latex/contrib/hvfloat/doc/examples/right2s2c.tex
+2021/07/23 | 661 | macros/latex/contrib/hvfloat/doc/examples/runAll.sh
2021/06/19 | 666 | macros/latex/contrib/hvfloat/doc/examples/runEXA.sh
-2021/06/26 | 143952 | macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf
-2021/06/17 | 4534 | macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.tex
-2021/06/26 | 144771 | macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf
-2021/06/17 | 4576 | macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.tex
-2021/06/26 | 144003 | macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf
-2021/05/17 | 4497 | macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.tex
-2021/06/26 | 144217 | macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf
-2021/05/17 | 4541 | macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.tex
-2021/06/26 | 143517 | macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf
-2021/05/17 | 4549 | macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.tex
-2021/06/26 | 143873 | macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf
-2021/06/17 | 4534 | macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.tex
-2021/06/26 | 144879 | macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf
-2021/06/17 | 4576 | macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.tex
-2021/06/26 | 144315 | macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf
-2021/06/17 | 4576 | macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.tex
-2021/06/26 | 120949 | macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf
-2021/06/17 | 4184 | macros/latex/contrib/hvfloat/doc/examples/wide1s2c.tex
-2021/06/26 | 121917 | macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf
-2021/06/17 | 3964 | macros/latex/contrib/hvfloat/doc/examples/wide2s2c.tex
-2022/05/01 | 5039170 | macros/latex/contrib/hvfloat/doc/hvfloat.pdf
-2022/05/01 | 120636 | macros/latex/contrib/hvfloat/doc/hvfloat.tex
+2022/07/20 | 143688 | macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf
+2021/11/20 | 4538 | macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.tex
+2022/07/20 | 144612 | macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf
+2021/11/20 | 4580 | macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.tex
+2022/07/20 | 143725 | macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf
+2021/11/20 | 4502 | macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.tex
+2022/07/20 | 144030 | macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf
+2021/11/20 | 4546 | macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.tex
+2022/07/20 | 143328 | macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf
+2021/11/20 | 4554 | macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.tex
+2022/07/20 | 143611 | macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf
+2021/11/20 | 4538 | macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.tex
+2022/07/20 | 144711 | macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf
+2021/11/20 | 4580 | macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.tex
+2022/07/20 | 144144 | macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf
+2021/11/20 | 4580 | macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.tex
+2022/07/20 | 120832 | macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf
+2021/11/11 | 4184 | macros/latex/contrib/hvfloat/doc/examples/wide1s2c.tex
+2022/07/20 | 121819 | macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf
+2021/11/11 | 3964 | macros/latex/contrib/hvfloat/doc/examples/wide2s2c.tex
+2022/07/20 | 5037834 | macros/latex/contrib/hvfloat/doc/hvfloat.pdf
+2022/07/20 | 120656 | macros/latex/contrib/hvfloat/doc/hvfloat.tex
2019/04/01 | 69089 | macros/latex/contrib/hvfloat/doc/images/CTAN.png
2021/03/12 | 1362739 | macros/latex/contrib/hvfloat/doc/images/felsen-wasser-small.pdf
2019/04/01 | 5208 | macros/latex/contrib/hvfloat/doc/images/frose.png
@@ -218732,9 +218778,9 @@
2019/04/01 | 2493 | macros/latex/contrib/hvfloat/doc/images/rose.png
2021/03/14 | 501524 | macros/latex/contrib/hvfloat/doc/images/sonne-meer.jpg
2021/06/20 | 918 | macros/latex/contrib/hvfloat/latex/hvfloat-fps.sty
-2022/05/01 | 69796 | macros/latex/contrib/hvfloat/latex/hvfloat.sty
+2022/07/20 | 69916 | macros/latex/contrib/hvfloat/latex/hvfloat.sty
2021/03/08 | 563 | macros/latex/contrib/hvfloat/README
-2022/05/01 | 14343080 | macros/latex/contrib/hvfloat.zip
+2022/07/20 | 17989295 | macros/latex/contrib/hvfloat.zip
2017/12/12 | 533 | macros/latex/contrib/hvindex/Changes
2017/12/12 | 74896 | macros/latex/contrib/hvindex/doc/hvindex-doc.pdf
2017/12/12 | 7652 | macros/latex/contrib/hvindex/doc/hvindex-doc.tex
@@ -219792,25 +219838,6 @@
2007/03/01 | 31037 | macros/latex/contrib/jpsj/jpsj2.cls
2003/04/22 | 3667 | macros/latex/contrib/jpsj/template.tex
2007/03/09 | 162970 | macros/latex/contrib/jpsj.zip
-2021/07/01 | 197349 | macros/latex/contrib/jsclasses/jsclasses.dtx
-2021/07/01 | 561 | macros/latex/contrib/jsclasses/jsclasses.ins
-2021/07/01 | 412473 | macros/latex/contrib/jsclasses/jsclasses.pdf
-2021/07/01 | 11305 | macros/latex/contrib/jsclasses/jslogo.dtx
-2021/07/01 | 233 | macros/latex/contrib/jsclasses/jslogo.ins
-2021/07/01 | 76779 | macros/latex/contrib/jsclasses/jslogo.pdf
-2021/07/01 | 8623 | macros/latex/contrib/jsclasses/jsverb.dtx
-2021/07/01 | 232 | macros/latex/contrib/jsclasses/jsverb.ins
-2021/07/01 | 75649 | macros/latex/contrib/jsclasses/jsverb.pdf
-2021/07/01 | 1392 | macros/latex/contrib/jsclasses/LICENSE
-2021/07/01 | 2811 | macros/latex/contrib/jsclasses/Makefile
-2021/07/01 | 40908 | macros/latex/contrib/jsclasses/okumacro.dtx
-2021/07/01 | 240 | macros/latex/contrib/jsclasses/okumacro.ins
-2021/07/01 | 175557 | macros/latex/contrib/jsclasses/okumacro.pdf
-2021/07/01 | 6087 | macros/latex/contrib/jsclasses/okuverb.dtx
-2021/07/01 | 236 | macros/latex/contrib/jsclasses/okuverb.ins
-2021/07/01 | 59902 | macros/latex/contrib/jsclasses/okuverb.pdf
-2021/07/01 | 1432 | macros/latex/contrib/jsclasses/README.md
-2021/07/01 | 860614 | macros/latex/contrib/jsclasses.zip
2015/07/09 | 1361 | macros/latex/contrib/jslectureplanner/cologne.lps
2018/09/26 | 2829 | macros/latex/contrib/jslectureplanner/english.lps
2017/03/12 | 710 | macros/latex/contrib/jslectureplanner/examples/English/lecpresbody-english.tex
@@ -226765,22 +226792,11 @@
2006/01/31 | 1797 | macros/latex/contrib/punk-latex/punk.tex
2006/01/25 | 493 | macros/latex/contrib/punk-latex/README
2006/09/23 | 151193 | macros/latex/contrib/punk-latex.zip
-2022/05/25 | 1091 | macros/latex/contrib/pxcjkcat/LICENSE
-2022/06/03 | 197668 | macros/latex/contrib/pxcjkcat/pxcjkcat.pdf
-2022/06/03 | 40123 | macros/latex/contrib/pxcjkcat/pxcjkcat.sty
-2022/06/03 | 50755 | macros/latex/contrib/pxcjkcat/pxcjkcat.tex
-2022/06/03 | 1658 | macros/latex/contrib/pxcjkcat/README-ja.md
-2022/06/03 | 3204 | macros/latex/contrib/pxcjkcat/README.md
-2022/06/08 | 223926 | macros/latex/contrib/pxcjkcat.zip
2011/03/16 | 11907 | macros/latex/contrib/pxgreeks/pxgreeks.dtx
2011/03/16 | 2216 | macros/latex/contrib/pxgreeks/pxgreeks.ins
2011/03/16 | 68222 | macros/latex/contrib/pxgreeks/pxgreeks.pdf
2011/03/25 | 1502 | macros/latex/contrib/pxgreeks/README
2011/03/26 | 62655 | macros/latex/contrib/pxgreeks.zip
-2017/01/21 | 1196 | macros/latex/contrib/pxtatescale/LICENSE
-2017/01/21 | 1443 | macros/latex/contrib/pxtatescale/pxtatescale.sty
-2017/01/21 | 1181 | macros/latex/contrib/pxtatescale/README
-2017/01/21 | 2360 | macros/latex/contrib/pxtatescale.zip
2020/12/21 | 62882 | macros/latex/contrib/pygmentex/blueshade.png
2020/12/21 | 300 | macros/latex/contrib/pygmentex/Factorial.java
2020/12/21 | 236 | macros/latex/contrib/pygmentex/pygmentex_demo.c
@@ -234694,6 +234710,10 @@
2011/04/09 | 15201 | macros/latex/contrib/wrapfig/wrapfig-doc.tex
2003/02/05 | 26220 | macros/latex/contrib/wrapfig/wrapfig.sty
2011/04/09 | 346180 | macros/latex/contrib/wrapfig.zip
+2022/07/20 | 1703 | macros/latex/contrib/wrapstuff/README.md
+2022/07/20 | 88543 | macros/latex/contrib/wrapstuff/wrapstuff.dtx
+2022/07/20 | 422157 | macros/latex/contrib/wrapstuff/wrapstuff.pdf
+2022/07/20 | 424500 | macros/latex/contrib/wrapstuff.zip
2013/08/27 | 1511 | macros/latex/contrib/wsemclassic/LICENSE
2013/08/27 | 2275 | macros/latex/contrib/wsemclassic/Makefile
2013/08/27 | 2394 | macros/latex/contrib/wsemclassic/README
@@ -236111,14 +236131,14 @@
2022/06/08 | 454511 | macros/latex/required/amsmath/testmath.pdf
2022/06/08 | 82371 | macros/latex/required/amsmath/testmath.tex
2022/06/08 | 2762704 | macros/latex/required/amsmath.zip
-2022/06/26 | 750004 | macros/latex/required/babel/base/babel.dtx
-2022/06/26 | 7799 | macros/latex/required/babel/base/babel.ins
-2022/06/26 | 885137 | macros/latex/required/babel/base/babel.pdf
-2022/06/26 | 21890 | macros/latex/required/babel/base/bbcompat.dtx
-2022/06/26 | 3526 | macros/latex/required/babel/base/bbidxglo.dtx
-2022/06/26 | 837636 | macros/latex/required/babel/base/locale.zip
-2022/06/26 | 2478 | macros/latex/required/babel/base/README.md
-2022/06/26 | 1921487 | macros/latex/required/babel/base.zip
+2022/07/20 | 748494 | macros/latex/required/babel/base/babel.dtx
+2022/07/20 | 7799 | macros/latex/required/babel/base/babel.ins
+2022/07/20 | 883440 | macros/latex/required/babel/base/babel.pdf
+2022/07/20 | 21890 | macros/latex/required/babel/base/bbcompat.dtx
+2022/07/20 | 3526 | macros/latex/required/babel/base/bbidxglo.dtx
+2022/07/20 | 838780 | macros/latex/required/babel/base/locale.zip
+2022/07/20 | 2141 | macros/latex/required/babel/base/README.md
+2022/07/20 | 1920315 | macros/latex/required/babel/base.zip
2022/06/16 | 5612 | macros/latex/required/cyrillic/changes.txt
2022/06/16 | 57710 | macros/latex/required/cyrillic/cyinpenc.dtx
2022/06/16 | 215413 | macros/latex/required/cyrillic/cyinpenc.pdf
@@ -262322,6 +262342,16 @@
2016/11/08 | 12644 | obsolete/language/japanese/jfontmaps/tools/mkmap.lua
2016/11/08 | 1553 | obsolete/language/japanese/jfontmaps/tools/release.sh
2016/11/08 | 563470 | obsolete/language/japanese/jfontmaps.zip
+1995/08/05 | 7067 | obsolete/language/japanese/jtex/00NEWS
+1995/07/26 | 1558 | obsolete/language/japanese/jtex/00README
+1995/06/21 | 1825 | obsolete/language/japanese/jtex/jlatex2e-add1.tar.gz
+1995/06/21 | 51373 | obsolete/language/japanese/jtex/jlatex2e.tar.gz
+1995/06/21 | 2627 | obsolete/language/japanese/jtex/jlib-add1.tar.gz
+1995/06/21 | 150730 | obsolete/language/japanese/jtex/jlib.tar.gz
+1995/06/18 | 1751 | obsolete/language/japanese/jtex/README
+1995/07/26 | 1091 | obsolete/language/japanese/jtex/web2c-6.1j-add1.tar.gz
+1995/08/05 | 19100 | obsolete/language/japanese/jtex/web2c-6.1j-add2.tar.gz
+1995/08/05 | 259455 | obsolete/language/japanese/jtex/web2c-6.1j.tar.gz
1998/05/11 | 462865 | obsolete/language/malayalam/Malayalam-TeX-1.6.zip
2001/04/01 | 17982 | obsolete/language/manju/manjutex/COPYING
2001/04/01 | 32916 | obsolete/language/manju/manjutex/doc/manjutex.dvi
@@ -282399,7 +282429,7 @@
2022/01/22 | 1272 | systems/texlive/tlnet/archive/collection-bibtexextra.r61687.tar.xz
2022/01/29 | 960 | systems/texlive/tlnet/archive/collection-binextra.r61780.tar.xz
2020/03/04 | 596 | systems/texlive/tlnet/archive/collection-context.r54074.tar.xz
-2022/05/25 | 1964 | systems/texlive/tlnet/archive/collection-fontsextra.r63394.tar.xz
+2022/07/20 | 1964 | systems/texlive/tlnet/archive/collection-fontsextra.r63936.tar.xz
2020/03/04 | 560 | systems/texlive/tlnet/archive/collection-fontsrecommended.r54074.tar.xz
2021/12/03 | 536 | systems/texlive/tlnet/archive/collection-fontutils.r61207.tar.xz
2022/02/27 | 584 | systems/texlive/tlnet/archive/collection-formatsextra.r62226.tar.xz
@@ -284467,15 +284497,15 @@
2021/03/03 | 893672 | systems/texlive/tlnet/archive/fewerfloatpages.doc.r58058.tar.xz
2021/03/03 | 2660 | systems/texlive/tlnet/archive/fewerfloatpages.r58058.tar.xz
2021/03/03 | 16108 | systems/texlive/tlnet/archive/fewerfloatpages.source.r58058.tar.xz
-2020/07/08 | 516512 | systems/texlive/tlnet/archive/feyn.doc.r55777.tar.xz
+2022/07/20 | 522192 | systems/texlive/tlnet/archive/feyn.doc.r63935.tar.xz
2019/02/28 | 466364 | systems/texlive/tlnet/archive/feynmf.doc.r17259.tar.xz
2019/02/28 | 19484 | systems/texlive/tlnet/archive/feynmf.r17259.tar.xz
2019/02/28 | 64056 | systems/texlive/tlnet/archive/feynmf.source.r17259.tar.xz
2019/02/28 | 375268 | systems/texlive/tlnet/archive/feynmp-auto.doc.r30223.tar.xz
2019/02/28 | 1912 | systems/texlive/tlnet/archive/feynmp-auto.r30223.tar.xz
2019/02/28 | 4768 | systems/texlive/tlnet/archive/feynmp-auto.source.r30223.tar.xz
-2020/07/08 | 13492 | systems/texlive/tlnet/archive/feyn.r55777.tar.xz
-2020/07/08 | 16212 | systems/texlive/tlnet/archive/feyn.source.r55777.tar.xz
+2022/07/20 | 13512 | systems/texlive/tlnet/archive/feyn.r63935.tar.xz
+2022/07/20 | 16212 | systems/texlive/tlnet/archive/feyn.source.r63935.tar.xz
2022/01/24 | 190180 | systems/texlive/tlnet/archive/ffcode.doc.r61719.tar.xz
2022/01/24 | 1924 | systems/texlive/tlnet/archive/ffcode.r61719.tar.xz
2019/02/28 | 381912 | systems/texlive/tlnet/archive/ffslides.doc.r38895.tar.xz
@@ -284585,9 +284615,9 @@
2019/08/06 | 202740 | systems/texlive/tlnet/archive/fixcmex.doc.r51825.tar.xz
2019/08/06 | 1400 | systems/texlive/tlnet/archive/fixcmex.r51825.tar.xz
2019/08/06 | 2868 | systems/texlive/tlnet/archive/fixcmex.source.r51825.tar.xz
-2022/07/15 | 321516 | systems/texlive/tlnet/archive/fixdif.doc.r63892.tar.xz
-2022/07/15 | 1816 | systems/texlive/tlnet/archive/fixdif.r63892.tar.xz
-2022/07/15 | 6844 | systems/texlive/tlnet/archive/fixdif.source.r63892.tar.xz
+2022/07/20 | 321848 | systems/texlive/tlnet/archive/fixdif.doc.r63938.tar.xz
+2022/07/20 | 1796 | systems/texlive/tlnet/archive/fixdif.r63938.tar.xz
+2022/07/20 | 6864 | systems/texlive/tlnet/archive/fixdif.source.r63938.tar.xz
2019/02/28 | 50024 | systems/texlive/tlnet/archive/fixfoot.doc.r17131.tar.xz
2019/02/28 | 3280 | systems/texlive/tlnet/archive/fixfoot.r17131.tar.xz
2019/02/28 | 286260 | systems/texlive/tlnet/archive/fixjfm.doc.r47113.tar.xz
@@ -286036,8 +286066,8 @@
2019/02/28 | 340 | systems/texlive/tlnet/archive/jfmutil.x86_64-solaris.r44835.tar.xz
2022/04/06 | 151932 | systems/texlive/tlnet/archive/jieeetran.doc.r62958.tar.xz
2022/04/06 | 17652 | systems/texlive/tlnet/archive/jieeetran.r62958.tar.xz
-2022/06/21 | 164884 | systems/texlive/tlnet/archive/jigsaw.doc.r63662.tar.xz
-2022/06/21 | 1528 | systems/texlive/tlnet/archive/jigsaw.r63662.tar.xz
+2022/07/20 | 173688 | systems/texlive/tlnet/archive/jigsaw.doc.r63937.tar.xz
+2022/07/20 | 1532 | systems/texlive/tlnet/archive/jigsaw.r63937.tar.xz
2019/02/28 | 128124 | systems/texlive/tlnet/archive/jkmath.doc.r47109.tar.xz
2019/02/28 | 1636 | systems/texlive/tlnet/archive/jkmath.r47109.tar.xz
2019/02/28 | 3252 | systems/texlive/tlnet/archive/jknapltx.doc.r19440.tar.xz
@@ -290475,8 +290505,8 @@
2019/02/28 | 3888 | systems/texlive/tlnet/archive/rulercompass.r32392.tar.xz
2019/02/28 | 6072 | systems/texlive/tlnet/archive/rulercompass.source.r32392.tar.xz
2020/03/13 | 6620 | systems/texlive/tlnet/archive/ruler.r54251.tar.xz
-2022/05/15 | 54836 | systems/texlive/tlnet/archive/runcode.doc.r63301.tar.xz
-2022/05/15 | 3916 | systems/texlive/tlnet/archive/runcode.r63301.tar.xz
+2022/07/20 | 56552 | systems/texlive/tlnet/archive/runcode.doc.r63939.tar.xz
+2022/07/20 | 4000 | systems/texlive/tlnet/archive/runcode.r63939.tar.xz
2019/02/28 | 3584 | systems/texlive/tlnet/archive/r_und_s.doc.r15878.tar.xz
2019/02/28 | 15440 | systems/texlive/tlnet/archive/r_und_s.r15878.tar.xz
2019/02/28 | 297660 | systems/texlive/tlnet/archive/russ.doc.r25209.tar.xz
@@ -290772,9 +290802,9 @@
2022/06/14 | 2912 | systems/texlive/tlnet/archive/showhyphenation.r63578.tar.xz
2022/06/24 | 45620 | systems/texlive/tlnet/archive/showkerning.doc.r63708.tar.xz
2022/06/24 | 2660 | systems/texlive/tlnet/archive/showkerning.r63708.tar.xz
-2021/10/28 | 231580 | systems/texlive/tlnet/archive/showlabels.doc.r60877.tar.xz
-2021/10/28 | 3212 | systems/texlive/tlnet/archive/showlabels.r60877.tar.xz
-2021/10/28 | 15948 | systems/texlive/tlnet/archive/showlabels.source.r60877.tar.xz
+2022/07/20 | 232956 | systems/texlive/tlnet/archive/showlabels.doc.r63940.tar.xz
+2022/07/20 | 3236 | systems/texlive/tlnet/archive/showlabels.r63940.tar.xz
+2022/07/20 | 16256 | systems/texlive/tlnet/archive/showlabels.source.r63940.tar.xz
2019/02/28 | 211912 | systems/texlive/tlnet/archive/showtags.doc.r20336.tar.xz
2019/02/28 | 2052 | systems/texlive/tlnet/archive/showtags.r20336.tar.xz
2022/03/05 | 2123460 | systems/texlive/tlnet/archive/shtthesis.doc.r62441.tar.xz
@@ -291732,7 +291762,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/07/19 | 418864 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63925.tar.xz
+2022/07/20 | 418788 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63934.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
@@ -291756,7 +291786,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/07/19 | 113496 | systems/texlive/tlnet/archive/texlive-scripts.r63925.tar.xz
+2022/07/20 | 113544 | systems/texlive/tlnet/archive/texlive-scripts.r63934.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
@@ -292246,8 +292276,8 @@
2021/01/22 | 8444 | systems/texlive/tlnet/archive/tkz-berge.r57485.tar.xz
2022/07/16 | 40180 | systems/texlive/tlnet/archive/tkz-doc.doc.r63902.tar.xz
2022/07/16 | 536 | systems/texlive/tlnet/archive/tkz-doc.r63902.tar.xz
-2022/07/16 | 1157328 | systems/texlive/tlnet/archive/tkz-euclide.doc.r63907.tar.xz
-2022/07/16 | 39604 | systems/texlive/tlnet/archive/tkz-euclide.r63907.tar.xz
+2022/07/20 | 1157656 | systems/texlive/tlnet/archive/tkz-euclide.doc.r63941.tar.xz
+2022/07/20 | 39620 | systems/texlive/tlnet/archive/tkz-euclide.r63941.tar.xz
2022/07/16 | 96832 | systems/texlive/tlnet/archive/tkzexample.doc.r63908.tar.xz
2022/07/16 | 3872 | systems/texlive/tlnet/archive/tkzexample.r63908.tar.xz
2022/02/09 | 749696 | systems/texlive/tlnet/archive/tkz-fct.doc.r61949.tar.xz
@@ -293474,6 +293504,8 @@
2022/06/21 | 897156 | systems/texlive/tlnet/archive/yet-another-guide-latex2e.doc.r63663.tar.xz
2022/06/21 | 572 | systems/texlive/tlnet/archive/yet-another-guide-latex2e.r63663.tar.xz
2019/04/06 | 192824 | systems/texlive/tlnet/archive/yfonts.doc.r50755.tar.xz
+2022/07/20 | 146036 | systems/texlive/tlnet/archive/yfonts-otf.doc.r63936.tar.xz
+2022/07/20 | 52024 | systems/texlive/tlnet/archive/yfonts-otf.r63936.tar.xz
2019/04/06 | 1820 | systems/texlive/tlnet/archive/yfonts.r50755.tar.xz
2019/04/06 | 7968 | systems/texlive/tlnet/archive/yfonts.source.r50755.tar.xz
2019/02/28 | 952 | systems/texlive/tlnet/archive/yfonts-t1.doc.r36013.tar.xz
@@ -293571,16 +293603,16 @@
2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
2022/07/17 | 124404 | systems/texlive/tlnet/install-tl
-2022/07/19 | 5804914 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/07/19 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/07/19 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/07/20 | 5804718 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/07/20 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/07/20 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat
-2022/07/19 | 20459353 | systems/texlive/tlnet/install-tl-windows.exe
-2022/07/19 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/07/19 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/07/19 | 25489326 | systems/texlive/tlnet/install-tl.zip
-2022/07/19 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/07/19 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/07/20 | 20463125 | systems/texlive/tlnet/install-tl-windows.exe
+2022/07/20 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/07/20 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/07/20 | 25489317 | systems/texlive/tlnet/install-tl.zip
+2022/07/20 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/07/20 | 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
@@ -293590,7 +293622,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/07/18 | 7436 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2022/07/19 | 7390 | 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
@@ -293632,12 +293664,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/07/19 | 17557620 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/07/19 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/07/20 | 17559148 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/07/20 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2022/04/18 | 86658 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2022/07/19 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/07/19 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/07/19 | 2392680 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/07/20 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/07/20 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/07/20 | 2392992 | 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
@@ -298897,7 +298929,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/07/19 | 659658 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/07/20 | 659658 | 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
@@ -300559,9 +300591,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2022/07/16 | 39688 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2022/07/16 | 43614 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/07/19 | 286514 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/07/19 | 1474308 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/07/19 | 1358454 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/07/20 | 286473 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/07/20 | 1474474 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/07/20 | 1358362 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2022/07/16 | 13509 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2022/07/16 | 14427 | 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
@@ -300802,191 +300834,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/07/19 | 659836 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/07/19 | 51828 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2022/07/19 | 57284 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/07/19 | 1023424 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2022/07/19 | 1161246 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/07/19 | 28930 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2022/07/19 | 31572 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/07/19 | 30158 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2022/07/19 | 35251 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/07/19 | 56965 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2022/07/19 | 65178 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/07/19 | 83218 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2022/07/19 | 95603 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/07/19 | 69370 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2022/07/19 | 77247 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/07/19 | 27387 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2022/07/19 | 31532 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/07/19 | 332482 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2022/07/19 | 394070 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/07/19 | 32775 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2022/07/19 | 37020 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2022/07/19 | 51464 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2022/07/19 | 57515 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/07/19 | 244718 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2022/07/19 | 270788 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/07/19 | 179834 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2022/07/19 | 196154 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2022/07/19 | 92904 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2022/07/19 | 103265 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/07/19 | 21338 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2022/07/19 | 24140 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/07/19 | 481220 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/07/19 | 46418 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2022/07/19 | 51990 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/07/19 | 285844 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2022/07/19 | 326016 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/07/19 | 41460 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2022/07/19 | 45803 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/07/19 | 120682 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2022/07/19 | 135401 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/07/19 | 1297232 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2022/07/19 | 1455265 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/07/19 | 99487 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2022/07/19 | 112994 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/07/19 | 43672 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2022/07/19 | 48841 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2022/07/19 | 25261 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2022/07/19 | 28502 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/07/19 | 56906 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2022/07/19 | 63161 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/07/19 | 136104 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2022/07/19 | 155472 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/07/19 | 74110 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2022/07/19 | 79106 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2022/07/19 | 72152 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2022/07/19 | 81351 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/07/19 | 259332 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2022/07/19 | 295871 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/07/19 | 22153 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2022/07/19 | 25104 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/07/19 | 97422 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2022/07/19 | 113026 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/07/19 | 64629 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2022/07/19 | 73217 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/07/19 | 96970 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2022/07/19 | 115404 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/07/19 | 38692 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2022/07/19 | 43700 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/07/19 | 483447 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2022/07/19 | 564871 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/07/19 | 204191 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
-2022/07/19 | 247273 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/07/19 | 152543 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2022/07/19 | 169636 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/07/19 | 95498 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2022/07/19 | 109688 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/07/19 | 16462 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2022/07/19 | 18390 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/07/19 | 28508 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2022/07/19 | 30555 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/07/19 | 631396 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2022/07/19 | 681996 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/07/19 | 532440 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2022/07/19 | 599118 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/07/19 | 478114 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2022/07/19 | 527081 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/07/19 | 94100 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2022/07/19 | 103624 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/07/19 | 1740658 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2022/07/19 | 2027161 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/07/19 | 67993 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2022/07/19 | 74072 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/07/19 | 27744 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2022/07/19 | 32080 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/07/19 | 7754 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2022/07/19 | 8819 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2022/07/19 | 190509 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2022/07/19 | 209176 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/07/19 | 251193 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2022/07/19 | 286692 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/07/19 | 99343 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2022/07/19 | 104730 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/07/19 | 126875 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2022/07/19 | 140069 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/07/19 | 287375 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2022/07/19 | 325592 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/07/19 | 199825 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2022/07/19 | 181608 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/07/19 | 49728 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2022/07/19 | 55267 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2022/07/19 | 31441 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2022/07/19 | 35212 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2022/07/19 | 38311 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2022/07/19 | 43617 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/07/19 | 43507 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2022/07/19 | 48034 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/07/19 | 45809 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2022/07/19 | 52366 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/07/19 | 197328 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2022/07/19 | 213318 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/07/19 | 36408 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2022/07/19 | 41137 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/07/19 | 748816 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2022/07/19 | 824815 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/07/19 | 200458 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2022/07/19 | 203527 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/07/19 | 210189 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2022/07/19 | 245183 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/07/19 | 79452 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2022/07/19 | 88390 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/07/19 | 1180314 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2022/07/19 | 1322192 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/07/19 | 20186 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2022/07/19 | 23976 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/07/19 | 31581 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2022/07/19 | 37545 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/07/19 | 64869 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2022/07/19 | 72970 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/07/19 | 50554 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2022/07/19 | 58741 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/07/19 | 692213 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
-2022/07/19 | 763861 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/07/19 | 1354844 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2022/07/19 | 1503355 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2022/07/19 | 42744 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2022/07/19 | 52579 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/07/19 | 57416 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2022/07/19 | 63795 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/07/19 | 25502 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2022/07/19 | 27629 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/07/19 | 16517 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2022/07/19 | 18492 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/07/19 | 64181 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2022/07/19 | 70948 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/07/19 | 157153 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2022/07/19 | 173123 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2022/07/19 | 58254 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2022/07/19 | 68210 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2022/07/19 | 100584 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2022/07/19 | 107322 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2022/07/19 | 2695590 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2022/07/19 | 2823041 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/07/19 | 55560 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2022/07/19 | 62337 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2022/07/19 | 37038 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2022/07/19 | 41199 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/07/19 | 28715 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2022/07/19 | 33837 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2022/07/19 | 68060 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2022/07/19 | 73610 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/07/19 | 316695 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2022/07/19 | 352130 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/07/19 | 55745 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2022/07/19 | 57455 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/07/19 | 591164 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2022/07/19 | 630005 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/07/19 | 39638 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2022/07/19 | 43673 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/07/19 | 286481 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/07/19 | 1474555 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/07/19 | 1358257 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/07/19 | 13518 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2022/07/19 | 14435 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/07/20 | 659836 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/07/20 | 51828 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2022/07/20 | 57283 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/07/20 | 1023425 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2022/07/20 | 1161245 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/07/20 | 28929 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2022/07/20 | 31572 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/07/20 | 30157 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2022/07/20 | 35251 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/07/20 | 56964 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2022/07/20 | 65178 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/07/20 | 83218 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2022/07/20 | 95605 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/07/20 | 69367 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2022/07/20 | 77247 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/07/20 | 27386 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2022/07/20 | 31532 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/07/20 | 332480 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2022/07/20 | 394070 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/07/20 | 32776 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2022/07/20 | 37020 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/07/20 | 51462 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2022/07/20 | 57515 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/07/20 | 244719 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2022/07/20 | 270790 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/07/20 | 179833 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2022/07/20 | 196154 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/07/20 | 92902 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2022/07/20 | 103261 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/07/20 | 21337 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2022/07/20 | 24140 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/07/20 | 481220 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/07/20 | 46419 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2022/07/20 | 51990 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/07/20 | 285843 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2022/07/20 | 326014 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/07/20 | 41460 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2022/07/20 | 45804 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/07/20 | 120683 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2022/07/20 | 135401 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/07/20 | 1297230 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2022/07/20 | 1455266 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/07/20 | 99486 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2022/07/20 | 112994 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/07/20 | 43671 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2022/07/20 | 48840 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/07/20 | 25261 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2022/07/20 | 28501 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/07/20 | 56905 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2022/07/20 | 63161 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/07/20 | 136103 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2022/07/20 | 155471 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/07/20 | 74110 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2022/07/20 | 79106 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/07/20 | 72151 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2022/07/20 | 81350 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/07/20 | 259332 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2022/07/20 | 295868 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/07/20 | 22153 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2022/07/20 | 25104 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/07/20 | 97421 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2022/07/20 | 113027 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/07/20 | 64628 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2022/07/20 | 73216 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/07/20 | 96970 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2022/07/20 | 115404 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/07/20 | 38692 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2022/07/20 | 43699 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/07/20 | 483448 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2022/07/20 | 564871 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/07/20 | 204192 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
+2022/07/20 | 247273 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/07/20 | 152543 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2022/07/20 | 169632 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/07/20 | 95497 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2022/07/20 | 109688 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/07/20 | 16463 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2022/07/20 | 18391 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/07/20 | 28508 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2022/07/20 | 30555 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/07/20 | 631398 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2022/07/20 | 681995 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/07/20 | 532438 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2022/07/20 | 599119 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/07/20 | 478112 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2022/07/20 | 527079 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/07/20 | 94099 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2022/07/20 | 103623 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/07/20 | 1740657 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2022/07/20 | 2027162 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/07/20 | 67994 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2022/07/20 | 74072 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/07/20 | 27745 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2022/07/20 | 32080 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/07/20 | 7753 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2022/07/20 | 8818 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/07/20 | 190509 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2022/07/20 | 209177 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/07/20 | 251193 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2022/07/20 | 286694 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/07/20 | 99343 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2022/07/20 | 104730 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/07/20 | 126878 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2022/07/20 | 140069 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/07/20 | 287374 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2022/07/20 | 325593 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/07/20 | 199823 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2022/07/20 | 181606 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/07/20 | 49728 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2022/07/20 | 55268 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/07/20 | 31441 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2022/07/20 | 35213 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/07/20 | 38311 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2022/07/20 | 43616 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/07/20 | 43507 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2022/07/20 | 48033 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/07/20 | 45809 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2022/07/20 | 52365 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/07/20 | 197327 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2022/07/20 | 213318 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/07/20 | 36408 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2022/07/20 | 41137 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/07/20 | 748817 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2022/07/20 | 824814 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/07/20 | 200460 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2022/07/20 | 203528 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/07/20 | 210192 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2022/07/20 | 245183 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/07/20 | 79450 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2022/07/20 | 88390 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/07/20 | 1180314 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2022/07/20 | 1322193 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/07/20 | 20186 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2022/07/20 | 23977 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/07/20 | 31580 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2022/07/20 | 37543 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/07/20 | 64868 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2022/07/20 | 72970 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/07/20 | 50554 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2022/07/20 | 58742 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/07/20 | 692213 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
+2022/07/20 | 763862 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/07/20 | 1354845 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2022/07/20 | 1503355 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/07/20 | 42743 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2022/07/20 | 52579 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/07/20 | 57416 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2022/07/20 | 63796 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/07/20 | 25502 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2022/07/20 | 27628 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/07/20 | 16516 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2022/07/20 | 18493 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/07/20 | 64178 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2022/07/20 | 70948 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/07/20 | 157153 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2022/07/20 | 173123 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/07/20 | 58253 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2022/07/20 | 68211 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/07/20 | 100585 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2022/07/20 | 107321 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/07/20 | 2695587 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2022/07/20 | 2823041 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/07/20 | 55559 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2022/07/20 | 62335 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/07/20 | 37039 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2022/07/20 | 41200 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/07/20 | 28716 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2022/07/20 | 33837 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/07/20 | 68061 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2022/07/20 | 73609 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/07/20 | 316696 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2022/07/20 | 352131 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/07/20 | 55744 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2022/07/20 | 57454 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/07/20 | 591160 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2022/07/20 | 630006 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/07/20 | 39637 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2022/07/20 | 43671 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/07/20 | 286537 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/07/20 | 1474289 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/07/20 | 1359449 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/07/20 | 13517 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2022/07/20 | 14435 | 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/07/19 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/07/20 | 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
@@ -301473,7 +301505,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/07/19 | 1138 | systems/win32/miktex/tm/packages/pr.ini
+2022/07/20 | 1138 | 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
@@ -303386,7 +303418,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2022/07/20 | 186 | timestamp
+2022/07/21 | 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 b1b767aa09..e2e1cae143 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index 709a2abd24..fb108b6501 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,341 +1,478 @@
-2022/07/19 | 99487 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2022/07/19 | 99343 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2022/07/19 | 97422 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2022/07/19 | 96970 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2022/07/19 | 95603 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/07/19 | 95498 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2022/07/19 | 94100 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2022/07/20 | 99486 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2022/07/20 | 99343 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2022/07/20 | 98070 | macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf
+2022/07/20 | 98061 | macros/latex/contrib/hvfloat/doc/examples/capPos.pdf
+2022/07/20 | 97421 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2022/07/20 | 96970 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2022/07/20 | 95605 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/07/20 | 95497 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2022/07/20 | 94099 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2022/07/20 | 92902 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2022/07/20 | 90436 | macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf
+2022/07/20 | 90257 | macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf
+2022/07/20 | 89620 | macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.pdf
+2022/07/20 | 89151 | macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf
+2022/07/20 | 88543 | macros/latex/contrib/wrapstuff/wrapstuff.dtx
+2022/07/20 | 88390 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/07/20 | 883440 | macros/latex/required/babel/base/babel.pdf
+2022/07/20 | 8818 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/07/20 | 87873 | macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf
+2022/07/20 | 87776 | macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf
+2022/07/20 | 87165 | macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.pdf
+2022/07/20 | 87061 | macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.pdf
+2022/07/20 | 87033 | macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf
+2022/07/20 | 86559 | macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf
+2022/07/20 | 86549 | macros/latex/contrib/hvfloat/doc/examples/fullpage1s1c.pdf
+2022/07/20 | 86322 | macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf
+2022/07/20 | 86224 | macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf
+2022/07/20 | 86195 | macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf
+2022/07/20 | 85685 | graphics/pgf/contrib/bodeplot/bodeplot.dtx
+2022/07/20 | 85642 | macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf
+2022/07/20 | 85418 | macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf
+2022/07/20 | 85385 | macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf
+2022/07/20 | 85326 | macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf
+2022/07/20 | 84895 | macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf
+2022/07/20 | 84587 | macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf
+2022/07/20 | 84135 | macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf
+2022/07/20 | 84006 | macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf
+2022/07/20 | 83924 | macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf
+2022/07/20 | 838780 | macros/latex/required/babel/base/locale.zip
+2022/07/20 | 83734 | macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf
+2022/07/20 | 83699 | macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf
+2022/07/20 | 83218 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2022/07/20 | 83180 | macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf
+2022/07/20 | 824814 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/07/20 | 81685 | macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf
+2022/07/20 | 81371 | macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf
+2022/07/20 | 81350 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/07/20 | 81195 | macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf
+2022/07/20 | 79855 | macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf
+2022/07/20 | 79681 | macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf
+2022/07/20 | 79450 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2022/07/20 | 79106 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/07/20 | 78955 | macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf
+2022/07/20 | 78954 | macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf
+2022/07/20 | 78903 | macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf
+2022/07/20 | 7799 | macros/latex/required/babel/base/babel.ins
+2022/07/20 | 776733 | graphics/pgf/contrib/bodeplot.zip
+2022/07/20 | 7753 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2022/07/20 | 77375 | macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf
+2022/07/20 | 77247 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/07/20 | 77202 | macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf
+2022/07/20 | 763862 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/07/20 | 748817 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2022/07/20 | 748494 | macros/latex/required/babel/base/babel.dtx
+2022/07/20 | 74110 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2022/07/20 | 74072 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/07/20 | 73609 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/07/20 | 73216 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/07/20 | 72970 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/07/20 | 72151 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2022/07/20 | 721265 | graphics/pgf/contrib/tikzfill/tikzfill.pdf
+2022/07/20 | 70948 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/07/20 | 7057 | fonts/feyn/feyn.html
+2022/07/20 | 69916 | macros/latex/contrib/hvfloat/latex/hvfloat.sty
+2022/07/20 | 69367 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2022/07/20 | 692213 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
+2022/07/20 | 6864 | systems/texlive/tlnet/archive/fixdif.source.r63938.tar.xz
+2022/07/20 | 68211 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/07/20 | 681995 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/07/20 | 68061 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2022/07/20 | 67994 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2022/07/20 | 67965 | fonts/feyn/overheads.pdf
+2022/07/20 | 675 | fonts/feyn/overheads.tex
+2022/07/20 | 6729 | fonts/feyn/style.css
+2022/07/20 | 659836 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/07/20 | 659658 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/07/20 | 6563 | graphics/pgf/contrib/tikzfill/tikzlibraryfill.rhombus.code.tex
+2022/07/20 | 65178 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/07/20 | 64868 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2022/07/20 | 64628 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2022/07/20 | 64178 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2022/07/20 | 63796 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/07/20 | 637842 | graphics/pgf/contrib/tikzfill.zip
+2022/07/20 | 637204 | install/graphics/pgf/contrib/tikzfill.tds.zip
+2022/07/20 | 63161 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/07/20 | 631398 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2022/07/20 | 630006 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/07/20 | 62335 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/07/20 | 616570 | macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf
+2022/07/20 | 606752 | fonts/feyn.zip
+2022/07/20 | 599119 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/07/20 | 5939 | fonts/feyn/exercise-font.tex
+2022/07/20 | 591160 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2022/07/20 | 58742 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/07/20 | 58253 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2022/07/20 | 5804718 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/07/20 | 57515 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/07/20 | 57454 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/07/20 | 57416 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2022/07/20 | 57404 | fonts/feyn/feyn.dtx
+2022/07/20 | 57283 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/07/20 | 56964 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2022/07/20 | 56905 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2022/07/20 | 56552 | systems/texlive/tlnet/archive/runcode.doc.r63939.tar.xz
+2022/07/20 | 564871 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/07/20 | 55744 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2022/07/20 | 55559 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2022/07/20 | 55268 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/07/20 | 53 | fonts/greek/gfs/gfsneohellenic/VERSION
+2022/07/20 | 532438 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2022/07/20 | 527079 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/07/20 | 52579 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/07/20 | 52365 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/07/20 | 522192 | systems/texlive/tlnet/archive/feyn.doc.r63935.tar.xz
+2022/07/20 | 52024 | systems/texlive/tlnet/archive/yfonts-otf.r63936.tar.xz
+2022/07/20 | 51990 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/07/20 | 51828 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2022/07/20 | 51462 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2022/07/20 | 50554 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2022/07/20 | 5037834 | macros/latex/contrib/hvfloat/doc/hvfloat.pdf
+2022/07/20 | 49728 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2022/07/20 | 4935 | fonts/feyn/sample-two-loop-annotated.png
+2022/07/20 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/07/20 | 48840 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/07/20 | 4857 | fonts/feyn/release-notes.html
+2022/07/20 | 483448 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2022/07/20 | 481220 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/07/20 | 48033 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/07/20 | 478112 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2022/07/20 | 4680 | graphics/pgf/contrib/tikzfill/tikzfill-doc.sty
+2022/07/20 | 46419 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2022/07/20 | 45809 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2022/07/20 | 45804 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/07/20 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/07/20 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/07/20 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/07/20 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/07/20 | 4422 | fonts/feyn/feynmac.mf
+2022/07/20 | 43699 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/07/20 | 43671 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/07/20 | 43671 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2022/07/20 | 43616 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/07/20 | 43507 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2022/07/20 | 42743 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2022/07/20 | 424500 | macros/latex/contrib/wrapstuff.zip
+2022/07/20 | 422157 | macros/latex/contrib/wrapstuff/wrapstuff.pdf
+2022/07/20 | 42108 | graphics/pgf/contrib/tikzfill/tikzfill.tex
+2022/07/20 | 4199 | macros/latex/contrib/hvfloat/Changes
+2022/07/20 | 418788 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63934.tar.xz
+2022/07/20 | 41460 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2022/07/20 | 41200 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/07/20 | 41137 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/07/20 | 402 | graphics/pgf/contrib/tikzfill/CHANGES.md
+2022/07/20 | 4000 | systems/texlive/tlnet/archive/runcode.r63939.tar.xz
+2022/07/20 | 3981 | fonts/feyn/sample-phi4.png
+2022/07/20 | 39637 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2022/07/20 | 39620 | systems/texlive/tlnet/archive/tkz-euclide.r63941.tar.xz
+2022/07/20 | 394070 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/07/20 | 3928 | fonts/feyn/sample-two-loop.png
+2022/07/20 | 3920 | fonts/feyn/sample-massive.png
+2022/07/20 | 38692 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2022/07/20 | 38311 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2022/07/20 | 37543 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/07/20 | 37039 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2022/07/20 | 37020 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/07/20 | 36408 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2022/07/20 | 3629 | graphics/pgf/contrib/bodeplot/README.md
+2022/07/20 | 3526 | macros/latex/required/babel/base/bbidxglo.dtx
+2022/07/20 | 35251 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/07/20 | 35213 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/07/20 | 352131 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/07/20 | 33837 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/07/20 | 332480 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2022/07/20 | 3319 | fonts/feyn/sample-vertex.png
+2022/07/20 | 32776 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2022/07/20 | 326102 | fonts/feyn/feyn.pdf
+2022/07/20 | 326014 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/07/20 | 325593 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/07/20 | 3236 | systems/texlive/tlnet/archive/showlabels.r63940.tar.xz
+2022/07/20 | 321848 | systems/texlive/tlnet/archive/fixdif.doc.r63938.tar.xz
+2022/07/20 | 32080 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/07/20 | 316696 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2022/07/20 | 31580 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2022/07/20 | 31572 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/07/20 | 31532 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/07/20 | 31441 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2022/07/20 | 30555 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/07/20 | 30157 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2022/07/20 | 3013535 | install/macros/latex/required/babel-base.tds.zip
+2022/07/20 | 295868 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/07/20 | 28929 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2022/07/20 | 287374 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2022/07/20 | 28716 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2022/07/20 | 286694 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/07/20 | 286537 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/07/20 | 286473 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/07/20 | 285843 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2022/07/20 | 28508 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2022/07/20 | 28501 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/07/20 | 2823041 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/07/20 | 27745 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2022/07/20 | 27628 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/07/20 | 27386 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2022/07/20 | 270790 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/07/20 | 2695587 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2022/07/20 | 259332 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2022/07/20 | 25502 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2022/07/20 | 25489317 | systems/texlive/tlnet/install-tl.zip
+2022/07/20 | 25261 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2022/07/20 | 251193 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2022/07/20 | 25104 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/07/20 | 247273 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/07/20 | 2462 | macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.tex
+2022/07/20 | 245183 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/07/20 | 2450 | graphics/pgf/contrib/tikzfill/README.md
+2022/07/20 | 244719 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2022/07/20 | 24140 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/07/20 | 2399 | fonts/feyn/README
+2022/07/20 | 23977 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/07/20 | 2392992 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/07/20 | 23442 | fonts/feyn/feyn.mf
+2022/07/20 | 232956 | systems/texlive/tlnet/archive/showlabels.doc.r63940.tar.xz
+2022/07/20 | 231 | fonts/feyn/feyn.ins
+2022/07/20 | 2317480 | macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf
+2022/07/20 | 22153 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2022/07/20 | 21890 | macros/latex/required/babel/base/bbcompat.dtx
+2022/07/20 | 2141 | macros/latex/required/babel/base/README.md
+2022/07/20 | 21337 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2022/07/20 | 213318 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/07/20 | 210192 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2022/07/20 | 209177 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/07/20 | 20463125 | systems/texlive/tlnet/install-tl-windows.exe
+2022/07/20 | 204192 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
+2022/07/20 | 203528 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/07/20 | 2027162 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/07/20 | 20186 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2022/07/20 | 200460 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2022/07/20 | 199823 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2022/07/20 | 197327 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2022/07/20 | 1964 | systems/texlive/tlnet/archive/collection-fontsextra.r63936.tar.xz
+2022/07/20 | 196154 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/07/20 | 1920315 | macros/latex/required/babel/base.zip
+2022/07/20 | 190509 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2022/07/20 | 1891 | graphics/pgf/contrib/tikzfill/tikzfill-common.sty
+2022/07/20 | 18493 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/07/20 | 18391 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/07/20 | 181606 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/07/20 | 17989295 | macros/latex/contrib/hvfloat.zip
+2022/07/20 | 179833 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2022/07/20 | 1796 | systems/texlive/tlnet/archive/fixdif.r63938.tar.xz
+2022/07/20 | 1759143 | macros/latex/contrib/hvfloat/doc/examples/doublefullpage2s2c.pdf
+2022/07/20 | 17559148 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/07/20 | 1740657 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2022/07/20 | 173688 | systems/texlive/tlnet/archive/jigsaw.doc.r63937.tar.xz
+2022/07/20 | 173604 | macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf
+2022/07/20 | 173123 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/07/20 | 1703 | macros/latex/contrib/wrapstuff/README.md
+2022/07/20 | 169632 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/07/20 | 16516 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2022/07/20 | 16463 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2022/07/20 | 16256 | systems/texlive/tlnet/archive/showlabels.source.r63940.tar.xz
+2022/07/20 | 16212 | systems/texlive/tlnet/archive/feyn.source.r63935.tar.xz
+2022/07/20 | 161626 | fonts/feyn/exercise-font.pdf
+2022/07/20 | 1615381 | macros/latex/contrib/hvfloat/doc/examples/paper-twocolcaption-after2s2c.pdf
+2022/07/20 | 157153 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2022/07/20 | 1562087 | fonts/greek/gfs/gfsneohellenic.zip
+2022/07/20 | 155471 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/07/20 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/07/20 | 1532 | systems/texlive/tlnet/archive/jigsaw.r63937.tar.xz
+2022/07/20 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/07/20 | 152543 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2022/07/20 | 1503355 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/07/20 | 1474474 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/07/20 | 1474289 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/07/20 | 146064 | macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf
+2022/07/20 | 146036 | systems/texlive/tlnet/archive/yfonts-otf.doc.r63936.tar.xz
+2022/07/20 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/07/20 | 145886 | macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf
+2022/07/20 | 1455266 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/07/20 | 145453 | macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf
+2022/07/20 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/07/20 | 144711 | macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf
+2022/07/20 | 144612 | macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf
+2022/07/20 | 14435 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/07/20 | 144144 | macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf
+2022/07/20 | 144030 | macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf
+2022/07/20 | 143725 | macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf
+2022/07/20 | 143688 | macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf
+2022/07/20 | 143611 | macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf
+2022/07/20 | 143328 | macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf
+2022/07/20 | 142146 | macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf
+2022/07/20 | 1416 | graphics/pgf/contrib/bodeplot/bodeplot.ins
+2022/07/20 | 1414 | fonts/feyn/feynx11.mf
+2022/07/20 | 1410 | fonts/feyn/feynx24.mf
+2022/07/20 | 1410 | fonts/feyn/feynx10.mf
+2022/07/20 | 1409 | fonts/feyn/feynx18.mf
+2022/07/20 | 1408 | fonts/feyn/feynx12.mf
+2022/07/20 | 140069 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/07/20 | 1382 | fonts/feyn/feyn11.mf
+2022/07/20 | 1379 | fonts/feyn/feyntext11.mf
+2022/07/20 | 1378 | fonts/feyn/feyn24.mf
+2022/07/20 | 1378 | fonts/feyn/feyn10.mf
+2022/07/20 | 1377 | fonts/feyn/feyn18.mf
+2022/07/20 | 1377 | fonts/feyn/feyn12.mf
+2022/07/20 | 1374 | fonts/feyn/feyntext24.mf
+2022/07/20 | 1374 | fonts/feyn/feyntext12.mf
+2022/07/20 | 1373 | fonts/feyn/feyntext18.mf
+2022/07/20 | 1373 | fonts/feyn/feyntext10.mf
+2022/07/20 | 136103 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2022/07/20 | 1359449 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/07/20 | 1358362 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/07/20 | 1354845 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2022/07/20 | 135401 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/07/20 | 13517 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2022/07/20 | 13512 | systems/texlive/tlnet/archive/feyn.r63935.tar.xz
+2022/07/20 | 1333 | fonts/feyn/LICENCE
+2022/07/20 | 1322193 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/07/20 | 1297230 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2022/07/20 | 126878 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2022/07/20 | 121819 | macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf
+2022/07/20 | 120832 | macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf
+2022/07/20 | 120683 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2022/07/20 | 120656 | macros/latex/contrib/hvfloat/doc/hvfloat.tex
+2022/07/20 | 12043 | graphics/pgf/contrib/tikzfill/tikzlibraryfill.hexagon.code.tex
+2022/07/20 | 11 | fonts/feyn/VERSION
+2022/07/20 | 1180314 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2022/07/20 | 11652 | graphics/pgf/contrib/tikzfill/tikzlibraryfill.image.code.tex
+2022/07/20 | 1161245 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/07/20 | 1157656 | systems/texlive/tlnet/archive/tkz-euclide.doc.r63941.tar.xz
+2022/07/20 | 115404 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/07/20 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/07/20 | 1138 | systems/win32/miktex/tm/packages/pr.ini
+2022/07/20 | 113544 | systems/texlive/tlnet/archive/texlive-scripts.r63934.tar.xz
+2022/07/20 | 113027 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/07/20 | 112994 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/07/20 | 1109 | graphics/pgf/contrib/tikzfill/tikzfill.sty
+2022/07/20 | 1101 | graphics/pgf/contrib/tikzfill/tikzfill.rhombus.sty
+2022/07/20 | 1101 | graphics/pgf/contrib/tikzfill/tikzfill.hexagon.sty
+2022/07/20 | 109688 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/07/20 | 1083 | graphics/pgf/contrib/tikzfill/tikzfill.image.sty
+2022/07/20 | 107321 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/07/20 | 104730 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/07/20 | 103623 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/07/20 | 103261 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/07/20 | 102871 | macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf
+2022/07/20 | 1023425 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2022/07/20 | 101319 | macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf
+2022/07/20 | 1007326 | graphics/pgf/contrib/bodeplot/bodeplot.pdf
+2022/07/20 | 100585 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2022/07/20 | 100507 | macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf
2022/07/19 | 9391 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-circles.tex
-2022/07/19 | 92904 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2022/07/19 | 88390 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/07/19 | 8819 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
2022/07/19 | 8465 | fonts/yfonts-otf/doc/yfonts-otf.ltx
-2022/07/19 | 83218 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2022/07/19 | 824815 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/07/19 | 81351 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/07/19 | 79452 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
2022/07/19 | 7934 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-main.tex
2022/07/19 | 79307 | fonts/yfonts-otf/doc/Erlkonig.pdf
-2022/07/19 | 79106 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
2022/07/19 | 787 | macros/latex/contrib/fixdif/README.md
2022/07/19 | 7808 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-eu-math.tex
2022/07/19 | 7783 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-eu-utilities.tex
-2022/07/19 | 7754 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2022/07/19 | 77247 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/07/19 | 763861 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/07/19 | 748816 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2022/07/19 | 74110 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2022/07/19 | 74072 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/07/19 | 73610 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/07/19 | 7390 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/07/19 | 7321 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-points.tex
-2022/07/19 | 73217 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/07/19 | 72970 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/07/19 | 72152 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2022/07/19 | 70948 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
2022/07/19 | 6 | macros/latex/contrib/showlabels/VERSION
-2022/07/19 | 69370 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2022/07/19 | 692213 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
-2022/07/19 | 68210 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2022/07/19 | 681996 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/07/19 | 68060 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2022/07/19 | 67993 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
2022/07/19 | 6765 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-axesmin.tex
2022/07/19 | 6729 | macros/latex/contrib/showlabels/style.css
-2022/07/19 | 659836 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/07/19 | 659658 | systems/win32/miktex/tm/packages/files.csv.lzma
2022/07/19 | 6576 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-circles-by.tex
2022/07/19 | 656908 | systems/texlive/tlnet/archive/polyglossia.doc.r63931.tar.xz
-2022/07/19 | 65178 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
2022/07/19 | 6496 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points.tex
-2022/07/19 | 64869 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
2022/07/19 | 64839 | fonts/yfonts-otf/doc/yfonts-otf.pdf
-2022/07/19 | 64629 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2022/07/19 | 64181 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2022/07/19 | 63795 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/07/19 | 63161 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/07/19 | 631396 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2022/07/19 | 630005 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/07/19 | 62337 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
2022/07/19 | 614164 | systems/texlive/tlnet/archive/texlive-common.doc.r63925.tar.xz
2022/07/19 | 6085 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-euclide.sty
2022/07/19 | 60152 | macros/latex/contrib/runcode.zip
-2022/07/19 | 599118 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
2022/07/19 | 5962 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-circles.tex
-2022/07/19 | 594397 | fonts/feyn.zip
-2022/07/19 | 591164 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2022/07/19 | 58741 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/07/19 | 58254 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2022/07/19 | 5804914 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/07/19 | 57515 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/07/19 | 57455 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/07/19 | 57416 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2022/07/19 | 57284 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/07/19 | 56965 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2022/07/19 | 56906 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2022/07/19 | 564871 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
2022/07/19 | 55816 | macros/latex/contrib/runcode/runcode.pdf
-2022/07/19 | 55745 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2022/07/19 | 55560 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2022/07/19 | 55267 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
2022/07/19 | 5343 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-rnd.tex
-2022/07/19 | 532440 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
2022/07/19 | 52976 | macros/latex/contrib/showlabels/showlabels.dtx
-2022/07/19 | 527081 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/07/19 | 52579 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/07/19 | 52366 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/07/19 | 51990 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/07/19 | 51828 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2022/07/19 | 51464 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
2022/07/19 | 5067 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-polygons.tex
-2022/07/19 | 50554 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2022/07/19 | 49728 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2022/07/19 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2022/07/19 | 48841 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2022/07/19 | 483447 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2022/07/19 | 481220 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/07/19 | 48034 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/07/19 | 478114 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
2022/07/19 | 47528 | fonts/yfonts-otf/fonts/ygoth.otf
-2022/07/19 | 46418 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
2022/07/19 | 4601 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-protractor.tex
-2022/07/19 | 45809 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2022/07/19 | 45803 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/07/19 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/07/19 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2022/07/19 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/07/19 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2022/07/19 | 448 | systems/texlive/tlnet/archive/mcf2graph.r63929.tar.xz
2022/07/19 | 4375 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-lib-eu-marks.tex
-2022/07/19 | 43700 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/07/19 | 43673 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/07/19 | 43672 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2022/07/19 | 43617 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/07/19 | 43507 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2022/07/19 | 42744 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2022/07/19 | 418864 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63925.tar.xz
-2022/07/19 | 41460 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2022/07/19 | 41199 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/07/19 | 41137 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
2022/07/19 | 4085 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-polygons.tex
2022/07/19 | 4052588 | systems/texlive/tlnet/archive/bidi.doc.r63930.tar.xz
2022/07/19 | 40320 | fonts/yfonts-otf/fonts/yfrak.otf
2022/07/19 | 3975 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-compass.tex
-2022/07/19 | 39638 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2022/07/19 | 394070 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/07/19 | 38692 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2022/07/19 | 38311 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2022/07/19 | 37545 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
2022/07/19 | 37220 | fonts/yfonts-otf/fonts/yswab.otf
-2022/07/19 | 37038 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2022/07/19 | 37020 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2022/07/19 | 36408 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2022/07/19 | 35251 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/07/19 | 352130 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/07/19 | 35212 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
2022/07/19 | 348 | systems/texlive/tlnet/archive/texlive-common.r63925.tar.xz
2022/07/19 | 3484 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-eu-base.tex
2022/07/19 | 3473 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-grids.tex
2022/07/19 | 3414 | fonts/yfonts-otf/doc/Erlkonig.ltx
-2022/07/19 | 33837 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
2022/07/19 | 3371 | fonts/yfonts-otf/tex/oldgerm-otf.sty
-2022/07/19 | 332482 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
2022/07/19 | 331118 | macros/latex/contrib/fixdif/fixdif.pdf
-2022/07/19 | 32775 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
2022/07/19 | 327444 | macros/latex/contrib/fixdif.zip
-2022/07/19 | 326016 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/07/19 | 325592 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/07/19 | 32080 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/07/19 | 316695 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2022/07/19 | 31581 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2022/07/19 | 31572 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/07/19 | 31532 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/07/19 | 31441 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
2022/07/19 | 3111 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-eu-angles.tex
2022/07/19 | 3061 | macros/latex/contrib/fixdif/fixdif.ins
-2022/07/19 | 30555 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/07/19 | 30158 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
2022/07/19 | 2987 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-eu-text.tex
2022/07/19 | 296192 | systems/texlive/tlnet/archive/gfsneohellenicmath.r63928.tar.xz
-2022/07/19 | 295871 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/07/19 | 28930 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2022/07/19 | 287375 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2022/07/19 | 28715 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2022/07/19 | 286692 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/07/19 | 286514 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/07/19 | 286481 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/07/19 | 285844 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2022/07/19 | 28508 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2022/07/19 | 28502 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
2022/07/19 | 2836 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-triangles.tex
-2022/07/19 | 2823041 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/07/19 | 27744 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2022/07/19 | 27629 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
2022/07/19 | 2749 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-eu-modules.tex
-2022/07/19 | 27387 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2022/07/19 | 270788 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/07/19 | 2695590 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
2022/07/19 | 268 | macros/latex/contrib/showlabels/showlabels.ins
-2022/07/19 | 259332 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2022/07/19 | 25502 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2022/07/19 | 25489326 | systems/texlive/tlnet/install-tl.zip
2022/07/19 | 252659 | macros/latex/contrib/showlabels.zip
-2022/07/19 | 25261 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2022/07/19 | 251193 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2022/07/19 | 25104 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/07/19 | 247273 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/07/19 | 245183 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/07/19 | 244718 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2022/07/19 | 24140 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/07/19 | 23976 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/07/19 | 2392680 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2022/07/19 | 23735 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-spc.tex
2022/07/19 | 22979 | macros/latex/contrib/fixdif/fixdif.dtx
2022/07/19 | 2268 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-eu-colors.tex
-2022/07/19 | 22153 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
2022/07/19 | 2207 | macros/latex/contrib/showlabels/README
2022/07/19 | 219520 | macros/latex/contrib/showlabels/showlabels.pdf
2022/07/19 | 21724 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-angles.tex
2022/07/19 | 214457 | fonts/yfonts-otf.zip
-2022/07/19 | 21338 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2022/07/19 | 213318 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/07/19 | 210189 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2022/07/19 | 209176 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
2022/07/19 | 20618 | macros/latex/contrib/showlabels/showlabels.html
-2022/07/19 | 20459353 | systems/texlive/tlnet/install-tl-windows.exe
-2022/07/19 | 204191 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
-2022/07/19 | 203527 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/07/19 | 2027161 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/07/19 | 20186 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
2022/07/19 | 2005 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-lib-eu-shape.tex
-2022/07/19 | 200458 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2022/07/19 | 199825 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2022/07/19 | 197328 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2022/07/19 | 196154 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
2022/07/19 | 19106 | macros/latex/contrib/showlabels/lppl.txt
-2022/07/19 | 190509 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
2022/07/19 | 18568 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-by.tex
-2022/07/19 | 18492 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
2022/07/19 | 18460 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-eu-intersections.tex
-2022/07/19 | 18390 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/07/19 | 181608 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/07/19 | 179834 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
2022/07/19 | 17804 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-triangles.tex
-2022/07/19 | 17557620 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/07/19 | 1740658 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2022/07/19 | 173123 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2022/07/19 | 169636 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/07/19 | 16517 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2022/07/19 | 16462 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
2022/07/19 | 1614 | fonts/yfonts-otf/README.md
2022/07/19 | 158224 | systems/texlive/tlnet/archive/polyglossia.source.r63931.tar.xz
-2022/07/19 | 157153 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2022/07/19 | 155472 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/07/19 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
2022/07/19 | 15343 | macros/latex/contrib/runcode/runcode.sty
-2022/07/19 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/07/19 | 152543 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2022/07/19 | 1503355 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
2022/07/19 | 148044 | systems/texlive/tlnet/archive/bidi.source.r63930.tar.xz
-2022/07/19 | 1474555 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/07/19 | 1474308 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/07/19 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/07/19 | 1455265 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/07/19 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
2022/07/19 | 14443 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-show.tex
-2022/07/19 | 14435 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2022/07/19 | 1436 | systems/texlive/tlnet/archive/gfsneohellenicmath.doc.r63928.tar.xz
-2022/07/19 | 140069 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/07/19 | 136104 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2022/07/19 | 1358454 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2022/07/19 | 1358257 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/07/19 | 1354844 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2022/07/19 | 135401 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/07/19 | 13518 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
2022/07/19 | 13272 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-sectors.tex
-2022/07/19 | 1322192 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
2022/07/19 | 131436 | systems/texlive/tlnet/archive/bidi.r63930.tar.xz
-2022/07/19 | 1297232 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2022/07/19 | 126875 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
2022/07/19 | 1265504 | macros/latex/contrib/tkz/tkz-euclide.zip
2022/07/19 | 1239 | macros/latex/contrib/runcode/README
2022/07/19 | 1224 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-eu-BB.tex
-2022/07/19 | 120682 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
2022/07/19 | 119580 | systems/texlive/tlnet/archive/polyglossia.r63931.tar.xz
-2022/07/19 | 1180314 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2022/07/19 | 1161246 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/07/19 | 115404 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/07/19 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
-2022/07/19 | 1138 | systems/win32/miktex/tm/packages/pr.ini
-2022/07/19 | 113496 | systems/texlive/tlnet/archive/texlive-scripts.r63925.tar.xz
-2022/07/19 | 113026 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/07/19 | 112994 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
2022/07/19 | 11224 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-euclide.cfg
2022/07/19 | 1102232 | macros/latex/contrib/tkz/tkz-euclide/doc/tkz-euclide.pdf
-2022/07/19 | 109688 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
2022/07/19 | 10762 | macros/latex/contrib/runcode/runcode.tex
-2022/07/19 | 107322 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
2022/07/19 | 10652 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-with.tex
2022/07/19 | 10572 | macros/latex/contrib/tkz/tkz-euclide/README.md
-2022/07/19 | 104730 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
2022/07/19 | 10463 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-lines.tex
2022/07/19 | 1037804 | systems/texlive/tlnet/archive/mcf2graph.doc.r63929.tar.xz
-2022/07/19 | 103624 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/07/19 | 103265 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/07/19 | 1023424 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
2022/07/19 | 10207 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-lines.tex
-2022/07/19 | 100584 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
2022/07/18 | 971089 | macros/unicodetex/latex/polyglossia/polyglossia.dtx
2022/07/18 | 8484 | systems/texlive/tlnet/archive/tabvar.r63921.tar.xz
2022/07/18 | 79537 | graphics/mcf2graph/mcf_exa_code.pdf
2022/07/18 | 7938 | graphics/pgf/contrib/jigsaw/jigsaw-doc.tex
2022/07/18 | 761651 | macros/xetex/latex/bidi/gull.jpg
-2022/07/18 | 7436 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/07/18 | 714748 | systems/texlive/tlnet/archive/latex-base-dev.source.r63922.tar.xz
-2022/07/18 | 6895 | fonts/feyn/feyn.html
-2022/07/18 | 6729 | fonts/feyn/style.css
2022/07/18 | 65 | systems/mac/mactex/mactex-MacTeXtras-20220718.zip.md5
2022/07/18 | 619144 | systems/texlive/tlnet/archive/tabvar.doc.r63921.tar.xz
2022/07/18 | 6101 | macros/xetex/latex/bidi/bidi-doc-latex-pkgsupport.ltx
-2022/07/18 | 5939 | fonts/feyn/exercise-font.tex
-2022/07/18 | 582 | fonts/feyn/overheads.tex
2022/07/18 | 5823 | macros/xetex/latex/bidi/bidi-doc-plain-basics.ltx
2022/07/18 | 57636 | graphics/mcf2graph/mcf_manual.tex
-2022/07/18 | 56836 | fonts/feyn/feyn.dtx
2022/07/18 | 564296 | macros/unicodetex/latex/polyglossia.zip
-2022/07/18 | 55977 | fonts/feyn/overheads.pdf
2022/07/18 | 534 | macros/xetex/latex/bidi/bidi-doc.ltx
2022/07/18 | 514376969 | systems/mac/mactex/mactex-MacTeXtras-20220718.zip
2022/07/18 | 49 | systems/mac/mactex/MacTeXtras.zip.md5
-2022/07/18 | 4935 | fonts/feyn/sample-two-loop-annotated.png
2022/07/18 | 473 | graphics/pgf/contrib/jigsaw/README.md
2022/07/18 | 4698846 | install/macros/xetex/latex/bidi.tds.zip
-2022/07/18 | 4579 | fonts/feyn/release-notes.html
2022/07/18 | 4547 | macros/xetex/latex/bidi/bidi-doc-latex-pkgs.ltx
2022/07/18 | 4497 | macros/xetex/latex/bidi/bidi-doc-latex-programming.ltx
-2022/07/18 | 4422 | fonts/feyn/feynmac.mf
2022/07/18 | 43352 | graphics/mcf2graph/mcf_man_soc.mp
2022/07/18 | 432324 | graphics/mcf2graph/mcf_example.pdf
2022/07/18 | 4280226 | macros/xetex/latex/bidi.zip
-2022/07/18 | 3981 | fonts/feyn/sample-phi4.png
-2022/07/18 | 3928 | fonts/feyn/sample-two-loop.png
-2022/07/18 | 3920 | fonts/feyn/sample-massive.png
2022/07/18 | 387830 | fonts/gfsneohellenicmath.zip
2022/07/18 | 38151 | systems/mac/mactex/ExtrasFolder.pdf
2022/07/18 | 3812 | graphics/mcf2graph/mcf_exa_code.tex
2022/07/18 | 3596 | macros/xetex/latex/bidi/bidi-doc-preamble.ltx
2022/07/18 | 352848 | macros/unicodetex/latex/polyglossia/polyglossia.pdf
2022/07/18 | 3469983 | macros/xetex/latex/bidi/bidi.pdf
-2022/07/18 | 3319 | fonts/feyn/sample-vertex.png
-2022/07/18 | 325984 | fonts/feyn/feyn.pdf
2022/07/18 | 30769112 | systems/texlive/tlnet/archive/latex-base-dev.doc.r63922.tar.xz
2022/07/18 | 3013 | graphics/pgf/contrib/jigsaw/jigsaw.sty
2022/07/18 | 2984 | graphics/mcf2graph/mcf_example.tex
2022/07/18 | 2936 | macros/xetex/latex/bidi/bidi-bibitem.pdf
2022/07/18 | 289436 | graphics/mcf2graph/mcf_manual.pdf
2022/07/18 | 2772 | systems/texlive/tlnet/archive/gitver.r63920.tar.xz
-2022/07/18 | 2422 | fonts/feyn/README
-2022/07/18 | 23442 | fonts/feyn/feyn.mf
-2022/07/18 | 231 | fonts/feyn/feyn.ins
2022/07/18 | 23131 | macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx
2022/07/18 | 2285 | graphics/mcf2graph/mcf_exa_soc.mp
2022/07/18 | 226712 | systems/texlive/tlnet/archive/latex-base-dev.r63922.tar.xz
@@ -350,30 +487,12 @@
2022/07/18 | 174269 | graphics/pgf/contrib/jigsaw.zip
2022/07/18 | 1693 | macros/xetex/latex/bidi/picture.jpg
2022/07/18 | 161 | systems/mac/mactex/mactex-MacTeXtras-20220718.zip.sha512
-2022/07/18 | 161614 | fonts/feyn/exercise-font.pdf
2022/07/18 | 1612 | systems/mac/mactex/Licenses.txt
2022/07/18 | 145 | systems/mac/mactex/MacTeXtras.zip.sha512
2022/07/18 | 14575 | graphics/mcf2graph/mcf_mplib_exa.tex
-2022/07/18 | 1414 | fonts/feyn/feynx11.mf
-2022/07/18 | 1410 | fonts/feyn/feynx24.mf
-2022/07/18 | 1410 | fonts/feyn/feynx10.mf
-2022/07/18 | 1409 | fonts/feyn/feynx18.mf
-2022/07/18 | 1408 | fonts/feyn/feynx12.mf
2022/07/18 | 140860 | systems/texlive/tlnet/archive/gitver.doc.r63920.tar.xz
2022/07/18 | 1396 | macros/xetex/latex/bidi/bidi-doc-intro.ltx
-2022/07/18 | 1382 | fonts/feyn/feyn11.mf
-2022/07/18 | 1379 | fonts/feyn/feyntext11.mf
-2022/07/18 | 1378 | fonts/feyn/feyn24.mf
-2022/07/18 | 1378 | fonts/feyn/feyn10.mf
-2022/07/18 | 1377 | fonts/feyn/feyn18.mf
-2022/07/18 | 1377 | fonts/feyn/feyn12.mf
-2022/07/18 | 1374 | fonts/feyn/feyntext24.mf
-2022/07/18 | 1374 | fonts/feyn/feyntext12.mf
-2022/07/18 | 1373 | fonts/feyn/feyntext18.mf
-2022/07/18 | 1373 | fonts/feyn/feyntext10.mf
-2022/07/18 | 1333 | fonts/feyn/LICENCE
2022/07/18 | 1323 | macros/xetex/latex/bidi/README
-2022/07/18 | 11 | fonts/feyn/VERSION
2022/07/18 | 1137643 | install/macros/unicodetex/latex/polyglossia.tds.zip
2022/07/18 | 11084 | systems/texlive/tlnet/archive/tabvar.source.r63921.tar.xz
2022/07/18 | 1048141 | graphics/mcf2graph.zip
@@ -861,7 +980,6 @@
2022/07/16 | 40180 | systems/texlive/tlnet/archive/tkz-doc.doc.r63902.tar.xz
2022/07/16 | 4001 | macros/latex/contrib/gitver/gitver.tex
2022/07/16 | 39688 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
-2022/07/16 | 39604 | systems/texlive/tlnet/archive/tkz-euclide.r63907.tar.xz
2022/07/16 | 393941 | systems/win32/miktex/tm/packages/miktex-cairo-bin-x64-2.9.tar.lzma
2022/07/16 | 3872 | systems/texlive/tlnet/archive/tkzexample.r63908.tar.xz
2022/07/16 | 38642 | systems/win32/miktex/tm/packages/miktex-gsf2pk-bin-2.9.tar.lzma
@@ -980,7 +1098,6 @@
2022/07/16 | 11851628 | systems/texlive/tlnet/archive/l3kernel.doc.r63904.tar.xz
2022/07/16 | 1180421 | systems/win32/miktex/tm/packages/miktex-poppler-bin-2.9.tar.lzma
2022/07/16 | 1161779 | systems/win32/miktex/tm/packages/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/07/16 | 1157328 | systems/texlive/tlnet/archive/tkz-euclide.doc.r63907.tar.xz
2022/07/16 | 115471 | systems/win32/miktex/tm/packages/miktex-gregorio-bin-x64-2.9.tar.lzma
2022/07/16 | 112940 | systems/win32/miktex/tm/packages/miktex-epstopdf-bin-x64-2.9.tar.lzma
2022/07/16 | 112881 | systems/win32/miktex/tm/packages/miktex-gd-bin-x64-2.9.tar.lzma
@@ -1026,7 +1143,6 @@
2022/07/15 | 70685 | macros/latex/contrib/l3kernel/expl3.dtx
2022/07/15 | 70578 | macros/latex/contrib/l3kernel/l3fp.dtx
2022/07/15 | 69260 | macros/latex/contrib/l3kernel/l3candidates.dtx
-2022/07/15 | 6844 | systems/texlive/tlnet/archive/fixdif.source.r63892.tar.xz
2022/07/15 | 6760 | systems/texlive/tlnet/archive/pseudo.r63896.tar.xz
2022/07/15 | 6677 | macros/latex/contrib/l3kernel/l3news02.tex
2022/07/15 | 66524 | macros/latex/contrib/l3kernel/l3prg.dtx
@@ -1075,7 +1191,6 @@
2022/07/15 | 33607 | macros/latex/contrib/lwarp/lwarp.ins
2022/07/15 | 33116 | macros/latex/contrib/l3kernel/l3sys.dtx
2022/07/15 | 32430 | macros/latex/contrib/l3kernel/l3cctab.dtx
-2022/07/15 | 321516 | systems/texlive/tlnet/archive/fixdif.doc.r63892.tar.xz
2022/07/15 | 3191275 | macros/latex/contrib/lwarp/lwarp.pdf
2022/07/15 | 304577 | macros/latex/contrib/l3kernel/l3regex.dtx
2022/07/15 | 29836 | macros/latex/contrib/lwarp/lwarpmk.lua
@@ -1114,7 +1229,6 @@
2022/07/15 | 1908 | macros/latex/contrib/l3kernel/interface3.tex
2022/07/15 | 18531 | macros/latex/contrib/l3kernel/l3fp-round.dtx
2022/07/15 | 18263 | macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-axes.tex
-2022/07/15 | 1816 | systems/texlive/tlnet/archive/fixdif.r63892.tar.xz
2022/07/15 | 17886 | macros/latex/contrib/tkz/tkzexample/doc/latex/tkzexample.tex
2022/07/15 | 1768619 | macros/latex/contrib/l3kernel/interface3.pdf
2022/07/15 | 170063 | macros/latex/contrib/l3kernel/l3news11.pdf
@@ -1494,30 +1608,3 @@
2022/07/14 | 1012088 | systems/win32/miktex/tm/packages/xepersian__doc.tar.lzma
2022/07/14 | 100665 | support/texlive/texlive-dummy/Fedora.zip
2022/07/14 | 10007 | systems/win32/miktex/tm/packages/create-theorem.tar.lzma
-2022/07/13 | 9784 | systems/texlive/tlnet/archive/create-theorem.r63879.tar.xz
-2022/07/13 | 9274 | language/japanese/jlreq/Makefile
-2022/07/13 | 8600450 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
-2022/07/13 | 816627 | macros/latex/contrib/profcollege/latex/ProfCollege.sty
-2022/07/13 | 8096 | systems/texlive/tlnet/archive/ndsu-thesis-2022.r63881.tar.xz
-2022/07/13 | 7878 | language/japanese/jlreq/jlreq-trimmarks-ja.md
-2022/07/13 | 78020 | systems/texlive/tlnet/archive/create-theorem.doc.r63879.tar.xz
-2022/07/13 | 7312024 | systems/texlive/tlnet/archive/biblatex.doc.r63878.tar.xz
-2022/07/13 | 6802 | language/japanese/jlreq/README.md
-2022/07/13 | 6560 | language/japanese/jlreq/jlreq-trimmarks.md
-2022/07/13 | 62924 | macros/latex/contrib/profcollege/metapost/PfCPseudo.mp
-2022/07/13 | 603041 | language/japanese/jlreq.zip
-2022/07/13 | 48330 | language/japanese/jlreq/jlreq-trimmarks.sty
-2022/07/13 | 45772 | language/japanese/jlreq/README-ja.md
-2022/07/13 | 371560 | language/japanese/jlreq/jlreq-ja.pdf
-2022/07/13 | 284079 | language/japanese/jlreq/jlreq.cls
-2022/07/13 | 254224 | systems/texlive/tlnet/archive/biblatex.r63878.tar.xz
-2022/07/13 | 2209146 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip
-2022/07/13 | 1612 | systems/texlive/tlnet/archive/collection-publishers.r63881.tar.xz
-2022/07/13 | 1567624 | systems/texlive/tlnet/archive/ndsu-thesis-2022.doc.r63881.tar.xz
-2022/07/13 | 1348 | language/japanese/jlreq/LICENSE
-2022/07/13 | 12941594 | macros/latex/contrib/profcollege.zip
-2022/07/13 | 119802 | language/japanese/jlreq/jlreq.pdf
-2022/07/13 | 10946453 | install/language/japanese/jlreq.tds.zip
-2022/07/13 | 104857 | macros/latex/contrib/profcollege/metapost/PfCScratchpdf.mp
-2022/07/13 | 102812 | macros/latex/contrib/profcollege/metapost/PfCScratch.mp
-2022/07/13 | 10200 | language/japanese/jlreq/jlreq-complements.sty
diff --git a/fonts/feyn/README b/fonts/feyn/README
index 6c8044502a..1c3a807ba5 100644
--- a/fonts/feyn/README
+++ b/fonts/feyn/README
@@ -2,7 +2,7 @@
Feyn: a Metafont for Feynman diagrams
-------------------------------------
-Version 0.4.2.
+Version 0.4.3.
This package is intended to produce relatively simple Feynman diagrams, for
example within equations.
@@ -26,7 +26,7 @@ equations’.
There is further documentation, plus numerous examples, in the package
documentation (feyn.pdf).
-See the package's home page on the web: http://purl.org/nxg/dist/feyn
+See the package's home page on the web: <https://purl.org/nxg/dist/feyn>.
Installation
@@ -45,8 +45,8 @@ installed correctly, then the usual font-generation commands (such as
`mktexpk` for example) should work as normal, and they should be
invoked by default when you LaTeX the feyn.dtx file.
-You should be able to find generic instructions for installing LaTeX files at
-http://www.tex.ac.uk/cgi-bin/texfaq2html?label=installthings
+You should be able to find generic instructions for installing LaTeX
+files at <https://texfaq.org/#installing>.
Licence
diff --git a/fonts/feyn/VERSION b/fonts/feyn/VERSION
index 526394f33e..5f95f31416 100644
--- a/fonts/feyn/VERSION
+++ b/fonts/feyn/VERSION
@@ -1 +1 @@
-feyn-0.4.2
+feyn-0.4.3
diff --git a/fonts/feyn/exercise-font.pdf b/fonts/feyn/exercise-font.pdf
index 68ab27ff61..0b3ab898ce 100644
--- a/fonts/feyn/exercise-font.pdf
+++ b/fonts/feyn/exercise-font.pdf
Binary files differ
diff --git a/fonts/feyn/feyn.dtx b/fonts/feyn/feyn.dtx
index 73827d2672..74e7830814 100644
--- a/fonts/feyn/feyn.dtx
+++ b/fonts/feyn/feyn.dtx
@@ -5,17 +5,17 @@
%% It is distributed under the terms of the 2-clause BSD Licence;
%% see the file LICENCE for details.
%
-%<+package|driver>%% VCS Info: Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0
+%<+package|driver>%% VCS Info: Mercurial revision 0a471f8ed572, 2022-07-20 11:23 +0100, tag 0.4.3 + 0
%<+package>\NeedsTeXFormat{LaTeX2e}
-%<+package>\ProvidesPackage{feyn}[2022/07/18 0.4.2]
-%<+package>\typeout{Package: `feyn' 0.4.2 <2022/07/18>}
+%<+package>\ProvidesPackage{feyn}[2022/07/20 0.4.3]
+%<+package>\typeout{Package: `feyn' 0.4.3 <2022/07/20>}
%
%<*driver>
\documentclass{ltxdoc}
\usepackage{feyn}
\title{The feyn font}
\author{Norman Gray\\(\texttt{https://nxg.me.uk})}
-\date{Version 0.4.2, 2022 July 18}
+\date{Version 0.4.3, 2022 July 20}
\newcommand\Lopt[1]{\textsf {#1}}
\newcommand\file[1]{\texttt {#1}}
\newcommand\Lcount[1]{\textsl {\small#1}}
@@ -100,7 +100,7 @@
% The propagators and vertices which are implemented are those of one-
% and two-loop QED and QCD, plus $\phi^4$ theory, plus a few extras
% which commonly appear in non-figure displays (the practical
-% definition of `commonly appear is `which I wanted' or `which
+% definition of `commonly appear' is: `which I wanted' or `which
% people asked me for'). I'd be delighted to add others which folk
% feel would be useful, as long as they're still in the rather simple
% scope of the font.
@@ -123,6 +123,15 @@
% of~`!' using the \Lopt{globalbang} and \Lopt{noglobalbang} options
% to the \texttt{$\backslash$usepackage\{feyn\}} command.}
%
+% You write Feynman diagrams in text by writing a sequence of letters
+% in the maths-mode \feynx\ font, selected with |\Feyn{...}| in text
+% style and |\feyn{...}| in displays. Most of the characters in the
+% font are selected using ligatures, so that |\feyn{f}| produces a
+% fermion propagator, $\feyn{f}$., but |\feyn{fs}| produces a short
+% fermion, $\feyn{fs}$ and |\feyn{fA}| produces an arrowed one,
+% $\feyn{fA}$. See below for more detailed description of how to use
+% the font.
+%
% \makeatletter
% \def\refptcirc{\lower\feyn@maxis \hbox to 0pt{\hss$\circ$\hss}}
% \makeatother
@@ -231,7 +240,8 @@
%
% The unnassigned positions in the \feynx\ font are filled
% with an obviously wrong dummy character, so that |$\feyn{A}$|, for example,
-% produces $\feyn{fs0Afs0}$.
+% produces $\feyn{fs0Afs0}$. This should help at least some
+% mistypings stand out.
%
% If you were to print out a font table, you would discover that many
% of the glyphs in the font can be obtained using single
@@ -243,8 +253,9 @@
% The file \file{feyn.sty} additionally defines a number of macros,
% described here.
% \begin{description}
-% \item[\cs{feyn}] Selects the diagram font. This must be used
-% within math mode. \cs{Feyn} selects the text-mode diagram font.
+% \item[\cs{feyn}] Selects the diagram font, in display style -- that
+% is, suitable for a displayed equation. This must be used
+% within math mode. \cs{Feyn} selects the textstyle diagram font.
% \item[\cs{momentum}\{ch\}\{text\}] sets the character
% `ch', which may be a ligature, and puts the given text at the recommended
% annotation position for that character. |\momentum[pos]{ch}{text}|
@@ -838,7 +849,7 @@
% The nominal distribution point for the Feyn package is CTAN,
% under \texttt{fonts/feyn}\footnote{\url{https://ctan.org/pkg/feyn}}.
%
-% The feyn package is included in the TeXLive distribution\footnote{\url{http://www.tug.org/texlive/}}, so
+% The feyn package is included in the TeXLive distribution\footnote{\url{https://www.tug.org/texlive/}}, so
% you may have it on your machine already. If not, or if you need a
% more up-to-date version, read on.
%
@@ -847,14 +858,13 @@
% For TeXLive, that's
% `tlmgr'\footnote{\url{https://www.tug.org/texlive/tlmgr.html}}, and
% for MikTeX see the maintenance section of the
-% manual\footnote{\url{https://docs.miktex.org/faq/maintenance.html}}.
+% manual\footnote{\url{https://docs.miktex.org/}}.
%
% \subsection{Installing by hand}
%
% If, for some reason, you need to install the package by hand, then
% you should be able to find generic instructions for installing
-% \LaTeX\ files at
-% \url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=installthings}.
+% \LaTeX\ files at \url{https://texfaq.org/#installing}.
%
% In brief: If you have not done so already, you need to extract the package
% file from the distribution file using |latex feyn.ins|. The
diff --git a/fonts/feyn/feyn.html b/fonts/feyn/feyn.html
index 14e432b81b..2c431acc7c 100644
--- a/fonts/feyn/feyn.html
+++ b/fonts/feyn/feyn.html
@@ -4,14 +4,13 @@
<title>Feyn font</title>
<link href="https://nxg.me.uk" rev="author"/>
<link type="text/css" rel="stylesheet" href="style.css"/>
-<base href='.' />
</head>
<body>
<h1>Feyn font</h1>
<div class="abstract">
<p>A package of fonts for displaying Feynman diagrams.</p>
-<p>Version 0.4.2, 2022 July 18.</p>
+<p>Version 0.4.3, 2022 July 20.</p>
<ul>
<li>Canonical URL: <code style='font-size: larger;'>https://purl.org/nxg/dist/feyn</code></li>
<li><a href='https://heptapod.host/nxg/feyn'>Repository</a></li>
@@ -26,7 +25,7 @@ primarily for use within equations.</p>
/>This package differs from Thorsten Ohl’s
<code>feynmf/feynmp</code> package (at <a href="https://ctan.org/pkg/feynmf">CTAN</a>,
or see the
-<a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=drawFeyn" >TeX FAQ</a>).
+<a href="https://texfaq.org/FAQ-drawFeyn" >TeX FAQ</a>).
FeynMP works by creating Metafont or MetaPost figures using a
preprocessor. It’s more general than this package, but is at its best
when creating relatively large diagrams, for figures. In contrast,
@@ -59,6 +58,11 @@ It is distributed under the terms of the <a href='LICENCE'>2-clause BSD Licence<
<dl>
<!-- @RELEASENOTES@ -->
+<dt><span class='attention'>Version 0.4.3, 2022 July 20</span></dt>
+<dd>Documentation update, including fixes for broken URIs, and more
+consistent use of the canonical homepage URI,
+<a href='https://purl.org/nxg/dist/feyn'><code>https://purl.org/nxg/dist/feyn</code></a>.</dd>
+
<dt><span class='attention'>Version 0.4.2, 2022 July 18</span></dt>
<dd>
<p>No code changes, but updates to URLs, including the repository location.</p>
@@ -108,16 +112,15 @@ are no longer the same as one half-loop.</p></dd>
under <a href="https://ctan.org/pkg/feyn">fonts/feyn</a>.</p>
<p>The feyn package is included in the
-<a href='http://www.tug.org/texlive/'>TeXLive distribution</a>, so
+<a href='https://www.tug.org/texlive/'>TeXLive distribution</a>, so
you may have it on your machine already. If not, or if you need a
more up-to-date version, read on.</p>
<p>Since the package is on CTAN, it should be easily installed and
updated using the tools which support this in your TeX distribution.
For TeXLive, that's <a href='https://www.tug.org/texlive/tlmgr.html'>tlmgr</a>,
-and for MikTeX see the
-<a href='https://docs.miktex.org/faq/maintenance.html'>maintenance
-section of the manual</a>.</p>
+and for MikTeX see the maintenance section of
+<a href='https://docs.miktex.org'>the manual</a>.</p>
<h3>Doing the installation by hand</h3>
@@ -125,9 +128,9 @@ section of the manual</a>.</p>
<ol>
<li>Download either
-<a href="feyn-0.4.2.tar.gz" >feyn-0.4.2.tar.gz</a>
+<a href="feyn-0.4.3.tar.gz" >feyn-0.4.3.tar.gz</a>
or
-<a href="feyn-0.4.2.zip" >feyn-0.4.2.zip</a>
+<a href="feyn-0.4.3.zip" >feyn-0.4.3.zip</a>
and unpack it.</li>
<li>Run LaTeX on the file <code>feyn.ins</code> – this will unpack the
@@ -148,7 +151,7 @@ With the teTeX and TeXLive Unix distributions, the output of
for Metafont source files. The font files <em>should</em> be
generated on the fly when you first refer to them. See also the
relevant discussion in the TeX FAQ about <a
-href='http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-wlcf'
+href='https://texfaq.org/FAQ-inst-wlcf'
>‘where LaTeX can find them’</a>.</li>
<li>Run LaTeX on the file <code>feyn.dtx</code> to obtain the
@@ -158,13 +161,13 @@ generate the font files as a side-effect).</li>
</ol>
<p>You should be able to find generic instructions for installing LaTeX files at
-<a href='http://www.tex.ac.uk/cgi-bin/texfaq2html?label=installthings' >the TeX FAQ</a>.</p>
+<a href='https://texfaq.org/#installing' >the TeX FAQ</a>.</p>
<div class="signature">
<a href="https://nxg.me.uk" >Norman Gray</a><br/>
-2022 July 18
+2022 July 20
</div>
</body>
diff --git a/fonts/feyn/feyn.mf b/fonts/feyn/feyn.mf
index 9c5247356f..68b81c771f 100644
--- a/fonts/feyn/feyn.mf
+++ b/fonts/feyn/feyn.mf
@@ -1,9 +1,9 @@
-% This is the metafont for the feynfont font, release 0.4.2, 2022 July 18
+% This is the metafont for the feynfont font, release 0.4.3, 2022 July 20
%
% Copyright 1991, 1994, 2001, 2002, 2005, 2008-10, Norman Gray.
% See the file LICENCE for licence details.
%
-% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0
+% Mercurial revision 0a471f8ed572, 2022-07-20 11:23 +0100, tag 0.4.3 + 0
%
%
%
diff --git a/fonts/feyn/feyn.pdf b/fonts/feyn/feyn.pdf
index 467ca16f8f..9c350c8618 100644
--- a/fonts/feyn/feyn.pdf
+++ b/fonts/feyn/feyn.pdf
Binary files differ
diff --git a/fonts/feyn/feyn10.mf b/fonts/feyn/feyn10.mf
index 05aaea3ecf..694d85eafb 100644
--- a/fonts/feyn/feyn10.mf
+++ b/fonts/feyn/feyn10.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 10pt display size, release 0.4.2, 2022 July 18.
+% Feynman diagram font, 10pt display size, release 0.4.3, 2022 July 20.
%
% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
-% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0
+% Mercurial revision 0a471f8ed572, 2022-07-20 11:23 +0100, tag 0.4.3 + 0
font_identifier "FEYN"; font_size 10pt#;
diff --git a/fonts/feyn/feyn11.mf b/fonts/feyn/feyn11.mf
index 32bfa5df31..3357ab1579 100644
--- a/fonts/feyn/feyn11.mf
+++ b/fonts/feyn/feyn11.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 11pt display size, release 0.4.2, 2022 July 18.
+% Feynman diagram font, 11pt display size, release 0.4.3, 2022 July 20.
%
% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
-% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0
+% Mercurial revision 0a471f8ed572, 2022-07-20 11:23 +0100, tag 0.4.3 + 0
font_identifier "FEYN"; font_size 11pt#;
diff --git a/fonts/feyn/feyn12.mf b/fonts/feyn/feyn12.mf
index 7739aa7d22..3bc3f464b6 100644
--- a/fonts/feyn/feyn12.mf
+++ b/fonts/feyn/feyn12.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 12pt display size, release 0.4.2, 2022 July 18.
+% Feynman diagram font, 12pt display size, release 0.4.3, 2022 July 20.
%
% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
-% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0
+% Mercurial revision 0a471f8ed572, 2022-07-20 11:23 +0100, tag 0.4.3 + 0
font_identifier "FEYN"; font_size 12pt#;
diff --git a/fonts/feyn/feyn18.mf b/fonts/feyn/feyn18.mf
index 14be743168..459a7a77f1 100644
--- a/fonts/feyn/feyn18.mf
+++ b/fonts/feyn/feyn18.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 18pt display size, release 0.4.2, 2022 July 18.
+% Feynman diagram font, 18pt display size, release 0.4.3, 2022 July 20.
%
% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
-% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0
+% Mercurial revision 0a471f8ed572, 2022-07-20 11:23 +0100, tag 0.4.3 + 0
font_identifier "FEYN"; font_size 18pt#;
diff --git a/fonts/feyn/feyn24.mf b/fonts/feyn/feyn24.mf
index 3d502bcbe5..1cc8e8d469 100644
--- a/fonts/feyn/feyn24.mf
+++ b/fonts/feyn/feyn24.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 24pt display size, release 0.4.2, 2022 July 18.
+% Feynman diagram font, 24pt display size, release 0.4.3, 2022 July 20.
%
% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
-% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0
+% Mercurial revision 0a471f8ed572, 2022-07-20 11:23 +0100, tag 0.4.3 + 0
font_identifier "FEYN"; font_size 24pt#;
diff --git a/fonts/feyn/feynmac.mf b/fonts/feyn/feynmac.mf
index 70467a06de..6691e7a7ad 100644
--- a/fonts/feyn/feynmac.mf
+++ b/fonts/feyn/feynmac.mf
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% Macros to support feyn.mf
-% Release 0.4.2, 2022 July 18
+% Release 0.4.3, 2022 July 20
def looselink = ..tension 0.75.. enddef;
diff --git a/fonts/feyn/feyntext10.mf b/fonts/feyn/feyntext10.mf
index 3240e538c0..bd8d33508c 100644
--- a/fonts/feyn/feyntext10.mf
+++ b/fonts/feyn/feyntext10.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 10pt text size, release 0.4.2, 2022 July 18.
+% Feynman diagram font, 10pt text size, release 0.4.3, 2022 July 20.
%
% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
-% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0
+% Mercurial revision 0a471f8ed572, 2022-07-20 11:23 +0100, tag 0.4.3 + 0
font_identifier "FEYN"; font_size 10pt#;
diff --git a/fonts/feyn/feyntext11.mf b/fonts/feyn/feyntext11.mf
index c8c35ffb50..1fc28d1e31 100644
--- a/fonts/feyn/feyntext11.mf
+++ b/fonts/feyn/feyntext11.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 11pt text size, release 0.4.2, 2022 July 18.
+% Feynman diagram font, 11pt text size, release 0.4.3, 2022 July 20.
%
% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
-% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0
+% Mercurial revision 0a471f8ed572, 2022-07-20 11:23 +0100, tag 0.4.3 + 0
font_identifier "FEYN"; font_size 11pt#;
diff --git a/fonts/feyn/feyntext12.mf b/fonts/feyn/feyntext12.mf
index c07b38bc88..f3d8b5d22f 100644
--- a/fonts/feyn/feyntext12.mf
+++ b/fonts/feyn/feyntext12.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 12pt text size, release 0.4.2, 2022 July 18.
+% Feynman diagram font, 12pt text size, release 0.4.3, 2022 July 20.
%
% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
-% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0
+% Mercurial revision 0a471f8ed572, 2022-07-20 11:23 +0100, tag 0.4.3 + 0
font_identifier "FEYN"; font_size 12pt#;
diff --git a/fonts/feyn/feyntext18.mf b/fonts/feyn/feyntext18.mf
index d522ccf908..6deb985c0c 100644
--- a/fonts/feyn/feyntext18.mf
+++ b/fonts/feyn/feyntext18.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 18pt text size, release 0.4.2, 2022 July 18.
+% Feynman diagram font, 18pt text size, release 0.4.3, 2022 July 20.
%
% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
-% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0
+% Mercurial revision 0a471f8ed572, 2022-07-20 11:23 +0100, tag 0.4.3 + 0
font_identifier "FEYN"; font_size 18pt#;
diff --git a/fonts/feyn/feyntext24.mf b/fonts/feyn/feyntext24.mf
index a23769fb46..cae23a4a8f 100644
--- a/fonts/feyn/feyntext24.mf
+++ b/fonts/feyn/feyntext24.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 24pt text size, release 0.4.2, 2022 July 18.
+% Feynman diagram font, 24pt text size, release 0.4.3, 2022 July 20.
%
% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
-% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0
+% Mercurial revision 0a471f8ed572, 2022-07-20 11:23 +0100, tag 0.4.3 + 0
font_identifier "FEYN"; font_size 24pt#;
diff --git a/fonts/feyn/feynx10.mf b/fonts/feyn/feynx10.mf
index ce869ade76..1b7804cd77 100644
--- a/fonts/feyn/feynx10.mf
+++ b/fonts/feyn/feynx10.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 10pt extended size, release 0.4.2, 2022 July 18.
+% Feynman diagram font, 10pt extended size, release 0.4.3, 2022 July 20.
%
% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
-% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0
+% Mercurial revision 0a471f8ed572, 2022-07-20 11:23 +0100, tag 0.4.3 + 0
font_identifier "FEYNX"; font_size 10pt#;
diff --git a/fonts/feyn/feynx11.mf b/fonts/feyn/feynx11.mf
index efb348ee7c..81b1526f55 100644
--- a/fonts/feyn/feynx11.mf
+++ b/fonts/feyn/feynx11.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 11pt extended size, release 0.4.2, 2022 July 18.
+% Feynman diagram font, 11pt extended size, release 0.4.3, 2022 July 20.
%
% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
-% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0
+% Mercurial revision 0a471f8ed572, 2022-07-20 11:23 +0100, tag 0.4.3 + 0
font_identifier "FEYNX"; font_size 11pt#;
diff --git a/fonts/feyn/feynx12.mf b/fonts/feyn/feynx12.mf
index 28adc32dce..cfeb7f7e72 100644
--- a/fonts/feyn/feynx12.mf
+++ b/fonts/feyn/feynx12.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 12pt extended size, release 0.4.2, 2022 July 18.
+% Feynman diagram font, 12pt extended size, release 0.4.3, 2022 July 20.
%
% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
-% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0
+% Mercurial revision 0a471f8ed572, 2022-07-20 11:23 +0100, tag 0.4.3 + 0
font_identifier "FEYNX"; font_size 12pt#;
diff --git a/fonts/feyn/feynx18.mf b/fonts/feyn/feynx18.mf
index 46dac86221..7bb05c04e6 100644
--- a/fonts/feyn/feynx18.mf
+++ b/fonts/feyn/feynx18.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 18pt extended size, release 0.4.2, 2022 July 18.
+% Feynman diagram font, 18pt extended size, release 0.4.3, 2022 July 20.
%
% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
-% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0
+% Mercurial revision 0a471f8ed572, 2022-07-20 11:23 +0100, tag 0.4.3 + 0
font_identifier "FEYNX"; font_size 18pt#;
diff --git a/fonts/feyn/feynx24.mf b/fonts/feyn/feynx24.mf
index d912aeb1d5..c46ea55749 100644
--- a/fonts/feyn/feynx24.mf
+++ b/fonts/feyn/feynx24.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 24pt extended size, release 0.4.2, 2022 July 18.
+% Feynman diagram font, 24pt extended size, release 0.4.3, 2022 July 20.
%
% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
-% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0
+% Mercurial revision 0a471f8ed572, 2022-07-20 11:23 +0100, tag 0.4.3 + 0
font_identifier "FEYNX"; font_size 24pt#;
diff --git a/fonts/feyn/overheads.pdf b/fonts/feyn/overheads.pdf
index 043120ae05..0089ebd77a 100644
--- a/fonts/feyn/overheads.pdf
+++ b/fonts/feyn/overheads.pdf
Binary files differ
diff --git a/fonts/feyn/overheads.tex b/fonts/feyn/overheads.tex
index 46aee60713..8ba1b2e11d 100644
--- a/fonts/feyn/overheads.tex
+++ b/fonts/feyn/overheads.tex
@@ -1,12 +1,12 @@
\documentclass{beamer}
-% Quick example of overheads, using the sample beamer description at
+% Quick example of overheads, using the sample beamer description at
% http://www.miwie.org/presentations/presentations.html#beamer
-\usepackage{feyn}
+\usepackage{feyn,url}
-\title{Feynman diagrams}
+\title{Feynman diagram font}
\author{Norman Gray\\University of Glasgow}
-\date{v0.4.2, 2022 July 18}
+\date{v0.4.3, 2022 July 20}
%\parindent0pt
@@ -24,5 +24,6 @@ Here is a text diagram $\Feyn{fglf}$, and a displayed one:
= \displaystyle
ig\gamma_\mu (t^c)_{ab}
\]
+This uses the `feyn' font for drawing diagrams: \url{https://purl.org/nxg/dist/feyn}.
}
\end{document}
diff --git a/fonts/feyn/release-notes.html b/fonts/feyn/release-notes.html
index e2442f1baa..bf4ebe9bfe 100644
--- a/fonts/feyn/release-notes.html
+++ b/fonts/feyn/release-notes.html
@@ -14,6 +14,11 @@ dd ul { padding: 0pt; margin: 0pt; }
<dl>
<!-- @CURRENT@ -->
+<dt><span class='attention'>Version 0.4.3, 2022 July 20</span></dt>
+<dd>Documentation update, including fixes for broken URIs, and more
+consistent use of the canonical homepage URI,
+<a href='https://purl.org/nxg/dist/feyn'><code>https://purl.org/nxg/dist/feyn</code></a>.</dd>
+
<dt><span class='attention'>Version 0.4.2, 2022 July 18</span></dt>
<dd>
<p>No code changes, but updates to URLs, including the repository location.</p>
diff --git a/fonts/greek/gfs/gfsneohellenic/VERSION b/fonts/greek/gfs/gfsneohellenic/VERSION
new file mode 100644
index 0000000000..8aac43fccb
--- /dev/null
+++ b/fonts/greek/gfs/gfsneohellenic/VERSION
@@ -0,0 +1 @@
+GFSNeoHellenic for LaTeX. Version 1.02, 20 July 2022
diff --git a/fonts/greek/gfs/gfsneohellenic/doc/VERSION b/fonts/greek/gfs/gfsneohellenic/doc/VERSION
deleted file mode 100644
index f64c450ab8..0000000000
--- a/fonts/greek/gfs/gfsneohellenic/doc/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-GFSNeoHellenic for LaTeX. Version 1.01, 12 May 2006
diff --git a/fonts/greek/gfs/gfsneohellenic/opentype/GFSNeohellenic.otf b/fonts/greek/gfs/gfsneohellenic/opentype/GFSNeohellenic.otf
index fb84eaab36..8453f79c87 100644
--- a/fonts/greek/gfs/gfsneohellenic/opentype/GFSNeohellenic.otf
+++ b/fonts/greek/gfs/gfsneohellenic/opentype/GFSNeohellenic.otf
Binary files differ
diff --git a/graphics/pgf/contrib/bodeplot/README.md b/graphics/pgf/contrib/bodeplot/README.md
index 23733a484e..25b8d7e1dd 100644
--- a/graphics/pgf/contrib/bodeplot/README.md
+++ b/graphics/pgf/contrib/bodeplot/README.md
@@ -5,6 +5,16 @@ Inspired by the `bodegraph` package.
*Version 1.0.8 and newer store `gnuplot` temporary files in the working directory. Use class option `declutter` to restore pre-v1.0.8 behavior. Option `declutter` can cause errors if used with a `tikzexternalize` prefix.*
+Compilation instructions:
+1) `latex bodeplot.ins` to generate `bodeplot.sty`
+2) To compile documentation (needs `gnuplot` on system PATH):
+```
+pdflatex bodeplot.dtx --shell-escape
+makeindex -s gind.ist bodeplot.idx
+makeindex -s gglo.ist -o bodeplot.gls bodeplot.glo
+pdflatex bodeplot.dtx --shell-escape
+pdflatex bodeplot.dtx --shell-escape
+```
Added functionality:
- New `\BodeZPK` and `\BodeTF` commands to generate Bode plots of any transfer function given either poles, zeros, gain, and delay, or numerator and denominator coefficients and delay
- Support for unstable poles and zeros.
@@ -42,4 +52,4 @@ Other new environments and associated commands:
- `\addNyquistZPKPlot[plot-options]{z/{zeros},p/{poles},k/gain,d/delay}`
- `\addNyquistTFPlot[plot-options]{num/{coeff},den/{coeff},d/delay}`
-Limitation: Phase plots from TF commands are wrapped between 0 and 360 degrees. \ No newline at end of file
+Limitation: Nichols charts from TF commands are wrapped between 0 and 360 degrees.
diff --git a/graphics/pgf/contrib/bodeplot/bodeplot.dtx b/graphics/pgf/contrib/bodeplot/bodeplot.dtx
index 10cc1700aa..a5cdfbf6db 100644
--- a/graphics/pgf/contrib/bodeplot/bodeplot.dtx
+++ b/graphics/pgf/contrib/bodeplot/bodeplot.dtx
@@ -18,7 +18,6 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[2006/05/20]
%<package>\ProvidesPackage{bodeplot}
-%<package>\RequirePackage{tikz}
%<package>\RequirePackage{pdftexcmds}
%<package>\RequirePackage{ifplatform}
%<package>\RequirePackage{pgfplots}
@@ -55,6 +54,7 @@
\geometry{lmargin=2in,rmargin=1in,tmargin=1in,bmargin=1in}
\usetikzlibrary{decorations.markings,arrows.meta,spy,backgrounds}
\usepackage[nottoc]{tocbibind}
+\sloppy
\EnableCrossrefs
\CodelineIndex
\RecordChanges
@@ -66,7 +66,7 @@
%</driver>
% \fi
%
-% \CheckSum{1375}
+% \CheckSum{1404}
%
% \changes{v1.0}{2021/10/25}{Initial release}
% \changes{v1.0.4}{2021/11/05}{Fixed unintended optional argument macro expansion}
@@ -74,13 +74,12 @@
% \changes{v1.0.7}{2021/12/02}{Removed unnecessary semicolons}
% \changes{v1.0.7}{2022/01/18}{Updated documentation}
% \changes{v1.0.8}{2022/07/06}{Added a new class option `declutter'}
+% \changes{v1.1.0}{2022/07/06}{Fixed phase wrapping in gnuplot mode}
%
% \GetFileInfo{bodeplot.sty}
% \DoNotIndex{\newcommand,\xdef,\gdef,\def,\edef,\addplot,\approx,\arabic,\opt,\typ,\obj,\else,\if@pgfarg,\fi,\begin,\end,\feature,\footnotesize,\draw,\detokenize,\DeclareOption,\foreach,\ifdim,\ifodd,\Im,\Re,\let,\newif,\nextgroupplot,\noexpand,\expandafter,\unexpanded,\PackageError,\PackageWarning,\relax,\RequirePackage,\tikzset,\pgfmathsetmacro,\pgfmathtruncatemacro,\ProcessOptions}
%
-% \title{The \textsf{bodeplot} package\thanks{This document
-% corresponds to \textsf{bodeplot}~v1.0.8,
-% dated July 06, 2022.}}
+% \title{The \textsf{bodeplot} package\thanks{This document corresponds to \textsf{bodeplot}~v1.1.0, dated July 20, 2022.}}
% \author{Rushikesh Kamalapurkar \\ \texttt{rlkamalapurkar@gmail.com}}
%
% \maketitle
@@ -88,14 +87,14 @@
% \clearpage
% \section{Introduction}
%
-% Generate Bode, Nyquist, and Nichols plots for transfer functions in the canonical (TF) form \begin{equation}G(s) = e^{-Ts}\frac{b_ms^m+\cdots+b_1s+b_0}{a_ns^n+\cdots+a_1s+a_0}\label{eq:TF}\end{equation} and the zero-pole-gain (ZPK) form \begin{equation}G(s) = Ke^{-Ts}\frac{(s-z_1)(s-z_2)\cdots(s-z_m)}{(s-p_1)(s-p_2)\cdots(s-p_n)}.\label{eq:ZPK}\end{equation} In the equations above, $b_m,\cdots,b_0$ and $a_n,\cdots,a_0$ are real coefficients, $T\geq 0$ is the loop delay, $z_1,\cdots,z_m$ and $p_1,\cdots,p_n$ are complex zeros and poles of the transfer function, respectively, and $K\in \Re$ is the loop gain. For transfer functions in the ZPK format in (\ref{eq:ZPK}) \emph{with zero delay}, this package also supports linear and asymptotic approximation of Bode plots.
+% Generate Bode, Nyquist, and Nichols plots for transfer functions in the canonical (TF) form \begin{equation}G(s) = e^{-Ts}\frac{b_ms^m+\cdots+b_1s+b_0}{a_ns^n+\cdots+a_1s+a_0}\label{eq:TF}\end{equation} and the zero-pole-gain (ZPK) form \begin{equation}G(s) = Ke^{-Ts}\frac{(s-z_1)(s-z_2)\cdots(s-z_m)}{(s-p_1)(s-p_2)\cdots(s-p_n)}.\label{eq:ZPK}\end{equation} In the equations above, $b_m,\cdots,b_0$ and $a_n,\cdots,a_0$ are real coefficients, $T\geq 0$ is the loop delay, $z_1,\cdots,z_m$ and $p_1,\cdots,p_n$ are complex zeros and poles of the transfer function, respectively, and $K\in \Re$ is the loop gain. For transfer functions in the ZPK format in (\ref{eq:ZPK}) \emph{with zero delay}, this package also supports linear and asymptotic approximation of Bode plots. By default, all phase plots use degrees as units. Use the |rad| package option to generate plots in radians.
% \subsection{External Dependencies}
-% By default, the package uses |gnuplot| to do all the computations. If |gnuplot| is not available, the |pgf| package option can be used to do the calculations using the native |pgf| math engine. Compilation using the |pgf| math engine is typically slower, but the end result should be the identical.
+% By default, the package uses |gnuplot| to do all the computations. If |gnuplot| is not available, the |pgf| package option can be used to do the calculations using the native |pgf| math engine. Compilation using the |pgf| math engine is typically slower, but the end result should be the identical (other than phase wrapping in the TF format, see limitations below).
%\subsection{Directory Structure}
% Since version 1.0.8, the |bodeplot| package places all |gnuplot| temporary files in the working directory. The package option |declutter| restores the original behavior where the temporary files are placed in a folder called |gnuplot|.
% \subsection{Limitations}
% \begin{itemize}
-% \item In TF form, the phase angles are always between 0 and 360$^\circ$. As such, the Bode phase plots and the Nyquist and Nichols plots will have phase wrapping discontinuities. I do not know how this can be rectified, pull requests are welcome!
+% \item When plotting Nichols charts in TF form, the phase angles are wrapped between 0 and 360$^\circ$. As such, the Nichols charts will have phase wrapping discontinuities. Phase wrapping in Bode plots was fixed in v1.1.0 using |gnuplot|. In |pgf| mode, Bode phase plots, plotted using the TF form, will also show phase wrapping discontinuities.
% \item Use of the |declutter| option with other directory management tools such as a |tikzexternalize| prefix is not recommended.
% \end{itemize}
% \clearpage
@@ -123,7 +122,7 @@
\hrulefill
-Bode plot in TF format with arrow decoration, transport delay, and color customization (note the phase wrapping)
+Bode plot in TF format with arrow decoration, transport delay, and color customization (the phase plot will show wrapping if the |pgf| package option is used)
\begin{LTXexample}[pos=r,width=0.5\textwidth]
\BodeTF[%
samples=1000,
@@ -188,10 +187,8 @@ Individual gain and phase plots with more customization
\begin{minipage}[t]{0.45\textwidth}
\begin{LTXexample}[pos=t,width=\columnwidth]
-\begin{BodePlot}[%
- axes/{ylabel={Gain (dB)},
- ytick distance=40,
- height=2cm,
+\begin{BodeMagPlot}[%
+ axes/{height=2cm,
width=4cm}
]
{0.01}
@@ -207,13 +204,12 @@ Individual gain and phase plots with more customization
p/{{-0.5,-10},{-0.5,10}},
k/10
}
-\end{BodePlot}
+\end{BodeMagPlot}
\end{LTXexample}
\end{minipage}\hfill
\begin{minipage}[t]{0.45\textwidth}
\begin{LTXexample}[pos=t,width=\columnwidth]
-\begin{BodePlot}[%
- ylabel={Phase ($^{\circ}$)},
+\begin{BodePhPlot}[%
height=2cm,
width=4cm,
ytick distance=90
@@ -231,7 +227,7 @@ Individual gain and phase plots with more customization
p/{{-0.5,-10},{-0.5,10}},
k/10
}
-\end{BodePlot}
+\end{BodePhPlot}
\end{LTXexample}
\end{minipage}
@@ -243,20 +239,21 @@ Nichols chart
{%
z/{0,{-0.1,-0.5},{-0.1,0.5}},
p/{{-0.5,-10},{-0.5,10}},
- k/10
+ k/10,
+ d/0.01
}
{0.001}
-{100}
+{500}
\end{LTXexample}
\hrulefill
-Nichols chart in TF format
+Same Nichols chart in TF format (shows phase wrapping discontinuity)
\begin{LTXexample}[pos=r,hsep=20pt,width=0.5\textwidth]
\NicholsTF[samples=1000]
-{num/{10,2,2.6,0},den/{1,1,100.25}}
+{num/{10,2,2.6,0},den/{1,1,100.25},d/0.01}
{0.001}
-{100}
+{500}
\end{LTXexample}
\hrulefill
@@ -486,12 +483,12 @@ Nyquist plots with additional commands, using two different macros
% \end{center}
% \end{figure}
%
-% \DescribeEnv{BodePlot}
-% |\begin{BodePlot}|\oarg{obj1/\marg{opt1},obj2/\marg{opt2},...}\\
+% \DescribeEnv{BodeMagPlot}
+% |\begin{BodeMagPlot}|\oarg{obj1/\marg{opt1},obj2/\marg{opt2},...}\\
% \hspace*{3em}\marg{min-frequency}\marg{max-frequency}\\
% \hspace*{2em}|\addBode...|\\
-% \hspace*{1.5em}|\end{BodePlot}|\\
-% The |BodePlot| environment works in conjunction with the parametric function generator macros |\addBodeZPKPlots|, |\addBodeTFPlot|, and |\addBodeComponentPlot|. The optional argument is comprised of a comma separated list of tuples, either |obj/{opt}| or just |{opt}|. Each tuple passes options to different |pgfplots| macros that generate the axes and the plots according to:
+% \hspace*{1.5em}|\end{BodeMagPlot}|\\
+% The |BodeMagPlot| environment works in conjunction with the parametric function generator macros |\addBodeZPKPlots|, |\addBodeTFPlot|, and |\addBodeComponentPlot|, intended to be used for magnitude plots. The optional argument is comprised of a comma separated list of tuples, either |obj/{opt}| or just |{opt}|. Each tuple passes options to different |pgfplots| macros that generate the axes and the plots according to:
% \begin{itemize}
% \item Tuples of the form |obj/{opt}|:
% \begin{itemize}
@@ -503,6 +500,13 @@ Nyquist plots with additional commands, using two different macros
% \end{itemize}
% The frequency limits are translated to the x-axis limits and the domain of the |semilogaxis| environment. Example usage in the description of |\addBodeZPKPlots|, |\addBodeTFPlot|, and |\addBodeComponentPlot|.
%
+%\DescribeEnv{BodePhPlot}
+% |\begin{BodePhPlot}|\oarg{obj1/\marg{opt1},obj2/\marg{opt2},...}\\
+ % \hspace*{3em}\marg{min-frequency}\marg{max-frequency}\\
+ % \hspace*{2em}|\addBode...|\\
+ % \hspace*{1.5em}|\end{BodePhPlot}|\\
+% Intended to be used for phase plots, otherwise same as the |BodeMagPlot| environment
+%
% \DescribeMacro{\addBodeZPKPlots}
% |\addBodeZPKPlots| \oarg{approx1/\marg{opt1},approx2/\marg{opt2},...}\\
% \hspace*{2em}\marg{plot-type}\\
@@ -512,50 +516,44 @@ Nyquist plots with additional commands, using two different macros
%
% For example, given the transfer function in (\ref{eq:ZPKExample}), its linear, asymptotic, and true Bode plots can be superimposed using
%\begin{verbatim}
-%\begin{BodePlot}[ ylabel={Gain (dB)}, ytick distance=40,
-% height=2cm, width=4cm] {0.01} {100}
+%\begin{BodeMagPlot}[height=2cm,width=4cm] {0.01} {100}
% \addBodeZPKPlots[
% true/{black,thick},
% linear/{red,dashed,thick},
% asymptotic/{blue,dotted,thick}]
% {magnitude}
% {z/{0,{-0.1,-0.5},{-0.1,0.5}},p/{{-0.5,-10},{-0.5,10}},k/10}
-%\end{BodePlot}
+%\end{BodeMagPlot}
%
-%\begin{BodePlot}[ylabel={Phase ($^{\circ}$)},
-% height=2cm, width=4cm, ytick distance=90] {0.01} {100}
+%\begin{BodePhPlot}[height=2cm, width=4cm, ytick distance=90] {0.01} {100}
% \addBodeZPKPlots[
% true/{black,thick},
% linear/{red,dashed,thick},
% asymptotic/{blue,dotted,thick}]
% {phase}
% {z/{0,{-0.1,-0.5},{-0.1,0.5}},p/{{-0.5,-10},{-0.5,10}},k/10}
-%\end{BodePlot}
+%\end{BodePhPlot}
%\end{verbatim}
% \begin{figure}
% \begin{center}
-% \begin{BodePlot}[ ylabel={Gain (dB)}, ytick distance=40,
-% height=2cm, width=4cm] {0.01} {100}
-%
+% \begin{BodeMagPlot}[height=2cm,width=4cm]{0.01}{100}
% \addBodeZPKPlots[
% true/{black,thick},
% linear/{red,dashed,thick},
% asymptotic/{blue,dotted,thick}]
% {magnitude}
% {z/{0,{-0.1,-0.5},{-0.1,0.5}},p/{{-0.5,-10},{-0.5,10}},k/10}
-% \end{BodePlot}
-% \begin{BodePlot}[ylabel={Phase ($^{\circ}$)},
-% height=2cm, width=4cm, ytick distance=90] {0.01} {100}
-%
+% \end{BodeMagPlot}
+% \begin{BodePhPlot}[height=2cm,width=4cm,ytick distance=90]{0.01}{100}
% \addBodeZPKPlots[
% true/{black,thick},
% linear/{red,dashed,thick},
% asymptotic/{blue,dotted,thick}]
% {phase}
% {z/{0,{-0.1,-0.5},{-0.1,0.5}},p/{{-0.5,-10},{-0.5,10}},k/10}
-% \end{BodePlot}
+% \end{BodePhPlot}
% \end{center}
-% \caption{\label{multiBodeZPK}Superimposed approximate and true Bode plots using the \texttt{BodePlot} environment and the \texttt{\textbackslash addBodeZPKPlots} macro.}
+% \caption{\label{multiBodeZPK}Superimposed approximate and true Bode plots using the \texttt{BodeMagPlot} and \texttt{BodePhPlot} environments and the \texttt{\textbackslash addBodeZPKPlots} macro.}
% \end{figure}
% which generates the plot in Figure \ref{multiBodeZPK}.
%
@@ -584,7 +582,7 @@ Nyquist plots with additional commands, using two different macros
% \end{itemize}
% All 20 of the macros defined by combinations of |Type|, |Feature|, and |Approx|, and any |gnuplot| (or |pgfplot| if the |pgf| class option is loaded) compatible function of the 20 macros can be used as |plot-command| in the |addBodeComponentPlot| macro. This is sufficient to generate the Bode plot of any rational transfer function with delay. For example, the Bode phase plot in Figure \ref{multiBodeZPK} can also be generated using:
%\begin{verbatim}
-%\begin{BodePlot}[ylabel={Phase (degree)},ytick distance=90]{0.01}{100}
+%\begin{BodePhPlot}[ytick distance=90]{0.01}{100}
% \addBodeComponentPlot[black,thick]{\PhZero{0}{0} + \PhZero{-0.1}{-0.5} +
% \PhZero{-0.1}{0.5} + \PhPole{-0.5}{-10} + \PhPole{-0.5}{10} +
% \PhK{10}{0}}
@@ -594,17 +592,17 @@ Nyquist plots with additional commands, using two different macros
% \addBodeComponentPlot[blue,dotted,thick] {\PhZeroAsymp{0}{0} +
% \PhZeroAsymp{-0.1}{-0.5} + \PhZeroAsymp{-0.1}{0.5} +
% \PhPoleAsymp{-0.5}{-10} + \PhPoleAsymp{-0.5}{10} + \PhKAsymp{10}{40}}
-%\end{BodePlot}
+%\end{BodePhPlot}
%\end{verbatim}
%\begin{figure}
% \begin{center}
-% \begin{BodePlot}[ylabel={Phase (degree)},ytick distance=90]{0.01}{100}
+% \begin{BodePhPlot}[ytick distance=90]{0.01}{100}
% \addBodeComponentPlot[black,thick] {\PhZero{0}{0} + \PhZero{-0.1}{-0.5} + \PhZero{-0.1}{0.5} + \PhPole{-0.5}{-10} + \PhPole{-0.5}{10} + \PhK{10}{0}}
% \addBodeComponentPlot[red,dashed,thick] {\PhZeroLin{0}{0} + \PhZeroLin{-0.1}{-0.5} + \PhZeroLin{-0.1}{0.5} + \PhPoleLin{-0.5}{-10} + \PhPoleLin{-0.5}{10} + \PhKLin{10}{20}}
% \addBodeComponentPlot[blue,dotted,thick] {\PhZeroAsymp{0}{0} + \PhZeroAsymp{-0.1}{-0.5} + \PhZeroAsymp{-0.1}{0.5} + \PhPoleAsymp{-0.5}{-10} + \PhPoleAsymp{-0.5}{10} + \PhKAsymp{10}{40}}
-% \end{BodePlot}
+% \end{BodePhPlot}
% \end{center}
-% \caption{\label{multiBodeComponents}Superimposed approximate and true Bode Phase plot using the \texttt{BodePlot} environment, the \texttt{\textbackslash addBodeComponentPlot} macro, and several macros of the \texttt{\textbackslash TypeFeatureApprox} form.}
+% \caption{\label{multiBodeComponents}Superimposed approximate and true Bode Phase plot using the \texttt{BodePhPlot} environment, the \texttt{\textbackslash addBodeComponentPlot} macro, and several macros of the \texttt{\textbackslash TypeFeatureApprox} form.}
%\end{figure}
% which gives us the plot in Figure \ref{multiBodeComponents}.
%
@@ -620,21 +618,21 @@ Nyquist plots with additional commands, using two different macros
%
% \noindent This entry describes 2 different macros of the form |\MagSOFeaturePeak| that take the the coefficients $ a_1 $ and $ a_0 $ of a general second order system as inputs, and draw a resonant peak using the |\draw| TikZ macro. The |Feature| in the macro name should be replaced by either |Poles| or |Zeros| to generate a peak for poles and a valley for zeros, respectively. For example, the command
%\begin{verbatim}
-%\begin{BodePlot}[xlabel={}]{0.1}{10}
+%\begin{BodeMagPlot}[xlabel={}]{0.1}{10}
% \addBodeComponentPlot[red,dashed,thick]{\MagSOPoles{0.2}{1}}
% \addBodeComponentPlot[black,thick]{\MagSOPolesLin{0.2}{1}}
% \MagSOPolesPeak[thick]{0.2}{1}
-%\end{BodePlot}
+%\end{BodeMagPlot}
%\end{verbatim}
% generates the plot in Figure \ref{BodePeak}.
%
% \begin{figure}
% \begin{center}
-% \begin{BodePlot}[xlabel={}]{0.1}{10}
+% \begin{BodeMagPlot}[xlabel={}]{0.1}{10}
% \addBodeComponentPlot[red,dashed,thick]{\MagSOPoles{0.2}{1}}
% \addBodeComponentPlot[black,thick]{\MagSOPolesLin{0.2}{1}}
% \MagSOPolesPeak[very thick]{0.2}{1}
-% \end{BodePlot}
+% \end{BodeMagPlot}
% \end{center}
% \cprotect\caption{\label{BodePeak} Resonant peak in asymptotic Bode plot using |\MagSOPolesPeak|.}
% \end{figure}
@@ -727,7 +725,7 @@ Nyquist plots with additional commands, using two different macros
% |\addNyquistTFPlot|\oarg{plot-options}\\
% \hspace*{2em}\marg{num/\marg{coeffs},den/\marg{coeffs},d/\marg{delay}}
%
-% \noindent Similar to |\addNyquistZPKPlot|, with a transfer function input in the TF form.
+% \noindent Similar to |\addNyquistZPKPlot|, with a transfer function input in the TF form.
%
% \subsection{Nichols charts}
% \DescribeMacro{\NicholsZPK}
@@ -804,8 +802,7 @@ Nyquist plots with additional commands, using two different macros
% \begin{macro}{gnuplot@prefix}
% \changes{v1.0.3}{2021/11/03}{Added jobname to gnuplot prefix}
% \changes{v1.0.8}{2022/07/06}{Fixed issue \#6}
-% \begin{macro}{gnuplot@degrees}
-% This code is needed to support both |pgfplots| and |gnuplot| simultaneously. New macros are defined for the |pow| and |mod| functions to address differences between the two math engines. We start by processing the |pgf| and |declutter| class options.
+% This code is needed to support both |pgfplots| and |gnuplot| simultaneously. New macros are defined for the |pow| and |mod| functions to address differences between the two math engines. We start by processing the class options.
% \begin{macrocode}
\newif\if@pgfarg\@pgfargfalse
\DeclareOption{pgf}{%
@@ -815,21 +812,27 @@ Nyquist plots with additional commands, using two different macros
\DeclareOption{declutter}{%
\@declutterargtrue
}
+\newif\if@radarg\@radargfalse
+\DeclareOption{rad}{%
+ \@radargtrue
+}
\ProcessOptions\relax
% \end{macrocode}
% Then, we define two new macros to unify |pgfplots| and |gnuplot|.
% \begin{macrocode}
+\newcommand{\n@mod}[2]{(#1)-(floor((#1)/(#2))*(#2))}
\if@pgfarg
- \newcommand{\n@pow}[2]{(#1)^(#2)}%
- \newcommand{\n@mod}[2]{mod((#1),(#2))}%
+ \newcommand{\n@pow}[2]{(#1)^(#2)}
+ \pgfplotsset{%
+ trig format plots=rad%
+ }
\else
- \newcommand{\n@pow}[2]{(#1)**(#2)}%
- \newcommand{\n@mod}[2]{(#1)-(floor((#1)/(#2))*(#2))}%
+ \newcommand{\n@pow}[2]{(#1)**(#2)}
% \end{macrocode}
% Then, we create a counter so that a new data table is generated and for each new plot. If the plot macros have not changed, the tables, once generated, can be reused by |gnuplot|, which reduces compilation time. The |declutter| option is used to enable the |gnuplot| directory to declutter the working directory.
% \begin{macrocode}
- \newcounter{gnuplot@id}%
- \setcounter{gnuplot@id}{0}%
+ \newcounter{gnuplot@id}
+ \setcounter{gnuplot@id}{0}
\if@declutterarg
\tikzset{%
gnuplot@prefix/.style={%
@@ -846,21 +849,11 @@ Nyquist plots with additional commands, using two different macros
}
\fi
% \end{macrocode}
-% Then, we add |set angles degrees| to all |gnuplot| macros to avoid having to convert from degrees to radians everywhere.
-% \begin{macrocode}
- \pgfplotsset{%
- gnuplot@degrees/.code={%
- \ifnum\value{gnuplot@id}=1
- \xdef\pgfplots@gnuplot@format{\pgfplots@gnuplot@format set angles degrees;}%
- \fi
- }%
- }
-% \end{macrocode}
% If the operating system is not Windows, and if the |declutter| option is not passed, we create the |gnuplot| folder if it does not already exist. \changes{v1.0.2}{2021/11/01}{Fixed issue \#1}
% \begin{macrocode}
\ifwindows\else
\if@declutterarg
- \immediate\write18{mkdir -p gnuplot}%
+ \immediate\write18{mkdir -p gnuplot}
\fi
\fi
\fi
@@ -869,7 +862,6 @@ Nyquist plots with additional commands, using two different macros
% \end{macro}
% \end{macro}
% \end{macro}
-% \end{macro}
% \begin{macro}{bode@style}
% Default axis properties for all plot macros are collected in this |pgf| style.
% \begin{macrocode}
@@ -889,6 +881,20 @@ Nyquist plots with additional commands, using two different macros
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{ph@filter}
+% \begin{macro}{ph@x@filter}
+% These macros create |pgf| filters to convert plots from radians to degrees.
+% \begin{macrocode}
+\if@radarg
+ \pgfplotsset{ph@filter/.style = {ytick distance=pi/4, ylabel={Phase (rad)}}}%
+ \pgfplotsset{ph@x@filter/.style = {xlabel={Phase (rad)}}}%
+\else
+ \pgfplotsset{ph@filter/.style = {y filter/.expression={y*180/pi}, ytick distance=45, ylabel={Phase (deg)}}}%
+ \pgfplotsset{ph@x@filter/.style = {x filter/.expression={x*180/pi}, xlabel={Phase (deg)}}}%
+\fi
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
% \subsection{Parametric function generators for poles, zeros, gains, and delays.}
% \begin{macro}{\MagK}
% \begin{macro}{\MagKAsymp}
@@ -901,7 +907,7 @@ Nyquist plots with additional commands, using two different macros
\newcommand*{\MagK}[2]{(20*log10(abs(#1)))}
\newcommand*{\MagKAsymp}{\MagK}
\newcommand*{\MagKLin}{\MagK}
-\newcommand*{\PhK}[2]{(#1<0?-180:0)}
+\newcommand*{\PhK}[2]{(#1<0?-pi:0)}
\newcommand*{\PhKAsymp}{\PhK}
\newcommand*{\PhKLin}{\PhK}
% \end{macrocode}
@@ -916,7 +922,7 @@ Nyquist plots with additional commands, using two different macros
% True magnitude and phase parametric functions for a pure delay $G(s)=e^{-Ts}$. The macros take two arguments corresponding to real and imaginary part of the gain to facilitate code reuse between delays, gains, poles, and zeros, but only real gains are supported. The second argument, if supplied, is ignored.
% \begin{macrocode}
\newcommand*{\MagDel}[2]{0}
-\newcommand*{\PhDel}[2]{-#1*180*t/pi}
+\newcommand*{\PhDel}[2]{-#1*t}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -945,23 +951,23 @@ Nyquist plots with additional commands, using two different macros
% Parametric function for the true phase of a complex pole.
% \begin{macrocode}
\newcommand*{\PhPole}[2]{(#1 > 0 ? (#2 > 0 ?
- (\n@mod{-atan2((t - (#2)),-(#1))+360}{360}) :
+ (\n@mod{-atan2((t - (#2)),-(#1))}{2*pi}) :
(-atan2((t - (#2)),-(#1)))) :
(-atan2((t - (#2)),-(#1))))}
% \end{macrocode}
% Parametric function for linear approximation of the phase of a complex pole.
% \begin{macrocode}
\newcommand*{\PhPoleLin}[2]{%
- (abs(#1)+abs(#2) == 0 ? -90 :
- (t < (sqrt(\n@pow{#1}{2} + \n@pow{#2}{2}) /
- (\n@pow{10}{sqrt(\n@pow{#1}{2}/(\n@pow{#1}{2} + \n@pow{#2}{2}))})) ?
+ (abs(#1)+abs(#2) == 0 ? -pi/2 :
+ (t < (sqrt(\n@pow{#1}{2} + \n@pow{#2}{2}) /
+ (\n@pow{10}{sqrt(\n@pow{#1}{2}/(\n@pow{#1}{2} + \n@pow{#2}{2}))})) ?
(-atan2(-(#2),-(#1))) :
- (t >= (sqrt(\n@pow{#1}{2} + \n@pow{#2}{2}) *
- (\n@pow{10}{sqrt(\n@pow{#1}{2}/(\n@pow{#1}{2} + \n@pow{#2}{2}))})) ?
- (#2>0?(#1>0?270:-90):-90) :
- (-atan2(-(#2),-(#1)) + (log10(t/(sqrt(\n@pow{#1}{2} + \n@pow{#2}{2}) /
- (\n@pow{10}{sqrt(\n@pow{#1}{2}/(\n@pow{#1}{2} +
- \n@pow{#2}{2}))}))))*((#2>0?(#1>0?270:-90):-90) + atan2(-(#2),-(#1)))/
+ (t >= (sqrt(\n@pow{#1}{2} + \n@pow{#2}{2}) *
+ (\n@pow{10}{sqrt(\n@pow{#1}{2}/(\n@pow{#1}{2} + \n@pow{#2}{2}))})) ?
+ (#2>0?(#1>0?3*pi/2:-pi/2):-pi/2) :
+ (-atan2(-(#2),-(#1)) + (log10(t/(sqrt(\n@pow{#1}{2} + \n@pow{#2}{2}) /
+ (\n@pow{10}{sqrt(\n@pow{#1}{2}/(\n@pow{#1}{2} +
+ \n@pow{#2}{2}))}))))*((#2>0?(#1>0?3*pi/2:-pi/2):-pi/2) + atan2(-(#2),-(#1)))/
(log10(\n@pow{10}{sqrt((4*\n@pow{#1}{2})/
(\n@pow{#1}{2} + \n@pow{#2}{2}))}))))))}
% \end{macrocode}
@@ -969,7 +975,7 @@ Nyquist plots with additional commands, using two different macros
% \begin{macrocode}
\newcommand*{\PhPoleAsymp}[2]{(t < (sqrt(\n@pow{#1}{2} + \n@pow{#2}{2})) ?
(-atan2(-(#2),-(#1))) :
- (#2>0?(#1>0?270:-90):-90))}
+ (#2>0?(#1>0?3*pi/2:-pi/2):-pi/2))}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1026,10 +1032,10 @@ Nyquist plots with additional commands, using two different macros
\newcommand*{\PhCSPolesLin}[2]{(t < (#2 / (\n@pow{10}{abs(#1)})) ?
0 :
(t >= (#2 * (\n@pow{10}{abs(#1)})) ?
- (#1>0 ? -180 : 180) :
- (#1>0 ? (-180*(log10(t*(\n@pow{10}{#1})/#2))/(2*#1)) :
- (180*(log10(t*(\n@pow{10}{abs(#1)})/#2))/(2*abs(#1))))))}
-\newcommand*{\PhCSPolesAsymp}[2]{(#1>0?(t<#2?0:-180):(t<#2?0:180))}
+ (#1>0 ? -pi : pi) :
+ (#1>0 ? (-pi*(log10(t*(\n@pow{10}{#1})/#2))/(2*#1)) :
+ (pi*(log10(t*(\n@pow{10}{abs(#1)})/#2))/(2*abs(#1))))))}
+\newcommand*{\PhCSPolesAsymp}[2]{(#1>0?(t<#2?0:-pi):(t<#2?0:pi))}
% \end{macrocode}
% Plots of the inverse function $G(s)=s^2+2\zeta\omega_n s+\omega_n^2$ are defined to be negative of plots of poles. The |0-| is necessary due to a bug in |gnuplot| (fixed in version 5.4, patchlevel 3).
% \begin{macrocode}
@@ -1092,10 +1098,10 @@ Nyquist plots with additional commands, using two different macros
\newcommand*{\PhSOPoles}[2]{(-atan2((#1)*t,((#2) - \n@pow{t}{2})))}
\newcommand*{\PhSOPolesLin}[2]{(#2>0 ?
\PhCSPolesLin{(#1/(2*sqrt(#2)))}{(sqrt(#2))} :
- (#1>0 ? -180 : 180))}
+ (#1>0 ? -pi : pi))}
\newcommand*{\PhSOPolesAsymp}[2]{(#2>0 ?
\PhCSPolesAsymp{(#1/(2*sqrt(#2)))}{(sqrt(#2))} :
- (#1>0 ? -180 : 180))}
+ (#1>0 ? -pi : pi))}
% \end{macrocode}
% Plots of the inverse function $G(s)=s^2+as+b$ are defined to be negative of plots of poles. The |0-| is necessary due to a bug in |gnuplot| (fixed in version 5.4, patchlevel 3).
% \begin{macrocode}
@@ -1151,7 +1157,7 @@ Nyquist plots with additional commands, using two different macros
% \end{macrocode}
% The |\noexpand| macros below are needed to so that only the macro |\opt@group| is expanded. \changes{v1.0.3}{2021/11/03}{Added Tikz option}
% \begin{macrocode}
- \edef\temp@cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt@tikz}]%
+ \edef\temp@cmd{\noexpand\begin{tikzpicture} [\unexpanded\expandafter{\opt@tikz}]%
\noexpand\begin{groupplot}[%
bode@style,
xmin={#3},
@@ -1167,48 +1173,35 @@ Nyquist plots with additional commands, using two different macros
% \end{macrocode}
% To ensure frequency tick marks on magnitude and the phase plots are always aligned, we use the |groupplot| library. The |\expandafter| chain below is used to expand macros in the plot and group optional arguments.
% \begin{macrocode}
- \if@pgfarg
- \expandafter\nextgroupplot\expandafter[ytick distance=20,
- ylabel={Gain (dB)},xmajorticks=false,\optmag@axes]
- \edef\temp@cmd{\noexpand\addplot[variable=t,thick,\optmag@plot]}%
- \temp@cmd {\func@mag};
- \optmag@commands
- \expandafter\nextgroupplot\expandafter[ytick distance=45,
- ylabel={Phase ($^{\circ}$)},xlabel={Frequency (rad/s)},\optph@axes]
- \edef\temp@cmd{\noexpand\addplot[variable=t,thick,\optph@plot]}%
- \temp@cmd {\func@ph};
- \optph@commands
- \else
+ \edef\temp@mag@cmd{\noexpand\nextgroupplot[ytick distance=20, ylabel={Gain (dB)}, xmajorticks=false, \optmag@axes]
+ \noexpand\addplot[variable=t, thick, \optmag@plot]}
+ \edef\temp@ph@cmd{\noexpand\nextgroupplot[ph@filter, xlabel={Frequency (rad/s)}, \optph@axes]
+ \noexpand\addplot[variable=t, thick, \optph@plot]}
% \end{macrocode}
% In |gnuplot| mode, we increment the |gnuplot@id| counter before every plot to make sure that new and reusable |.gnuplot| and |.table| files are generated for every plot.
% \begin{macrocode}
- \stepcounter{gnuplot@id}
- \expandafter\nextgroupplot\expandafter[ytick distance=20,
- ylabel={Gain (dB)},xmajorticks=false,\optmag@axes]
- \edef\temp@cmd{\noexpand\addplot[variable=t,thick,\optmag@plot]}%
- \temp@cmd gnuplot[gnuplot@degrees,gnuplot@prefix] {\func@mag};
+ \if@pgfarg\else
+ \edef\temp@mag@cmd{\noexpand\stepcounter{gnuplot@id} \unexpanded\expandafter{\temp@mag@cmd} gnuplot[gnuplot@prefix]}
+ \edef\temp@ph@cmd{\noexpand\stepcounter{gnuplot@id} \unexpanded\expandafter{\temp@ph@cmd} gnuplot[gnuplot@prefix]}
+ \fi
+ \temp@mag@cmd {\func@mag};
\optmag@commands
- \stepcounter{gnuplot@id}
- \expandafter\nextgroupplot\expandafter[ytick distance=45,
- ylabel={Phase ($^{\circ}$)},xlabel={Frequency (rad/s)},\optph@axes]
- \edef\temp@cmd{\noexpand\addplot[variable=t,thick,\optph@plot]}%
- \temp@cmd gnuplot[gnuplot@degrees,gnuplot@prefix] {\func@ph};
+ \temp@ph@cmd {\func@ph};
\optph@commands
- \fi
\end{groupplot}
\end{tikzpicture}
}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\BodeTF}
-% Implementation of this macro is very similar to the |\BodeZPK| macro above. The only difference is the lack of linear and asymptotic plots and slightly different parsing of the mandatory arguments. \changes{v1.0.3}{2021/11/03}{Added Tikz option}
+% Implementation of this macro is very similar to the |\BodeZPK| macro above. The only difference is the lack of linear and asymptotic plots and slightly different parsing of the mandatory arguments. \changes{v1.0.3}{2021/11/03}{Added Tikz option} \changes{v1.1.0}{2022/07/06}{Fixed phase wrapping in gnuplot mode}
% \begin{macrocode}
\newcommand{\BodeTF}[4][]{%
\parse@opt{#1}%
\gdef\func@mag{}%
\gdef\func@ph{}%
\build@TF@plot{\func@mag}{\func@ph}{#2}%
- \edef\temp@cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt@tikz}]%
+ \edef\temp@cmd{\noexpand\begin{tikzpicture} [\unexpanded\expandafter{\opt@tikz}]%
\noexpand\begin{groupplot}[%
bode@style,
xmin={#3},
@@ -1221,31 +1214,22 @@ Nyquist plots with additional commands, using two different macros
]%
}%
\temp@cmd
+ \edef\temp@mag@cmd{\noexpand\nextgroupplot[ytick distance=20, ylabel={Gain (dB)}, xmajorticks=false, \optmag@axes]
+ \noexpand\addplot[variable=t, thick, \optmag@plot]}
+ \edef\temp@ph@cmd{\noexpand\nextgroupplot[ph@filter, xlabel={Frequency (rad/s)}, \optph@axes]
+ \noexpand\addplot[variable=t, thick, \optph@plot]}
+ \if@pgfarg\else
+ \edef\temp@mag@cmd{\noexpand\stepcounter{gnuplot@id} \unexpanded\expandafter{\temp@mag@cmd} gnuplot[gnuplot@prefix]}
+ \edef\temp@ph@cmd{\noexpand\stepcounter{gnuplot@id} \unexpanded\expandafter{\temp@ph@cmd} gnuplot[gnuplot@prefix]}
+ \fi
+ \temp@mag@cmd {\func@mag};
+ \optmag@commands
\if@pgfarg
- \expandafter\nextgroupplot\expandafter[ytick distance=20,
- ylabel={Gain (dB)},xmajorticks=false,\optmag@axes]
- \edef\temp@cmd{\noexpand\addplot[variable=t,thick,\optmag@plot]}%
- \temp@cmd {\func@mag};
- \optmag@commands
- \expandafter\nextgroupplot\expandafter[ytick distance=45,
- ylabel={Phase ($^{\circ}$)},xlabel={Frequency (rad/s)},\optph@axes]
- \edef\temp@cmd{\noexpand\addplot[variable=t,thick,\optph@plot]}%
- \temp@cmd {\func@ph};
- \optph@commands
+ \temp@ph@cmd {\n@mod{\func@ph}{2*pi}};
\else
- \stepcounter{gnuplot@id}%
- \expandafter\nextgroupplot\expandafter[ytick distance=20,
- ylabel={Gain (dB)},xmajorticks=false,\optmag@axes]
- \edef\temp@cmd{\noexpand\addplot[variable=t,thick,\optmag@plot]}%
- \temp@cmd gnuplot[gnuplot@degrees,gnuplot@prefix] {\func@mag};
- \optmag@commands
- \stepcounter{gnuplot@id}%
- \expandafter\nextgroupplot\expandafter[ytick distance=45,
- ylabel={Phase ($^{\circ}$)},xlabel={Frequency (rad/s)},\optph@axes]
- \edef\temp@cmd{\noexpand\addplot[variable=t,thick,\optph@plot]}%
- \temp@cmd gnuplot[gnuplot@degrees,gnuplot@prefix] {\func@ph};
- \optph@commands
+ \temp@ph@cmd {'+' using (t):\func@ph smooth unwrap};
\fi
+ \optph@commands
\end{groupplot}
\end{tikzpicture}
}
@@ -1269,14 +1253,14 @@ Nyquist plots with additional commands, using two different macros
\else
\stepcounter{gnuplot@id}%
\edef\temp@cmd{\noexpand\addplot[variable=t,thick,\opt]}
- \temp@cmd gnuplot[gnuplot@degrees,gnuplot@prefix] {\plot@macro};
+ \temp@cmd gnuplot[gnuplot@prefix] {\plot@macro};
\fi
}%
}
% \end{macrocode}
%\end{macro}
% \begin{macro}{\addBodeTFPlot}
-% This macro is designed to issues a single |\addplot| macros for the set of coefficients and delay. All of the work is done by the |\build@TF@plot| macro.
+% This macro is designed to issues a single |\addplot| macros for the set of coefficients and delay. All of the work is done by the |\build@TF@plot| macro. \changes{v1.1.0}{2022/07/06}{Fixed phase wrapping in gnuplot mode}
% \begin{macrocode}
\newcommand{\addBodeTFPlot}[3][thick]{%
\gdef\plot@macro{}%
@@ -1287,10 +1271,18 @@ Nyquist plots with additional commands, using two different macros
\build@TF@plot{\plot@macro}{\temp@macro}{#3}%
\fi
\if@pgfarg
- \addplot[variable=t,#1]{\plot@macro};
+ \ifnum\pdfstrcmp{#2}{phase}=0
+ \addplot[variable=t,#1]{\n@mod{\plot@macro}{2*pi}};
+ \else
+ \addplot[variable=t,#1]{\plot@macro};
+ \fi
\else
\stepcounter{gnuplot@id}%
- \addplot[variable=t,#1] gnuplot[gnuplot@degrees, gnuplot@prefix] {\plot@macro};
+ \ifnum\pdfstrcmp{#2}{phase}=0
+ \addplot[variable=t,#1] gnuplot[gnuplot@prefix] {'+' using (t):\plot@macro smooth unwrap}
+ \else
+ \addplot[variable=t,#1] gnuplot[gnuplot@prefix] {\plot@macro};
+ \fi
\fi
}
% \end{macrocode}
@@ -1303,17 +1295,67 @@ Nyquist plots with additional commands, using two different macros
\addplot[variable=t,#1]{#2};
\else
\stepcounter{gnuplot@id}%
- \addplot[variable=t,#1] gnuplot[gnuplot@degrees,gnuplot@prefix] {#2};
+ \addplot[variable=t,#1] gnuplot[gnuplot@prefix] {#2};
\fi
}
% \end{macrocode}
%\end{macro}
+% \begin{environment}{BodePhPlot}
+% An environment to host phase plot macros that pass parametric functions to |\addplot| macros. Uses the defaults specified in |bode@style| to create a shortcut that includes the |tikzpicture| and |semilogaxis| environments.\changes{v1.1.0}{2022/07/20}{Added separate environments for phase and magnitude plots}
+% \begin{macrocode}
+\newenvironment{BodePhPlot}[3][]{%
+ \parse@env@opt{#1}%
+ \edef\temp@cmd{\noexpand\begin{tikzpicture} [\unexpanded\expandafter{\opt@tikz}]
+ \noexpand\begin{semilogxaxis}[%
+ ph@filter,
+ bode@style,
+ xmin={#2},
+ xmax={#3},
+ domain=#2:#3,
+ height=2.5cm,
+ xlabel={Frequency (rad/s)},
+ \unexpanded\expandafter{\opt@axes}
+ ]%
+ }
+ \temp@cmd
+}{
+ \end{semilogxaxis}
+ \end{tikzpicture}
+}
+% \end{macrocode}
+% \end{environment}
+% \begin{environment}{BodeMagPlot}
+% An environment to host magnitude plot macros that pass parametric functions to |\addplot| macros. Uses the defaults specified in |bode@style| to create a shortcut that includes the |tikzpicture| and |semilogaxis| environments.\changes{v1.1.0}{2022/07/20}{Added separate environments for phase and magnitude plots}
+% \begin{macrocode}
+\newenvironment{BodeMagPlot}[3][]{%
+ \parse@env@opt{#1}%
+ \edef\temp@cmd{\noexpand\begin{tikzpicture} [\unexpanded\expandafter{\opt@tikz}]
+ \noexpand\begin{semilogxaxis}[%
+ bode@style,
+ xmin={#2},
+ xmax={#3},
+ domain=#2:#3,
+ height=2.5cm,
+ xlabel={Frequency (rad/s)},
+ ylabel={Gain (dB)},
+ ytick distance=40,
+ \unexpanded\expandafter{\opt@axes}
+ ]%
+ }
+ \temp@cmd
+}{
+ \end{semilogxaxis}
+ \end{tikzpicture}
+}
+% \end{macrocode}
+% \end{environment}
% \begin{environment}{BodePlot}
-% An environment to host macros that pass parametric functions to |\addplot| macros. Uses the defaults specified in |bode@style| to create a shortcut that includes the |tikzpicture| and |semilogaxis| environments. \changes{v1.0.3}{2021/11/03}{Added tikz option to environments}
+% Same as |BodeMagPlot|. The |BodePlot| environment is deprecated as of v1.1.0, please use the |BodePhPlot| and |BodeMagPlot| environments instead.\changes{v1.0.3}{2021/11/03}{Added tikz option to environments}\changes{v1.1.0}{2022/02/20}{Deprecated BodePlot environment}
% \begin{macrocode}
\newenvironment{BodePlot}[3][]{%
+ \PackageWarning{bodeplot}{Since v1.1.0, the BodePlot environment returns phase plots in radian units only. Please use the BodePhPlot environment if degree units are needed.}%
\parse@env@opt{#1}%
- \edef\temp@cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt@tikz}]
+ \edef\temp@cmd{\noexpand\begin{tikzpicture} [\unexpanded\expandafter{\opt@tikz}]
\noexpand\begin{semilogxaxis}[%
bode@style,
xmin={#2},
@@ -1323,7 +1365,7 @@ Nyquist plots with additional commands, using two different macros
xlabel={Frequency (rad/s)},
\unexpanded\expandafter{\opt@axes}
]%
- }%
+ }
\temp@cmd
}{
\end{semilogxaxis}
@@ -1475,8 +1517,8 @@ Nyquist plots with additional commands, using two different macros
\xdef\loop@delay{\values}%
\fi
}%
- \xdef#2{(\n@mod{atan2((\num@im),(\num@real))-atan2((\den@im),%
- (\den@real))-\loop@delay*180*t/pi+360}{360})}%
+ \xdef#2{(atan2((\num@im),(\num@real))-atan2((\den@im),%
+ (\den@real))-\loop@delay*t)}%
\xdef#1{(20*log10(sqrt((\n@pow{\num@real}{2})+(\n@pow{\num@im}{2})))-%
20*log10(sqrt((\n@pow{\den@real}{2})+(\n@pow{\den@im}{2}))))}%
}
@@ -1581,7 +1623,7 @@ Nyquist plots with additional commands, using two different macros
\gdef\func@mag{}%
\gdef\func@ph{}%
\build@ZPK@plot{\func@mag}{\func@ph}{}{#2}%
- \edef\temp@cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt@tikz}]%
+ \edef\temp@cmd{\noexpand\begin{tikzpicture} [\unexpanded\expandafter{\opt@tikz}]%
\noexpand\begin{axis}[%
bode@style,
domain=#3:#4,
@@ -1594,14 +1636,14 @@ Nyquist plots with additional commands, using two different macros
}%
\temp@cmd
\addplot [only marks,mark=+,thick,red] (-1 , 0);
- \edef\temp@cmd{\noexpand\addplot[variable=t,thick,\unexpanded\expandafter{\opt@plot}]}%
+ \edef\temp@cmd{\noexpand\addplot[variable=t, thick, \unexpanded\expandafter{\opt@plot}]}%
\if@pgfarg
\temp@cmd ( {\n@pow{10}{((\func@mag)/20)}*cos(\func@ph)},
{\n@pow{10}{((\func@mag)/20)}*sin(\func@ph)} );
\opt@commands
\else
\stepcounter{gnuplot@id}%
- \temp@cmd gnuplot[parametric,gnuplot@degrees,gnuplot@prefix] {%
+ \temp@cmd gnuplot[parametric,gnuplot@prefix] {%
\n@pow{10}{((\func@mag)/20)}*cos(\func@ph),
\n@pow{10}{((\func@mag)/20)}*sin(\func@ph)};
\opt@commands
@@ -1619,7 +1661,7 @@ Nyquist plots with additional commands, using two different macros
\gdef\func@mag{}%
\gdef\func@ph{}%
\build@TF@plot{\func@mag}{\func@ph}{#2}%
- \edef\temp@cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt@tikz}]%
+ \edef\temp@cmd{\noexpand\begin{tikzpicture} [\unexpanded\expandafter{\opt@tikz}]%
\noexpand\begin{axis}[%
bode@style,
domain=#3:#4,
@@ -1632,14 +1674,14 @@ Nyquist plots with additional commands, using two different macros
}%
\temp@cmd
\addplot [only marks,mark=+,thick,red] (-1 , 0);
- \edef\temp@cmd{\noexpand\addplot[variable=t,thick,\unexpanded\expandafter{\opt@plot}]}%
+ \edef\temp@cmd{\noexpand\addplot[variable=t, thick, \unexpanded\expandafter{\opt@plot}]}%
\if@pgfarg
\temp@cmd ( {\n@pow{10}{((\func@mag)/20)}*cos(\func@ph)},
{\n@pow{10}{((\func@mag)/20)}*sin(\func@ph)} );
\opt@commands
\else
\stepcounter{gnuplot@id}%
- \temp@cmd gnuplot[parametric,gnuplot@degrees,gnuplot@prefix]{%
+ \temp@cmd gnuplot[parametric,gnuplot@prefix]{%
\n@pow{10}{((\func@mag)/20)}*cos(\func@ph),
\n@pow{10}{((\func@mag)/20)}*sin(\func@ph)};
\opt@commands
@@ -1661,7 +1703,7 @@ Nyquist plots with additional commands, using two different macros
{\n@pow{10}{((\func@mag)/20)}*sin(\func@ph)} );
\else
\stepcounter{gnuplot@id}%
- \addplot[variable=t,#1] gnuplot[parametric,gnuplot@degrees,gnuplot@prefix]{%
+ \addplot[variable=t,#1] gnuplot[parametric,gnuplot@prefix]{%
\n@pow{10}{((\func@mag)/20)}*cos(\func@ph),
\n@pow{10}{((\func@mag)/20)}*sin(\func@ph)};
\fi
@@ -1680,7 +1722,7 @@ Nyquist plots with additional commands, using two different macros
{\n@pow{10}{((\func@mag)/20)}*sin(\func@ph)} );
\else
\stepcounter{gnuplot@id}%
- \addplot[variable=t,#1] gnuplot[parametric,gnuplot@degrees,gnuplot@prefix]{%
+ \addplot[variable=t,#1] gnuplot[parametric,gnuplot@prefix]{%
\n@pow{10}{((\func@mag)/20)}*cos(\func@ph),
\n@pow{10}{((\func@mag)/20)}*sin(\func@ph)};
\fi
@@ -1692,7 +1734,7 @@ Nyquist plots with additional commands, using two different macros
% \begin{macrocode}
\newenvironment{NyquistPlot}[3][]{%
\parse@env@opt{#1}%
- \edef\temp@cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt@tikz}]%
+ \edef\temp@cmd{\noexpand\begin{tikzpicture} [\unexpanded\expandafter{\opt@tikz}]%
\noexpand\begin{axis}[%
bode@style,
height=5cm,
@@ -1758,12 +1800,12 @@ Nyquist plots with additional commands, using two different macros
\gdef\func@mag{}%
\gdef\func@ph{}%
\build@ZPK@plot{\func@mag}{\func@ph}{}{#2}%
- \edef\temp@cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt@tikz}]%
+ \edef\temp@cmd{\noexpand\begin{tikzpicture} [\unexpanded\expandafter{\opt@tikz}]%
\noexpand\begin{axis}[%
+ ph@x@filter,
bode@style,
domain=#3:#4,
height=5cm,
- xlabel={Phase (degrees)},
ylabel={Gain (dB)},
samples=500,
\unexpanded\expandafter{\opt@axes}
@@ -1776,7 +1818,7 @@ Nyquist plots with additional commands, using two different macros
\opt@commands
\else
\stepcounter{gnuplot@id}%
- \temp@cmd gnuplot[parametric, gnuplot@degrees, gnuplot@prefix]
+ \temp@cmd gnuplot[parametric,gnuplot@prefix]
{ \func@ph , \func@mag };
\opt@commands
\fi
@@ -1788,12 +1830,12 @@ Nyquist plots with additional commands, using two different macros
\gdef\func@mag{}%
\gdef\func@ph{}%
\build@TF@plot{\func@mag}{\func@ph}{#2}%
- \edef\temp@cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt@tikz}]%
+ \edef\temp@cmd{\noexpand\begin{tikzpicture} [\unexpanded\expandafter{\opt@tikz}]%
\noexpand\begin{axis}[%
+ ph@x@filter,
bode@style,
domain=#3:#4,
height=5cm,
- xlabel={Phase (degrees)},
ylabel={Gain (dB)},
samples=500,
\unexpanded\expandafter{\opt@axes}
@@ -1802,12 +1844,12 @@ Nyquist plots with additional commands, using two different macros
\temp@cmd
\edef\temp@cmd{\noexpand\addplot[variable=t,thick,\opt@plot]}%
\if@pgfarg
- \temp@cmd ( {\func@ph} , {\func@mag} );
+ \temp@cmd ( {\n@mod{\func@ph}{2*pi}} , {\func@mag} );
\opt@commands
\else
\stepcounter{gnuplot@id}%
- \temp@cmd gnuplot[parametric, gnuplot@degrees, gnuplot@prefix]
- { \func@ph , \func@mag };
+ \temp@cmd gnuplot[parametric,gnuplot@prefix]
+ { \n@mod{\func@ph}{2*pi} , \func@mag };
\opt@commands
\fi
\end{axis}
@@ -1815,12 +1857,12 @@ Nyquist plots with additional commands, using two different macros
}
\newenvironment{NicholsChart}[3][]{%
\parse@env@opt{#1}%
- \edef\temp@cmd{\noexpand\begin{tikzpicture}[\unexpanded\expandafter{\opt@tikz}]%
+ \edef\temp@cmd{\noexpand\begin{tikzpicture} [\unexpanded\expandafter{\opt@tikz}]%
\noexpand\begin{axis}[%
+ ph@x@filter,
bode@style,
domain=#2:#3,
height=5cm,
- xlabel={Phase (degrees)},
ylabel={Gain (dB)},
\unexpanded\expandafter{\opt@axes}
]%
@@ -1838,7 +1880,7 @@ Nyquist plots with additional commands, using two different macros
\addplot[variable=t,#1] ( {\func@ph} , {\func@mag} );
\else
\stepcounter{gnuplot@id}%
- \addplot[variable=t,#1] gnuplot[parametric,gnuplot@degrees,gnuplot@prefix]
+ \addplot[variable=t,#1] gnuplot[parametric,gnuplot@prefix]
{\func@ph , \func@mag};
\fi
}
@@ -1847,11 +1889,11 @@ Nyquist plots with additional commands, using two different macros
\gdef\func@ph{}%
\build@TF@plot{\func@mag}{\func@ph}{#2}%
\if@pgfarg
- \addplot[variable=t,#1] ( {\func@ph} , {\func@mag} );
+ \addplot[variable=t,#1] ( {\n@mod{\func@ph}{2*pi}} , {\func@mag} );
\else
\stepcounter{gnuplot@id}%
- \addplot[variable=t,#1] gnuplot[gnuplot@degrees,gnuplot@prefix]
- {\func@ph , \func@mag};
+ \addplot[variable=t,#1] gnuplot[gnuplot@prefix]
+ {\n@mod{\func@ph}{2*pi} , \func@mag};
\fi
}
% \end{macrocode}
diff --git a/graphics/pgf/contrib/bodeplot/bodeplot.pdf b/graphics/pgf/contrib/bodeplot/bodeplot.pdf
index 4ccba156a5..1660b2dc51 100644
--- a/graphics/pgf/contrib/bodeplot/bodeplot.pdf
+++ b/graphics/pgf/contrib/bodeplot/bodeplot.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/tikzfill/CHANGES.md b/graphics/pgf/contrib/tikzfill/CHANGES.md
new file mode 100644
index 0000000000..23037f13d1
--- /dev/null
+++ b/graphics/pgf/contrib/tikzfill/CHANGES.md
@@ -0,0 +1,23 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on
+[Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to
+[Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+
+
+
+## [1.00] - 2022-07-20
+
+### Added
+- Initial public release
diff --git a/graphics/pgf/contrib/tikzfill/README.md b/graphics/pgf/contrib/tikzfill/README.md
new file mode 100644
index 0000000000..2ce0a8735a
--- /dev/null
+++ b/graphics/pgf/contrib/tikzfill/README.md
@@ -0,0 +1,56 @@
+# The LaTeX package tikzfill - version 1.0.0 (2022/07/20)
+
+
+> Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+
+> This work may be distributed and/or modified under the
+> conditions of the LaTeX Project Public License, either version 1.3
+> of this license or (at your option) any later version.
+> The latest version of this license is in
+> 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 `author-maintained`.
+
+> This work consists of all files listed in README.md
+
+
+`tikzfill` is a collection of *TikZ* libraries which add
+further options to fill *TikZ* paths with images and
+patterns. The libraries comprise fillings with images from
+files and from *TikZ* pictures. Also, patterns of hexagons
+and of rhombi are provided.
+
+
+## Contents of the package
+
+- `README.md` this file
+- `CHANGES.md` log of changes (history)
+- `tikzfill.sty` LaTeX package file (style file)
+- `tikzfill-common.sty` LaTeX package file (style file)
+- `tikzfill.hexagon.sty` LaTeX package file (style file)
+- `tikzfill.image.sty` LaTeX package file (style file)
+- `tikzfill.rhombus.sty` LaTeX package file (style file)
+- `tikzlibraryfill.hexagon.code.tex` TikZ library file
+- `tikzlibraryfill.image.code.tex` TikZ library file
+- `tikzlibraryfill.rhombus.code.tex` TikZ library file
+- `tikzfill.pdf` Documentation for tikzfill
+- `tikzfill.tex` Source code of the documentation
+- `tikzfill-doc.sty` Source code of the documentation
+
+
+## Installation
+
+Copy the contents of the `tikzfill.tds.zip` from CTAN to your local TeX file tree.
+
+Alternatively, put the files to their respective locations within the TeX installation:
+
+- `tikzfill.sty` -> /tex/latex/tikzfill
+- `tikzfill-common.sty` -> /tex/latex/tikzfill
+- `tikzfill.hexagon.sty` -> /tex/latex/tikzfill
+- `tikzfill.image.sty` -> /tex/latex/tikzfill
+- `tikzfill.rhombus.sty` -> /tex/latex/tikzfill
+- `tikzlibraryfill.hexagon.code.tex` -> /tex/latex/tikzfill
+- `tikzlibraryfill.image.code.tex` -> /tex/latex/tikzfill
+- `tikzlibraryfill.rhombus.code.tex` -> /tex/latex/tikzfill
diff --git a/graphics/pgf/contrib/tikzfill/tikzfill-common.sty b/graphics/pgf/contrib/tikzfill/tikzfill-common.sty
new file mode 100644
index 0000000000..2adb2a7cea
--- /dev/null
+++ b/graphics/pgf/contrib/tikzfill/tikzfill-common.sty
@@ -0,0 +1,56 @@
+%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20)
+%% tikzfill-common.sty: auxiliary code for library loading
+%%
+%% -------------------------------------------------------------------------------------------
+%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% -------------------------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% 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 `author-maintained'.
+%%
+%% This work consists of all files listed in README.md
+%%
+\NeedsTeXFormat{LaTeX2e}[2020/10/01]
+\ProvidesPackage{tikzfill-common}[2022/07/20 v1.0.0 Auxiliary code for tikzfill]
+\RequirePackage{tikz}
+
+\ExplSyntaxOn
+
+\cs_new_nopar:Npn \__tikzfill_usetikzlibrary:n #1
+ {
+ \cs_if_exist:NTF \tikzfillpkgprefix
+ {
+ \bool_set:Nn \l_tmpa_bool { \tl_if_blank_p:V \tikzfillpkgprefix }
+ }
+ {
+ \bool_set_true:N \l_tmpa_bool
+ }
+ \bool_if:NTF \l_tmpa_bool
+ {
+ \usetikzlibrary{ #1 }
+ }
+ {
+ \cs_if_exist:NF \l__tikzfill_library_seq
+ {
+ \seq_new:N \l__tikzfill_library_seq
+ }
+ \seq_set_from_clist:Nn \l__tikzfill_library_seq { #1 }
+ \seq_map_inline:Nn \l__tikzfill_library_seq
+ {
+ \cs_if_exist:cF { tikz@library@ ##1 @loaded }
+ {
+ \cs_gset:cpn { tikz@library@ ##1 @loaded }{}
+ \input{ \tikzfillpkgprefix tikzlibrary ##1 .code.tex}
+ }
+ }
+ }
+ }
+
+\ExplSyntaxOff
diff --git a/graphics/pgf/contrib/tikzfill/tikzfill-doc.sty b/graphics/pgf/contrib/tikzfill/tikzfill-doc.sty
new file mode 100644
index 0000000000..60b1320964
--- /dev/null
+++ b/graphics/pgf/contrib/tikzfill/tikzfill-doc.sty
@@ -0,0 +1,130 @@
+% !TeX encoding=UTF-8
+%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20)
+%% tikzfill-doc.sty: style file for the documentation
+%%
+%% -------------------------------------------------------------------------------------------
+%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% -------------------------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% 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 `author-maintained'.
+%%
+%% This work consists of all files listed in README.md
+%%
+\def\version{1.0.0}%
+\def\datum{2022/07/20}%
+
+\def\tikzfillpkgprefix{}
+\IfFileExists{tikzfill-doc.cfg}{\input{tikzfill-doc.cfg}}{}
+
+% prevent hypdoc from loading (sets hyperindex=false)
+%\@namedef{ver@hypdoc.sty}{9999/12/31}
+%\@namedef{opt@hypdoc.sty}{hypdoc}
+
+
+\RequirePackage[T1]{fontenc}
+\RequirePackage[utf8]{inputenc}
+\RequirePackage[english]{babel}
+\RequirePackage{lmodern,parskip,array,makeidx}
+\RequirePackage{amsmath,amssymb}
+\RequirePackage[svgnames,table,hyperref]{xcolor}
+\RequirePackage{tikz,siunitx,xfp,tabularray}
+\usetikzlibrary{patterns,shadings,fadings}
+\RequirePackage{varioref}
+\RequirePackage[pdftex,bookmarks,raiselinks,pageanchor,hyperindex,colorlinks]{hyperref}
+\urlstyle{sf}
+\RequirePackage{cleveref}
+
+\RequirePackage[a4paper,left=2.5cm,right=2.5cm,top=1.5cm,bottom=1.5cm,
+ marginparsep=3mm,marginparwidth=18mm,
+ headheight=0mm,headsep=0cm,
+ footskip=1.5cm,includeheadfoot]{geometry}
+\RequirePackage{fancyhdr}
+\fancyhf{}
+\fancyfoot[C]{\thepage}%
+\renewcommand{\headrulewidth}{0pt}
+\renewcommand{\footrulewidth}{0pt}
+\pagestyle{fancy}
+\tolerance=2000%
+\setlength{\emergencystretch}{20pt}%
+
+\RequirePackage{longtable,booktabs,ifthen,etoolbox}
+
+\RequirePackage{shortvrb}
+\AtBeginDocument{\MakeShortVerb{\|}}
+
+\RequirePackage{tcolorbox}
+\tcbuselibrary{skins,minted,breakable,documentation,raster,hooks}
+
+\definecolor{Green_Dark}{rgb}{0.078431,0.407843,0.176471}
+\definecolor{Blue_Dark}{rgb}{0.090196,0.211765,0.364706}
+\definecolor{Blue_Bright}{rgb}{0.858824,0.898039,0.945098}
+
+\tcbset{skin=enhanced,
+ sbs/.style={sidebyside,before lower app={\tcbset{sidebyside=false}}},
+ minted options={fontsize=\footnotesize},
+ doc raster={raster before skip=4mm plus 2mm minus 1mm},
+ doc head={colback=yellow!10!white,interior style=fill},
+ doc head key={colback=magenta!5!white,interior style=fill},
+ color key=DarkViolet,
+ color value=Teal,
+ color color=Teal,
+ color counter=Orange!85!black,
+ color length=Orange!85!black,
+ index colorize,
+ index annotate,
+ beforeafter example/.style={
+ before skip balanced=4pt plus 2pt minus 1pt,
+ after skip balanced=6pt plus 2pt minus 1pt
+ },
+ docexample/.style={bicolor,
+ beforeafter example,
+ arc is angular,fonttitle=\bfseries,
+ fontlower=\footnotesize,
+ colframe=green!25!yellow!50!black,
+ colback=green!25!yellow!7,
+ colbacklower=white,
+ drop fuzzy shadow=green!25!yellow!50!black,
+ listing engine=minted,
+ documentation minted style=colorful,
+ documentation minted options={fontsize=\footnotesize},
+ },
+}
+
+\renewcommand*{\tcbdocnew}[1]{\textcolor{green!50!black}{\sffamily\bfseries N} #1}
+\renewcommand*{\tcbdocupdated}[1]{\textcolor{blue!75!black}{\sffamily\bfseries U} #1}
+
+\NewDocumentCommand{\csvsorter}{}{\textsf{\bfseries\color{red!20!black}CSV-Sorter}}
+
+\newtcbinputlisting{\csvlisting}[1]{docexample,minted options={fontsize=\footnotesize},minted language=latex,
+ fonttitle=\bfseries,listing only,title={CSV file \flqq\texttt{\detokenize{#1.csv}}\frqq},listing file=#1.csv}
+
+\newtcbinputlisting{\xmllisting}[1]{docexample,minted options={fontsize=\footnotesize},minted language=xml,
+ fonttitle=\bfseries,listing only,title={Configuration file \flqq\texttt{\detokenize{#1.xml}}\frqq},listing file=#1.xml}
+
+\NewTotalTCBox{\verbbox}{m}{enhanced,on line,size=fbox,frame empty,colback=red!5!white,
+ colupper=red!85!black,fontupper=\bfseries\ttfamily}{\detokenize{"}#1\detokenize{"}}
+
+\NewDocumentCommand{\ctanpkg}{m}
+ {%
+ \href{https://ctan.org/pkg/#1}{\texttt{#1}}%
+ }
+
+\def\tikzname{Ti\emph{k}Z}
+
+\tcbmakedocSubKey{docTikzKey}{tikz}
+\tcbmakedocSubKeys{docTikzKeys}{tikz}
+\tcbmakedocSubKey{docPatternKey}{pgf/pattern keys}
+\tcbmakedocSubKeys{docPatternKeys}{pgf/pattern keys}
+
+
+\makeindex
+
+\pdfsuppresswarningpagegroup=1
diff --git a/graphics/pgf/contrib/tikzfill/tikzfill.hexagon.sty b/graphics/pgf/contrib/tikzfill/tikzfill.hexagon.sty
new file mode 100644
index 0000000000..66ad292e47
--- /dev/null
+++ b/graphics/pgf/contrib/tikzfill/tikzfill.hexagon.sty
@@ -0,0 +1,24 @@
+%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20)
+%% tikzfill.hexagon.sty: filling with hexagon patterns
+%%
+%% -------------------------------------------------------------------------------------------
+%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% -------------------------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% 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 `author-maintained'.
+%%
+%% This work consists of all files listed in README.md
+%%
+\ProvidesPackage{tikzfill.hexagon}[2022/07/20 v1.0.0 Hexagon pattern library for TikZ]
+\RequirePackage{tikzfill-common}
+\ExplSyntaxOn
+\__tikzfill_usetikzlibrary:n { fill.hexagon }
+\ExplSyntaxOff
diff --git a/graphics/pgf/contrib/tikzfill/tikzfill.image.sty b/graphics/pgf/contrib/tikzfill/tikzfill.image.sty
new file mode 100644
index 0000000000..fb7bb3e030
--- /dev/null
+++ b/graphics/pgf/contrib/tikzfill/tikzfill.image.sty
@@ -0,0 +1,24 @@
+%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20)
+%% tikzfill.image.sty: filling with images
+%%
+%% -------------------------------------------------------------------------------------------
+%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% -------------------------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% 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 `author-maintained'.
+%%
+%% This work consists of all files listed in README.md
+%%
+\ProvidesPackage{tikzfill.image}[2022/07/20 v1.0.0 Image filling library for TikZ]
+\RequirePackage{tikzfill-common}
+\ExplSyntaxOn
+\__tikzfill_usetikzlibrary:n { fill.image }
+\ExplSyntaxOff
diff --git a/graphics/pgf/contrib/tikzfill/tikzfill.pdf b/graphics/pgf/contrib/tikzfill/tikzfill.pdf
new file mode 100644
index 0000000000..e68d134f78
--- /dev/null
+++ b/graphics/pgf/contrib/tikzfill/tikzfill.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/tikzfill/tikzfill.rhombus.sty b/graphics/pgf/contrib/tikzfill/tikzfill.rhombus.sty
new file mode 100644
index 0000000000..58deb47655
--- /dev/null
+++ b/graphics/pgf/contrib/tikzfill/tikzfill.rhombus.sty
@@ -0,0 +1,24 @@
+%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20)
+%% tikzfill.rhombus.sty: filling with rhombus patterns
+%%
+%% -------------------------------------------------------------------------------------------
+%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% -------------------------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% 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 `author-maintained'.
+%%
+%% This work consists of all files listed in README.md
+%%
+\ProvidesPackage{tikzfill.rhombus}[2022/07/20 v1.0.0 Rhombus pattern library for TikZ]
+\RequirePackage{tikzfill-common}
+\ExplSyntaxOn
+\__tikzfill_usetikzlibrary:n { fill.rhombus }
+\ExplSyntaxOff
diff --git a/graphics/pgf/contrib/tikzfill/tikzfill.sty b/graphics/pgf/contrib/tikzfill/tikzfill.sty
new file mode 100644
index 0000000000..c9a622b9e5
--- /dev/null
+++ b/graphics/pgf/contrib/tikzfill/tikzfill.sty
@@ -0,0 +1,24 @@
+%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20)
+%% tikzfill.sty: load all fill libraries
+%%
+%% -------------------------------------------------------------------------------------------
+%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% -------------------------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% 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 `author-maintained'.
+%%
+%% This work consists of all files listed in README.md
+%%
+\ProvidesPackage{tikzfill}[2022/07/20 v1.0.0 Image and pattern libraries for TikZ]
+\RequirePackage{tikzfill-common}
+\ExplSyntaxOn
+\__tikzfill_usetikzlibrary:n { fill.image, fill.hexagon, fill.rhombus }
+\ExplSyntaxOff
diff --git a/graphics/pgf/contrib/tikzfill/tikzfill.tex b/graphics/pgf/contrib/tikzfill/tikzfill.tex
new file mode 100644
index 0000000000..4762f59771
--- /dev/null
+++ b/graphics/pgf/contrib/tikzfill/tikzfill.tex
@@ -0,0 +1,1385 @@
+% \LaTeX-Main\
+% !TeX encoding=UTF-8
+%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20)
+%% tikzfill.tex: Manual
+%%
+%% -------------------------------------------------------------------------------------------
+%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% -------------------------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% 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 `author-maintained'.
+%%
+%% This work consists of all files listed in README.md
+%%
+% \RequirePackage[check-declarations,enable-debug]{expl3}
+\documentclass[a4paper,11pt]{article}
+\usepackage{tikzfill-doc}
+
+\usepackage{\tikzfillpkgprefix tikzfill}
+
+\hypersetup{
+ pdftitle={Manual for the tikzfill package},
+ pdfauthor={Thomas F. Sturm},
+ pdfsubject={TikZ libraries for filling with images and patterns},
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\begin{document}
+
+\begin{tcboutputlisting}
+% \documentclass[a4paper]{article}
+% \usepackage{tikzfill}
+% \usetikzlibrary{fadings,shadings}
+% \usepackage[skins,breakable]{tcolorbox}
+% \usepackage{ninecolors}
+% \begin{document}
+\begin{tcolorbox}[spread,blankest,phantom={\thispagestyle{empty}}]
+\begin{tikzfadingfrompicture}[name=titlepicture]
+ \path
+ [
+ pattern hexagon cycle = { size=28mm, rings=5 },
+ pattern color = white,
+ ]
+ (-\tcbtextwidth/2,-\tcbtextheight/2) rectangle
+ (\tcbtextwidth/2,\tcbtextheight/2);
+\end{tikzfadingfrompicture}%
+%
+\begin{tikzpicture}
+ \fill
+ [
+ upper left = blue5, upper right = cyan5,
+ lower left = magenta5, lower right = blue5,
+ ]
+ (-\tcbtextwidth/2,-\tcbtextheight/2) rectangle
+ (\tcbtextwidth/2,\tcbtextheight/2);
+\shade
+ [
+ path fading = titlepicture,
+ fit fading = false,
+ upper left = blue6, upper right = cyan6,
+ lower left = magenta6, lower right = blue6,
+ ]
+ (-\tcbtextwidth/2,-\tcbtextheight/2) rectangle
+ (\tcbtextwidth/2,\tcbtextheight/2);
+\node[white,font=\Huge\bfseries] (title) at (0,\tcbtextheight/4)
+ {The \texttt{tikzfill} package};
+\node[white,font=\Large\bfseries,below=8mm] (title) at (title.south)
+ {Manual for version \version\ (\datum)};
+\node[white,font=\large\bfseries,below=8mm] (title) at (title.south)
+ {Thomas F.~Sturm};
+\end{tikzpicture}
+\end{tcolorbox}
+% \end{document}
+\end{tcboutputlisting}
+\tcbuselistingtext
+\tcbinputlisting{title=Cover code,docexample,listing only}
+
+\clearpage
+
+\begin{center}
+\begin{tcolorbox}[enhanced,hbox,tikznode,left=8mm,right=8mm,boxrule=0.4pt,
+ colback=white,colframe=black!50!yellow,
+ drop lifted shadow=black!50!yellow,arc is angular,
+ before=\par\vspace*{5mm},after=\par\bigskip]
+{\bfseries\LARGE The \texttt{tikzfill} package}\\[3mm]
+{\large Manual for version \version\ (\datum)}
+\end{tcolorbox}
+{\large Thomas F.~Sturm%
+ \footnote{Prof.~Dr.~Dr.~Thomas F.~Sturm, Institut f\"{u}r Mathematik und Informatik,
+ Universit\"{a}t der Bundeswehr M\"{u}nchen, D-85577 Neubiberg, Germany;
+ email: \href{mailto:thomas.sturm@unibw.de}{thomas.sturm@unibw.de}}\par\medskip
+\normalsize\url{https://www.ctan.org/pkg/tikzfill}\par
+\url{https://github.com/T-F-S/tikzfill}
+}
+\end{center}
+\bigskip
+\begin{absquote}
+ \begin{center}\bfseries Abstract\end{center}
+ |tikzfill| is a collection of \tikzname\ libraries which add further
+ options to fill \tikzname\ paths with images and patterns.
+ The libraries comprise fillings with images from files and from \tikzname\ pictures.
+ Also, patterns of hexagons and of rhombi are provided.
+\end{absquote}
+
+\clearpage
+\tableofcontents
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\clearpage
+\section{Short Introduction}\label{sec:intro}
+
+\tikzname\ is a very advanced and comprehensive graphics package for \LaTeX.
+The package |tikzfill| comprises a collection of libraries for \tikzname\, which
+add further options to fill \tikzname\ paths with images and patterns.
+
+For \LaTeX, the provided libraries can be loaded using the preferred
+\tikzname\ mechanism by
+\begin{dispListing*}{}
+\usetikzlibrary{fill.***} % LATEX (primary choice) and plain TEX
+\end{dispListing*}
+where |***| is to be replaced by the actual library name found on the following pages.
+
+Alternatively, the libraries can be loaded using \LaTeX\ style files
+\begin{dispListing*}{}
+\usepackage{tikzfill.***} % LATEX (secondary choice)
+\end{dispListing*}
+
+If you want to load all \tikzname\ libraries of this package, you can use
+the following \LaTeX\ style file
+\begin{dispListing*}{}
+\usepackage{tikzfill} % load all libraries
+\end{dispListing*}
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\clearpage
+\section{Image and Picture Fill Library}\label{sec:imagefill}%
+
+\begin{dispListing*}{title=\tikzname\ Library |fill.image|}
+\usetikzlibrary{fill.image} % LATEX (primary choice) and plain TEX
+\usetikzlibrary[fill.image] % ConTEXt
+\usepackage{tikzfill.image} % LATEX (secondary choice)
+\end{dispListing*}
+
+This library defines options to fill graphs with images or arbitray pictures.
+
+Until |tcolorbox| version 5.1.1 (2022/06/24), the code of this library was part
+of |tcolorbox|. Now, on suggestion of
+\href{https://github.com/muzimuzhi}{muzimuzhi},
+it is a separate library usable without |tcolorbox|. Also, the code is
+completely rewritten with |expl3|.
+
+
+
+\subsection{Fill Plain}
+\begin{docTikzKey}{fill plain image}{=\meta{file name}}{no default, initially unset}
+ Fills the current path with an external image referenced by \meta{file name}.
+ The image is put in the center of the path, but it is not resized to fit into
+ the path area.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[draw,fill plain image=goldshade.png]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+\begin{docTikzKey}{fill plain image*}{=\meta{file name}}{no default, initially unset}
+ Fills the current path with an external image referenced by \meta{file name}.
+ The image is put in the center of the path, but it is not resized to fit into
+ the path area.
+ The \meta{graphics options} are given to the underlying \docAuxCommand*{includegraphics} command.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[draw,
+ fill plain image*={width=2.5cm}{goldshade.png}]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+\enlargethispage*{8mm}
+
+\begin{docTikzKey}{fill plain picture}{=\meta{graphical code}}{no default, initially unset}
+ Fills the current path with the given \meta{graphical code}.
+ The result is put in the center of the path, but it is not resized to fit into
+ the path area. Note that this is almost identical to the standard |path picture| option.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[draw,fill plain picture={%
+ \draw[red!50!yellow,line width=2mm]
+ (0,0) circle (8mm);
+ \draw[red,line width=5mm] (-1,-1) -- (1,1);
+ \draw[red,line width=5mm] (-1,1) -- (1,-1);
+ }]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+\clearpage
+\subsection{Fill Stretch}
+\begin{docTikzKey}{fill stretch image}{=\meta{file name}}{no default, initially unset}
+ Fills the current path with an external image referenced by \meta{file name}.
+ The image is stretched to fill the path area.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[fill stretch image=goldshade.png]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+\begin{docTikzKey}{fill stretch image*}{=\marg{graphics options}\marg{file name}}{no default, initially unset}
+ Fills the current path with an external image referenced by \meta{file name}.
+ The \meta{graphics options} are given to the underlying \docAuxCommand*{includegraphics} command.
+ The image is stretched to fill the path area.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[fill stretch image*=
+ {angle=90,origin=c}{goldshade.png}]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+\begin{docTikzKey}{fill stretch picture}{=\meta{graphical code}}{no default, initially unset}
+ Fills the current path with the given \meta{graphical code}.
+ The result is stretched to fill the path area.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[draw,fill stretch picture={%
+ \draw[red!50!yellow,line width=2mm]
+ (0,0) circle (8mm);
+ \draw[red,line width=5mm] (-1,-1) -- (1,1);
+ \draw[red,line width=5mm] (-1,1) -- (1,-1);
+ }]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+\clearpage
+\subsection{Fill Overzoom}
+\begin{docTikzKey}{fill overzoom image}{=\meta{file name}}{no default, initially unset}
+ Fills the current path with an external image referenced by \meta{file name}.
+ The image is zoomed such that the path area fills the image.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[fill overzoom image=goldshade.png]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+\begin{docTikzKey}{fill overzoom image*}{=\marg{graphics options}\marg{file name}}{no default, initially unset}
+ Fills the current path with an external image referenced by \meta{file name}.
+ The \meta{graphics options} are given to the underlying \docAuxCommand*{includegraphics} command.
+ The image is zoomed such that the path area fills the image.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[fill overzoom image*=
+ {angle=90,origin=c}{goldshade.png}]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+\begin{docTikzKey}{fill overzoom picture}{=\meta{graphical code}}{no default, initially unset}
+ Fills the current path with the given \meta{graphical code}.
+ The result is zoomed such that the path area fills the image.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[draw,fill overzoom picture={%
+ \draw[red!50!yellow,line width=2mm]
+ (0,0) circle (8mm);
+ \draw[red,line width=5mm] (-1,-1) -- (1,1);
+ \draw[red,line width=5mm] (-1,1) -- (1,-1);
+ }]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+\clearpage
+\subsection{Fill Zoom}
+\begin{docTikzKey}{fill zoom image}{=\meta{file name}}{no default, initially unset}
+ Fills the current path with an external image referenced by \meta{file name}.
+ The image is zoomed such that it fits inside the path area.
+ Typically, some parts of the path area will stay unfilled.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[draw,fill zoom image=goldshade.png]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+\begin{docTikzKey}{fill zoom image*}{=\marg{graphics options}\marg{file name}}{no default, initially unset}
+ Fills the current path with an external image referenced by \meta{file name}.
+ The \meta{graphics options} are given to the underlying \docAuxCommand*{includegraphics} command.
+ The image is zoomed such that it fits inside the path area.
+ Typically, some parts of the path area will stay unfilled.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[draw,fill zoom image*=
+ {angle=90,origin=c}{goldshade.png}]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+\begin{docTikzKey}{fill zoom picture}{=\meta{graphical code}}{no default, initially unset}
+ Fills the current path with the given \meta{graphical code}.
+ The result is zoomed such that it fits inside the path area.
+ Typically, some parts of the path area will stay unfilled.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[draw,fill zoom picture={%
+ \draw[red!50!yellow,line width=2mm]
+ (0,0) circle (8mm);
+ \draw[red,line width=5mm] (-1,-1) -- (1,1);
+ \draw[red,line width=5mm] (-1,1) -- (1,-1);
+ }]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+\clearpage
+\subsection{Fill Shrink}
+\begin{docTikzKey}{fill shrink image}{=\meta{file name}}{no default, initially unset}
+ Fills the current path with an external image referenced by \meta{file name}.
+ The image is zoomed such that it fits inside the path area, but it never
+ gets enlarged.
+ Typically, some parts of the path area will stay unfilled.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[draw,fill shrink image=goldshade.png]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+\begin{docTikzKey}{fill shrink image*}{=\meta{file name}}{no default, initially unset}
+ Fills the current path with an external image referenced by \meta{file name}.
+ The \meta{graphics options} are given to the underlying \docAuxCommand*{includegraphics} command.
+ The image is zoomed such that it fits inside the path area, but it never
+ gets enlarged.
+ Typically, some parts of the path area will stay unfilled.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[draw,
+ fill shrink image*={width=1.5cm}{goldshade.png}]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+\begin{docTikzKey}{fill shrink picture}{=\meta{graphical code}}{no default, initially unset}
+ Fills the current path with the given \meta{graphical code}.
+ The result is zoomed such that it fits inside the path area, but it never
+ gets enlarged.
+ Typically, some parts of the path area will stay unfilled.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[draw,fill shrink picture={%
+ \draw[red!50!yellow,line width=2mm]
+ (0,0) circle (8mm);
+ \draw[red,line width=5mm] (-1,-1) -- (1,1);
+ \draw[red,line width=5mm] (-1,1) -- (1,-1);
+ }]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+\clearpage
+\subsection{Fill Tile}
+\begin{docTikzKey}{fill tile image}{=\meta{file name}}{no default, initially unset}
+ Fills the current path with a tile pattern using an external image referenced by \meta{file name}.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[fill tile image=pink_marble.png]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+\begin{docTikzKey}{fill tile image*}{=\marg{graphics options}\marg{file name}}{no default, initially unset}
+ Fills the current path with a tile pattern using an external image referenced by \meta{file name}.
+ The \meta{graphics options} are given to the underlying \docAuxCommand*{includegraphics} command.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[fill tile image*={width=8mm}{pink_marble.png}]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+\begin{docTikzKey}{fill tile picture}{=\meta{graphical code}}{no default, initially unset}
+ Fills the current path with a tile pattern using the given \meta{graphical code}.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[draw,fill tile picture={%
+ \draw[red!50!yellow,line width=2mm]
+ (0,0) circle (8mm);
+ \draw[red,line width=5mm] (-1,-1) -- (1,1);
+ \draw[red,line width=5mm] (-1,1) -- (1,-1);
+ }]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+\begin{docTikzKey}{fill tile picture*}{=\marg{fraction}\marg{graphical code}}{no default, initially unset}
+ Fills the current path with a tile pattern using the given \meta{graphical code}.
+ The graphic is resized by \meta{fraction}.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[draw,fill tile picture*={0.25}{%
+ \draw[red!50!yellow,line width=2mm]
+ (0,0) circle (8mm);
+ \draw[red,line width=5mm] (-1,-1) -- (1,1);
+ \draw[red,line width=5mm] (-1,1) -- (1,-1);
+ }]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+\clearpage
+\subsection{Filling Options}
+\begin{docTikzKey}{fill image opacity}{=\meta{fraction}}{no default, initially |1.0|}
+ Sets the fill opacity for the image or picture fill options to the given \meta{fraction}.
+\begin{dispExample}
+\begin{tikzpicture}
+\path[fill stretch image=goldshade.png] (0,0) circle (8mm);
+\path[fill=red,fill stretch image=goldshade.png,fill image opacity=0.75]
+ (2,0) circle (8mm);
+\path[fill=red,fill stretch image=goldshade.png,fill image opacity=0.5]
+ (4,0) circle (8mm);
+\path[fill=red,fill stretch image=goldshade.png,fill image opacity=0.25]
+ (6,0) circle (8mm);
+\path[fill=red] (8,0) circle (8mm);
+\end{tikzpicture}
+\end{dispExample}
+\end{docTikzKey}
+
+
+\begin{docTikzKey}{fill image scale}{=\meta{fraction}}{no default, initially |1.0|}
+ Stretches, zooms, overzooms or shrinks the image or picture to the given \meta{fraction} of the
+ width and height of the current path.
+\begin{dispExample}
+\begin{tikzpicture}
+\path[draw,fill zoom image=goldshade.png]
+ (0,0) rectangle +(2,2);
+
+\path[draw,fill zoom image=goldshade.png,fill image scale=0.75]
+ (3,0) rectangle +(2,2);
+
+\path[draw,fill zoom image=goldshade.png,fill image scale=1.5]
+ (6,0) rectangle +(2,2);
+\end{tikzpicture}
+\end{dispExample}
+\end{docTikzKey}
+
+
+\begin{docTikzKey}{fill image options}{=\meta{graphics options}}{no default, initially empty}
+ The \meta{graphics options} are given to the underlying \docAuxCommand*{includegraphics} command
+ for the image fill options. This can be just together with
+ \refKey{/tikz/fill stretch image}, \refKey{/tikz/fill overzoom image}, \refKey{/tikz/fill zoom image},
+ and \refKey{/tikz/fill tile image}.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\path[fill image options={width=8mm},
+ fill tile image=pink_marble.png]
+ (2.75,-0.75) -- (3,0) -- (2.75,0.75)
+ \foreach \w in {45,90,...,315}
+ { -- (\w:1.5cm) } -- cycle;
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+\begin{dispExample*}{sbs,lefthand ratio=0.6,center lower,fonttitle=\bfseries,
+ title=Image blending example}
+\begin{tikzpicture}[every node/.style=
+ {circle,minimum width=2cm}]
+\node[fill stretch image=blueshade.png]
+ (A) at (120:3cm) {A};
+\node[fill stretch image=goldshade.png]
+ (B) at (60:3cm) {B};
+\node[
+ preaction={fill stretch image=blueshade.png},
+ fill stretch image=goldshade.png,
+ fill image opacity=0.5] (C) {C};
+\path (A) -- node{$+$} (B);
+\draw[->,very thick] (A)--(C);
+\draw[->,very thick] (B)--(C);
+\end{tikzpicture}
+\end{dispExample*}
+
+
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\clearpage
+\section{Hexagon Pattern Library}\label{sec:hexagon}%
+
+\begin{dispListing*}{title=\tikzname\ Library |fill.hexagon|}
+\usetikzlibrary{fill.hexagon} % LATEX (primary choice) and plain TEX
+\usetikzlibrary[fill.hexagon] % ConTEXt
+\usepackage{tikzfill.hexagon} % LATEX (secondary choice)
+\end{dispListing*}
+
+Based on |patterns.meta|, this library defines new hexagon patterns to fill graphs.
+
+
+
+%-------------------------------------------------------------------------------
+\subsection{Hexagon}
+The \docValue{hexagon} pattern draws hexagons which may be filled or outlined.
+A single pattern is one of two different \emph{bands}, called band 0 and band 1.
+
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern = { hexagon
+ [
+ size = 5mm, angle = 15, line width = 1mm
+ ]},
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+
+Both bands together build a uniform combined pattern.
+
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ preaction = {
+ pattern = { hexagon
+ [
+ size = 5mm, angle = 15, line width = 1mm, band = 1
+ ]},
+ pattern color=blue },
+ pattern = { hexagon
+ [
+ size = 5mm, angle = 15, line width = 1mm, band = 0
+ ]},
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+
+\begin{docTikzKey}{pattern hexagon}{=\marg{pattern keys}}{style, no default}
+ Convenience shortcut for setting the combined pattern (in one color).
+
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern hexagon =
+ {
+ size = 5mm, angle = 15, line width = 1mm
+ },
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+\clearpage
+
+\begin{docPatternKey}{size}{=\meta{size}}{no default, initially |8mm|}
+ The given \meta{size} denotes the length of an edge of one hexagonical tile
+ where the (possibly smaller) hexagon is located in.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern hexagon =
+ {
+ size = 5mm,
+ },
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+
+
+\begin{docPatternKey}{fill}{}{no value, initially set}
+ Sets the hexagons to be filled. |fill| and |draw| are mutually exclusionary.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern hexagon =
+ {
+ fill,
+ },
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+
+\begin{docPatternKey}{draw}{}{no value, initially unset}
+ Sets the hexagons to be outlined. |fill| and |draw| are mutually exclusionary.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern hexagon =
+ {
+ draw,
+ },
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+
+\begin{docPatternKey}{line width}{=\meta{length}}{no default, initially |0.4pt|}
+ Sets the \meta{length} value of the line width.
+ This is only relevant, if the hexagons are not filled.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern hexagon =
+ {
+ draw, line width = 1mm,
+ },
+ pattern color=red
+ ]
+(0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+
+
+\begin{docPatternKeys}
+ {
+ {
+ doc name = xshift,
+ doc parameter = {=\meta{xshift}},
+ doc description = {no default, initially |0pt|}
+ },
+ {
+ doc name = yshift,
+ doc parameter = {=\meta{yshift}},
+ doc description = {no default, initially |0pt|}
+ }
+ }
+ The pattern is shifted by \meta{xshift} and \meta{yshift}.
+ \par
+ Note that for \docValue*{hexagon} is valid, that a pattern is shifted first and rotated afterwards.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ preaction={pattern hexagon grid, pattern color=blue},
+ pattern hexagon =
+ {
+ xshift=3mm, yshift=1mm,
+ },
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKeys}
+
+
+
+\begin{docPatternKey}{angle}{=\meta{angle}}{no default, initially |0|}
+ The pattern is rotated by the given \meta{angle}.
+ \par
+ Note that for \docValue*{hexagon} is valid, that a pattern is shifted first and rotated afterwards.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern hexagon =
+ {
+ angle = 15,
+ },
+ pattern color=red
+ ]
+(0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+
+
+\begin{docPatternKey}{pos}{=\meta{value}}{no default, initially |0.8|}
+ Sets the edge position with a \meta{value} between 0 and 1, where $0$ is
+ the center and $1$ the outer rim of the hexagonical tile. $1$ is a less
+ efficient way to either fill the whole graph or to draw a \docValue*{hexagon grid}.
+
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ preaction={ pattern hexagon={pos=0.8},
+ pattern color=blue!80!red },
+ preaction={ pattern hexagon={pos=0.6},
+ pattern color=blue!60!red },
+ preaction={ pattern hexagon={pos=0.4},
+ pattern color=blue!40!red },
+ pattern hexagon={pos=0.2},
+ pattern color=blue!20!red,
+ ]
+(0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+
+\clearpage
+
+
+\begin{docPatternKey}{band}{=\meta{number}}{no default, initially |0|}
+ \meta{number} can take 0 or 1 and denotes one of two different bands of the pattern.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ preaction = { pattern={hexagon[band=1,draw,
+ line width=1mm]},
+ pattern color=blue },
+ pattern={hexagon[band=0,pos=0.5]},
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+
+
+\clearpage
+%-------------------------------------------------------------------------------
+\subsection{Hexagon Grid}
+The \docValue{hexagon grid} pattern draws a grid made of hexagons. It is
+a single pattern und more efficient than \docValue*{hexagon} with settings |draw,pos=1|.
+
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern = { hexagon grid
+ [
+ size = 5mm, angle = 15, line width = 1mm
+ ]},
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+
+
+\begin{docTikzKey}{pattern hexagon grid}{=\marg{pattern keys}}{style, no default}
+ Convenience shortcut for setting the pattern to \docValue{hexagon grid}:
+\begin{dispListing}
+ pattern = { hexagon grid [ ... ] }
+\end{dispListing}
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern hexagon grid =
+ {
+ size = 5mm, angle = 15, line width = 1mm
+ },
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+
+\begin{docPatternKey}{size}{=\meta{size}}{no default, initially |8mm|}
+ The given \meta{size} denotes the length of an edge of one hexagon.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern hexagon grid =
+ {
+ size = 5mm,
+ },
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+\clearpage
+
+
+\begin{docPatternKeys}
+ {
+ {
+ doc name = xshift,
+ doc parameter = {=\meta{xshift}},
+ doc description = {no default, initially |0pt|}
+ },
+ {
+ doc name = yshift,
+ doc parameter = {=\meta{yshift}},
+ doc description = {no default, initially |0pt|}
+ }
+ }
+ The pattern is shifted by \meta{xshift} and \meta{yshift}.
+ \par
+ Note that for \docValue*{hexagon grid} is valid, that a pattern is shifted first and rotated afterwards.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ preaction={pattern={hexagon grid}, pattern color=blue},
+ pattern hexagon grid =
+ {
+ xshift=3mm, yshift=1mm,
+ },
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKeys}
+
+
+\begin{docPatternKey}{angle}{=\meta{angle}}{no default, initially |0|}
+ The pattern is rotated by the given \meta{angle}.
+ \par
+ Note that for \docValue*{hexagon grid} is valid, that a pattern is shifted first and rotated afterwards.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern hexagon grid =
+ {
+ angle = 15,
+ },
+ pattern color=red
+ ]
+(0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+
+
+\begin{docPatternKey}{line width}{=\meta{length}}{no default, initially |0.4pt|}
+ Sets the \meta{length} value of the line width.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern hexagon grid =
+ {
+ line width = 2mm,
+ },
+ pattern color=red
+ ]
+(0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+
+\clearpage
+%-------------------------------------------------------------------------------
+\subsection{Hexagon Cycle}
+The \docValue{hexagon cycle} pattern draws several hexagon rings in a cyclic manor.
+A single pattern is one of two different \emph{bands}, called band 0 and band 1.
+
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern = { hexagon cycle
+ [
+ size = 5mm, angle = 15
+ ]},
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+
+Both bands together build a uniform combined pattern.
+
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ preaction = {
+ pattern = { hexagon cycle
+ [
+ size = 5mm, angle = 15, band = 1
+ ]},
+ pattern color=blue },
+ pattern = { hexagon cycle
+ [
+ size = 5mm, angle = 15, band = 0
+ ]},
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+
+\begin{docTikzKey}{pattern hexagon cycle}{=\marg{pattern keys}}{style, no default}
+ Convenience shortcut for setting the combined pattern (in one color).
+
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern hexagon cycle =
+ {
+ size = 5mm, angle = 15
+ },
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+\clearpage
+
+\begin{docPatternKey}{size}{=\meta{size}}{no default, initially |8mm|}
+ The given \meta{size} denotes the length of an edge of one hexagonical tile
+ where the (smaller) hexagons are located in.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern hexagon cycle =
+ {
+ size = 5mm,
+ },
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+
+\begin{docPatternKeys}
+ {
+ {
+ doc name = xshift,
+ doc parameter = {=\meta{xshift}},
+ doc description = {no default, initially |0pt|}
+ },
+ {
+ doc name = yshift,
+ doc parameter = {=\meta{yshift}},
+ doc description = {no default, initially |0pt|}
+ }
+ }
+ The pattern is shifted by \meta{xshift} and \meta{yshift}.
+ \par
+ Note that for \docValue*{hexagon cycle} is valid, that a pattern is shifted first and rotated afterwards.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ postaction={pattern={hexagon grid}, pattern color=blue},
+ pattern hexagon cycle =
+ {
+ xshift=3mm, yshift=1mm,
+ },
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKeys}
+
+
+\begin{docPatternKey}{angle}{=\meta{angle}}{no default, initially |0|}
+ The pattern is rotated by the given \meta{angle}.
+ \par
+ Note that for \docValue*{hexagon cycle} is valid, that a pattern is shifted first and rotated afterwards.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern hexagon cycle =
+ {
+ angle = 15,
+ },
+ pattern color=red
+ ]
+(0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+
+\clearpage
+
+
+\begin{docPatternKey}{rings}{=\meta{number}}{no default, initially |3|}
+ Sets the \meta{number} of rings as $0, 1, 2, 3, \ldots$
+
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern hexagon cycle =
+ {
+ rings = 2,
+ },
+ pattern color=red
+ ]
+(0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+
+\begin{docPatternKey}{gap}{=\meta{value}}{no default, initially |1|}
+ Sets the gap between two rings as \meta{value} times the line width of a ring.
+ \meta{value} has to be greater or equal $0.01$.
+
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern hexagon cycle =
+ {
+ gap = 0.5,
+ },
+ pattern color=red
+ ]
+(0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+
+\begin{docPatternKey}{band}{=\meta{number}}{no default, initially |0|}
+ \meta{number} can take 0 or 1 and denotes one of two different bands of the pattern.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ preaction = { pattern={hexagon cycle[
+ band=1, gap=0.5 ]}, pattern color=blue },
+ pattern={hexagon cycle[band=0,rings=2]},
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\clearpage
+\section{Rhombus Pattern Library}\label{sec:rhombus}%
+
+\begin{dispListing*}{title=\tikzname\ Library |fill.rhombus|}
+\usetikzlibrary{fill.rhombus} % LATEX (primary choice) and plain TEX
+\usetikzlibrary[fill.rhombus] % ConTEXt
+\usepackage{tikzfill.rhombus} % LATEX (secondary choice)
+\end{dispListing*}
+
+Based on |patterns.meta|, this library defines new rhombus patterns to fill graphs.
+
+%-------------------------------------------------------------------------------
+\subsection{Rhombus}
+The \docValue{rhombus} pattern draws rhombi or diamonds. The rhombi may be
+filled or outlined and can be arranged in different \emph{bands}, called band 0, band 1, and band 2.
+
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern = { rhombus
+ [
+ size = 8mm, angle = 15
+ ]},
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+
+
+\begin{docTikzKey}{pattern rhombus}{=\marg{pattern keys}}{style, no default}
+ Convenience shortcut for setting the pattern to \docValue{rhombus}:
+\begin{dispListing}
+ pattern = { rhombus [ ... ] }
+\end{dispListing}
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern rhombus =
+ {
+ size = 8mm, angle = 15
+ },
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docTikzKey}
+
+
+\begin{docPatternKey}{size}{=\meta{size}}{no default, initially |10mm|}
+ The given \meta{size} denotes the length of an edge of one rhombical tile
+ where the (possibly smaller) rhombus is located in.
+
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern rhombus =
+ {
+ size = 5mm,
+ },
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+\clearpage
+
+\begin{docPatternKey}{fill}{}{no value, initially set}
+ Sets the rhombi to be filled. |fill| and |draw| are mutually exclusionary.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern rhombus =
+ {
+ fill,
+ },
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+
+\begin{docPatternKey}{draw}{}{no value, initially unset}
+ Sets the rhombi to be outlined. |fill| and |draw| are mutually exclusionary.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern rhombus =
+ {
+ draw,
+ },
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+
+\begin{docPatternKey}{line width}{=\meta{length}}{no default, initially |0.4pt|}
+ Sets the \meta{length} value of the line width. This is only relevant, if
+ the rhombi are not filled.
+
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern rhombus =
+ {
+ line width = 1mm, draw
+ },
+ pattern color=red
+ ]
+(0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+
+\begin{docPatternKey}{angle}{=\meta{angle}}{no default, initially |-40|}
+ The pattern is rotated by the given \meta{angle}.
+ \par
+ Note that for \docValue*{rhombus} is valid, that a pattern is rotated first and shifted afterwards.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern rhombus =
+ {
+ angle = 15,
+ },
+ pattern color=red
+ ]
+(0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+\clearpage
+
+\begin{docPatternKeys}
+ {
+ {
+ doc name = xshift,
+ doc parameter = {=\meta{xshift}},
+ doc description = {no default, initially |0pt|}
+ },
+ {
+ doc name = yshift,
+ doc parameter = {=\meta{yshift}},
+ doc description = {no default, initially |0pt|}
+ }
+ }
+ The pattern is shifted by \meta{xshift} and \meta{yshift}.
+ \par
+ Note that for \docValue*{rhombus} is valid, that a pattern is rotated first and shifted afterwards.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ preaction={pattern rhombus, pattern color=blue},
+ pattern rhombus =
+ {
+ xshift=3mm, yshift=1mm,
+ },
+ pattern color=red
+ ]
+ (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKeys}
+
+
+
+\begin{docPatternKey}{ratio}{=\meta{value}}{no default, initially |2|}
+ Sets the \meta{value} of the ratio
+ between the longer diagonal and the shorter diagonal.
+ Therefore, $\text{\meta{value}}\ge 1$.
+
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ pattern rhombus =
+ {
+ ratio = 4
+ },
+ pattern color=red
+ ]
+(0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+
+
+\begin{docPatternKey}{pos}{=\meta{value}}{no default, initially |1|}
+ Sets the edge position with a \meta{value} between 0 and 1, where $0$ is
+ the center and $1$ the outer rim of the rhombical tile.
+
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ preaction={ pattern rhombus={pos=1},
+ pattern color=blue },
+ preaction={ pattern rhombus={pos=0.8},
+ pattern color=blue!80!red },
+ preaction={ pattern rhombus={pos=0.6},
+ pattern color=blue!60!red },
+ preaction={ pattern rhombus={pos=0.4},
+ pattern color=blue!40!red },
+ pattern rhombus={pos=0.2},
+ pattern color=blue!20!red,
+ ]
+(0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+\clearpage
+
+
+\begin{docPatternKey}{band}{=\meta{number}}{no default, initially |0|}
+ \meta{number} can take 0, 1, or 2.
+ Here, 0 and 1 denote one of two different bands of the pattern,
+ while 2 denotes the comination of both.
+\begin{dispExample*}{sbs,lefthand ratio=0.66,right=2mm,sidebyside gap=5mm,center lower}
+\begin{tikzpicture}
+\draw[
+ preaction = {
+ pattern rhombus = {
+ pos = 0.8, band = 0 },
+ pattern color=red },
+ pattern rhombus = {
+ pos = 0.8, band = 1
+ },
+ pattern color=blue
+ ] (0,0) rectangle (4,4);
+\end{tikzpicture}
+
+\begin{tikzpicture}
+\draw[
+ pattern rhombus = {
+ pos = 0.8, band = 2
+ },
+ pattern color=red
+ ] (0,0) rectangle (4,4);
+\end{tikzpicture}
+\end{dispExample*}
+\end{docPatternKey}
+
+\clearpage
+
+\printindex
+
+\end{document}
diff --git a/graphics/pgf/contrib/tikzfill/tikzlibraryfill.hexagon.code.tex b/graphics/pgf/contrib/tikzfill/tikzlibraryfill.hexagon.code.tex
new file mode 100644
index 0000000000..2fccee15b9
--- /dev/null
+++ b/graphics/pgf/contrib/tikzfill/tikzlibraryfill.hexagon.code.tex
@@ -0,0 +1,315 @@
+%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20)
+%% tikzlibraryfill.hexagon.code.tex: filling with hexagon patterns
+%%
+%% -------------------------------------------------------------------------------------------
+%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% -------------------------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% 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 `author-maintained'.
+%%
+%% This work consists of all files listed in README.md
+%%
+\ProvidesFile{tikzlibraryfill.hexagon.code.tex}[2022/07/20 v1.0.0 Hexagon pattern library]
+
+\usetikzlibrary{patterns.meta}
+
+\ExplSyntaxOn
+
+\int_new:N \l__tikzfill_hex_ring_int
+\tl_new:N \l__tikzfill_hex_a_tl
+\tl_new:N \l__tikzfill_hex_as_tl
+\tl_new:N \l__tikzfill_hex_b_tl
+\tl_new:N \l__tikzfill_hex_bs_tl
+\tl_new:N \l__tikzfill_hex_linewidth_tl
+\tl_new:N \l__tikzfill_hex_pos_tl
+
+\pgfdeclarepattern
+ {
+ name = hexagon~grid,
+ parameters =
+ {
+ \pgfkeysvalueof{/pgf/pattern~keys/size},
+ \pgfkeysvalueof{/pgf/pattern~keys/angle},
+ \pgfkeysvalueof{/pgf/pattern~keys/xshift},
+ \pgfkeysvalueof{/pgf/pattern~keys/yshift},
+ \pgfkeysvalueof{/pgf/pattern~keys/line~width},
+ },
+ defaults =
+ {
+ size /.initial = 8mm,
+ angle /.initial = 0,
+ line~width /.initial = 0.4pt,
+ xshift /.initial = 0pt,
+ yshift /.initial = 0pt,
+ },
+ set~up~code =
+ {
+ \fp_set:Nn \l_tmpa_fp { \pgfkeysvalueof{/pgf/pattern~keys/size} }
+ \tl_set:Nx \l__tikzfill_hex_a_tl { \fp_to_dim:N \l_tmpa_fp }
+ \tl_set:Nx \l__tikzfill_hex_b_tl { \fp_to_dim:n { \l_tmpa_fp*sqrt(3)/2 } }
+ \tl_set:Nx \l__tikzfill_hex_linewidth_tl { \fp_to_dim:n { \pgfkeysvalueof{/pgf/pattern~keys/line~width} } }
+ },
+ bottom~left =
+ {
+ \pgfpoint{ -\l__tikzfill_hex_b_tl-.1pt }{ -\l__tikzfill_hex_a_tl-\l__tikzfill_hex_linewidth_tl }
+ },
+ top~right =
+ {
+ \pgfpoint{ \l__tikzfill_hex_b_tl+.1pt }{ 2*\l__tikzfill_hex_a_tl+.1pt }
+ },
+ tile~size =
+ {
+ \pgfpoint{ 2*\l__tikzfill_hex_b_tl }{ 3*\l__tikzfill_hex_a_tl }
+ },
+ tile~transformation =
+ {
+ \pgftransformrotate{ \pgfkeysvalueof{/pgf/pattern~keys/angle} }
+ \pgftransformshift
+ {
+ \pgfpoint{ \pgfkeysvalueof{/pgf/pattern~keys/xshift} }
+ { \pgfkeysvalueof{/pgf/pattern~keys/yshift} }
+ }
+ },
+ code=
+ {
+ \pgfsetlinewidth{\l__tikzfill_hex_linewidth_tl}
+ \pgfpathmoveto{\pgfpoint{ 0 }{ 2*\l__tikzfill_hex_a_tl+.1pt }}
+ \pgfpathlineto{\pgfpoint{ 0 }{ \l__tikzfill_hex_a_tl }}
+ \pgfpathlineto{\pgfpoint{ -\l__tikzfill_hex_b_tl }{ 0.5*\l__tikzfill_hex_a_tl }}
+ \pgfpathlineto{\pgfpoint{ -\l__tikzfill_hex_b_tl }{ -0.5*\l__tikzfill_hex_a_tl }}
+ \pgfpathlineto{\pgfpoint{ 0 }{ -\l__tikzfill_hex_a_tl }}
+ \pgfpathlineto{\pgfpoint{ \l__tikzfill_hex_b_tl }{ -0.5*\l__tikzfill_hex_a_tl }}
+ \pgfpathlineto{\pgfpoint{ \l__tikzfill_hex_b_tl }{ 0.5*\l__tikzfill_hex_a_tl }}
+ \pgfpathlineto{\pgfpoint{ 0 }{ \l__tikzfill_hex_a_tl }}
+ \pgfusepath{stroke}
+ }
+ }
+
+\tikzset{
+ pattern~hexagon~grid /.style =
+ {
+ pattern={hexagon~grid[#1]}
+ }
+}
+
+
+
+\pgfdeclarepattern
+ {
+ name = hexagon,
+ parameters =
+ {
+ \pgfkeysvalueof{/pgf/pattern~keys/size},
+ \pgfkeysvalueof{/pgf/pattern~keys/angle},
+ \pgfkeysvalueof{/pgf/pattern~keys/xshift},
+ \pgfkeysvalueof{/pgf/pattern~keys/yshift},
+ \pgfkeysvalueof{/pgf/pattern~keys/line~width},
+ \pgfkeysvalueof{/pgf/pattern~keys/pos},
+ \pgfkeysvalueof{/pgf/pattern~keys/band},
+ \pgfkeysvalueof{/pgf/pattern~keys/_fill_},
+ },
+ defaults =
+ {
+ size /.initial = 8mm,
+ angle /.initial = 0,
+ xshift /.initial = 0pt,
+ yshift /.initial = 0pt,
+ line~width /.initial = 0.4pt,
+ pos /.initial = 0.8,
+ band /.initial = 0,
+ _fill_ /.initial = 1,
+ fill /.style = { _fill_=1 },
+ draw /.style = { _fill_=0 },
+ },
+ set~up~code =
+ {
+ \fp_set:Nn \l_tmpa_fp { \pgfkeysvalueof{/pgf/pattern~keys/size} }
+ \tl_set:Nx \l__tikzfill_hex_a_tl { \fp_to_dim:N \l_tmpa_fp }
+ \tl_set:Nx \l__tikzfill_hex_b_tl { \fp_to_dim:n { \l_tmpa_fp*sqrt(3)/2 } }
+ \tl_set:Nx \l__tikzfill_hex_linewidth_tl { \fp_to_dim:n { \pgfkeysvalueof{/pgf/pattern~keys/line~width} } }
+ \tl_set:Nx \l__tikzfill_hex_pos_tl { \fp_to_decimal:n { min ( 1 , max( 0, \pgfkeysvalueof{/pgf/pattern~keys/pos} )) } }
+ },
+ bottom~left =
+ {
+ \pgfpoint{ -\l__tikzfill_hex_b_tl-\l__tikzfill_hex_linewidth_tl }{ -\l__tikzfill_hex_a_tl-\l__tikzfill_hex_linewidth_tl }
+ },
+ top~right =
+ {
+ \pgfpoint{ \l__tikzfill_hex_b_tl+\l__tikzfill_hex_linewidth_tl }{ 2*\l__tikzfill_hex_a_tl+\l__tikzfill_hex_linewidth_tl }
+ },
+ tile~size =
+ {
+ \pgfpoint{ 2*\l__tikzfill_hex_b_tl }{ 3*\l__tikzfill_hex_a_tl }
+ },
+ tile~transformation =
+ {
+ \pgftransformrotate{ \pgfkeysvalueof{/pgf/pattern~keys/angle} }
+ \int_compare:nNnTF { \pgfkeysvalueof{/pgf/pattern~keys/band} } = 0
+ {
+ \pgftransformshift
+ {
+ \pgfpoint{ \pgfkeysvalueof{/pgf/pattern~keys/xshift} }
+ { \pgfkeysvalueof{/pgf/pattern~keys/yshift} }
+ }
+ }
+ {
+ \pgftransformshift
+ {
+ \pgfpoint{ \pgfkeysvalueof{/pgf/pattern~keys/xshift}-\l__tikzfill_hex_b_tl }
+ { \pgfkeysvalueof{/pgf/pattern~keys/yshift}+1.5*\l__tikzfill_hex_a_tl }
+ }
+ }
+ },
+ code=
+ {
+ \tl_set:Nx \l__tikzfill_hex_as_tl { \fp_to_dim:n { \l__tikzfill_hex_pos_tl*\l__tikzfill_hex_a_tl } }
+ \tl_set:Nx \l__tikzfill_hex_bs_tl { \fp_to_dim:n { \l__tikzfill_hex_pos_tl*\l__tikzfill_hex_b_tl } }
+ \pgfpathmoveto{\pgfpoint{ 0 }{ \l__tikzfill_hex_as_tl }}
+ \pgfpathlineto{\pgfpoint{ -\l__tikzfill_hex_bs_tl }{ 0.5*\l__tikzfill_hex_as_tl }}
+ \pgfpathlineto{\pgfpoint{ -\l__tikzfill_hex_bs_tl }{ -0.5*\l__tikzfill_hex_as_tl }}
+ \pgfpathlineto{\pgfpoint{ 0 }{ -\l__tikzfill_hex_as_tl }}
+ \pgfpathlineto{\pgfpoint{ \l__tikzfill_hex_bs_tl }{ -0.5*\l__tikzfill_hex_as_tl }}
+ \pgfpathlineto{\pgfpoint{ \l__tikzfill_hex_bs_tl }{ 0.5*\l__tikzfill_hex_as_tl }}
+ \pgfpathclose
+ \int_compare:nNnTF { \pgfkeysvalueof{/pgf/pattern~keys/_fill_} } = 1
+ {
+ \pgfusepath{fill}
+ }
+ {
+ \pgfsetlinewidth{\l__tikzfill_hex_linewidth_tl}
+ \pgfusepath{stroke}
+ }
+ }
+ }
+
+
+\tikzset{
+ pattern~hexagon /.style =
+ {
+ preaction={pattern={hexagon[#1,band=1]}},
+ pattern={hexagon[#1,band=0]}
+ }
+}
+
+
+
+\pgfdeclarepattern
+ {
+ name = hexagon~cycle,
+ parameters =
+ {
+ \pgfkeysvalueof{/pgf/pattern~keys/size},
+ \pgfkeysvalueof{/pgf/pattern~keys/angle},
+ \pgfkeysvalueof{/pgf/pattern~keys/xshift},
+ \pgfkeysvalueof{/pgf/pattern~keys/yshift},
+ \pgfkeysvalueof{/pgf/pattern~keys/rings},
+ \pgfkeysvalueof{/pgf/pattern~keys/gap},
+ \pgfkeysvalueof{/pgf/pattern~keys/band},
+ },
+ defaults =
+ {
+ size /.initial = 8mm,
+ angle /.initial = 0,
+ xshift /.initial = 0pt,
+ yshift /.initial = 0pt,
+ rings /.initial = 3,
+ gap /.initial = 1,
+ band /.initial = 0,
+ },
+ set~up~code =
+ {
+ \fp_set:Nn \l_tmpa_fp { \pgfkeysvalueof{/pgf/pattern~keys/size} }
+ \tl_set:Nx \l__tikzfill_hex_a_tl { \fp_to_dim:N \l_tmpa_fp }
+ \tl_set:Nx \l__tikzfill_hex_b_tl { \fp_to_dim:n { \l_tmpa_fp*sqrt(3)/2 } }
+ \int_set:Nn \l__tikzfill_hex_ring_int { \fp_to_int:n { max ( 0, \pgfkeysvalueof{/pgf/pattern~keys/rings} ) }}
+ \fp_set:Nn \l_tmpa_fp { max ( 0.01, \pgfkeysvalueof{/pgf/pattern~keys/gap} ) }
+ \tl_set:Nx \l__tikzfill_hex_linewidth_tl { \fp_to_dim:n
+ {
+ \l__tikzfill_hex_b_tl / (( \l__tikzfill_hex_ring_int + 0.5 )*( 1 + \l_tmpa_fp ))
+ }}
+ },
+ bottom~left =
+ {
+ \pgfpoint{ -\l__tikzfill_hex_b_tl }{ -\l__tikzfill_hex_a_tl }
+ },
+ top~right =
+ {
+ \pgfpoint{ \l__tikzfill_hex_b_tl }{ 2*\l__tikzfill_hex_a_tl }
+ },
+ tile~size =
+ {
+ \pgfpoint{ 2*\l__tikzfill_hex_b_tl }{ 3*\l__tikzfill_hex_a_tl }
+ },
+ tile~transformation =
+ {
+ \pgftransformrotate{ \pgfkeysvalueof{/pgf/pattern~keys/angle} }
+ \int_compare:nNnTF { \pgfkeysvalueof{/pgf/pattern~keys/band} } = 0
+ {
+ \pgftransformshift
+ {
+ \pgfpoint{ \pgfkeysvalueof{/pgf/pattern~keys/xshift} }
+ { \pgfkeysvalueof{/pgf/pattern~keys/yshift} }
+ }
+ }
+ {
+ \pgftransformshift
+ {
+ \pgfpoint{ \pgfkeysvalueof{/pgf/pattern~keys/xshift}-\l__tikzfill_hex_b_tl }
+ { \pgfkeysvalueof{/pgf/pattern~keys/yshift}+1.5*\l__tikzfill_hex_a_tl }
+ }
+ }
+ },
+ code=
+ {
+ \tl_set:Nn \l__tikzfill_hex_pos_tl { \l__tikzfill_hex_linewidth_tl/2/\l__tikzfill_hex_b_tl }
+ \tl_set:Nx \l__tikzfill_hex_as_tl { \fp_to_dim:n { \l__tikzfill_hex_pos_tl*\l__tikzfill_hex_a_tl } }
+ \tl_set:Nx \l__tikzfill_hex_bs_tl { \fp_to_dim:n { \l__tikzfill_hex_pos_tl*\l__tikzfill_hex_b_tl } }
+ \pgfpathmoveto{\pgfpoint{ 0 }{ \l__tikzfill_hex_as_tl }}
+ \pgfpathlineto{\pgfpoint{ -\l__tikzfill_hex_bs_tl }{ 0.5*\l__tikzfill_hex_as_tl }}
+ \pgfpathlineto{\pgfpoint{ -\l__tikzfill_hex_bs_tl }{ -0.5*\l__tikzfill_hex_as_tl }}
+ \pgfpathlineto{\pgfpoint{ 0 }{ -\l__tikzfill_hex_as_tl }}
+ \pgfpathlineto{\pgfpoint{ \l__tikzfill_hex_bs_tl }{ -0.5*\l__tikzfill_hex_as_tl }}
+ \pgfpathlineto{\pgfpoint{ \l__tikzfill_hex_bs_tl }{ 0.5*\l__tikzfill_hex_as_tl }}
+ \pgfpathclose
+ \pgfusepath{fill}
+ %
+ \pgfsetlinewidth{\l__tikzfill_hex_linewidth_tl}
+ \int_step_function:nN { \l__tikzfill_hex_ring_int } \__tikzfill_hex_draw_ring:n
+ }
+ }
+
+
+\cs_set:Npn \__tikzfill_hex_draw_ring:n #1
+ {
+ \tl_set:Nn \l__tikzfill_hex_pos_tl { #1/( \l__tikzfill_hex_ring_int + 0.5 )}
+ \tl_set:Nx \l__tikzfill_hex_as_tl { \fp_to_dim:n { \l__tikzfill_hex_pos_tl*\l__tikzfill_hex_a_tl } }
+ \tl_set:Nx \l__tikzfill_hex_bs_tl { \fp_to_dim:n { \l__tikzfill_hex_pos_tl*\l__tikzfill_hex_b_tl } }
+ \pgfpathmoveto{\pgfpoint{ 0 }{ \l__tikzfill_hex_as_tl }}
+ \pgfpathlineto{\pgfpoint{ -\l__tikzfill_hex_bs_tl }{ 0.5*\l__tikzfill_hex_as_tl }}
+ \pgfpathlineto{\pgfpoint{ -\l__tikzfill_hex_bs_tl }{ -0.5*\l__tikzfill_hex_as_tl }}
+ \pgfpathlineto{\pgfpoint{ 0 }{ -\l__tikzfill_hex_as_tl }}
+ \pgfpathlineto{\pgfpoint{ \l__tikzfill_hex_bs_tl }{ -0.5*\l__tikzfill_hex_as_tl }}
+ \pgfpathlineto{\pgfpoint{ \l__tikzfill_hex_bs_tl }{ 0.5*\l__tikzfill_hex_as_tl }}
+ \pgfpathclose
+ \pgfusepath{stroke}
+ }
+
+
+\tikzset{
+ pattern~hexagon~cycle /.style =
+ {
+ preaction={pattern={hexagon~cycle[#1,band=1]}},
+ pattern={hexagon~cycle[#1,band=0]}%
+ }
+}
+
+
+\ExplSyntaxOff
diff --git a/graphics/pgf/contrib/tikzfill/tikzlibraryfill.image.code.tex b/graphics/pgf/contrib/tikzfill/tikzlibraryfill.image.code.tex
new file mode 100644
index 0000000000..ed20d0e780
--- /dev/null
+++ b/graphics/pgf/contrib/tikzfill/tikzlibraryfill.image.code.tex
@@ -0,0 +1,400 @@
+%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20)
+%% tikzlibraryfill.image.code.tex: filling with images
+%%
+%% -------------------------------------------------------------------------------------------
+%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% -------------------------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% 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 `author-maintained'.
+%%
+%% This work consists of all files listed in README.md
+%%
+\ProvidesFile{tikzlibraryfill.image.code.tex}[2022/07/20 v1.0.0 Image filling library]
+
+\ExplSyntaxOn
+
+\box_new:N \l__tikzfill_img_box
+
+\tl_new:N \l__tikzfill_img_xa_tl
+\tl_new:N \l__tikzfill_img_xb_tl
+\tl_new:N \l__tikzfill_img_ya_tl
+\tl_new:N \l__tikzfill_img_yb_tl
+\tl_new:N \l__tikzfill_img_xc_tl
+\tl_new:N \l__tikzfill_img_yc_tl
+\tl_new:N \l__tikzfill_img_width_tl
+\tl_new:N \l__tikzfill_img_height_tl
+
+\tl_new:N \l__tikzfill_img_opacity_tl
+\tl_new:N \l__tikzfill_img_scale_tl
+\tl_new:N \l__tikzfill_img_graphics_options_tl
+
+\fp_new:N \l__tikzfill_img_scale_x_fp
+\fp_new:N \l__tikzfill_img_scale_y_fp
+
+
+\cs_new_nopar:Npn \__tikzfill_img_process_ppbb:
+ {
+ \pgf@process{\pgfpointanchor{path~picture~bounding~box}{south~west}}
+ \tl_set:Nx \l__tikzfill_img_xa_tl { \dim_eval:n { \pgf@x } }
+ \tl_set:Nx \l__tikzfill_img_ya_tl { \dim_eval:n { \pgf@y } }
+ \pgf@process{\pgfpointanchor{path~picture~bounding~box}{north~east}}
+ \tl_set:Nx \l__tikzfill_img_xb_tl { \dim_eval:n { \pgf@x } }
+ \tl_set:Nx \l__tikzfill_img_yb_tl { \dim_eval:n { \pgf@y } }
+ \tl_set:Nx \l__tikzfill_img_width_tl { \dim_eval:n { \pgf@x - \l__tikzfill_img_xa_tl } }
+ \tl_set:Nx \l__tikzfill_img_height_tl { \dim_eval:n { \pgf@y - \l__tikzfill_img_ya_tl } }
+ \pgfsetfillopacity{\l__tikzfill_img_opacity_tl}
+ \pgfsetstrokeopacity{\l__tikzfill_img_opacity_tl}
+ }
+
+
+\cs_new_nopar:Npn \__tikzfill_img_path_picture:n #1
+ {
+ \pgfkeysalso
+ {
+ path~picture =
+ {
+ \__tikzfill_img_process_ppbb:
+ #1
+ }
+ }
+ }
+
+
+\cs_new_nopar:Npn \__tikzfill_img_draw_textbox:n #1
+ {
+ \pgftext
+ [
+ x = \dim_eval:n { \l__tikzfill_img_xa_tl + \l__tikzfill_img_width_tl/2 },
+ y = \dim_eval:n { \l__tikzfill_img_ya_tl + \l__tikzfill_img_height_tl/2 }
+ ]{ #1 }
+ }
+
+
+\cs_new_nopar:Npn \__tikzfill_img_include_graphics:n #1
+ {
+ \tl_set_eq:NN \l_tmpa_tl \l__tikzfill_img_graphics_options_tl
+ \tl_if_empty:NTF \l_tmpa_tl
+ {
+ \tl_set:Nn \l_tmpa_tl { \includegraphics }
+ }
+ {
+ \tl_put_left:Nn \l_tmpa_tl { \includegraphics[ }
+ \tl_put_right:Nn \l_tmpa_tl { ] }
+ }
+ \l_tmpa_tl { #1 }
+ }
+
+
+\cs_new_nopar:Npn \__tikzfill_img_set_box_to_image:n #1
+ {
+ \hbox_set:Nn \l__tikzfill_img_box
+ {
+ \pgfinterruptpicture
+ \group_begin:
+ \__tikzfill_img_include_graphics:n { #1 }
+ \group_end:
+ \endpgfinterruptpicture
+ }
+ }
+
+
+
+\cs_new_nopar:Npn \__tikzfill_img_set_box_to_picture:n #1
+ {
+ \hbox_set:Nn \l__tikzfill_img_box
+ {
+ \pgfinterruptpicture
+ \group_begin:
+ \pgfsetbaseline{0pt}
+ \tikzpicture#1\endtikzpicture
+ \group_end:
+ \endpgfinterruptpicture
+ }
+ }
+
+
+\cs_new_nopar:Npn \__tikzfill_img_draw_box:
+ {
+ \__tikzfill_img_draw_textbox:n
+ {
+ \box_use_drop:N \l__tikzfill_img_box
+ }
+ }
+
+
+\cs_new_nopar:Npn \__tikzfill_img_stretch_draw_box:
+ {
+ \box_resize_to_wd_and_ht_plus_dp:Nnn \l__tikzfill_img_box
+ { \fp_to_dim:n { \l__tikzfill_img_scale_tl*\l__tikzfill_img_width_tl }}
+ { \fp_to_dim:n { \l__tikzfill_img_scale_tl*\l__tikzfill_img_height_tl }}
+ \__tikzfill_img_draw_box:
+ }
+
+
+\cs_new_nopar:Npn \xxxx__tikzfill_img_compute_scales:
+ {
+ \fp_set:Nn \l_tmpa_fl { \box_wd:N \l__tikzfill_img_box }
+ \fp_compare:nNnTF \l_tmpa_fl < {1pt}
+ {
+ \fp_set_eq:NN \l__tikzfill_img_scale_x_fp \c_one_fp
+ }
+ {
+ \fp_set:Nn \l__tikzfill_img_scale_x_fp
+ {
+ \l__tikzfill_img_scale_tl*\l__tikzfill_img_width_tl / \l_tmpa_fl
+ }
+ }
+ \fp_set:Nn \l_tmpb_fl { \box_ht:N \l__tikzfill_img_box + \box_dp:N \l__tikzfill_img_box }
+ \fp_compare:nNnTF \l_tmpb_fl < {1pt}
+ {
+ \fp_set_eq:NN \l__tikzfill_img_scale_y_fp \c_one_fp
+ }
+ {
+ \fp_set:Nn \l__tikzfill_img_scale_y_fp
+ {
+ \l__tikzfill_img_scale_tl*\l__tikzfill_img_height_tl / \l_tmpb_fl
+ }
+ }
+ }
+
+
+\cs_new_nopar:Npn \__tikzfill_img_compute_scales:
+ {
+ \dim_set:Nn \l_tmpa_dim { \box_wd:N \l__tikzfill_img_box }
+ \dim_compare:nNnTF \l_tmpa_dim < {1pt}
+ {
+ \fp_set_eq:NN \l__tikzfill_img_scale_x_fp \c_one_fp
+ }
+ {
+ \fp_set:Nn \l__tikzfill_img_scale_x_fp
+ {
+ \l__tikzfill_img_scale_tl * \l__tikzfill_img_width_tl / \l_tmpa_dim
+ }
+ }
+ \dim_set:Nn \l_tmpb_dim { \box_ht:N \l__tikzfill_img_box + \box_dp:N \l__tikzfill_img_box }
+ \dim_compare:nNnTF \l_tmpb_dim < {1pt}
+ {
+ \fp_set_eq:NN \l__tikzfill_img_scale_y_fp \c_one_fp
+ }
+ {
+ \fp_set:Nn \l__tikzfill_img_scale_y_fp
+ {
+ \l__tikzfill_img_scale_tl * \l__tikzfill_img_height_tl / \l_tmpb_dim
+ }
+ }
+ }
+
+
+\cs_new_nopar:Npn \__tikzfill_img_scale_draw_box:
+ {
+ \box_scale:Nnn \l__tikzfill_img_box
+ { \fp_to_dim:N \l__tikzfill_img_scale_x_fp }
+ { \fp_to_dim:N \l__tikzfill_img_scale_y_fp }
+ \__tikzfill_img_draw_box:
+ }
+
+
+\cs_new_nopar:Npn \__tikzfill_img_overzoom_draw_box:
+ {
+ \__tikzfill_img_compute_scales:
+ \fp_compare:nNnTF \l__tikzfill_img_scale_x_fp > \l__tikzfill_img_scale_y_fp
+ { \fp_set_eq:NN \l__tikzfill_img_scale_y_fp \l__tikzfill_img_scale_x_fp }
+ { \fp_set_eq:NN \l__tikzfill_img_scale_x_fp \l__tikzfill_img_scale_y_fp }
+ \__tikzfill_img_scale_draw_box:
+ }
+
+
+\cs_new_nopar:Npn \__tikzfill_img_zoom_draw_box:
+ {
+ \__tikzfill_img_compute_scales:
+ \fp_compare:nNnTF \l__tikzfill_img_scale_x_fp > \l__tikzfill_img_scale_y_fp
+ { \fp_set_eq:NN \l__tikzfill_img_scale_x_fp \l__tikzfill_img_scale_y_fp }
+ { \fp_set_eq:NN \l__tikzfill_img_scale_y_fp \l__tikzfill_img_scale_x_fp }
+ \__tikzfill_img_scale_draw_box:
+ }
+
+
+\cs_new_nopar:Npn \__tikzfill_img_shrink_draw_box:
+ {
+ \__tikzfill_img_compute_scales:
+ \fp_compare:nNnTF \l__tikzfill_img_scale_x_fp > \l__tikzfill_img_scale_y_fp
+ { \fp_set_eq:NN \l__tikzfill_img_scale_x_fp \l__tikzfill_img_scale_y_fp }
+ { \fp_set_eq:NN \l__tikzfill_img_scale_y_fp \l__tikzfill_img_scale_x_fp }
+ \fp_compare:nNnT \l__tikzfill_img_scale_x_fp > 1
+ {
+ \fp_set_eq:NN \l__tikzfill_img_scale_x_fp \c_one_fp
+ \fp_set_eq:NN \l__tikzfill_img_scale_y_fp \c_one_fp
+ }
+ \__tikzfill_img_scale_draw_box:
+ }
+
+
+\cs_new_nopar:Npn \__tikzfill_img_tile_draw_box:
+ {
+ \dim_set:Nn \l_tmpa_dim { \box_wd:N \l__tikzfill_img_box }
+ \dim_set:Nn \l_tmpb_dim { \box_ht:N \l__tikzfill_img_box + \box_dp:N \l__tikzfill_img_box }
+ \dim_set:Nn \l_tmpb_dim { -\l_tmpb_dim }
+
+ \dim_step_variable:nnnNn
+ { \l__tikzfill_img_xa_tl }
+ { \l_tmpa_dim }
+ { \l__tikzfill_img_xb_tl }
+ \l__tikzfill_img_xc_tl
+ {
+ \dim_step_variable:nnnNn
+ { \l__tikzfill_img_yb_tl }
+ { \l_tmpb_dim }
+ { \l__tikzfill_img_ya_tl }
+ \l__tikzfill_img_yc_tl
+ {
+ \pgftext
+ [
+ x = \l__tikzfill_img_xc_tl,
+ y = \l__tikzfill_img_yc_tl,
+ left,
+ top
+ ]
+ { \box_use:N\l__tikzfill_img_box }
+ }
+ }
+ }
+
+
+\tikzset
+ {
+ fill~image~opacity/.store~in=\l__tikzfill_img_opacity_tl,
+ fill~image~opacity=1,
+ fill~image~scale/.store~in=\l__tikzfill_img_scale_tl,
+ fill~image~scale=1,
+ fill~image~options/.store~in=\l__tikzfill_img_graphics_options_tl,
+ fill~image~options=,
+ fill~plain~image/.code=
+ {
+ \__tikzfill_img_path_picture:n
+ {
+ \__tikzfill_img_draw_textbox:n
+ {
+ \__tikzfill_img_include_graphics:n { #1 }
+ }
+ }
+ },
+ fill~plain~picture/.code=
+ {
+ \__tikzfill_img_set_box_to_picture:n { #1 }
+ \__tikzfill_img_path_picture:n
+ {
+ \__tikzfill_img_draw_box:
+ }
+ },
+ fill~stretch~image/.code=
+ {
+ \__tikzfill_img_set_box_to_image:n { #1 }
+ \__tikzfill_img_path_picture:n
+ {
+ \__tikzfill_img_stretch_draw_box:
+ }
+ },
+ fill~stretch~picture/.code=
+ {
+ \__tikzfill_img_set_box_to_picture:n { #1 }
+ \__tikzfill_img_path_picture:n
+ {
+ \__tikzfill_img_stretch_draw_box:
+ }
+ },
+ fill~overzoom~image/.code=
+ {
+ \__tikzfill_img_set_box_to_image:n { #1 }
+ \__tikzfill_img_path_picture:n
+ {
+ \__tikzfill_img_overzoom_draw_box:
+ }
+ },
+ fill~overzoom~picture/.code=
+ {
+ \__tikzfill_img_set_box_to_picture:n { #1 }
+ \__tikzfill_img_path_picture:n
+ {
+ \__tikzfill_img_overzoom_draw_box:
+ }
+ },
+ fill~zoom~image/.code=
+ {
+ \__tikzfill_img_set_box_to_image:n { #1 }
+ \__tikzfill_img_path_picture:n
+ {
+ \__tikzfill_img_zoom_draw_box:
+ }
+ },
+ fill~zoom~picture/.code=
+ {
+ \__tikzfill_img_set_box_to_picture:n { #1 }
+ \__tikzfill_img_path_picture:n
+ {
+ \__tikzfill_img_zoom_draw_box:
+ }
+ },
+ fill~shrink~image/.code=
+ {
+ \__tikzfill_img_set_box_to_image:n { #1 }
+ \__tikzfill_img_path_picture:n
+ {
+ \__tikzfill_img_shrink_draw_box:
+ }
+ },
+ fill~shrink~picture/.code=
+ {
+ \__tikzfill_img_set_box_to_picture:n { #1 }
+ \__tikzfill_img_path_picture:n
+ {
+ \__tikzfill_img_shrink_draw_box:
+ }
+ },
+ fill~tile~image/.code=
+ {
+ \__tikzfill_img_set_box_to_image:n { #1 }
+ \__tikzfill_img_path_picture:n
+ {
+ \__tikzfill_img_tile_draw_box:
+ }
+ },
+ fill~tile~picture/.code=
+ {
+ \__tikzfill_img_set_box_to_picture:n { #1 }
+ \__tikzfill_img_path_picture:n
+ {
+ \__tikzfill_img_tile_draw_box:
+ }
+ },
+ fill~tile~picture*/.code~n~args={2}
+ {
+ \__tikzfill_img_set_box_to_picture:n { #2 }
+ \box_scale:Nnn \l__tikzfill_img_box { #1 }{ #1 }
+ \__tikzfill_img_path_picture:n
+ {
+ \__tikzfill_img_tile_draw_box:
+ }
+ },
+ }
+
+
+\ExplSyntaxOff
+
+\tikzset
+ {
+ fill plain image*/.style n args={2}{fill image options={#1},fill plain image={#2}},%
+ fill stretch image*/.style n args={2}{fill image options={#1},fill stretch image={#2}},%
+ fill overzoom image*/.style n args={2}{fill image options={#1},fill overzoom image={#2}},%
+ fill zoom image*/.style n args={2}{fill image options={#1},fill zoom image={#2}},%
+ fill shrink image*/.style n args={2}{fill image options={#1},fill shrink image={#2}},%
+ fill tile image*/.style n args={2}{fill image options={#1},fill tile image={#2}},%
+ }
+
diff --git a/graphics/pgf/contrib/tikzfill/tikzlibraryfill.rhombus.code.tex b/graphics/pgf/contrib/tikzfill/tikzlibraryfill.rhombus.code.tex
new file mode 100644
index 0000000000..e425470c44
--- /dev/null
+++ b/graphics/pgf/contrib/tikzfill/tikzlibraryfill.rhombus.code.tex
@@ -0,0 +1,159 @@
+%% The LaTeX package tikzfill - version 1.0.0 (2022/07/20)
+%% tikzlibraryfill.rhombus.code.tex: filling with rhombus patterns
+%%
+%% -------------------------------------------------------------------------------------------
+%% Copyright (c) 2022-2022 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% -------------------------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% 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 `author-maintained'.
+%%
+%% This work consists of all files listed in README.md
+%%
+\ProvidesFile{tikzlibraryfill.rhombus.code.tex}[2022/07/15 v0.0.1 Rhombus pattern library]
+
+\usetikzlibrary{patterns.meta}
+
+\ExplSyntaxOn
+
+\fp_new:N \l__tikzfill_rho_angle_fp
+\fp_new:N \l__tikzfill_rho_d_fp
+\fp_new:N \l__tikzfill_rho_s_fp
+
+\tl_new:N \l__tikzfill_rho_dsize_tl
+\tl_new:N \l__tikzfill_rho_linewidth_tl
+\tl_new:N \l__tikzfill_rho_matrix_a_tl
+\tl_new:N \l__tikzfill_rho_matrix_b_tl
+\tl_new:N \l__tikzfill_rho_matrix_c_tl
+\tl_new:N \l__tikzfill_rho_matrix_d_tl
+\tl_new:N \l__tikzfill_rho_poffset_tl
+\tl_new:N \l__tikzfill_rho_psize_tl
+\tl_new:N \l__tikzfill_rho_size_tl
+
+
+\pgfdeclarepattern
+ {
+ name = rhombus,
+ parameters =
+ {
+ \pgfkeysvalueof{/pgf/pattern~keys/size},
+ \pgfkeysvalueof{/pgf/pattern~keys/angle},
+ \pgfkeysvalueof{/pgf/pattern~keys/ratio},
+ \pgfkeysvalueof{/pgf/pattern~keys/xshift},
+ \pgfkeysvalueof{/pgf/pattern~keys/yshift},
+ \pgfkeysvalueof{/pgf/pattern~keys/line~width},
+ \pgfkeysvalueof{/pgf/pattern~keys/pos},
+ \pgfkeysvalueof{/pgf/pattern~keys/band},
+ \pgfkeysvalueof{/pgf/pattern~keys/_fill_},
+ },
+ defaults =
+ {
+ size /.initial = 10mm,
+ angle /.initial = -40,
+ ratio /.initial = 2,
+ xshift /.initial = 0pt,
+ yshift /.initial = 0pt,
+ line~width /.initial = 0.4pt,
+ pos /.initial = 1,
+ band /.initial = 0,
+ _fill_ /.initial = 1,
+ fill /.style = { _fill_=1 },
+ draw /.style = { _fill_=0 },
+ },
+ set~up~code =
+ {
+ \tl_set:Nx \l__tikzfill_rho_linewidth_tl { \fp_to_dim:n { \pgfkeysvalueof{/pgf/pattern~keys/line~width} } }
+
+ \fp_set:Nn \l_tmpa_fp { \pgfkeysvalueof{/pgf/pattern~keys/size} }
+ \tl_set:Nx \l__tikzfill_rho_size_tl { \fp_to_dim:N \l_tmpa_fp }
+ \tl_set:Nx \l__tikzfill_rho_dsize_tl { \fp_to_dim:n { 2 * \l_tmpa_fp } }
+
+ \fp_set:Nn \l_tmpb_fp { min ( 1, max( 0, \pgfkeysvalueof{/pgf/pattern~keys/pos} )) }
+ \tl_set:Nx \l__tikzfill_rho_psize_tl { \fp_to_dim:n { \l_tmpa_fp * \l_tmpb_fp } }
+ \tl_set:Nx \l__tikzfill_rho_poffset_tl { \fp_to_dim:n { \l_tmpa_fp * (1-\l_tmpb_fp)/2 } }
+
+ \fp_set:Nn \l__tikzfill_rho_angle_fp { \pgfkeysvalueof{/pgf/pattern~keys/angle} }
+
+ \fp_set:Nn \l_tmpa_fp { max( 1 , \pgfkeysvalueof{/pgf/pattern~keys/ratio} ) }
+ \fp_set:Nn \l_tmpa_fp { \l_tmpa_fp*\l_tmpa_fp }
+ \fp_set:Nn \l__tikzfill_rho_s_fp{ (\l_tmpa_fp-1)/(\l_tmpa_fp+1) }
+
+ \fp_set:Nn \l__tikzfill_rho_d_fp { sqrt( 1 - \l__tikzfill_rho_s_fp * \l__tikzfill_rho_s_fp ) }
+ \fp_set:Nn \l_tmpb_fp
+ {
+ \l__tikzfill_rho_angle_fp - atand( \l__tikzfill_rho_d_fp / ( 1 + \l__tikzfill_rho_s_fp ) )
+ }
+ \fp_set:Nn \l_tmpa_fp { cosd(\l_tmpb_fp) }
+ \fp_set:Nn \l_tmpb_fp { sind(\l_tmpb_fp) }
+
+ \tl_set:Nx \l__tikzfill_rho_matrix_a_tl { \fp_to_decimal:N \l_tmpa_fp }
+ \tl_set:Nx \l__tikzfill_rho_matrix_b_tl { \fp_to_decimal:N \l_tmpb_fp }
+ \tl_set:Nx \l__tikzfill_rho_matrix_c_tl { \fp_to_decimal:n
+ {
+ \l__tikzfill_rho_s_fp * \l_tmpa_fp - \l__tikzfill_rho_d_fp * \l_tmpb_fp
+ }}
+ \tl_set:Nx \l__tikzfill_rho_matrix_d_tl { \fp_to_decimal:n
+ {
+ \l__tikzfill_rho_s_fp * \l_tmpb_fp + \l__tikzfill_rho_d_fp * \l_tmpa_fp
+ }}
+ },
+ bottom~left = { \pgfpoint{-\l__tikzfill_rho_linewidth_tl}{-\l__tikzfill_rho_linewidth_tl} },
+ top~right = { \pgfpoint{\l__tikzfill_rho_dsize_tl+\l__tikzfill_rho_linewidth_tl}
+ {\l__tikzfill_rho_dsize_tl+\l__tikzfill_rho_linewidth_tl} },
+ tile~size = { \pgfqpoint{\l__tikzfill_rho_dsize_tl}{\l__tikzfill_rho_dsize_tl} },
+ tile~transformation =
+ {
+ \pgftransformshift
+ {
+ \pgfpoint{ \pgfkeysvalueof{/pgf/pattern~keys/xshift} }
+ { \pgfkeysvalueof{/pgf/pattern~keys/yshift} }
+ }
+ \pgftransformcm{\l__tikzfill_rho_matrix_a_tl}{\l__tikzfill_rho_matrix_b_tl}
+ {\l__tikzfill_rho_matrix_c_tl}{\l__tikzfill_rho_matrix_d_tl}
+ {\pgfpointorigin}
+ },
+ code =
+ {
+ \int_set:Nn \l_tmpa_int { \pgfkeysvalueof{/pgf/pattern~keys/band} }
+ \int_compare:nNnF \l_tmpa_int = 1
+ {
+ \pgfpathrectangle{\pgfqpoint{\l__tikzfill_rho_poffset_tl}{\l__tikzfill_rho_poffset_tl}}
+ {\pgfqpoint{\l__tikzfill_rho_psize_tl}{\l__tikzfill_rho_psize_tl}}
+ \pgfpathrectangle{\pgfpoint{\l__tikzfill_rho_size_tl+\l__tikzfill_rho_poffset_tl}{\l__tikzfill_rho_size_tl+\l__tikzfill_rho_poffset_tl}}
+ {\pgfqpoint{\l__tikzfill_rho_psize_tl}{\l__tikzfill_rho_psize_tl}}
+ }
+ \int_compare:nNnT \l_tmpa_int > 0
+ {
+ \pgfpathrectangle{\pgfpoint{\l__tikzfill_rho_poffset_tl}{\l__tikzfill_rho_size_tl+\l__tikzfill_rho_poffset_tl}}
+ {\pgfqpoint{\l__tikzfill_rho_psize_tl}{\l__tikzfill_rho_psize_tl}}
+ \pgfpathrectangle{\pgfpoint{\l__tikzfill_rho_size_tl+\l__tikzfill_rho_poffset_tl}{\l__tikzfill_rho_poffset_tl}}
+ {\pgfqpoint{\l__tikzfill_rho_psize_tl}{\l__tikzfill_rho_psize_tl}}
+ }
+ \int_compare:nNnTF { \pgfkeysvalueof{/pgf/pattern~keys/_fill_} } = 1
+ {
+ \pgfusepath{fill}
+ }
+ {
+ \pgfsetlinewidth{\l__tikzfill_rho_linewidth_tl}
+ \pgfusepath{draw}
+ }
+ }
+ }
+
+
+\tikzset{
+ pattern~rhombus /.style =
+ {
+ pattern={rhombus[#1]}
+ }
+}
+
+
+\ExplSyntaxOff
diff --git a/language/japanese/README.CJK b/language/japanese/README.CJK
deleted file mode 100644
index 432baee019..0000000000
--- a/language/japanese/README.CJK
+++ /dev/null
@@ -1,5 +0,0 @@
-The CJK package, for setting Chinese, Japanese and Korean, is
-available via directory tex-archive/language/japanese/CJK, even
-though it does not necessarily show up in via this directory in the
-`quote site index' command
-
diff --git a/macros/generic/fixjfm/README b/macros/jptex/generic/fixjfm/README
index 3b68f21c0b..3b68f21c0b 100644
--- a/macros/generic/fixjfm/README
+++ b/macros/jptex/generic/fixjfm/README
diff --git a/macros/generic/fixjfm/fixjfm-doc.pdf b/macros/jptex/generic/fixjfm/fixjfm-doc.pdf
index 43147b99de..43147b99de 100644
--- a/macros/generic/fixjfm/fixjfm-doc.pdf
+++ b/macros/jptex/generic/fixjfm/fixjfm-doc.pdf
Binary files differ
diff --git a/macros/generic/fixjfm/fixjfm-doc.tex b/macros/jptex/generic/fixjfm/fixjfm-doc.tex
index d52f836721..d52f836721 100644
--- a/macros/generic/fixjfm/fixjfm-doc.tex
+++ b/macros/jptex/generic/fixjfm/fixjfm-doc.tex
diff --git a/macros/generic/fixjfm/fixjfm.sty b/macros/jptex/generic/fixjfm/fixjfm.sty
index 11887daafc..11887daafc 100644
--- a/macros/generic/fixjfm/fixjfm.sty
+++ b/macros/jptex/generic/fixjfm/fixjfm.sty
diff --git a/macros/latex/contrib/gentombow/LICENSE b/macros/jptex/latex/gentombow/LICENSE
index 9661ce7b8d..9661ce7b8d 100644
--- a/macros/latex/contrib/gentombow/LICENSE
+++ b/macros/jptex/latex/gentombow/LICENSE
diff --git a/macros/latex/contrib/gentombow/README.md b/macros/jptex/latex/gentombow/README.md
index 94cbdbdac0..94cbdbdac0 100644
--- a/macros/latex/contrib/gentombow/README.md
+++ b/macros/jptex/latex/gentombow/README.md
diff --git a/macros/latex/contrib/gentombow/bounddvi-en.pdf b/macros/jptex/latex/gentombow/bounddvi-en.pdf
index 2cf419316e..2cf419316e 100644
--- a/macros/latex/contrib/gentombow/bounddvi-en.pdf
+++ b/macros/jptex/latex/gentombow/bounddvi-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/gentombow/bounddvi-en.tex b/macros/jptex/latex/gentombow/bounddvi-en.tex
index 82046f888a..82046f888a 100644
--- a/macros/latex/contrib/gentombow/bounddvi-en.tex
+++ b/macros/jptex/latex/gentombow/bounddvi-en.tex
diff --git a/macros/latex/contrib/gentombow/bounddvi.pdf b/macros/jptex/latex/gentombow/bounddvi.pdf
index 57fed9c6c7..57fed9c6c7 100644
--- a/macros/latex/contrib/gentombow/bounddvi.pdf
+++ b/macros/jptex/latex/gentombow/bounddvi.pdf
Binary files differ
diff --git a/macros/latex/contrib/gentombow/bounddvi.sty b/macros/jptex/latex/gentombow/bounddvi.sty
index a70da52c6e..a70da52c6e 100644
--- a/macros/latex/contrib/gentombow/bounddvi.sty
+++ b/macros/jptex/latex/gentombow/bounddvi.sty
diff --git a/macros/latex/contrib/gentombow/bounddvi.tex b/macros/jptex/latex/gentombow/bounddvi.tex
index 198bbb7fb9..198bbb7fb9 100644
--- a/macros/latex/contrib/gentombow/bounddvi.tex
+++ b/macros/jptex/latex/gentombow/bounddvi.tex
diff --git a/macros/latex/contrib/gentombow/gentombow-ja.pdf b/macros/jptex/latex/gentombow/gentombow-ja.pdf
index ee94b6c132..ee94b6c132 100644
--- a/macros/latex/contrib/gentombow/gentombow-ja.pdf
+++ b/macros/jptex/latex/gentombow/gentombow-ja.pdf
Binary files differ
diff --git a/macros/latex/contrib/gentombow/gentombow-ja.tex b/macros/jptex/latex/gentombow/gentombow-ja.tex
index 411aad1db2..411aad1db2 100644
--- a/macros/latex/contrib/gentombow/gentombow-ja.tex
+++ b/macros/jptex/latex/gentombow/gentombow-ja.tex
diff --git a/macros/latex/contrib/gentombow/gentombow.pdf b/macros/jptex/latex/gentombow/gentombow.pdf
index 178bab4c52..178bab4c52 100644
--- a/macros/latex/contrib/gentombow/gentombow.pdf
+++ b/macros/jptex/latex/gentombow/gentombow.pdf
Binary files differ
diff --git a/macros/latex/contrib/gentombow/gentombow.sty b/macros/jptex/latex/gentombow/gentombow.sty
index bcd8093f50..bcd8093f50 100644
--- a/macros/latex/contrib/gentombow/gentombow.sty
+++ b/macros/jptex/latex/gentombow/gentombow.sty
diff --git a/macros/latex/contrib/gentombow/gentombow.tex b/macros/jptex/latex/gentombow/gentombow.tex
index d0bc4523ab..d0bc4523ab 100644
--- a/macros/latex/contrib/gentombow/gentombow.tex
+++ b/macros/jptex/latex/gentombow/gentombow.tex
diff --git a/macros/latex/contrib/gentombow/pxesopic.sty b/macros/jptex/latex/gentombow/pxesopic.sty
index 567b9d0a2d..567b9d0a2d 100644
--- a/macros/latex/contrib/gentombow/pxesopic.sty
+++ b/macros/jptex/latex/gentombow/pxesopic.sty
diff --git a/macros/latex/contrib/gentombow/pxgentombow.pdf b/macros/jptex/latex/gentombow/pxgentombow.pdf
index d30a4509e4..d30a4509e4 100644
--- a/macros/latex/contrib/gentombow/pxgentombow.pdf
+++ b/macros/jptex/latex/gentombow/pxgentombow.pdf
Binary files differ
diff --git a/macros/latex/contrib/gentombow/pxgentombow.sty b/macros/jptex/latex/gentombow/pxgentombow.sty
index bd94b4bcee..bd94b4bcee 100644
--- a/macros/latex/contrib/gentombow/pxgentombow.sty
+++ b/macros/jptex/latex/gentombow/pxgentombow.sty
diff --git a/macros/latex/contrib/gentombow/pxgentombow.tex b/macros/jptex/latex/gentombow/pxgentombow.tex
index 8a8c2616bd..8a8c2616bd 100644
--- a/macros/latex/contrib/gentombow/pxgentombow.tex
+++ b/macros/jptex/latex/gentombow/pxgentombow.tex
diff --git a/macros/latex/contrib/gentombow/pxpdfpages.sty b/macros/jptex/latex/gentombow/pxpdfpages.sty
index ad86ea819b..ad86ea819b 100644
--- a/macros/latex/contrib/gentombow/pxpdfpages.sty
+++ b/macros/jptex/latex/gentombow/pxpdfpages.sty
diff --git a/macros/latex/contrib/gentombow/pxtextpos.sty b/macros/jptex/latex/gentombow/pxtextpos.sty
index 02cd5202e2..02cd5202e2 100644
--- a/macros/latex/contrib/gentombow/pxtextpos.sty
+++ b/macros/jptex/latex/gentombow/pxtextpos.sty
diff --git a/macros/latex/contrib/jsclasses/LICENSE b/macros/jptex/latex/jsclasses/LICENSE
index 1f8bc0f533..1f8bc0f533 100644
--- a/macros/latex/contrib/jsclasses/LICENSE
+++ b/macros/jptex/latex/jsclasses/LICENSE
diff --git a/macros/latex/contrib/jsclasses/Makefile b/macros/jptex/latex/jsclasses/Makefile
index 3e91b82d58..3e91b82d58 100644
--- a/macros/latex/contrib/jsclasses/Makefile
+++ b/macros/jptex/latex/jsclasses/Makefile
diff --git a/macros/latex/contrib/jsclasses/README.md b/macros/jptex/latex/jsclasses/README.md
index 284efa7815..284efa7815 100644
--- a/macros/latex/contrib/jsclasses/README.md
+++ b/macros/jptex/latex/jsclasses/README.md
diff --git a/macros/latex/contrib/jsclasses/jsclasses.dtx b/macros/jptex/latex/jsclasses/jsclasses.dtx
index 37567b64d9..37567b64d9 100644
--- a/macros/latex/contrib/jsclasses/jsclasses.dtx
+++ b/macros/jptex/latex/jsclasses/jsclasses.dtx
diff --git a/macros/latex/contrib/jsclasses/jsclasses.ins b/macros/jptex/latex/jsclasses/jsclasses.ins
index b7e4ca24ab..b7e4ca24ab 100644
--- a/macros/latex/contrib/jsclasses/jsclasses.ins
+++ b/macros/jptex/latex/jsclasses/jsclasses.ins
diff --git a/macros/latex/contrib/jsclasses/jsclasses.pdf b/macros/jptex/latex/jsclasses/jsclasses.pdf
index f41951d9e6..f41951d9e6 100644
--- a/macros/latex/contrib/jsclasses/jsclasses.pdf
+++ b/macros/jptex/latex/jsclasses/jsclasses.pdf
Binary files differ
diff --git a/macros/latex/contrib/jsclasses/jslogo.dtx b/macros/jptex/latex/jsclasses/jslogo.dtx
index e8350bdb61..e8350bdb61 100644
--- a/macros/latex/contrib/jsclasses/jslogo.dtx
+++ b/macros/jptex/latex/jsclasses/jslogo.dtx
diff --git a/macros/latex/contrib/jsclasses/jslogo.ins b/macros/jptex/latex/jsclasses/jslogo.ins
index 0f8f287a42..0f8f287a42 100644
--- a/macros/latex/contrib/jsclasses/jslogo.ins
+++ b/macros/jptex/latex/jsclasses/jslogo.ins
diff --git a/macros/latex/contrib/jsclasses/jslogo.pdf b/macros/jptex/latex/jsclasses/jslogo.pdf
index 6975d75515..6975d75515 100644
--- a/macros/latex/contrib/jsclasses/jslogo.pdf
+++ b/macros/jptex/latex/jsclasses/jslogo.pdf
Binary files differ
diff --git a/macros/latex/contrib/jsclasses/jsverb.dtx b/macros/jptex/latex/jsclasses/jsverb.dtx
index ed6fefde63..ed6fefde63 100644
--- a/macros/latex/contrib/jsclasses/jsverb.dtx
+++ b/macros/jptex/latex/jsclasses/jsverb.dtx
diff --git a/macros/latex/contrib/jsclasses/jsverb.ins b/macros/jptex/latex/jsclasses/jsverb.ins
index 20279cfb8d..20279cfb8d 100644
--- a/macros/latex/contrib/jsclasses/jsverb.ins
+++ b/macros/jptex/latex/jsclasses/jsverb.ins
diff --git a/macros/latex/contrib/jsclasses/jsverb.pdf b/macros/jptex/latex/jsclasses/jsverb.pdf
index a2273084a5..a2273084a5 100644
--- a/macros/latex/contrib/jsclasses/jsverb.pdf
+++ b/macros/jptex/latex/jsclasses/jsverb.pdf
Binary files differ
diff --git a/macros/latex/contrib/jsclasses/okumacro.dtx b/macros/jptex/latex/jsclasses/okumacro.dtx
index e2d70e4770..e2d70e4770 100644
--- a/macros/latex/contrib/jsclasses/okumacro.dtx
+++ b/macros/jptex/latex/jsclasses/okumacro.dtx
diff --git a/macros/latex/contrib/jsclasses/okumacro.ins b/macros/jptex/latex/jsclasses/okumacro.ins
index 57a45c97a0..57a45c97a0 100644
--- a/macros/latex/contrib/jsclasses/okumacro.ins
+++ b/macros/jptex/latex/jsclasses/okumacro.ins
diff --git a/macros/latex/contrib/jsclasses/okumacro.pdf b/macros/jptex/latex/jsclasses/okumacro.pdf
index d01f531572..d01f531572 100644
--- a/macros/latex/contrib/jsclasses/okumacro.pdf
+++ b/macros/jptex/latex/jsclasses/okumacro.pdf
Binary files differ
diff --git a/macros/latex/contrib/jsclasses/okuverb.dtx b/macros/jptex/latex/jsclasses/okuverb.dtx
index b6cc0256ec..b6cc0256ec 100644
--- a/macros/latex/contrib/jsclasses/okuverb.dtx
+++ b/macros/jptex/latex/jsclasses/okuverb.dtx
diff --git a/macros/latex/contrib/jsclasses/okuverb.ins b/macros/jptex/latex/jsclasses/okuverb.ins
index a9076d54d1..a9076d54d1 100644
--- a/macros/latex/contrib/jsclasses/okuverb.ins
+++ b/macros/jptex/latex/jsclasses/okuverb.ins
diff --git a/macros/latex/contrib/jsclasses/okuverb.pdf b/macros/jptex/latex/jsclasses/okuverb.pdf
index b8014b3c66..b8014b3c66 100644
--- a/macros/latex/contrib/jsclasses/okuverb.pdf
+++ b/macros/jptex/latex/jsclasses/okuverb.pdf
Binary files differ
diff --git a/macros/latex/contrib/pxcjkcat/LICENSE b/macros/jptex/latex/pxcjkcat/LICENSE
index 71f0e1f5a2..71f0e1f5a2 100644
--- a/macros/latex/contrib/pxcjkcat/LICENSE
+++ b/macros/jptex/latex/pxcjkcat/LICENSE
diff --git a/macros/latex/contrib/pxcjkcat/README-ja.md b/macros/jptex/latex/pxcjkcat/README-ja.md
index 4c93dc9b04..4c93dc9b04 100644
--- a/macros/latex/contrib/pxcjkcat/README-ja.md
+++ b/macros/jptex/latex/pxcjkcat/README-ja.md
diff --git a/macros/latex/contrib/pxcjkcat/README.md b/macros/jptex/latex/pxcjkcat/README.md
index 11fcfe0132..11fcfe0132 100644
--- a/macros/latex/contrib/pxcjkcat/README.md
+++ b/macros/jptex/latex/pxcjkcat/README.md
diff --git a/macros/latex/contrib/pxcjkcat/pxcjkcat.pdf b/macros/jptex/latex/pxcjkcat/pxcjkcat.pdf
index 8772b88c4a..8772b88c4a 100644
--- a/macros/latex/contrib/pxcjkcat/pxcjkcat.pdf
+++ b/macros/jptex/latex/pxcjkcat/pxcjkcat.pdf
Binary files differ
diff --git a/macros/latex/contrib/pxcjkcat/pxcjkcat.sty b/macros/jptex/latex/pxcjkcat/pxcjkcat.sty
index 04fad06654..04fad06654 100644
--- a/macros/latex/contrib/pxcjkcat/pxcjkcat.sty
+++ b/macros/jptex/latex/pxcjkcat/pxcjkcat.sty
diff --git a/macros/latex/contrib/pxcjkcat/pxcjkcat.tex b/macros/jptex/latex/pxcjkcat/pxcjkcat.tex
index e8e00fcbc7..e8e00fcbc7 100644
--- a/macros/latex/contrib/pxcjkcat/pxcjkcat.tex
+++ b/macros/jptex/latex/pxcjkcat/pxcjkcat.tex
diff --git a/macros/latex/contrib/pxtatescale/LICENSE b/macros/jptex/latex/pxtatescale/LICENSE
index d2d2a02dd5..d2d2a02dd5 100644
--- a/macros/latex/contrib/pxtatescale/LICENSE
+++ b/macros/jptex/latex/pxtatescale/LICENSE
diff --git a/macros/latex/contrib/pxtatescale/README b/macros/jptex/latex/pxtatescale/README
index 5f811cb249..5f811cb249 100644
--- a/macros/latex/contrib/pxtatescale/README
+++ b/macros/jptex/latex/pxtatescale/README
diff --git a/macros/latex/contrib/pxtatescale/pxtatescale.sty b/macros/jptex/latex/pxtatescale/pxtatescale.sty
index 9f8745d354..9f8745d354 100644
--- a/macros/latex/contrib/pxtatescale/pxtatescale.sty
+++ b/macros/jptex/latex/pxtatescale/pxtatescale.sty
diff --git a/macros/latex/contrib/hvfloat/Changes b/macros/latex/contrib/hvfloat/Changes
index 9976f84d27..85e1f31fbe 100644
--- a/macros/latex/contrib/hvfloat/Changes
+++ b/macros/latex/contrib/hvfloat/Changes
@@ -1,4 +1,6 @@
hvfloat.sty:
+2.40 2022-07-20 - fix full page floats without pagenumber. We now use
+ package floatpag and \thisfloatpagestyle
2.39 2022-05-01 - fix for using package calc and global length setting
2.38 2022-04-02 - added option l for capWidth to get a caption with linewidth,
if also using the option wide for the object
diff --git a/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf
index 40854d1f72..92a1d4d54c 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/after1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/after1s1c.tex
index bdb9db7170..3a1f4a581e 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/after1s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/after1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: after1s1c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: after1s1c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
@@ -22,7 +22,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -35,7 +35,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -50,7 +50,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -63,7 +63,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf
index 6a3f002998..d1c3b2d875 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/after2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/after2s2c.tex
index 8c9f998931..a8b363d559 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/after2s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/after2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: after2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: after2s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -28,7 +28,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -41,7 +41,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf b/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf
index 630a337a53..c527cfd980 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/capVPos.inc b/macros/latex/contrib/hvfloat/doc/examples/capVPos.inc
index 10ef70e88c..5e76aaface 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/capVPos.inc
+++ b/macros/latex/contrib/hvfloat/doc/examples/capVPos.inc
@@ -19,7 +19,7 @@ justification=
\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capShortText}{}
\end{lstlisting}
-\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capShortText}{}
+\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capShortText~\protect\parencite{aksin}}{}
\blindtext
@@ -27,15 +27,15 @@ justification=
\hvFloat[capPos=right,capFormat={singlelinecheck=off}]{figure}{\includegraphics{frose}}{\capShortText}{}
\end{lstlisting}
-\hvFloat[capPos=right,capFormat={singlelinecheck=off}]{figure}{\includegraphics{frose}}{\capShortText}{}
+\hvFloat[capPos=right,capFormat={singlelinecheck=off}]{figure}{\includegraphics{frose}}{\capShortText~\protect\parencite{aksin}}{}
\blindtext
\begin{lstlisting}
-\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capLongText}{}
+\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capLongText~\protect\parencite{aksin}}{}
\end{lstlisting}
-\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capLongText}{}
+\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capLongText~\protect\parencite{aksin}}{}
\blindtext
@@ -47,10 +47,10 @@ justification=
\subsection{\texttt{capVPos=top}}
\begin{lstlisting}
-\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capShortText}{}
+\hvFloat[capPos=outer,capVPos=top]{figure}{\includegraphics{frose}}{\capShortText}{}
\end{lstlisting}
-\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capShortText}{}
+\hvFloat[capPos=outer,capVPos=top]{figure}{\includegraphics{frose}}{\capShortText~\protect\parencite{aksin}}{}
\blindtext
@@ -65,10 +65,10 @@ justification=
\begin{lstlisting}
-\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capLongText}{}
+\hvFloat[capPos=inner,capVPos=top]{figure}{\includegraphics{frose}}{\capLongText}{}
\end{lstlisting}
-\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capLongText}{}
+\hvFloat[capPos=inner,capVPos=top]{figure}{\includegraphics{frose}}{\capLongText}{}
\blindtext
@@ -78,10 +78,10 @@ justification=
\subsection{\texttt{capVPos=bottom}}
\begin{lstlisting}
-\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{}
+\hvFloat[capPos=outer,capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{}
\end{lstlisting}
-\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{}
+\hvFloat[capPos=outer,capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{}
\blindtext
@@ -95,10 +95,10 @@ justification=
\blindtext
\begin{lstlisting}
-\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capLongText}{}
+\hvFloat[capPos=inner,capVPos=bottom]{figure}{\includegraphics{frose}}{\capLongText}{}
\end{lstlisting}
-\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capLongText}{}
+\hvFloat[capPos=inner,capVPos=bottom]{figure}{\includegraphics{frose}}{\capLongText}{}
\blindtext
\NewColumn
@@ -107,10 +107,10 @@ justification=
\subsection{\texttt{capPos=center}}
\begin{lstlisting}
-\hvFloat[capPos=right,capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{}
+\hvFloat[capPos=outer,capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{}
\end{lstlisting}
-\hvFloat[capPos=right,capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{}
+\hvFloat[capPos=outer,capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{}
\blindtext
@@ -123,10 +123,10 @@ justification=
\blindtext
\begin{lstlisting}
-\hvFloat[capPos=right,capVPos=center]{figure}{\includegraphics{frose}}{\capLongText}{}
+\hvFloat[capPos=inner,capVPos=center]{figure}{\includegraphics{frose}}{\capLongText}{}
\end{lstlisting}
-\hvFloat[capPos=right,capVPos=center]{figure}{\includegraphics{frose}}{\capLongText}{}
+\hvFloat[capPos=inner,capVPos=center]{figure}{\includegraphics{frose}}{\capLongText}{}
\blindtext
diff --git a/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf
index 861efc9ac7..ac6eb73113 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/default1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/default1s1c.tex
index 357a8c7543..a974d118a3 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/default1s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/default1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: default1s1c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: default1s1c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
@@ -27,7 +27,7 @@ The fullpage image~\vref{fig:fullpage1} has a caption~\vpageref{fig:fullpage1-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -40,7 +40,7 @@ The fullpage image~\vref{fig:fullpage1} has a caption~\vpageref{fig:fullpage1-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -53,7 +53,7 @@ The fullpage image~\vref{fig:fullpage1} has a caption~\vpageref{fig:fullpage1-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -66,7 +66,7 @@ The fullpage image~\vref{fig:fullpage1} has a caption~\vpageref{fig:fullpage1-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf
index 60e3cb94ca..80402bdde4 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/default1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/default1s2c.tex
index 86c3b0a898..79f9f8b101 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/default1s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/default1s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: default1s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: default1s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -21,7 +21,7 @@
[A float with the default caption setting]%
{A default caption of a ``default'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:0}
\end{lstlisting}
@@ -32,7 +32,7 @@
[A float with the default caption setting]%
{A default caption of a ``default'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:0}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf
index 33ac8dd876..75436d0f01 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/default2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/default2s1c.tex
index 282925826d..449cb5d9c1 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/default2s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/default2s1c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: default2s1c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: default2s1c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
@@ -22,7 +22,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -35,7 +35,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -48,7 +48,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -61,7 +61,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf
index 1291839ce8..95b0cf19fb 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/default2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/default2s2c.tex
index 45278e1e8d..0055c3c570 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/default2s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/default2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: default2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: default2s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -28,7 +28,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -41,7 +41,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublefullpage2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/doublefullpage2s2c.pdf
new file mode 100644
index 0000000000..7c52645880
--- /dev/null
+++ b/macros/latex/contrib/hvfloat/doc/examples/doublefullpage2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublefullpage2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/doublefullpage2s2c.tex
new file mode 100644
index 0000000000..46ae9406ba
--- /dev/null
+++ b/macros/latex/contrib/hvfloat/doc/examples/doublefullpage2s2c.tex
@@ -0,0 +1,802 @@
+\errorcontextlines=100
+%\documentclass[final]{ltugboat}
+\documentclass[twoside,twocolumn,american]{scrartcl}
+%% $Id: doublepage2s2c.tex 92 2021-05-18 09:46:55Z herbert $
+
+\input{preamble.ltx}
+\usepackage{xcolor,marginnote}
+
+\usepackage{marginnote,showframe}
+\setcounter{tocdepth}{2}
+
+\begin{document}
+\title{Examples for doublepage floats \newline with bind correction}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+
+\onecolumn
+\listoffigures
+
+\newpage\null
+\twocolumn
+\part{Argument \texttt{doubleFULLPAGE}}
+\section{Definition on an odd page}
+
+\Blindtext\hvblindtext
+
+\hvblindtext
+
+\subsection{The default -- in the first column}
+
+\begin{lstlisting}
+\hvFloat[doubleFULLPAGE]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE0}
+\end{lstlisting}
+
+
+\marginnote{Fig. \ref{fig:doubleFULLPAGE0}}
+\hvFloat[doubleFULLPAGE]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE0}
+
+\Blindtext
+
+\Blindtext
+
+%\Blindtext
+
+\hvblindtext
+
+\hvblindtext
+\hvblindtext
+
+\subsection{The default -- in the second column}
+
+
+\begin{lstlisting}
+\hvFloat[doubleFULLPAGE]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE02nd}
+\end{lstlisting}
+
+
+\marginnote{Fig. \ref{fig:doubleFULLPAGE02nd}}
+\hvFloat[doubleFULLPAGE]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE02nd}
+
+\Blindtext
+
+%\Blindtext
+
+%\Blindtext
+
+\hvblindtext
+
+\hvblindtext
+\hvblindtext
+
+\subsection{\texttt{bindCorr=1cm} -- first column}
+
+\begin{lstlisting}
+\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE1}
+\end{lstlisting}
+
+\marginnote{Fig. \ref{fig:doubleFULLPAGE1}}
+\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE1}
+
+\hvblindtext
+
+%\Blindtext
+
+\Blindtext
+
+\Blindtext
+
+%\Blindtext
+
+\hvblindtext
+
+\hvblindtext
+
+\hvblindtext
+
+\subsection{\texttt{bindCorr=1cm} -- second column}
+
+\begin{lstlisting}
+\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE12nd}
+\end{lstlisting}
+
+\marginnote{Fig. \ref{fig:doubleFULLPAGE12nd}}
+\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE12nd}
+
+\hvblindtext
+
+%\Blindtext
+
+\Blindtext
+
+%\Blindtext
+
+\hvblindtext
+\hvblindtext
+
+\hvblindtext
+
+
+
+\subsection{\texttt{bindCorr=3mm} -- first column}
+\begin{lstlisting}
+\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE2}
+\end{lstlisting}
+
+\marginnote{Fig. \ref{fig:doubleFULLPAGE2}}
+\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE2}
+
+
+\Blindtext
+
+\Blindtext
+
+%\Blindtext
+%\Blindtext
+
+\hvblindtext
+
+\hvblindtext
+\hvblindtext
+
+
+
+
+\subsection{\texttt{bindCorr=3mm} -- second column}
+\begin{lstlisting}
+\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE22nd}
+\end{lstlisting}
+
+\marginnote{Fig. \ref{fig:doubleFULLPAGE22nd}}
+\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE22nd}
+
+
+\Blindtext
+
+%\Blindtext
+
+%\Blindtext
+
+\hvblindtext
+\hvblindtext
+
+\hvblindtext
+
+
+\subsection{\texttt{bindCorr=<inside textwidth>} -- first column}
+
+\begin{lstlisting}
+\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE3}
+\end{lstlisting}
+
+\marginnote{Fig. \ref{fig:doubleFULLPAGE3}}
+\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE3}
+
+
+\Blindtext
+
+\Blindtext
+
+%\Blindtext
+
+\hvblindtext
+
+\hvblindtext
+\hvblindtext
+
+\hvblindtext
+
+\subsection{\texttt{bindCorr=<inside textwidth>} -- second column}
+
+\begin{lstlisting}
+\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE32nd}
+\end{lstlisting}
+
+\marginnote{Fig. \ref{fig:doubleFULLPAGE32nd}}
+\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin,capPos=after]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE32nd}
+
+
+%\Blindtext
+
+\hvblindtext
+
+\hvblindtext
+
+%\hvblindtext
+
+
+
+
+\section{Definition on an even page}
+
+
+\subsection{The default -- first column}
+\begin{lstlisting}
+\hvFloat[doubleFULLPAGE]%
+ {figure}%
+ {\includegraphics[height=\paperheight]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE0a}
+\end{lstlisting}
+
+
+\marginnote{Fig. \ref{fig:doubleFULLPAGE0a}}
+\hvFloat[doubleFULLPAGE]%
+ {figure}%
+ {\includegraphics[height=\paperheight]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE0a}
+
+
+\Blindtext
+
+\Blindtext
+
+%\Blindtext
+
+\hvblindtext
+%\Blindtext
+
+\hvblindtext
+
+\hvblindtext
+\hvblindtext
+
+\subsection{The default -- second column}
+\begin{lstlisting}
+\hvFloat[doubleFULLPAGE]%
+ {figure}%
+ {\includegraphics[height=\paperheight]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE0a2nd}
+\end{lstlisting}
+
+
+\marginnote{Fig. \ref{fig:doubleFULLPAGE0a2nd}}
+\hvFloat[doubleFULLPAGE]%
+ {figure}%
+ {\includegraphics[height=\paperheight]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE0a2nd}
+
+
+\hvblindtext
+\hvblindtext
+
+\hvblindtext
+
+\Blindtext
+
+%\Blindtext
+
+%\Blindtext
+
+
+
+
+\subsection{\texttt{bindCorr=1cm} -- first column}
+
+\begin{lstlisting}
+\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE1a}
+\end{lstlisting}
+
+\marginnote{Fig. \ref{fig:doubleFULLPAGE1a}}
+\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE1a}
+
+%\hvblindtext
+
+\Blindtext
+
+\Blindtext
+
+%\Blindtext
+%\Blindtext
+
+\hvblindtext
+
+\hvblindtext
+\hvblindtext
+
+\hvblindtext
+
+
+\subsection{\texttt{bindCorr=1cm} -- second column}
+
+\begin{lstlisting}
+\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE1a2nd}
+\end{lstlisting}
+
+\marginnote{Fig. \ref{fig:doubleFULLPAGE1a2nd}}
+\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE1a2nd}
+
+\hvblindtext
+
+%\Blindtext
+
+\Blindtext
+
+%\Blindtext
+
+\hvblindtext
+
+\hvblindtext
+
+
+
+
+\subsection{\texttt{bindCorr=3mm} -- first column}
+
+\begin{lstlisting}
+\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE2a}
+\end{lstlisting}
+
+\marginnote{Fig. \ref{fig:doubleFULLPAGE2a}}
+\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE2a}
+
+
+\Blindtext
+
+\Blindtext
+
+%\Blindtext
+%\Blindtext
+
+\hvblindtext
+
+\hvblindtext
+
+\hvblindtext
+
+\hvblindtext
+
+
+\subsection{\texttt{bindCorr=3mm} -- second column}
+
+\begin{lstlisting}
+\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE2a2nd}
+\end{lstlisting}
+
+\marginnote{Fig. \ref{fig:doubleFULLPAGE2a2nd}}
+\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE2a2nd}
+
+
+\Blindtext
+
+%\Blindtext
+
+%\Blindtext
+
+%\hvblindtext
+
+\hvblindtext
+
+\hvblindtext
+
+\hvblindtext
+
+
+
+\subsection{\texttt{bindCorr=<inside textwidth>} -- first column}
+
+\begin{lstlisting}
+\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE3a}
+\end{lstlisting}
+
+\marginnote{Fig. \ref{fig:doubleFULLPAGE3a}}
+\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE3a}
+
+
+\Blindtext
+
+\Blindtext
+
+%\Blindtext
+
+\hvblindtext
+
+\hvblindtext
+
+%\hvblindtext
+
+%\hvblindtext
+
+
+\subsection{\texttt{bindCorr=<inside textwidth>} -- second column}
+
+\begin{lstlisting}
+\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE3a2nd}
+\end{lstlisting}
+
+\marginnote{Fig. \ref{fig:doubleFULLPAGE3a2nd}}
+\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin,capPos=after]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE3a2nd}
+
+
+\Blindtext
+
+\Blindtext
+
+\Blindtext
+
+\hvblindtext
+
+
+
+%\cleardoublepage
+
+
+\hvblindtext
+
+\hvblindtext
+
+\Blindtext
+
+\hvblindtext
+
+\section{Full height, but no complete double page}
+\subsection{The default -- in the first column}
+
+\begin{lstlisting}
+\hvFloat[doubleFULLPAGE,capPos=right]%
+ {figure}%
+ {\includegraphics[height=\paperheight]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE0n}
+\end{lstlisting}
+
+
+\marginnote{Fig. \ref{fig:doubleFULLPAGE0n}}
+\hvFloat[doubleFULLPAGE,capPos=right]%
+ {figure}%
+ {\includegraphics[height=\paperheight]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE0n}
+
+\Blindtext
+
+\Blindtext
+
+%\Blindtext
+
+\clearpage
+\Blindtext
+%\hvblindtext
+
+%\hvblindtext
+
+\Blindtext
+
+\hvblindtext
+\Blindtext
+
+\subsection{The default -- in the second column}
+
+
+\begin{lstlisting}
+\hvFloat[doubleFULLPAGE,capPos=before]%
+ {figure}%
+ {\includegraphics[height=\paperheight]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE02ndn}
+\end{lstlisting}
+
+
+\marginnote{Fig. \ref{fig:doubleFULLPAGE02ndn}}
+\hvFloat[doubleFULLPAGE,capPos=before]
+ {figure}%
+ {\includegraphics[height=\paperheight]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE02ndn}
+
+\Blindtext
+
+\Blindtext
+
+\Blindtext
+
+%\hvblindtext
+
+\Blindtext
+
+%\Blindtext
+
+
+\subsection{The default -- in the second column}
+
+
+\begin{lstlisting}
+\hvFloat[doubleFULLPAGE,capPos=after,twoColumnCaption]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed on the right side of the
+ right-hand part of the illustration. The illustration begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE02ndnn}
+\end{lstlisting}
+
+
+\marginnote{Fig. \ref{fig:doubleFULLPAGE02ndnn}}
+\hvFloat[doubleFULLPAGE,capPos=after,twoColumnCaption]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}%
+ [A doublepage image with a caption on the right side of the right part.]%
+ {A caption for a double-sided image that will be placed
+ at the bottom of the following page. The doublepage image begins on the left edge of
+ the paper. A short form is used for the LOF.
+ The parameter is \texttt{doubleFULLPAGE}}%
+ {fig:doubleFULLPAGE02ndnn}
+
+\Blindtext
+
+\Blindtext
+
+\Blindtext
+
+\hvblindtext
+
+\hvblindtext
+\hvblindtext
+
+
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf
index 0d3e2713ef..bb31028bef 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.tex
index 656cbe68c8..ebd703e964 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: doublepage2s1c.tex 92 2021-05-18 09:46:55Z herbert $
+%% $Id: doublepage2s1c.tex 299 2021-10-09 14:05:35Z herbert $
\input{preamble.ltx}
\usepackage{blindtext,xcolor,marginnote}
@@ -166,10 +166,11 @@
\hvblindtext
\hvblindtext
+\hvblindtext
\subsection{Definition on an even page}
\subsubsection{The default}
-\begin{lstlisting}
+\begin{verbatim}
\hvFloat[doublePage,capWidth=n,capPos=right]%
{figure}%
{\includegraphics[width=2\textwidth]{images/sonne-meer}}%
@@ -179,7 +180,7 @@
the paper. A short form is used for the LOF.
The parameter is \texttt{doublePage}}%
{fig:doublePage0a}
-\end{lstlisting}
+\end{verbatim}
\marginnote{Fig. \ref{fig:doublePage0a}}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf
index 1578d673ff..040449a017 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf
index 7be7a1cb5b..79c403fd39 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/even1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/even1s1c.tex
index 75eb2bf872..d042b90863 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/even1s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/even1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: even1s1c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: even1s1c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
@@ -22,7 +22,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -35,7 +35,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -48,7 +48,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -61,7 +61,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf
index e98663ed09..6dcc088e0d 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/even1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/even1s2c.tex
index da5d013c40..2965b47502 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/even1s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/even1s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: even1s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: even1s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -28,7 +28,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -41,7 +41,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf
index 09a417c031..bcd7e34b43 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/even2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/even2s1c.tex
index 1ee584c81a..0e794a30e7 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/even2s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/even2s1c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: even2s1c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: even2s1c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
@@ -27,7 +27,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -39,7 +39,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf
index e2898a14ae..1be9492a91 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/even2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/even2s2c.tex
index ce3206c075..6952e4e45e 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/even2s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/even2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: even2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: even2s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -28,7 +28,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -41,7 +41,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/fullpage1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s1c.pdf
new file mode 100644
index 0000000000..250833bf54
--- /dev/null
+++ b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/fullpage1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s1c.tex
new file mode 100644
index 0000000000..1b95fbaa03
--- /dev/null
+++ b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s1c.tex
@@ -0,0 +1,64 @@
+\documentclass{scrartcl}
+%% $Id: fullpage1s1c.tex 72 2021-05-02 11:40:10Z herbert $
+
+\input{preamble.ltx}
+\setlength\columnseprule{0.4pt}
+
+\begin{document}
+\title{Example for fullpage floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+\section{The fullpage optional arguments}
+\Blindtext
+
+\subsection{\texttt{fullpage}}
+\blindtext
+\blindtext
+\verb|\includegraphics[fullpage]{tiger}|
+
+\includegraphics[fullpage]{tiger}
+
+\Blindtext
+\subsection{\texttt{FullPage}}
+\blindtext
+
+\verb|\includegraphics[FullPage]{tiger}|
+\begin{figure*}[p]
+\includegraphics*[FullPage]{tiger}
+\end{figure*}
+
+\Blindtext
+
+\Blindtext
+
+\subsection{\texttt{FULLPAGE}}
+\blindtext
+
+\verb|\includegraphics[FULLPAGE]{tiger}|
+
+\begin{figure*}[p]
+ \vspace*{\the\dimexpr-1in-\voffset+\topskip-\headheight-0.5\baselineskip}%
+ \if@twoside
+ \leavevmode\checkoddpage
+ \ifoddpage
+ \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}%
+ \else
+ \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
+ \fi
+ \else
+ \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}%
+ \fi
+ \put(0,0){\usebox\hvObjectBox}%
+ \AtBeginShipoutNext{\thispagestyle{empty}}%
+\includegraphics*[FULLPAGE]{tiger}
+\end{figure*}
+
+\Blindtext
+
+\blindtext
+
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf
index e0e787f994..074ceff1eb 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf
index 73a49d0a07..8a9972eb2f 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.tex
index 6960658c3b..eae3c5ce67 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: inner1s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: inner1s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -27,7 +27,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the inner side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}
{fig:fullpage0}
\end{lstlisting}
@@ -38,7 +38,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the inner side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}
{fig:fullpage0}
@@ -52,7 +52,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the inner side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}
{fig:fullpage1}
\end{lstlisting}
@@ -64,7 +64,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the inner side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf
index 3cd80ae131..3a73ceb98b 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.tex
index 15b6508111..60b226c085 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: inner2s1c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: inner2s1c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
@@ -26,7 +26,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the inner side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}
{fig:fullpage0}
\end{lstlisting}
@@ -37,7 +37,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the inner side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}
{fig:fullpage0}
@@ -51,7 +51,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the inner side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}
{fig:fullpage1}
\end{lstlisting}
@@ -63,7 +63,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the inner side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf
index 6b794b3732..420038d756 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.tex
index 0f4a3856c8..04627efaa8 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: inner2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: inner2s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -27,7 +27,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the inner side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}
{fig:fullpage0}
\end{lstlisting}
@@ -38,7 +38,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the inner side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}
{fig:fullpage0}
@@ -52,7 +52,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the inner side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}
{fig:fullpage1}
\end{lstlisting}
@@ -64,7 +64,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the inner side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf
index 4e6b0cfae7..0ed3921202 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/left2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/left2s2c.tex
index d415c7e343..56ea72912e 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/left2s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/left2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: left2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: left2s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -28,7 +28,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -41,7 +41,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf
index bc345dc15b..bda39bf142 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.tex
index a01561d840..6238a6f910 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: multi-after1s1c.tex 112 2021-06-14 08:01:42Z herbert $
+%% $Id: multi-after1s1c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
@@ -27,7 +27,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{img:demo0}%
+{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
@@ -56,7 +56,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{img:demo0}%
+{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
@@ -88,7 +88,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{img:demo3}%
+{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
@@ -116,7 +116,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{img:demo3}%
+{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf
index e37e60e626..663ef48f3a 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.tex
index 1c4e98195f..655d8fd062 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: multi-default1s1c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: multi-default1s1c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
@@ -28,7 +28,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{img:demo0}%
+{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
@@ -56,7 +56,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{img:demo0}%
+{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
@@ -88,7 +88,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{img:demo3}%
+{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
@@ -116,7 +116,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{img:demo3}%
+{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf
index 614b2fcf30..b2a9f1cfbd 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.tex
index f42bc85ae5..a46ae56938 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: multi-default1s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: multi-default1s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -29,7 +29,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{multi:demo0}%
+{table}{\begin{tabular}{lr}\hline % no 2
@@ -54,7 +54,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{multi:demo0}%
+{table}{\begin{tabular}{lr}\hline % no 2
@@ -84,7 +84,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{multi:demo2}%
+{table}{\begin{tabular}{lr}\hline % no 2
@@ -109,7 +109,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{multi:demo2}%
+{table}{\begin{tabular}{lr}\hline % no 2
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf
index e2ec474cb7..68a05d99a6 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.tex
index 8725520a26..8ceae45750 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: multi-default2s1c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: multi-default2s1c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
@@ -27,7 +27,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{img:demo0}%
+{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
@@ -55,7 +55,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{img:demo0}%
+{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
@@ -87,7 +87,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{img:demo3}%
+{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
@@ -115,7 +115,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{img:demo3}%
+{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf
index 23fdd5f04f..f2c2b955e5 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.tex
index 4ce8149cda..3848015a92 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: multi-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: multi-default2s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -29,7 +29,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{multi:demo0}%
+{table}{\begin{tabular}{lr}\hline % no 2
@@ -54,7 +54,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{multi:demo0}%
+{table}{\begin{tabular}{lr}\hline % no 2
@@ -84,7 +84,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{multi:demo2}%
+{table}{\begin{tabular}{lr}\hline % no 2
@@ -109,7 +109,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{multi:demo2}%
+{table}{\begin{tabular}{lr}\hline % no 2
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf
index 3f79249b52..409a42e884 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.tex
index 668da0a147..ee91984d4a 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.tex
@@ -1,6 +1,6 @@
\errorcontextlines=200
\documentclass[twoside]{scrartcl}
-%% $Id: multi-inner2s2c.tex 103 2021-05-31 12:37:11Z herbert $
+%% $Id: multi-inner2s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -31,7 +31,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{multi:demo0}%
+{table}{\begin{tabular}{lr}\hline % no 2
@@ -58,7 +58,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{multi:demo0}%
+{table}{\begin{tabular}{lr}\hline % no 2
@@ -90,7 +90,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{multi:demo2}%
+{table}{\begin{tabular}{lr}\hline % no 2
@@ -117,7 +117,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{multi:demo2}%
+{table}{\begin{tabular}{lr}\hline % no 2
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf
index 7ebd9bd69a..007311ba40 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.tex
index fef798e1e9..306762846e 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.tex
@@ -1,6 +1,6 @@
\errorcontextlines=100
\documentclass[twoside]{scrartcl}
-%% $Id: multi-outer2s2c.tex 103 2021-05-31 12:37:11Z herbert $
+%% $Id: multi-outer2s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -32,7 +32,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{multi:demo0}%
+{table}{\begin{tabular}{lr}\hline % no 2
@@ -57,7 +57,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{multi:demo0}%
+{table}{\begin{tabular}{lr}\hline % no 2
@@ -88,7 +88,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{multi:demo2}%
+{table}{\begin{tabular}{lr}\hline % no 2
@@ -115,7 +115,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{multi:demo2}%
+{table}{\begin{tabular}{lr}\hline % no 2
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf
index 23f3c0b60c..b7241dabae 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.tex
index 1b78f0fba6..fae07fc364 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: multi-right1s1c.tex 103 2021-05-31 12:37:11Z herbert $
+%% $Id: multi-right1s1c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
@@ -27,7 +27,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{img:demo0}%
+{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
@@ -55,7 +55,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{img:demo0}%
+{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
@@ -87,7 +87,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{img:demo3}%
+{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
@@ -115,7 +115,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{img:demo3}%
+{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf
index 9a8f796d02..5e9f30293d 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.tex
index 2d93d7b2b5..bc70f79b05 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: odd1s1c.tex 119 2021-06-20 13:28:09Z herbert $
+%% $Id: odd1s1c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
@@ -23,7 +23,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -36,7 +36,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -55,7 +55,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -68,7 +68,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf
index eae0be6b8d..675f2499a8 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.tex
index 8454f4198b..636a8366d5 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: odd1s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: odd1s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -28,7 +28,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -41,7 +41,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf
index ef5b9fd7ab..a1e777fe52 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.tex
index ee0e69c74e..d14f499615 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: odd2s1c.tex 107 2021-06-09 06:43:25Z herbert $
+%% $Id: odd2s1c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
@@ -27,7 +27,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -39,7 +39,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf
index 6aa3ac83cf..6e736f1a97 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.tex
index f044fa127c..98dfd6c84b 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: odd2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: odd2s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -28,7 +28,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -41,7 +41,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf
index c6676e1291..54d63e7e7c 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.tex
index f6444f614c..e0302a6b77 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: outer1s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: outer1s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -26,7 +26,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}.
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the outer side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:full0}
\end{lstlisting}
@@ -37,7 +37,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}.
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the outer side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:full0}
@@ -51,7 +51,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}.
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the outer side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -63,7 +63,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}.
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the outer side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf
index a7d55f4c80..2ecc0080d5 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.tex
index d30d66e8fa..68cd510976 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: outer2s1c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: outer2s1c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
@@ -26,7 +26,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}.
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the outer side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:full0}
\end{lstlisting}
@@ -37,7 +37,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}.
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the outer side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:full0}
@@ -51,7 +51,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}.
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the outer side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -63,7 +63,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}.
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the outer side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf
index 204d0dad65..80c32239b7 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.tex
index 84b3dc0cf5..4ac33b7478 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: outer2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: outer2s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -26,7 +26,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}.
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the outer side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:full0}
\end{lstlisting}
@@ -37,7 +37,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}.
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the outer side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:full0}
@@ -51,7 +51,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}.
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the outer side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -63,7 +63,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}.
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption on the outer side of a twosided document.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf
index a65718b90a..a48bdeff12 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.tex
index 90e4ac9196..c847c531c5 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: paper-after1s1c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: paper-after1s1c.tex 318 2021-11-20 07:30:54Z herbert $
\usepackage{pdfpages}
\input{preamble.ltx}
@@ -29,7 +29,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -42,7 +42,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -57,7 +57,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -70,7 +70,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.pdf
new file mode 100644
index 0000000000..efdf0c08f9
--- /dev/null
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.tex
new file mode 100644
index 0000000000..ab7faa4b9d
--- /dev/null
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.tex
@@ -0,0 +1,81 @@
+\documentclass[twocolumn]{scrartcl}
+%% $Id: paper-default2s2c.tex 318 2021-11-20 07:30:54Z herbert $
+
+\input{preamble.ltx}
+\setlength\columnseprule{0.4pt}
+
+\begin{document}
+\title{Example for FULLPAGE floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+\blinddocument
+
+\section{File \texttt{\jobname}}
+
+\begin{lstlisting}
+The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}.
+\end{lstlisting}
+
+The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}.
+
+\begin{lstlisting}
+\hvFloat*[FULLPAGE,capPos=after]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A default caption of a ``FULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text which has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:FULLPAGE0}
+\end{lstlisting}
+
+
+\Float[default]
+\hvFloat*[FULLPAGE,capPos=after]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A default caption of a ``FULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text which has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:FULLPAGE0}
+
+\blinddocument
+
+\begin{lstlisting}
+\hvFloat*[FULLPAGE,capPos=after]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A default caption of a ``FULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text which has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:FULLPAGE1}
+\end{lstlisting}
+
+
+\Float[default]
+\hvFloat*[FULLPAGE,capPos=after]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A default caption of a ``FULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text which has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:FULLPAGE1}
+
+\blinddocument
+
+\Blindtext
+
+\blindtext
+
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf
index fd27f7ca54..a0091c6cd0 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.tex
index bb789ab593..a6304754cb 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.tex
@@ -1,9 +1,10 @@
\documentclass{scrartcl}
-%% $Id: paper-default1s1c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: paper-default1s1c.tex 584 2022-07-20 18:29:58Z herbert $
\usepackage{pdfpages}
\input{preamble.ltx}
+
\begin{document}
\title{Example for fullpage floats}
\author{Herbert Voß}
@@ -12,7 +13,7 @@
\tableofcontents
\Blindtext
-\blindtext
+\Blindtext
\section{File \texttt{\jobname}}
@@ -29,7 +30,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -42,7 +43,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -57,7 +58,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -70,7 +71,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf
index 6e06341ad5..139b9f6a0a 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.tex
index 73701e6c1e..61cc027864 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: paper-default1s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: paper-default1s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -28,7 +28,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca
[A FULLPAGE float with the default caption setting]%
{A default caption of a ``FULLPAGE'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:FULLPAGE0}
\end{lstlisting}
@@ -41,7 +41,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca
[A FULLPAGE float with the default caption setting]%
{A default caption of a ``FULLPAGE'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:FULLPAGE0}
@@ -54,7 +54,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca
[A FULLPAGE float with the default caption setting]%
{A default caption of a ``FULLPAGE'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:FULLPAGE1}
\end{lstlisting}
@@ -67,7 +67,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca
[A FULLPAGE float with the default caption setting]%
{A default caption of a ``FULLPAGE'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:FULLPAGE1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf
index c9cd842897..96bf69e588 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.tex
index 4db0220481..20cea7741e 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.tex
@@ -28,7 +28,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca
[A FULLPAGE float with the default caption setting]%
{A default caption of a ``FULLPAGE'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:FULLPAGE0}
\end{lstlisting}
@@ -41,7 +41,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca
[A FULLPAGE float with the default caption setting]%
{A default caption of a ``FULLPAGE'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:FULLPAGE0}
@@ -54,7 +54,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca
[A FULLPAGE float with the default caption setting]%
{A default caption of a ``FULLPAGE'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:FULLPAGE1}
\end{lstlisting}
@@ -67,7 +67,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca
[A FULLPAGE float with the default caption setting]%
{A default caption of a ``FULLPAGE'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:FULLPAGE1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf
index 330a7425ca..8020696880 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.tex
index 64b430652b..a9b5b15bef 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: paper-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: paper-default2s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -28,7 +28,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca
[A FULLPAGE float with the default caption setting]%
{A default caption of a ``FULLPAGE'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:FULLPAGE0}
\end{lstlisting}
@@ -41,7 +41,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca
[A FULLPAGE float with the default caption setting]%
{A default caption of a ``FULLPAGE'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:FULLPAGE0}
@@ -54,7 +54,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca
[A FULLPAGE float with the default caption setting]%
{A default caption of a ``FULLPAGE'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:FULLPAGE1}
\end{lstlisting}
@@ -67,7 +67,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca
[A FULLPAGE float with the default caption setting]%
{A default caption of a ``FULLPAGE'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:FULLPAGE1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.pdf
new file mode 100644
index 0000000000..4146e7e182
--- /dev/null
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.tex
new file mode 100644
index 0000000000..9b8436d697
--- /dev/null
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.tex
@@ -0,0 +1,81 @@
+\documentclass{scrartcl}
+%% $Id: paper-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+
+\input{preamble.ltx}
+\setlength\columnseprule{0.4pt}
+
+\begin{document}
+\title{Example for FULLPAGE floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+\blinddocument
+
+\section{File \texttt{\jobname}}
+
+\begin{lstlisting}
+The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}.
+\end{lstlisting}
+
+The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}.
+
+\begin{lstlisting}
+\hvFloat[FULLPAGE,capPos=evenPage]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A default caption of a ``FULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text which has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:FULLPAGE0}
+\end{lstlisting}
+
+
+\Float[default]
+\hvFloat[FULLPAGE,capPos=evenPage]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A caption of a \texttt{FULLPAGE} object with \texttt{capPos=evenPage},
+ so it appears on an even-numbered page.
+ And some more text which has no
+ meaning because it merely fills the space for a long caption.}%
+ {fig:FULLPAGE0}
+
+\blinddocument
+
+\begin{lstlisting}
+\hvFloat[FULLPAGE,capPos=evenPage]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A default caption of a ``FULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text which has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:FULLPAGE1}
+\end{lstlisting}
+
+
+\Float[default]
+\hvFloat[FULLPAGE,capPos=evenPage]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A default caption of a ``FULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text which has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:FULLPAGE1}
+
+\blinddocument
+
+\Blindtext
+
+\blindtext
+
+
+\end{document}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf
index b0792355fb..93208e62a9 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.tex
index 1cb218ac79..b7a6880d36 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: paper-inner2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: paper-inner2s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -28,7 +28,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca
[A FULLPAGE float with the default caption setting]%
{A default caption of a ``FULLPAGE'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:FULLPAGE0}
\end{lstlisting}
@@ -41,7 +41,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca
[A FULLPAGE float with the default caption setting]%
{A default caption of a ``FULLPAGE'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:FULLPAGE0}
@@ -54,7 +54,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca
[A FULLPAGE float with the default caption setting]%
{A default caption of a ``FULLPAGE'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:FULLPAGE1}
\end{lstlisting}
@@ -67,7 +67,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca
[A FULLPAGE float with the default caption setting]%
{A default caption of a ``FULLPAGE'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:FULLPAGE1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.pdf
new file mode 100644
index 0000000000..bb68490230
--- /dev/null
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.tex
new file mode 100644
index 0000000000..be6c896aa8
--- /dev/null
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.tex
@@ -0,0 +1,81 @@
+\documentclass{scrartcl}
+%% $Id: paper-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+
+\input{preamble.ltx}
+\setlength\columnseprule{0.4pt}
+
+\begin{document}
+\title{Example for FULLPAGE floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+\blinddocument
+
+\section{File \texttt{\jobname}}
+
+\begin{lstlisting}
+The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}.
+\end{lstlisting}
+
+The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}.
+
+\begin{lstlisting}
+\hvFloat[FULLPAGE,capPos=oddPage]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A default caption of a ``FULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text which has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:FULLPAGE0}
+\end{lstlisting}
+
+
+\Float[default]
+\hvFloat[FULLPAGE,capPos=oddPage]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A default caption of a ``FULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text which has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:FULLPAGE0}
+
+\blinddocument
+
+\begin{lstlisting}
+\hvFloat[FULLPAGE,capPos=oddPage]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A default caption of a ``FULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text which has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:FULLPAGE1}
+\end{lstlisting}
+
+
+\Float[default]
+\hvFloat[FULLPAGE,capPos=oddPage]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A default caption of a ``FULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text which has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:FULLPAGE1}
+
+\blinddocument
+
+\Blindtext
+
+\blindtext
+
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf
index 5ed8ec5a71..e478ced583 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.tex
index f285704496..41595db224 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: paper-right1s1c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: paper-right1s1c.tex 318 2021-11-20 07:30:54Z herbert $
\usepackage{pdfpages}
\input{preamble.ltx}
@@ -29,7 +29,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -42,7 +42,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -57,7 +57,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -70,7 +70,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-twocolcaption-after2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-twocolcaption-after2s2c.pdf
new file mode 100644
index 0000000000..76fec026a9
--- /dev/null
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-twocolcaption-after2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-twocolcaption-after2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/paper-twocolcaption-after2s2c.tex
new file mode 100644
index 0000000000..9da31571a3
--- /dev/null
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-twocolcaption-after2s2c.tex
@@ -0,0 +1,81 @@
+\documentclass[twocolumn]{scrartcl}
+%% $Id: paper-default2s2c.tex 318 2021-11-20 07:30:54Z herbert $
+
+\input{preamble.ltx}
+\setlength\columnseprule{0.4pt}
+
+\begin{document}
+\title{Example for FULLPAGE floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+\blinddocument
+
+\section{File \texttt{\jobname}}
+
+\begin{lstlisting}
+The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}.
+\end{lstlisting}
+
+The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}.
+
+\begin{lstlisting}
+\hvFloat*[doubleFULLPAGE,capPos=after,twoColumnCaption]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGE]{rheinsberg}}%
+ [A doubleFULLPAGE float with the default caption setting]%
+ {A default caption of a ``doubleFULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text which has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:doubleFULLPAGE0}
+\end{lstlisting}
+
+
+\Float[default]
+\hvFloat*[doubleFULLPAGE,capPos=after,twoColumnCaption]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGE]{rheinsberg}}%
+ [A doubleFULLPAGE float with the default caption setting]%
+ {A default caption of a ``doubleFULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text which has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:doubleFULLPAGE0}
+
+\blinddocument
+
+\begin{lstlisting}
+\hvFloat*[doubleFULLPAGE,capPos=after,twoColumnCaption]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGE]{rheinsberg}}%
+ [A doubleFULLPAGE float with the default caption setting]%
+ {A default caption of a ``doubleFULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text which has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:doubleFULLPAGE1}
+\end{lstlisting}
+
+
+\Float[default]
+\hvFloat*[doubleFULLPAGE,capPos=after,twoColumnCaption]%
+ {figure}%
+ {\includegraphics[doubleFULLPAGE]{rheinsberg}}%
+ [A doubleFULLPAGE float with the default caption setting]%
+ {A default caption of a ``doubleFULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text which has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:doubleFULLPAGE1}
+
+\blinddocument
+
+\Blindtext
+
+\blindtext
+
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/hvfloat/doc/examples/preamble.ltx b/macros/latex/contrib/hvfloat/doc/examples/preamble.ltx
index 525725c6c0..075d72bba0 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/preamble.ltx
+++ b/macros/latex/contrib/hvfloat/doc/examples/preamble.ltx
@@ -41,6 +41,9 @@
\captionsetup{labelfont={red,sf},font={red,sf},format=plain}
\usepackage{blindtext}
+\usepackage[style=authoryear]{biblatex}
+\addbibresource{biblatex-examples.bib}
+
\def\hvblindtext{\textcolor{black!30}{Hello, here is some text without a meaning. This text should show what a
printed text will look like at this place. If you read this text, you will get no information. Really?
diff --git a/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf
index c6c6bd27bd..79abdb9d11 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/right1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/right1s1c.tex
index 4ad53de6b9..58dbd7869e 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/right1s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/right1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: right1s1c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: right1s1c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
@@ -22,7 +22,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -35,7 +35,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -50,7 +50,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -63,7 +63,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf
index dfd03e566c..7bd72cb3ad 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/right1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/right1s2c.tex
index ada1d0b186..26de3dc0bc 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/right1s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/right1s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: right1s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: right1s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -28,7 +28,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -41,7 +41,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf
index dbb63e5fac..8dc456d441 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/right2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/right2s1c.tex
index 6672586390..f1a07efd74 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/right2s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/right2s1c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: right2s1c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: right2s1c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
@@ -22,7 +22,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -35,7 +35,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -48,7 +48,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -61,7 +61,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf
index e269a747a3..d1904cada6 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/right2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/right2s2c.tex
index eaaed1d57c..7c7cf4e67d 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/right2s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/right2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: right2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: right2s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -28,7 +28,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -41,7 +41,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
\end{lstlisting}
@@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
[A fullpage float with the default caption setting]%
{A default caption of a ``fullpage'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/runAll.sh b/macros/latex/contrib/hvfloat/doc/examples/runAll.sh
index 0cecd6a0c2..7b1ecfb77e 100755
--- a/macros/latex/contrib/hvfloat/doc/examples/runAll.sh
+++ b/macros/latex/contrib/hvfloat/doc/examples/runAll.sh
@@ -16,5 +16,5 @@ do
then TEST=0
fi
done
- rm -fr $MAIN.aux $MAIN.log $MAIN.out $MAIN.toc
+ rm -fr $MAIN.aux $MAIN.log $MAIN.out $MAIN.toc $MAIN.lof
done
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf
index f75bb23f56..edec7c4dda 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.tex
index 660e942090..a0cdbcde18 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: sub-after1s1c.tex 103 2021-05-31 12:37:11Z herbert $
+%% $Id: sub-after1s1c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
@@ -27,7 +27,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo0}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -50,7 +50,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo0}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -77,7 +77,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo4}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -100,7 +100,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo4}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf
index 00554afc00..3a7d78069e 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.tex
index 761faa2c4b..d610aff9cd 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: sub-after2s2c.tex 103 2021-05-31 12:37:11Z herbert $
+%% $Id: sub-after2s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -27,7 +27,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo0}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -50,7 +50,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo0}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -77,7 +77,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo4}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -100,7 +100,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo4}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf
index efea15759c..22f84d81d6 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.tex
index ec371418a7..374a2fa0f1 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: sub-default1s1c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: sub-default1s1c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
@@ -28,7 +28,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo0}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -51,7 +51,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo0}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -78,7 +78,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo4}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -101,7 +101,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo4}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf
index 8d48919902..39e0377260 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.tex
index c9307aecef..33c1c8ad40 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: sub-default1s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: sub-default1s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -29,7 +29,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo0}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -52,7 +52,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo0}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -79,7 +79,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo4}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -102,7 +102,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo4}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf
index 84ab3d56cc..68205759a4 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.tex
index cd6d370b80..9ecb891836 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: sub-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: sub-default2s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -29,7 +29,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo0}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -52,7 +52,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo0}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -79,7 +79,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo4}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -102,7 +102,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo4}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf
index b319265630..8f71ca5fc2 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.tex
index e4fea43506..5717edc39e 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: sub-right1s1c.tex 103 2021-05-31 12:37:11Z herbert $
+%% $Id: sub-right1s1c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
@@ -27,7 +27,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo0}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -50,7 +50,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo0}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -77,7 +77,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo4}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -100,7 +100,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo4}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf
index 72ca919045..0faebe2324 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.tex
index d1073b7838..0e085d56da 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: sub-right1s2c.tex 103 2021-05-31 12:37:11Z herbert $
+%% $Id: sub-right1s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -27,7 +27,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo0}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -50,7 +50,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo0}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -77,7 +77,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo4}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -100,7 +100,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo4}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf
index 23e0a03ee7..f7224bc6d8 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.tex
index a6e556161c..0e8b0b6744 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: sub-right2s2c.tex 103 2021-05-31 12:37:11Z herbert $
+%% $Id: sub-right2s2c.tex 318 2021-11-20 07:30:54Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -27,7 +27,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo0}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -50,7 +50,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo0}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -77,7 +77,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo4}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
@@ -100,7 +100,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo4}%
+{}{\includegraphics[width=\linewidth]{CTAN}}%
diff --git a/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf
index b81fedc701..32af056a0e 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf
index a95470d1eb..ce2bc459b0 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf
index 83ad56d472..65487377e3 100644
--- a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf
+++ b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.tex b/macros/latex/contrib/hvfloat/doc/hvfloat.tex
index 116141dec6..fb50aa0941 100644
--- a/macros/latex/contrib/hvfloat/doc/hvfloat.tex
+++ b/macros/latex/contrib/hvfloat/doc/hvfloat.tex
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.tex 530 2022-05-01 11:01:31Z herbert $
+%% $Id: hvfloat.tex 584 2022-07-20 18:29:58Z herbert $
\listfiles
\errorcontextlines=100
\documentclass[twoside,paper=a4,usegeometry]{scrartcl}
@@ -241,6 +241,7 @@ The following packages are loaded by \Lpack{hvfloat} and the optional argument
\Lpack{subcaption},
\Lpack{atbegshi},
\Lpack{stfloats},
+\Lpack{floatpag},
\Lpack{expl3}, \Lpack{multido},
\Lpack{graphicx},
\Lpack{xkeyval},
@@ -2666,11 +2667,12 @@ in the inner margin on both pages.
Placing the caption on the image itself is not the best solution. With the optional arguments
\Lkeyval{before} and \Lkeyval{after} for \Lkeyword{capPos}, the caption can be placed on the bottom
-of the preceding or follwing page of the doublepage object. A givel label, e.g. \texttt{foo} will always point to the
+of the preceding or following page of the doublepage object. A givel label, e.g. \texttt{foo} will always point to the
page with the left part of the object. Internally are two additional labels defined: \texttt{foo-cap} points to the
caption and \texttt{foo-2} points to the right part of the doublepage object.
-In the follwoing example~\ref{foo} the caption is on page~\pageref{foo-cap}, the left image part on page~\pageref{foo}
+In the follwoing example~\ref{foo} the caption is on page~\pageref{foo-cap}, the left image part on
+page~\pageref{foo}
and the right part on page~\pageref{foo-2}. In the follwoing example~\ref{bar} the caption is on page~\pageref{bar-cap}, the left image part on page~\pageref{bar}
and the right part on page~\pageref{bar-2}. All three labels points to the same figure or table number:
diff --git a/macros/latex/contrib/hvfloat/latex/hvfloat.sty b/macros/latex/contrib/hvfloat/latex/hvfloat.sty
index ec23f2c318..7c1e23111a 100644
--- a/macros/latex/contrib/hvfloat/latex/hvfloat.sty
+++ b/macros/latex/contrib/hvfloat/latex/hvfloat.sty
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 530 2022-05-01 11:01:31Z herbert $
+%% $Id: hvfloat.sty 584 2022-07-20 18:29:58Z herbert $
%%
%%
%% IMPORTANT NOTICE:
@@ -16,8 +16,8 @@
%% `hvfloat' offers rotating of captions and objects for floats
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.39}
-\def\filedate{2022/05/01}
+\def\fileversion{2.40}
+\def\filedate{2022/07/20}
%\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
\ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)]
\let\hvFloatFileVersion\fileversion
@@ -27,7 +27,7 @@
\newif\ifhv@nostfloats \hv@nostfloatsfalse
\newif\ifhv@tugboat \hv@tugboatfalse
-\DeclareOption{fbox}{\hv@fboxtrue\setlength{\fboxsep}{1pt}}
+\DeclareOption{fbox}{\hv@fboxtrue\setlength\fboxsep{1pt}}
\DeclareOption{hyperref}{\hv@hyperreftrue}
\DeclareOption{nostfloats}{\hv@nostfloatstrue}
\DeclareOption{no-stfloats}{\hv@nostfloatstrue}
@@ -56,8 +56,12 @@
\ifhv@hyperref
\RequirePackage{hyperref}
\fi
-\ifhv@nostfloats\else
+\ifhv@nostfloats
+ \def\thisfloatpagestyle#1{%
+ \global\@namedef{\number\@currbox @float}{\thispagestyle{#1}}}
+\else
\RequirePackage{stfloats}% for bottom floats in a twocolumn mode
+ \RequirePackage{floatpag}% for bottom floats in a twocolumn mode
\fi
%
\providecommand*\LenToUnit[1]{\strip@pt\dimexpr#1*\p@/\unitlength}
@@ -67,10 +71,9 @@
\newlength\hvWideWidth
\newlength\hvMultiFloatSkip
\newlength\hvMaxCapWidth
-%\AtBeginDocument{%
-% \setlength\hv@BottomSpace{\dimexpr\paperheight-1in-\topmargin-\headheight-\headsep-\textheight}}
-\newlength\hvFullWidth % only for user purpose
-\setlength\hvFullWidth{\dimexpr\textwidth+\marginparwidth+\marginparsep}
+\newlength\hvFloatFullWidth % only for user purpose
+\AtBeginDocument{\hvFloatFullWidth=\the\dimexpr\textwidth+\marginparwidth+\marginparsep\relax}
+
\newsavebox\hvObjectBox
\newsavebox\hvCaptionBox
@@ -186,6 +189,7 @@
\newif\ifhv@global@sameHeight
\newif\ifhv@forceOutput
+
\newlength\hvSet@bindCorrection
\newlength\hvSet@sepLineskip
\newlength\hv@leftPageObjectWidth% for doublepage images
@@ -203,7 +207,7 @@
\define@key{hvSet}{bindCorr}[0pt]{%
\def\hv@temp{#1}%
\ifx\hv@temp\hv@Inner
- \setlength\hvSet@bindCorr{\dimexpr1in+\oddsidemargin}%
+ \hvSet@bindCorr=\the\dimexpr1in+\oddsidemargin\relax
\else
\setlength\hvSet@bindCorr{#1}%
\fi
@@ -259,7 +263,7 @@
\let\hvFloatSetDefaults\setDefaults
\hvFloatSetDefaults% onyl for first loading of the package
-\newcommand\hv@typeout[1]{\ifhv@Debug\typeout{>>>> #1}\fi}
+\providecommand\hv@typeout[1]{\ifhv@Debug\typeout{>>>> #1}\fi}
\providecommand\@tugclass{\@empty}
\ifx\@tugclass\@empty
@@ -283,8 +287,9 @@
\newlength\fboxlinewidth
\AtBeginDocument{%
- \setlength\fboxlinewidth{\dimexpr\linewidth-2\fboxrule-2\fboxsep}%
+ \fboxlinewidth=\the\dimexpr\linewidth-2\fboxrule-2\fboxsep\relax
}
+
\setlength\belowcaptionskip{\abovecaptionskip}% it is in latex.ltx = 0pt
\newcommand\saveCaptionSkip{%
\setlength{\hvAboveCaptionSkip}{\abovecaptionskip}%
@@ -331,9 +336,10 @@
\expandafter\captionsetup\expandafter{\hv@caption@format,position=below}
\ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi
\endgroup}
+
%
\newlength\hv@maxImageWidth
-\AtBeginDocument{\hv@maxImageWidth=\columnwidth}
+\AtBeginDocument{\setlength\hv@maxImageWidth{\columnwidth}}
\define@key{Gin}{columnWidth}[true]{%
\def\Gin@ewidth{\columnwidth}%
@@ -361,7 +367,7 @@
\Gin@boolkey{false}{iso}%
}
\define@key{Gin}{doublefullPage}[true]{%
- \def\Gin@ewidth{\dimexpr2\paperwidth-2in-2\evensidemargin}%
+ \def\Gin@ewidth{\the\dimexpr2\paperwidth-2in-2\evensidemargin}%
% \def\Gin@eheight{\paperheight}%
\Gin@boolkey{true}{iso}%
}
@@ -423,7 +429,6 @@
\fi
}
-
\def\drawSepLine{%
\par\noindent
\if@twocolumn
@@ -470,7 +475,7 @@
\def\hvFloat@i*{\@ifnextchar[{\do@hvFloat}{\do@hvFloat[]}}
\def\do@hvFloat[#1]{%
\begingroup
- \setlength\hvWideWidth{\dimexpr\columnwidth+\marginparwidth+\marginparsep}%
+ \hvWideWidth=\the\dimexpr\columnwidth+\marginparwidth+\marginparsep\relax%
% \setlength\hvWideWidth{\dimexpr\textwidth+\marginparwidth+\marginparsep}%
% \setlength\hvWideWidth{\dimexpr\linewidth+\marginparwidth}%
\hv@maxImageWidth=\textwidth
@@ -630,12 +635,12 @@
\ifx\hvSet@capWidth\hv@Natural% captionwidth=\linewidth-\objectwidth-separation
\ifhv@capbeside
\ifhv@wide
- \setlength\hvCapWidth{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hv@floatCapSep\relax}%
+ \hvCapWidth=\the\dimexpr\hvWideWidth-\hvObjectWidth-\hv@floatCapSep\relax
\else
\ifhv@star
- \setlength\hvCapWidth{\the\dimexpr\textwidth-\hvObjectWidth-\hv@floatCapSep\relax}%
+ \hvCapWidth=\the\dimexpr\textwidth-\hvObjectWidth-\hv@floatCapSep\relax
\else
- \setlength\hvCapWidth{\the\dimexpr\linewidth-\hvObjectWidth-\hv@floatCapSep\relax}%
+ \hvCapWidth=\the\dimexpr\linewidth-\hvObjectWidth-\hv@floatCapSep\relax
\fi
\fi
\else
@@ -645,13 +650,13 @@
\ifhv@capbeside
\ifhv@wide
\setlength\hvCapWidth{\hvSet@capWidth\hvWideWidth}%
- \setlength\@tempdima{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hv@floatCapSep\relax}%
+ \@tempdima=\the\dimexpr\hvWideWidth-\hvObjectWidth-\hv@floatCapSep\relax
\else
\setlength\hvCapWidth{\hvSet@capWidth\columnwidth}%
- \setlength\@tempdima{\the\dimexpr\columnwidth-\hvObjectWidth-\hv@floatCapSep\relax}%
+ \@tempdima=\the\dimexpr\columnwidth-\hvObjectWidth-\hv@floatCapSep\relax
\fi
\ifdim\hvCapWidth>\@tempdima
- \setlength\hvCapWidth{\@tempdima}%
+ \hvCapWidth=\@tempdima
\fi
\else
\ifhv@wide
@@ -1101,7 +1106,7 @@
\def\do@hvFloat@doublePage#1{% image on left and right page with caption on the right page
% #1-> 0/1 caption under/right
\hv@typeout{>>>doublePage: start with definitions of \hv@floatObject}%
- \global\hv@leftPageObjectWidth=\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection\relax
+ \global\hv@leftPageObjectWidth=\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection\relax
\global\hv@tempWidthA=\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection\relax
\xdef\hv@caption@format@temp{\hv@caption@format}% it gets lost otherwise for next afterpage
\@dblfpbot=0\p@ \@plus 1fil%
@@ -1749,7 +1754,7 @@
\endminipage}}}%
\fi
\else% ifnum, caption not rotated, under or over the right page
- \setlength\hv@tempWidthA{\dimexpr\paperheight-\ht\hvObjectBox}%
+ \hv@tempWidthA=\the\dimexpr\paperheight-\ht\hvObjectBox\relax
\ifdim\hv@tempWidthA > \ht\hvCaptionBox
\else
\put(\the\dimexpr1.5\paperwidth-\wd\hvObjectBox-\hvSet@bindCorrection,\the\dimexpr\ht\hvCaptionBox+\abovecaptionskip+\belowcaptionskip){\makebox[0pt][c]{\parbox{\textwidth}{%%
@@ -1782,12 +1787,15 @@
\end{\hv@floatType}%
}
+
+
\def\setPageObject{%
\ifhv@star
\begin{\hv@floatType*}[p]%
\else
\begin{\hv@floatType}[p]%
\fi
+ \thisfloatpagestyle{empty}%
\hfuzz=\maxdimen
\expandafter\hvFloatSet\expandafter{\hv@save@setting}%
\ifhv@FULLPAGE
@@ -1802,7 +1810,8 @@
\else
\hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}%
\fi
- \AtBeginShipoutNext{\thispagestyle{empty}}%
+% \AtBeginShipoutNext{\thispagestyle{empty}}%
+% \afterpage{\AddToHookNext{shipout/after}{\thispagestyle{empty}}}%
\usebox\hvObjectBox
\else
\usebox\hvObjectBox
diff --git a/macros/latex/contrib/wrapstuff/README.md b/macros/latex/contrib/wrapstuff/README.md
new file mode 100644
index 0000000000..017a8bf27c
--- /dev/null
+++ b/macros/latex/contrib/wrapstuff/README.md
@@ -0,0 +1,50 @@
+wrapstuff
+=========
+
+The `wrapstuff` package provides another implementation of text wrapping.
+Its implementation benefits from the paragraph hooks available since
+LaTeX 2021-06-01.
+
+Basic Usage
+-----------
+The package only provides a user environment `wrapstuff`.
+
+ \begin{wrapstuff}[<options>]
+ <wrapping stuff>
+ \end{wrapstuff}
+ <main text>
+
+You can read the package manual (in Chinese) for some explanations.
+
+Contributing
+------------
+The package is still highly experimental and not fully tested.
+[Issues](https://github.com/qinglee/wrapstuff/issues) and
+[pull requests](https://github.com/qinglee/wrapstuff/pulls)
+are always welcome.
+
+Copyright and Licence
+---------------------
+
+ Copyright (C) 2022 by Qing Lee <sobenlee@gmail.com>
+ -----------------------------------------------------------------
+
+ This work may be distributed and/or modified under the
+ conditions of the LaTeX Project Public License, either
+ version 1.3c of this license or (at your option) any later
+ version. This version of this license is in
+ http://www.latex-project.org/lppl/lppl-1-3c.txt
+ and 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 Qing Lee.
+
+ This package consists of the file wrapstuff.dtx,
+ and the derived files wrapstuff.pdf,
+ wrapstuff.sty,
+ wrapstuff.ins and
+ README.md (this file).
diff --git a/macros/latex/contrib/wrapstuff/wrapstuff.dtx b/macros/latex/contrib/wrapstuff/wrapstuff.dtx
new file mode 100644
index 0000000000..5b8c03ec03
--- /dev/null
+++ b/macros/latex/contrib/wrapstuff/wrapstuff.dtx
@@ -0,0 +1,3011 @@
+% \iffalse meta-comment
+% !TeX program = XeLaTeX
+% !TeX encoding = UTF-8
+%<*internal>
+\iffalse
+%</internal>
+%<*readme>
+wrapstuff
+=========
+
+The `wrapstuff` package provides another implementation of text wrapping.
+Its implementation benefits from the paragraph hooks available since
+LaTeX 2021-06-01.
+
+Basic Usage
+-----------
+The package only provides a user environment `wrapstuff`.
+
+ \begin{wrapstuff}[<options>]
+ <wrapping stuff>
+ \end{wrapstuff}
+ <main text>
+
+You can read the package manual (in Chinese) for some explanations.
+
+Contributing
+------------
+The package is still highly experimental and not fully tested.
+[Issues](https://github.com/qinglee/wrapstuff/issues) and
+[pull requests](https://github.com/qinglee/wrapstuff/pulls)
+are always welcome.
+
+Copyright and Licence
+---------------------
+
+ Copyright (C) 2022 by Qing Lee <sobenlee@gmail.com>
+ -----------------------------------------------------------------
+
+ This work may be distributed and/or modified under the
+ conditions of the LaTeX Project Public License, either
+ version 1.3c of this license or (at your option) any later
+ version. This version of this license is in
+ http://www.latex-project.org/lppl/lppl-1-3c.txt
+ and 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 Qing Lee.
+
+ This package consists of the file wrapstuff.dtx,
+ and the derived files wrapstuff.pdf,
+ wrapstuff.sty,
+ wrapstuff.ins and
+ README.md (this file).
+%</readme>
+%<*internal>
+\fi
+\begingroup
+ \def\temp{LaTeX2e}
+\expandafter\endgroup\ifx\temp\fmtname\else
+\csname fi\endcsname
+%</internal>
+%<*install>
+
+\input ctxdocstrip %
+
+\preamble
+
+ Copyright (C) 2022 by Qing Lee <sobenlee@gmail.com>
+-----------------------------------------------------------------
+
+ This work may be distributed and/or modified under the
+ conditions of the LaTeX Project Public License, either
+ version 1.3c of this license or (at your option) any later
+ version. This version of this license is in
+ http://www.latex-project.org/lppl/lppl-1-3c.txt
+ and 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 Qing Lee.
+
+-----------------------------------------------------------------
+
+\endpreamble
+
+\postamble
+
+ This work consists of the file wrapstuff.dtx,
+ and the derived files wrapstuff.pdf,
+ wrapstuff.sty,
+ wrapstuff.ins and
+ README.md.
+\endpostamble
+
+\generate
+ {
+%</install>
+%<*internal>
+ \usedir{source/latex/wrapstuff}
+ \file{wrapstuff.ins} {\from{\jobname.dtx}{install}}
+%</internal>
+%<*install>
+ \usedir{tex/latex/wrapstuff}
+ \file{wrapstuff.sty} {\from{\jobname.dtx}{package}}
+ \nopreamble\nopostamble
+ \usedir{doc/latex/wrapstuff}
+ \file{README.md} {\from{\jobname.dtx}{readme}}
+ }
+
+\endbatchfile
+%</install>
+%<*internal>
+\fi
+%</internal>
+%<package>\NeedsTeXFormat{LaTeX2e}
+%<package>\@ifundefined{ExplLoaderFileDate}{\RequirePackage{expl3}}{}
+%<+package>\GetIdInfo$Id: wrapstuff.dtx 564fe9d 2022-07-20 19:55:58 +0800 Qing Lee <sobenlee@gmail.com> $
+%<package> {Wrapping text around stuff}
+%<package>\ProvidesExplPackage{\ExplFileName}
+%<package> {\ExplFileDate}{0.1}{\ExplFileDescription}
+%<*driver>
+\documentclass{ctxdoc}
+\usepackage{wrapstuff}
+\usepackage{graphicx}
+\usepackage{zhlipsum}
+\ExplSyntaxOn
+\makeatletter
+\DeclareDocumentCommand \gitsha { m }
+ {
+ \href { https \c_colon_str //github.com/qinglee/wrapstuff/commit/#1 }
+ { rev. ~ \texttt{#1} }
+ }
+\DeclareDocumentCommand \QIANZIWEN { }
+ {
+ 天地玄黄宇宙洪荒日月盈昃辰宿列张
+ 寒来暑往秋收冬藏闰馀成岁律召调阳 \par
+ 云腾致雨露结为霜金生丽水玉出昆冈 \par
+ }
+\DeclareDocumentCommand \ADDSPECEIALKEY { m }
+ {
+ \cs_gset_eq:NN \@@_codedoc_names_typeset_save:
+ \__codedoc_names_typeset:
+ \cs_gset_protected:Npn \__codedoc_names_typeset:
+ {
+ \cs_gset_eq:NN \__codedoc_names_typeset:
+ \@@_codedoc_names_typeset_save:
+ \__codedoc_names_typeset:
+ #1 \\
+ }
+ }
+\DeclareDocumentCommand \IMAGE { m m }
+ { \includegraphics [ width = \dim_eval:n {#1} ] { example-image-#2.pdf } }
+\tl_put_left:Nn \Example
+ { \trivlist \item \relax }
+\tl_put_right:Nn \endExample
+ { \endtrivlist }
+\SideBySideExampleSet { numbers = none }
+\makeatother
+\ExplSyntaxOff
+\begin{document}
+ \DocInput{\jobname.dtx}
+ \IndexLayout
+ \PrintChanges
+ \PrintIndex
+\end{document}
+%</driver>
+% \fi
+%
+% \CheckSum{2923}
+%
+% \changes{v0.1}{2022/07/05}{初始版本。}
+% \changes{v0.1}{2022/07/20}{首次提交到 CTAN 发布。}
+%
+% \GetFileId{wrapstuff.sty}
+%
+% \title{\bfseries\pkg{wrapstuff} 宏包}
+% \author{李清}
+% \date{\filedate\qquad\fileversion\thanks{\gitsha{\ExplFileVersion}.}}
+% \maketitle
+%
+% \begin{documentation}
+%
+% \section{基本用法}
+%
+% \pkg{wrapstuff} 宏包提供了图文绕排的另一种实现。
+% \pkg{wrapstuff} 的实现依赖 \LaTeX\ 2021-06-01 开始提供的段落钩子,
+% 并依赖 \LaTeXiii\ 2022-04-10 之后的版本。
+%
+% \begin{function}{wrapstuff}
+% \begin{syntax}
+% \tn{begin}\{wrapstuff\}\oarg{选项}
+% <绕排内容>
+% \tn{end}\{wrapstuff\}
+% <正文>
+% \end{syntax}
+% \pkg{wrapstuff} 只提供了一个用户环境 \env{wrapstuff},
+% 会在环境之后的段落开始绕排。例如
+% \begin{Example}[frame=single,numbers=none,gobble=5]
+% \begin{wrapstuff}[c,top=1]
+% \includegraphics[width=\dimeval{\linewidth/3}]{example-image.pdf}
+% \end{wrapstuff}
+% \zhlipsum[1][name=zhufu]
+% \end{Example}
+% \end{function}
+%
+% \begin{function}{\wrapstuffset}
+% \begin{syntax}
+% \tn{wrapstuffset} \Arg{选项列表}
+% \end{syntax}
+% \pkg{wrapstuff} 的选项可以在调用宏包时设置,也可以通过 \tn{wrapstuffset} 设置。
+% 选项将在下面描述。
+% \end{function}
+%
+% \ADDSPECEIALKEY{\textrm{\meta{n}}}
+% \begin{function}{top}
+% \begin{syntax}
+% top = <非负整数>
+% \end{syntax}
+% 设置在正文段落的第几行之后开始绕排,可以设置为非负整数。
+% 非负整数选项 \meta{n} 是设置选项 \opt{top} 为 \meta{n} 的缩写形式。
+% 初始值是 \num{0}。
+% \end{function}
+%
+% \begin{function}{width}
+% \begin{syntax}
+% width = <宽度>
+% \end{syntax}
+% 设置绕排内容的宽度,初始值为 \qty{0}{pt},代表自然宽度。
+% \end{function}
+%
+% \begin{function}{height}
+% \begin{syntax}
+% height = <高度>
+% \end{syntax}
+% 设置绕排内容的高度,初始值为 \qty{0}{pt},代表自然高度。
+% \end{function}
+%
+% \begin{function}{leftsep,rightsep,hsep}
+% \begin{syntax}
+% leftsep = <长度>
+% rightsep = <长度>
+% hsep = <长度>
+% \end{syntax}
+% 设置绕排内容与正文的左/右间距,选项 \opt{hsep} 同时设置 \opt{leftsep} 和 \opt{rightsep}。
+% 初始值是 \qty{1}{em}。
+% \end{function}
+%
+% \begin{function}{abovesep,belowsep,vsep}
+% \begin{syntax}
+% abovesep = <长度>
+% belowsep = <长度>
+% vsep = <长度>
+% \end{syntax}
+% 设置绕排内容与正文的上/下间距,选项 \opt{vsep} 同时设置 \opt{abovesep} 和 \opt{belowsep}。
+% 初始值是 \qty{0}{pt}。
+% \end{function}
+%
+% \begin{function}{l,r,c,i,o,ratio}
+% \begin{syntax}
+% l/r/c/i/o
+% ratio = <实数>
+% \end{syntax}
+% 这些选项用于设置绕排内容位于正文中的位置。
+% 选项 \opt{l/r/c/i/o} 分别设置绕排内容位于正文的左侧、右侧、中间、内侧、外侧。
+% 选项 \opt{ratio} 设置绕排内容左侧的正文占据行宽的比例,可以设置为 $[0,1]$ 区间中的合理实数。
+% 选项 \opt{i/o} 可以与 \opt{ratio} 一起使用,这时设置的是内/外侧正文的行宽比例。
+% 初始设置为 |r|,即位于正文的右侧。
+% \end{function}
+%
+% \begin{function}{column}
+% \begin{syntax}
+% column = <(true)|false|par>
+% \end{syntax}
+% 控制是否将绕排内容两侧的正文分栏显示,只有设置 |c| 选项或者
+% 设置 \opt{ratio} 不等于 $0$ 或者 $1$ 时才有效。
+% \opt{false} 表示不分栏,正文文字方向始终保持从左到右的顺序;
+% \opt{par} 表示以段落为单位进行分栏,如下示例。
+% \begin{SideBySideExample}[xrightmargin=\dimeval{20em+5mm}]
+% \begin{wrapstuff}[c,1]
+% \IMAGE{2em}{a}
+% \end{wrapstuff}
+% \QIANZIWEN
+% \begin{wrapstuff}[c,1,column=par]
+% \IMAGE{2em}{b}
+% \end{wrapstuff}
+% \QIANZIWEN
+% \begin{wrapstuff}[c,0,column=false]
+% \IMAGE{2em}{c}
+% \end{wrapstuff}
+% \QIANZIWEN
+% \end{SideBySideExample}
+% \end{function}
+%
+% \begin{function}{hoffset}
+% \begin{syntax}
+% hoffset = <长度>
+% \end{syntax}
+% 设置绕排内容伸出正文版心的长度。
+% 当设置了选项 \opt{c} 或者选项 \opt{ratio} 的值位于 $(0,1)$ 时,本选项无效。
+% 一个特殊值 \tn{width} 用于表示绕排内容和相应间距的总宽度,
+% 可以将 \opt{hoffset} 设置为 \tn{width},完全伸出版心。
+% 初始值为 \qty{0}{pt}。
+% \end{function}
+%
+% \begin{function}{voffset}
+% \begin{syntax}
+% voffset = <长度>
+% \end{syntax}
+% 用于调整绕排内容的竖直位置,初始值为 \qty{0}{pt}。
+% \end{function}
+%
+% \begin{function}{type}
+% \begin{syntax}
+% type = <浮动体类型>
+% \end{syntax}
+% 设置绕排内容的浮动体类型,初始值为空。
+% 如果需要在 \env{wrapstuff} 环境中使用 \tn{caption} 命令,
+% 则需要设置 \opt{type} 为 \opt{figure} 或 \opt{table} 等类型,
+% 并需要同时设置 \opt{width} 指定宽度。
+% \begin{SideBySideExample}[xrightmargin=\dimeval{18em+5mm}]
+% \begin{wrapstuff}[type=figure,width=5em]
+% \centering
+% \IMAGE{4em}{plain}
+% \caption{示例}
+% \end{wrapstuff}
+% \QIANZIWEN
+% \end{SideBySideExample}
+% \end{function}
+%
+% \begin{function}{lines}
+% \begin{syntax}
+% lines = <正整数>
+% \end{syntax}
+% 设置绕排内容占据正文的行数,可以设置正整数。
+% 初始值为空,根据绕排内容的高度自动计算行数。
+% \end{function}
+%
+% \begin{function}{linewidth}
+% \begin{syntax}
+% linewidth = <宽度>
+% \end{syntax}
+% 设置正文段落的行宽,初始设置为 |\linewidth|,一般不需要调整。
+% \end{function}
+%
+% \begin{function}{\wrapstuffclear}
+% 如果当前正文段落的行数不够,\pkg{wrapstuff} 的作用会延续到下一段。
+% 这可能会导致某些意外结果,可以在下一段之前启用命令 \tn{wrapstuffclear} 消除影响。
+% \end{function}
+%
+% \end{documentation}
+%
+%
+% \StopEventually{}
+%
+%
+%\begin{implementation}
+%
+% \section{代码实现}
+%
+% \begin{macrocode}
+%<*package>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<@@=wstf>
+% \end{macrocode}
+%
+% \pkg{wrapstuff} 的实现依赖 \LaTeX\ 2021-06-01 开始提供的段落钩子。
+% \begin{macrocode}
+\@ifl@t@r \fmtversion { 2021-06-01 }
+ { }
+ {
+ \msg_new:nnn { wrapstuff } { latex-too-old }
+ {
+ You~need~to~update~your~LaTeX~to~the~latest~release. \\
+ Loading~wrapstuff~will~abort!
+ }
+ \msg_critical:nn { wrapstuff } { latex-too-old }
+ }
+% \end{macrocode}
+%
+% 由于使用了 \cs{keys_precompile:nnN},需要比较新的 \LaTeXiii。
+% \begin{macrocode}
+\@ifl@t@r \ExplLoaderFileDate { 2022-04-10 }
+ { }
+ {
+ \msg_new:nnn { wrapstuff } { latex3-too-old }
+ {
+ You~need~to~update~your~installation~of~the~bundles~
+ "l3kernel"~and~"l3packages". \\
+ Loading~wrapstuff~will~abort!
+ }
+ \msg_critical:nn { wrapstuff } { latex3-too-old }
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
+\prop_gput:Nnn \g_msg_module_name_prop { wstf } { wrapstuff }
+% \end{macrocode}
+%
+% \begin{macro}[TF]{
+% \@@_if_last_none:,
+% \@@_if_last_hlist:,
+% \@@_if_last_whatsit:,
+% \@@_if_last_glue:,
+% \@@_if_last_kern:,
+% \@@_if_last_penalty:}
+% 一些 \hologo{eTeX} 结点判定函数。
+% \begin{macrocode}
+\group_begin:
+\cs_set:Npn \@@_tmp:nn #1
+ {
+ \group_begin:
+ \exp_args:Ncc \@@_tmp_aux:NNn
+ { @@_if_last_ #1 : }
+ { c_@@_ #1 _node }
+ }
+\cs_set:Npn \@@_tmp_aux:NNn #1#2#3
+ {
+ \group_end:
+ \int_const:Nn #2 {#3}
+ \prg_new_conditional:Npnn #1 { T , F , TF }
+ {
+ \if_int_compare:w \tex_lastnodetype:D = #2
+ \prg_return_true: \else: \prg_return_false: \fi:
+ }
+ }
+\@@_tmp:nn { none } { -1 }
+\@@_tmp:nn { hlist } { 1 }
+\@@_tmp:nn { whatsit } { 9 }
+\@@_tmp:nn { glue } { 11 }
+\@@_tmp:nn { kern } { 12 }
+\@@_tmp:nn { penalty } { 13 }
+\group_end:
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_gadd_hook:nn, \@@_package_hook:nn}
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_gadd_hook:nn #1
+ { \hook_gput_code:nnn {#1} { wrapstuff } }
+\cs_new_protected:Npn \@@_package_hook:nn #1
+ { \hook_gput_code:nnn { package/#1/after } { wrapstuff } }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{wrapstuff}
+% 主要功能环境接口。
+% \begin{macrocode}
+\NewDocumentEnvironment { wrapstuff } { O { } }
+ {
+ \@@_clear:
+ \int_set:Nn \l_@@_top_int { -1 }
+ \tl_if_blank:nTF {#1}
+ { \tl_clear:N \l_@@_main_kv_tl }
+ {
+ \keys_set_filter:nnnN { wrapstuff }
+ { main , ratio }
+ {#1} \l_@@_main_kv_tl
+ }
+ \tl_set:Nx \l_@@_type_tl { \l_@@_type_tl }
+ \dim_set:Nn \l_@@_width_dim { \l_@@_width_tl }
+ \dim_set:Nn \l_@@_height_dim { \l_@@_height_tl }
+ \hbox_gset:Nw \g_@@_stuff_box
+ \dim_compare:nNnTF \l_@@_width_dim > \c_zero_dim
+ { \@@_minipage_begin: }
+ { \@@_hbox_begin: }
+ }
+ {
+ \dim_compare:nNnTF \l_@@_width_dim > \c_zero_dim
+ { \@@_minipage_end: }
+ { \@@_hbox_end: }
+ \@@_set_vsep:
+ \@@_attach_label:
+ \tl_if_empty:NTF \l_@@_main_kv_tl
+ { \tl_gclear:N \g_@@_main_setting_tl }
+ { \@@_save_main_setting: }
+ \@@_set_top_line:
+ \dim_gset:Nn \g_@@_stuff_wd_dim
+ { \box_wd:N \g_@@_stuff_box }
+ \dim_gset:Nn \g_@@_stuff_ht_dim
+ { \box_ht_plus_dp:N \g_@@_stuff_box }
+ \dim_gset_eq:NN
+ \g_@@_remaining_dim
+ \g_@@_stuff_ht_dim
+ \@@_next_para:
+ }
+\@@_gadd_hook:nn { env/wrapstuff/before } { \par }
+\cs_new_protected_nopar:Npn \@@_minipage_begin:
+ {
+ \@@_floatrow_hook:
+ \dim_compare:nNnTF \l_@@_height_dim > \c_zero_dim
+ { \begin { minipage } [b] [ \l_@@_height_dim ] [c] { \l_@@_width_dim } }
+ { \begin { minipage } [b] { \l_@@_width_dim } }
+ \tl_if_empty:NF \l_@@_type_tl
+ { \@@_set_float: }
+ }
+\cs_new_protected_nopar:Npn \@@_minipage_end:
+ {
+ \end { minipage }
+ \hbox_gset_end:
+ \@@_float_pos_hook:
+ }
+\cs_new_protected_nopar:Npn \@@_hbox_begin:
+ { \tex_ignorespaces:D }
+\cs_new_protected_nopar:Npn \@@_hbox_end:
+ {
+ \tex_unskip:D
+ \hbox_gset_end:
+ \dim_compare:nNnT \l_@@_height_dim > \c_zero_dim
+ { \@@_gset_height: }
+ }
+\cs_new_protected_nopar:Npn \@@_gset_height:
+ {
+ \hbox_gset:Nn \g_@@_stuff_box
+ {
+ \box_move_up:nn
+ {
+ ( \l_@@_height_dim
+ - \box_ht:N \g_@@_stuff_box
+ + \box_dp:N \g_@@_stuff_box
+ ) / 2
+ }
+ { \box_use_drop:N \g_@@_stuff_box }
+ }
+ \box_gset_ht:Nn \g_@@_stuff_box { \l_@@_height_dim }
+ \box_gset_dp:Nn \g_@@_stuff_box { \c_zero_dim }
+ }
+\cs_new_protected_nopar:Npn \@@_set_vsep:
+ {
+ \@@_gadd_ht:Nn \g_@@_stuff_box { \l_@@_abovesep_tl }
+ \dim_set:Nn \l_@@_shift_dim { \l_@@_belowsep_tl }
+ \dim_compare:nNnF \l_@@_shift_dim = \c_zero_dim
+ { \@@_set_belowsep: }
+ }
+\cs_new_protected_nopar:Npn \@@_set_belowsep:
+ {
+ \hbox_gset:Nn \g_@@_stuff_box
+ {
+ \box_move_up:nn
+ { \l_@@_shift_dim + \box_dp:N \g_@@_stuff_box }
+ { \box_use_drop:N \g_@@_stuff_box }
+ }
+ \box_gset_dp:Nn \g_@@_stuff_box { \c_zero_dim }
+ }
+\tl_new:N \l_@@_main_kv_tl
+\tl_new:N \g_@@_main_setting_tl
+\box_new:N \g_@@_stuff_box
+\dim_new:N \g_@@_stuff_ht_dim
+\dim_new:N \g_@@_stuff_wd_dim
+\dim_new:N \l_@@_shift_dim
+\dim_new:N \l_@@_width_dim
+\dim_new:N \l_@@_height_dim
+\dim_new:N \g_@@_prevdepth_dim
+\dim_new:N \g_@@_remaining_dim
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_attach_label:, \@@_write_label:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_attach_label:
+ {
+ \stepcounter { wrapstuff }
+ \hbox_gset:Nn \g_@@_stuff_box
+ {
+ \@@_write_label:
+ \box_use_drop:N \g_@@_stuff_box
+ }
+ }
+\cs_new_protected_nopar:Npn \@@_write_label:
+ {
+ \iow_shipout_x:Nx \@auxout
+ {
+ \c_backslash_str wrapstuff@label
+ { \@@_counter:n { wrapstuff } }
+ { \exp_not:N \wrapstuff@counter { page } }
+ }
+ }
+\cs_new:Npn \@@_counter:n #1
+ { \int_value:w \value {#1} }
+\cs_new_eq:NN \wrapstuff@counter \@@_counter:n
+\cs_new_protected_nopar:Npn \wrapstuff@label
+ { \@newl@bel { wrapstuff@label } }
+\tl_const:Nn \c_@@_label_tl
+ { wrapstuff@label@ \int_value:w \value { wrapstuff } }
+\@@_gadd_hook:nn { begindocument }
+ {
+ \legacy_if:nTF { @filesw }
+ {
+ \iow_now:Nx \@mainaux
+ {
+ \c_backslash_str providecommand
+ \c_backslash_str wrapstuff@label [2] { }
+ }
+ }
+ { \cs_gset_eq:NN \@@_write_label: \@@_empty: }
+ }
+\newcounter { wrapstuff }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_save_main_setting:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_save_main_setting:
+ {
+ \exp_args:Nnno
+ \keys_set_filter:nnnN { wrapstuff }
+ { main }
+ { \l_@@_main_kv_tl } \l_@@_main_kv_tl
+ \bool_if:NTF \l_@@_swap_bool
+ { \@@_swap_ratio: }
+ { \@@_set_ratio:N \l_@@_ratio_fp }
+ \tl_if_empty:NF \l_@@_main_kv_tl
+ { \@@_save_main_setting_aux: }
+ }
+\cs_new_protected:Npn \@@_set_ratio:N #1
+ {
+ \tl_gset:Nx \g_@@_main_setting_tl
+ { \fp_set:Nn \exp_not:N \l_@@_ratio_fp { \fp_use:N #1 } }
+ }
+\cs_new_protected:Npn \@@_set_ratio:n #1
+ {
+ \tl_gset:Nx \g_@@_main_setting_tl
+ { \fp_set:Nn \exp_not:N \l_@@_ratio_fp { \fp_eval:n {#1} } }
+ }
+\cs_new_protected_nopar:Npn \@@_save_main_setting_aux:
+ {
+ \exp_args:Nno
+ \keys_precompile:nnN
+ { wrapstuff }
+ { \l_@@_main_kv_tl } \l_@@_main_kv_tl
+ \tl_gconcat:NNN \g_@@_main_setting_tl
+ \g_@@_main_setting_tl \l_@@_main_kv_tl
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_set_top_line:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_set_top_line:
+ {
+ \int_compare:nNnF \l_@@_top_int < \c_zero_int
+ {
+ \tl_gput_right:Nx \g_@@_main_setting_tl
+ {
+ \int_set:Nn \l_@@_top_int
+ { \int_use:N \l_@@_top_int }
+ }
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_swap_ratio:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_swap_ratio:
+ {
+ \fp_compare:nF
+ { \c_zero_fp < \l_@@_ratio_fp < \c_one_fp }
+ { \fp_zero:N \l_@@_ratio_fp }
+ \int_if_odd:nTF
+ {
+ \exp_args:Ne \cs_if_exist_use:cF
+ { \c_@@_label_tl }
+ { \@@_counter:n { page } }
+ }
+ { \bool_if:NTF \l_@@_inner_bool }
+ { \bool_if:NTF \l_@@_outer_bool }
+ { \@@_set_ratio:N \l_@@_ratio_fp }
+ { \@@_set_ratio:n { \c_one_fp - \l_@@_ratio_fp } }
+ }
+\bool_new:N \l_@@_swap_bool
+\bool_new:N \l_@@_inner_bool
+\bool_new:N \l_@@_outer_bool
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_gadd_ht:Nn,\@@_gsub_ht:Nn}
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_gadd_ht:Nn #1#2
+ { \box_gset_ht:Nn #1 { \box_ht:N #1 + \dim_eval:n {#2} } }
+\cs_new_protected:Npn \@@_gsub_ht:Nn #1#2
+ { \box_gset_ht:Nn #1 { \box_ht:N #1 - \dim_eval:n {#2} } }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_clear:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_clear:
+ {
+ \@@_clear_para_hook:
+ \@@_clear_kludge:
+ \@@_clear_variable:
+ }
+\cs_new_protected_nopar:Npn \@@_clear_variable:
+ {
+ \int_gset:Nn \g_@@_top_int { -1 }
+ \int_gzero:N \g_@@_window_int
+ \dim_gzero:N \g_@@_total_ht_dim
+ \dim_gzero:N \g_@@_column_left_dim
+ \tl_gclear:N \g_@@_main_setting_tl
+ \bool_gset_false:N \g_@@_next_bool
+ \bool_gset_false:N \g_@@_hoffset_bool
+ \bool_gset_false:N \g_@@_next_hang_bool
+ \bool_gset_false:N \g_@@_first_save_bool
+ \bool_gset_false:N \g_@@_right_move_bool
+ \bool_gset_false:N \g_@@_column_right_bool
+ }
+\cs_new_protected_nopar:Npn \@@_clear_kludge:
+ {
+ \bool_if:NTF \g_@@_next_bool
+ {
+ \box_gclear:N \g_@@_stuff_box
+ \skip_vertical:n
+ { \tex_baselineskip:D * \g_@@_window_int }
+ }
+ {
+ \box_if_empty:NF \g_@@_stuff_box
+ { \@@_clear_stuff_box: }
+ }
+ }
+\cs_new_protected_nopar:Npn \@@_clear_stuff_box:
+ {
+ \@@_ignore_depth:
+ \skip_set:Nn \l_@@_last_skip
+ { \box_dp:N \strutbox }
+ \skip_vertical:N \l_@@_last_skip
+ \box_use_drop:N \g_@@_stuff_box
+ \skip_vertical:N \l_@@_last_skip
+ \@@_ignore_depth:
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_next_para:}
+% 将 \env{wrapstuff} 环境之后的段落放入内部环境 \env{wrapstuff@par} 中。
+% 为了控制钩子执行顺序,需要使用 |wrapstuff| 标签,
+% 而不用更为方便的 \cs{hook_gput_next_code:nn} 实现。
+% \begin{macrocode}
+\@@_gadd_hook:nn { para/before } { \@@_para_before: }
+\@@_gadd_hook:nn { para/begin } { \@@_para_begin: }
+\@@_gadd_hook:nn { para/end } { \@@_para_end: }
+\cs_new_protected_nopar:Npn \@@_next_para:
+ {
+ \cs_gset_eq:NN \@@_para_before: \@@_env_before:
+ \cs_gset_eq:NN \@@_para_begin: \@@_env_begin:
+ \cs_gset_eq:NN \@@_para_end: \@@_env_end:
+ }
+\cs_new_protected_nopar:Npn \@@_env_before:
+ { \dim_gset_eq:NN \g_@@_prevdepth_dim \tex_prevdepth:D }
+\cs_new_protected_nopar:Npn \@@_env_begin:
+ { \begin { wrapstuff@par } }
+\cs_new_protected_nopar:Npn \@@_env_end:
+ { \end { wrapstuff@par } }
+\cs_new_protected_nopar:Npn \@@_clear_para_hook:
+ {
+ \cs_gset_eq:NN \@@_para_before: \@@_empty:
+ \cs_gset_eq:NN \@@_para_begin: \@@_empty:
+ \cs_gset_eq:NN \@@_para_end: \@@_empty:
+ }
+\cs_new_protected_nopar:Npn \@@_empty:
+ { }
+\cs_new_eq:NN \@@_para_before: \@@_empty:
+\cs_new_eq:NN \@@_para_begin: \@@_empty:
+\cs_new_eq:NN \@@_para_end: \@@_empty:
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[int]{wrapstuff@par}
+% 内部环境,实现主要功能。
+% \begin{macrocode}
+\NewDocumentEnvironment { wrapstuff@par } { }
+ {
+ \tl_use:N \g_@@_main_setting_tl
+ \dim_set:Nn \l_@@_leftsep_dim { \l_@@_leftsep_tl }
+ \dim_set:Nn \l_@@_rightsep_dim { \l_@@_rightsep_tl }
+ \dim_set:Nn \l_@@_voffset_dim { \l_@@_voffset_tl }
+ \dim_set:Nn \l_@@_line_dim { \l_@@_linewidth_tl }
+ \dim_set:Nn \l_@@_min_dim { \box_dp:N \strutbox }
+ \dim_set_eq:NN \l_@@_main_width_dim \l_@@_line_dim
+ \dim_sub:Nn \l_@@_line_dim
+ { \tex_leftskip:D + \tex_rightskip:D }
+ \dim_set:Nn \l_@@_window_dim
+ { \l_@@_line_dim - \g_@@_stuff_wd_dim }
+ \fp_compare:nNnTF \l_@@_ratio_fp > \c_zero_fp
+ {
+ \fp_compare:nNnTF \l_@@_ratio_fp < \c_one_fp
+ { \@@_set_window: }
+ { \@@_set_hang_right: }
+ }
+ { \@@_set_hang_left: }
+ \int_compare:nNnTF \g_@@_window_int > \c_zero_int
+ {
+ \int_set_eq:NN \l_@@_window_int \g_@@_window_int
+ \int_zero:N \l_@@_top_int
+ }
+ { \@@_set_lines: }
+ \bool_if:NTF \l_@@_hang_bool
+ {
+ \dim_set_eq:NN \l_@@_display_dim \l_@@_window_dim
+ \int_set_eq:NN \l_@@_window_line_int \l_@@_window_int
+ }
+ {
+ \dim_set_eq:NN \l_@@_display_dim \l_@@_l_dim
+ \int_set:Nn \l_@@_window_int { \l_@@_window_int * 2 }
+ \int_set:Nn \l_@@_window_line_int
+ {
+ \bool_if:NTF \g_@@_column_right_bool
+ { \l_@@_window_int / 2 + \g_@@_column_window_int }
+ { \l_@@_window_int }
+ }
+ }
+ \cs_gset_eq:NN \@@_para_before: \@@_empty:
+ \cs_gset_eq:NN \@@_para_begin: \@@_empty:
+ \@@_save_parshape:
+ \vbox_set:Nw \l_@@_body_box
+ \@@_set_prevdepth:N \g_@@_prevdepth_dim
+ \@@_save_tex_skip:
+ \@@_tex_parameter:
+ \@@_restore_parshape:
+ \@@_display_parameter:
+ \@@_make_main_parshape:
+ \para_raw_noindent:
+ }
+ {
+ \@@_save_hangfrom:
+ \@@_save_tex_skip:
+ \@@_group_kludge:
+ \@@_tex_parameter:
+ \@@_make_main_parshape:
+ \para_raw_end:
+ \int_gset_eq:NN \g_@@_line_int \tex_prevgraf:D
+ \vbox_set_end:
+ \@@_adjust_tex_skip:
+ \cs_gset_eq:NN \@@_para_end: \@@_empty:
+ \int_compare:nNnTF \g_@@_line_int > \l_@@_top_int
+ { \@@_build_par: }
+ { \@@_put_par: }
+ }
+\box_new:N \l_@@_body_box
+\box_new:N \l_@@_window_box
+\int_new:N \l_@@_window_int
+\int_new:N \g_@@_window_int
+\int_new:N \g_@@_line_int
+\int_new:N \l_@@_window_line_int
+\int_new:N \g_@@_column_window_int
+\dim_new:N \l_@@_l_dim
+\dim_new:N \l_@@_r_dim
+\dim_new:N \l_@@_min_dim
+\dim_new:N \l_@@_line_dim
+\dim_new:N \l_@@_window_dim
+\dim_new:N \l_@@_display_dim
+\dim_new:N \l_@@_voffset_dim
+\dim_new:N \l_@@_leftsep_dim
+\dim_new:N \l_@@_rightsep_dim
+\dim_new:N \g_@@_window_ht_dim
+\dim_new:N \l_@@_main_width_dim
+\int_new:N \g_@@_top_int
+\int_gdecr:N \g_@@_top_int
+\bool_new:N \l_@@_hang_bool
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_set_hang_left:, \@@_set_hang_right:, \@@_set_window:,}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_set_hang_left:
+ {
+ \bool_set_true:N \l_@@_hang_bool
+ \bool_if:NF \g_@@_hoffset_bool
+ { \@@_set_hoffset:NN \l_@@_rightsep_dim \use:nn }
+ \dim_sub:Nn \l_@@_window_dim { \l_@@_rightsep_dim }
+ \dim_zero:N \l_@@_l_dim
+ \dim_set_eq:NN \l_@@_r_dim \l_@@_window_dim
+ \cs_set_eq:NN \@@_build_box: \@@_build_hang:
+ }
+\cs_new_protected_nopar:Npn \@@_set_hang_right:
+ {
+ \bool_set_true:N \l_@@_hang_bool
+ \bool_if:NF \g_@@_hoffset_bool
+ { \@@_set_hoffset:NN \l_@@_leftsep_dim \use_ii_i:nn }
+ \dim_sub:Nn \l_@@_window_dim { \l_@@_leftsep_dim }
+ \dim_zero:N \l_@@_r_dim
+ \dim_set_eq:NN \l_@@_l_dim \l_@@_window_dim
+ \cs_set_eq:NN \@@_build_box: \@@_build_hang:
+ }
+\cs_new_protected_nopar:Npn \@@_set_window:
+ {
+ \bool_set_false:N \l_@@_hang_bool
+ \dim_sub:Nn \l_@@_window_dim
+ { \l_@@_leftsep_dim + \l_@@_rightsep_dim }
+ \dim_set:Nn \l_@@_l_dim
+ { \@@_ratio:Nn \l_@@_ratio_fp { \l_@@_window_dim } }
+ \dim_set:Nn \l_@@_r_dim
+ { \l_@@_window_dim - \l_@@_l_dim }
+ \bool_if:NTF \l_@@_column_bool
+ { \cs_set_eq:NN \@@_build_box: \@@_build_column: }
+ { \cs_set_eq:NN \@@_build_box: \@@_build_block: }
+ }
+\cs_new_protected:Npn \@@_set_hoffset:NN #1#2
+ {
+ \bool_gset_true:N \g_@@_hoffset_bool
+ \dim_set:Nn \l_@@_hoffset_width_dim
+ { #1 + \g_@@_stuff_wd_dim }
+ \group_begin:
+ \cs_set_eq:NN \width \l_@@_hoffset_width_dim
+ \dim_gset:Nn \g_@@_hoffset_dim { \l_@@_hoffset_tl }
+ \group_end:
+ \int_compare:nNnF \g_@@_hoffset_dim = \c_zero_dim
+ {
+ \hbox_gset:Nn \g_@@_stuff_box
+ {
+ #2 { \tex_kern:D - \g_@@_hoffset_dim }
+ { \box_use_drop:N \g_@@_stuff_box }
+ }
+ \dim_add:Nn \l_@@_window_dim { \g_@@_hoffset_dim }
+ }
+ }
+\dim_new:N \g_@@_hoffset_dim
+\dim_new:N \l_@@_hoffset_width_dim
+\bool_new:N \g_@@_hoffset_bool
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_set_lines:, \@@_window_init:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_set_lines:
+ {
+ \bool_if:NTF \g_@@_next_bool
+ { \tl_clear:N \l_@@_lines_tl }
+ { \tl_set:Nx \l_@@_lines_tl { \l_@@_lines_tl } }
+ \int_set:Nn \l_@@_window_int
+ {
+ \tl_if_empty:NTF \l_@@_lines_tl
+ { \@@_unit:n { \g_@@_remaining_dim + \l_@@_min_dim } }
+ { \l_@@_lines_tl }
+ }
+ \bool_if:NF \g_@@_next_bool
+ { \@@_window_init: }
+ \int_compare:nNnTF \g_@@_top_int < \c_zero_int
+ {
+ \int_compare:nNnT \l_@@_top_int < \c_zero_int
+ { \int_zero:N \l_@@_top_int }
+ }
+ { \int_set_eq:NN \l_@@_top_int \g_@@_top_int }
+ }
+\cs_new_protected_nopar:Npn \@@_window_init:
+ {
+ \int_gset_eq:NN \g_@@_column_window_int \l_@@_window_int
+ \dim_gset:Nn \g_@@_window_ht_dim
+ { \tex_baselineskip:D * \g_@@_column_window_int }
+ \tl_if_empty:NF \l_@@_lines_tl
+ {
+ \dim_gset:Nn \g_@@_remaining_dim
+ { \g_@@_window_ht_dim - \box_ht:N \strutbox }
+ \dim_gset_eq:NN \g_@@_stuff_ht_dim \g_@@_remaining_dim
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_make_main_parshape:}
+% 主要处理用于标题悬挂的 \tn{@hangfrom} 和用于列表环境的 \tn{parshape}。
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_make_main_parshape:
+ {
+ \dim_compare:nNnTF \g_@@_hangindent_dim > \c_zero_dim
+ {
+ \int_compare:nNnTF \g_@@_hangafter_int = \c_one_int
+ { \@@_make_hangfrom: }
+ { \@@_make_main_parshape_aux: }
+ }
+ { \@@_make_main_parshape_aux: }
+ }
+\cs_new_protected_nopar:Npn \@@_make_main_parshape_aux:
+ {
+ \bool_gset_false:N \g_@@_hangfrom_bool
+ \tex_parshape:D
+ \int_eval:n { \l_@@_top_int + 1 } ~
+ \prg_replicate:nn
+ { \l_@@_top_int }
+ { \g_@@_parshape_indent_dim \g_@@_parshape_length_dim }
+ \c_zero_dim \c_max_dim
+ }
+\cs_new_protected_nopar:Npn \@@_save_parshape:
+ {
+ \int_gset_eq:NN \g_@@_parshape_int \tex_parshape:D
+ \int_compare:nNnTF \g_@@_parshape_int = \c_one_int
+ {
+ \dim_gset:Nn \g_@@_parshape_indent_dim
+ { \tex_parshapeindent:D \c_one_int }
+ \dim_gset:Nn \g_@@_parshape_length_dim
+ { \tex_parshapelength:D \c_one_int }
+ }
+ {
+ \int_gzero:N \g_@@_parshape_int
+ \dim_gzero:N \g_@@_parshape_indent_dim
+ \dim_gset_eq:NN \g_@@_parshape_length_dim \l_@@_main_width_dim
+ \int_gset_eq:NN \g_@@_hangafter_int \tex_hangafter:D
+ \dim_gset_eq:NN \g_@@_hangindent_dim \tex_hangindent:D
+ }
+ }
+\cs_new_protected_nopar:Npn \@@_restore_parshape:
+ {
+ \int_compare:nNnTF \g_@@_parshape_int = \c_one_int
+ {
+ \tex_parshape:D \g_@@_parshape_int
+ \g_@@_parshape_indent_dim \g_@@_parshape_length_dim
+ }
+ { \@@_restore_hangfrom: }
+ }
+\cs_new_protected_nopar:Npn \@@_parshape_kern:
+ {
+ \dim_compare:nNnT \l_@@_l_dim = \c_zero_dim
+ {
+ \dim_compare:nNnF \g_@@_parshape_indent_dim = \c_zero_dim
+ { \tex_kern:D - \g_@@_parshape_indent_dim }
+ }
+ }
+\cs_new_protected_nopar:Npn \@@_make_hangfrom:
+ {
+ \bool_if:NTF \l_@@_hang_bool
+ { \@@_make_hangfrom_aux: }
+ { \@@_make_main_parshape_aux: }
+ }
+\cs_new_protected_nopar:Npn \@@_make_hangfrom_aux:
+ {
+ \@@_restore_hangfrom:
+ \int_zero:N \tex_parshape:D
+ \bool_gset_true:N \g_@@_hangfrom_bool
+ \dim_set_eq:NN \tex_hsize:D \l_@@_window_dim
+ }
+\cs_new_protected_nopar:Npn \@@_save_hangfrom:
+ {
+ \int_gset_eq:NN \g_@@_hangafter_int \tex_hangafter:D
+ \dim_gset_eq:NN \g_@@_hangindent_dim \tex_hangindent:D
+ }
+\cs_new_protected_nopar:Npn \@@_restore_hangfrom:
+ {
+ \int_set_eq:NN \tex_hangafter:D \g_@@_hangafter_int
+ \dim_set_eq:NN \tex_hangindent:D \g_@@_hangindent_dim
+ }
+\bool_new:N \g_@@_hangfrom_bool
+\int_new:N \g_@@_parshape_int
+\int_new:N \g_@@_hangafter_int
+\dim_new:N \g_@@_hangindent_dim
+\dim_new:N \g_@@_parshape_indent_dim
+\dim_new:N \g_@@_parshape_length_dim
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_group_kludge:}
+% \LaTeX\ 的 \tn{list} 环境中,为了保持 \tn{parshape},\tn{par} 被重定义为 |{\@@par}|。
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_group_kludge:
+ {
+ \scan_stop:
+ \int_compare:nNnTF \tex_currentgrouptype:D = \c_one_int
+ {
+ \c_group_end_token
+ \cs_gset_eq:NN \@@_group_begin: \c_group_begin_token
+ }
+ { \cs_gset_eq:NN \@@_group_begin: \@@_empty: }
+ \legacy_if:nTF { @noitemarg }
+ { \cs_gset_eq:NN \@@_set_itemarg: \@noitemargtrue }
+ { \cs_gset_eq:NN \@@_set_itemarg: \@@_empty: }
+ }
+\cs_new_eq:NN \@@_set_itemarg: \@@_empty:
+\cs_new_eq:NN \@@_group_begin: \@@_empty:
+\@@_gadd_hook:nn { env/wrapstuff@par/after }
+ {
+ \@@_set_itemarg:
+ \@@_group_begin:
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_ratio:Nn, \@@_unit:n}
+% \begin{macrocode}
+\cs_new:Npn \@@_ratio:Nn #1#2
+ { \fp_to_dim:n { #1 \dim_to_fp:n {#2} } }
+\cs_new:Npn \@@_unit:n #1
+ {
+ \fp_eval:n
+ {
+ ceil
+ (
+ \dim_to_decimal_in_unit:nn
+ {#1}
+ { \tex_baselineskip:D }
+ )
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_save_tex_skip:,\@@_tex_parameter:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_save_tex_skip:
+ {
+ \skip_gset_eq:NN \g_@@_left_skip \tex_leftskip:D
+ \skip_gset_eq:NN \g_@@_right_skip \tex_rightskip:D
+ \skip_gset_eq:NN \g_@@_parfill_skip \tex_parfillskip:D
+ \skip_gset_eq:NN \g_@@_baseline_skip \tex_baselineskip:D
+ \skip_gset:Nn \g_@@_main_left_skip { - \tex_leftskip:D }
+ }
+\cs_new_protected_nopar:Npn \@@_adjust_tex_skip:
+ {
+ \@@_adjust_skip:N \g_@@_left_skip
+ \@@_adjust_skip:N \g_@@_right_skip
+ \@@_adjust_skip:N \g_@@_parfill_skip
+ }
+\cs_new_protected:Npn \@@_adjust_skip:N #1
+ { \skip_gsub:Nn #1 { \dim_eval:n {#1} } }
+\cs_new_protected_nopar:Npn \@@_tex_parameter:
+ {
+ \int_zero:N \tex_clubpenalty:D
+ \int_zero:N \tex_widowpenalty:D
+ \int_zero:N \tex_interlinepenalty:D
+ \int_zero:N \tex_displaywidowpenalty:D
+ \int_zero:N \tex_clubpenalties:D
+ \int_zero:N \tex_widowpenalties:D
+ \int_zero:N \tex_interlinepenalties:D
+ \int_zero:N \tex_displaywidowpenalties:D
+ \skip_set_eq:NN \tex_leftskip:D \g_@@_left_skip
+ \skip_set_eq:NN \tex_rightskip:D \g_@@_right_skip
+ \skip_set_eq:NN \tex_parfillskip:D \g_@@_parfill_skip
+ }
+\skip_new:N \g_@@_left_skip
+\skip_new:N \g_@@_right_skip
+\skip_new:N \g_@@_parfill_skip
+\skip_new:N \g_@@_baseline_skip
+\skip_new:N \g_@@_main_left_skip
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_display_parameter:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_display_parameter:
+ {
+ \bool_gset_false:N \g_@@_display_bool
+ \tex_everydisplay:D \exp_after:wN
+ {
+ \tex_the:D \tex_everydisplay:D
+ \@@_test_leqno:
+ \dim_compare:nNnF \tex_displaywidth:D < \c_max_dim
+ {
+ \bool_gset_true:N \g_@@_display_bool
+ \dim_set_eq:NN \tex_displaywidth:D \l_@@_display_dim
+ }
+ }
+ }
+\cs_new_eq:NN \@@_test_leqno: \@@_empty:
+\bool_new:N \g_@@_display_bool
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_build_par:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_build_par:
+ {
+ \bool_if:NTF \g_@@_hangfrom_bool
+ { \@@_build_box: }
+ { \@@_build_par_aux: }
+ \box_if_empty:NTF \l_@@_window_box
+ { \@@_put_next_par: }
+ { \@@_put_box: }
+ }
+\cs_new_protected_nopar:Npn \@@_build_par_aux:
+ {
+ \@@_extract_display_hbox:NN \l_@@_body_box \l_@@_bottom_box
+ \int_compare:nNnT \l_@@_top_int > \c_zero_int
+ { \@@_put_body_box: }
+ \box_if_empty:NTF \l_@@_bottom_box
+ {
+ \box_if_empty:NF \g_@@_display_box
+ { \@@_build_display_box: }
+ }
+ { \@@_build_body_box: }
+ }
+\box_new:N \l_@@_bottom_box
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_put_par:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_put_par:
+ {
+ \int_gset:Nn \g_@@_top_int
+ { \l_@@_top_int - \g_@@_line_int }
+ \int_gzero:N \g_@@_window_int
+ \@@_put_body_box:
+ \skip_zero:N \tex_parskip:D
+ \para_raw_noindent:
+ \@@_next_para:
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_put_body_box:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_put_body_box:
+ {
+ \para_raw_end:
+ \dim_compare:nNnTF { \box_wd:N \l_@@_body_box } < \c_max_dim
+ { \@@_put_body_aux:N \l_@@_body_box }
+ {
+ \@@_extract_hbox:NN \l_@@_body_box \l_@@_bottom_box
+ \@@_put_body_aux:N \l_@@_body_box
+ \box_set_eq_drop:NN \l_@@_body_box \l_@@_bottom_box
+ }
+ \para_raw_end:
+ }
+\cs_new_protected_nopar:Npn \@@_put_body_aux:N #1
+ {
+ \dim_gset:Nn \g_@@_prevdepth_dim { \box_dp:N #1 }
+ \vbox_unpack_drop:N #1
+ \@@_set_prevdepth:N \g_@@_prevdepth_dim
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_put_next_par:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_put_next_par:
+ {
+ \int_gzero:N \g_@@_top_int
+ \int_gzero:N \g_@@_window_int
+ \skip_zero:N \tex_parskip:D
+ \para_raw_noindent:
+ \@@_next_para:
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_build_display_box:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_build_display_box:
+ {
+ \bool_set_true:N \l_@@_display_bool
+ \bool_if:NTF \g_@@_amsmath_bool
+ { \@@_build_display_amsmath: }
+ { \@@_build_display_normal: }
+ \box_if_empty:NTF \l_@@_body_box
+ { \@@_build_display_auxi: }
+ { \@@_build_display_auxii: }
+ }
+\cs_new_protected_nopar:Npn \@@_build_display_amsmath:
+ {
+ \vbox_gset:Nn \g_@@_equation_box
+ {
+ \skip_vertical:n { - \g_@@_display_pre_skip }
+ \vbox_unpack_drop:N \g_@@_display_box
+ \skip_gset_eq:NN \g_@@_pos_skip \tex_lastskip:D
+ \tex_unskip:D
+ \int_gset_eq:NN \g_@@_pos_int \tex_lastpenalty:D
+ \tex_unpenalty:D
+ \skip_gadd:Nn \g_@@_pos_skip { \tex_lastskip:D }
+ \tex_unskip:D
+ \tex_unpenalty:D
+ }
+ \box_gset_wd:Nn \g_@@_equation_box
+ { \l_@@_display_dim }
+ \vbox_gset:Nn \g_@@_display_box
+ {
+ \tex_penalty:D \g_@@_display_pre_int
+ \skip_vertical:N \g_@@_display_pre_skip
+ }
+ \skip_gset_eq:NN \g_@@_pre_skip \g_@@_display_pre_skip
+ }
+\cs_new_protected_nopar:Npn \@@_build_display_normal:
+ {
+ \vbox_gset:Nn \g_@@_display_box
+ {
+ \vbox_unpack_drop:N \g_@@_display_box
+ \skip_gset_eq:NN \g_@@_pos_skip \tex_lastskip:D
+ \tex_unskip:D
+ \int_gset_eq:NN \g_@@_pos_int \tex_lastpenalty:D
+ \tex_unpenalty:D
+ \box_gset_to_last:N \g_@@_equation_box
+ \skip_gset_eq:NN \g_@@_pre_skip \tex_lastskip:D
+ \tex_unskip:D
+ \skip_gadd:Nn \g_@@_pre_skip { \tex_lastskip:D }
+ \tex_unskip:D
+ \skip_vertical:N \g_@@_pre_skip
+ }
+ }
+\cs_new_protected_nopar:Npn \@@_build_display_auxi:
+ {
+ \bool_if:NTF \g_@@_amsmath_bool
+ { \box_set_eq_drop:NN \l_@@_window_box \g_@@_equation_box }
+ {
+ \hbox_set_to_wd:Nnn \l_@@_window_box
+ { \l_@@_display_dim }
+ {
+ \tex_hss:D
+ \@@_adjust_equation:
+ \box_use_drop:N \g_@@_equation_box
+ \tex_hss:D
+ }
+ }
+ \dim_gset:Nn \g_@@_ht_dim { \box_ht:N \l_@@_window_box }
+ \dim_add:Nn \l_@@_voffset_dim
+ { \box_ht:N \g_@@_display_box / 2 }
+ }
+\cs_new_protected_nopar:Npn \@@_build_display_auxii:
+ {
+ \box_if_horizontal:NTF \l_@@_body_box
+ {
+ \box_set_eq:NN \l_@@_bottom_box \l_@@_body_box
+ \@@_build_display_auxiii:
+ }
+ {
+ \@@_extract_hbox:NN \l_@@_body_box \l_@@_bottom_box
+ \str_if_eq:eeTF
+ {
+ \dim_eval:n { \box_ht:N \l_@@_body_box }
+ \dim_eval:n { \box_dp:N \l_@@_body_box }
+ \dim_eval:n { \box_ht:N \l_@@_bottom_box }
+ \dim_eval:n { \box_dp:N \l_@@_bottom_box }
+ }
+ { \c_@@_zero_pt_str }
+ {
+ \vbox_unpack_drop:N \l_@@_body_box
+ \box_clear:N \l_@@_bottom_box
+ \@@_build_display_auxi:
+ }
+ { \@@_build_display_auxiii: }
+ }
+ }
+\str_const:Nx \c_@@_zero_pt_str
+ {
+ \dim_use:N \c_zero_dim
+ \dim_use:N \c_zero_dim
+ \dim_use:N \c_zero_dim
+ \dim_use:N \c_zero_dim
+ }
+\cs_new_protected_nopar:Npn \@@_build_display_auxiii:
+ {
+ \bool_set_true:N \l_@@_attach_equation_bool
+ \bool_if:NTF \g_@@_amsmath_bool
+ { \box_set_eq_drop:NN \l_@@_display_box \g_@@_display_box }
+ {
+ \box_gclear:N \g_@@_display_box
+ \@@_adjust_equation:
+ }
+ \@@_build_body_box:
+ }
+\cs_new_protected_nopar:Npn \@@_attach_equation:N
+ {
+ \bool_if:NTF \g_@@_amsmath_bool
+ { \@@_attach_equation_amsmath:N }
+ { \@@_attach_equation_normal:N }
+ }
+\cs_new_protected:Npn \@@_attach_equation_amsmath:N #1
+ {
+ \vbox_set:Nn #1
+ {
+ \box_use:N #1
+ \@@_ignore_depth:
+ \vbox_unpack_drop:N \l_@@_display_box
+ \skip_vertical:n
+ { \g_@@_display_pre_dim - \box_dp:N #1 }
+ \box_use_drop:N \g_@@_equation_box
+ }
+ }
+\cs_new_protected:Npn \@@_attach_equation_normal:N #1
+ {
+ \vbox_set:Nn #1
+ {
+ \@@_tex_parameter:
+ \dim_set_eq:NN \tex_hsize:D \l_@@_display_dim
+ \para_raw_noindent:
+ \hbox_unpack_drop:N #1 \tex_unskip:D
+ \@@_insert_equation:
+ \para_raw_end:
+ \skip_gset_eq:NN \g_@@_pos_skip \tex_lastskip:D
+ \tex_unskip:D
+ \int_gset_eq:NN \g_@@_pos_int \tex_lastpenalty:D
+ \tex_unpenalty:D
+ }
+ }
+\cs_new_protected_nopar:Npn \@@_insert_equation:
+ {
+ \c_math_toggle_token \c_math_toggle_token
+ \dim_compare:nNnTF \tex_displaywidth:D = \l_@@_display_dim
+ { \box_use_drop:N \g_@@_equation_box }
+ {
+ \bool_if:NTF \g_@@_eqnum_bool
+ { \@@_repack_equation: }
+ { \box_use_drop:N \g_@@_equation_box }
+ }
+ \c_math_toggle_token \c_math_toggle_token
+ }
+\cs_new_protected_nopar:Npn \@@_repack_equation:
+ {
+ \box_gclear:N \g_@@_equation_box
+ \box_use_drop:N \g_@@_eqbody_box
+ \bool_if:NTF \g_@@_leqno_bool
+ { \tex_leqno:D }
+ { \tex_eqno:D }
+ \box_use_drop:N \g_@@_eqnum_box
+ }
+\cs_new_protected_nopar:Npn \@@_adjust_equation:
+ {
+ \@@_test_eqnum:
+ \bool_if:NT \g_@@_eqnum_bool
+ { \@@_adjust_equation_width: }
+ }
+\cs_new_protected_nopar:Npn \@@_test_eqnum:
+ {
+ \hbox_set:Nn \l_@@_last_box
+ {
+ \bool_gset_false:N \g_@@_eqnum_bool
+ \hbox_unpack:N \g_@@_equation_box
+ \@@_if_last_hlist:F { \use_none_delimit_by_q_stop:w }
+ \box_gset_to_last:N \g_@@_eqnum_box
+ \@@_if_last_kern:F { \use_none_delimit_by_q_stop:w }
+ \tex_unkern:D
+ \@@_if_last_hlist:F { \use_none_delimit_by_q_stop:w }
+ \box_gset_to_last:N \g_@@_eqbody_box
+ \@@_if_last_none:F { \use_none_delimit_by_q_stop:w }
+ \bool_gset_true:N \g_@@_eqnum_bool
+ \use_none_delimit_by_q_stop:w \q_stop
+ }
+ }
+\cs_new_protected_nopar:Npn \@@_adjust_equation_width:
+ {
+ \bool_if:NTF \g_@@_leqno_bool
+ { \@@_adjust_leqno: }
+ {
+ \box_gset_wd:Nn \g_@@_equation_box
+ { \box_wd:N \g_@@_eqbody_box }
+ }
+ }
+\cs_new_protected_nopar:Npn \@@_adjust_leqno:
+ {
+ \box_set_eq_drop:NN \l_@@_last_box \g_@@_eqnum_box
+ \box_gset_eq_drop:NN \g_@@_eqnum_box \g_@@_eqbody_box
+ \box_gset_eq_drop:NN \g_@@_eqbody_box \l_@@_last_box
+ \hbox_gset:Nn \g_@@_equation_box
+ {
+ \skip_horizontal:n
+ {
+ \box_wd:N \g_@@_eqbody_box
+ - \box_wd:N \g_@@_equation_box
+ }
+ \box_use_drop:N \g_@@_equation_box
+ }
+ }
+\box_new:N \g_@@_eqbody_box
+\box_new:N \g_@@_eqnum_box
+\box_new:N \g_@@_equation_box
+\box_new:N \l_@@_display_box
+\int_new:N \g_@@_pos_int
+\skip_new:N \g_@@_pos_skip
+\bool_new:N \g_@@_eqnum_bool
+\bool_new:N \g_@@_leqno_bool
+\bool_new:N \l_@@_display_bool
+\bool_new:N \l_@@_attach_equation_bool
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_add_pos_skip:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_add_pos_skip:
+ {
+ \bool_lazy_or:nnTF
+ { \g_@@_right_move_bool }
+ { \int_compare_p:nNn \g_@@_window_int > \c_zero_int }
+ {
+ \tex_vadjust:D
+ {
+ \tex_penalty:D \c_@@_nobreak_int
+ \bool_if:NT \l_@@_display_bool
+ { \skip_vertical:N \g_@@_pos_skip }
+ }
+ }
+ {
+ \bool_if:NT \l_@@_display_bool
+ {
+ \tex_vadjust:D
+ {
+ \tex_penalty:D \g_@@_pos_int
+ \skip_vertical:N \g_@@_pos_skip
+ }
+ }
+ }
+ \int_gzero:N \g_@@_pos_int
+ \skip_gzero:N \g_@@_pos_skip
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_build_body_box:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_build_body_box:
+ {
+ \box_set_eq:NN \l_@@_save_body_box \l_@@_bottom_box
+ \@@_build_window:
+ \int_compare:nNnTF \g_@@_line_int > \l_@@_window_line_int
+ { \@@_extract_hbox:NN \l_@@_body_box \l_@@_bottom_box }
+ { \box_clear:N \l_@@_bottom_box }
+ \box_if_empty:NF \l_@@_bottom_box
+ { \bool_set_false:N \l_@@_attach_equation_bool }
+ \box_clear:N \l_@@_window_box
+ \@@_build_box:
+ }
+\box_new:N \l_@@_save_body_box
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_build_body_box:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_build_window:
+ {
+ \vbox_set:Nn \l_@@_body_box
+ {
+ \@@_tex_parameter:
+ \@@_make_parshape:
+ \@@_column_penalties:
+ \dim_zero:N \tex_emergencystretch:D
+ \dim_set_eq:NN \tex_hfuzz:D \c_max_dim
+ \dim_set_eq:NN \tex_vfuzz:D \c_max_dim
+ \int_set_eq:NN \tex_hbadness:D \c_max_int
+ \int_set_eq:NN \tex_vbadness:D \c_max_int
+ \int_set:Nn \tex_tolerance:D { 1000 }
+ \para_raw_noindent:
+ \hbox_unpack_drop:N \l_@@_bottom_box
+ \para_raw_end:
+ \int_gset_eq:NN \g_@@_line_int \tex_prevgraf:D
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_make_parshape:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_make_parshape:
+ {
+ \tex_parshape:D
+ \int_eval:n { \l_@@_window_line_int + 1 } ~
+ \bool_if:NTF \l_@@_hang_bool
+ {
+ \prg_replicate:nn
+ { \l_@@_window_int }
+ { \c_zero_dim \l_@@_window_dim }
+ }
+ {
+ \bool_if:NTF \l_@@_column_bool
+ {
+ \prg_replicate:nn
+ { \l_@@_window_int / 2 }
+ { \c_zero_dim \l_@@_l_dim }
+ \prg_replicate:nn
+ {
+ \bool_if:NTF \g_@@_column_right_bool
+ { \g_@@_column_window_int }
+ { \l_@@_window_int / 2 }
+ }
+ { \c_zero_dim \l_@@_r_dim }
+ }
+ {
+ \prg_replicate:nn
+ { \l_@@_window_int / 2 }
+ {
+ \c_zero_dim \l_@@_l_dim
+ \c_zero_dim \l_@@_r_dim
+ }
+ }
+ }
+ \c_zero_dim \c_max_dim
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_column_penalties:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_column_penalties:
+ {
+ \bool_if:NF \l_@@_hang_bool
+ {
+ \bool_if:NT \l_@@_column_bool
+ { \@@_column_penalties_aux: }
+ }
+ }
+\cs_new_protected_nopar:Npn \@@_column_penalties_aux:
+ {
+ \tex_interlinepenalties:D
+ \int_eval:n { \l_@@_window_int / 2 + \c_one_int } ~
+ \prg_replicate:nn
+ { \l_@@_window_int / 2 - \c_one_int }
+ { \c_@@_nobreak_int }
+ \c_@@_break_int
+ \c_zero_int
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_build_box:, \@@_build_block:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_build_block:
+ {
+ \@@_build_block_auxi:
+ \vbox_set:Nn \l_@@_window_box
+ {
+ \@@_tex_parameter:
+ \dim_set_eq:NN \tex_hsize:D \l_@@_line_dim
+ \para_raw_noindent:
+ \hbox_unpack_drop:N \g_@@_line_box
+ \para_raw_end:
+ }
+ \bool_if:NT \l_@@_attach_equation_bool
+ {
+ \box_set_ht:Nn \l_@@_window_box
+ { \box_ht_plus_dp:N \l_@@_window_box - \g_@@_dp_dim }
+ \box_set_dp:Nn \l_@@_window_box { \g_@@_dp_dim }
+ }
+ }
+\cs_new_protected_nopar:Npn \@@_build_block_auxi:
+ {
+ \vbox_set:Nn \l_@@_body_box
+ {
+ \vbox_unpack_drop:N \l_@@_body_box
+ \bool_lazy_and:nnTF
+ { \box_if_empty_p:N \l_@@_bottom_box }
+ { \int_if_odd_p:n { \g_@@_line_int } }
+ { \box_set_eq:NN \l_@@_r_box \l_@@_empty_box }
+ {
+ \box_set_to_last:N \l_@@_r_box
+ \tex_unskip:D \tex_unpenalty:D
+ }
+ \box_set_to_last:N \l_@@_l_box
+ \tex_unskip:D \tex_unpenalty:D
+ \hbox_gset:Nn \g_@@_line_box
+ {
+ \bool_if:NT \l_@@_attach_equation_bool
+ { \@@_build_block_attach: }
+ \box_use:N \l_@@_l_box
+ \tex_hfill:D
+ \box_use:N \l_@@_r_box
+ }
+ \@@_build_block_auxii:
+ }
+ }
+\cs_new_protected_nopar:Npn \@@_build_block_auxii:
+ {
+ \int_case:nnTF
+ { \tex_lastnodetype:D }
+ {
+ { \c_@@_none_node } { }
+ { \c_@@_whatsit_node } { }
+ }
+ { \@@_build_block_finalise: }
+ { \@@_build_block_auxiii: }
+ }
+\cs_new_protected_nopar:Npn \@@_build_block_auxiii:
+ {
+ \box_set_to_last:N \l_@@_r_box
+ \tex_unskip:D \tex_unpenalty:D
+ \box_set_to_last:N \l_@@_l_box
+ \tex_unskip:D \tex_unpenalty:D
+ \hbox_gset:Nn \g_@@_line_box
+ {
+ \box_use:N \l_@@_l_box
+ \tex_hfill:D
+ \box_use:N \l_@@_r_box
+ \tex_penalty:D \c_@@_break_int
+ \hbox_unpack_drop:N \g_@@_line_box
+ }
+ \@@_build_block_auxii:
+ }
+\cs_new_protected_nopar:Npn \@@_build_block_attach:
+ {
+ \box_set_eq:NN \l_@@_last_box \l_@@_l_box
+ \@@_attach_equation:N \l_@@_last_box
+ \dim_gset:Nn \g_@@_dp_dim { \box_dp:N \l_@@_last_box }
+ \hbox_set:Nn \l_@@_l_box
+ {
+ \box_move_down:nn
+ { \box_ht:N \l_@@_last_box - \box_ht:N \l_@@_l_box }
+ { \box_use_drop:N \l_@@_last_box }
+ }
+ }
+\cs_new_protected_nopar:Npn \@@_build_block_finalise:
+ {
+ \dim_gset:Nn \g_@@_ht_dim
+ {
+ \dim_max:nn
+ { \box_ht:N \l_@@_l_box }
+ { \box_ht:N \l_@@_r_box }
+ }
+ }
+\dim_new:N \g_@@_dp_dim
+\dim_new:N \g_@@_ht_dim
+\box_new:N \l_@@_l_box
+\box_new:N \l_@@_r_box
+\box_new:N \g_@@_line_box
+\box_new:N \l_@@_empty_box
+\hbox_set:Nn \l_@@_empty_box { }
+\int_const:Nn \c_@@_break_int { -10000 }
+\int_const:Nn \c_@@_nobreak_int { 10000 }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_build_column_fuzzy:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_build_column_fuzzy:
+ {
+ \hbox_set_to_wd:Nnn \l_@@_window_box
+ { \l_@@_line_dim }
+ {
+ \skip_zero:N \tex_splittopskip:D
+ \dim_set_eq:NN \tex_vfuzz:D \c_max_dim
+ \int_set_eq:NN \tex_vbadness:D \c_max_int
+ \@@_build_column_aux:
+ \box_if_empty:NT \l_@@_bottom_box
+ { \@@_build_column_fuzzy_aux: }
+ \dim_gset:Nn \g_@@_ht_dim { \box_ht:N \l_@@_l_box }
+ \vbox_set:Nn \l_@@_l_box
+ {
+ \vbox_unpack_drop:N \l_@@_l_box
+ \bool_if:NT \l_@@_attach_equation_bool
+ {
+ \box_set_to_last:N \l_@@_last_box
+ \@@_attach_equation:N \l_@@_last_box
+ \vbox_unpack_drop:N \l_@@_last_box
+ }
+ }
+ \box_use:N \l_@@_l_box
+ \tex_hfil:D
+ \box_move_up:nn
+ { \box_ht:N \l_@@_l_box - \box_ht:N \l_@@_r_box }
+ { \box_use_drop:N \l_@@_r_box }
+ }
+ }
+\cs_new_protected_nopar:Npn \@@_build_column_aux:
+ {
+ \vbox_set_split_to_ht:NNn \l_@@_l_box \l_@@_body_box
+ { \c_zero_dim }
+ \vbox_set_top:Nn \l_@@_l_box
+ { \vbox_unpack_drop:N \l_@@_l_box }
+ \box_set_eq_drop:NN \l_@@_r_box \l_@@_body_box
+ }
+\cs_new_protected_nopar:Npn \@@_build_column_fuzzy_aux:
+ {
+ \dim_compare:nNnTF
+ {
+ \box_ht_plus_dp:N \l_@@_r_box -
+ \box_ht_plus_dp:N \l_@@_l_box
+ }
+ >
+ { \l_@@_min_dim }
+ {
+ \box_if_empty:NF \l_@@_last_l_box
+ {
+ \box_set_eq_drop:NN \l_@@_l_box \l_@@_last_l_box
+ \box_set_eq_drop:NN \l_@@_r_box \l_@@_last_r_box
+ }
+ }
+ { \@@_rebuild_window: }
+ }
+\cs_new_protected_nopar:Npn \@@_rebuild_window:
+ {
+ \int_compare:nNnT \l_@@_window_int > { 2 }
+ {
+ \int_sub:Nn \l_@@_window_int { 2 }
+ \box_set_eq_drop:NN \l_@@_last_l_box \l_@@_l_box
+ \box_set_eq_drop:NN \l_@@_last_r_box \l_@@_r_box
+ \box_set_eq:NN \l_@@_bottom_box \l_@@_save_body_box
+ \int_set_eq:NN \l_@@_window_line_int \l_@@_window_int
+ \@@_build_window:
+ \@@_build_column_aux:
+ \@@_build_column_fuzzy_aux:
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_build_column_strict:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_build_column_strict:
+ {
+ \group_begin:
+ \skip_zero:N \tex_splittopskip:D
+ \dim_set_eq:NN \tex_vfuzz:D \c_max_dim
+ \int_set_eq:NN \tex_vbadness:D \c_max_int
+ \@@_build_column_aux:
+ \box_if_empty:NTF \l_@@_r_box
+ { \@@_build_column_strict_auxi: }
+ {
+ \box_if_empty:NTF \l_@@_bottom_box
+ { \@@_build_column_strict_auxii: }
+ {
+ \bool_if:NTF \g_@@_column_right_bool
+ { \@@_build_column_strict_auxiii: }
+ { \@@_build_column_strict_auxiv: }
+ }
+ }
+ \group_end:
+ \box_set_eq_drop:NN \l_@@_window_box \g_@@_window_box
+ }
+\cs_new_protected_nopar:Npn \@@_build_column_strict_auxi:
+ {
+ \@@_repack_left_box:
+ \bool_if:NT \l_@@_attach_equation_bool
+ { \@@_column_attach:N \l_@@_l_box }
+ \box_gset_eq_drop:NN \g_@@_window_box \l_@@_l_box
+ \bool_gset_true:N \g_@@_column_right_bool
+ \bool_if:NF \g_@@_first_save_bool
+ {
+ \bool_gset_true:N \g_@@_first_save_bool
+ \dim_gset:Nn \g_@@_first_sep_dim
+ { \tex_baselineskip:D - \g_@@_ht_dim }
+ \dim_gset_eq:NN \g_@@_first_dp_dim \g_@@_prevdepth_dim
+ }
+ \int_case:nnT { \g_@@_window_int }
+ {
+ { \c_zero_int } { }
+ { \g_@@_line_int } { }
+ }
+ { \@@_column_move_entire_aux: }
+ }
+\cs_new_protected_nopar:Npn \@@_column_move_entire_aux:
+ {
+ \bool_gset_true:N \g_@@_entire_bool
+ \bool_gset_true:N \g_@@_next_hang_bool
+ }
+\cs_new_protected_nopar:Npn \@@_column_move_entire:
+ {
+ \dim_gsub:Nn \g_@@_first_sep_dim
+ { \box_dp:N \l_@@_window_box }
+ \bool_gset_false:N \g_@@_entire_bool
+ \dim_gzero:N \g_@@_column_right_ht_dim
+ \dim_gset_eq:NN \g_@@_prevdepth_dim \g_@@_first_dp_dim
+ \@@_column_right_move_set:nn
+ { \g_@@_stuff_ht_dim }
+ { \g_@@_window_ht_dim }
+ \int_gset_eq:NN \g_@@_window_int \g_@@_column_window_int
+ }
+\cs_new_protected:Npn \@@_column_right_move_set:nn #1#2
+ {
+ \bool_gset_true:N \g_@@_right_move_bool
+ \bool_gset_true:N \g_@@_first_set_bool
+ \tl_gput_right:Nn \g_@@_main_setting_tl
+ {
+ \bool_if:NTF \g_@@_first_set_bool
+ {
+ \bool_gset_false:N \g_@@_first_set_bool
+ \bool_set_true:N \l_@@_first_move_bool
+ }
+ { \bool_set_false:N \l_@@_first_move_bool }
+ \fp_zero:N \l_@@_ratio_fp
+ }
+ \@@_make_next_stuff:nn
+ { \l_@@_line_dim - \l_@@_r_dim - \l_@@_rightsep_dim }
+ {#1}
+ \dim_gset:Nn \g_@@_column_left_dim {#2}
+ \int_gzero:N \g_@@_top_int
+ }
+\cs_new_protected_nopar:Npn \@@_build_column_strict_auxii:
+ {
+ \bool_gset_false:N \g_@@_entire_bool
+ \@@_repack_left_box:
+ \bool_if:NT \l_@@_attach_equation_bool
+ { \@@_column_attach:N \l_@@_r_box }
+ \dim_gset:Nn \g_@@_hang_ht_dim
+ {
+ \g_@@_stuff_ht_dim - \tex_baselineskip:D *
+ \@@_unit:n { \box_ht_plus_dp:N \l_@@_r_box }
+ - \g_@@_pos_skip
+ }
+ \dim_compare:nNnTF \g_@@_hang_ht_dim > \c_zero_dim
+ { \@@_column_move_right: }
+ { \@@_column_put_right: }
+ \box_gset_ht:Nn \g_@@_window_box { \box_ht:N \l_@@_l_box }
+ \box_gset_dp:Nn \g_@@_window_box { \box_dp:N \l_@@_l_box }
+ }
+\cs_new_protected_nopar:Npn \@@_column_move_right:
+ {
+ \int_compare:nNnTF \g_@@_window_int > \c_zero_int
+ {
+ \dim_gset:Nn \g_@@_column_left_dim
+ {
+ \g_@@_window_ht_dim
+ - \g_@@_first_sep_dim
+ - \box_ht:N \l_@@_r_box
+ }
+ \@@_next_hang_para:
+ }
+ {
+ \dim_gset:Nn \g_@@_column_left_dim
+ {
+ \box_ht:N \l_@@_l_box
+ - \box_ht:N \l_@@_r_box
+ }
+ \dim_gset:Nn \g_@@_first_sep_dim
+ { \tex_baselineskip:D - \g_@@_ht_dim }
+ \bool_gset_true:N \g_@@_right_move_bool
+ \bool_gset_true:N \g_@@_next_hang_bool
+ }
+ \hbox_gset_to_wd:Nnn \g_@@_window_box
+ { \l_@@_line_dim }
+ {
+ \box_use:N \l_@@_l_box
+ \tex_hfil:D
+ \box_move_up:nn
+ { \g_@@_column_left_dim }
+ { \box_use:N \l_@@_r_box }
+ }
+ \dim_gset:Nn \g_@@_column_right_ht_dim
+ { \box_ht:N \l_@@_r_box + \g_@@_pos_skip }
+ }
+\cs_new_protected_nopar:Npn \@@_column_put_right:
+ {
+ \hbox_gset_to_wd:Nnn \g_@@_window_box
+ { \l_@@_line_dim }
+ {
+ \box_use:N \l_@@_l_box
+ \tex_hfil:D
+ \box_move_up:nn
+ {
+ \int_compare:nNnTF \g_@@_window_int > \c_zero_int
+ { \g_@@_window_ht_dim - \g_@@_first_sep_dim }
+ { \box_ht:N \l_@@_l_box }
+ - \box_ht:N \l_@@_r_box
+ }
+ { \box_use:N \l_@@_r_box }
+ }
+ \skip_gzero:N \g_@@_pos_skip
+ }
+\cs_new_protected_nopar:Npn \@@_next_hang_para:
+ {
+ \bool_if:NTF \g_@@_entire_bool
+ { \@@_column_move_entire: }
+ {
+ \@@_column_right_move_set:nn
+ { \g_@@_hang_ht_dim }
+ { \g_@@_column_left_dim }
+ \int_gzero:N \g_@@_window_int
+ }
+ \bool_gset_false:N \g_@@_next_hang_bool
+ }
+\cs_new_protected_nopar:Npn \@@_build_column_strict_auxiii:
+ {
+ \bool_gset_false:N \g_@@_column_right_bool
+ \@@_repack_left_box:
+ \hbox_gset_to_wd:Nnn \g_@@_window_box
+ { \l_@@_line_dim }
+ {
+ \box_use:N \l_@@_l_box
+ \tex_hfil:D
+ \box_use:N \l_@@_r_box
+ }
+ \box_gset_ht:Nn \g_@@_window_box
+ { \box_ht:N \l_@@_l_box }
+ }
+\cs_new_protected_nopar:Npn \@@_build_column_strict_auxiv:
+ {
+ \@@_repack_left_box:
+ \hbox_gset_to_wd:Nnn \g_@@_window_box
+ { \l_@@_line_dim }
+ {
+ \box_use:N \l_@@_l_box
+ \tex_hfil:D
+ \box_move_up:nn
+ { \box_ht:N \l_@@_l_box - \box_ht:N \l_@@_r_box }
+ { \box_use_drop:N \l_@@_r_box }
+ }
+ }
+\cs_new_protected_nopar:Npn \@@_repack_left_box:
+ {
+ \dim_gset:Nn \g_@@_ht_dim { \box_ht:N \l_@@_l_box }
+ \vbox_set:Nn \l_@@_l_box
+ { \vbox_unpack_drop:N \l_@@_l_box }
+ }
+\cs_new_protected_nopar:Npn \@@_column_attach:N #1
+ {
+ \vbox_set:Nn #1
+ {
+ \vbox_unpack_drop:N #1
+ \box_set_to_last:N \l_@@_last_box
+ \@@_attach_equation:N \l_@@_last_box
+ \vbox_unpack_drop:N \l_@@_last_box
+ }
+ }
+\box_new:N \l_@@_last_l_box
+\box_new:N \l_@@_last_r_box
+\box_new:N \g_@@_window_box
+\dim_new:N \g_@@_fake_wd_dim
+\dim_new:N \g_@@_first_dp_dim
+\dim_new:N \g_@@_first_sep_dim
+\dim_new:N \g_@@_column_left_dim
+\dim_new:N \g_@@_column_right_ht_dim
+\bool_new:N \g_@@_entire_bool
+\bool_new:N \g_@@_next_hang_bool
+\bool_new:N \g_@@_first_save_bool
+\bool_new:N \g_@@_column_right_bool
+\bool_new:N \l_@@_column_strict_bool
+\bool_new:N \g_@@_first_set_bool
+\bool_new:N \l_@@_first_move_bool
+\bool_new:N \g_@@_right_move_bool
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_build_box:,\@@_build_column:}
+% \begin{macrocode}
+\bool_new:N \l_@@_column_bool
+\cs_new_eq:NN \@@_build_column: \@@_build_column_strict:
+\cs_new_eq:NN \@@_build_box: \@@_build_column:
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_build_hang:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_build_hang:
+ {
+ \bool_if:NTF \g_@@_hangfrom_bool
+ { \@@_build_hangfrom: }
+ {
+ \vbox_set_top:Nn \l_@@_window_box
+ { \vbox_unpack:N \l_@@_body_box }
+ \dim_gset:Nn \g_@@_ht_dim { \box_ht:N \l_@@_window_box }
+ }
+ \bool_if:NTF \l_@@_attach_equation_bool
+ {
+ \vbox_set:Nn \l_@@_window_box
+ {
+ \vbox_unpack_drop:N \l_@@_window_box
+ \box_set_to_last:N \l_@@_last_box
+ \@@_attach_equation:N \l_@@_last_box
+ \vbox_unpack_drop:N \l_@@_last_box
+ }
+ }
+ { \box_set_eq_drop:NN \l_@@_window_box \l_@@_body_box }
+ \dim_compare:nNnTF \g_@@_column_left_dim > \c_zero_dim
+ { \@@_build_hang_aux: }
+ { \bool_gset_false:N \g_@@_move_hang_bool }
+ }
+\cs_new_protected_nopar:Npn \@@_build_hang_aux:
+ {
+ \dim_set:Nn \l_@@_shift_dim
+ {
+ \dim_max:nn
+ { \box_ht:N \l_@@_window_box }
+ { \tex_baselineskip:D * \g_@@_line_int }
+ + \tex_parskip:D
+ }
+ \dim_gsub:Nn \g_@@_column_left_dim { \l_@@_shift_dim }
+ \dim_compare:nNnTF \g_@@_column_left_dim > \c_zero_dim
+ {
+ \box_if_empty:NTF \l_@@_bottom_box
+ { \bool_if:NT \g_@@_right_move_bool { \@@_set_next_hang: } }
+ { \bool_gset_false:N \g_@@_move_hang_bool }
+ }
+ { \bool_gset_false:N \g_@@_move_hang_bool }
+ }
+\cs_new_protected_nopar:Npn \@@_set_next_hang:
+ {
+ \bool_if:NF \g_@@_move_hang_bool
+ {
+ \bool_gset_true:N \g_@@_move_hang_bool
+ \dim_gset_eq:NN \g_@@_hang_ht_dim \g_@@_remaining_dim
+ }
+ \dim_gsub:Nn \g_@@_hang_ht_dim { \l_@@_shift_dim }
+ \dim_gset:Nn \g_@@_dp_dim { \box_dp:N \l_@@_window_box }
+ \@@_column_right_move_set:nn
+ { \g_@@_hang_ht_dim }
+ { \g_@@_column_left_dim }
+ \int_gzero:N \g_@@_window_int
+ }
+\dim_new:N \g_@@_hang_ht_dim
+\bool_new:N \g_@@_move_hang_bool
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_build_hangfrom:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_build_hangfrom:
+ {
+ \dim_compare:nNnTF \g_@@_prevdepth_dim > \c_@@_ignore_depth_dim
+ { \@@_build_hangfrom_aux: }
+ { \dim_gzero:N \g_@@_ht_dim }
+ }
+\cs_new_protected_nopar:Npn \@@_build_hangfrom_aux:
+ {
+ \group_begin:
+ \skip_zero:N \tex_splittopskip:D
+ \vbox_gset:Nn \g_@@_line_box
+ {
+ \tex_penalty:D \c_@@_break_int
+ \vbox_unpack:N \l_@@_body_box
+ }
+ \vbox_set_split_to_ht:NNn \l_@@_last_box \g_@@_line_box
+ { \c_zero_dim }
+ \dim_gset:Nn \g_@@_ht_dim
+ {
+ \g_@@_baseline_skip
+ - \g_@@_prevdepth_dim
+ - \l_@@_shift_dim
+ - \box_ht:N \l_@@_body_box
+ + \box_ht:N \g_@@_line_box
+ }
+ \group_end:
+ \box_set_eq_drop:NN \l_@@_body_box \g_@@_line_box
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_put_box:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_put_box:
+ {
+ \para_raw_end:
+ \dim_compare:nNnTF \g_@@_prevdepth_dim > \c_@@_ignore_depth_dim
+ { \@@_add_vskip: }
+ { \skip_gzero:N \g_@@_pre_skip }
+ \skip_set_eq:NN \l_@@_par_skip \tex_parskip:D
+ \skip_zero:N \tex_parskip:D
+ \bool_if:NTF \g_@@_right_move_bool
+ { \@@_put_box_aux: }
+ {
+ \box_if_empty:NTF \l_@@_bottom_box
+ {
+ \dim_compare:nNnTF
+ { \g_@@_remaining_dim }
+ >
+ { \box_ht_plus_dp:N \l_@@_window_box }
+ { \@@_set_next: }
+ { \@@_put_box_aux: }
+ }
+ { \@@_put_box_aux: }
+ }
+ }
+\skip_new:N \l_@@_par_skip
+\cs_new_protected_nopar:Npn \@@_put_box_aux:
+ {
+ \int_gzero:N \g_@@_window_int
+ \@@_hbox:n
+ {
+ \@@_put_window_box:
+ \bool_if:NF \g_@@_next_bool
+ { \@@_put_stuff_box: }
+ }
+ \box_if_empty:NTF \l_@@_bottom_box
+ { \@@_put_trailer_box: }
+ { \@@_put_bottom_box: }
+ }
+\cs_new_protected_nopar:Npn \@@_put_trailer_box:
+ {
+ \bool_if:NTF \g_@@_next_hang_bool
+ {
+ \@@_next_hang_para:
+ \@@_next_para_trailer:
+ }
+ {
+ \bool_if:NTF \g_@@_right_move_bool
+ { \@@_next_para_trailer: }
+ {
+ \@@_add_pos_skip:
+ \box_if_empty:NF \g_@@_pos_box
+ {
+ \@@_newline:
+ \hbox_unpack_drop:N \g_@@_pos_box
+ }
+ }
+ }
+ }
+\cs_new_protected_nopar:Npn \@@_put_bottom_box:
+ {
+ \@@_newline:
+ \hbox_unpack_drop:N \l_@@_bottom_box
+ \box_if_empty:NF \g_@@_equation_box
+ { \@@_insert_equation: }
+ \box_if_empty:NF \g_@@_pos_box
+ { \hbox_unpack_drop:N \g_@@_pos_box }
+ \bool_gset_false:N \g_@@_right_move_bool
+ \bool_gset_false:N \g_@@_first_save_bool
+ }
+\cs_new_protected_nopar:Npn \@@_newline:
+ {
+ \tex_penalty:D \c_@@_nobreak_int
+ \tex_hfil:D
+ \tex_penalty:D \c_@@_break_int
+ }
+\cs_new_protected:Npn \@@_hbox:n #1
+ {
+ \para_raw_noindent:
+ \hbox_gset:Nn \g_@@_last_box {#1}
+ \box_gset_wd:Nn \g_@@_last_box { \l_@@_line_dim }
+ \box_use_drop:N \g_@@_last_box
+ }
+\cs_new_protected_nopar:Npn \@@_put_window_box:
+ {
+ \dim_compare:nNnF \l_@@_l_dim > \c_zero_dim
+ { \skip_horizontal:n { \l_@@_line_dim - \l_@@_r_dim } }
+ \box_use:N \l_@@_window_box
+ }
+\cs_new_protected_nopar:Npn \@@_put_stuff_box:
+ {
+ \@@_move_stuff_box:nn { up }
+ {
+ \l_@@_voffset_dim
+ + ( \box_dp:N \g_@@_stuff_box -
+ \box_dp:N \l_@@_window_box )
+ + ( \box_ht_plus_dp:N \l_@@_window_box -
+ \g_@@_stuff_ht_dim ) / 2
+ \box_if_empty:NT \l_@@_bottom_box
+ { - \g_@@_pos_skip / 2 }
+ }
+ \@@_output_stuff_box:
+ }
+\cs_new_protected_nopar:Npn \@@_output_stuff_box:
+ {
+ \skip_horizontal:n
+ {
+ \dim_compare:nNnTF \l_@@_r_dim > \c_zero_dim
+ {
+ \dim_compare:nNnTF
+ { \box_wd:N \l_@@_window_box }
+ <
+ { \l_@@_window_dim }
+ { \l_@@_leftsep_dim }
+ {
+ - \l_@@_r_dim
+ - \l_@@_rightsep_dim
+ - \g_@@_stuff_wd_dim
+ }
+ }
+ { \l_@@_leftsep_dim }
+ }
+ \box_use_drop:N \g_@@_stuff_box
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_move_stuff_box:n}
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_move_stuff_box:nn #1#2
+ {
+ \hbox_gset:Nn \g_@@_stuff_box
+ {
+ \@@_parshape_kern:
+ \use:c { box_move_ #1 :nn }
+ {#2}
+ { \box_use_drop:N \g_@@_stuff_box }
+ }
+ \box_gset_ht:Nn \g_@@_stuff_box { \c_zero_dim }
+ \box_gset_dp:Nn \g_@@_stuff_box { \c_zero_dim }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_add_vskip:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_add_vskip:
+ {
+ \box_if_empty:NTF \g_@@_display_box
+ { \@@_add_vskip_auxi: }
+ { \@@_add_vskip_display: }
+ }
+\cs_new_protected_nopar:Npn \@@_add_vskip_display:
+ {
+ \vbox_unpack_drop:N \g_@@_display_box
+ \@@_ignore_depth:
+ }
+\cs_new_protected_nopar:Npn \@@_add_vskip_auxi:
+ {
+ \dim_compare:nNnTF \tex_pagegoal:D < \c_max_dim
+ { \@@_add_vskip_auxii: }
+ { \@@_add_vskip_auxiii: }
+ }
+\cs_new_protected_nopar:Npn \@@_add_vskip_auxii:
+ {
+ \skip_gset:Nn \g_@@_pre_skip
+ {
+ \g_@@_baseline_skip
+ - \g_@@_prevdepth_dim
+ - \g_@@_ht_dim
+ }
+ \dim_compare:nNnT \g_@@_pre_skip < \tex_lineskiplimit:D
+ { \skip_gset_eq:NN \g_@@_pre_skip \tex_lineskip:D }
+ \bool_if:NTF \l_@@_first_move_bool
+ { \@@_first_move_skip: }
+ { \skip_vertical:N \g_@@_pre_skip }
+ \@@_ignore_depth:
+ }
+\cs_new_protected_nopar:Npn \@@_add_vskip_auxiii:
+ {
+ \dim_compare:nNnTF \tex_topskip:D > \g_@@_ht_dim
+ {
+ \tex_hrule:D height \c_zero_dim \scan_stop:
+ \skip_gset:Nn \g_@@_pre_skip
+ { \tex_topskip:D - \g_@@_ht_dim }
+ \skip_vertical:n { \g_@@_pre_skip - \tex_topskip:D }
+ }
+ { \skip_gzero:N \g_@@_pre_skip }
+ }
+\cs_new_protected_nopar:Npn \@@_first_move_skip:
+ {
+ \skip_vertical:n
+ {
+ \g_@@_first_sep_dim
+ - \g_@@_window_ht_dim
+ - \tex_parskip:D
+ \dim_compare:nNnT \g_@@_column_right_ht_dim > \c_zero_dim
+ { + \g_@@_column_right_ht_dim + \g_@@_pre_skip }
+ }
+ }
+\skip_new:N \g_@@_pre_skip
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_ignore_depth:,\@@_set_prevdepth:N}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_ignore_depth:
+ { \dim_set_eq:NN \tex_prevdepth:D \c_@@_ignore_depth_dim }
+\cs_new_protected_nopar:Npn \@@_set_prevdepth:N
+ { \dim_set_eq:NN \tex_prevdepth:D }
+\dim_const:Nn \c_@@_ignore_depth_dim { -1000pt }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_set_next:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_set_next:
+ {
+ \dim_set:Nn \l_@@_height_dim
+ {
+ \g_@@_pre_skip
+ + \g_@@_pos_skip
+ + \box_ht_plus_dp:N \l_@@_window_box
+ }
+ \dim_gadd:Nn \g_@@_total_ht_dim { \l_@@_height_dim }
+ \dim_set:Nn \l_@@_shift_dim
+ { \g_@@_remaining_dim - \l_@@_height_dim }
+ \dim_compare:nNnTF \l_@@_shift_dim > \c_zero_dim
+ { \@@_set_next_auxi: }
+ {
+ \dim_compare:nNnTF
+ { - \l_@@_shift_dim } > \l_@@_min_dim
+ { \@@_set_next_auxii: }
+ { \@@_set_next_auxi: }
+ }
+ }
+\dim_new:N \g_@@_total_ht_dim
+\cs_new_protected_nopar:Npn \@@_set_next_auxi:
+ {
+ \int_gset:Nn \g_@@_window_int
+ {
+ \dim_compare:nNnTF \l_@@_shift_dim > \c_zero_dim
+ { \@@_unit:n { \l_@@_shift_dim } }
+ { \c_one_int }
+ }
+ \@@_set_next_verify:
+ \bool_if:NF \g_@@_next_bool
+ { \@@_move_next_stuff_box: }
+ \@@_set_next_output:
+ \@@_make_next_stuff:nn
+ { \g_@@_stuff_wd_dim }
+ { \l_@@_shift_dim }
+ \int_gzero:N \g_@@_top_int
+ \@@_next_para_trailer:
+ }
+\cs_new_protected_nopar:Npn \@@_move_next_stuff_box:
+ {
+ \@@_move_stuff_box:nn { down }
+ {
+ \box_ht:N \g_@@_stuff_box
+ - \box_ht:N \l_@@_window_box
+ + ( \g_@@_window_ht_dim
+ - \g_@@_stuff_ht_dim
+ - \g_@@_pre_skip
+ + \g_@@_pos_skip
+ + \l_@@_par_skip ) / 2
+ - \l_@@_voffset_dim
+ }
+ }
+\cs_new_protected_nopar:Npn \@@_set_next_auxii:
+ {
+ \int_gzero:N \g_@@_window_int
+ \bool_if:NF \g_@@_next_bool
+ {
+ \@@_move_stuff_box:nn { down }
+ {
+ \box_ht:N \g_@@_stuff_box
+ - \box_ht:N \l_@@_window_box
+ - \l_@@_voffset_dim
+ }
+ }
+ \@@_set_next_output:
+ \@@_add_pos_skip:
+ }
+\cs_new_protected_nopar:Npn \@@_set_next_output:
+ {
+ \@@_hbox:n
+ {
+ \@@_put_window_box:
+ \bool_if:NF \g_@@_next_bool
+ { \@@_output_stuff_box: }
+ }
+ }
+\cs_new_protected_nopar:Npn \@@_set_next_verify:
+ {
+ \dim_set:Nn \l_@@_height_dim
+ { \g_@@_window_ht_dim - \g_@@_total_ht_dim }
+ \dim_until_do:nNnn
+ { \tex_baselineskip:D * \g_@@_window_int + \l_@@_par_skip }
+ >
+ { \l_@@_height_dim }
+ { \int_gincr:N \g_@@_window_int }
+ \dim_gadd:Nn \g_@@_total_ht_dim
+ { \tex_baselineskip:D * \g_@@_window_int + \l_@@_par_skip }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_next_para_trailer:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_next_para_trailer:
+ {
+ \@@_add_pos_skip:
+ \box_if_empty:NTF \g_@@_pos_box
+ { \@@_next_para: }
+ {
+ \@@_env_begin:
+ \hbox_unpack_drop:N \g_@@_pos_box
+ \@@_env_end:
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_make_next_stuff:nn}
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_make_next_stuff:nn #1#2
+ {
+ \bool_gset_true:N \g_@@_next_bool
+ \dim_gset:Nn \g_@@_stuff_wd_dim {#1}
+ \dim_gset:Nn \g_@@_remaining_dim {#2}
+ }
+\bool_new:N \g_@@_next_bool
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_extract_hbox:NN}
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_extract_display_hbox:NN #1
+ {
+ \box_gclear:N \g_@@_pos_box
+ \vbox_set:Nn #1
+ {
+ \vbox_unpack_drop:N #1
+ \bool_if:NTF \g_@@_display_bool
+ { \@@_test_display_math: }
+ { \box_gclear:N \g_@@_display_box }
+ \box_if_empty:NTF \g_@@_display_box
+ {
+ \bool_gset_false:N \g_@@_amsmath_bool
+ \@@_extract_last_hbox:N \g_@@_last_box
+ }
+ { \box_gclear:N \g_@@_last_box }
+ }
+ \box_if_empty:NF \g_@@_display_box
+ { \dim_gset:Nn \g_@@_display_pre_dim { \box_dp:N #1 } }
+ \@@_extract_hbox_aux:N
+ }
+\cs_new_protected:Npn \@@_extract_hbox:NN #1
+ {
+ \vbox_set:Nn #1
+ {
+ \vbox_unpack_drop:N #1
+ \@@_extract_last_hbox:N \g_@@_last_box
+ }
+ \@@_extract_hbox_aux:N
+ }
+\cs_new_protected:Npn \@@_extract_hbox_aux:N #1
+ {
+ \box_if_empty:NTF \g_@@_last_box
+ { \box_clear:N #1 }
+ { \@@_repack_hbox:N #1 }
+ }
+\cs_new_protected:Npn \@@_repack_hbox:N #1
+ {
+ \hbox_set:Nn #1
+ {
+ \skip_if_eq:nnF
+ { \g_@@_main_left_skip } { \c_zero_skip }
+ { \skip_horizontal:N \g_@@_main_left_skip }
+ \hbox_unpack_drop:N \g_@@_last_box
+ \tex_unskip:D \tex_unskip:D \tex_unpenalty:D
+ }
+ }
+\cs_new_protected:Npn \@@_extract_last_hbox:N #1
+ {
+ \@@_if_last_hlist:TF
+ {
+ \box_gset_to_last:N #1
+ \tex_unskip:D
+ }
+ { \box_gclear:N #1 }
+ }
+\box_new:N \g_@@_last_box
+\box_new:N \g_@@_display_box
+\dim_new:N \g_@@_display_pre_dim
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_test_display_math:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_test_display_math:
+ {
+ \@@_if_last_hlist:T
+ {
+ \box_gset_to_last:N \g_@@_pos_box
+ \tex_unskip:D
+ }
+ \box_clear:N \l_@@_add_box
+ \box_gclear:N \g_@@_display_box
+ \skip_gzero:N \g_@@_last_skip
+ \skip_gzero:N \g_@@_display_pre_skip
+ \bool_gset_false:N \g_@@_amsmath_bool
+ \@@_add_last_skip:w
+ \@@_add_last_penalty:w
+ \@@_add_last_box:w
+ \@@_add_last_skip:w
+ \@@_add_last_skip:w
+ \@@_add_last_penalty:w
+ \@@_add_last_finalise:w \q_stop
+ }
+\box_new:N \l_@@_add_box
+\box_new:N \g_@@_pos_box
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_add_last_stop:w}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_add_last_stop:w
+ {
+ \vbox_unpack_drop:N \l_@@_add_box
+ \use_none_delimit_by_q_stop:w
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_add_last_skip:w}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_add_last_skip:w
+ {
+ \@@_if_last_glue:TF
+ {
+ \skip_set_eq:NN \l_@@_last_skip \tex_lastskip:D
+ \vbox_set:Nn \l_@@_add_box
+ {
+ \skip_vertical:N \l_@@_last_skip
+ \vbox_unpack_drop:N \l_@@_add_box
+ }
+ \tex_unskip:D
+ \skip_gadd:Nn \g_@@_last_skip { \l_@@_last_skip }
+ }
+ { \@@_skip_stop:w }
+ }
+\skip_new:N \l_@@_last_skip
+\skip_new:N \g_@@_last_skip
+\cs_new_eq:NN \@@_skip_stop:w \@@_add_last_stop:w
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_add_last_penalty:w}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_add_last_penalty:w
+ {
+ \@@_if_last_penalty:TF
+ {
+ \int_set_eq:NN \l_@@_last_int \tex_lastpenalty:D
+ \vbox_set:Nn \l_@@_add_box
+ {
+ \tex_penalty:D \l_@@_last_int
+ \vbox_unpack_drop:N \l_@@_add_box
+ }
+ \tex_unpenalty:D
+ \skip_gset_eq:NN \g_@@_pre_skip \g_@@_last_skip
+ \skip_gzero:N \g_@@_last_skip
+ }
+ { \@@_penalty_stop:w }
+ }
+\int_new:N \l_@@_last_int
+\cs_new_eq:NN \@@_penalty_stop:w \@@_add_last_stop:w
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_add_last_box:w}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_add_last_box:w
+ {
+ \@@_if_last_hlist:TF
+ {
+ \skip_gzero:N \g_@@_last_skip
+ \box_set_to_last:N \l_@@_last_box
+ \vbox_set:Nn \l_@@_add_box
+ {
+ \box_use_drop:N \l_@@_last_box
+ \vbox_unpack_drop:N \l_@@_add_box
+ }
+ }
+ { \@@_box_stop:w }
+ }
+\box_new:N \l_@@_last_box
+\cs_new_eq:NN \@@_box_stop:w \@@_add_last_stop:w
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_add_last_finalise:w}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_add_last_finalise:w
+ {
+ \int_gset_eq:NN \g_@@_display_pre_int \l_@@_last_int
+ \skip_gadd:Nn \g_@@_display_pre_skip { \g_@@_pre_skip }
+ \int_case:nnTF { \tex_lastnodetype:D }
+ {
+ { \c_@@_hlist_node } { }
+ { \c_@@_none_node } { }
+ { \c_@@_whatsit_node } { }
+ }
+ { \box_gset_eq_drop:NN \g_@@_display_box \l_@@_add_box }
+ { \vbox_unpack_drop:N \l_@@_add_box }
+ \use_none_delimit_by_q_stop:w
+ }
+\int_new:N \g_@@_display_pre_int
+\skip_new:N \g_@@_display_pre_skip
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_amsmath_boot:w,\@@_amsmath_recursion:w,\@@_amsmath_multline:w}
+% \pkg{amsmath} 的 \env{align} 等数学环境内部是一个 \tn{halign} 环境,结构不一样,需要另外处理。
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_amsmath_boot:w
+ {
+ \@@_add_last_skip:w
+ \@@_add_last_penalty:w
+ \cs_set_eq:NN \@@_box_stop:w \@@_add_last_stop:w
+ \@@_add_last_box:w
+ \bool_gset_true:N \g_@@_amsmath_bool
+ \cs_set_eq:NN \@@_skip_stop:w \@@_amsmath_multline:w
+ \cs_set_eq:NN \@@_penalty_stop:w \@@_amsmath_stop:NN
+ \@@_amsmath_recursion:w
+ }
+\cs_new_protected_nopar:Npn \@@_amsmath_recursion:w
+ {
+ \@@_add_last_skip:w
+ \@@_add_last_skip:w
+ \@@_add_last_penalty:w
+ \@@_add_last_box:w
+ \@@_amsmath_recursion:w
+ }
+\cs_new_protected:Npn \@@_amsmath_stop:NN #1#2
+ {
+ \cs_set_eq:NN \@@_skip_stop:w \@@_add_last_stop:w
+ \cs_set_eq:NN \@@_penalty_stop:w \@@_add_last_stop:w
+ }
+\bool_new:N \g_@@_amsmath_bool
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_amsmath_multline:w}
+% \env{multline} 环境的结构与其他环境不一样。\pkg{amsmath} 的 \tn{@display@init} 定义为
+% \begin{verbatim}
+% \def\@display@init#1{%
+% \global\dt@ptrue \spread@equation
+% \everycr{%
+% \noalign{%
+% #1%
+% \ifdt@p
+% \global\dt@pfalse
+% \vskip-\lineskiplimit
+% \vskip\normallineskiplimit
+% \else
+% \penalty\@eqpen \global\dspbrk@lvl\m@ne
+% \fi
+% }%
+% }%
+% }
+% \end{verbatim}
+% \env{align} 等环境的开头 \tn{ifdt@p} 为真,会插入两个 \tn{vskip},
+% 但是 \env{multline} 定义中的 \tn{mmeasure@} 没有重定义 \tn{everycr},
+% 上述定义中的 \tn{dt@pfalse} 被执行,导致环境开头被加入了 \tn{penalty},
+% 不确定是有意为之还是疏忽。
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_amsmath_multline:w
+ {
+ \@@_amsmath_stop:NN ? ?
+ \@@_add_last_penalty:w
+ \skip_gset_eq:NN \g_@@_display_pre_skip
+ \g_@@_pre_skip
+ \@@_add_last_skip:w
+ \@@_add_last_penalty:w
+ \@@_add_last_finalise:w
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_amsmath_leqno:}
+% \pkg{amsmath} 的 \opt{leqno} 是直接用 \cs{tex_leqno:D} 实现的,与 \LaTeX\ 的实现不一样。
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_amsmath_leqno:
+ {
+ \legacy_if:nTF { tagsleft@ }
+ { \bool_gset_true:N \g_@@_leqno_bool }
+ { \bool_gset_false:N \g_@@_leqno_bool }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\@@_package_hook:nn { amsmath }
+ {
+ \cs_gset_eq:NN \@@_box_stop:w
+ \@@_amsmath_boot:w
+ \cs_gset_eq:NN \@@_test_leqno:
+ \@@_amsmath_leqno:
+ }
+% \end{macrocode}
+%
+% \begin{macro}{\@@_set_float:}
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_set_float:
+ {
+ \cs_set_eq:NN \@captype \l_@@_type_tl
+ \@@_float_pre_hook:
+ \@@_caption_hook:
+ \@floatboxreset
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_float_pre_hook:, \@@_float_pos_hook:}
+% \begin{macrocode}
+\cs_new_eq:NN \@@_float_pre_hook: \@@_empty:
+\cs_new_eq:NN \@@_float_pos_hook: \@@_empty:
+\@@_package_hook:nn { float }
+ {
+ \bool_new:N \g_@@_float_pos_bool
+ \cs_gset_protected_nopar:Npn \@@_float_pre_hook:
+ { \exp_args:No \@@_float_pre_aux:n { \l_@@_type_tl } }
+ \cs_new_protected:Npn \@@_float_pre_aux:n #1
+ {
+ \cs_if_exist_use:cTF { fst@ #1 }
+ {
+ \@float@setevery {#1}
+ \bool_gset_true:N \g_@@_float_pos_bool
+ }
+ { \bool_gset_false:N \g_@@_float_pos_bool }
+ }
+ \cs_gset_protected_nopar:Npn \@@_float_pos_hook:
+ {
+ \bool_if:NT \g_@@_float_pos_bool
+ { \exp_args:No \@@_float_pos_aux:n { \l_@@_type_tl } }
+ }
+ \cs_new_protected:Npn \@@_float_pos_aux:n #1
+ {
+ \hbox_gset:Nn \g_@@_stuff_box
+ {
+ \use:c { fst@ #1 }
+ \cs_set_eq:NN \@currbox \g_@@_stuff_box
+ \vbox_gset:Nn \g_@@_stuff_box
+ { \box_use_drop:N \g_@@_stuff_box }
+ \exp_args:Ne \float@makebox
+ { \dim_eval:n { \box_wd:N \g_@@_stuff_box } }
+ }
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_floatrow_hook:}
+% \begin{macrocode}
+\cs_new_eq:NN \@@_floatrow_hook: \@@_empty:
+\@@_package_hook:nn { floatrow }
+ {
+ \cs_gset_protected_nopar:Npn \@@_floatrow_hook:
+ {
+ \cs_set_eq:NN \@captype \l_@@_type_tl
+ \killfloatstyle
+ \FR@redefs
+ \dim_zero:N \FBc@wd
+ \exp_args:Ne \flrow@setlist
+ {
+ { \l_@@_type_tl }
+ { wrapfloat }
+ { wrap \l_@@_type_tl }
+ }
+ \FRifFBOX \@@@@setframe \relax \@@@@FStrue
+ \hbox_gset:Nw \g_@@_stuff_box
+ \tl_set:Nx \FBB@wd { \dim_use:N \l_@@_width_dim }
+ \FB@fs@wd
+ \dim_set:Nn \l_@@_width_dim { \FBo@wd }
+ }
+ \cs_gset_protected_nopar:Npn \@@_float_pre_hook:
+ { \the \FR@everyfloat }
+ \cs_gset_protected_nopar:Npn \@@_float_pos_hook:
+ {
+ \legacy_if:nTF { FBbuild }
+ {
+ \cs_set_eq:NN \@currbox \g_@@_stuff_box
+ \vbox_gset:Nn \g_@@_stuff_box
+ { \box_use_drop:N \g_@@_stuff_box }
+ \flrow@FB { \l_@@_width_dim }
+ }
+ {
+ \cs_undefine:N \flrow@typ@tmpset
+ \box_use_drop:N \g_@@_stuff_box
+ }
+ \hbox_gset_end:
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_caption_hook:}
+% \begin{macrocode}
+\cs_new_eq:NN \@@_caption_hook: \@@_empty:
+\@@_package_hook:nn { caption }
+ {
+ \cs_gset_protected_nopar:Npn \@@_caption_hook:
+ { \exp_args:No \@@_caption_aux:n { \l_@@_type_tl } }
+ \cs_new_protected:Npn \@@_caption_aux:n #1
+ {
+ \caption@settype {#1}
+ \caption@clearmargin
+ \caption@setoptions { wrap #1 }
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{top}
+% \begin{macrocode}
+\keys_define:nn { wrapstuff }
+ {
+ abovesep .tl_set:N = \l_@@_abovesep_tl ,
+ belowsep .tl_set:N = \l_@@_belowsep_tl ,
+ leftsep .tl_set:N = \l_@@_leftsep_tl ,
+ rightsep .tl_set:N = \l_@@_rightsep_tl ,
+ linewidth .tl_set:N = \l_@@_linewidth_tl ,
+ lines .tl_set:N = \l_@@_lines_tl ,
+ width .tl_set:N = \l_@@_width_tl ,
+ height .tl_set:N = \l_@@_height_tl ,
+ hoffset .tl_set:N = \l_@@_hoffset_tl ,
+ voffset .tl_set:N = \l_@@_voffset_tl ,
+ type .tl_set:N = \l_@@_type_tl ,
+ ratio .fp_set:N = \l_@@_ratio_fp ,
+ top .int_set:N = \l_@@_top_int ,
+ i .code:n = \@@_swap_true:N \c_true_bool ,
+ o .code:n = \@@_swap_true:N \c_false_bool ,
+ l .code:n = \@@_swap_false:N \c_zero_fp ,
+ r .code:n = \@@_swap_false:N \c_one_fp ,
+ c .code:n = \@@_swap_false:N \c_@@_c_fp ,
+ column .choice: ,
+ column/true .code:n =
+ {
+ \bool_set_true:N \l_@@_column_bool
+ \cs_set_eq:NN \@@_build_column:
+ \@@_build_column_strict:
+ } ,
+ column/par .code:n =
+ {
+ \bool_set_true:N \l_@@_column_bool
+ \cs_set_eq:NN \@@_build_column:
+ \@@_build_column_fuzzy:
+ } ,
+ column/false .code:n =
+ { \bool_set_false:N \l_@@_column_bool } ,
+ hsep .code:n =
+ {
+ \tl_set:Nn \l_@@_leftsep_tl {#1}
+ \tl_set_eq:NN \l_@@_rightsep_tl
+ \l_@@_leftsep_tl
+ } ,
+ vsep .code:n =
+ {
+ \tl_set:Nn \l_@@_abovesep_tl {#1}
+ \tl_set_eq:NN \l_@@_belowsep_tl
+ \l_@@_abovesep_tl
+ } ,
+ unknown .code:n =
+ { \exp_args:No \@@_unknown_key:n { \l_keys_key_str } } ,
+ leftsep .groups:n = main ,
+ rightsep .groups:n = main ,
+ hsep .groups:n = main ,
+ linewidth .groups:n = main ,
+ lines .groups:n = main ,
+ column .groups:n = main ,
+ hoffset .groups:n = main ,
+ voffset .groups:n = main ,
+ top .groups:n = stuff ,
+ abovesep .groups:n = stuff ,
+ belowsep .groups:n = stuff ,
+ vsep .groups:n = stuff ,
+ width .groups:n = stuff ,
+ height .groups:n = stuff ,
+ float .groups:n = stuff ,
+ ratio .groups:n = ratio ,
+ l .groups:n = ratio ,
+ r .groups:n = ratio ,
+ c .groups:n = ratio ,
+ i .groups:n = ratio ,
+ o .groups:n = ratio ,
+ column .default:n = true ,
+ column .initial:n = true ,
+ abovesep .initial:n = \c_zero_dim ,
+ belowsep .initial:n = \c_zero_dim ,
+ leftsep .initial:n = 1em ,
+ rightsep .initial:n = 1em ,
+ linewidth .initial:n = \linewidth ,
+ hoffset .initial:n = \c_zero_dim ,
+ voffset .initial:n = \c_zero_dim ,
+ width .initial:n = \c_zero_dim ,
+ height .initial:n = \c_zero_dim ,
+ ratio .initial:n = \c_one_fp ,
+ abovesep .value_required:n = true ,
+ belowsep .value_required:n = true ,
+ leftsep .value_required:n = true ,
+ rightsep .value_required:n = true ,
+ linewidth .value_required:n = true ,
+ width .value_required:n = true ,
+ height .value_required:n = true ,
+ hoffset .value_required:n = true ,
+ voffset .value_required:n = true ,
+ hsep .value_required:n = true ,
+ vsep .value_required:n = true ,
+ l .value_forbidden:n = true ,
+ r .value_forbidden:n = true ,
+ c .value_forbidden:n = true ,
+ i .value_forbidden:n = true ,
+ o .value_forbidden:n = true
+ }
+\fp_const:Nn \c_@@_c_fp { 0.5 }
+\cs_new_protected:Npn \@@_swap_true:N #1
+ {
+ \bool_set_true:N \l_@@_swap_bool
+ \bool_set_eq:NN \l_@@_inner_bool #1
+ \bool_if:NTF \l_@@_inner_bool
+ { \bool_set_false:N \l_@@_outer_bool }
+ { \bool_set_true:N \l_@@_outer_bool }
+ }
+\cs_new_protected_nopar:Npn \@@_swap_false:N
+ {
+ \bool_set_false:N \l_@@_swap_bool
+ \fp_set_eq:NN \l_@@_ratio_fp
+ }
+\cs_new_protected:Npn \@@_unknown_key:n #1
+ {
+ \regex_match:NnTF \c_@@_integer_regex {#1}
+ { \int_set:Nn \l_@@_top_int }
+ { \@@_unknown_key_error:n }
+ {#1}
+ }
+\regex_const:Nn \c_@@_integer_regex { \A \d+ \Z }
+\cs_new_protected_nopar:Npn \@@_unknown_key_error:n
+ { \msg_error:nnn { wrapstuff } { unknown-key } }
+\msg_new:nnnn { wrapstuff } { unknown-key }
+ { The~key~'#1'~is~unknown~and~is~being~ignored. }
+ {
+ The~package~wrapstuff~does~not~have~a~key~called~'#1'.\\
+ Check~that~you~have~spelled~the~key~name~correctly.
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\wrapstuffset}
+% \begin{macrocode}
+\NewDocumentCommand \wrapstuffset { m }
+ { \keys_set:nn { wrapstuff } {#1} }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\wrapstuffclear}
+% 保险起见,加入 \tn{par} 结束段落,同时结束 \env{wrapstuff@par} 环境。
+% \begin{macrocode}
+\NewDocumentCommand \wrapstuffclear { }
+ {
+ \par
+ \@@_clear:
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\cs_if_exist:NTF \ProcessKeyOptions
+ { \ProcessKeyOptions [ wrapstuff ] }
+ {
+ \RequirePackage { l3keys2e }
+ \ProcessKeysOptions { wrapstuff }
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
+%</package>
+% \end{macrocode}
+%
+% \end{implementation}
+%
+% \Finale
+%
+\endinput
diff --git a/macros/latex/contrib/wrapstuff/wrapstuff.pdf b/macros/latex/contrib/wrapstuff/wrapstuff.pdf
new file mode 100644
index 0000000000..c9cd89da98
--- /dev/null
+++ b/macros/latex/contrib/wrapstuff/wrapstuff.pdf
Binary files differ
diff --git a/macros/latex/required/babel/base/README.md b/macros/latex/required/babel/base/README.md
index 74e4830b48..371dcfb50d 100644
--- a/macros/latex/required/babel/base/README.md
+++ b/macros/latex/required/babel/base/README.md
@@ -1,4 +1,4 @@
-## Babel 3.77
+## Babel 3.78
This package manages culturally-determined typographical (and other)
rules, and hyphenation patterns for a wide range of languages. Many
@@ -8,9 +8,9 @@ is a set of ini files for about 250 languages.
The latest stable version is available on <https://ctan.org/pkg/babel>.
-Changes in version 3.77 are described in:
+Changes in version 3.78 are described in:
-https://latex3.github.io/babel/news/whats-new-in-babel-3.77.html
+https://latex3.github.io/babel/news/whats-new-in-babel-3.78.html
Apart from the manual, you can find information on some aspects of babel at:
@@ -46,19 +46,13 @@ respective authors.
### Summary of latest changes
```
-3.77 2022-06-26
- * More on calendar conversions (\localedate, \today).
- * New calendars: 'coptic' (ar-EG, cop), 'buddhist' (th).
- * New Arabic locale for Saudi Arabia, with the Umm al-Qura
- calendar.
- * Date now defaults to 'persian' in a few locales: Persian,
- Northern Luri, Mazanderani, Pashto.
- * `bangla` is now the preferred name for `bengali`.
- * Attempt to deal with 'german' and 'swissgerman', whose names
- conflict with the CLDR ones.
- * More minor updates to the CLDR 41: Afrikaans, Arabic, Assamese,
- Asturian, Azerbaijani, Belarusian, Bulgarian, Bangla, Tibetan,
- Breton, Bodo, Bosnian, Catalan, English.
+3.78 2022-07-20
+ * Fix: Undefined \bbl@xenohyph with Thai (#182).
+ * More minor updates to the CLDR 41: Chechen, Cherokee, Central
+ Kurdish, Czech, Welsh, Danish, German, Lower Sorbian,
+ Dzongkha, Ewe, Greek, Esperanto, Spanish, Estonian, Persian,
+ Finnish, Filipino, Faroese, Western Frisian, Irish, Scottish
+ Gaelic.
```
### Previous changes
diff --git a/macros/latex/required/babel/base/babel.dtx b/macros/latex/required/babel/base/babel.dtx
index 21493d3f4e..d9ebe75a44 100644
--- a/macros/latex/required/babel/base/babel.dtx
+++ b/macros/latex/required/babel/base/babel.dtx
@@ -32,7 +32,7 @@
%
% \iffalse
%<*filedriver>
-\ProvidesFile{babel.dtx}[2022/06/26 v3.77 The Babel package]
+\ProvidesFile{babel.dtx}[2022/07/20 v3.78 The Babel package]
\documentclass{ltxdoc}
\GetFileInfo{babel.dtx}
\usepackage{fontspec}
@@ -3116,9 +3116,9 @@ font encodings are the same, like in Unicode based engines.
\end{note}
\begin{note}
- To set hyphenation exceptions in the preamble before any language is
- explicitly set with a selector, use |\babelhyphenation| instead of
- |\hyphenation|. In the preamble the hyphenation rules are not always
+ Use |\babelhyphenation| instead of |\hyphenation| to set hyphenation
+ exceptions in the preamble before any language is explicitly set with
+ a selector. In the preamble the hyphenation rules are not always
fully set up and an error can be raised.
\end{note}
@@ -5171,8 +5171,8 @@ help from Bernd Raichle, for which I am grateful.
% \section{Tools}
%
% \begin{macrocode}
-%<<version=3.77>>
-%<<date=2022/06/26>>
+%<<version=3.78>>
+%<<date=2022/07/20>>
% \end{macrocode}
%
% \textbf{Do not use the following macros in \texttt{ldf} files. They
@@ -5947,6 +5947,7 @@ help from Bernd Raichle, for which I am grateful.
% \begin{macrocode}
\ifx\bbl@opt@safe\@undefined
\def\bbl@opt@safe{BR}
+ % \let\bbl@opt@safe\@empty % -- By September
\fi
% \end{macrocode}
%
@@ -10940,7 +10941,7 @@ help from Bernd Raichle, for which I am grateful.
{\bbl@exp{\\\bbl@ifblank{\bbl@cs{prehc@#1}}}%
{}%
{\ifx\bbl@xenohyph\@undefined
- \let\bbl@xenohyph\bbl@xenohyph@d
+ \global\let\bbl@xenohyph\bbl@xenohyph@d
\ifx\AtBeginDocument\@notprerr
\expandafter\@secondoftwo % to execute right now
\fi
@@ -13105,53 +13106,6 @@ help from Bernd Raichle, for which I am grateful.
%
% \begin{macrocode}
\def\bbl@font@fams{rm,sf,tt}
-% \end{macrocode}
-%
-% The old tentative way. Short and preverved for compatibility, but
-% deprecated. Note there is no direct alternative for
-% |\babelFSfeatures|. The reason in explained in the user guide, but
-% essentially -- that was not the way to go :-).
-%
-% \begin{macrocode}
-\newcommand\babelFSstore[2][]{%
- \bbl@ifblank{#1}%
- {\bbl@csarg\def{sname@#2}{Latin}}%
- {\bbl@csarg\def{sname@#2}{#1}}%
- \bbl@provide@dirs{#2}%
- \bbl@csarg\ifnum{wdir@#2}>\z@
- \let\bbl@beforeforeign\leavevmode
- \EnableBabelHook{babel-bidi}%
- \fi
- \bbl@foreach{#2}{%
- \bbl@FSstore{##1}{rm}\rmdefault\bbl@save@rmdefault
- \bbl@FSstore{##1}{sf}\sfdefault\bbl@save@sfdefault
- \bbl@FSstore{##1}{tt}\ttdefault\bbl@save@ttdefault}}
-\def\bbl@FSstore#1#2#3#4{%
- \bbl@csarg\edef{#2default#1}{#3}%
- \expandafter\addto\csname extras#1\endcsname{%
- \let#4#3%
- \ifx#3\f@family
- \edef#3{\csname bbl@#2default#1\endcsname}%
- \fontfamily{#3}\selectfont
- \else
- \edef#3{\csname bbl@#2default#1\endcsname}%
- \fi}%
- \expandafter\addto\csname noextras#1\endcsname{%
- \ifx#3\f@family
- \fontfamily{#4}\selectfont
- \fi
- \let#3#4}}
-\let\bbl@langfeatures\@empty
-\def\babelFSfeatures{% make sure \fontspec is redefined once
- \let\bbl@ori@fontspec\fontspec
- \renewcommand\fontspec[1][]{%
- \bbl@ori@fontspec[\bbl@langfeatures##1]}
- \let\babelFSfeatures\bbl@FSfeatures
- \babelFSfeatures}
-\def\bbl@FSfeatures#1#2{%
- \expandafter\addto\csname extras#1\endcsname{%
- \babel@save\bbl@langfeatures
- \edef\bbl@langfeatures{#2,}}}
%<</Font selection>>
% \end{macrocode}
%
diff --git a/macros/latex/required/babel/base/babel.ins b/macros/latex/required/babel/base/babel.ins
index 007c7d6b9b..13a22deb6a 100644
--- a/macros/latex/required/babel/base/babel.ins
+++ b/macros/latex/required/babel/base/babel.ins
@@ -26,7 +26,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%%
-\def\filedate{2022/06/26}
+\def\filedate{2022/07/20}
\def\batchfile{babel.ins}
\input docstrip.tex
diff --git a/macros/latex/required/babel/base/babel.pdf b/macros/latex/required/babel/base/babel.pdf
index 1e47810554..8d2d9a776d 100644
--- a/macros/latex/required/babel/base/babel.pdf
+++ b/macros/latex/required/babel/base/babel.pdf
Binary files differ
diff --git a/macros/latex/required/babel/base/bbcompat.dtx b/macros/latex/required/babel/base/bbcompat.dtx
index 5538587a42..c8f85ad5b6 100644
--- a/macros/latex/required/babel/base/bbcompat.dtx
+++ b/macros/latex/required/babel/base/bbcompat.dtx
@@ -30,7 +30,7 @@
%
% \iffalse
%<*dtx>
-\ProvidesFile{bbcompat.dtx}[2022/06/26 v3.77]
+\ProvidesFile{bbcompat.dtx}[2022/07/20 v3.78]
%</dtx>
%
%% File 'bbcompat.dtx'
diff --git a/language/japanese/jtex/00NEWS b/obsolete/language/japanese/jtex/00NEWS
index 8cb147d71d..8cb147d71d 100644
--- a/language/japanese/jtex/00NEWS
+++ b/obsolete/language/japanese/jtex/00NEWS
diff --git a/language/japanese/jtex/00README b/obsolete/language/japanese/jtex/00README
index 8b1d1f0bc8..8b1d1f0bc8 100644
--- a/language/japanese/jtex/00README
+++ b/obsolete/language/japanese/jtex/00README
diff --git a/language/japanese/jtex/README b/obsolete/language/japanese/jtex/README
index 0be4ceaab5..0be4ceaab5 100644
--- a/language/japanese/jtex/README
+++ b/obsolete/language/japanese/jtex/README
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 6ceee56e02..68400a98f8 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -35,7 +35,6 @@ $mirrors = {
},
'Iran' => {
'http://ctan.yazd.ac.ir/' => 1,
- 'https://ctan.asis.ai/' => 1,
'https://ctan.um.ac.ir/' => 1,
'https://mirror.bardia.tech/ctan/' => 1,
},
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index b1b1255555..ac11693fd2 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/63941
+depend revision/63949
name 00texlive.image
category TLCore
-revision 63936
+revision 63949
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
@@ -4119,6 +4119,7 @@ runfiles size=12912
tlpkg/tlpsrc/tikzbricks.tlpsrc
tlpkg/tlpsrc/tikzcodeblocks.tlpsrc
tlpkg/tlpsrc/tikzducks.tlpsrc
+ tlpkg/tlpsrc/tikzfill.tlpsrc
tlpkg/tlpsrc/tikzinclude.tlpsrc
tlpkg/tlpsrc/tikzlings.tlpsrc
tlpkg/tlpsrc/tikzmark.tlpsrc
@@ -4417,6 +4418,7 @@ runfiles size=12912
tlpkg/tlpsrc/worldflags.tlpsrc
tlpkg/tlpsrc/wrapfig.tlpsrc
tlpkg/tlpsrc/wrapfig2.tlpsrc
+ tlpkg/tlpsrc/wrapstuff.tlpsrc
tlpkg/tlpsrc/wsemclassic.tlpsrc
tlpkg/tlpsrc/wsuipa.tlpsrc
tlpkg/tlpsrc/wtref.tlpsrc
@@ -4601,7 +4603,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 63933
+revision 63943
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
@@ -28112,7 +28114,7 @@ catalogue-version 1.0
name babel
category Package
-revision 63730
+revision 63948
shortdesc Multilingual support for LaTeX, LuaLaTeX, XeLaTeX, and Plain TeX
relocated 1
longdesc This package manages culturally-determined typographical (and
@@ -28125,22 +28127,22 @@ longdesc has to be done for each language. Included is also a set of ini
longdesc files for about 250 languages. Many language styles work with
longdesc pdfLaTeX, as well as with XeLaTeX and LuaLaTeX, out of the box.
longdesc A few even work with plain formats.
-containersize 190888
-containerchecksum 3863ba77af35af465d47accdcc59f57c2f8a1d522b12a34d036444e0851e9e6b5020ef94452ecde206deaa3420824897289e60093db2f88973ce47774d6958b5
-doccontainersize 871964
-doccontainerchecksum a2ca55e94871501d9c9ff48f4ca0c79ac3c73cc8c22cc97fefe910053f56f839e53f0fd9fa5fa6bf0abf03278fc02142b2cfff659cca8d30b6f80e62a42cb889
-docfiles size=218
+containersize 191140
+containerchecksum ba96647dfd2e6eb5ea3d8c03a6efc99a6122314b93c1ed911c1d8f2c01a44b0dda2605354ae53b291bf74e207a7a6ed8421e2919bd13637847fef27c7f0ef582
+doccontainersize 870100
+doccontainerchecksum 62cde36b43552f2a893fbb271cd5354eed19e7a022ceeb5ea52cfaefe8aa051f157029a7cff26c216d167656d1f33475e15b72e1000a496e831672e8d4ec2404
+docfiles size=217
RELOC/doc/latex/babel/README.md details="Readme"
RELOC/doc/latex/babel/babel.pdf details="Package documentation"
-srccontainersize 717808
-srccontainerchecksum f64774daa35225925723d61ee59863fbabc7f92470c8f54e9689590b546d75c0a1dbd4262beb1692e96a31fe5ccc5a52bf2d4750f1b814dff6f7e8e1d71e2b2d
-srcfiles size=398
+srccontainersize 718440
+srccontainerchecksum cdabe36eb98fd4a20b3dd0066fd77b0df48ca24865bbd767bdeaa18416ea6b77f9fd0821ef962cb7b58bcc991830465eb02b904fc369ac90a8e1058a0190a411
+srcfiles size=397
RELOC/source/latex/babel/babel.dtx
RELOC/source/latex/babel/babel.ins
RELOC/source/latex/babel/bbcompat.dtx
RELOC/source/latex/babel/bbidxglo.dtx
RELOC/source/latex/babel/locale.zip
-runfiles size=1033
+runfiles size=1035
RELOC/makeindex/babel/bbglo.ist
RELOC/makeindex/babel/bbind.ist
RELOC/tex/generic/babel/UKenglish.sty
@@ -28381,6 +28383,7 @@ runfiles size=1033
RELOC/tex/generic/babel/locale/es/babel-es-MX.ini
RELOC/tex/generic/babel/locale/es/babel-es.ini
RELOC/tex/generic/babel/locale/es/babel-mexican.tex
+ RELOC/tex/generic/babel/locale/es/babel-mexicanspanish.tex
RELOC/tex/generic/babel/locale/es/babel-spanish-mexico.tex
RELOC/tex/generic/babel/locale/es/babel-spanish-mx.tex
RELOC/tex/generic/babel/locale/es/babel-spanish.tex
@@ -28886,7 +28889,7 @@ catalogue-contact-repository https://github.com/latex3/babel
catalogue-ctan /macros/latex/required/babel/base
catalogue-license lppl1.3
catalogue-topics multilingual
-catalogue-version 3.77
+catalogue-version 3.78
name babel-albanian
category Package
@@ -42269,7 +42272,7 @@ catalogue-version 1.4
name bodeplot
category Package
-revision 63820
+revision 63946
shortdesc Draw Bode, Nyquist and Nichols plots with gnuplot or pgfplots
relocated 1
longdesc This is a LaTeX package to plot Bode, Nichols, and Nyquist
@@ -42283,15 +42286,15 @@ longdesc and unstable second order transfer functions. Support for both
longdesc Gnuplot (default) and pgfplots (package option pgf). Support
longdesc for linear and asymptotic approximation of magnitude and phase
longdesc plots of any transfer function given poles, zeros, and gain.
-containersize 4744
-containerchecksum 5afab6ca9c57f066d6e5461b3cfd2bcbf85a69df03b6a8f88990e9c80646d39122ed5f04174906969001bc624144d10f9aec54aabe48122b3e683f077b32ec48
-doccontainersize 726560
-doccontainerchecksum b582f5e588dc30144b42add6c8a44ab9f121b6bd520db11bdcee0fa0c4ac714cb585796ae3ea9e4885ee633b8d49180962778af0d8c5dbc09135f8613328c510
-docfiles size=244
+containersize 4944
+containerchecksum f6b070db631da86677fa529e94ff303b334e3e4a2c812d7e246e14ceafc929ac62e0ec4eb9eab538d23b81be832a3d5a798d5868983d37835a08aad981c5bb5e
+doccontainersize 737444
+doccontainerchecksum 66e912824a48de5106d81c0eb1fcfb1a7760a8f6af5037d57cdd92bc2eb36dd9f55bb0bd5cadbda948578d8d71dbee8925f27c584fb7c3a49a7b0ba6e5bd8a87
+docfiles size=247
RELOC/doc/latex/bodeplot/README.md details="Readme"
RELOC/doc/latex/bodeplot/bodeplot.pdf details="Package documentation"
-srccontainersize 15216
-srccontainerchecksum 713dfd810409dbb0e82d8acb7d935f17c3b4f61ca111e430bcea5d121124293317b287fa8026aa54458c497fe0c92e63ef10237b353d25530403ae46c2347049
+srccontainersize 15648
+srccontainerchecksum bbd3abc8b626b3abbf8228b953f93bc597881554e334b8900b7352b34d431b9f53cfb597b91d403c88ef296c3e10a46943bb153415eb827de963da8b5eb2effd
srcfiles size=22
RELOC/source/latex/bodeplot/bodeplot.dtx
RELOC/source/latex/bodeplot/bodeplot.ins
@@ -42303,7 +42306,7 @@ catalogue-contact-repository https://github.com/rlkamalapurkar/bodeplot
catalogue-ctan /graphics/pgf/contrib/bodeplot
catalogue-license lppl1.3c
catalogue-topics engineering graphics-plot pgf-tikz
-catalogue-version 1.0.8
+catalogue-version 1.1.0
name bohr
category Package
@@ -69016,7 +69019,7 @@ containerchecksum c73220abd1545907a1d8de37cb534d2c6bd2534f1b55f03c069f39f535c326
name collection-latexextra
category Collection
-revision 63865
+revision 63949
shortdesc LaTeX additional packages
relocated 1
longdesc A very large collection of add-on packages for LaTeX.
@@ -70420,6 +70423,7 @@ depend wordlike
depend worksheet
depend wrapfig
depend wrapfig2
+depend wrapstuff
depend wtref
depend xargs
depend xassoccnt
@@ -70468,8 +70472,8 @@ depend zref-clever
depend zref-vario
depend zwgetfdate
depend zwpagelayout
-containersize 6712
-containerchecksum adda8da1ae2b6d1d5568894bd88f8e7f459ce32b29acf9cad27a8da07c41a2b21ff24c0b88e1561a57cbb016d51ac20c5cbd5c3bf5e90dbef2b6cbec8f859542
+containersize 6708
+containerchecksum e0ab8446572d1989529970fade3eabc1a14034536e3fb68be9e950f432bbc16aaacbe538ba1c0bc3bca71687f208e63246461e662f39d9189128871f2af676ca
name collection-latexrecommended
category Collection
@@ -70993,7 +70997,7 @@ containerchecksum bc842942513a72c6a0f2346025739f09477ae1e920eaefc5e396e0b68ba534
name collection-pictures
category Collection
-revision 63908
+revision 63947
shortdesc Graphics, pictures, diagrams
relocated 1
longdesc Including TikZ, pict, etc., but MetaPost and PStricks are
@@ -71188,6 +71192,7 @@ depend tikz-truchet
depend tikzbricks
depend tikzcodeblocks
depend tikzducks
+depend tikzfill
depend tikzinclude
depend tikzlings
depend tikzmark
@@ -71226,8 +71231,8 @@ depend worldflags
depend xistercian
depend xpicture
depend xypic
-containersize 1520
-containerchecksum 110629ca298b24d06a765bb6551748bab874abbd835e0830eb9a720911061885d0a416a616cf48730a6e56c5b08bca71ab4b3beaee66c89aaacdb2f7ec6d7626
+containersize 1524
+containerchecksum 6236545f374404446cd1edf9632fd48e7d40e836947ce755dcc814bde5658ff6c78eaa70ffe5167dae853a49ae35cde5fc2196e62a0c87b1dc51fdb8313c57ee
name collection-plaingeneric
category Collection
@@ -118779,7 +118784,7 @@ catalogue-version 1.0b
name feyn
category Package
-revision 63935
+revision 63945
shortdesc A font for in-text Feynman diagrams
relocated 1
longdesc Feyn may be used to produce relatively simple Feynman diagrams
@@ -118788,11 +118793,11 @@ longdesc is good at drawing large diagrams for figures, the present
longdesc package and its fonts allow diagrams within equations or text,
longdesc at a matching size. The fonts are distributed as Metafont
longdesc source, and macros for their use are also provided.
-containersize 13512
-containerchecksum f0c26249af786c41f15369e7af5995f1183dea0a7fadc7cf9c4bbd038e9a431ad5b40d6ed25f1cfde831dd39b6eb2cd932fc99f38bc541e9d56dfc1d116fb417
-doccontainersize 522192
-doccontainerchecksum 093a3dbd96632fa57ccb62cd4f4f0244357dcfb4aa0036060f6d0ff6037a38c51cf587a857d20dd1b0d9a6cffe00eec87f37dd7f222ca9be150e1a53f45ee892
-docfiles size=152
+containersize 13508
+containerchecksum 30e3ca5e633d040fe2eaa88463a8c9fa6004b86c4ae264af9b8a9a3bf55f71f7e1eb21e656f2fa194ebc751648f411a094fe40fc6a2cade1fc31aa586da1317c
+doccontainersize 534244
+doccontainerchecksum b420c19b69caf39cfa0e54bcfc90f291d9ddbed21d771669bf82a0fb04b4099fd494d2287144655366af7d0ea9594a74d64867a31754278ab1b97ffa507dfc5c
+docfiles size=155
RELOC/doc/fonts/feyn/LICENCE
RELOC/doc/fonts/feyn/README details="Package Readme"
RELOC/doc/fonts/feyn/VERSION
@@ -118809,9 +118814,9 @@ docfiles size=152
RELOC/doc/fonts/feyn/sample-two-loop.png
RELOC/doc/fonts/feyn/sample-vertex.png
RELOC/doc/fonts/feyn/style.css
-srccontainersize 16212
-srccontainerchecksum d68a1574d8dd45290cd27ce8a4ed21f536339f145bf0882fc21d8f2e7cad8434011a6c128e1fa6240f445a645ccf1c8410511456a3f9d1a07c2812cd55267a84
-srcfiles size=16
+srccontainersize 16364
+srccontainerchecksum 578f093c588cd577ff696dd052ba969769f418dffa3b2450b71efeefd885105efcdc7be4ef9693bedc911940d2707eb084857f5db9197e74040211a9952d2209
+srcfiles size=17
RELOC/source/fonts/feyn/feyn.drv
RELOC/source/fonts/feyn/feyn.dtx
RELOC/source/fonts/feyn/feyn.ins
@@ -118849,12 +118854,12 @@ runfiles size=42
RELOC/fonts/tfm/public/feyn/feynx18.tfm
RELOC/fonts/tfm/public/feyn/feynx24.tfm
RELOC/tex/latex/feyn/feyn.sty
-catalogue-contact-home https://nxg.me.uk/dist/feyn/
+catalogue-contact-home https://purl.org/nxg/dist/feyn
catalogue-contact-repository https://heptapod.host/nxg/feyn
catalogue-ctan /fonts/feyn
catalogue-license bsd2
catalogue-topics graphics-use physics font font-mf
-catalogue-version 0.4.2
+catalogue-version 0.4.3
name feynmf
category Package
@@ -131458,7 +131463,7 @@ catalogue-version 001.001
name gfsneohellenic
category Package
-revision 54080
+revision 63944
shortdesc A font in the Neo-Hellenic style
relocated 1
longdesc The NeoHellenic style evolved in academic circles in the 19th
@@ -131469,10 +131474,10 @@ longdesc characters, and has been adjusted to work well with the
longdesc cmbright fonts for mathematics support. LaTeX support of the
longdesc fonts is provided, offering OT1, T1 and LGR encodings.
execute addMap gfsneohellenic.map
-containersize 977640
-containerchecksum bd8fbea65fafc3c09fd1a53ffd7de48e93f160a49bba902efe155913bbda5fd2bf38e0d4d2242ec8152dc869959128cfdad49ded95d196aed1c39fbaad62c527
-doccontainersize 10276
-doccontainerchecksum d10d56caab42b2bd25f246726616e359ee10f934469e59a818753d1e7c4d876018cfdb86f466c49f58122fe9d7e67ca6b811b25b5e2d94b120f296ce87a2a48c
+containersize 977780
+containerchecksum 7290de85142975c61b28cc8d3e5919805590e2be5f5b442f0c371c393f92012ef6b00997bbac1aa1fb63914578e99eb5e6b26f6af8f51cb5ec7f4c53ede51fd6
+doccontainersize 10308
+doccontainerchecksum 231ea0eb57834e5b781cc3e8f49a85e2564756abe3812a432212fa7e85468117a1d80d6af5db8cec754eb1996d3b9716c12c403b1865d60b18660f454a2323b8
docfiles size=11
RELOC/doc/fonts/gfsneohellenic/OFL-FAQ.txt
RELOC/doc/fonts/gfsneohellenic/OFL.txt
@@ -131597,6 +131602,7 @@ catalogue-contact-home http://myria.math.aegean.gr/labs/dt/
catalogue-ctan /fonts/greek/gfs/gfsneohellenic
catalogue-license other-free
catalogue-topics font font-otf font-greek
+catalogue-version 1.02
name gfsneohellenicmath
category Package
@@ -305889,7 +305895,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 63934
+revision 63943
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.
@@ -305897,10 +305903,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 113544
-containerchecksum a91738c6ce5a790a0ad369c73401428e9daa90b8ed510e70ace4d9c7eb443dd1b5e259c5b832a21fa7606813f6286371e42a5b45021c854bba7fdb547b4bfb46
+containersize 113528
+containerchecksum dc6b60c9ee379fb71971a48d11168b289ba173206b2193e44cd6bd330c1139da3b0ef21026ae4a506de6199b4e8eb4e7178c1e290bbef3c080da1aeaa437ad94
doccontainersize 418788
-doccontainerchecksum 6378ca3cf094edfb0975c678a88c3046f6de1dc5f516194713fa3af13bdca9bf2711ca9990128b1109ded7a5582393587f88ded60a76d7cc32bffbff444c7a0d
+doccontainerchecksum 1f4841557dadac6ef7f8fc301d81bbe2dd18eeb016b9da54fcaa44d69e344f8a1e009efc5ef4fb71a9aad2b1dba784a23458688c2ff9efd736810f7bcc27be15
docfiles size=515
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
@@ -312750,6 +312756,43 @@ catalogue-license lppl1.3c
catalogue-topics amusements graphics pgf-tikz
catalogue-version 1.5
+name tikzfill
+category Package
+revision 63947
+shortdesc TikZ libraries for filling with images and patterns
+relocated 1
+longdesc This is a collection of TikZ libraries which add further
+longdesc options to fill TikZ paths with images and patterns. The
+longdesc libraries comprise fillings with images from files and from
+longdesc TikZ pictures. Also, patterns of hexagons and of rhombi are
+longdesc provided.
+containersize 4432
+containerchecksum f0c83eb9352dc6dd0aaf5e25ce340a5c586dfe600a620a0ff5b976f976361c35a68a71f78f675ce5f9fa61a1bc7a79f16a5813115e6f8b010fe18b0308d77ab1
+doccontainersize 622916
+doccontainerchecksum d1877f3e9035c27e750050367badfb4e0127706d0064c30ccf619673bdf403707e9509780a85bc6478a17b08d7bd7c84b302d863860941b85fdfcee7a7262c7c
+docfiles size=192
+ RELOC/doc/latex/tikzfill/CHANGES.md
+ RELOC/doc/latex/tikzfill/README.md details="Readme"
+ RELOC/doc/latex/tikzfill/tikzfill-doc.sty
+ RELOC/doc/latex/tikzfill/tikzfill.pdf details="Package documentation"
+ RELOC/doc/latex/tikzfill/tikzfill.tex
+runfiles size=13
+ RELOC/tex/latex/tikzfill/tikzfill-common.sty
+ RELOC/tex/latex/tikzfill/tikzfill.hexagon.sty
+ RELOC/tex/latex/tikzfill/tikzfill.image.sty
+ RELOC/tex/latex/tikzfill/tikzfill.rhombus.sty
+ RELOC/tex/latex/tikzfill/tikzfill.sty
+ RELOC/tex/latex/tikzfill/tikzlibraryfill.hexagon.code.tex
+ RELOC/tex/latex/tikzfill/tikzlibraryfill.image.code.tex
+ RELOC/tex/latex/tikzfill/tikzlibraryfill.rhombus.code.tex
+catalogue-contact-bugs https://github.com/T-F-S/tikzfill/issues
+catalogue-contact-home https://github.com/T-F-S/tikzfill
+catalogue-contact-repository https://github.com/T-F-S/tikzfill.git
+catalogue-ctan /graphics/pgf/contrib/tikzfill
+catalogue-license lppl1.3
+catalogue-topics pgf-tikz expl3
+catalogue-version 1.0.0
+
name tikzinclude
category Package
revision 28715
@@ -340074,6 +340117,36 @@ catalogue-license lppl1.3c
catalogue-topics text-flow expl3
catalogue-version 6.0.0
+name wrapstuff
+category Package
+revision 63949
+shortdesc Wrapping text around stuff
+relocated 1
+longdesc This package provides another implementation of text wrapping.
+longdesc Its implementation benefits from the paragraph hooks available
+longdesc since LaTeX 2021-06-01.
+containersize 10888
+containerchecksum 821f724aa173935bd5f9fd2f5125808663c176970754720f91b755b571a3c586874621db837c071407c9e443b3582b78759e5843bdf9fdfa3d8b30e7e83f2db6
+doccontainersize 409780
+doccontainerchecksum 709c37d48a59a541883a844fefbcd62848446a338606e3a8c43ad268ac33a12034015661651d7e6ec25978708ee1775673c843ed687b6dfe957dcfb6b9b589c5
+docfiles size=105
+ RELOC/doc/latex/wrapstuff/README.md details="Readme"
+ RELOC/doc/latex/wrapstuff/wrapstuff.pdf details="Package documentation" language="zh"
+srccontainersize 14824
+srccontainerchecksum eaf00459a30ccc07aba360ad6a8e44accd22af231cee99412f57aea83a9788151ee6f49d66730d5e29e08d48e9908d4a1b7e571ac5fee2778f25a6ad20426e09
+srcfiles size=22
+ RELOC/source/latex/wrapstuff/wrapstuff.dtx
+runfiles size=19
+ RELOC/tex/latex/wrapstuff/wrapstuff.sty
+catalogue-contact-announce https://github.com/qinglee/wrapstuff/releases
+catalogue-contact-bugs https://github.com/qinglee/wrapstuff/issues
+catalogue-contact-repository https://github.com/qinglee/wrapstuff
+catalogue-contact-support https://github.com/qinglee/wrapstuff/discussions
+catalogue-ctan /macros/latex/contrib/wrapstuff
+catalogue-license lppl1.3c
+catalogue-topics text-flow expl3
+catalogue-version 0.1
+
name wsemclassic
category Package
revision 31532
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index a853192ddc..abc8697b41 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-1e50e84dba4b58fc89a0ee6e4cab9382 texlive.tlpdb
+dd0cd97e64e9fa5d47dd5df61b3f9120 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 304a8251de..1283d5be25 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-541089b492b0a76f19b0ffbdcb9d56c3f572aeebc9f3366fa84cd3e795fdd58cc030b8b58cca0c74702603799d54bac5169220eadb4642d7966d3c02525b06d4 texlive.tlpdb
+ce5fc1def2cc1c4c7c5fe03ef113c6f788869bc53bd3ded838a31cad3c09899a93c812b29a0123a03164b3f5cdfdd32d5bdba16edfdbe88b792e86b5e0282db2 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 654f64bd24..8b66540ece 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-----
-iQEcBAEBCgAGBQJi10P8AAoJEEzhh34ZQ4xwmaAIAJ/2qHXKntqihxKJhzY9N2bB
-4mifIAHWUmdfTVn1cQqhjutca//p1IISvtlkoRdv7ofEzuh3IKbSW/XPpD1NFhN+
-SNxY/xGFHHPf+8BzbbpmRvkBUSRFsiK3JE3pOOdFKLPIyrvTTpD/FJRMmqbKB+24
-qGwluP6AXC9MSuoGMEFdAQAa+oqG4EBKQuJ3WL2iP0MPx/Z9kjYxfQIaeLfAf43k
-ForZYr6iaFP4Yp78WC7PHyu2y0kQctOAmPqmuDTpZ1drWbhC2ZkkYX4qfOdyRsZG
-FvtYFEq5X0+nKFod0b5yKU1brfRZn8Uy2+LlVJj+2GNS/hrcpaxJOf9kxc9vnDM=
-=pAX+
+iQEcBAEBCgAGBQJi2JWbAAoJEEzhh34ZQ4xwhCcIAKWtSeqryC/Yo88Vn20e4Aza
+85DUGxcRrjpyzi/t95GbvA21Jge36pgmVXYfbaf2nWQ02DXP0FyDqNH1d/15Gg53
+bRoqBMulKhwv5JP1/+WQxOlukY5CcOjY0t6BdVihl44vaWQz2+x4An++583Z/DMF
+ryPnoU2QUmDoqro7bqN/og0/WjE7bW8UybLP/mYBCxOpPftiAnznA8O88dhv35sl
+6T/1iq9m7NLZybpv/05xvw0J9KQJ3ubosKs1mQvatzIbyjnfBPiKagy8oHpkFp0Y
+zVMBtOEpgkrXY28x+G19B7MsvrhdcMQgIakU/5m5EeBUCtrhIP1kKhTj1NW2qMs=
+=ggwn
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 37ee845841..8eb1147b20 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 def8d03c7e..aeda28a7ce 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=1658261912
+date=1658348336
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=26caabb98b767e3c916fefb94e1fb7e7
+lstdigest=dc79ad48fe4d8eb8b3397c0aaa8b9c7a
numpkg=5804
relstate=next
-version=8235
+version=8236
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: to8fX4vfxZF80IPKXgMc7BO3XT6ZnzfIE/oiyYHK3EV2CvdoyArq6Km3bO/0Xi7szESvE2MNSuqM5x2XXLJR6b8GV5383y2jkeWV8lLmB85Ql/2eI4gHKSCpKsuaOU9ilsj3dqpooDkmd1jKFR7MtnWelny+9BsPUiJJLSuaPDkOUX5joIu+OauhwDVRMOql4kaoS/kSKLxeBGxn9Lg+dnAx6z7d3//+n1awM1YQcjay9D5tbXJddl5ksKaWbe+k8s65iHWXvJIWHVJnVyWeqZ2e9TB+7cOcNiZpIdOOJ+x1LCJSXYrdOTNd5xrqOxZryKG3W1rXDETtqnevHTk1mQ==
+;;;; signature/miktex: RKaLD0B7abhFzwvVqpe36nuQ5xwDy+STLeEKTza5iCjijgP5IVxBoay6kiSGEuIaC8e3KjBgpmZO2YoBsMpBZYBZ2NCQA/FOe3QixGyaOHlsHKIGH4epsUEmXnpFU1rF16+OZz0O2Inyagh5ArSg5SRhMnR4K/wGJZdkzYfH86IIZMrflhKnhHBHh3xBLcFygHp2sAOvS+ye8y1R1PKqtz9WMRovx/OP2IKb+kJgqkNa/NU8KqGHbpwb702M9t5z3zE30qMXeGvgVoFY58fth/cqBINLT2+8wcbSGIdr0L5L40Y9Yj9oBK62g3a5mjDGbt92mkata6vQVCJVPFFsow==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index 1b2f5e9a72..6dfaad9a5f 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1658261516
+date=1658347908
lastupd=denisbdoc font-change-xetex font-change-xetex__doc font-change-xetex__source 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
-lstdigest=3fb7fe1ec71eb0fcb9ded972494a8e85
+lstdigest=49700faa223b82c7583411c7e69fcad7
numpkg=5804
relstate=stable
-version=8235
+version=8236
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: DGVpNHXjD4cqOQLfDjCpZhspObiZYLpE5/O9ptPKv4iHh48roVsUWiqFpCQ05xbyXDa57AswkeKveT96+IwzzovB6idcO+1x81LqejIi1GscVb94XOYwfSJD3u03a56E9WV/Fu8vv+l0e8Rla/BgtjEB+RrxYhtY9E7Ebuym5jZihTsuhXepANJ4td0m1VWFFiuMzneF6RUYji2Ki5TKEO6bAKec81biIs2gI9yb+i3d77DiGgLMGXUmvwQmN7UMEtxFkIN+XWYwLhfRq+J2inUdmsoG0goiJ9qhS0NMydb00ntQg3aA82gz2qPf4kz7SjRcUw1dCSzx22hIqPvXkQ==
+;;;; signature/miktex: e0YWTCmlDtWTXuiMoQTUpMq/xPj4P/EBcEAFbEU5YXl5Eg9aulNtrYndXdACtNfQaujql8PMZyF20knMEIOtXhlNtsVZuXg99h2SvNSDzFRTukdieVws930KyH5N/hvxRu1KfJgA5obAFouLKdek1l/TKf1Bxf1hHnviUwoGH6A6RITQTYc+F4K0UwzKJYkd41fIJU8GVYKz7cX1t02tXeLDSKB15MhV5UCBg1HADSpdy/bjbYBpQ12B4PKI4cMxTboRCudmNbhocN1tRZAqX8u91zUDdF+dO0IAt7zas0LeHkwe0LIwP+WkrGRQw6/pp8ui2TFJSORiqecD+oTbug==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index cc397d84bd..a63ee5cd07 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-07-20-02-02
+2022-07-21-02-02