diff options
| author | Norbert Preining <norbert@preining.info> | 2024-03-04 03:03:20 +0000 |
|---|---|---|
| committer | Norbert Preining <norbert@preining.info> | 2024-03-04 03:03:20 +0000 |
| commit | 2af51a2a2d7a231effe8ef99a49b76d8c65e80be (patch) | |
| tree | cf27466fd0286d1d21deaee3788e5a7d37b606cc | |
| parent | 56847810aa645903c20fb112fa248caeaef82db6 (diff) | |
CTAN sync 202403040303
23 files changed, 772 insertions, 485 deletions
diff --git a/FILES.byname b/FILES.byname index 8647a4d0f5..0f2debbaa6 100644 --- a/FILES.byname +++ b/FILES.byname @@ -2077,12 +2077,12 @@ 2024/02/20 | 1710 | biblio/citation-style-language/README.md 2024/02/20 | 12878 | biblio/citation-style-language/vancouver.csl 2024/02/20 | 4552203 | biblio/citation-style-language.zip -2024/03/02 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx +2024/03/03 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx 2022/10/08 | 127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx -2024/03/02 | 2851003 | biblio/ctan-bibdata/ctan.bib -2024/03/02 | 3708800 | biblio/ctan-bibdata/ctan.pdf +2024/03/03 | 2851407 | biblio/ctan-bibdata/ctan.bib +2024/03/03 | 3708800 | biblio/ctan-bibdata/ctan.pdf 2023/01/16 | 1489 | biblio/ctan-bibdata/README -2024/03/02 | 4118151 | biblio/ctan-bibdata.zip +2024/03/03 | 4118222 | biblio/ctan-bibdata.zip 2023/02/23 | 3126 | biblio/pbibtex/pbibtex-base/cpp.awk 2023/02/23 | 1009 | biblio/pbibtex/pbibtex-base/generate.sh 2023/02/23 | 22362 | biblio/pbibtex/pbibtex-base/jabbrv.bst @@ -5444,7 +5444,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 -2024/03/02 | 253158 | FILES.last07days +2024/03/03 | 254778 | 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 @@ -205315,9 +205315,9 @@ 1992/09/27 | 8502 | info/tex-for-pictures.txt 1999/05/31 | 135 | info/texlive/README 2020/04/01 | 458 | info/tex-nutshell/README -2023/05/25 | 273211 | info/tex-nutshell/tex-nutshell.pdf -2023/05/25 | 123096 | info/tex-nutshell/tex-nutshell.tex -2023/05/25 | 304156 | info/tex-nutshell.zip +2024/03/03 | 285751 | info/tex-nutshell/tex-nutshell.pdf +2024/03/03 | 127376 | info/tex-nutshell/tex-nutshell.tex +2024/03/03 | 317275 | info/tex-nutshell.zip 2019/04/18 | 360 | info/texonly/README.md 2019/04/18 | 70552 | info/texonly/texonly2.pdf 2019/04/18 | 10714 | info/texonly/texonly2.tex @@ -237979,7 +237979,7 @@ 2023/09/19 | 711 | macros/latex/contrib/hvextern/README 2022/07/21 | 1040 | macros/latex/contrib/hvextern/script/hvextern-checkfile.lua 2024/01/31 | 1391882 | macros/latex/contrib/hvextern.zip -2023/10/16 | 5030 | macros/latex/contrib/hvfloat/Changes +2024/03/03 | 5137 | macros/latex/contrib/hvfloat/Changes 2023/10/16 | 80278 | macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf 2021/11/20 | 2379 | macros/latex/contrib/hvfloat/doc/examples/after1s1c.tex 2023/10/16 | 86613 | macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf @@ -238108,21 +238108,22 @@ 2021/11/11 | 4184 | macros/latex/contrib/hvfloat/doc/examples/wide1s2c.tex 2023/10/16 | 121957 | macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf 2021/11/11 | 3964 | macros/latex/contrib/hvfloat/doc/examples/wide2s2c.tex -2023/10/16 | 6384414 | macros/latex/contrib/hvfloat/doc/hvfloat.pdf -2023/10/16 | 125287 | macros/latex/contrib/hvfloat/doc/hvfloat.tex +2024/03/03 | 6393567 | macros/latex/contrib/hvfloat/doc/hvfloat.pdf +2024/03/03 | 126787 | 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 2021/05/12 | 170 | macros/latex/contrib/hvfloat/doc/images/missing.txt 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 -2023/10/16 | 5002 | macros/latex/contrib/hvfloat/latex/hvfloat-0.inc -2023/10/16 | 21538 | macros/latex/contrib/hvfloat/latex/hvfloat-1.inc -2023/10/16 | 5087 | macros/latex/contrib/hvfloat/latex/hvfloat-2.inc +2024/02/05 | 6089 | macros/latex/contrib/hvfloat/latex/hvfloat-0.inc +2023/10/20 | 21796 | macros/latex/contrib/hvfloat/latex/hvfloat-1.inc +2024/01/30 | 6217 | macros/latex/contrib/hvfloat/latex/hvfloat-2.inc +2024/02/05 | 11343 | macros/latex/contrib/hvfloat/latex/hvfloat-3.inc 2021/06/20 | 918 | macros/latex/contrib/hvfloat/latex/hvfloat-fps.sty -2023/10/16 | 65838 | macros/latex/contrib/hvfloat/latex/hvfloat.sty +2024/03/03 | 56876 | macros/latex/contrib/hvfloat/latex/hvfloat.sty 2021/03/08 | 563 | macros/latex/contrib/hvfloat/README -2023/10/16 | 33461308 | macros/latex/contrib/hvfloat.zip +2024/03/03 | 33472871 | 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 @@ -241098,9 +241099,9 @@ 2011/09/01 | 23475 | macros/latex/contrib/lapdf/vector.pdf 2011/08/27 | 815 | macros/latex/contrib/lapdf/vector.tex 2011/09/02 | 2850895 | macros/latex/contrib/lapdf.zip -2012/07/17 | 1140 | macros/latex/contrib/lastbib/lastbib.sty -2012/07/17 | 379 | macros/latex/contrib/lastbib/README -2012/07/17 | 1203 | macros/latex/contrib/lastbib.zip +2024/03/02 | 1055 | macros/latex/contrib/lastbib/lastbib.sty +2024/03/02 | 413 | macros/latex/contrib/lastbib/README +2024/03/03 | 1176 | macros/latex/contrib/lastbib.zip 2014/06/27 | 4806 | macros/latex/contrib/lastpackage/lastpackage.dtx 2014/06/27 | 1199 | macros/latex/contrib/lastpackage/lastpackage.ins 2014/06/27 | 254490 | macros/latex/contrib/lastpackage/lastpackage.pdf @@ -306098,6 +306099,8 @@ 2023/12/29 | 27456 | systems/texlive/tlnet/archive/chemfig.r69227.tar.xz 2022/01/24 | 863468 | systems/texlive/tlnet/archive/chemformula.doc.r61719.tar.xz 2022/01/24 | 15792 | systems/texlive/tlnet/archive/chemformula.r61719.tar.xz +2024/03/03 | 156928 | systems/texlive/tlnet/archive/chemformula-ru.doc.r70357.tar.xz +2024/03/03 | 1168 | systems/texlive/tlnet/archive/chemformula-ru.r70357.tar.xz 2020/01/18 | 714860 | systems/texlive/tlnet/archive/chemgreek.doc.r53437.tar.xz 2020/01/18 | 7120 | systems/texlive/tlnet/archive/chemgreek.r53437.tar.xz 2019/02/28 | 4992 | systems/texlive/tlnet/archive/chem-journal.r15878.tar.xz @@ -306507,7 +306510,7 @@ 2023/12/14 | 704 | systems/texlive/tlnet/archive/collection-latex.r69131.tar.xz 2024/02/15 | 740 | systems/texlive/tlnet/archive/collection-latexrecommended.r69888.tar.xz 2024/01/13 | 1020 | systems/texlive/tlnet/archive/collection-luatex.r69404.tar.xz -2024/01/19 | 1716 | systems/texlive/tlnet/archive/collection-mathscience.r69485.tar.xz +2024/03/03 | 1728 | systems/texlive/tlnet/archive/collection-mathscience.r70357.tar.xz 2023/05/12 | 564 | systems/texlive/tlnet/archive/collection-metapost.r67071.tar.xz 2024/01/28 | 508 | systems/texlive/tlnet/archive/collection-music.r69613.tar.xz 2024/02/15 | 1676 | systems/texlive/tlnet/archive/collection-pictures.r69865.tar.xz @@ -307548,9 +307551,9 @@ 2019/02/28 | 3072 | systems/texlive/tlnet/archive/draftcopy.source.r15878.tar.xz 2019/02/28 | 163348 | systems/texlive/tlnet/archive/draftfigure.doc.r44854.tar.xz 2019/02/28 | 1828 | systems/texlive/tlnet/archive/draftfigure.r44854.tar.xz -2020/12/09 | 298848 | systems/texlive/tlnet/archive/draftwatermark.doc.r57099.tar.xz -2020/12/09 | 2816 | systems/texlive/tlnet/archive/draftwatermark.r57099.tar.xz -2020/12/09 | 12480 | systems/texlive/tlnet/archive/draftwatermark.source.r57099.tar.xz +2024/03/03 | 151496 | systems/texlive/tlnet/archive/draftwatermark.doc.r70356.tar.xz +2024/03/03 | 2828 | systems/texlive/tlnet/archive/draftwatermark.r70356.tar.xz +2024/03/03 | 12532 | systems/texlive/tlnet/archive/draftwatermark.source.r70356.tar.xz 2019/02/28 | 416040 | systems/texlive/tlnet/archive/dramatist.doc.r35866.tar.xz 2019/02/28 | 3968 | systems/texlive/tlnet/archive/dramatist.r35866.tar.xz 2019/02/28 | 34464 | systems/texlive/tlnet/archive/dramatist.source.r35866.tar.xz @@ -311164,8 +311167,8 @@ 2019/02/28 | 6188 | systems/texlive/tlnet/archive/listofsymbols.source.r16134.tar.xz 2023/12/14 | 917692 | systems/texlive/tlnet/archive/litesolution.doc.r69115.tar.xz 2023/12/14 | 6068 | systems/texlive/tlnet/archive/litesolution.r69115.tar.xz -2024/03/02 | 455284 | systems/texlive/tlnet/archive/litetable.doc.r70331.tar.xz -2024/03/02 | 3524 | systems/texlive/tlnet/archive/litetable.r70331.tar.xz +2024/03/03 | 425176 | systems/texlive/tlnet/archive/litetable.doc.r70355.tar.xz +2024/03/03 | 3840 | systems/texlive/tlnet/archive/litetable.r70355.tar.xz 2023/03/08 | 56116 | systems/texlive/tlnet/archive/lithuanian.doc.r66461.tar.xz 2023/03/08 | 64828 | systems/texlive/tlnet/archive/lithuanian.r66461.tar.xz 2019/02/28 | 115684 | systems/texlive/tlnet/archive/liturg.doc.r15878.tar.xz @@ -312695,8 +312698,8 @@ 2019/02/28 | 196212 | systems/texlive/tlnet/archive/newspaper.doc.r15878.tar.xz 2019/02/28 | 1924 | systems/texlive/tlnet/archive/newspaper.r15878.tar.xz 2019/02/28 | 6804 | systems/texlive/tlnet/archive/newspaper.source.r15878.tar.xz -2024/02/26 | 973524 | systems/texlive/tlnet/archive/newtx.doc.r70168.tar.xz -2024/02/26 | 6061396 | systems/texlive/tlnet/archive/newtx.r70168.tar.xz +2024/03/03 | 974452 | systems/texlive/tlnet/archive/newtx.doc.r70358.tar.xz +2024/03/03 | 6064040 | systems/texlive/tlnet/archive/newtx.r70358.tar.xz 2024/01/27 | 263284 | systems/texlive/tlnet/archive/newtxsf.doc.r69597.tar.xz 2024/01/27 | 106028 | systems/texlive/tlnet/archive/newtxsf.r69597.tar.xz 2024/01/17 | 194632 | systems/texlive/tlnet/archive/newtxtt.doc.r69451.tar.xz @@ -316185,7 +316188,7 @@ 2022/09/13 | 600 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r64356.tar.xz -2024/03/02 | 432904 | systems/texlive/tlnet/archive/texlive-scripts.doc.r70275.tar.xz +2024/03/03 | 432928 | systems/texlive/tlnet/archive/texlive-scripts.doc.r70346.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 @@ -316207,7 +316210,7 @@ 2022/09/13 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r64356.tar.xz -2024/03/02 | 114056 | systems/texlive/tlnet/archive/texlive-scripts.r70275.tar.xz +2024/03/03 | 114076 | systems/texlive/tlnet/archive/texlive-scripts.r70346.tar.xz 2022/09/13 | 580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz 2023/05/14 | 60312 | systems/texlive/tlnet/archive/texlive-scripts.windows.r67095.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz @@ -317172,9 +317175,9 @@ 2019/02/28 | 1120 | systems/texlive/tlnet/archive/unicode-bidi.r42482.tar.xz 2023/09/19 | 3864 | systems/texlive/tlnet/archive/unicode-data.doc.r68311.tar.xz 2023/09/19 | 304228 | systems/texlive/tlnet/archive/unicode-data.r68311.tar.xz -2023/05/11 | 1373804 | systems/texlive/tlnet/archive/unicodefonttable.doc.r67066.tar.xz -2023/05/11 | 7900 | systems/texlive/tlnet/archive/unicodefonttable.r67066.tar.xz -2023/05/11 | 22828 | systems/texlive/tlnet/archive/unicodefonttable.source.r67066.tar.xz +2024/03/03 | 1400904 | systems/texlive/tlnet/archive/unicodefonttable.doc.r70354.tar.xz +2024/03/03 | 7900 | systems/texlive/tlnet/archive/unicodefonttable.r70354.tar.xz +2024/03/03 | 22876 | systems/texlive/tlnet/archive/unicodefonttable.source.r70354.tar.xz 2023/08/14 | 3336280 | systems/texlive/tlnet/archive/unicode-math.doc.r67919.tar.xz 2024/01/26 | 116676 | systems/texlive/tlnet/archive/unicode-math-input.doc.r69591.tar.xz 2024/01/26 | 17036 | systems/texlive/tlnet/archive/unicode-math-input.r69591.tar.xz @@ -318123,16 +318126,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 2024/02/05 | 125030 | systems/texlive/tlnet/install-tl -2024/03/02 | 5749163 | systems/texlive/tlnet/install-tl-unx.tar.gz -2024/03/02 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2024/03/02 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2024/03/03 | 5747212 | systems/texlive/tlnet/install-tl-unx.tar.gz +2024/03/03 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2024/03/03 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2023/05/13 | 5083 | systems/texlive/tlnet/install-tl-windows.bat -2024/03/02 | 21029826 | systems/texlive/tlnet/install-tl-windows.exe -2024/03/02 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2024/03/02 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2024/03/02 | 26035579 | systems/texlive/tlnet/install-tl.zip -2024/03/02 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2024/03/02 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2024/03/03 | 21030814 | systems/texlive/tlnet/install-tl-windows.exe +2024/03/03 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2024/03/03 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2024/03/03 | 26035604 | systems/texlive/tlnet/install-tl.zip +2024/03/03 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2024/03/03 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc 2023/03/19 | 1229 | systems/texlive/tlnet/README.md 2023/03/19 | 0 | systems/texlive/tlnet/TEXLIVE_2023 2024/01/02 | 9011 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg @@ -318142,7 +318145,7 @@ 2024/01/02 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg 2024/01/16 | 50726 | systems/texlive/tlnet/tlpkg/installer/config.guess 2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt -2024/03/02 | 7362 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +2024/03/03 | 7459 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2023/12/13 | 226639 | 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 @@ -318184,12 +318187,12 @@ 2023/02/21 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm 2024/01/31 | 5840 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm 2023/04/08 | 28167 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm -2024/03/02 | 19342629 | systems/texlive/tlnet/tlpkg/texlive.tlpdb -2024/03/02 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2024/03/03 | 19344127 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2024/03/03 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 2024/01/31 | 87229 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm -2024/03/02 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2024/03/02 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2024/03/02 | 2552572 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2024/03/03 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2024/03/03 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2024/03/03 | 2551916 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2023/02/20 | 58928 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm 2023/06/11 | 42749 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm 2023/02/21 | 16138 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm @@ -320896,7 +320899,7 @@ 2024/02/11 | 95286 | systems/texlive/tlnet/tlpkg/translations/fr.po 2024/02/11 | 88795 | systems/texlive/tlnet/tlpkg/translations/it.po 2024/02/11 | 63064 | systems/texlive/tlnet/tlpkg/translations/ja.po -2024/03/02 | 47499 | systems/texlive/tlnet/tlpkg/translations/messages.pot +2024/03/03 | 47499 | systems/texlive/tlnet/tlpkg/translations/messages.pot 2024/02/11 | 59155 | systems/texlive/tlnet/tlpkg/translations/nl.po 2024/02/11 | 68210 | systems/texlive/tlnet/tlpkg/translations/pl.po 2024/02/11 | 83641 | systems/texlive/tlnet/tlpkg/translations/pt_BR.po @@ -329377,7 +329380,7 @@ 2014/07/05 | 611 | systems/win32/yandy/README 2014/07/05 | 1004628 | systems/win32/yandy/yandy-src.tar.xz 2014/07/05 | 1012416 | systems/win32/yandy.zip -2024/03/03 | 186 | timestamp +2024/03/04 | 186 | timestamp 2002/08/26 | 61898 | usergrps/dante/antrag.pdf 2002/08/26 | 118217 | usergrps/dante/antrag.ps 2021/11/11 | 917 | usergrps/dante/dtk/doc/beispiel.bib diff --git a/FILES.byname.gz b/FILES.byname.gz Binary files differindex 1ecfe1427a..382450f860 100644 --- a/FILES.byname.gz +++ b/FILES.byname.gz diff --git a/FILES.last07days b/FILES.last07days index 117787d576..2a6a2da8c2 100644 --- a/FILES.last07days +++ b/FILES.last07days @@ -1,5 +1,49 @@ +2024/03/03 | 974452 | systems/texlive/tlnet/archive/newtx.doc.r70358.tar.xz +2024/03/03 | 7900 | systems/texlive/tlnet/archive/unicodefonttable.r70354.tar.xz +2024/03/03 | 7459 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +2024/03/03 | 6393567 | macros/latex/contrib/hvfloat/doc/hvfloat.pdf +2024/03/03 | 6064040 | systems/texlive/tlnet/archive/newtx.r70358.tar.xz +2024/03/03 | 5747212 | systems/texlive/tlnet/install-tl-unx.tar.gz +2024/03/03 | 56876 | macros/latex/contrib/hvfloat/latex/hvfloat.sty +2024/03/03 | 5137 | macros/latex/contrib/hvfloat/Changes +2024/03/03 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2024/03/03 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2024/03/03 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2024/03/03 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2024/03/03 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2024/03/03 | 47499 | systems/texlive/tlnet/tlpkg/translations/messages.pot +2024/03/03 | 432928 | systems/texlive/tlnet/archive/texlive-scripts.doc.r70346.tar.xz +2024/03/03 | 425176 | systems/texlive/tlnet/archive/litetable.doc.r70355.tar.xz +2024/03/03 | 4118222 | biblio/ctan-bibdata.zip +2024/03/03 | 3840 | systems/texlive/tlnet/archive/litetable.r70355.tar.xz +2024/03/03 | 3708800 | biblio/ctan-bibdata/ctan.pdf +2024/03/03 | 33472871 | macros/latex/contrib/hvfloat.zip +2024/03/03 | 317275 | info/tex-nutshell.zip 2024/03/03 | 304570 | macros/latex/contrib/litetable/doc/litetable-cn.pdf +2024/03/03 | 285751 | info/tex-nutshell/tex-nutshell.pdf +2024/03/03 | 2851407 | biblio/ctan-bibdata/ctan.bib +2024/03/03 | 2828 | systems/texlive/tlnet/archive/draftwatermark.r70356.tar.xz +2024/03/03 | 26035604 | systems/texlive/tlnet/install-tl.zip +2024/03/03 | 2551916 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2024/03/03 | 22876 | systems/texlive/tlnet/archive/unicodefonttable.source.r70354.tar.xz +2024/03/03 | 21030814 | systems/texlive/tlnet/install-tl-windows.exe +2024/03/03 | 19344127 | systems/texlive/tlnet/tlpkg/texlive.tlpdb 2024/03/03 | 178911 | macros/latex/contrib/litetable/doc/litetable-en.pdf +2024/03/03 | 1728 | systems/texlive/tlnet/archive/collection-mathscience.r70357.tar.xz +2024/03/03 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx +2024/03/03 | 156928 | systems/texlive/tlnet/archive/chemformula-ru.doc.r70357.tar.xz +2024/03/03 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2024/03/03 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2024/03/03 | 151496 | systems/texlive/tlnet/archive/draftwatermark.doc.r70356.tar.xz +2024/03/03 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2024/03/03 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2024/03/03 | 1400904 | systems/texlive/tlnet/archive/unicodefonttable.doc.r70354.tar.xz +2024/03/03 | 127376 | info/tex-nutshell/tex-nutshell.tex +2024/03/03 | 126787 | macros/latex/contrib/hvfloat/doc/hvfloat.tex +2024/03/03 | 12532 | systems/texlive/tlnet/archive/draftwatermark.source.r70356.tar.xz +2024/03/03 | 1176 | macros/latex/contrib/lastbib.zip +2024/03/03 | 1168 | systems/texlive/tlnet/archive/chemformula-ru.r70357.tar.xz +2024/03/03 | 114076 | systems/texlive/tlnet/archive/texlive-scripts.r70346.tar.xz 2024/03/02 | 9852 | systems/texlive/tlnet/archive/metalogox.source.r70330.tar.xz 2024/03/02 | 9683807 | fonts/newtx.zip 2024/03/02 | 9516 | systems/texlive/tlnet/archive/unbtex.r70325.tar.xz @@ -10,12 +54,10 @@ 2024/03/02 | 78232 | systems/texlive/tlnet/archive/penlightplus.doc.r70319.tar.xz 2024/03/02 | 7712 | systems/texlive/tlnet/archive/firstaid.source.r70324.tar.xz 2024/03/02 | 7451 | macros/latex/contrib/litetable/doc/litetable-demo.tex -2024/03/02 | 7362 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2024/03/02 | 688185 | fonts/newtx/doc/newtxdoc.pdf 2024/03/02 | 648 | macros/latex/contrib/chemformula-ru/README.ru 2024/03/02 | 648472 | systems/texlive/tlnet/archive/unbtex.doc.r70325.tar.xz 2024/03/02 | 616920 | macros/latex/contrib/litetable.zip -2024/03/02 | 5749163 | systems/texlive/tlnet/install-tl-unx.tar.gz 2024/03/02 | 54552 | systems/texlive/tlnet/archive/pdfmanagement-testphase.r70328.tar.xz 2024/03/02 | 542604 | systems/texlive/tlnet/archive/ufrgscca.doc.r70326.tar.xz 2024/03/02 | 53952 | systems/texlive/tlnet/archive/xetexko.r70316.tar.xz @@ -23,38 +65,25 @@ 2024/03/02 | 5344 | systems/texlive/tlnet/archive/simplivre.r70317.tar.xz 2024/03/02 | 5060 | systems/texlive/tlnet/archive/metalogox.r70330.tar.xz 2024/03/02 | 49596 | macros/latex/contrib/draftwatermark/draftwatermark.dtx -2024/03/02 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 -2024/03/02 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2024/03/02 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc -2024/03/02 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2024/03/02 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2024/03/02 | 48846 | fonts/newtx/README 2024/03/02 | 485 | macros/latex/contrib/chemformula-ru/README.md -2024/03/02 | 47499 | systems/texlive/tlnet/tlpkg/translations/messages.pot -2024/03/02 | 455284 | systems/texlive/tlnet/archive/litetable.doc.r70331.tar.xz -2024/03/02 | 432904 | systems/texlive/tlnet/archive/texlive-scripts.doc.r70275.tar.xz 2024/03/02 | 41876 | systems/texlive/tlnet/archive/projlib.doc.r70327.tar.xz -2024/03/02 | 4118151 | biblio/ctan-bibdata.zip +2024/03/02 | 413 | macros/latex/contrib/lastbib/README 2024/03/02 | 399096 | systems/texlive/tlnet/archive/metalogox.doc.r70330.tar.xz -2024/03/02 | 3708800 | biblio/ctan-bibdata/ctan.pdf 2024/03/02 | 3629 | macros/latex/contrib/draftwatermark/draftwatermark.ins 2024/03/02 | 362316 | systems/texlive/tlnet/archive/minim.doc.r70320.tar.xz 2024/03/02 | 3589 | macros/latex/contrib/chemformula-ru/chemformula-ru.tex -2024/03/02 | 3524 | systems/texlive/tlnet/archive/litetable.r70331.tar.xz 2024/03/02 | 3426164 | systems/texlive/tlnet/archive/simpleicons.r70334.tar.xz 2024/03/02 | 3320 | systems/texlive/tlnet/archive/firstaid.r70324.tar.xz 2024/03/02 | 31556 | systems/texlive/tlnet/archive/projlib.source.r70327.tar.xz 2024/03/02 | 31344 | systems/texlive/tlnet/archive/projlib.r70327.tar.xz 2024/03/02 | 294320 | systems/texlive/tlnet/archive/erewhon-math.r70336.tar.xz -2024/03/02 | 2851003 | biblio/ctan-bibdata/ctan.bib 2024/03/02 | 27560 | systems/texlive/tlnet/archive/luamplib.source.r70323.tar.xz 2024/03/02 | 272080 | systems/texlive/tlnet/archive/simplivre.doc.r70317.tar.xz 2024/03/02 | 267464 | systems/texlive/tlnet/archive/xetexko.doc.r70316.tar.xz 2024/03/02 | 262948 | systems/texlive/tlnet/archive/euler-math.r70335.tar.xz 2024/03/02 | 262384 | systems/texlive/tlnet/archive/xcharter-math.r70333.tar.xz -2024/03/02 | 26035579 | systems/texlive/tlnet/install-tl.zip 2024/03/02 | 259792 | systems/texlive/tlnet/archive/firstaid.doc.r70324.tar.xz -2024/03/02 | 2552572 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2024/03/02 | 255244 | systems/texlive/tlnet/archive/concmath-otf.r70337.tar.xz 2024/03/02 | 25272 | systems/texlive/tlnet/archive/minim.r70320.tar.xz 2024/03/02 | 252568 | systems/texlive/tlnet/archive/einfart.doc.r70318.tar.xz @@ -63,13 +92,10 @@ 2024/03/02 | 24816 | systems/texlive/tlnet/archive/ufrgscca.r70326.tar.xz 2024/03/02 | 2378750 | macros/latex/contrib/unicodefonttable.zip 2024/03/02 | 21136 | systems/texlive/tlnet/archive/minim-mp.r70322.tar.xz -2024/03/02 | 21029826 | systems/texlive/tlnet/install-tl-windows.exe 2024/03/02 | 2004048 | systems/texlive/tlnet/archive/erewhon-math.doc.r70336.tar.xz 2024/03/02 | 1982532 | systems/texlive/tlnet/archive/xcharter-math.doc.r70333.tar.xz 2024/03/02 | 1935740 | systems/texlive/tlnet/archive/concmath-otf.doc.r70337.tar.xz -2024/03/02 | 19342629 | systems/texlive/tlnet/tlpkg/texlive.tlpdb 2024/03/02 | 17520 | systems/texlive/tlnet/archive/minim-pdf.r70321.tar.xz -2024/03/02 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx 2024/03/02 | 167712 | macros/latex/contrib/chemformula-ru/chemformula-ru.pdf 2024/03/02 | 163222 | macros/latex/contrib/draftwatermark.zip 2024/03/02 | 161688 | systems/texlive/tlnet/archive/cjk-ko.doc.r70332.tar.xz @@ -78,11 +104,7 @@ 2024/03/02 | 1581824 | systems/texlive/tlnet/archive/euler-math.doc.r70335.tar.xz 2024/03/02 | 157240 | systems/texlive/tlnet/archive/luamplib.doc.r70323.tar.xz 2024/03/02 | 15608 | macros/latex/contrib/litetable/doc/litetable-en.tex -2024/03/02 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 2024/03/02 | 153827 | macros/latex/contrib/draftwatermark/draftwatermark.pdf -2024/03/02 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2024/03/02 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2024/03/02 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 2024/03/02 | 14308 | macros/latex/contrib/litetable/doc/litetable-cn.tex 2024/03/02 | 142712 | systems/texlive/tlnet/archive/minim-pdf.doc.r70321.tar.xz 2024/03/02 | 141796 | fonts/newtx/tex/newtxmath.sty @@ -94,9 +116,9 @@ 2024/03/02 | 12144 | systems/texlive/tlnet/archive/luamplib.r70323.tar.xz 2024/03/02 | 1187066 | support/TeX4ht/source/tex4ht-4ht.tex 2024/03/02 | 117160 | systems/texlive/tlnet/archive/minim-mp.doc.r70322.tar.xz -2024/03/02 | 114056 | systems/texlive/tlnet/archive/texlive-scripts.r70275.tar.xz 2024/03/02 | 10904 | systems/texlive/tlnet/archive/penlightplus.r70319.tar.xz 2024/03/02 | 106969 | macros/latex/contrib/litetable/doc/litetable-demo.pdf +2024/03/02 | 1055 | macros/latex/contrib/lastbib/lastbib.sty 2024/03/01 | 989061 | macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf 2024/03/01 | 96337 | macros/luatex/generic/luamplib/luamplib.dtx 2024/03/01 | 93799 | macros/xetex/generic/xetexko/xetexko.sty @@ -2959,7 +2981,6 @@ 2024/02/27 | 10006 | graphics/asymptote/base/rationalSimplex.asy 2024/02/27 | 100010 | macros/latex/contrib/mandi/mandi.dtx 2024/02/27 | 100007 | graphics/asymptote/cudareflect/tinyexr/examples/exrview/ThirdPartyLibs/nativefiledialog/screens/open_cocoa.png -2024/02/26 | 973524 | systems/texlive/tlnet/archive/newtx.doc.r70168.tar.xz 2024/02/26 | 92770 | macros/latex/contrib/create-theorem/doc/create-theorem-doc.pdf 2024/02/26 | 896 | macros/latex/contrib/create-theorem/README.md 2024/02/26 | 858720 | systems/texlive/tlnet/archive/beautynote.doc.r70166.tar.xz @@ -2971,7 +2992,6 @@ 2024/02/26 | 78737 | graphics/pgf/contrib/profsio/doc/ProfSio-doc-fr.tex 2024/02/26 | 78085 | macros/latex/contrib/weiqi/weiqi.dtx 2024/02/26 | 65462 | macros/latex/contrib/cleveref-forward/demo/cleveref-forward-demo.pdf -2024/02/26 | 6061396 | systems/texlive/tlnet/archive/newtx.r70168.tar.xz 2024/02/26 | 580696 | systems/texlive/tlnet/archive/frenchmath.doc.r70163.tar.xz 2024/02/26 | 57952 | systems/texlive/tlnet/archive/proflycee.r70162.tar.xz 2024/02/26 | 575 | macros/latex/contrib/weiqi/README.md @@ -3054,38 +3074,3 @@ 2024/02/26 | 111308 | macros/luatex/latex/lua-ul/lua-ul.pdf 2024/02/26 | 1062288 | systems/texlive/tlnet/archive/mcf2graph.doc.r70167.tar.xz 2024/02/26 | 1046923 | macros/latex/contrib/reledmac/reledpar.pdf -2024/02/25 | 99039 | graphics/mcf2graph/mcf_manual.tex -2024/02/25 | 88678 | macros/latex/contrib/crefthe.zip -2024/02/25 | 880927 | macros/latex/contrib/beautynote/beautynote.pdf -2024/02/25 | 8092 | systems/texlive/tlnet/archive/fontsetup.r70135.tar.xz -2024/02/25 | 750 | macros/latex/contrib/beautynote/README.md -2024/02/25 | 732456 | systems/texlive/tlnet/archive/bithesis.doc.r70136.tar.xz -2024/02/25 | 71860 | macros/latex/contrib/crefthe/crefthe-doc.pdf -2024/02/25 | 713698 | graphics/mcf2graph/mcf_example.pdf -2024/02/25 | 598456 | systems/texlive/tlnet/archive/fontsetup.doc.r70135.tar.xz -2024/02/25 | 594685 | macros/latex/contrib/frenchmath.zip -2024/02/25 | 580908 | macros/latex/contrib/frenchmath/frenchmath.pdf -2024/02/25 | 5241 | macros/latex/contrib/beautynote/beautynote.tex -2024/02/25 | 4858 | graphics/mcf2graph/mcf_example.tex -2024/02/25 | 4843 | macros/latex/contrib/crefthe/README.md -2024/02/25 | 47939 | macros/latex/contrib/frenchmath/frenchmath.dtx -2024/02/25 | 3600 | systems/texlive/tlnet/archive/context-squares.r70141.tar.xz -2024/02/25 | 3285 | graphics/mcf2graph/template_lib.mcf -2024/02/25 | 319715 | graphics/mcf2graph/mcf_manual.pdf -2024/02/25 | 25864 | systems/texlive/tlnet/archive/bithesis.source.r70136.tar.xz -2024/02/25 | 25797 | macros/latex/contrib/crefthe/crefthe.sty -2024/02/25 | 249425 | macros/latex/contrib/proflycee/doc/ProfLycee-docctan.zip -2024/02/25 | 21101 | graphics/mcf2graph/CHANGELOG -2024/02/25 | 2001 | macros/latex/contrib/mismath/mismath.ins -2024/02/25 | 2000 | systems/texlive/tlnet/archive/context-squares.doc.r70141.tar.xz -2024/02/25 | 1955150 | macros/latex/contrib/proflycee.zip -2024/02/25 | 19263 | macros/latex/contrib/crefthe/crefthe-doc.tex -2024/02/25 | 19196 | systems/texlive/tlnet/archive/bithesis.r70136.tar.xz -2024/02/25 | 19106 | macros/latex/contrib/crefthe/LICENSE -2024/02/25 | 17611 | macros/latex/contrib/beautynote/beautynote.cls -2024/02/25 | 1612313 | macros/latex/contrib/beautynote.zip -2024/02/25 | 1539 | graphics/mcf2graph/mcf_exa_soc.mp -2024/02/25 | 1179 | graphics/mcf2graph/template_soc.mp -2024/02/25 | 109452 | graphics/mcf2graph/main_lib.mcf -2024/02/25 | 1071116 | graphics/mcf2graph.zip -2024/02/25 | 1065 | macros/latex/contrib/frenchmath/README.md diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib index 60a20818b5..288c5106a0 100644 --- a/biblio/ctan-bibdata/ctan.bib +++ b/biblio/ctan-bibdata/ctan.bib @@ -1,7 +1,7 @@ %% bib file of all CTAN packages %% (C) Herbert Voß %% -%% created at 02-03-2024, 02:00:04 +%% created at 03-03-2024, 02:00:04 %% %% This file is provided under the terms of the LPPL v1.3 or @@ -11991,6 +11991,17 @@ url = {https://ctan.org/pkg/chemfig}, } +@manual{ctan-chemformula-ru, + title = {The \texttt{chemformula-ru} package}, + subtitle = {Using the chemformula package with babel-russian settings}, + author = {Alexey Kuznetsov}, + date = {2024-03-02}, + version = {}, + license = {lppl1.3c}, + mirror = {https://mirror.ctan.org/macros/latex/contrib/chemformula-ru}, + url = {https://ctan.org/pkg/chemformula-ru}, +} + @manual{ctan-chemformula, title = {The \texttt{chemformula} package}, subtitle = {Command for typesetting chemical formulas and reactions}, @@ -19689,8 +19700,8 @@ title = {The \texttt{draftwatermark} package}, subtitle = {Put a grey textual watermark on document pages}, author = {Sergio Callegari}, - date = {2020-12-08}, - version = {3.0}, + date = {2024-03-02}, + version = {3.1}, license = {lppl1.3}, mirror = {https://mirror.ctan.org/macros/latex/contrib/draftwatermark}, url = {https://ctan.org/pkg/draftwatermark}, @@ -40358,8 +40369,8 @@ title = {The \texttt{LiteTable} package}, subtitle = {Class schedules with colorful course blocks}, author = {Mingyu Xia}, - date = {2024-03-01}, - version = {2.4b}, + date = {2024-03-02}, + version = {2.4c}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/litetable}, url = {https://ctan.org/pkg/litetable}, @@ -48888,8 +48899,8 @@ title = {The \texttt{newtx} package}, subtitle = {Alternative uses of the TX fonts, with improved metrics}, author = {Michael Sharpe}, - date = {2024-02-25}, - version = {1.739}, + date = {2024-03-02}, + version = {1.741}, license = {lppl1.3}, mirror = {https://mirror.ctan.org/fonts/newtx}, url = {https://ctan.org/pkg/newtx}, @@ -74551,7 +74562,7 @@ title = {The \texttt{unicodefonttable} package}, subtitle = {A Unicode font table generator}, author = {Frank Mittelbach}, - date = {2023-05-10}, + date = {2024-03-02}, version = {1.0h}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/unicodefonttable}, diff --git a/info/tex-nutshell/tex-nutshell.pdf b/info/tex-nutshell/tex-nutshell.pdf Binary files differindex 5f2405138c..f872f03307 100644 --- a/info/tex-nutshell/tex-nutshell.pdf +++ b/info/tex-nutshell/tex-nutshell.pdf diff --git a/info/tex-nutshell/tex-nutshell.tex b/info/tex-nutshell/tex-nutshell.tex index dbff5fdc2c..c82b08017a 100644 --- a/info/tex-nutshell/tex-nutshell.tex +++ b/info/tex-nutshell/tex-nutshell.tex @@ -55,6 +55,7 @@ \def\yy #1#2={\i #2 \egroup `#1#2=} \def\z`{`\let<=\l} \let\_cslinkcolor=\Blue +\def\q`#1`{\link[cs:\csstring#1]\Blue{\tt\string#1}} % tex-nutshell.pdf includes destinations to the explanation of the primitive % control sequences and plain TeX macros in the form: "cs:sequence". For example, @@ -145,8 +146,10 @@ There are four types of meanings of control sequences: tables, \i hbox `\hbox` creates a box in typesetting output). * the control sequence can be a \ii character/constant {\em character constant} (declared by \i chardef `\chardef` - or \i mathchardef `\mathchardef` primitive command) or a font selector (declared - by \i font `\font` primitive command). + or \i mathchardef `\mathchardef` primitive command) or a + \ii character/equivalent {\em character equivalent} + (declared by \i let `\let\sequence=<character>`) or a {\em font selector} + (declared by \i font `\font` primitive command). * the control sequence can be a \ii macro {\em macro}. When it is read, it is replaced by its \ii replacement/text {\em replacement text} in the input queue. If there are more macros in the replacement text, all macros are replaced. This is called the @@ -805,6 +808,11 @@ If the real parameter is in the form `{...}` then the outer braces are removed from the parameter. For example `\Test A{C..DEF G}.. H` reads `C..DEF G` to the `#2`. +When reading an unseparated parameter, \TeX/ ignores spaces before first +non-space token. Suppose for example `\def\m:#1{"#1"}`. Then both +`\m:x` and `\m: x` print `"x"` and both `\m:{a b}` and `\m: {a b}` +print `"a b"`. + The separated parameter can bring a potential problem if the user forgets the delimiter or the delimiter is specified incorrectly. Then \TeX/ reports an error. This error is reported when the first \i par `\par` is scanned as part of the @@ -1104,6 +1112,7 @@ value given by plain \TeX/ follows. * \y`\topskip=10pt` is the distance between the top of the page box and the baseline of the first line. + \y`\splittopskip=10pt` is the same for a box remainded after \q`\vsplit`. * \y`\linepenalty=10`, \y`\hyphenpenalty=50`, @@ -1145,6 +1154,9 @@ value given by plain \TeX/ follows. are parameters for the paragraph building algorithm (not described here in detail). +* \y`\uchyph=1`, if it is positive, then words with capital first letter can + be hyphenated. + * \y`\hbadness=1000`, \y`\vbadness=1000`. \TeX/ reports a warning about \iid badness on the terminal and to the log file if it is greater than these values. The warning has the form @@ -1225,6 +1237,8 @@ detail). * \y`\mathsurround=0pt` is the space inserted around a formula in internal math mode. +* \y`\displaywidth=*` includes the width of the line with display formula. + * \y`\abovedisplayskip=12pt plus3pt minus9pt`, \y`\abovedisplayshortskip=0pt plus3pt`, \y`\belowdisplayskip=12pt plus3pt minus9pt`, @@ -1251,6 +1265,23 @@ detail). situations respectively: opens output routine, paragraph, internal math mode, display math mode, {\noda\x`\vbox`, \x`\hbox`}, is at the end of a line in a table, at the end of an input file, or starts the job. + +* \y`\maxdepth=4pt`, \y`\boxmaxdepth=\maxdimen`, \y`\splitmaxdepth=\maxdimen` + are maximal pagebox / ordinal `\vbox` / `\vsplit`ted box depth. If exeeds, + baseline si shifted down. + +* \y`\delimiterfactor=901`, + \y`\delimitershortfall=5pt` are parameters for calculating size of math delimiters. + \y`\nulldelimiterspace=1.2pt` is empty delimiter horizontal space. + +* \y`\defaultskewchar=-1` sets a character \x`\skewchar` in font used for positioning math + accents. + +* \x`\fontdimen``<number><font selector>` enables access to various values + of given font. + +* \y`\pdfpagewidth=210mm`, \y`\pdfpageheight=297mm` are PDF page dimensions + (implemented in pdf\TeX/ and its successors). \enditems \sec[expand] Expandable primitive commands @@ -1287,7 +1318,7 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed. of the `<tokens register>` without re-tokenizing and the expand processor does not expand this output in {\noda`\edef`, `\write`, `\message`}, etc., arguments. -* \i scantoken `\scantokens/<expandafters>.`\z`{|<text>};` re-tokenizes \z`<text>` using the actual +* \i scantokens `\scantokens/<expandafters>.`\z`{|<text>};` re-tokenizes \z`<text>` using the actual tokenizer setting. The behavior is the same as when writing \z`<text>` to a virtual file and reading this file immediately. @@ -1317,6 +1348,9 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed. \value Peter % expands to \dict:Peter which expands to 21. \endtt +* \*\*\*\i lastnamedcs `\lastnamedcs` is the last control sequence created by + `\csname ...\endcsname`. + * \i expandafter \z`\expandafter|<token 1><token 2>;` does the transformation \z`<token 1><expanded token 2>`. Then \TeX/ processes `<token 1>` followed by `<expanded token 2>`. @@ -1343,7 +1377,7 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed. The `/<expandafters>.`\z`{|<text>};` syntax rule enables us to prepare \z`|<text>;` by `\expandafter`(s). For example \i detokenize `\detokenize{\macro}` expands to - `\`\c{12}`m`\c{12}`a`\c{12}`c`\c{12}`r`\c{12}`o`\c{12}. But if you need to detokenize + `\`\c{12}`m`\c{12}`a`\c{12}`c`\c{12}`r`\c{12}`o`\c{12}{\Blue\char9251}\c{10}. If you need to detokenize the `<replacement text>` of the `\macro` then use `\detokenize\expandafter{\macro}`. Not only `\expandafter`s should be here. The expand processor does full expansion here until an opening brace @@ -1363,18 +1397,21 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed. * \i if \z`\if<token 1><token 2>` is true if \begitems \removelastskip \style a - * both tokens are characters with the same Unicode (or ASCII code in classical \TeX) or + * both tokens are the same characters or * both tokens are control sequences (with arbitrary meaning but not \"the character") or - * one token is a character, second is a control sequence equal to the character (by `\let`) or - * both tokens are control sequences, their meaning (set by `\let`) is the same character code. + * one token is a character, second is a control sequence equal to this character (by `\let`) or + * both tokens are control sequences, their meaning (set by `\let`) is the same character. \enditems - \removelastskip - \noindent Example: you can say `\let\test=a` then `\if\test a` returns true. + In a), c) and d), only character codes are compared, no their category codes.\nl + Example: you can say `\let\test=a` then `\if\test a` returns true. * \i ifx \z`\ifx|<token 1><token 2>;` is true if the meanings of \z`<token 1>` and \z`<token 2>` are the same. +* \*\i ifcsname `\ifcsname<text>\endcsname` is true if the control sequance + `<text>` is declared. + * \i ifnum `\ifnum<number 1><relation><number 2>`. The `<relation>` could be \code{<} or \code{=} or \code{>}. It returns true if the comparison of the two numbers is true. @@ -1460,8 +1497,18 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed. was started. `\endinput` done in the main file causes future reading from the terminal and a headache for the user. +* \*\*\*\i Uchar \x`\Uchar``<number>` expands to a Unicode character + with given code <number>. (\XeTeX/ too). + * \*\*\*\i directlua \z`\directlua {<text>}` runs a Lua script given in \z`<text>`. +* \*\*\*\i luaescapestring \z`\luaescapestring {<text>}` prepares `<text>` + for usage as Lua string (escapes `"` and `\`). + +* \*\*\*\i immediateassignment `\immediateassignment`, + \i immediateassigned \z`\immediateassigned {<code>}` do following assignment + (or assignments in `<code>`) expandable. + \enditems @@ -1526,12 +1573,15 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed. separated by a semicolon. The {\let\,=\relax `otfinfo -f <file name>.otf`} command (on command line) can list them. Lua\TeX/ supports alternative syntax: `{...}` instead of `"..."`. - Example: `\font\test={[texgyretermes-regular]:+onum;-liga} at12pt`. + Example: `\font\test={[texgyretermes-regular]:+onum;-liga} at12pt`. + There is default font selector \x`\nullfont` which selects an \"empty font". * \i let `\let|<control sequence>=<token>;` sets to the `<control sequence>` the same meaning as `<token>` has. The `<token>` can be whatever, a character or a control sequence. +* \*\*\* \x`\glet` is equal to `\global\let`. + * \i futurelet \z`\futurelet|<control sequence><token 1><token 2>;` works in two steps. In the first step it does \z`\let|<control sequence>=<token 2>;` and in the second step \z`<token 1><token 2>` is processed with activated token @@ -1640,7 +1690,7 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed. result of this operation. For example, you can say `\newbox\column` `\setbox\column=\vbox{...}` and later `\setbox0=\vsplit\column to5cm`. The `\box0` is a `\vbox` containing the first 5cm of - saved material. + saved material. And the `\column` box includes the rest of the material. * \x`\lastbox` returns the last box in the current vertical or horizontal material and removes it. @@ -1699,7 +1749,8 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed. \noindent {\bf More commands for creating something in typesetting output} \begitems -* \x`\par` closes horizontal mode and finalizes a paragraph. +* \x`\par` closes horizontal mode and finalizes a paragraph. In vertical + mode, it does nothing. * \x`\indent`, \x`\noindent`. They leave vertical mode and open a paragraph with/without paragraph indentation. If horizontal mode is current then `\indent` inserts an empty box of `\parindent` width; `\noindent` does @@ -1950,6 +2001,7 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed. (available in pdf\TeX, \XeTeX/ and Lua\TeX) \begitems +* \i pdfoutput `\pdfoutput` is numeric register. If its value is 1 then PDF format is geneerated. * \i pdfliteral \z`\pdfliteral{<text>}` puts the \z`<text>` interpreted in a low level PDF language to the typesetting output. All PDF constructs defined in the PDF specification are allowed. The dimensions of @@ -1959,6 +2011,8 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed. A good practice is to close \z`<text>` to `q...Q` PDF commands. The command `\pdfliteral` is typically used for generating graphics and for linear transformation. +* \i pdfsave \i pdfrestore `\pdfsave`, `\pdfrestore` saves and restores + PDF graphics stack (like `q`, `Q` PDF commands). * \i pdfcolorstack `\pdfcolorstack<number><op>`\z`{<text>}` (where `<op>` is `push` or `pop` or `set`) behaves like \z`\pdfliteral{<text>}` and it is used for color switchers. For example when \z`<text>` is `1 0 0 rg` then the red color is @@ -2012,6 +2066,46 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed. of \TeX/ in order to get these absolute positions by macros. \enditems +\noindent {\bf Selected \LuaTeX/ primitives} + +\begitems +* \x`\pdffeedback`, \x`\pdfextension`, \x`\pdfvariable` declare pdf\TeX/ + \"primitives" in \LuaTeX. +* Moreover, \LuaTeX/ uses different names for several primitives: + {\spaceskip=.3em plus.7em minus.1em + \x`\pagewidth` is \q`\pdfpagewidth`, + \x`\pageheight` is \q`\pdfpageheight`, + \x`\outputmode` is \q`\pdfoutput`, + \x`\savepos` is \q`\pdfsavepos`, + \x`\lastxpos` is \q`\pdflastxpos`, + \x`\lastypos` is \q`\pdflastypos`, + \x`\outputmode` is \q`\pdfoutput`, + \x`\saveimageresource` is \q`\pdfximage`, + \x`\lastsavedimageresourceindex` is \q`\pdflastximage`, + \x`\useimageresource` is \q`\pdfrefximage`, + \x`\protrudechars` is \q`\pdfprotrudechars`, + \x`\normaldeviate` is \q`\pdfnormaldeviate`, + \x`\uniformdeviate` is \q`\pdfuniformdeviate`, + \x`\setrandomseed` is \q`\pdfsetrandomseed`. + } +* \x`\catcodetable`, \x`\initcatcodetable`, \x`\savecatcodetable` + do copy of whole catcode tables and enable to switch between them. +* \x`\attributedef` declares a sequence as an attribute number. Similar like + \q`\countdef`. +* \x`\suppressfontnotfounderror` and others switch on/off + error reporting in specified cases. +* \x`\matheqdirmode`, \x`\breakafterdirmode` one of many parameters for + right-to-left typesetting. +* \x`\crampeddisplaystyle`, \x`\crampedtextstyle`, + \x`\crampedscriptstyle`,\nl \x`\crampedscriptscriptstyle` + is a reduced math style (below fraction line, for example). +\enditems + +There are many additional primitives in \LuaTeX/, see its +\ulink[https://www.pragma-ade.com/general/manuals/luatex.pdf]{documentation}. +Only few of them are mentioned here. +\medskip + \noindent {\bf Microtypographical extensions} (available in pdf\TeX/, Lua\TeX/ and not all of them in \XeTeX) @@ -2092,6 +2186,9 @@ If it is~a~Lua\TeX/ only command then three *** are prefixed. * \i eqno `$$<formula>\eqno<mark>$$` puts the `<mark>` to the right margin as `\llap{$<mark>$}`. Analogously, \i leqno `$$<formula>\leqno<mark>$$` puts it to the left margin. +* \x`\mkern`, \x`\mskip` work like `\kern`, `\hskip`, but dimensions are + set in `mu`=1/18`em` units. +* \x`\nonscript` ignores following skip command if it is used in <S> or <SS> style. \enditems \noindent {\bf Commands for setting math codes and math-family fonts}\par\nobreak\medskip @@ -2351,6 +2448,7 @@ math-family font number `<d4>` and slot `<d5><d6>` for the first successor of does the same but without worrying about floating objects. \enditems +\filbreak \noindent{\bf Macros used in math modes} \begitems @@ -2430,8 +2528,8 @@ math-family font number `<d4>` and slot `<d5><d6>` for the first successor of \noindent Petr Olšák {\tt petr@olsak.net}\nl Czech Technical University in Prague\nl -Version of the text: 0.9 (\the\year-\thed\month-\thed\day) +Version of the text: 0.10 (\the\year-\thed\month-\thed\day) \break -\end +\bye diff --git a/macros/latex/contrib/hvfloat/Changes b/macros/latex/contrib/hvfloat/Changes index 41fa127bf1..541dc4d5c7 100644 --- a/macros/latex/contrib/hvfloat/Changes +++ b/macros/latex/contrib/hvfloat/Changes @@ -1,4 +1,6 @@ hvfloat.sty: +2.48 2024-03-03 - added option fboxLines to get patial lines of \fbox + (package fbox) 2.47 2023-10-16 - added type doubleFullPage for images with a width of 2\paperwidth, but variable height and possible text on both pages. diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf Binary files differindex be10a26587..30058a0475 100644 --- a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf +++ b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.tex b/macros/latex/contrib/hvfloat/doc/hvfloat.tex index 1ab2adddaa..40bb098819 100644 --- a/macros/latex/contrib/hvfloat/doc/hvfloat.tex +++ b/macros/latex/contrib/hvfloat/doc/hvfloat.tex @@ -1,7 +1,7 @@ -%% $Id: hvfloat.tex 774 2023-10-16 13:44:29Z herbert $ -\listfiles +%% $Id: hvfloat.tex 876 2024-03-03 14:04:56Z herbert $ +%\listfiles \errorcontextlines=100 -\documentclass[twoside,paper=a4,usegeometry]{scrartcl} +\documentclass[twoside,paper=a4,usegeometry,index=totoc]{scrartcl} \usepackage{fontspec} \usepackage[silent]{libertinus-otf} %\usepackage[scaled=0.85]{beramono} @@ -251,6 +251,7 @@ way with \Lcs{setlength} or \Lcs{addtolength}. The following packages are loaded by \Lpack{hvfloat} and the optional argument \Loption{hypcap} is passed to the packages \Lpack{caption} and \Lpack{subcaption}: +\Lpack{fbox}, \Lpack{caption}, \Lpack{subcaption}, \Lpack{atbegshi}, @@ -400,6 +401,8 @@ There are the following keywords: \Lkeyword{inMargin} & false & \rowvsp Put object and frame into the margin.\\ \Lkeyword{objectFrame} & false & \rowvsp Put a frame with no separation around the float object.\\ +\Lkeyword{fboxLines} & ltrb & \rowvsp Lines around the box l)eft, t)op, r)ight, b)ottom\\ +\Lkeyword{fboxSep} & 0pt & \rowvsp Additional box separation (like \Ldim{fboxsep})\\ \Lkeyword{style} & \none & \rowvsp Use a defined style.\\ \Lkeyword{capFormat} & \none & \rowvsp Define formatting options for \Lcs{caption}; see documentation of package \Lpack{caption}.\\ @@ -537,6 +540,23 @@ minus the width of the object and the space between object and caption, which is the separation between object and caption, and the current linewidth.}{fig:width1} +The same with box lines only on the left and right: + +\begin{lstlisting} +\hvFloat[floatPos=!htb,capPos=after,objectFrame, + fboxLines=lr,fboxSep=0pt]{figure}{\includegraphics[scale=1.5]{images/rose}}% + {Caption right beside with a \emph{natural} width, which is given by the width of the object, + the separation between object and caption, and the current linewidth.}{fig:width1A} +\end{lstlisting} + +\MarginNote{Fig.~\ref{fig:width1A}} +\hvFloat[floatPos=!htb,capPos=after,objectFrame, + fboxLines=lr,fboxSep=0pt]{figure}{\includegraphics[scale=1.5]{images/rose}}% + {Caption right beside with a \emph{natural} width, which is given by the width of the object, + the separation between object and caption, and the current linewidth.}{fig:width1A} + + + \subsection{Relative linewidth} With \Lkeyword{capWidth}\texttt{=<number>} the caption width is set to \texttt{<number>}\Ldim{columnwidth}. @@ -2742,9 +2762,9 @@ 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: -\verb/\ref{foo} | \ref{foo-cap} | \ref{foo-2}/ $\rightarrow$ \ref{foo} | \ref{foo-cap} | \ref{foo-2} +\verb/\ref{foo} | \ref{foo-cap} | \ref{foo-2}/ $\rightarrow$ Figure~\ref{foo} | Figure~\ref{foo-cap} | Figure~\ref{foo-2} -\verb/\pageref{foo} | \pageref{foo-cap} | \pageref{foo-2}/ $\rightarrow$ \pageref{foo} | \pageref{foo-cap} | \pageref{foo-2} +\verb/\pageref{foo} | \pageref{foo-cap} | \pageref{foo-2}/ $\rightarrow$ Page~\pageref{foo} | Page~\pageref{foo-cap} | Page~\pageref{foo-2} \begin{lstlisting} \hvFloat[doubleFULLPAGE,capPos=after]% @@ -2806,9 +2826,9 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same \hvBlindtext -\hvblindtext +\hvBlindtext -%\hvblindtext +\hvblindtext \subsection{\Lkeyword{doublePAGE}} With this option the object also starts at the left paper margin but on the top of the text area. @@ -3001,9 +3021,11 @@ of the object. \hvBlindtext -\hvBlindtext +%\hvBlindtext \hvBlindtext + +\vfill \begin{lstlisting} \hvFloat[doubleFullPage,capWidth=n,sameHeight,capPos=right]% {figure}% @@ -3016,9 +3038,13 @@ of the object. {fig:doublePage001} \end{lstlisting} +Now a pagebreak follows so that the following doublepage object should +immediately placed on the next page. +\newpage + \MarginNote{Fig. \ref{fig:doublePage001}} -\hvFloat[doubleFullPage,capWidth=n,sameHeight,capPos=right]% +\hvFloat[doubleFullPage,capWidth=n,sameHeight,capPos=left]% {figure}% {\includegraphics[doubleFullPage]{images/sonne-meer}}% [A doublepage image with a caption on the right side of the right part.]% @@ -3035,6 +3061,17 @@ of the object. \hvBlindtext \hvBlindtext +\hvblindtext +\hvblindtext + +\hvblindtext +\hvblindtext + +%\hvBlindtext +%\hvBlindtext +\hvBlindtext + +\hvBlindtext @@ -3086,13 +3123,11 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15 [A doublepage tabular with a caption on the right side of the right part.]% {A caption for a double-sided tabular 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{doublePage}}% + the paper. A short form is used for the LOF. The parameter is \texttt{doublePage}}% {tab:doublePage3} \end{lstlisting} -\marginpar{Tab.~\ref{tab:doublePage3}} \global\savebox\hvOBox{% \begin{tabular}{l*{18}r} \toprule & \textbf{1972} & \textbf{1973} & \textbf{1974} & \textbf{1975} & \textbf{1976} @@ -3121,6 +3156,7 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15 \end{tabular}} +\marginpar{Tab.~\ref{tab:doublePage3}}% \hvFloat[doublePage,capPos=right,capVPos=top,floatCapSep=12pt]% {table}% {\usebox\hvOBox}%%%%%%%%%%%%%% @@ -3131,6 +3167,14 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15 The parameter is \texttt{doublePage}}% {tab:doublePage3} + +Here comes some snonsense Text to show the output for a \Lcs{hvFloat} which appears +exactly on top of a new even page. This should be detectted by the command so that the +tabular is placed directly on the following double page, starting with the even pagenumber. + + +\hvBlindtext + \hvBlindtext \hvBlindtext diff --git a/macros/latex/contrib/hvfloat/latex/hvfloat-0.inc b/macros/latex/contrib/hvfloat/latex/hvfloat-0.inc index a39a994c76..c461aa6fca 100644 --- a/macros/latex/contrib/hvfloat/latex/hvfloat-0.inc +++ b/macros/latex/contrib/hvfloat/latex/hvfloat-0.inc @@ -36,15 +36,38 @@ \afterpage{\do@hvFloat@doubleFullPage@ObjectAndCaption}% oddpage->newpage \fi % end \if@twocolumn \else% evenpage - \if@twocolumn - \if@firstcolumn - \afterpage{\afterpage{\afterpage{\do@hvFloat@doubleFullPage@ObjectAndCaption}}}% ->2nd Col left page and newpage + %--------- + %\typeout{>>>>Setze hv@atPageBeginfalse}% + \global\hv@atPageBeginfalse + \stepcounter{hvfloat@ref}% + \zsavepos{\thehvfloat@ref}% + \@tempy=\dimexpr-\zposy{\thehvfloat@ref} sp+\paperheight-1in-\topmargin-\headheight-\headsep\relax + \@tempx=\dimexpr-\zposx{\thehvfloat@ref} sp+\evensidemargin+1in\relax + %\typeout{>>>>\the\@tempx >>>>>\the\@tempy >>>>\f@size}% + \ifdim\@tempy > \dimexpr\f@size pt + 2pt + %\typeout{>>>>Case 0, Leere Box oder Text auf der Seite \thehvfloat@ref}% + \else + \ifdim\@tempx = \z@ + %\typeout{>>>>Case 2, Absolut oben links auf der Seite \thehvfloat@ref }% + \global\hv@atPageBegintrue \else - \afterpage{\afterpage{\do@hvFloat@doubleFullPage@ObjectAndCaption}}% ->newpage ( 2columns) + %\typeout{>>>>Case 1, Oben auf der Seite \thehvfloat@ref, aber nicht am Anfang der Zeile}% \fi - \else % onecol - \afterpage{\afterpage{\do@hvFloat@doubleFullPage@ObjectAndCaption}}% evenpage->newpage->newpage - \fi % end \if@twocolumn + \fi + %--------- + \ifhv@atPageBegin% At the top left of the even page -> output image + \do@hvFloat@doubleFullPage@ObjectAndCaption + \else + \if@twocolumn + \if@firstcolumn + \afterpage{\afterpage{\afterpage{\do@hvFloat@doubleFullPage@ObjectAndCaption}}}% ->2nd Col left page and newpage + \else + \afterpage{\afterpage{\do@hvFloat@doubleFullPage@ObjectAndCaption}}% ->newpage ( 2columns) + \fi + \else % onecol + \afterpage{\afterpage{\do@hvFloat@doubleFullPage@ObjectAndCaption}}% evenpage->newpage->newpage + \fi % end \if@twocolumn + \fi % end of \ifhv@atPageBegin \fi% main ifoddpage \endgroup% started at main macro \hvFloat } @@ -53,9 +76,11 @@ \begin{\hv@floatType*}[t] \hv@set@noverticalSpace \hfuzz=\maxdimen + \let\c@hv@tempCNTfigA\c@figure + \let\c@hv@tempCNTtabA\c@table \expandafter\hvFloatSet\expandafter{\hv@save@setting}% \hv@leftPageObjectWidth=\dimexpr\paperwidth-\hvSet@bindCorrection% - \savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep}%-\baselineskip-\parskip+1.5\lineskip}% no interlineskip \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}% \clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% @@ -91,11 +116,11 @@ \begin{\hv@floatType*}[t] \hv@set@noverticalSpace \hfuzz=\maxdimen -% \let\c@hv@tempCNTfigA\c@figure -% \let\c@hv@tempCNTtabA\c@table + \let\c@hv@tempCNTfigA\c@figure + \let\c@hv@tempCNTtabA\c@table \expandafter\hvFloatSet\expandafter{\hv@save@setting}% \hv@leftPageObjectWidth=\dimexpr\paperwidth-\hvSet@bindCorrection - \savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep}%-\baselineskip-\parskip+1.5\lineskip}% no interlineskip \hspace*{\the\dimexpr-1in-\oddsidemargin+\hvSet@bindCorrection}% \clipbox*{\the\hv@leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}% diff --git a/macros/latex/contrib/hvfloat/latex/hvfloat-1.inc b/macros/latex/contrib/hvfloat/latex/hvfloat-1.inc index e5e0ead4bb..258bfbfaf7 100644 --- a/macros/latex/contrib/hvfloat/latex/hvfloat-1.inc +++ b/macros/latex/contrib/hvfloat/latex/hvfloat-1.inc @@ -199,6 +199,8 @@ \def\do@hvFloat@doubleFULLPAGE@CaptionBefore{% \afterpage{% + \let\c@hv@tempCNTfigA\c@figure + \let\c@hv@tempCNTtabA\c@table \hfuzz=\maxdimen \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip-\parskip+1.5\lineskip}% no interlineskip @@ -229,11 +231,11 @@ }}% } -\newif\ifhv@temp - \def\do@hvFloat@doubleFULLPAGE@CaptionAfter{% \afterpage{% \hfuzz=\maxdimen + \let\c@hv@tempCNTfigA\c@figure + \let\c@hv@tempCNTtabA\c@table \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip-\parskip+1.5\lineskip}% no interlineskip \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}% @@ -279,6 +281,8 @@ \def\do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol{% \hvfloat@typeout{do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol: start} % \afterpage{% + \let\c@hv@tempCNTfigA\c@figure + \let\c@hv@tempCNTtabA\c@table \hvfloat@typeout{do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol: afterpage start} % \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip-\parskip+1.5\lineskip}% no interlineskip @@ -327,6 +331,8 @@ \def\do@hvFloat@doubleFULLPAGE@CaptionOther#1{% \afterpage{% + \let\c@hv@tempCNTfigA\c@figure + \let\c@hv@tempCNTtabA\c@table \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip-\parskip+1.5\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}% \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% diff --git a/macros/latex/contrib/hvfloat/latex/hvfloat-2.inc b/macros/latex/contrib/hvfloat/latex/hvfloat-2.inc index c930479fae..9c27dc88b4 100644 --- a/macros/latex/contrib/hvfloat/latex/hvfloat-2.inc +++ b/macros/latex/contrib/hvfloat/latex/hvfloat-2.inc @@ -28,19 +28,47 @@ \do@hvFloat@doublePAGECaptionRight{#1}% \fi \else - \do@hvFloat@doublePAGECaptionRight{#1}% + \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% \fi \else \hvfloat@typeout{do@hvFloat@doublePAGE: evenpage}% - \if@twocolumn - \if@firstcolumn - \afterpage{\afterpage{\afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}}}% + %--------- + \hv@atPageBeginfalse + \stepcounter{hvfloat@ref}% + \zsavepos{\thehvfloat@ref}% + \@tempy=\dimexpr-\zposy{\thehvfloat@ref} sp+\paperheight-1in-\topmargin-\headheight-\headsep\relax + \@tempx=\dimexpr-\zposx{\thehvfloat@ref} sp+\evensidemargin+1in\relax + %\typeout{>>>>\the\@tempx >>>>>\the\@tempy >>>>\f@size}% + \ifdim\@tempy > \z@ + %\typeout{>>>>Case 0, Leere Box oder Text auf der Seite \thehvfloat@ref}% + \ifdim\@tempx < \z@ + %\typeout{>>>>Case 0-1, Text oben auf der Seite \thehvfloat@ref}% \else - \afterpage{\afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}}% + %\typeout{>>>>Case 0-2, Absolut oben links auf der Seite \thehvfloat@ref}% + \hv@atPageBegintrue \fi \else - \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% onecolumn/left page + \ifdim\@tempx > \z@ + %\typeout{>>>>Case 1, Oben auf der Seite \thehvfloat@ref, aber nicht am Anfang der Zeile}% + \else + %\typeout{>>>>Case 2, Absolut oben links auf der Seite \thehvfloat@ref }% + \hv@atPageBegintrue + \fi \fi + %--------- + \ifhv@atPageBegin + \do@hvFloat@doublePAGECaptionRight{#1}% + \else + \if@twocolumn + \if@firstcolumn + \afterpage{\afterpage{\afterpage{afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}}}}% + \else + \afterpage{\afterpage{\afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}}}% + \fi + \else + \afterpage{\afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}}% onecolumn/left page + \fi + \fi %end \hv@atPageBegintrue \fi \endgroup% startet at main macro } @@ -48,7 +76,6 @@ \def\do@hvFloat@doublePAGECaptionRight#1{% image on left and right page with caption on the right ---------------------------------- % #1-> 0/1 caption under/right \hvfloat@typeout{do@hvFloat@doublePAGECaptionRight->start}% - \afterpage{% \hfuzz=\maxdimen \expandafter\hvFloatSet\expandafter{\hv@save@setting}% \ifx\hv@caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi @@ -109,6 +136,5 @@ \fi \endgroup \newpage\if@twocolumn\null\newpage\fi - }% } % diff --git a/macros/latex/contrib/hvfloat/latex/hvfloat-3.inc b/macros/latex/contrib/hvfloat/latex/hvfloat-3.inc new file mode 100644 index 0000000000..8b394e4fe9 --- /dev/null +++ b/macros/latex/contrib/hvfloat/latex/hvfloat-3.inc @@ -0,0 +1,264 @@ +%% Herbert Voss <hvoss@tug.org> +%% Copyright (C) 2023 +%% +%% This program can be redistributed and/or modified under the terms +%% of the LaTeX Project Public License Distributed from CTAN archives +%% in directory macros/latex/base/lppl.txt. +%% +%% +%% ------------------------------------- the doublepage obejcts --------------------------- +%% ||1in+evenside --- |1in+oddside ---|| +% +\def\do@hvFloat@doublePage#1{% image on left and right page with caption on the right page + % #1-> 0/1 caption under/right + \setcounter{topnumber}{1}% + \setcounter{dbltopnumber}{1}% + \hvfloat@typeout{----------------------------- do@hvFloat@doublePage#1 --------------------------}% + \hvfloat@typeout{>>>do@hvFloat@doublePage: begin with definitions of \hv@floatObject}% + \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% + \global\hv@switchTypefalse + \setcounter{hv@tempCNTfigA}{\value{figure}}% + \setcounter{hv@tempCNTfigB}{\value{figure}}% + \setcounter{hv@tempCNTtabA}{\value{table}}% + \setcounter{hv@tempCNTtabB}{\value{table}}% + \savebox\hvCaptionBox{% NO rotation + \minipage{\textwidth}%% minipage, to get hyphenation + \let\@captype\hv@floatType + \caption*{\hv@longCap}% + \endminipage}% + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \ifnum#1=0\relax % no rotation, caption below +% \hvfloat@typeout{Texthöhe: \the\textheight}% +% \hvfloat@typeout{Objekthöhe: \the\ht\hvObjectBox}% +% \hvfloat@typeout{Captionhöhe: \the\ht\hvCaptionBox}% + \@tempdima=\dimexpr\ht\hvObjectBox+\ht\hvCaptionBox+\abovecaptionskip+\belowcaptionskip +\textfloatsep\relax%+\floatsep\relax +% \hvfloat@typeout{Summe: \the\@tempdima}% + \ifdim\@tempdima > \dimexpr\textheight-\hv@minTextlines\relax +% \hvfloat@typeout{hvfloat: switched to floattype p}% + \hv@switchTypetrue + \fi + \fi + \hvfloat@typeout{do@hvFloat@doublePage:hv@tempWidthA=\the\hv@tempWidthA}% + \ifhv@forceOutput + \do@hvFloat@doublePAGECaptionRight{#1}% no cheque + \else + %\checkoddpage + \ifoddpage + \hvfloat@typeout{do@hvFloat@doublePage:oddpage}% + \if@twocolumn + \hvfloat@typeout{do@hvFloat@doublePage: oddpage/twocolumn}% + \if@firstcolumn + \hvfloat@typeout{do@hvFloat@doublePage:oddpage->twocolumn->firstcolumn}% + \ifhv@switchType + \hvfloat@typeout{hvfloat: switched to floattype p}% + \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% + \else + \hvfloat@typeout{calling do@hvFloat@doublePageCaptionRight}% + %\afterpage{ + \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}%}% + \fi + \else +% \hvfloat@typeout{do@hvFloat@doublePage:oddpage->twocolumn->secondcolumn}% + \ifhv@tugboat + \do@hvFloat@doublePageCaptionRight{#1}% + \else + \ifhv@switchType + \do@hvFloat@doublePAGECaptionRight{#1}% + \else + \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \fi + \fi + \fi + \else% onecolumn + \hvfloat@typeout{do@hvFloat@doublePage: oddpage/onecolumn}% + \ifhv@switchType + \hvfloat@typeout{do@hvFloat@doublePage: oddpage/onecolumn/switchType}% + \do@hvFloat@doublePAGECaptionRight{#1}% + \else + \hvfloat@typeout{do@hvFloat@doublePage: call do@hvFloat@doublePageCaptionRight #1}% + \ifhv@forceLeft + \do@hvFloat@doublePageCaptionRight{#1}% no \afterpage + \else + \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \fi + \fi + \fi + \else% we have an even page + \hvfloat@typeout{do@hvFloat@doublePage:evenpage -> (\thepage)}% + %\typeout{>>>>Setze hv@atPageBeginfalse}% + \global\hv@atPageBeginfalse + \stepcounter{hvfloat@ref}% + \zsavepos{\thehvfloat@ref}% + \@tempy=\dimexpr-\zposy{\thehvfloat@ref} sp+\paperheight-1in-\topmargin-\headheight-\headsep\relax + \@tempx=\dimexpr-\zposx{\thehvfloat@ref} sp+\evensidemargin+1in\relax + %\typeout{>>>>\the\@tempx >>>>>\the\@tempy >>>>\f@size}% + \ifdim\@tempy > \dimexpr\f@size pt + 2pt % Interlinespace + %\typeout{>>>>Case 0, Leere Box oder Text auf der Seite \thehvfloat@ref}% + \else + \ifdim\@tempx = \z@ + %\typeout{>>>>Case 2, Absolut oben links auf der Seite \thehvfloat@ref }% + \global\hv@atPageBegintrue + \else + %\typeout{>>>>Case 1, Oben auf der Seite \thehvfloat@ref, aber nicht am Anfang der Zeile}% + \fi + \fi + %--------- + \ifhv@atPageBegin% At the top left of the even page -> output image + \do@hvFloat@doublePageCaptionRight{#1} + \else + \if@twocolumn + \if@firstcolumn + \ifhv@switchType + \afterpage{\afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}}% + \else + \afterpage{\afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}}% + \fi + \else% second column + \ifhv@switchType + \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% + \else + %\afterpage{ + \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}%}% + \fi + \fi + \else% onecolumn + \hvfloat@typeout{do@hvFloat@doublePage:evenpage/onecolumn -> (\thepage)}% + \ifhv@switchType + \hvfloat@typeout{do@hvFloat@doublePage:evenpage/onecolumn/switchType -> (\thepage)}% + \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% + \else + \hvfloat@typeout{do@hvFloat@doublePage:evenpage/onecolumn/noSwitchType -> (\thepage)}% + \ifhv@forceLeft + \hvfloat@typeout{do@hvFloat@doublePage:evenpage/onecolumn/noSwitchType/forceLeft -> (\thepage)}% + \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \else + \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}% + \fi + \fi + \fi + \fi + \fi + \let\@fptop\hv@fptop + \fi + \endgroup% started at main macro \hvFloat + \hvfloat@typeout{----------------------------- do@hvFloat@doublePage#1 ... Ende ----------------------}% +} +% +\def\do@hvFloat@doublePageCaptionRight#1{% image on left and right page with caption on the right page ---------------------------------- + \setcounter{topnumber}{1}% + \setcounter{dbltopnumber}{1}% + \hvfloat@typeout{do@hvFloat@doublePageCaptionRight->start}% + \do@hvFloat@doublePageCaptionRightObjectLeft{0pt}% + \do@hvFloat@doublePageCaptionRightObjectRight{#1}% +} +% +\def\do@hvFloat@doublePageCaptionRightObjectLeft#1{% left part of the object + \begin{\hv@floatType*}[t] + \hvfloat@typeout{>>>doublePage: begin with left side of the object \hv@floatObject}% + \hv@set@noverticalSpace + \hfuzz=\maxdimen + \let\c@hv@tempCNTfigA\c@figure + \let\c@hv@tempCNTtabA\c@table + \expandafter\hvFloatSet\expandafter{\hv@save@setting}% + \hvfloat@typeout{Float position parameter is for left page: !t}% + \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% + \ifx\hv@label\@empty + \else + \ifx\hv@floatType\hv@figure + \global\refstepcounter{hv@tempCNTfigA}% + \else + \global\refstepcounter{hv@tempCNTtabA}% before caption + \fi + \label{\hv@label}% + \fi + \ifhv@global@sameHeight + \hvfloat@typeout{text should be of same height of both pages}% + \par\noindent\phantom{\parbox{\textwidth}{\caption*{\hv@longCap}}}% +% \vspace{-2pt}% + \fi + \hv@reset@noverticalSpace + \hvfloat@typeout{>>>doublePage: end with left side of the object \hv@floatObject}% + \end{\hv@floatType*}% +} + +\def\do@hvFloat@doublePageCaptionRightObjectRight#1{% right part of the object + \begin{\hv@floatType*}[t] + \hvfloat@typeout{>>>doublePage: begin with right side of the object \hv@floatObject}% + \hv@set@noverticalSpace + \hfuzz=\maxdimen + \let\c@hv@tempCNTfigA\c@figure + \let\c@hv@tempCNTtabA\c@table + \expandafter\hvFloatSet\expandafter{\hv@save@setting}% + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \hv@tempWidthA=\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection\relax% FÜR DTK + \hspace*{-\hv@tempWidthA}% + \hv@leftPageObjectWidth=\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection\relax% FÜR FTK + \savebox\hv@rightBox{\clipbox*{\hv@leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}}% + \hv@tempWidthB=\dimexpr\textwidth-\wd\hv@rightBox-\hvSet@bindCorrection+1in+\oddsidemargin-\hv@floatCapSep\relax + \hvfloat@typeout{Height of right box: \the\ht\hv@rightBox}% + \hvfloat@typeout{Depth of right box : \the\dp\hv@rightBox}% + \ifdim\dp\hv@rightBox > \z@ + \raisebox{\depth}{\usebox\hv@rightBox}% + \else + \usebox\hv@rightBox + \fi + \c@hv@tempCNTfigB=\numexpr\c@figure-1\relax + \c@hv@tempCNTtabB=\numexpr\c@table-1\relax + \ifx\hv@label\@empty\else + \ifx\hv@floatType\hv@figure + \refstepcounter{hv@tempCNTfigB}% + \else + \refstepcounter{hv@tempCNTtabB}% before caption + \fi + \label{\hv@label-2}% + \fi + \ifx\hv@caption@format@temp\@empty\else + \expandafter\captionsetup\expandafter{\hv@caption@format@temp}% + \fi + \c@figure=\numexpr\c@hv@tempCNTfigB-1\relax + \c@table=\numexpr\c@hv@tempCNTtabB-1\relax + \ifnum#1>\z@ % caption on the right + \hvfloat@typeout{doublePage: capAngle=\hvSet@capAngle}% + \ifnum\hvSet@capAngle > \z@ + \hspace{\hv@floatCapSep}% + \rlap{\rotatebox{\hvSet@capAngle}{\parbox[b]{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{% + \abovecaptionskip=0pt% local inside parbox + \belowcaptionskip=0pt% local inside parbox + \ifx\relax\hv@shortCap\relax + \caption{\hv@longCap}% + \else + \caption[\hv@shortCap]{\hv@longCap}% + \fi + }}}% + \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi + \else + \hv@tempWidthB=\dimexpr\textwidth-\wd\hv@rightBox-\hvSet@bindCorrection+1in+\oddsidemargin-\hv@floatCapSep\relax + \hspace{\hv@floatCapSep}% + \rlap{\parbox[b][\dimexpr\ht\hv@rightBox+\dp\hv@rightBox][\hv@@capVPos]{\hv@tempWidthB}{% + \abovecaptionskip=0pt % local inside parbox + \belowcaptionskip=0pt % local inside parbox + \ifx\hv@shortCap\@empty + \caption{\hv@longCap}% + \else + \caption[\hv@shortCap]{\hv@longCap}% + \fi + }}% + \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi + \fi + \else % #1 = 0 caption below + \ifx\relax\hv@shortCap\relax + \caption{\hv@longCap}% + \else + \caption[\hv@shortCap]{\hv@longCap}% + \fi + \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi + \fi + \vspace{0pt}% + \hv@reset@noverticalSpace + \hvfloat@typeout{>>>doublePage: end with right side of the object \hv@floatObject}% + \end{\hv@floatType*} +} diff --git a/macros/latex/contrib/hvfloat/latex/hvfloat.sty b/macros/latex/contrib/hvfloat/latex/hvfloat.sty index 41c8042a4c..a5a5e51c65 100644 --- a/macros/latex/contrib/hvfloat/latex/hvfloat.sty +++ b/macros/latex/contrib/hvfloat/latex/hvfloat.sty @@ -1,4 +1,4 @@ -%% $Id: hvfloat.sty 774 2023-10-16 13:44:29Z herbert $ +%% $Id: hvfloat.sty 876 2024-03-03 14:04:56Z herbert $ %% %% %% IMPORTANT NOTICE: @@ -6,7 +6,7 @@ %% This is file `hvfloat.sty', %% %% Herbert Voss <hvoss@tug.org> -%% Copyright (C) 2003-23 +%% Copyright (C) 2003-24 %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -16,8 +16,8 @@ %% `hvfloat' offers rotating of captions and objects for floats %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{2.47} -\def\filedate{2023/10/16} +\def\fileversion{2.48} +\def\filedate{2024/03/03} \ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)] \let\hvFloatFileVersion\fileversion % @@ -49,11 +49,21 @@ \RequirePackage{expl3,multido} \RequirePackage{graphicx} \RequirePackage{varwidth} +\RequirePackage{fbox} \RequirePackage{xkeyval} \RequirePackage{ifoddpage} \RequirePackage{afterpage} +\RequirePackage{zref-savepos} +\newdimen\@tempx +\newdimen\@tempy +\newcounter{hvfloat@ref} +\renewcommand\thehvfloat@ref{tmp@\arabic{hvfloat@ref}} +\setcounter{hvfloat@ref}{0} +\newif\ifhv@atPageBegin + + \ifhv@hyperref \RequirePackage{hyperref} \fi @@ -265,6 +275,9 @@ \define@key{hvSet}{sepLineskip}{\def\hv@sepLineskip{#1}}% \define@key{hvSet}{minTextlines}{\setlength\hv@minTextlines{#1\baselineskip}}% \define@boolkey{hvSet}[hv@]{objectFrame}[true]{}% a frame around the object with no separation +\define@key{hvSet}{fboxLines}[ltrb]{\def\hv@fboxLines{#1}}% +\define@key{hvSet}{fboxSep}[0pt]{\def\hv@fboxSep{#1}}% + \define@key{hvSet}{style}{% \@ifundefined{hv@#1}% {\errmessage{Custom style `#1' undefined}}% @@ -290,7 +303,8 @@ onlyText=false, wide=false, fullpage=false, FULLPAGE=false, doubleFULLPAGE=false, doublePage=false, doublePAGE=false, multiFloat=false,subFloat=false,inMargin=false, - separatorLine,objectFrame=false,multiFloatSkip=\normalbaselineskip, + separatorLine,objectFrame=false, fboxLines={ltrb}, fboxSep=0pt, + multiFloatSkip=\normalbaselineskip, capFormat={}, subcapFormat={}, twoColumnCaption=false, sameHeight=false, bindCorr=\z@,sepLineskip=0pt, @@ -459,20 +473,20 @@ \ifhv@fbox \fbox{\parbox{\wd\hvObjectBox}{\usebox{\hvObjectBox}}}% \else - \parbox{\wd\hvObjectBox}{\ifhv@objectFrame\frame{\usebox{\hvObjectBox}}\else\usebox{\hvObjectBox}\fi}% + \parbox{\wd\hvObjectBox}{\ifhv@objectFrame\fbox[boxsep=\hv@fboxSep,,\hv@fboxLines]{\usebox{\hvObjectBox}}\else\usebox{\hvObjectBox}\fi}% \fi \or \ifhv@fbox \fbox{\raisebox{-\height}{\usebox{\hvObjectBox}}}% \else - \raisebox{-\height}{\ifhv@objectFrame\frame{\usebox{\hvObjectBox}}\else\usebox{\hvObjectBox}\fi}% + \raisebox{-\height}{\ifhv@objectFrame\fbox[boxsep=\hv@fboxSep,,\hv@fboxLines]{\usebox{\hvObjectBox}}\else\usebox{\hvObjectBox}\fi}% \fi \or \ifhv@fbox \fbox{\usebox{\hvObjectBox}}% \else % rotated object with a depth need to raise up the \depth - \ifhv@objectFrame\frame{\usebox{\hvObjectBox}}\else\raisebox{\depth}{\usebox{\hvObjectBox}}\fi% + \ifhv@objectFrame\fbox[boxsep=\hv@fboxSep,,\hv@fboxLines]{\usebox{\hvObjectBox}}\else\raisebox{\depth}{\usebox{\hvObjectBox}}\fi% \fi \fi } @@ -523,6 +537,8 @@ \def\hvFloat@i*{\@ifnextchar[{\do@hvFloat}{\do@hvFloat[]}} \def\do@hvFloat[#1]{% + %\marginnote{\textbf{hvFloat}}% + \savebox\hvObjectBox{}% \begingroup \hvWideWidth=\the\dimexpr\columnwidth+\marginparwidth+\marginparsep\relax% % \setlength\hvWideWidth{\dimexpr\textwidth+\marginparwidth+\marginparsep}% @@ -603,7 +619,7 @@ \ifx\relax#2\relax \setkeys{hvSet}{nonFloat,onlyText}% \xdef\hv@save@setting{\hv@save@setting,nonFloat,onlyText}% for later use after \endgroup inside figure/table env - \else + \else \xdef\hv@save@setting{\hv@save@setting}% for later use after \endgroup inside figure/table env \fi % \xdef\hv@floatListOfExt{\@nameuse{ext@\hv@floatType}}% @@ -677,15 +693,16 @@ \ifhv@useOBox \let\hvObjectBox\hvOBox \else - \savebox\hvObjectBox{\hv@floatObject}% + \global\savebox\hvObjectBox{\hv@floatObject}% \fi \else - \savebox\hvObjectBox{% + \global\savebox\hvObjectBox{% \rotatebox{\hvSet@objectAngle}{% \ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi }% }% \fi + \ifhv@useOBox\global\savebox\hvOBox{}\fi \setlength\hvObjectWidth{\wd\hvObjectBox}% % % Now we save the caption with its defined \hvCapWidth @@ -736,7 +753,7 @@ \fi \fi \fi - \saveCaptionSkip% we put this space ourselve + \saveCaptionSkip % we put this space ourselve \ifnum\hvSet@capAngle=0 % need rotation? \savebox\hvCaptionBox{% NO rotation \minipage[b]{\hvCapWidth}%% minipage, to get hyphenation @@ -759,7 +776,7 @@ \fi \fi \fi - \else + \else \ifhv@onlyText \hv@longCap \else @@ -770,7 +787,7 @@ \fi \fi \fi - \endminipage + \endminipage }% end CaptionBox without rotation \else \savebox\hvCaptionBox{% with Rotation @@ -812,7 +829,7 @@ \ifx\hvSet@floatPos\@empty % use type default \else \@namedef{fps@\hv@floatType}{\hvSet@floatPos}% - \fi + \fi \ifhv@nonFloat \noindent \begingroup% Start the nonfloat part @@ -827,7 +844,7 @@ \begin{\hv@floatType}% Start the floating environment \fi \fi - %%\checkoddpage + \checkoddpage \ifx\hvSet@objectPos\hv@Right\raggedleft\fi \ifx\hvSet@objectPos\hv@Center \ifhv@nonFloat\hspace*{\fill}\else\centering\fi @@ -957,7 +974,7 @@ \fbox{\usebox{\hvObjectBox}}\\[0.5\hvAboveCaptionSkip]% \fbox{\usebox{\hvCaptionBox}}% \else - \ifhv@objectFrame\frame{\usebox{\hvObjectBox}}\else\usebox{\hvObjectBox}\fi\\[0.5\hvAboveCaptionSkip]% + \ifhv@objectFrame\fbox[boxsep=\hv@fboxSep,,\hv@fboxLines]{\usebox{\hvObjectBox}}\else\usebox{\hvObjectBox}\fi\\[0.5\hvAboveCaptionSkip]% \usebox{\hvCaptionBox}% \fi \end{minipage}% @@ -1020,11 +1037,12 @@ % First we save the object in \hvObjectBox % \ifnum\hvSet@objectAngle=0 % rotate the object? - \ifhv@useOBox\let\hvObjectBox\hvOBox\else\savebox\hvObjectBox{\hv@floatObject}\fi + \ifhv@useOBox\global\let\hvObjectBox\hvOBox\else\global\savebox\hvObjectBox{\hv@floatObject}\fi \else - \savebox\hvObjectBox{\rotatebox{\hvSet@objectAngle}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}}% + \global\savebox\hvObjectBox{\rotatebox{\hvSet@objectAngle}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}}% \fi \setlength\hvObjectWidth{\wd\hvObjectBox}% + \ifhv@useOBox\global\savebox\hvOBox{}\fi % % Now we save the caption with its defined \hvCapWidth % @@ -1200,7 +1218,7 @@ \fbox{\usebox{\hvObjectBox}}\\[0.5\hvAboveCaptionSkip]% \fbox{\usebox{\hvCaptionBox}}% \else - \ifhv@objectFrame\frame{\usebox{\hvObjectBox}}\else\usebox{\hvObjectBox}\fi\\[0.5\hvAboveCaptionSkip]% + \ifhv@objectFrame\fbox[boxsep=\hv@fboxSep,,\hv@fboxLines]{\usebox{\hvObjectBox}}\else\usebox{\hvObjectBox}\fi\\[0.5\hvAboveCaptionSkip]% \usebox{\hvCaptionBox}% \fi \end{minipage}% @@ -1425,244 +1443,17 @@ } % - -%% ------------------------------------- the doublepage obejcts --------------------------- -%% ||1in+evenside --- |1in+oddside ---|| -% -\def\do@hvFloat@doublePage#1{% image on left and right page with caption on the right page - % #1-> 0/1 caption under/right - \hvfloat@typeout{----------------------------- do@hvFloat@doublePage#1 --------------------------}% - \hvfloat@typeout{>>>do@hvFloat@doublePage: begin with definitions of \hv@floatObject}% - \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% - \global\hv@switchTypefalse - \setcounter{hv@tempCNTfigA}{\value{figure}}% - \setcounter{hv@tempCNTfigB}{\value{figure}}% - \setcounter{hv@tempCNTtabA}{\value{table}}% - \setcounter{hv@tempCNTtabB}{\value{table}}% - \savebox\hvCaptionBox{% NO rotation - \minipage{\textwidth}%% minipage, to get hyphenation - \let\@captype\hv@floatType - \caption*{\hv@longCap}% - \endminipage}% - \savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \ifnum#1=0\relax % no rotation, caption below -% \hvfloat@typeout{Texthöhe: \the\textheight}% -% \hvfloat@typeout{Objekthöhe: \the\ht\hvObjectBox}% -% \hvfloat@typeout{Captionhöhe: \the\ht\hvCaptionBox}% - \@tempdima=\dimexpr\ht\hvObjectBox+\ht\hvCaptionBox+\abovecaptionskip+\belowcaptionskip +\textfloatsep\relax%+\floatsep\relax -% \hvfloat@typeout{Summe: \the\@tempdima}% - \ifdim\@tempdima > \dimexpr\textheight-\hv@minTextlines\relax -% \hvfloat@typeout{hvfloat: switched to floattype p}% - \hv@switchTypetrue - \fi - \fi - \hvfloat@typeout{do@hvFloat@doublePage:hv@tempWidthA=\the\hv@tempWidthA}% - \ifhv@forceOutput - \do@hvFloat@doublePAGECaptionRight{#1}% no cheque - \else - %\checkoddpage - \ifoddpage - \hvfloat@typeout{do@hvFloat@doublePage:oddpage}% - \if@twocolumn - \hvfloat@typeout{do@hvFloat@doublePage: oddpage/twocolumn}% - \if@firstcolumn - \hvfloat@typeout{do@hvFloat@doublePage:oddpage->twocolumn->firstcolumn}% - \ifhv@switchType - \hvfloat@typeout{hvfloat: switched to floattype p}% - \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% - \else - \hvfloat@typeout{calling do@hvFloat@doublePageCaptionRight}% - %\afterpage{ - \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}%}% - \fi - \else -% \hvfloat@typeout{do@hvFloat@doublePage:oddpage->twocolumn->secondcolumn}% - \ifhv@tugboat - \do@hvFloat@doublePageCaptionRight{#1}% - \else - \ifhv@switchType - \do@hvFloat@doublePAGECaptionRight{#1}% - \else - \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% - \fi - \fi - \fi - \else% onecolumn - \hvfloat@typeout{do@hvFloat@doublePage: oddpage/onecolumn}% - \ifhv@switchType - \hvfloat@typeout{do@hvFloat@doublePage: oddpage/onecolumn/switchType}% - \do@hvFloat@doublePAGECaptionRight{#1}% - \else - \hvfloat@typeout{do@hvFloat@doublePage: call do@hvFloat@doublePageCaptionRight #1}% - \ifhv@forceLeft - \do@hvFloat@doublePageCaptionRight{#1}% no \afterpage - \else - \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% - \fi - \fi - \fi - \else% we have an even page - \hvfloat@typeout{do@hvFloat@doublePage:evenpage -> (\thepage)}% - \if@twocolumn - \if@firstcolumn - \ifhv@switchType - \afterpage{\afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}}% - \else - \afterpage{\afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}}% - \fi - \else% second column - \ifhv@switchType - \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% - \else - %\afterpage{ - \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}%}% - \fi - \fi - \else% onecolumn - \hvfloat@typeout{do@hvFloat@doublePage:evenpage/onecolumn -> (\thepage)}% - \ifhv@switchType - \hvfloat@typeout{do@hvFloat@doublePage:evenpage/onecolumn/switchType -> (\thepage)}% - \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% - \else - \hvfloat@typeout{do@hvFloat@doublePage:evenpage/onecolumn/noSwitchType -> (\thepage)}% - \ifhv@forceLeft - \hvfloat@typeout{do@hvFloat@doublePage:evenpage/onecolumn/noSwitchType/forceLeft -> (\thepage)}% - \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% - \else - \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}% - \fi - \fi - \fi - \fi - \let\@fptop\hv@fptop - \fi - \endgroup% started at main macro \hvFloat - \hvfloat@typeout{----------------------------- do@hvFloat@doublePage#1 ... Ende ----------------------}% -} -% -\def\do@hvFloat@doublePageCaptionRight#1{% image on left and right page with caption on the right page ---------------------------------- - \hvfloat@typeout{do@hvFloat@doublePageCaptionRight->start}% - \do@hvFloat@doublePageCaptionRightObjectLeft{0pt}% - \afterpage{\do@hvFloat@doublePageCaptionRightObjectRight{#1}}% -} -% -\def\do@hvFloat@doublePageCaptionRightObjectLeft#1{% left part of the object - \begin{\hv@floatType*}[!t] - \hvfloat@typeout{>>>doublePage: begin with left side of the object \hv@floatObject}% - \hv@set@noverticalSpace - \hfuzz=\maxdimen - \let\c@hv@tempCNTfigA\c@figure - \let\c@hv@tempCNTtabA\c@table - \expandafter\hvFloatSet\expandafter{\hv@save@setting}% - \hvfloat@typeout{Float position parameter is for left page: !t}% - \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% - \ifx\hv@label\@empty - \else - \ifx\hv@floatType\hv@figure - \global\refstepcounter{hv@tempCNTfigA}% - \else - \global\refstepcounter{hv@tempCNTtabA}% before caption - \fi - \label{\hv@label}% - \fi - \ifhv@global@sameHeight - \hvfloat@typeout{text should be of same height of both pages}% - \par\noindent\phantom{\parbox{\textwidth}{\caption*{\hv@longCap}}}% -% \vspace{-2pt}% - \fi - \hv@reset@noverticalSpace - \hvfloat@typeout{>>>doublePage: end with left side of the object \hv@floatObject}% - \end{\hv@floatType*}% -} - -\def\do@hvFloat@doublePageCaptionRightObjectRight#1{% right part of the object - \begin{\hv@floatType*}[!t] - \hvfloat@typeout{>>>doublePage: begin with right side of the object \hv@floatObject}% - \hv@set@noverticalSpace - \hfuzz=\maxdimen - \expandafter\hvFloatSet\expandafter{\hv@save@setting}% - \savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \hv@tempWidthA=\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection\relax% FÜR DTK - \hspace*{-\hv@tempWidthA}% - \hv@leftPageObjectWidth=\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection\relax% FÜR FTK - \savebox\hv@rightBox{\clipbox*{\hv@leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}}% - \hv@tempWidthB=\dimexpr\textwidth-\wd\hv@rightBox-\hvSet@bindCorrection+1in+\oddsidemargin-\hv@floatCapSep\relax - \hvfloat@typeout{Height of right box: \the\ht\hv@rightBox}% - \hvfloat@typeout{Depth of right box : \the\dp\hv@rightBox}% - \ifdim\dp\hv@rightBox > \z@ - \raisebox{\depth}{\usebox\hv@rightBox}% - \else - \usebox\hv@rightBox - \fi - \c@hv@tempCNTfigB=\numexpr\c@figure-1\relax - \c@hv@tempCNTtabB=\numexpr\c@table-1\relax - \ifx\hv@label\@empty\else - \ifx\hv@floatType\hv@figure - \refstepcounter{hv@tempCNTfigB}% - \else - \refstepcounter{hv@tempCNTtabB}% before caption - \fi - \label{\hv@label-2}% - \fi - \ifx\hv@caption@format@temp\@empty\else - \expandafter\captionsetup\expandafter{\hv@caption@format@temp}% - \fi - \c@figure=\numexpr\c@hv@tempCNTfigB-1\relax - \c@table=\numexpr\c@hv@tempCNTtabB-1\relax - \ifnum#1>\z@ % caption on the right - \hvfloat@typeout{doublePage: capAngle=\hvSet@capAngle}% - \ifnum\hvSet@capAngle > \z@ - \hspace{\hv@floatCapSep}% - \rlap{\rotatebox{\hvSet@capAngle}{\parbox[b]{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{% - \abovecaptionskip=0pt% local inside parbox - \belowcaptionskip=0pt% local inside parbox - \ifx\relax\hv@shortCap\relax - \caption{\hv@longCap}% - \else - \caption[\hv@shortCap]{\hv@longCap}% - \fi - }}}% - \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi - \else - \hv@tempWidthB=\dimexpr\textwidth-\wd\hv@rightBox-\hvSet@bindCorrection+1in+\oddsidemargin-\hv@floatCapSep\relax - \hspace{\hv@floatCapSep}% - \rlap{\parbox[b][\dimexpr\ht\hv@rightBox+\dp\hv@rightBox][\hv@@capVPos]{\hv@tempWidthB}{% - \abovecaptionskip=0pt % local inside parbox - \belowcaptionskip=0pt % local inside parbox - \ifx\hv@shortCap\@empty - \caption{\hv@longCap}% - \else - \caption[\hv@shortCap]{\hv@longCap}% - \fi - }}% - \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi - \fi - \else % #1 = 0 caption below - \ifx\relax\hv@shortCap\relax - \caption{\hv@longCap}% - \else - \caption[\hv@shortCap]{\hv@longCap}% - \fi - \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi - \fi - \vspace{0pt}% - \hv@reset@noverticalSpace - \hvfloat@typeout{>>>doublePage: end with right side of the object \hv@floatObject}% - \end{\hv@floatType*} -} -% \newsavebox\hv@boxLeftPage \newsavebox\hv@boxRightPage +\newif\ifhv@temp + +\input{hvfloat-3.inc}% doublePage -\input{hvfloat-2.inc} +\input{hvfloat-2.inc}% doublePAGE -\input{hvfloat-1.inc} +\input{hvfloat-1.inc}% doubleFULLPAGE -\input{hvfloat-0.inc} +\input{hvfloat-0.inc}% doubleFullPage \ExplSyntaxOn @@ -1695,7 +1486,7 @@ } \def\getMultiObjectAndLabel{% - \global\sbox\hvObjectBox{% + \global\savebox\hvObjectBox{% \ifhv@vFill \minipage[b][\textheight][s]{\columnwidth}% \else @@ -1711,7 +1502,7 @@ \hv@cnta=1 \loop \def\@temp{\clist_item:Nn\l_clist_Object{\hv@cnta}}% - \ifhv@objectFrame\frame{\@temp}\else\@temp\fi + \ifhv@objectFrame\fbox[boxsep=\hv@fboxSep,,\hv@fboxLines]{\@temp}\else\@temp\fi \edef\@tempa{\clist_item:Nn\l_clist_Label{\hv@cnta}}% \edef\@tempb{\clist_item:Nn\l_clist_Type{\hv@cnta}}% \edef\@captype{hv@p\@tempb}% @@ -1746,7 +1537,7 @@ } \def\getMultiSubObjectAndLabel{% - \global\sbox\hvObjectBox{% + \global\savebox\hvObjectBox{% \expandafter\hvFloatSet\expandafter{\hv@save@setting}% \ifhv@vFill \minipage[b][\textheight][s]{\columnwidth}% @@ -1774,7 +1565,7 @@ \fi \loop \def\@temp{\clist_item:Nn\l_clist_Object{\hv@cnta}}% - \ifhv@objectFrame\frame{\@temp}\else\@temp\fi + \ifhv@objectFrame\fbox[boxsep=\hv@fboxSep,,\hv@fboxLines]{\@temp}\else\@temp\fi \begingroup \edef\@tempa{\clist_item:Nn\l_clist_LofCaption{\hv@cnta}}% \ifx\@tempa\@empty @@ -1850,9 +1641,9 @@ \ifhv@subFloat \getMultiSubObjectAndLabel \else - \global\sbox\hvObjectBox{% + \global\savebox\hvObjectBox{% \refstepcounter{\@captype}% - \ifhv@objectFrame\frame{\hv@floatObject}\else\hv@floatObject\fi + \ifhv@objectFrame\fbox[boxsep=\hv@fboxSep,,\hv@fboxLines]{\hv@floatObject}\else\hv@floatObject\fi \expandafter\ifx\expandafter\relax\hv@label\relax \else \expandafter\label\expandafter{\hv@label}% diff --git a/macros/latex/contrib/lastbib/README b/macros/latex/contrib/lastbib/README index 3a9f4d32f6..390cf1e55f 100644 --- a/macros/latex/contrib/lastbib/README +++ b/macros/latex/contrib/lastbib/README @@ -3,6 +3,8 @@ It allows for things like |... \LastBib\ references in the work| to get `... 25 It was inspired by early version of package lastpage.sty pastorm/ru-board fixed a bug with BiBTeX and href +The LaTeX Project Public License + Enjoy! Berik I. Tuleuov, Karaganda, Kazakhstan. E-mail: berik_t at yahoo.com diff --git a/macros/latex/contrib/lastbib/lastbib.sty b/macros/latex/contrib/lastbib/lastbib.sty index 8b36427af9..75ad3cf58a 100644 --- a/macros/latex/contrib/lastbib/lastbib.sty +++ b/macros/latex/contrib/lastbib/lastbib.sty @@ -1,20 +1,18 @@ %% %% This is file `lastbib.sty', created by Berik I. Tuleuov, %% Karaganda, Kazakhstan, on 27/10/1999. -%% modified 01/11/1999. -%% modified by pastorm/ru-board to fix some bugs 29/01/2010. +%% Modified 01/11/1999. +%% Modified by pastorm/ru-board to fix some bugs 29/01/2010. +%% Modified 02/03/2024 to change License agreement to The LaTeX Project Public License %% -%% And the usual copying conditions apply: If you change it, you take the blame; -%% if you pass it on, pass on all present condiditions; you -%% are not allowed to sell it. %% %% Allow for things like |... \LastBib\ references in the work| to %% get `... 25 references in the work' \def\filename{lastbib} -\def\fileversion{v2.0} -\def\filedate{2012/07/17} -\def\docdate {2012/07/17} +\def\fileversion{v2.1} +\def\filedate{2024/03/02} +\def\docdate {2024/03/02} \NeedsTeXFormat{LaTeX2e}[1994/06/01] \ProvidesPackage{lastbib}[\filedate\space\fileversion\space diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl index 158723a0d4..6cfb8ee6de 100644 --- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl @@ -128,6 +128,7 @@ $mirrors = { 'https://ctan.mirror.garr.it/mirrors/ctan/' => 1, }, 'Netherlands' => { + 'https://ftp.snt.utwente.nl/pub/software/tex/' => 1, 'https://mirror.koddos.net/CTAN/' => 1, 'https://mirror.lyrahosting.com/CTAN/' => 1, }, @@ -148,6 +149,7 @@ $mirrors = { 'https://mirrors.nxthost.com/ctan/' => 1, }, 'Russia' => { + 'https://ctan.altspu.ru/' => 1, 'https://mirror.macomnet.net/pub/CTAN/' => 1, 'https://mirror.truenetwork.ru/CTAN/' => 1, }, diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb index deb9233f6c..a9c3d9c9ea 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/2023 -depend revision/70344 +depend revision/70365 name 00texlive.image category TLCore -revision 70237 +revision 70357 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 @@ -1032,6 +1032,7 @@ runfiles size=14451 tlpkg/tlpsrc/chemcono.tlpsrc tlpkg/tlpsrc/chemexec.tlpsrc tlpkg/tlpsrc/chemfig.tlpsrc + tlpkg/tlpsrc/chemformula-ru.tlpsrc tlpkg/tlpsrc/chemformula.tlpsrc tlpkg/tlpsrc/chemgreek.tlpsrc tlpkg/tlpsrc/chemmacros.tlpsrc @@ -4859,7 +4860,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd name 00texlive.installer category TLCore -revision 70275 +revision 70346 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 @@ -56613,6 +56614,32 @@ catalogue-license lppl1.3c catalogue-topics chemistry expl3 catalogue-version 4.17 +name chemformula-ru +category Package +revision 70357 +shortdesc Using the chemformula package with babel-russian settings +relocated 1 +longdesc The chemformula package and babel-russian settings +longdesc (russian.ldf) both define macros named "\ch". The package +longdesc chemformula-ru undefines babel's macro to prevent an error when +longdesc both packages are loaded together. Optionally it redefines the +longdesc \cosh macro to print the hyperbolic cosine in Russian notation +longdesc and/or defines a new macro \Ch for that purpose. +containersize 1168 +containerchecksum ee12aadfaee03282e1cf9fcde69bf141abf0bcc5ed5a35ea78a54111494c5cb65f97a3bcdf8838a536128b05de1039a9caae7ef5078188811a54d12ec4f41855 +doccontainersize 156928 +doccontainerchecksum 290b509e2eacd081d690f857ed2a2ba3f860ec25788150af8da5f3eedc5291bbfeea84e117d04959b1a30775ebe72e88f2c0a4a4dc89517ac81b239e3c001d39 +docfiles size=44 + RELOC/doc/latex/chemformula-ru/README.md details="Readme (English)" + RELOC/doc/latex/chemformula-ru/README.ru details="Readme (Russian)" language="ru" + RELOC/doc/latex/chemformula-ru/chemformula-ru.pdf details="Package documentation" + RELOC/doc/latex/chemformula-ru/chemformula-ru.tex +runfiles size=1 + RELOC/tex/latex/chemformula-ru/chemformula-ru.sty +catalogue-ctan /macros/latex/contrib/chemformula-ru +catalogue-license lppl1.3c +catalogue-topics chemistry russian + name chemgreek category Package revision 53437 @@ -73602,7 +73629,7 @@ containerchecksum d03b9242340be7be8c32e87c2773bb8aecd4a6b7e1594fe755d9955f111dad name collection-mathscience category Collection -revision 69485 +revision 70357 shortdesc Mathematics, natural sciences, computer science packages relocated 1 depend 12many @@ -73646,6 +73673,7 @@ depend chemcompounds depend chemcono depend chemexec depend chemformula +depend chemformula-ru depend chemgreek depend chemmacros depend chemnum @@ -73866,8 +73894,8 @@ depend youngtab depend yquant depend ytableau depend zx-calculus -containersize 1716 -containerchecksum 6b8b38a89760ad3207054a401163ed661c16156a5a65f9e8f58aa7de51302a7e135b8484c976dbcc6f4845a7360bf4cfe07b405bb3710ef292c5fdfb95b1ccad +containersize 1728 +containerchecksum 1fbc1238b2017d8c2a75c86a654308e02c004309d1c64b994b9f1dcc7dfb9bc62736c999773277288f0a6b391bd447252274f49d2168b70302b4ac2ca8a3c00c name collection-metapost category Collection @@ -99175,7 +99203,7 @@ catalogue-version 0.2 name draftwatermark category Package -revision 57099 +revision 70356 shortdesc Put a grey textual watermark on document pages relocated 1 longdesc The package provides a means to add a watermark (typically a @@ -99190,11 +99218,11 @@ longdesc provides a legacy version of itself (that is automatically longdesc loaded, currently being at release 2.3) which relies on the longdesc everypage package. Note that this legacy version will longdesc progressively lag behind in terms of features. -containersize 2816 -containerchecksum c12311ce3723e6b93e8d21df2a50a3c1ab2326aa5cb6a1600fb848efd5309fa9a1c920e0ad27c785925387af5872570142aae61a2ffea0b3578d10209060e9dc -doccontainersize 298848 -doccontainerchecksum bf3c28f78f03ebe43c84d722d668c14e0a751fb9e0d53ccb6a81cebf40b78f95b53fc3871ffa4919a94c260de861e93048b3adb590dee2bb8b600be1bbeaef3e -docfiles size=79 +containersize 2828 +containerchecksum be1baba4770db6a53bf3b1998279d991fd2fd9f44f5bb0eb43996b87f99ea49853b87636df147e5dfaf961f95456c25917e9ce10518132caccfea87cdb85bdc8 +doccontainersize 151496 +doccontainerchecksum 3386023f2d2d92f47622ab7a19a80541f91804f0e4d673ce2343450ee9e3df397e5ba252508e8abc4c0a3130bb97d28c59fd70cbadbf42d45411432d58509b80 +docfiles size=44 RELOC/doc/latex/draftwatermark/README.md details="Readme" RELOC/doc/latex/draftwatermark/draftwatermark.pdf details="Package documentation" RELOC/doc/latex/draftwatermark/test_draftwatermark-1.tex @@ -99202,8 +99230,8 @@ docfiles size=79 RELOC/doc/latex/draftwatermark/test_draftwatermark-3.tex RELOC/doc/latex/draftwatermark/test_draftwatermark-4.tex RELOC/doc/latex/draftwatermark/test_draftwatermark-5.tex -srccontainersize 12480 -srccontainerchecksum 7f9eacb71dc803059f6d9951aa7958effb9e97bb2030884ed02f0fcd43ad554f860ccebc455ede5893d67c527915f8a7093a94b2f146e4884e23303fe882527e +srccontainersize 12532 +srccontainerchecksum 240bb232da5d362ec62e4c20c38fce629fb8c3b909fa853de491f6157bab9117be40590fa0a8d571131f5372c49a4527aa546fc01c01c98f88567b60b6c907c1 srcfiles size=14 RELOC/source/latex/draftwatermark/draftwatermark.dtx RELOC/source/latex/draftwatermark/draftwatermark.ins @@ -99217,7 +99245,7 @@ catalogue-contact-repository https://github.com/callegar/LaTeX-draftwatermark catalogue-ctan /macros/latex/contrib/draftwatermark catalogue-license lppl1.3 catalogue-topics editorial watermark -catalogue-version 3.0 +catalogue-version 3.1 name dramatist category Package @@ -198065,7 +198093,7 @@ catalogue-version 1.2a name litetable category Package -revision 70331 +revision 70355 shortdesc Class schedules with colorful course blocks relocated 1 longdesc This template provides a beautiful design of class schedule @@ -198074,11 +198102,11 @@ longdesc template, or if you have better suggestions or ideas, or want longdesc to participate in the development of the template or other longdesc templates by me, welcome to contact me via email longdesc xiamyphys@gmail.com. -containersize 3524 -containerchecksum 761613c8c30dcedcabcd63139ece5d5d37489ee4217de42aac07fe867ef945dc05bdfe938be0145cd2e98ba346076da6c362363443afaaf813cd8b2c6fe06f00 -doccontainersize 455284 -doccontainerchecksum 77b651cb76bc8803be83ed086348764149c44e0eb3d07bb2892985e56b7f2c8a922375a78b7889cfbcac2cd38131edbd8a7bd995c510748bb484b813b3d8998e -docfiles size=161 +containersize 3840 +containerchecksum a77145b829bfb5ff6d943f11e687f54ccb3abb3784ce9e3bdf145bb66e5c808a46a802eaec1f6932a2917683d64df41cb44b8ec90499a8e93928b46913d099bf +doccontainersize 425176 +doccontainerchecksum b4080e8d6243b8e6353f12b090c481cc63fafa7c1c20596467dec79340a8fc1060431f9576d9742c901e45cc1d7285686356bd64cf0d274a7a8bc2c0de8162f6 +docfiles size=167 RELOC/doc/latex/litetable/License RELOC/doc/latex/litetable/README.md details="Readme" RELOC/doc/latex/litetable/favicon.png @@ -198097,7 +198125,7 @@ catalogue-contact-support https://qm.qq.com/q/RGFmHwBecC catalogue-ctan /macros/latex/contrib/litetable catalogue-license lppl1.3c catalogue-topics table class doc-templ -catalogue-version 2.4b +catalogue-version 2.4c name lithuanian category Package @@ -233002,7 +233030,7 @@ catalogue-version 1.0 name newtx category Package -revision 70168 +revision 70358 shortdesc Alternative uses of the TX fonts, with improved metrics relocated 1 longdesc The bundle splits txfonts.sty (from the TX fonts distribution) @@ -233017,11 +233045,11 @@ longdesc garamondx package, thus offering a garamond-alike longdesc text-with-maths combination. depend kastrup execute addMap newtx.map -containersize 6061396 -containerchecksum 4c01f60d603bc7a5311630c1a1e5e0ccde3f5a895f3d4464e29f964cfce0d876d9e2faa3aafd536e6c97fca78dd294402ed40526afc49398c1fed1519a082565 -doccontainersize 973524 -doccontainerchecksum c3fc4f8548a2e5509242188b6d8c1267bee97a2024cc292977c12bd68196614a2cdd905e74ba0cc20c5a3d788f9b5802762490de4c80964e9aa0af8a3723f114 -docfiles size=317 +containersize 6064040 +containerchecksum ece983df837849d906f9ef01726dba8466c892bb0c85af58c68f8f46ce764ff2299bd6ef8fa1dc642f11fdbab9acca41ea827a4987a52d8477be26b57c52bb96 +doccontainersize 974452 +doccontainerchecksum 9b457822a04e6c8e567fedc341eef9c1ab029e26863a12d2f88cc86eb3b256dbb6435a9e7b39f7ec12cd4245d0263d5558d9b59c039b966d0f926ab713dfb3c2 +docfiles size=318 RELOC/doc/fonts/newtx/MANIFEST-newtx.txt RELOC/doc/fonts/newtx/README details="Readme" RELOC/doc/fonts/newtx/implementation.pdf details="Implementation notes" @@ -233036,7 +233064,7 @@ docfiles size=317 RELOC/doc/fonts/newtx/sample-ntx-crop.pdf RELOC/doc/fonts/newtx/sample-ptmx-crop.pdf RELOC/doc/fonts/newtx/sample-tx-crop.pdf -runfiles size=4478 +runfiles size=4482 RELOC/fonts/afm/public/newtx/LibertineI-5nu.afm RELOC/fonts/afm/public/newtx/LibertineMathBMI.afm RELOC/fonts/afm/public/newtx/LibertineMathBMI5.afm @@ -233055,6 +233083,8 @@ runfiles size=4478 RELOC/fonts/afm/public/newtx/NewTXMI7.afm RELOC/fonts/afm/public/newtx/TeXGyreTermesX-Regular.afm RELOC/fonts/afm/public/newtx/TeXGyreTermesX-Slanted.afm + RELOC/fonts/afm/public/newtx/ebgBMI.afm + RELOC/fonts/afm/public/newtx/ebgMI.afm RELOC/fonts/afm/public/newtx/ntxsups-Bold.afm RELOC/fonts/afm/public/newtx/ntxsups-BoldItalic.afm RELOC/fonts/afm/public/newtx/ntxsups-Italic.afm @@ -234110,7 +234140,7 @@ catalogue-also minion2newtx catalogue-ctan /fonts/newtx catalogue-license lppl1.3 catalogue-topics font font-body font-maths font-serif font-proportional font-type1 font-otf font-supp font-t1enc -catalogue-version 1.739 +catalogue-version 1.741 name newtxsf category Package @@ -324877,7 +324907,7 @@ docfiles size=376 name texlive-scripts category TLCore -revision 70275 +revision 70346 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. @@ -324885,10 +324915,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 114056 -containerchecksum 6cc17e8a736f8cd90d0cec78fb6b434cec088f7759fae34c9b7449beee2438b0d60cb7323613d19d4987ac57ac59dd2fca42fa59129db20c0cc279d439326d4f -doccontainersize 432904 -doccontainerchecksum a72e7dcc1cc9be550b2444148114c6cabb7e5e52c2f42ef35f22a90c22a67caf76d6533742c56f987c12b7d1ccbaceca5a5d34f2d2b61a460ec2a73aadc10fc7 +containersize 114076 +containerchecksum 7e39a25094b24670c0a37def80fde0c9308472d4b69fc92e80166b7b55dd13f27a8fad336ce53b1d409d768f686390f48fed7f2c200f7f26f604d016d559189a +doccontainersize 432928 +doccontainerchecksum 593379174e0c42bb90b6b33f7965b461a194b935c8560b31530787b9fac2f6f34495260789bc596347929df1259f998fdbc815e23794a273335b2f9b8b511c18 docfiles size=565 doc.html texmf-dist/doc/man/man1/fmtutil-sys.1 @@ -350308,7 +350338,7 @@ catalogue-version 0.1.1 name unicodefonttable category Package -revision 67066 +revision 70354 shortdesc A Unicode font table generator relocated 1 longdesc This package produces font tables for unicode fonts as well as @@ -350319,10 +350349,10 @@ longdesc there is a stand-alone version unicodefont.tex that asks you a longdesc few questions and then generates the table --- somewhat similar longdesc to nfssfont.tex for 8-bit fonts. containersize 7900 -containerchecksum aa387053dd18c6927256690dba7e5c47a586466624f4dd36aef20b5cfbd9e1c5190ac4c5e45b5fc7325fbdb9db1fe30c42b4b9bdeeebcc6ad404d27ea36d1b37 -doccontainersize 1373804 -doccontainerchecksum 8cbfcedf459f9fdd970658ab7a462c1389e1502425816804c44bba79a4be05fbc2a6feb6769a0c693e208f2ee0ff0765c29dd7eac9afe7a5a11d1e43d636910d -docfiles size=591 +containerchecksum 08b2d90bed46237ebfdf0e98c45696b4dc1ba7f6f3ba2547fab2b129d6dd96e836dc23c345ccb45bdbd370fcc706e7a127a10f43aef9ea08ad75227f0b6b2857 +doccontainersize 1400904 +doccontainerchecksum 823d26c705d4b6154ddd1324ac6297f97ef3244b815a7da23b0079c5bd94ece9391407432cf66b7bee7422dd55514c033839b31ee04262cdc1a75e5e11726e42 +docfiles size=605 RELOC/doc/latex/unicodefonttable/README.md details="Readme" RELOC/doc/latex/unicodefonttable/TODO.md RELOC/doc/latex/unicodefonttable/changes.txt @@ -350333,8 +350363,8 @@ docfiles size=591 RELOC/doc/latex/unicodefonttable/unicodefonttable-doc.tex RELOC/doc/latex/unicodefonttable/unicodefonttable-samples.pdf RELOC/doc/latex/unicodefonttable/unicodefonttable-samples.tex -srccontainersize 22828 -srccontainerchecksum 189a69754a90457b5e99a099e65a4e62c4dc613597de7d4fc3818609a301f6da056fd88e6a6cabe4df8c1e18c0441a35dfb87d24ce9142f7fdb5e639d89c8ac8 +srccontainersize 22876 +srccontainerchecksum ea0086f6d9c3838d0fde1baef225c4e9ab57470033749e6bd4a877d6aaf85a28ad4c557b44f7ef2970db1c636c9dfb43ace959c2e41bf20f2daef3418ad08b60 srcfiles size=23 RELOC/source/latex/unicodefonttable/unicodefonttable.dtx RELOC/source/latex/unicodefonttable/unicodefonttable.ins diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 index ecfc6d11f9..51385c313f 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 @@ -1 +1 @@ -166b8fd6d7154ec02a7ffc126ee7c11c texlive.tlpdb +0f4f1fc10c1f207cc908bfebf09b3f15 texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 index 7fb94c4a7b..e56abbc690 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 @@ -1 +1 @@ -839d8bdd9128dcf00d96e7dfed7f9ec9c3886d87cbcca48466da6c69e0e490e638f36ad0153f7f7db4550320ae3663a8a8f5a0ae1538cbca3de6bbe2e08f30c8 texlive.tlpdb +41c11cbfab55f23185cd1c01b955110fe7380ef2928058cf68987d9c676230a4f6b1a32876a584e5fac4ec15e50ff687b51ad19ac4fef52b2b7d213b94ffe225 texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc index 39d4cf21df..2b64905b6f 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc @@ -1,11 +1,11 @@ -----BEGIN PGP SIGNATURE----- -iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmXijxIACgkQTOGHfhlD -jHDn6Qf/UmviL5Gd44dAO4JVAcegBt16ZdyWmZSrdXWeA/glz0sN1FYv993bEt0L -71hjKhsB5SwVqN7aoGiamgsGJfduCeszKHJik71/J1N0QdsgIEReydKDQ2FFlJt/ -J7jDIOo18uw4Ezt0J+LYjm5ZpCo9G4ROrxdRhVwvXQEsozPsrACLyQof49ZIVYHL -KOVPLAQi9SGZjtHTgBEFs+8iPmu+gVsm4NTVKEzIuGGmHnPIWNzrZ5+OFRXywZUW -9RZ0s8xxBS6jhcFFn0L5vDifiqNG0guGJsKBhIlkpYBil3ZnFu1JR7HmvYWJdL43 -z/RG/xQG36zarxJeHB+pepD+w5ii5Q== -=uD3u +iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmXj4egACgkQTOGHfhlD +jHDTLwf/db7SyrQh3tM2z8Ik/SkrqV7DFzcRZ5ZcZIrWBRwP1hW1CMD+7Xqlj1W5 +ZwLtLZhN1UGXpLpi3yqLmlPHaJ/S0PedBcs276+PlP1GbTA9rpCBwIlXlyH3CCQP +5ELg1oKzj+8BYA1yqwc0Ov+fAfGzc8ZQpHz7QeT/HkYiJ/7bhaW5j0PXaJe91Gqp +CIdn0tWGXQ8prIHC7YwLZWihvoXLxr9i4v2P3orHPgS+CVcy+jOXK3CE390hqbII +rB+odj9DEQSivwXlZTMWn5nXS6Eg4UGRDTyFH/ACXh3D9IHKVqSVJw96uCGEYIL1 +SsVPuQmGtCyitvr3ctu+RTzx4+YsSw== +=Aq1p -----END PGP SIGNATURE----- diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz Binary files differindex 22e0e67646..64bd1a7fa8 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz @@ -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: -2024-03-03-02-02 +2024-03-04-02-02 |