summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2024-08-06 03:01:14 +0000
committerNorbert Preining <norbert@preining.info>2024-08-06 03:01:14 +0000
commitb0bf44f89c03c433fb7e9733f24a28a729a80121 (patch)
tree1a136df9919c1488b41d73c91118bf5c3c383f28
parentf0d5386b8d7fba4c439e10a541c86deeccb14a18 (diff)
CTAN sync 202408060301
-rw-r--r--FILES.byname116
-rw-r--r--FILES.byname.gzbin2665943 -> 2665939 bytes
-rw-r--r--FILES.last07days123
-rw-r--r--biblio/ctan-bibdata/ctan.bib14
-rw-r--r--macros/latex/contrib/easybook/README.md2
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx99
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin625245 -> 634568 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex74
-rw-r--r--macros/latex/contrib/mercatormap/CHANGES.md23
-rw-r--r--macros/latex/contrib/mercatormap/README.md2
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap-example.tex2
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap.doc.animations.tex106
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap.doc.definition.tex12
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap.doc.orthodromes.tex24
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap.doc.sty2
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap.pdfbin23015231 -> 23145514 bytes
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap.sty174
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap.tex6
-rw-r--r--macros/latex/contrib/mercatormap/mercatorpy.def4
-rw-r--r--macros/latex/contrib/mercatormap/mercatorsupplier.def2
-rw-r--r--support/texshop/README.txt2
-rw-r--r--support/texshop/texshop536.html64
-rw-r--r--support/texshop/texshop542.html86
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl4
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb28
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.md52
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha5122
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc16
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.xzbin2585124 -> 2584120 bytes
-rw-r--r--timestamp2
30 files changed, 666 insertions, 325 deletions
diff --git a/FILES.byname b/FILES.byname
index fec0759e10..5e61c54d44 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -2077,12 +2077,12 @@
2024/07/31 | 1837 | biblio/citation-style-language/README.md
2024/07/31 | 12878 | biblio/citation-style-language/vancouver.csl
2024/07/31 | 4571454 | biblio/citation-style-language.zip
-2024/08/04 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2024/08/05 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2022/10/08 | 127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx
-2024/08/04 | 2879247 | biblio/ctan-bibdata/ctan.bib
-2024/08/04 | 3708800 | biblio/ctan-bibdata/ctan.pdf
+2024/08/05 | 2879247 | biblio/ctan-bibdata/ctan.bib
+2024/08/05 | 3708800 | biblio/ctan-bibdata/ctan.pdf
2023/01/16 | 1489 | biblio/ctan-bibdata/README
-2024/08/04 | 4123866 | biblio/ctan-bibdata.zip
+2024/08/05 | 4123866 | 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/08/04 | 57356 | FILES.last07days
+2024/08/05 | 56150 | 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
@@ -207178,7 +207178,7 @@
2022/10/12 | 211667 | install/macros/latex/contrib/media4svg.tds.zip
2022/08/04 | 7385937 | install/macros/latex/contrib/media9.tds.zip
2024/01/26 | 3610563 | install/macros/latex/contrib/memoir.tds.zip
-2024/08/01 | 22854768 | install/macros/latex/contrib/mercatormap.tds.zip
+2024/08/05 | 22983913 | install/macros/latex/contrib/mercatormap.tds.zip
2022/10/18 | 815562 | install/macros/latex/contrib/mfirstuc.tds.zip
2024/03/29 | 3009090 | install/macros/latex/contrib/microtype.tds.zip
2016/07/03 | 499067 | install/macros/latex/contrib/milog.tds.zip
@@ -232871,12 +232871,12 @@
2008/02/10 | 19110 | macros/latex/contrib/ean13isbn/License.txt
2021/01/24 | 422 | macros/latex/contrib/ean13isbn/README
2021/01/24 | 322624 | macros/latex/contrib/ean13isbn.zip
-2024/08/03 | 87872 | macros/latex/contrib/easybook/easybook.dtx
+2024/08/05 | 89948 | macros/latex/contrib/easybook/easybook.dtx
2024/01/04 | 2081 | macros/latex/contrib/easybook/easybook.ins
-2024/08/03 | 625245 | macros/latex/contrib/easybook/easybook.pdf
-2024/08/03 | 105586 | macros/latex/contrib/easybook/easybook.tex
-2024/08/03 | 913 | macros/latex/contrib/easybook/README.md
-2024/08/03 | 676390 | macros/latex/contrib/easybook.zip
+2024/08/05 | 634568 | macros/latex/contrib/easybook/easybook.pdf
+2024/08/05 | 108300 | macros/latex/contrib/easybook/easybook.tex
+2024/08/05 | 913 | macros/latex/contrib/easybook/README.md
+2024/08/05 | 687247 | macros/latex/contrib/easybook.zip
2009/06/17 | 82589 | macros/latex/contrib/easy/doc/docbib.pdf
2009/06/17 | 78378 | macros/latex/contrib/easy/doc/docbmat.pdf
2009/06/17 | 99132 | macros/latex/contrib/easy/doc/doceqn.pdf
@@ -243088,29 +243088,29 @@
2009/01/29 | 132906 | macros/latex/contrib/menu/menu.pdf
2009/01/29 | 915 | macros/latex/contrib/menu/README
2009/03/04 | 122601 | macros/latex/contrib/menu.zip
-2024/08/01 | 4707 | macros/latex/contrib/mercatormap/CHANGES.md
-2024/08/01 | 1107 | macros/latex/contrib/mercatormap/mercatormap.bib
-2024/08/01 | 3775 | macros/latex/contrib/mercatormap/mercatormap.doc.abstract.tex
-2024/08/01 | 13743 | macros/latex/contrib/mercatormap/mercatormap.doc.animations.tex
-2024/08/01 | 21268 | macros/latex/contrib/mercatormap/mercatormap.doc.definition.tex
-2024/08/01 | 10275 | macros/latex/contrib/mercatormap/mercatormap.doc.drawing.tex
-2024/08/01 | 15635 | macros/latex/contrib/mercatormap/mercatormap.doc.examples.tex
-2024/08/01 | 5591 | macros/latex/contrib/mercatormap/mercatormap.doc.intro.tex
-2024/08/01 | 12864 | macros/latex/contrib/mercatormap/mercatormap.doc.limitations.tex
-2024/08/01 | 40069 | macros/latex/contrib/mercatormap/mercatormap.doc.maptiles.tex
-2024/08/01 | 25659 | macros/latex/contrib/mercatormap/mercatormap.doc.marker.tex
-2024/08/01 | 10274 | macros/latex/contrib/mercatormap/mercatormap.doc.orthodromes.tex
-2024/08/01 | 4842 | macros/latex/contrib/mercatormap/mercatormap.doc.routes.tex
-2024/08/01 | 15758 | macros/latex/contrib/mercatormap/mercatormap.doc.scales.tex
-2024/08/01 | 3901 | macros/latex/contrib/mercatormap/mercatormap.doc.sty
-2024/08/01 | 3055 | macros/latex/contrib/mercatormap/mercatormap-example.tex
-2024/08/01 | 23015231 | macros/latex/contrib/mercatormap/mercatormap.pdf
-2024/08/01 | 95287 | macros/latex/contrib/mercatormap/mercatormap.sty
-2024/08/01 | 3039 | macros/latex/contrib/mercatormap/mercatormap.tex
-2024/08/01 | 21418 | macros/latex/contrib/mercatormap/mercatorpy.def
-2024/08/01 | 12630 | macros/latex/contrib/mercatormap/mercatorsupplier.def
-2024/08/01 | 2115 | macros/latex/contrib/mercatormap/README.md
-2024/08/01 | 22854309 | macros/latex/contrib/mercatormap.zip
+2024/08/05 | 5456 | macros/latex/contrib/mercatormap/CHANGES.md
+2024/08/05 | 1107 | macros/latex/contrib/mercatormap/mercatormap.bib
+2024/08/05 | 3775 | macros/latex/contrib/mercatormap/mercatormap.doc.abstract.tex
+2024/08/05 | 15302 | macros/latex/contrib/mercatormap/mercatormap.doc.animations.tex
+2024/08/05 | 21688 | macros/latex/contrib/mercatormap/mercatormap.doc.definition.tex
+2024/08/05 | 10275 | macros/latex/contrib/mercatormap/mercatormap.doc.drawing.tex
+2024/08/05 | 15635 | macros/latex/contrib/mercatormap/mercatormap.doc.examples.tex
+2024/08/05 | 5591 | macros/latex/contrib/mercatormap/mercatormap.doc.intro.tex
+2024/08/05 | 12864 | macros/latex/contrib/mercatormap/mercatormap.doc.limitations.tex
+2024/08/05 | 40069 | macros/latex/contrib/mercatormap/mercatormap.doc.maptiles.tex
+2024/08/05 | 25659 | macros/latex/contrib/mercatormap/mercatormap.doc.marker.tex
+2024/08/05 | 10812 | macros/latex/contrib/mercatormap/mercatormap.doc.orthodromes.tex
+2024/08/05 | 4842 | macros/latex/contrib/mercatormap/mercatormap.doc.routes.tex
+2024/08/05 | 15758 | macros/latex/contrib/mercatormap/mercatormap.doc.scales.tex
+2024/08/05 | 3932 | macros/latex/contrib/mercatormap/mercatormap.doc.sty
+2024/08/05 | 3055 | macros/latex/contrib/mercatormap/mercatormap-example.tex
+2024/08/05 | 23145514 | macros/latex/contrib/mercatormap/mercatormap.pdf
+2024/08/05 | 98027 | macros/latex/contrib/mercatormap/mercatormap.sty
+2024/08/05 | 3039 | macros/latex/contrib/mercatormap/mercatormap.tex
+2024/08/05 | 21418 | macros/latex/contrib/mercatormap/mercatorpy.def
+2024/08/05 | 12630 | macros/latex/contrib/mercatormap/mercatorsupplier.def
+2024/08/05 | 2115 | macros/latex/contrib/mercatormap/README.md
+2024/08/05 | 22983476 | macros/latex/contrib/mercatormap.zip
2012/03/05 | 927 | macros/latex/contrib/messagebubbles/messagebubbles.sty
2012/03/06 | 68997 | macros/latex/contrib/messagebubbles/messagebubbles-usage.pdf
2012/03/06 | 1321 | macros/latex/contrib/messagebubbles/messagebubbles-usage.tex
@@ -303030,9 +303030,9 @@
1999/09/13 | 17553 | support/texref/texref
1999/09/14 | 10702 | support/texref/texref.1
2006/03/12 | 12757 | support/texref.zip
-2024/05/26 | 748 | support/texshop/README.txt
-2024/05/27 | 5242 | support/texshop/texshop536.html
-2024/05/27 | 69637214 | support/texshop/texshop536.zip
+2024/08/04 | 750 | support/texshop/README.txt
+2024/08/04 | 8997 | support/texshop/texshop542.html
+2024/08/05 | 70421135 | support/texshop/texshop542.zip
1994/11/10 | 411107 | support/texspell/texspell.zip
1994/11/10 | 42315 | support/texspell/texspsrc.zip
1994/11/10 | 411107 | support/texspell.zip
@@ -307370,7 +307370,7 @@
2024/07/04 | 15256 | systems/texlive/tlnet/archive/beautybook.r71693.tar.xz
2024/02/26 | 858696 | systems/texlive/tlnet/archive/beautynote.doc.r70155.tar.xz
2024/02/26 | 5132 | systems/texlive/tlnet/archive/beautynote.r70155.tar.xz
-2024/08/03 | 927788 | systems/texlive/tlnet/archive/beebe.r71961.tar.xz
+2024/08/05 | 928552 | systems/texlive/tlnet/archive/beebe.r71974.tar.xz
2022/05/08 | 785552 | systems/texlive/tlnet/archive/begingreek.doc.r63255.tar.xz
2022/05/08 | 1808 | systems/texlive/tlnet/archive/begingreek.r63255.tar.xz
2022/05/08 | 7856 | systems/texlive/tlnet/archive/begingreek.source.r63255.tar.xz
@@ -312390,8 +312390,8 @@
2019/02/28 | 13160912 | systems/texlive/tlnet/archive/ipaex-type1.r47700.tar.xz
2023/11/16 | 170652 | systems/texlive/tlnet/archive/ipsum.doc.r68861.tar.xz
2023/11/16 | 14988 | systems/texlive/tlnet/archive/ipsum.r68861.tar.xz
-2024/08/04 | 164860 | systems/texlive/tlnet/archive/iran-bibtex.doc.r71969.tar.xz
-2024/08/04 | 14760 | systems/texlive/tlnet/archive/iran-bibtex.r71969.tar.xz
+2024/08/05 | 164848 | systems/texlive/tlnet/archive/iran-bibtex.doc.r71972.tar.xz
+2024/08/05 | 14764 | systems/texlive/tlnet/archive/iran-bibtex.r71972.tar.xz
2019/11/04 | 18792 | systems/texlive/tlnet/archive/is-bst.doc.r52623.tar.xz
2019/11/04 | 9932 | systems/texlive/tlnet/archive/is-bst.r52623.tar.xz
2019/02/28 | 269984 | systems/texlive/tlnet/archive/iscram.doc.r45801.tar.xz
@@ -318520,7 +318520,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/08/04 | 436884 | systems/texlive/tlnet/archive/texlive-scripts.doc.r71970.tar.xz
+2024/08/05 | 436836 | systems/texlive/tlnet/archive/texlive-scripts.doc.r71974.tar.xz
2024/07/09 | 908 | systems/texlive/tlnet/archive/texlive-scripts-extra.aarch64-linux.r71749.tar.xz
2024/07/09 | 920 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-freebsd.r71749.tar.xz
2024/07/09 | 908 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-netbsd.r71749.tar.xz
@@ -318542,7 +318542,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/08/04 | 114424 | systems/texlive/tlnet/archive/texlive-scripts.r71970.tar.xz
+2024/08/05 | 114424 | systems/texlive/tlnet/archive/texlive-scripts.r71974.tar.xz
2022/09/13 | 580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz
2024/05/10 | 60592 | systems/texlive/tlnet/archive/texlive-scripts.windows.r71215.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz
@@ -320495,16 +320495,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/07/20 | 125851 | systems/texlive/tlnet/install-tl
-2024/08/04 | 5755021 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2024/08/04 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2024/08/04 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2024/08/05 | 5755331 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2024/08/05 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2024/08/05 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2024/04/13 | 5743 | systems/texlive/tlnet/install-tl-windows.bat
-2024/08/04 | 27717125 | systems/texlive/tlnet/install-tl-windows.exe
-2024/08/04 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2024/08/04 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2024/08/04 | 34425894 | systems/texlive/tlnet/install-tl.zip
-2024/08/04 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2024/08/04 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2024/08/05 | 27717608 | systems/texlive/tlnet/install-tl-windows.exe
+2024/08/05 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2024/08/05 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2024/08/05 | 34425896 | systems/texlive/tlnet/install-tl.zip
+2024/08/05 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2024/08/05 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2024/03/13 | 1229 | systems/texlive/tlnet/README.md
2024/03/13 | 0 | systems/texlive/tlnet/TEXLIVE_2024
2024/01/02 | 9011 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -320514,7 +320514,7 @@
2024/01/02 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2024/07/29 | 50743 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2024/08/04 | 7571 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2024/08/05 | 7571 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2024/07/03 | 228633 | 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
@@ -320556,12 +320556,12 @@
2023/02/21 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2024/05/02 | 5898 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2023/04/08 | 28167 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2024/08/04 | 19540009 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2024/08/04 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2024/08/05 | 19540009 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2024/08/05 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2024/06/22 | 87725 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2024/08/04 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2024/08/04 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2024/08/04 | 2584796 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2024/08/05 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2024/08/05 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2024/08/05 | 2585124 | 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
@@ -332184,7 +332184,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/08/05 | 186 | timestamp
+2024/08/06 | 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
index e44e15b3a3..8a4f25a6f2 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index 038b5a2ba5..70afe17632 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,57 +1,87 @@
+2024/08/05 | 98027 | macros/latex/contrib/mercatormap/mercatormap.sty
+2024/08/05 | 928552 | systems/texlive/tlnet/archive/beebe.r71974.tar.xz
+2024/08/05 | 913 | macros/latex/contrib/easybook/README.md
+2024/08/05 | 89948 | macros/latex/contrib/easybook/easybook.dtx
+2024/08/05 | 7571 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2024/08/05 | 70421135 | support/texshop/texshop542.zip
+2024/08/05 | 687247 | macros/latex/contrib/easybook.zip
+2024/08/05 | 634568 | macros/latex/contrib/easybook/easybook.pdf
+2024/08/05 | 5755331 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2024/08/05 | 5591 | macros/latex/contrib/mercatormap/mercatormap.doc.intro.tex
+2024/08/05 | 5456 | macros/latex/contrib/mercatormap/CHANGES.md
+2024/08/05 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2024/08/05 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2024/08/05 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2024/08/05 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2024/08/05 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2024/08/05 | 4842 | macros/latex/contrib/mercatormap/mercatormap.doc.routes.tex
+2024/08/05 | 436836 | systems/texlive/tlnet/archive/texlive-scripts.doc.r71974.tar.xz
+2024/08/05 | 4123866 | biblio/ctan-bibdata.zip
+2024/08/05 | 40069 | macros/latex/contrib/mercatormap/mercatormap.doc.maptiles.tex
+2024/08/05 | 3932 | macros/latex/contrib/mercatormap/mercatormap.doc.sty
+2024/08/05 | 3775 | macros/latex/contrib/mercatormap/mercatormap.doc.abstract.tex
+2024/08/05 | 3708800 | biblio/ctan-bibdata/ctan.pdf
+2024/08/05 | 34425896 | systems/texlive/tlnet/install-tl.zip
+2024/08/05 | 3055 | macros/latex/contrib/mercatormap/mercatormap-example.tex
+2024/08/05 | 3039 | macros/latex/contrib/mercatormap/mercatormap.tex
+2024/08/05 | 2879247 | biblio/ctan-bibdata/ctan.bib
+2024/08/05 | 27717608 | systems/texlive/tlnet/install-tl-windows.exe
+2024/08/05 | 2585124 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2024/08/05 | 25659 | macros/latex/contrib/mercatormap/mercatormap.doc.marker.tex
+2024/08/05 | 23145514 | macros/latex/contrib/mercatormap/mercatormap.pdf
+2024/08/05 | 22983913 | install/macros/latex/contrib/mercatormap.tds.zip
+2024/08/05 | 22983476 | macros/latex/contrib/mercatormap.zip
+2024/08/05 | 21688 | macros/latex/contrib/mercatormap/mercatormap.doc.definition.tex
+2024/08/05 | 21418 | macros/latex/contrib/mercatormap/mercatorpy.def
+2024/08/05 | 2115 | macros/latex/contrib/mercatormap/README.md
+2024/08/05 | 19540009 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2024/08/05 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2024/08/05 | 164848 | systems/texlive/tlnet/archive/iran-bibtex.doc.r71972.tar.xz
+2024/08/05 | 15758 | macros/latex/contrib/mercatormap/mercatormap.doc.scales.tex
+2024/08/05 | 15635 | macros/latex/contrib/mercatormap/mercatormap.doc.examples.tex
+2024/08/05 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2024/08/05 | 15302 | macros/latex/contrib/mercatormap/mercatormap.doc.animations.tex
+2024/08/05 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2024/08/05 | 14764 | systems/texlive/tlnet/archive/iran-bibtex.r71972.tar.xz
+2024/08/05 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2024/08/05 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2024/08/05 | 12864 | macros/latex/contrib/mercatormap/mercatormap.doc.limitations.tex
+2024/08/05 | 12630 | macros/latex/contrib/mercatormap/mercatorsupplier.def
+2024/08/05 | 114424 | systems/texlive/tlnet/archive/texlive-scripts.r71974.tar.xz
+2024/08/05 | 1107 | macros/latex/contrib/mercatormap/mercatormap.bib
+2024/08/05 | 108300 | macros/latex/contrib/easybook/easybook.tex
+2024/08/05 | 10812 | macros/latex/contrib/mercatormap/mercatormap.doc.orthodromes.tex
+2024/08/05 | 10275 | macros/latex/contrib/mercatormap/mercatormap.doc.drawing.tex
2024/08/04 | 9558 | biblio/bibtex/contrib/iran-bibtex/README.md
2024/08/04 | 91432 | biblio/bibtex/contrib/iran-bibtex/iran-bibtex-pattern.pdf
+2024/08/04 | 8997 | support/texshop/texshop542.html
2024/08/04 | 8440 | systems/texlive/tlnet/archive/texplate.source.r71963.tar.xz
2024/08/04 | 8376 | systems/texlive/tlnet/archive/bxpdfver.r71967.tar.xz
-2024/08/04 | 7571 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2024/08/04 | 750 | support/texshop/README.txt
2024/08/04 | 6719 | biblio/bibtex/contrib/iran-bibtex/iran-bibtex.sty
2024/08/04 | 653284 | systems/texlive/tlnet/archive/easybook.doc.r71966.tar.xz
2024/08/04 | 6352 | systems/texlive/tlnet/archive/fontscale.r71965.tar.xz
2024/08/04 | 62994 | biblio/bibtex/contrib/iran-bibtex/iran-bibtex-userguide-fa.pdf
-2024/08/04 | 5755021 | systems/texlive/tlnet/install-tl-unx.tar.gz
2024/08/04 | 5736 | systems/texlive/tlnet/archive/bxpdfver.doc.r71967.tar.xz
-2024/08/04 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2024/08/04 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2024/08/04 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2024/08/04 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2024/08/04 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2024/08/04 | 46376 | systems/texlive/tlnet/archive/luamplib.source.r71964.tar.xz
2024/08/04 | 45361 | biblio/bibtex/contrib/iran-bibtex/iran-bibtex-pattern.tex
-2024/08/04 | 436884 | systems/texlive/tlnet/archive/texlive-scripts.doc.r71970.tar.xz
-2024/08/04 | 4123866 | biblio/ctan-bibdata.zip
-2024/08/04 | 3708800 | biblio/ctan-bibdata/ctan.pdf
-2024/08/04 | 34425894 | systems/texlive/tlnet/install-tl.zip
2024/08/04 | 3372272 | systems/texlive/tlnet/archive/texplate.r71963.tar.xz
-2024/08/04 | 2879247 | biblio/ctan-bibdata/ctan.bib
-2024/08/04 | 27717125 | systems/texlive/tlnet/install-tl-windows.exe
2024/08/04 | 261808 | systems/texlive/tlnet/archive/luamplib.doc.r71964.tar.xz
-2024/08/04 | 2584796 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2024/08/04 | 2551296 | systems/texlive/tlnet/archive/circuitikz.doc.r71968.tar.xz
2024/08/04 | 240077 | biblio/bibtex/contrib/iran-bibtex.zip
2024/08/04 | 23588 | systems/texlive/tlnet/archive/luamplib.r71964.tar.xz
-2024/08/04 | 19540009 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
2024/08/04 | 19036 | systems/texlive/tlnet/archive/easybook.r71966.tar.xz
2024/08/04 | 18932 | systems/texlive/tlnet/archive/easybook.source.r71966.tar.xz
2024/08/04 | 181852 | systems/texlive/tlnet/archive/circuitikz.r71968.tar.xz
-2024/08/04 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
-2024/08/04 | 164860 | systems/texlive/tlnet/archive/iran-bibtex.doc.r71969.tar.xz
2024/08/04 | 15484 | biblio/bibtex/contrib/iran-bibtex/iran-bibtex-userguide-fa.tex
-2024/08/04 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2024/08/04 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2024/08/04 | 14760 | systems/texlive/tlnet/archive/iran-bibtex.r71969.tar.xz
-2024/08/04 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2024/08/04 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
2024/08/04 | 114940 | systems/texlive/tlnet/archive/texplate.doc.r71963.tar.xz
-2024/08/04 | 114424 | systems/texlive/tlnet/archive/texlive-scripts.r71970.tar.xz
2024/08/04 | 110544 | systems/texlive/tlnet/archive/fontscale.doc.r71965.tar.xz
2024/08/03 | 9804 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex
2024/08/03 | 9538 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex
2024/08/03 | 9457 | macros/luatex/generic/luamplib/test-luamplib-plain.tex
2024/08/03 | 937130 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2-body.tex
2024/08/03 | 929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex
-2024/08/03 | 927788 | systems/texlive/tlnet/archive/beebe.r71961.tar.xz
-2024/08/03 | 913 | macros/latex/contrib/easybook/README.md
2024/08/03 | 89399 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
-2024/08/03 | 87872 | macros/latex/contrib/easybook/easybook.dtx
2024/08/03 | 8445 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
2024/08/03 | 841340 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0-body.tex
2024/08/03 | 834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex
@@ -62,7 +92,6 @@
2024/08/03 | 72092 | systems/texlive/tlnet/archive/tagpdf.source.r71958.tar.xz
2024/08/03 | 690729 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3-body.tex
2024/08/03 | 683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex
-2024/08/03 | 676390 | macros/latex/contrib/easybook.zip
2024/08/03 | 641 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty
2024/08/03 | 635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty
2024/08/03 | 635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty
@@ -72,7 +101,6 @@
2024/08/03 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty
2024/08/03 | 631 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6.sty
2024/08/03 | 626 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty
-2024/08/03 | 625245 | macros/latex/contrib/easybook/easybook.pdf
2024/08/03 | 622508 | systems/texlive/tlnet/archive/l3kernel.source.r71959.tar.xz
2024/08/03 | 6172 | macros/latex/contrib/bxpdfver/README.md
2024/08/03 | 57962 | graphics/pgf/contrib/circuitikz/doc/changelog.tex
@@ -131,7 +159,6 @@
2024/08/03 | 1099457 | info/biblio/font.bib
2024/08/03 | 1081680 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6-body.tex
2024/08/03 | 1073051 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.4.6.tex
-2024/08/03 | 105586 | macros/latex/contrib/easybook/easybook.tex
2024/08/03 | 10541 | macros/luatex/generic/luamplib/test-luamplib-latex.tex
2024/08/03 | 1036 | systems/texlive/tlnet/archive/pgfplotsthemebeamer.r71954.tar.xz
2024/08/03 | 1021798 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7-body.tex
@@ -417,7 +444,6 @@
2024/08/02 | 100428 | macros/latex/required/l3kernel/l3seq.dtx
2024/08/01 | 99952 | systems/texlive/tlnet/archive/cjs-rcs-article.source.r71936.tar.xz
2024/08/01 | 9896 | systems/texlive/tlnet/archive/se2thesis.r71938.tar.xz
-2024/08/01 | 95287 | macros/latex/contrib/mercatormap/mercatormap.sty
2024/08/01 | 9443 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
2024/08/01 | 94303 | macros/latex/contrib/asmeconf/asmeconf.cls
2024/08/01 | 9068 | graphics/pgf/contrib/polyomino/polyomino.tex
@@ -434,45 +460,30 @@
2024/08/01 | 645632 | macros/latex/contrib/siunitx/siunitx-code.pdf
2024/08/01 | 591788 | systems/texlive/tlnet/archive/se2thesis.doc.r71938.tar.xz
2024/08/01 | 5816 | macros/latex/contrib/siunitx/siunitx-locale.dtx
-2024/08/01 | 5591 | macros/latex/contrib/mercatormap/mercatormap.doc.intro.tex
2024/08/01 | 55763 | macros/latex/contrib/siunitx/siunitx-table.dtx
2024/08/01 | 494044 | systems/texlive/tlnet/archive/bib2qr.doc.r71940.tar.xz
2024/08/01 | 48613 | macros/latex/contrib/asmeconf/asmeconf-template.tex
-2024/08/01 | 4842 | macros/latex/contrib/mercatormap/mercatormap.doc.routes.tex
2024/08/01 | 4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
-2024/08/01 | 4707 | macros/latex/contrib/mercatormap/CHANGES.md
2024/08/01 | 4598568 | systems/texlive/tlnet/archive/pagelayout.doc.r71937.tar.xz
2024/08/01 | 44385694 | macros/latex/contrib/asmeconf.zip
2024/08/01 | 43854 | macros/latex/contrib/siunitx/siunitx-compound.dtx
-2024/08/01 | 40069 | macros/latex/contrib/mercatormap/mercatormap.doc.maptiles.tex
2024/08/01 | 39914315 | macros/latex/contrib/asmeconf/examples/asmeconf-fontspec.pdf
2024/08/01 | 39313 | macros/latex/contrib/siunitx/siunitx-complex.dtx
-2024/08/01 | 3901 | macros/latex/contrib/mercatormap/mercatormap.doc.sty
2024/08/01 | 37988 | macros/latex/contrib/siunitx/siunitx-print.dtx
-2024/08/01 | 3775 | macros/latex/contrib/mercatormap/mercatormap.doc.abstract.tex
2024/08/01 | 3682 | macros/latex/contrib/siunitx/siunitx.ins
2024/08/01 | 3540 | graphics/pgf/contrib/pgf-periodictable/README
2024/08/01 | 346032 | systems/texlive/tlnet/archive/cjs-rcs-article.doc.r71936.tar.xz
2024/08/01 | 31797 | macros/latex/contrib/siunitx/siunitx-emulation.dtx
2024/08/01 | 31738 | macros/latex/contrib/siunitx/siunitx-version-1.cfg
2024/08/01 | 3079 | graphics/pgf/contrib/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_name.tex
-2024/08/01 | 3055 | macros/latex/contrib/mercatormap/mercatormap-example.tex
-2024/08/01 | 3039 | macros/latex/contrib/mercatormap/mercatormap.tex
2024/08/01 | 29544 | macros/latex/contrib/asmeconf/examples/asmeconf-fontspec.tex
2024/08/01 | 2941 | macros/latex/contrib/siunitx/siunitx-binary.dtx
2024/08/01 | 273398 | macros/latex/contrib/siunitx/siunitx-v2.sty
2024/08/01 | 26628 | systems/texlive/tlnet/archive/se2thesis.source.r71938.tar.xz
2024/08/01 | 2621 | macros/latex/contrib/siunitx/siunitx-code.tex
2024/08/01 | 25868 | systems/texlive/tlnet/archive/pagelayout.r71937.tar.xz
-2024/08/01 | 25659 | macros/latex/contrib/mercatormap/mercatormap.doc.marker.tex
2024/08/01 | 25053 | graphics/pgf/contrib/pgf-periodictable/manualfiles/pgfPTmanual.macros.tex
-2024/08/01 | 23015231 | macros/latex/contrib/mercatormap/mercatormap.pdf
-2024/08/01 | 22854768 | install/macros/latex/contrib/mercatormap.tds.zip
-2024/08/01 | 22854309 | macros/latex/contrib/mercatormap.zip
2024/08/01 | 22316 | macros/latex/contrib/siunitx/siunitx.dtx
-2024/08/01 | 21418 | macros/latex/contrib/mercatormap/mercatorpy.def
-2024/08/01 | 21268 | macros/latex/contrib/mercatormap/mercatormap.doc.definition.tex
-2024/08/01 | 2115 | macros/latex/contrib/mercatormap/README.md
2024/08/01 | 210294 | graphics/pgf/contrib/pgf-periodictable/pgf-PeriodicTable.sty
2024/08/01 | 18426 | macros/latex/contrib/siunitx/siunitx-angle.dtx
2024/08/01 | 17763 | graphics/pgf/contrib/pgf-periodictable/pgfPT.names.tex
@@ -482,25 +493,17 @@
2024/08/01 | 1668273 | support/TeX4ht/source/tex4ht-fonts-noncjk.tex
2024/08/01 | 163362 | macros/latex/contrib/siunitx/siunitx-number.dtx
2024/08/01 | 1591546 | install/macros/latex/contrib/siunitx.tds.zip
-2024/08/01 | 15758 | macros/latex/contrib/mercatormap/mercatormap.doc.scales.tex
-2024/08/01 | 15635 | macros/latex/contrib/mercatormap/mercatormap.doc.examples.tex
2024/08/01 | 1543968 | macros/latex/contrib/siunitx.zip
2024/08/01 | 15296 | macros/latex/contrib/siunitx/siunitx-quantity.dtx
2024/08/01 | 15044 | systems/texlive/tlnet/archive/cjs-rcs-article.r71936.tar.xz
2024/08/01 | 14803 | graphics/pgf/contrib/polyomino/polyomino.sty
-2024/08/01 | 13743 | macros/latex/contrib/mercatormap/mercatormap.doc.animations.tex
2024/08/01 | 12949 | macros/latex/contrib/asmeconf/README.md
2024/08/01 | 1292 | systems/texlive/tlnet/archive/collection-bibtexextra.r71940.tar.xz
-2024/08/01 | 12864 | macros/latex/contrib/mercatormap/mercatormap.doc.limitations.tex
-2024/08/01 | 12630 | macros/latex/contrib/mercatormap/mercatorsupplier.def
2024/08/01 | 1166 | macros/latex/contrib/siunitx/README.md
2024/08/01 | 11252 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
2024/08/01 | 110899 | graphics/pgf/contrib/polyomino.zip
-2024/08/01 | 1107 | macros/latex/contrib/mercatormap/mercatormap.bib
2024/08/01 | 109235 | graphics/pgf/contrib/polyomino/polyomino.pdf
2024/08/01 | 104102 | macros/latex/contrib/siunitx/siunitx-unit.dtx
-2024/08/01 | 10275 | macros/latex/contrib/mercatormap/mercatormap.doc.drawing.tex
-2024/08/01 | 10274 | macros/latex/contrib/mercatormap/mercatormap.doc.orthodromes.tex
2024/07/31 | 99929 | macros/latex/contrib/pagelayout/doc/quickstart-3.svg
2024/07/31 | 9563 | biblio/citation-style-language/citeproc-context.lua
2024/07/31 | 955 | macros/latex/contrib/pagelayout/doc/example-template.tex
@@ -719,17 +722,3 @@
2024/07/30 | 10879 | macros/latex/contrib/cjs-rcs-article/cjs-rcs-english.mbs
2024/07/30 | 1056515 | macros/luatex/latex/piton/piton.pdf
2024/07/30 | 1056291 | macros/luatex/latex/piton.zip
-2024/07/29 | 8908 | systems/texlive/tlnet/archive/luacensor.r71922.tar.xz
-2024/07/29 | 50743 | systems/texlive/tlnet/tlpkg/installer/config.guess
-2024/07/29 | 4824 | systems/texlive/tlnet/archive/doibanner.source.r71919.tar.xz
-2024/07/29 | 290792 | systems/texlive/tlnet/archive/doibanner.doc.r71919.tar.xz
-2024/07/29 | 2391136 | systems/texlive/tlnet/archive/junicodevf.doc.r71920.tar.xz
-2024/07/29 | 2212376 | systems/texlive/tlnet/archive/junicodevf.r71920.tar.xz
-2024/07/29 | 18931 | CTAN.sites
-2024/07/29 | 1812 | systems/texlive/tlnet/archive/jigsaw.r71923.tar.xz
-2024/07/29 | 166608 | systems/texlive/tlnet/archive/luacensor.doc.r71922.tar.xz
-2024/07/29 | 158352 | systems/texlive/tlnet/archive/beamertheme-rainbow.doc.r71925.tar.xz
-2024/07/29 | 149580 | systems/texlive/tlnet/archive/jigsaw.doc.r71923.tar.xz
-2024/07/29 | 1484 | systems/texlive/tlnet/archive/doibanner.r71919.tar.xz
-2024/07/29 | 1215936 | graphics/pgf/contrib/wheelchart.zip
-2024/07/29 | 1124 | systems/texlive/tlnet/archive/beamertheme-rainbow.r71925.tar.xz
diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib
index 6893ede102..83ef8288c7 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 05-08-2024, 02:00:03
+%% created at 06-08-2024, 02:00:02
%%
%% This file is provided under the terms of the LPPL v1.3 or
@@ -20926,8 +20926,8 @@
title = {The \texttt{easybook} package},
subtitle = {Easily typesetting Chinese theses or books},
author = {Qu Yi},
- date = {2024-08-03},
- version = {2024de},
+ date = {2024-08-05},
+ version = {2024df},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/easybook},
url = {https://ctan.org/pkg/easybook},
@@ -45430,8 +45430,8 @@
title = {The \texttt{mercatormap} package},
subtitle = {Spherical Mercator coordinate systems and Web Mercator tile integration},
author = {Thomas F. Sturm},
- date = {2024-08-01},
- version = {1.1.0},
+ date = {2024-08-05},
+ version = {1.2.0},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/mercatormap},
url = {https://ctan.org/pkg/mercatormap},
@@ -70084,8 +70084,8 @@
title = {The \texttt{texshop} package},
subtitle = {TeX front end for use on MacOS X},
author = {Dick Koch},
- date = {2024-05-27},
- version = {5.36},
+ date = {2024-08-05},
+ version = {5.42},
license = {gpl},
mirror = {https://mirror.ctan.org/support/texshop},
url = {https://ctan.org/pkg/texshop},
diff --git a/macros/latex/contrib/easybook/README.md b/macros/latex/contrib/easybook/README.md
index fdb41b709b..b4c05b60c7 100644
--- a/macros/latex/contrib/easybook/README.md
+++ b/macros/latex/contrib/easybook/README.md
@@ -1,5 +1,5 @@
# The `easybook` document class
-Easily typesetting Chinese theses or books (v2024de)
+Easily typesetting Chinese theses or books (v2024df)
## Abstract
`easybook` is a pure academic template created based on the `ctexbook` book document class. It also has the functions of `book` and `article` document class. Combined with the general framework design of the theses of many universities in China, providing multiple commands and interfaces allows users to easily customize the theses templates. Its basic macro package `easybase` can also be used with `ctex` and standard document classes.
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 8387f4de4c..4ca79fe295 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -14,7 +14,7 @@
% This work has the LPPL maintenance status `maintained'.
%<class|package>\NeedsTeXFormat{LaTeX2e}[2021/11/15]
%<*class>
-\ProvidesExplClass{easybook}{2024/08/03}{2024de}
+\ProvidesExplClass{easybook}{2024/08/05}{2024df}
{Easily typesetting Chinese theses or books}
\bool_new:N \l__eb_compile_draft_bool
@@ -301,7 +301,7 @@
%</class>
%<*package>
\RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2024/08/03}{2024de}
+\ProvidesExplPackage{easybase}{2024/08/05}{2024df}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -332,7 +332,7 @@
\clist_map_inline:nn {#1}
{ \AtBeginEnvironment{##1}{#2} }
}
-\cs_new_protected:Npn \eb_at_end_preamble:n
+\cs_set_protected:Npn \ctex_before_end_preamble:n
{ \BeforeBeginEnvironment{document} }
\cs_new_protected:Npn \eb_if_package_loaded:nnF #1#2#3
{
@@ -957,7 +957,7 @@
unknown .code:n = \eb_msg_deprecated_option:n { hdr }
}
-\eb_at_end_preamble:n
+\ctex_before_end_preamble:n
{
\bool_if:NT \l__eb_chap_counter_withpart_bool
{ \counterwithin*{chapter}{part} }
@@ -1973,7 +1973,7 @@
\ctex_at_end_package:nn { imakeidx }
{
- \RenewDocumentCommand{\printindex}{st+od()}
+ \RenewDocumentCommand{\printindex}{st++o}
{
\group_begin:
\tl_set_eq:NN \eb@toc@title \indexname
@@ -2455,7 +2455,7 @@
{ \exp_args:NV \bibliographystyle \l__eb_bib_both_style_tl }
\tl_if_blank:VF \l__eb_bib_cite_style_tl
{ \exp_args:NV \setcitestyle \l__eb_bib_cite_style_tl }
- \NewDocumentCommand{\printbibliography}{st+o}
+ \NewDocumentCommand{\printbibliography}{st++o}
{
\group_begin:
\tl_set_eq:NN \eb@toc@title \bibname
@@ -2503,7 +2503,7 @@
\setcounter{biburllcpenalty}{1}
\setcounter{biburlnumpenalty}{1}
}
-\eb_at_end_preamble:n
+\ctex_before_end_preamble:n
{
\providecommand{\bibname}{\refname}
\clist_if_empty:NF \l__eb_bib_datafile_clist
@@ -2728,9 +2728,92 @@
lstlistingname = Code
}
}
+
+\DeclareObjectType{easybook}{0}
+\DeclareTemplateInterface{easybook}{cover}{0}
+ {
+ content : tokenlist = \c_empty_tl,
+ beforecode : tokenlist = \c_empty_tl,
+ aftercode : tokenlist = \c_empty_tl,
+ align : choice {l,r,c,n} = c
+ }
+\DeclareTemplateCode{easybook}{cover}{0}
+ {
+ content = \l__eb_cover_content_tl,
+ beforecode = \l__eb_cover_before_code_tl,
+ aftercode = \l__eb_cover_after_code_tl,
+ align =
+ {
+ l = \cs_set_eq:NN \eb_cover_align: \raggedright,
+ r = \cs_set_eq:NN \eb_cover_align: \raggedleft,
+ c = \cs_set_eq:NN \eb_cover_align: \centering,
+ n = \cs_set:Npn \eb_cover_align: { }
+ }
+ }
+ {
+ \AssignTemplateKeys
+ \tl_use:N \l__eb_cover_before_code_tl
+ \group_begin:
+ \eb_cover_align:
+ \tl_use:N \l__eb_cover_content_tl
+ \tex_par:D
+ \group_end:
+ \tl_use:N \l__eb_cover_after_code_tl
+ }
+\DeclareInstance{easybook}{top}{cover}{}
+\DeclareInstance{easybook}{bottom}{cover}{}
+\DeclareInstance{easybook}{middle}{cover}
+ {
+ content =
+ {
+ \LARGE\@title\par\vskip 3em
+ \large
+ \begin{tabular}[t]{c}
+ \@author
+ \end{tabular}\par\vskip 1.5em
+ \@date
+ },
+ beforecode =
+ {
+ \ifbool{@titlepage}
+ {
+ \begin{titlepage}
+ \let\footnotesize\small
+ \let\footnoterule\relax
+ \let\footnote\thanks
+ \null\vfil
+ }
+ {\null}
+ \vskip 60\p@
+ },
+ aftercode =
+ {
+ \@thanks
+ \ifbool{@titlepage}
+ {
+ \vfil\null
+ \end{titlepage}
+ }
+ {\thispagestyle{plain}}
+ \setcounter{footnote}{0}
+ }
+ }
+\keys_define:nn { eb/cover }
+ {
+ title .tl_set:N = \@title,
+ author .tl_set:N = \@author,
+ date .tl_set:N = \@date
+ }
+\RenewDocumentCommand{\maketitle}{+O{}}
+ {
+ \keys_set:nn { eb/cover } {#1}
+ \UseInstance{easybook}{top}
+ \UseInstance{easybook}{middle}
+ \UseInstance{easybook}{bottom}
+ }
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/08/03}{2024de}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/08/05}{2024df}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 0b0573b31a..212eb0a499 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index 32aae47601..cf00f45b98 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -23,8 +23,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v2024de,
- date = 2024/08/03,
+ version = v2024df,
+ date = 2024/08/05,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi@163.com,
@@ -500,7 +500,7 @@ $\blacktriangleright$需要注意正确\textbf{编译索引}要增加 \code{-she
\label{subsec:reference}
\begin{cnltxlist}
\keychoice{backend}{\fbox{bibtex},biblatex}
- 参考文献处理后端。选择 \code{bibtex} 时使用传统的 \hologo{BibTeX} 引擎处理参考文献,加载 \pkg*{natbib} 宏包。选择 \code{biblatex} 时使用 \hologo{biber} 引擎,加载 \pkg*{biblatex} 宏包。
+ 参考文献处理后端。选择 \code{bibtex} 时使用传统的 \hologo{BibTeX} 引擎处理参考文献,加载 \pkg*{natbib} 宏包。选择 \code{biblatex} 时使用 \hologo{biber} 引擎,加载 \pkg*{biblatex} 宏包。若自动载入参考文献宏包则位于导言区末尾,但在 \pkg*{hyperref} 宏包之前。
\keychoice{bibstyle}{\fbox{numerical},authoryear,\optpath*{other sty}}
参考文献格式使用中国参考文献推荐标准GB/T 7714-2015,对应顺序编码制和著者—出版年制两种风格。若使用其它格式,使用 \hologo{BibTeX} 处理时需确保正确的 \code{bst} 文件,使用 \hologo{biber} 处理可使用 \pkg*{biblatex} 宏包支持的参考文献风格名称。
\keyval{citestyle}{标注风格}
@@ -552,11 +552,11 @@ $\blacktriangleright$需要注意正确\textbf{编译索引}要增加 \code{-she
\keyval{style}{定理样式}\Default{default}
选项的值为使用 \cs{declaretheoremstyle} 命令新定义的定理样式。
- 使用 \cs{declaretheorem} 命令以\ref{exam:new theorem sty} 中的定理样式 \code{fancy} 新建一个定理环境猜想,然后用一个基于 \pkg*{tcolorbox} 宏包的预置彩色盒子 \env{easyboxi} 增加背景:
+ 使用 \cs{declaretheorem} 命令以\ref{exam:new theorem sty} 中的定理样式 \code{fancy} 新建一个定理环境 \env*{lemma},然后用一个基于 \pkg*{tcolorbox} 宏包的预置彩色盒子 \env{easyboxi} 增加背景:
\begin{ctexexam}[labelref = exam:new theorem env]
- \declaretheorem[style = fancy,name = 猜想]{caixiang}
+ \declaretheorem[style = fancy,name = 引理]{lemma}
\addtotcbstyle{tc-easyboxi}{colback = GreenYellow}
- \tcolorboxenvironment{caixiang}{tc-easyboxi}
+ \tcolorboxenvironment{lemma}{tc-easyboxi}
\end{ctexexam}
\command{declaretheoremstyle}[\oarg{键值列表1}\marg{定理样式}\oarg{键值列表2}]
定理样式声明命令,键值列表支持自身以及定理声明命令 \cs{declaretheorem} 的所有选项。可选参数的 \meta{键值列表1} 与 \meta{键值列表2} 等效,其中支持的选项如下:
@@ -608,12 +608,12 @@ $\blacktriangleright$需要注意正确\textbf{编译索引}要增加 \code{-she
\command{thmtifname}[\marg{存在编号代码}\marg{不存在编号代码}]
在 \meta{标题定义} 中测试当前定理是否有编号从而输出不同的内容,定理风格选项 \keyis{numbered}{no} 设置当前定理环境没有编号。
\begin{ctexexam}
- \contentsuse{caixiang}{loe}
- \RegisterTocName{caixiang}
- \setlisttheoremstyle{ignoreall,show = caixiang}
- \settheoremtocline{caixiang}
+ \contentsuse{lemma}{loe}
+ \RegisterTocName{lemma}
+ \setlisttheoremstyle{ignoreall,show = lemma}
+ \settheoremtocline{lemma}
{
- \listnumberline{caixiang}
+ \listnumberline{lemma}
\thmtname\thmtifnote{[\thmtnote]}{}
}
\end{ctexexam}
@@ -937,8 +937,47 @@ $\blacktriangleright$需要注意正确\textbf{编译索引}要增加 \code{-she
\section{环境和命令}
-\subsection{文区命令}
+\subsection{封面和文区}
\begin{cnltxlist}
+ \command{maketitle}[\oarg{键值列表}]\newtagv{2024df}%
+ 重新改写了默认的封面标题命令,在保证原生风格的前提下使用 \pkg*{xtemplate} 宏包将封面抽象为由实例组成的模板。并为命令增加了可选参数,选项的含义与标准文档类一致:
+ \keyval{title}{文档标题}
+ 设置文档的标题,可以包含格式命令。如果没有设置标题而输出封面会报错。
+ \keyval{author}{文档作者}
+ 设置文档的作者,可以包含格式命令。多位作者之间可以用 \cs*{and} 命令分隔,每个作者后可用 \cs*{thanks} 命令添加致谢脚注。
+ \keyval{date}{文档日期}\Default{\cs*{today}}
+ 设置文档的日期,可以包含格式命令。默认的文档日期为当前日期 \cs*{today}。
+ \command{DeclareInstance}[\Marg{easybook}\marg{位置}\Marg{cover}\marg{键值列表}]
+ 封面模板可用 \pkg*{xtemplate} 提供的实例声明命令进行自由定制,\ref{exam:cover instance} 举例说明了定制页面中部的内容。模板由页面上、中和下三个位置的实例组成,它们的 \meta{位置} 名字分别为 \code{top}、\code{middle} 和 \code{bottom}。每个实例的属性可用 \meta{键值列表} 修改,包含的选项如下:
+ \keyval{content}{实例内容}
+ 设置实例内容,可以包含任何记号列表的代码。通常为格式和排版内容的命令,在局部生效。
+ \keyval{beforecode}{实例前代码}
+ 设置实例内容前的代码,可以包含任何记号列表的代码。通常为换页和垂直距离的命令。
+ \keyval{aftercode}{实例后代码}
+ 与 \option{before} 选项类似,设置实例内容后的代码。
+ \keychoice{align}{l,\fbox{c},r,n}
+ 设置实例内容的对齐方式,分别为左、中、右和自然对齐,自然对齐即正常的段落文本。
+ \begin{ctexexam}[labelref = exam:cover instance]
+ \DeclareInstance{easybook}{middle}{cover}
+ {
+ content =
+ {
+ \thispagestyle{empty}
+ \begin{tblr}
+ {
+ columns = c,
+ hline{2-4} = {2}{0.5pt,solid},
+ column{1} = {rightsep = 0pt}
+ }
+ 标题:& 一个文档标题 \\
+ 作者:& 张三 \\
+ 日期:& \today
+ \end{tblr}
+ },
+ beforecode = \null\vspace{3cm},
+ aftercode = \clearpage
+ }
+ \end{ctexexam}
\command{frontmatter}[\sarg\oarg{编号格式}]\Default{Roman}
前言区命令。使部分和章标题不编号,带有星号的变体命令不使用 \cs{cleardoublepage} 命令。页码 \meta{编号格式} 可设置为 \code{arabic}、\code{Alph}、\code{alph}、\code{Roman}、\code{roman} 和 \code{chinese} 形式。
\command{mainmatter}[\sarg]
@@ -1329,13 +1368,13 @@ $\blacktriangleright$需要注意正确\textbf{编译索引}要增加 \code{-she
\subsection{索引}
\begin{cnltxlist}
\command{indexsetup}[\marg{键值列表}]
- \pkg*{imakeidx} 宏包增强了索引的功能,可使用户在制作和排版文档的同时制作一个或多个索引。这是 \pkg*{imakeidx} 宏包的接口命令,用于设置索引表的整体格式。
+ \pkg*{imakeidx} 宏包增强了索引的功能,可使用户在制作和排版文档的同时制作一个或多个索引。这是 \pkg*{imakeidx} 宏包的接口命令,用于设置索引表的整体格式,它的 \option{level} 和 \option{headers} 选项失效。
\command{index}[\oarg{索引名}\marg{标签}]
索引标签命令的可选参数可以用不同的 \meta{索引名} 给多个索引表设置标签。
\command{makeindex}[\oarg{键值列表}]
用于导言区开启索引收集的命令。这个命令可以重复使用收集多个索引表,以不同的 \meta{索引名} 作为区分,如果仅打印一个索引表没必要重复使用。
\command{printindex}[\sarg\oarg{键值列表}]
- 打印不同索引表的命令。这个命令被重新定义,\meta{键值列表} 中的选项与\ref{subsec:directory command} 其它目录命令相同,但是接口命令 \cs{indexsetup} 的部分选项失效。
+ 打印不同索引表的命令。这个命令被重新定义,\meta{键值列表} 中的选项与\ref{subsec:directory command} 其它目录命令相同,并多出 \option{name} 选项用于指定打印索引的名字。
\keyval{name}{索引名}
指定输出名为 \meta{索引名} 的索引表,如果只使用一个索引表则默认为项目文件名不需要指定。
\end{cnltxlist}
@@ -1464,7 +1503,12 @@ $\blacktriangleright$需要注意正确\textbf{编译索引}要增加 \code{-she
\shortversion{v = 2024cq,date = 2024/07/12,changes = 新增章节标题格式复制命令 \cs{CopyTitleFormat}。}
\shortversion{v = 2024cu,date = 2024/07/20,changes = 修复无编号的定理环境标签命令 \cs*{p@}\meta{定理名} 缺失导致报错的问题。}
\shortversion{v = 2024cx,date = 2024/07/28,changes = 新增将脚注置于页面底部的命令 \cs{PushFntBottom}。}
- \shortversion{v = 2024de,date = 2024/08/03,changes = 取消默认载入 \pkg*{ulem} 下划线宏包。}
+ \begin{version}[v = 2024df,date = 2024/08/05]
+ \changed
+ \item 取消默认载入 \pkg*{ulem} 下划线宏包。
+ \added
+ \item 使用 \pkg*{xtemplate} 宏包将封面标题命令 \cs{maketitle} 抽象为由实例组成的模板。
+ \end{version}
\end{changelog}
\nocite{*}
% \AddToHook{cmd/printindex/before}{\clearpage}
diff --git a/macros/latex/contrib/mercatormap/CHANGES.md b/macros/latex/contrib/mercatormap/CHANGES.md
index 3d699e9b47..49ef66fb7a 100644
--- a/macros/latex/contrib/mercatormap/CHANGES.md
+++ b/macros/latex/contrib/mercatormap/CHANGES.md
@@ -16,6 +16,29 @@ and this project adheres to
### Security
+
+## [1.2.0] - 2024-08-05
+
+### Added
+- Command `\ifmrcNPexists` to test existence of a named position
+- Macros `\mrcAnimAngle` and `\l_mermap_anim_angle_fp` to measure
+ the current orthodrome angle
+- Animation example for static maps
+
+### Changed
+- `\mrcNPlat` and `\mrcNPlon` result to 0 now, if named position does not exist
+- `\ifmrcNPinmap` and `\ifmrcNPinvicinity` result to `false` now, if named position does not exist
+- Point definitions on an orthodrome now take an optional angle as result:
+ - Command `mrcNPfromOrthoFraction`
+ - Command `mrcNPfromOrthoFractionNamed`
+ - Command `mrcNPfromOrthoDistance`
+ - Command `mrcNPfromOrthoDistanceNamed`
+
+### Fixed
+- Documentation contained dates from `2023` instead of `2024`
+
+
+
## [1.1.0] - 2024-08-01
### Added
diff --git a/macros/latex/contrib/mercatormap/README.md b/macros/latex/contrib/mercatormap/README.md
index dcea9833cc..b7b4be29ab 100644
--- a/macros/latex/contrib/mercatormap/README.md
+++ b/macros/latex/contrib/mercatormap/README.md
@@ -1,4 +1,4 @@
-# The LaTeX package mercatormap - version 1.1.0 (2024/08/01)
+# The LaTeX package mercatormap - version 1.2.0 (2024/08/05)
> Copyright (c) 2020-2024 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
diff --git a/macros/latex/contrib/mercatormap/mercatormap-example.tex b/macros/latex/contrib/mercatormap/mercatormap-example.tex
index fbd0bd7e17..333a249590 100644
--- a/macros/latex/contrib/mercatormap/mercatormap-example.tex
+++ b/macros/latex/contrib/mercatormap/mercatormap-example.tex
@@ -1,7 +1,7 @@
% \LaTeX-Main\
% !TeX encoding=UTF-8
%%
-%% The LaTeX package mercatormap - version 1.1.0 (2024/08/01)
+%% The LaTeX package mercatormap - version 1.2.0 (2024/08/05)
%% mercatormap-example.tex: Example document with a map
%%
%% -------------------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/mercatormap/mercatormap.doc.animations.tex b/macros/latex/contrib/mercatormap/mercatormap.doc.animations.tex
index 67671dc165..022b856a61 100644
--- a/macros/latex/contrib/mercatormap/mercatormap.doc.animations.tex
+++ b/macros/latex/contrib/mercatormap/mercatormap.doc.animations.tex
@@ -46,7 +46,8 @@ PDF with a sequence of maps (frames) following such an animation path.
\item Movement along an orthodrome from starting to final position with an unchanged
common scale denominator.
\item Zoom in or out on a fixed position.
- \item Combination of both animation.
+ \item Combination of both animations.
+ \item Animated orthodrome drawing on a static map.
\end{itemize}
For more complex animations, several \refEnv{mrcAnimation} environments may be
used consecutively.
@@ -92,13 +93,54 @@ PDF with a sequence of maps (frames) following such an animation path.
\end{dispExample*}
+
+\clearpage
+\begin{dispExample*}{breakable}
+ % \usepackage{fontawesome5}
+ \mrcNPdef{heathrow}{51.4678}{-0.4548}
+ \mrcNPdef{lax}{33.9421}{-118.4088}
+ \mrcNPdef{reykjavik}{64.1289}{-21.9369}
+
+ \begin{tcbraster}[raster height=22cm,raster columns=2,raster rows=4,
+ tile,size=minimal,boxsep=1pt,colback=black!20 ]
+ \begin{mrcAnimation}
+ {
+ named-start-position = heathrow,
+ named-final-position = lax,
+ frames = 8,
+ }
+ \begin{tcolorbox}
+ \begin{tikzpicture}
+ \mrcmap
+ [
+ type = areafit,
+ area = {heathrow,lax,reykjavik},
+ source = topplusopen web,
+ tex width = \tcbtextwidth,
+ tex height = \tcbtextheight,
+ flex area fit = 8mm,
+ ]{london-lax-\mrcAnimFrame}
+ \mrcdrawmap
+ \node[above left,font=\fontsize{3.5pt}{3.5pt}\sffamily]
+ at (mrcmap.south east) {\mrcmapattribution};
+ \mrcclipmap
+ \mrcNPdraworthodrome[red,very thick]{heathrow}{AnimNP}
+ \node[red!70!black,rotate=\mrcAnimAngle]
+ at (\mrcNPcs{AnimNP}) {\large\faPlane};
+ \end{tikzpicture}
+ \end{tcolorbox}
+ \end{mrcAnimation}
+ \end{tcbraster}
+\end{dispExample*}
+
+
\clearpage
%-------------------------------------------------------------------------------
\subsection{Animation Options}\label{ref:animOptions}
\begin{docMrcKeys}[
doc keypath = anim,
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = start-position,
@@ -117,7 +159,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\begin{docMrcKeys}[
doc keypath = anim,
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = final-position,
@@ -136,7 +178,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\begin{docMrcKeys}[
doc keypath = anim,
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = position,
@@ -158,7 +200,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\begin{docMrcKeys}[
doc keypath = anim,
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = frames,
@@ -175,7 +217,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\begin{docMrcKeys}[
doc keypath = anim,
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
doc parameter = {\colOpt{=true\textbar false}},
doc description = {default |true|, initially |false|},
]{
@@ -194,7 +236,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\begin{docMrcKeys}[
doc keypath = anim,
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = drop-no-frame,
@@ -207,7 +249,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\begin{docMrcKeys}[
doc keypath = anim,
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = scale-denominators,
@@ -238,7 +280,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\begin{docMrcKeys}[
doc keypath = anim,
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = common-scale-denominator,
@@ -257,7 +299,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\clearpage
\begin{docMrcKeys}[
doc keypath = anim,
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = timewarp,
@@ -274,7 +316,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\begin{docCommands}[
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = mrcTimewarpIdentity,
@@ -287,7 +329,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\begin{docMrcKeys}[
doc keypath = anim,
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = timewarp-identity,
@@ -300,7 +342,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\begin{docCommands}[
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = mrcTimewarpSlowStart,
@@ -314,7 +356,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\begin{docMrcKeys}[
doc keypath = anim,
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = timewarp-slow-start,
@@ -332,7 +374,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\begin{docCommands}[
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = mrcTimewarpSlowFinal,
@@ -346,7 +388,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\begin{docMrcKeys}[
doc keypath = anim,
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = timewarp-slow-final,
@@ -364,7 +406,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\begin{docCommands}[
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = mrcTimewarpSlowStartFinal,
@@ -379,7 +421,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\begin{docMrcKeys}[
doc keypath = anim,
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = timewarp-slow-start-final,
@@ -402,7 +444,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\subsection{Macros inside the Animation Environment}\label{ref:animMacros}
\begin{docCommands}[
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = mrcAnimFrame,
@@ -416,7 +458,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\begin{docCommands}[
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = mrcAnimTime,
@@ -430,7 +472,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\begin{docCommands}[
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = mrcAnimScaleDenom,
@@ -444,7 +486,7 @@ PDF with a sequence of maps (frames) following such an animation path.
\begin{docCommands}[
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = mrcAnimLatitude,
@@ -457,9 +499,8 @@ PDF with a sequence of maps (frames) following such an animation path.
\end{docCommands}
-
\begin{docCommands}[
- doc new = 2023-07-31,
+ doc new = 2024-07-31,
]{
{
doc name = mrcAnimLongitude,
@@ -472,6 +513,23 @@ PDF with a sequence of maps (frames) following such an animation path.
\end{docCommands}
+\begin{docCommands}[
+ doc new = 2024-08-05,
+ ]{
+ {
+ doc name = mrcAnimAngle,
+ },
+ {
+ doc name = l_mermap_anim_angle_fp,
+ },
+ }
+ Current angle between the tangent vector to the orthodrome and
+ the current parallel circle.
+\end{docCommands}
+
+
+
+
\docValue{AnimNP}\tcbdocmarginnote{\tcbdocnew{2024-07-31}}:
The current named position.
diff --git a/macros/latex/contrib/mercatormap/mercatormap.doc.definition.tex b/macros/latex/contrib/mercatormap/mercatormap.doc.definition.tex
index 5c914dd012..01667cd1d3 100644
--- a/macros/latex/contrib/mercatormap/mercatormap.doc.definition.tex
+++ b/macros/latex/contrib/mercatormap/mercatormap.doc.definition.tex
@@ -298,9 +298,10 @@ A map point can be defined even quicker by
\end{docCommand}
-\begin{docCommand}{mrcNPlat}{\marg{name}}
+\begin{docCommand}[doc updated=2024-08-02]{mrcNPlat}{\marg{name}}
Inserts the \emph{latitude} of a \emph{named position} with given \meta{name}.
\refCom{mrcNPlat} is expandable and may be used in floating point expressions.
+ If the \meta{name} does not exist, the macro expands to |0|.
\begin{dispExample}
\mrcNPdef{nuremberg}{49.45522}{11.07631}
Latitude: \mrcNPlat{nuremberg}\\
@@ -309,9 +310,16 @@ A map point can be defined even quicker by
\end{docCommand}
-\begin{docCommand}{mrcNPlon}{\marg{name}}
+\begin{docCommand}[doc updated=2024-08-02]{mrcNPlon}{\marg{name}}
Inserts the \emph{longitude} of a \emph{named position} with given \meta{name}.
\refCom{mrcNPlon} is expandable and may be used in floating point expressions.
+ If the \meta{name} does not exist, the macro expands to |0|.
+\end{docCommand}
+
+
+\begin{docCommand}[doc new=2024-08-02]{ifmrcNPexists}{\marg{name}\marg{true}\marg{false}}
+ If the given \emph{named position} with given \meta{name} exists, the \meta{true} code is executed, otherwise
+ the \meta{false} code.
\end{docCommand}
diff --git a/macros/latex/contrib/mercatormap/mercatormap.doc.orthodromes.tex b/macros/latex/contrib/mercatormap/mercatormap.doc.orthodromes.tex
index ec69b5e73b..6f9620fae0 100644
--- a/macros/latex/contrib/mercatormap/mercatormap.doc.orthodromes.tex
+++ b/macros/latex/contrib/mercatormap/mercatormap.doc.orthodromes.tex
@@ -102,15 +102,15 @@ The mathematical background and further information are found in \cite{Sturm:202
\subsection{Orthodrome Points}
\begin{docCommands}[
- doc new = 2024-08-01,
]{
{
+ doc new and updated = {2024-08-01}{2024-08-05},
doc name = mrcNPfromOrthoFraction,
- doc parameter = \marg{name}\marg{lat1}\marg{lon1}\marg{lat2}\marg{lon2}\marg{fraction},
+ doc parameter = \marg{name}\oarg{\textbackslash angle}\marg{lat1}\marg{lon1}\marg{lat2}\marg{lon2}\marg{fraction},
},
{
doc name = mrcNPfromOrthoFractionNamed,
- doc parameter = \marg{name}\marg{name1}\marg{name2}\marg{fraction},
+ doc parameter = \marg{name}\oarg{\textbackslash angle}\marg{name1}\marg{name2}\marg{fraction},
},
}
Defines a new named position \meta{name} which is located on a \meta{fraction}
@@ -121,6 +121,9 @@ The mathematical background and further information are found in \cite{Sturm:202
latitude \meta{lat2} and longitude \meta{lon2} (or described by a named position \meta{name2}).
The given starting and final point of the orthodrome need to have a distance of more than
\SI{1}{\meter}.
+ If \meta{\textbackslash angle} is given, this macro is set to the
+ angle between the tangent vector to the orthodrome and
+ the current parallel circle.
\tikzsetnextfilename{ortho_orthodrome3}%
\begin{dispExample}
@@ -142,8 +145,10 @@ The mathematical background and further information are found in \cite{Sturm:202
\mrcNPdraworthodrome[red,very thick] {munich}{newyork}
\foreach \fraction in { 0.1,0.3,0.5,0.7,1.0,1.1 }
{
- \mrcNPfromOrthoFractionNamed{waypoint}{munich}{newyork}{\fraction}
- \mrcmarker{type=pin,named position=waypoint,contents={\fraction}}
+ \mrcNPfromOrthoFractionNamed{waypoint}[\myangle]
+ {munich}{newyork}{\fraction}
+ \mrcmarker{type=pin,named position=waypoint,
+ contents={\fraction: \fpeval{round(\myangle)}\textdegree }}
}
\end{tikzpicture}
\end{dispExample}
@@ -152,15 +157,15 @@ The mathematical background and further information are found in \cite{Sturm:202
\clearpage
\begin{docCommands}[
- doc new = 2024-08-01,
]{
{
+ doc new and updated = {2024-08-01}{2024-08-05},
doc name = mrcNPfromOrthoDistance,
- doc parameter = \marg{name}\marg{lat1}\marg{lon1}\marg{lat2}\marg{lon2}\marg{distance},
+ doc parameter = \marg{name}\oarg{\textbackslash angle}\marg{lat1}\marg{lon1}\marg{lat2}\marg{lon2}\marg{distance},
},
{
doc name = mrcNPfromOrthoDistanceNamed,
- doc parameter = \marg{name}\marg{name1}\marg{name2}\marg{distance},
+ doc parameter = \marg{name}\oarg{\textbackslash angle}\marg{name1}\marg{name2}\marg{distance},
},
}
Defines a new named position \meta{name} which is located on a \meta{distance}
@@ -171,6 +176,9 @@ The mathematical background and further information are found in \cite{Sturm:202
latitude \meta{lat2} and longitude \meta{lon2} (or described by a named position \meta{name2}).
The given starting and final point of the orthodrome need to have a distance of more than
\SI{1}{\meter}. The unit for the \meta{distance} is kilometer.
+ If \meta{\textbackslash angle} is given, this macro is set to the
+ angle between the tangent vector to the orthodrome and
+ the current parallel circle.
\tikzsetnextfilename{ortho_orthodrome4}%
\begin{dispExample}
diff --git a/macros/latex/contrib/mercatormap/mercatormap.doc.sty b/macros/latex/contrib/mercatormap/mercatormap.doc.sty
index 1eab49098f..95b45544d7 100644
--- a/macros/latex/contrib/mercatormap/mercatormap.doc.sty
+++ b/macros/latex/contrib/mercatormap/mercatormap.doc.sty
@@ -39,6 +39,8 @@
\RequirePackage{\mrcpkgprefix mercatormap}
\IfFileExists{../private/privatekeys.tex}{\input{../private/privatekeys.tex}}{}
+\RequirePackage{fontawesome5}
+
\RequirePackage{csquotes}
\RequirePackage[%style=authoryear,
style=numeric-comp,
diff --git a/macros/latex/contrib/mercatormap/mercatormap.pdf b/macros/latex/contrib/mercatormap/mercatormap.pdf
index d39519309c..1c0c7dc3d8 100644
--- a/macros/latex/contrib/mercatormap/mercatormap.pdf
+++ b/macros/latex/contrib/mercatormap/mercatormap.pdf
Binary files differ
diff --git a/macros/latex/contrib/mercatormap/mercatormap.sty b/macros/latex/contrib/mercatormap/mercatormap.sty
index c9b8048659..b9f77b9715 100644
--- a/macros/latex/contrib/mercatormap/mercatormap.sty
+++ b/macros/latex/contrib/mercatormap/mercatormap.sty
@@ -1,4 +1,4 @@
-%% The LaTeX package mercatormap - version 1.1.0 (2024/08/01)
+%% The LaTeX package mercatormap - version 1.2.0 (2024/08/05)
%% mercatormap.sty: geographic coordinates (Mercator projection) and map tiles for TikZ pictures
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
\NeedsTeXFormat{LaTeX2e}[2023-11-01]
-\ProvidesExplPackage{mercatormap}{2024/08/01}{1.1.0}
+\ProvidesExplPackage{mercatormap}{2024/08/05}{1.2.0}
{A Web Mercator projection package with map tile support}
\RequirePackage{siunitx,graphicx,tikz}
@@ -330,7 +330,7 @@
}
-\prg_new_conditional:Npnn \__mermap_if_in_map:nn #1#2 { p, TF }
+\prg_new_conditional:Npnn \__mermap_if_in_map:nn #1#2 { p, T, F, TF }
{
\fp_compare:nNnTF {#1} > \l__mermap_mapnorth_fp
{
@@ -368,7 +368,7 @@
}
-\prg_new_conditional:Npnn \__mermap_if_in_vicinity:nn #1#2 { p, TF }
+\prg_new_conditional:Npnn \__mermap_if_in_vicinity:nn #1#2 { p, T, F, TF }
{
\fp_compare:nNnTF {#1} > \l__mermap_vic_north_fp
{
@@ -445,19 +445,13 @@
\NewExpandableDocumentCommand \mrcNPlat { m }
{
- \cs_if_exist_use:cF{__mermap__lat__#1}
- {
- \msg_error:nnx{ mercatormap }{ np-undefined }{ #1 }
- }
+ \cs_if_exist_use:cF{ __mermap__lat__#1 }{ 0 }
}
\NewExpandableDocumentCommand \mrcNPlon { m }
{
- \cs_if_exist_use:cF{__mermap__lon__#1}
- {
- \msg_error:nnx{ mercatormap }{ np-undefined }{ #1 }
- }
+ \cs_if_exist_use:cF{ __mermap__lon__#1 }{ 0 }
}
@@ -467,15 +461,75 @@
}
+\prg_new_conditional:Npnn \__mermap_if_NP_exists:n #1 { p, TF }
+ {
+ \cs_if_exist:cTF{ __mermap__lat__#1 }
+ {
+ \cs_if_exist:cTF{ __mermap__lon__#1 }
+ {
+ \prg_return_true:
+ }
+ {
+ \prg_return_false:
+ }
+ }
+ {
+ \prg_return_false:
+ }
+ }
+
+
+\NewDocumentCommand{\ifmrcNPexists}{ m }
+ {
+ \__mermap_if_NP_exists:nTF{ #1 }
+ }
+
+
+\prg_new_conditional:Npnn \__mermap_if_NP_in_map:n #1 { p, TF }
+ {
+ \__mermap_if_NP_exists:nTF { #1 }
+ {
+ \__mermap_if_in_map:nnTF{ \mrcNPlat{#1} }{ \mrcNPlon{#1} }
+ {
+ \prg_return_true:
+ }
+ {
+ \prg_return_false:
+ }
+ }
+ {
+ \prg_return_false:
+ }
+ }
+
+
\NewDocumentCommand{\ifmrcNPinmap}{ m }
{
- \__mermap_if_in_map:nnTF{\mrcNPlat{#1}}{\mrcNPlon{#1}}
+ \__mermap_if_NP_in_map:nTF { #1 }
+ }
+
+
+\prg_new_conditional:Npnn \__mermap_if_NP_in_vicinity:n #1 { p, TF }
+ {
+ \__mermap_if_NP_exists:nTF { #1 }
+ {
+ \__mermap_if_in_vicinity:nnTF{ \mrcNPlat{#1} }{ \mrcNPlon{#1} }
+ {
+ \prg_return_true:
+ }
+ {
+ \prg_return_false:
+ }
+ }
+ {
+ \prg_return_false:
+ }
}
\NewDocumentCommand{\ifmrcNPinvicinity}{ m }
{
- \__mermap_if_in_vicinity:nnTF{\mrcNPlat{#1}}{\mrcNPlon{#1}}
+ \__mermap_if_NP_in_vicinity:nTF{ #1 }
}
@@ -2264,12 +2318,16 @@
\fp_new:N \l__mermap_b_x_fp
\fp_new:N \l__mermap_b_y_fp
\fp_new:N \l__mermap_b_z_fp
+\fp_new:N \l__mermap_alpha_fp
\fp_new:N \l__mermap_delta_lambda_fp
\fp_new:N \l__mermap_delta_phi_fp
+\fp_new:N \l__mermap_n_x_fp
+\fp_new:N \l__mermap_n_y_fp
+\fp_new:N \l__mermap_n_z_fp
\fp_new:N \l__mermap_psi_fp
\fp_new:N \l__mermap_sin_psi_fp
-\fp_new:N \l__mermap_t_psi_fp
\fp_new:N \l__mermap_t_fp
+\fp_new:N \l__mermap_t_psi_fp
\fp_new:N \l__mermap_t_x_fp
\fp_new:N \l__mermap_t_y_fp
\fp_new:N \l__mermap_t_z_fp
@@ -2364,6 +2422,31 @@
}
+\cs_new_protected:Npn \__mermap_angle_at_orthodrome:
+ {
+ \bool_if:NTF \l__mermap_linearization_bool
+ {
+ \fp_set:Nn \l__mermap_alpha_fp { 90 }
+ }
+ {
+ \fp_set:Nn \l__mermap_tmpa_fp { cosd( \l__mermap_psi_fp - \l__mermap_t_psi_fp ) }
+ \fp_set:Nn \l__mermap_tmpb_fp { cosd( \l__mermap_t_psi_fp ) }
+ \fp_set:Nn \l__mermap_n_x_fp { \l__mermap_tmpb_fp*\l__mermap_b_x_fp - \l__mermap_tmpa_fp*\l__mermap_a_x_fp }
+ \fp_set:Nn \l__mermap_n_y_fp { \l__mermap_tmpb_fp*\l__mermap_b_y_fp - \l__mermap_tmpa_fp*\l__mermap_a_y_fp }
+ \fp_set:Nn \l__mermap_n_z_fp { \l__mermap_tmpb_fp*\l__mermap_b_z_fp - \l__mermap_tmpa_fp*\l__mermap_a_z_fp }
+ \fp_set:Nn \l__mermap_tmpa_fp { sqrt( \l__mermap_n_x_fp^2 + \l__mermap_n_y_fp^2 + \l__mermap_n_z_fp^2 ) }
+ \fp_set:Nn \l__mermap_n_x_fp { \l__mermap_n_x_fp / \l__mermap_tmpa_fp }
+ \fp_set:Nn \l__mermap_n_y_fp { \l__mermap_n_y_fp / \l__mermap_tmpa_fp }
+ \fp_set:Nn \l__mermap_n_z_fp { \l__mermap_n_z_fp / \l__mermap_tmpa_fp }
+ \fp_set:Nn \l__mermap_alpha_fp { acosd( \l__mermap_n_y_fp*cosd(\l__mermap_cs_lon_fp) - \l__mermap_n_x_fp*sind(\l__mermap_cs_lon_fp) ) }
+ \fp_compare:nNnT \l__mermap_n_z_fp < 0
+ {
+ \fp_set:Nn \l__mermap_alpha_fp { 360 - \l__mermap_alpha_fp }
+ }
+ }
+ }
+
+
\NewDocumentCommand \mrcdraworthodrome { O{} mmmm }
{
\__mermap_draw_orthodrome:nnnnn {#1}{#2}{#3}{#4}{#5}
@@ -2442,50 +2525,65 @@
\NewDocumentCommand \mrcNPprettyloxodistance { mm }
{
- \__mermap_loxo_distance:nnnn {\mrcNPlat{#1}}{\mrcNPlon{#1}}{\mrcNPlat{#2}}{\mrcNPlon{#2}}
+ \__mermap_loxo_distance:nnnn { \mrcNPlat{#1} }{ \mrcNPlon{#1} }{ \mrcNPlat{#2} }{ \mrcNPlon{#2} }
\__mermap_pretty_distance:n { \l__mermap_result_fp }
}
-\NewDocumentCommand \mrcNPfromOrthoFraction { mmmmmm }
+\cs_new_protected:Npn \__mermap_orthodrome_point:nnn #1#2#3
{
- \__mermap_setup_orthodrome:nnnn { #2 }{ #3 }{ #4 }{ #5 }
- \__mermap_point_on_orthodrome:n { #6 }
+ \__mermap_point_on_orthodrome:n { #3 }
\__mermap_set_named_position { #1 }{ \l__mermap_cs_lat_fp }{ \l__mermap_cs_lon_fp }
+ \IfNoValueF { #2 }
+ {
+ \__mermap_angle_at_orthodrome:
+ \cs_set:Npe #2 { \fp_to_decimal:N \l__mermap_alpha_fp }
+ }
}
-\NewDocumentCommand \mrcNPfromOrthoFractionNamed { mmmm }
+\NewDocumentCommand \mrcNPfromOrthoFraction { mo mm mm m }
{
- \__mermap_setup_orthodrome:nnnn { \mrcNPlat{#2} }{ \mrcNPlon{#2} }{ \mrcNPlat{#3} }{ \mrcNPlon{#3} }
- \__mermap_point_on_orthodrome:n { #4 }
- \__mermap_set_named_position { #1 }{ \l__mermap_cs_lat_fp }{ \l__mermap_cs_lon_fp }
+ \__mermap_setup_orthodrome:nnnn { #3 }{ #4 }{ #5 }{ #6 }
+ \__mermap_orthodrome_point:nnn { #1 }{ #2 }{ #7 }
}
-\NewDocumentCommand \mrcNPfromOrthoDistance { mmmmmm }
+\NewDocumentCommand \mrcNPfromOrthoFractionNamed { mo m m m }
{
- \__mermap_ortho_distance:nnnn { #2 }{ #3 }{ #4 }{ #5 }
+ \__mermap_setup_orthodrome:nnnn { \mrcNPlat{#3} }{ \mrcNPlon{#3} }{ \mrcNPlat{#4} }{ \mrcNPlon{#4} }
+ \__mermap_orthodrome_point:nnn { #1 }{ #2 }{ #5 }
+ }
+
+\NewDocumentCommand \mrcNPfromOrthoDistance { mo mm mm m }
+ {
+ \__mermap_ortho_distance:nnnn { #3 }{ #4 }{ #5 }{ #6 }
\fp_compare:nNnTF \l__mermap_result_fp > { 0.001 }
{
- \__mermap_setup_orthodrome:nnnn { #2 }{ #3 }{ #4 }{ #5 }
- \__mermap_point_on_orthodrome:n { #6 / \l__mermap_result_fp }
- \__mermap_set_named_position { #1 }{ \l__mermap_cs_lat_fp }{ \l__mermap_cs_lon_fp }
+ \__mermap_setup_orthodrome:nnnn { #3 }{ #4 }{ #5 }{ #6 }
+ \__mermap_orthodrome_point:nnn { #1 }{ #2 }{ #7 / \l__mermap_result_fp }
}
{
- \__mermap_set_named_position { #1 }{ #2 }{ #3 }
+ \__mermap_set_named_position { #1 }{ #3 }{ #4 }
+ \IfNoValueF { #2 }
+ {
+ \cs_set:Npn #2 { 90 }
+ }
}
}
-\NewDocumentCommand \mrcNPfromOrthoDistanceNamed { mmmm }
+\NewDocumentCommand \mrcNPfromOrthoDistanceNamed { mo m m m }
{
- \__mermap_ortho_distance:nnnn { \mrcNPlat{#2} }{ \mrcNPlon{#2} }{ \mrcNPlat{#3} }{ \mrcNPlon{#3} }
+ \__mermap_ortho_distance:nnnn { \mrcNPlat{#3} }{ \mrcNPlon{#3} }{ \mrcNPlat{#4} }{ \mrcNPlon{#4} }
\fp_compare:nNnTF \l__mermap_result_fp > { 0.001 }
{
- \__mermap_setup_orthodrome:nnnn { \mrcNPlat{#2} }{ \mrcNPlon{#2} }{ \mrcNPlat{#3} }{ \mrcNPlon{#3} }
- \__mermap_point_on_orthodrome:n { #4 / \l__mermap_result_fp }
- \__mermap_set_named_position { #1 }{ \l__mermap_cs_lat_fp }{ \l__mermap_cs_lon_fp }
+ \__mermap_setup_orthodrome:nnnn { \mrcNPlat{#3} }{ \mrcNPlon{#3} }{ \mrcNPlat{#4} }{ \mrcNPlon{#4} }
+ \__mermap_orthodrome_point:nnn { #1 }{ #2 }{ #5 / \l__mermap_result_fp }
}
{
- \__mermap_set_named_position { #1 }{ \mrcNPlat{#2} }{ \mrcNPlon{#2} }
+ \__mermap_set_named_position { #1 }{ \mrcNPlat{#3} }{ \mrcNPlon{#3} }
+ \IfNoValueF { #2 }
+ {
+ \cs_set:Npn #2 { 90 }
+ }
}
}
@@ -2503,6 +2601,7 @@
\fp_new:N \l__mermap_anim_b_lon_fp
\fp_new:N \l__mermap_anim_b_scaledenom_fp
\fp_new:N \l__mermap_anim_b_time_fp
+\fp_new:N \l_mermap_anim_angle_fp
\fp_new:N \l_mermap_anim_lat_fp
\fp_new:N \l_mermap_anim_lon_fp
\fp_new:N \l_mermap_anim_scaledenom_fp
@@ -2579,11 +2678,13 @@
\fp_set:Nn \l_mermap_anim_time_fp { \l__mermap_anim_timewarp_tl { \l_mermap_anim_time_fp } }
\__mermap_point_on_orthodrome:n { \l_mermap_anim_time_fp }
-
\fp_set_eq:NN \l_mermap_anim_lat_fp \l__mermap_cs_lat_fp
\fp_set_eq:NN \l_mermap_anim_lon_fp \l__mermap_cs_lon_fp
\__mermap_set_named_position{ AnimNP }{ \l_mermap_anim_lat_fp }{ \l_mermap_anim_lon_fp }
+ \__mermap_angle_at_orthodrome:
+ \fp_set_eq:NN \l_mermap_anim_angle_fp \l__mermap_alpha_fp
+
\fp_while_do:nNnn \l_mermap_anim_time_fp > \l__mermap_anim_b_time_fp
{
\fp_set_eq:NN \l__mermap_anim_a_time_fp \l__mermap_anim_b_time_fp
@@ -2730,6 +2831,7 @@
\NewExpandableDocumentCommand\mrcAnimScaleDenom{}{\fp_to_decimal:N \l_mermap_anim_scaledenom_fp}
\NewExpandableDocumentCommand\mrcAnimLatitude{}{\fp_to_decimal:N \l_mermap_anim_lat_fp}
\NewExpandableDocumentCommand\mrcAnimLongitude{}{\fp_to_decimal:N \l_mermap_anim_lon_fp}
+\NewExpandableDocumentCommand\mrcAnimAngle{}{\fp_to_decimal:N \l_mermap_anim_angle_fp}
%---- supplier -----------------------------------------------------------------
diff --git a/macros/latex/contrib/mercatormap/mercatormap.tex b/macros/latex/contrib/mercatormap/mercatormap.tex
index eb73a10ccf..a904cce2f9 100644
--- a/macros/latex/contrib/mercatormap/mercatormap.tex
+++ b/macros/latex/contrib/mercatormap/mercatormap.tex
@@ -2,7 +2,7 @@
% !TeX encoding=UTF-8
% !TeX spellcheck=en_US
%%
-%% The LaTeX package mercatormap - version 1.1.0 (2024/08/01)
+%% The LaTeX package mercatormap - version 1.2.0 (2024/08/05)
%% mercatormap.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
@@ -32,8 +32,8 @@
% The following personal API-keys are needed for compilation
% \mrcsetapikey{thunderforest}{YOUR-API-KEY} % registered key
-\def\version{1.1.0}%
-\def\datum{2024/08/01}%
+\def\version{1.2.0}%
+\def\datum{2024/08/05}%
\mrcactivatescript% activates Python script
diff --git a/macros/latex/contrib/mercatormap/mercatorpy.def b/macros/latex/contrib/mercatormap/mercatorpy.def
index 047dd2267c..0df48609bf 100644
--- a/macros/latex/contrib/mercatormap/mercatorpy.def
+++ b/macros/latex/contrib/mercatormap/mercatorpy.def
@@ -1,6 +1,6 @@
\begin{filecontents}[force,noheader,nowarn]{maptiles.texpy}
"""
-The LaTeX package mercatormap - version 1.1.0 (2024/08/01)
+The LaTeX package mercatormap - version 1.2.0 (2024/08/05)
maptiles.texpy: Python script for map tile download
-------------------------------------------------------------------------------------------
@@ -28,7 +28,7 @@ from pathlib import Path
from PIL import Image
-packageversion = '1.1.0 (2024/08/01)'
+packageversion = '1.2.0 (2024/08/05)'
def gd(x):
diff --git a/macros/latex/contrib/mercatormap/mercatorsupplier.def b/macros/latex/contrib/mercatormap/mercatorsupplier.def
index 36252c83a2..a8063f8135 100644
--- a/macros/latex/contrib/mercatormap/mercatorsupplier.def
+++ b/macros/latex/contrib/mercatormap/mercatorsupplier.def
@@ -1,4 +1,4 @@
-%% The LaTeX package mercatormap - version 1.1.0 (2024/08/01)
+%% The LaTeX package mercatormap - version 1.2.0 (2024/08/05)
%% mercatorsupplier.def: predefined map supplier list
%%
%% -------------------------------------------------------------------------------------------
diff --git a/support/texshop/README.txt b/support/texshop/README.txt
index f8c0d70436..5c17bd2662 100644
--- a/support/texshop/README.txt
+++ b/support/texshop/README.txt
@@ -7,4 +7,4 @@ The main author is Richard Koch, koch@uoregon.edu, with supporting contributions
Consult the program web site, https://pages.uoregon.edu/koch/texshop/texshop.html,
for full source code, an extensive Changes document, and other information.
-The current version, 5.36, was released on May 26, 2024. \ No newline at end of file
+The current version, 5.42, was released on August 5, 2024. \ No newline at end of file
diff --git a/support/texshop/texshop536.html b/support/texshop/texshop536.html
deleted file mode 100644
index 705e6546b3..0000000000
--- a/support/texshop/texshop536.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <title>TeXShop</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-</head>
-
-<body>
-
-
-<!-- main content -->
-<div id="main">
-
-Version 5.36 has one minor bug fix and a major improvement of the PageNumber correction introduced in version 5.35.
-<ul>
-<p><li> In a document with over a thousand pages, the PageNumber box in the toolbar displays the number with a comma, as in 1,325. But users who want to go to a different page must enter the new page number without a comma. This makes it impossible to edit the existing number, say by changing 25 to 17 to go to page 1,317. This is fixed.
-<p><li> Suppose a document has several pages of preliminary material before the main text begins. Perhaps these preliminary pages are numbered i, ii, iii, iv, v, ... and the main pages are numbered 1, 2, 3, 4, 5, ... Then entries in the PageNumber box will not be in sync with the actual page numbers in the text. The previous version of TeXShop introduced a fix for this problem, which required the user to insert a magic comment line and manually indicate the number of preliminary pages. The fix then numbered the preliminary pages 1#, 2#, 3#, ... and the main pages 1, 2, 3, ...
-Moreover, users could enter a number like 17 in the box to go to main page 17, and 2# in the box to go to the second preliminary page.
-
-<p> This fix is still present in TeXShop 5.36, but the method of turning it on has been supplanted by a better method which does not require a magic comment line. The new method adds a macro to the source file which inserts an extra line in the console output and log file
-during typesetting. That line reads "Start of main material: 3." Here 3 is replaced with the page number of the first main page. TeXShop looks for this line during typesetting; if it occurs, the PageNumber is modified as in the old method. A big advantage is that as the preliminary material grows during editing, the fix automatically adjusts without user intervention.
-
-<p> To activate this fix when using LaTeX and related engines, add the line
-<pre>
- \write128{Start of main material: \the\ReadonlyShipoutCounter.}
-</pre>
-to a spot in the source just after the main material is introduced.
-
-<p> If instead you are using plain TeX or related engines, add the line
-<pre>
- \write128{Start of main material: \the\pageno.}
-</pre>
-to a spot in the source just after the main material is introduced.
-
-
-<p> TeXShop users need to find a way to remember these additional lines. Some may add items to the Macro
-menu, while others may modify their templates. It is also possible to add appropriate items to the Command Completion dictionary.
-
-<p> After these lines have been added to the source, it is necessary to typeset to see changes in the PageNumber box. A lot of effort has gone into modifying the PageNumber whenever appropriate information is available in the log file. When TeXShop opens a new document, it checks to see if a log file is present, and if so it reads the log file to adjust the PageNumber box. If TeXShop is closed while documents are open, the documents will reappear the next time TeXShop starts with correct PageNumber entries.
-
-<p> Suppose a situation I did not anticipate causes the new code to crash the program when reading an old document, even when the extra lines above have not been added to the source. In that case, write me immediately and I'll fix the problem. But in the meantime, you can fix the crash. Add the magic comment below to the top of the source. This comment completely cancels all of the new code, and the number 0 in the comment tells it to make no changes in the numbering.
-<pre>
- % !TEX numberingCorrection = 0 + current - desired
-</pre>
-
-<p> Fixing Page Number boxes is a standard feature of pdf display programs like Preview, Skim, and Adobe Acrobat. These programs do not have access to the source file, and often work by parsing the table of contents information in the pdf file. TeXShop is a program for authors rather than a pdf display program, so it is natural for it to find the information to fix the Page Number box in the source file.
-
-<p> Some users may prefer to view pdf files in TeXShop. If these users have access to the Log file associated with the pdf, they can get Number Box correction without using the source file. Just place the Log file in the same location as the pdf file, and TeXShop will automatically open and parse it, and adjust Page Numbers accordingly.
-
-<p> This feature is even available if you do not have access to the Log file. For example, the Driver Manual for my car is a pdf file with two preliminary pages and then the main pages numbered 1, 2, 3, ... Using Apple's Text Edit in plain text mode, I created a small file with the same name as the pdf manual, but extension ".log". The complete contents of this file were
-<pre>
- Start of main material: 3.
-</pre>
-After this file was placed in the location of the manual, opening the manual in TeXShop provided PageNumber boxes with the correct numbering.
-</ul>
-
-<p>
-<p>
-</div>
-
-
-</body>
-</html> \ No newline at end of file
diff --git a/support/texshop/texshop542.html b/support/texshop/texshop542.html
new file mode 100644
index 0000000000..990aec54dc
--- /dev/null
+++ b/support/texshop/texshop542.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title>TeXShop</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+</head>
+
+<body>
+
+
+<!-- main content -->
+<div id="main">
+
+Versions 5.37 - 5.41 were never released. Version 5.42 has seven small changes and one major additional feature:
+<ul>
+<p><li> Recall that version 5.36 fixed a bug reported by Hans Schoutens which surfaced when his document reached a length of 1000 pages. His Page Number box displayed the number with a comma, writing for instance 1,213. In that case, it was not possible to use the box to go to page 1,209 by just changing the last two digits, because TeXShop ignores all numerals after the comma. I fixed this problem by removing all commas in the box before using the number to go to another page.
+<p>Shortly after making this fix, a similar complaint came from Emilio Faro Rivas. But in his country, periods are used to separate groups of three digits, and commas are used to set off the fractional part of a number. So while I would write 1,213.74, Rivas would write 1.213,74.
+
+<p> In the Language & Region control panel, Apple provides four different ways to determine how numbers are written. Since page numbers cannot have fractional part, TeXShop now removes all commas and periods from the Page Number box before interpreting the number.
+
+<p> Learning of two books with more than 1000 pages in the course of a couple of days reminded me of the English critic who met Edward Gibbons after skimming through the volumes of the Decline and Fall of the Roman Empire, and said "always scribble, scribble, scribble, eh Mr Gibbons.''
+<p><li> Version 5.42 fixes a bug reported by Juan Luis Varona Malumbres. In TeXShop Preferences under the Misc2 tab, there is an item reading "During File Save, Automatic UTF-8-Mac to UTF-8 Conversion", but this item no longer worked. I checked back to TeXShop 5.18 and the item was already broken then. The ultimate cause is embarrassing. TeXShop's code interpreting a change in this preference read as follows
+<pre>
+ 1) Remember the old Conversion value so we can undo if the user clicks "Cancel" rather than "OK"
+ 2) Activate the font panel for the Console Font.
+ 3) Modify the Console Font if the user chooses a new font.
+</pre>
+Huh? It turns out that sometime in the past, a mistaken copy and paste operation replaced the rest of the
+code for Conversion with pieces of code for the Console Font. Miraculously, that bad code still compiled, and
+caused no problems when the Preference Panel ran except that the Conversion item no longer worked. The misplaced Console code also existed in its regular spot, where it did what it was supposed to do. The bad code was removed and the original code was reinserted. Problem fixed.
+<p><li> Peter Smith requested that the keyboard shortcut command-T also apply if an Experiment window is open, and typeset for that window rather than for the entire document. Done.
+<p><li> If TeXShop opens the Log file of a project, a header at the top allows users to filter the contents of the log file based on various criteria, showing for instance all warnings, or all underfull boxes. This feature was added to TeXShop twenty years ago, and I had completely forgotten how it works. It turns out that texloganalyser is a perl script
+by Thomas van Oudenhove, which he has maintained over the years. This script is in TeXLive, and TeXShop
+ calls the script to parse. Thanks, Thomas van Oudenhove, after all these years!
+ <p> This script does not have an option to print only error messages. But error messages in files typeset by TeXShop leave an easy-to-recognize trace in the log file due to the flag "-file-line-error" added by default in Preferences.
+ TeXShop already uses this trace to implement Goto Error. So an extra button has been added to the header when TeXShop displays Log Files allowing users to search for error messages.
+ <p><li> TeXShop can now open, write, and edit .adoc files. This was requested by Richard Bennett, who wrote that he is transitioning to using the asciidoc format and wanted to edit such files in TeXShop.
+ <p><li> In languages like Spanish, many words begin with "part", so using "part" as a trigger word in the Tags menu leads to incorrect items. This problem is fixed by changing the trigger to "part{".
+ <p><li> Finally, a comment about the PageNumber correction system introduced in versions 5.35 and 5.36
+ of TeXshop. Large documents often begin with preliminary pages, numbered with Roman numerals. After that, the main pages begin, with numbering starting at page 1. But then the page number in the TeXShop Page Number Box does not agree with the actual page number shown in the document.
+<p> Version 5.36 provides an easy fix by asking the author to add just one line of source code. After the fix, TeXShop reports preliminary pages as 1#, 2#, 3#, ..., and then regular pages as 1, 2, 3, ...
+<p> To activate this fix when using LaTeX and related engines, add the line
+<pre>
+ \write128{Start of main material: \the\ReadonlyShipoutCounter.}
+</pre>
+to a spot in the source just after the main material is introduced.
+
+<p> If instead you are using plain TeX or related engines, add the line
+<pre>
+ \write128{Start of main material: \the\pageno.}
+</pre>
+to a spot in the source just after the main material is introduced.
+<p> Alan C. Bowen pointed out that the fix also works in ConTeXt, and in that case the line to add is
+<pre>
+ \write128{Start of main material: \the\realpageno}
+</pre>
+<p><li>The new feature is that TeXShop can now annotate pages of a pdf document.
+See the "Annotation" chapter of the TeXShop manual for details.
+<p> It has always been possible to annotate pdf files created by TeXShop using a third party program like Preview, Skim, Adobe Acrobat, etc. The resulting annotated file can be opened in TeXShop and displayed alongside the
+original source and preview windows. So an author can write a paper in TeXShop, send the pdf output to an editor to be annotated in Adobe Acrobat, open the annotated version alongside the regular version in TeXShop, and revise as needed. All of this is possible in earlier versions of TeXShop because Apple's PDFKit supports annotation. This use pattern is likely to remain standard in the future because the listed programs and many others have sophisticated annotation capabilities.
+<p> TeXShop 5.42 provides only a subset of easy to use annotations, but these may be
+helpful for those just starting to annotate, or if one author is creating both a manuscript and the annotated version
+at the same time.
+<p> The new feature has been added in a nonintrusive manner. No new tools were added to the toolbar, no new code runs in standard mode, and the only difference a regular user will notice is a new item in the Preview menu called "Annotation Panel".
+The ability to annotate in TeXShop may not change authors' working habits, but it was a fun summer project for me.
+
+<p> For those who don't read the manual, here's a short survey. The annotation panel contains all tools needed to annotate. Switch between Edit mode and Run mode at top left. Annotations are created, moved, resized, and modified in Edit mode. They are fixed in Run mode. Create new annotations by clicking on the picture of the annotation in the panel. For instance, select some text and then click strikeout to strike out the text. Emphasize and underline work the same way.
+
+<p> For other annotations, select some pdf text and click on a picture in the panel to make an annotation appear near the text selection. Or just click the picture and the annotation will appear at bottom left. Drag and resize annotations
+after creation. To change annotation colors, open the Color Panel,
+select an annotation, and then select a color. One annotation shows text on a colored background. Change the background color as above, and hold down the option key while selecting a color to change the text color.
+To change the fonts in annotations with text, open the Font Panel, select an annotation, and change the font in the panel. To modify the text in annotations with text, open the Text Panel and edit the copy of text it contains.
+
+<p> Popups are annotations that look like a small icon, often in the document margin. In Run mode, clicking on this icon opens a panel of scrollable text. The font and color of this text cannot be changed; to change the background color, change the color of the icon. To insert text in a popup during Edit mode, click on the icon while holding down the option key to reveal the editable panel of text.
+
+<p>A special note of thanks to Uwe Schmock, who was helpful with both program design and the manual pages during work on Annotations. He has a list of further desirable changes, but eventually I cried "enough."
+</ul>
+
+<p>
+<p>
+</div>
+
+
+</body>
+</html> \ No newline at end of file
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index ab31db480e..436ae3d555 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -116,6 +116,7 @@ $mirrors = {
'https://ftp.rrze.uni-erlangen.de/ctan/' => 1,
'https://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/' => 1,
'https://ftp.tu-chemnitz.de/pub/tex/' => 1,
+ 'https://markov.htwsaar.de/tex-archive/' => 1,
'https://mirror.clientvps.com/CTAN/' => 1,
'https://mirror.dogado.de/tex-archive/' => 1,
'https://mirror.funkfreundelandshut.de/latex/' => 1,
@@ -123,7 +124,6 @@ $mirrors = {
},
'Greece' => {
'http://ftp.ntua.gr/mirror/ctan/' => 1,
- 'https://fosszone.csd.auth.gr/CTAN/' => 1,
'https://ftp.cc.uoc.gr/mirrors/CTAN/' => 1,
},
'Hungary' => {
@@ -148,12 +148,14 @@ $mirrors = {
'https://sunsite.icm.edu.pl/pub/CTAN/' => 1,
},
'Portugal' => {
+ 'https://ftp.eq.uc.pt/software/TeX/' => 1,
'https://mirrors.up.pt/pub/CTAN/' => 1,
},
'Romania' => {
'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 f32f0c95ba..977f3d6c02 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,7 +26,7 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2024
-depend revision/71974
+depend revision/71977
name 00texlive.image
category TLCore
@@ -4928,7 +4928,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 71974
+revision 71977
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
@@ -214688,7 +214688,7 @@ catalogue-version 1.6.2
name mercatormap
category Package
-revision 71946
+revision 71976
shortdesc Spherical Mercator coordinate systems and Web Mercator tile integration
relocated 1
longdesc This package extends TikZ with tools to create map graphics.
@@ -214698,11 +214698,11 @@ longdesc package supports the seamless integration of graphics from
longdesc public map tile servers by a Python script. Also, common map
longdesc elements like markers, geodetic networks, bar scales, routes,
longdesc orthodrome pieces, and more are part of the package.
-containersize 20744
-containerchecksum cf97fa903301eab2f3eda55ed81f74fb6ed3634691eb49ee2f4fb9fb03e2916141a1ca2cd35f5c05e7ae2a3f0a367bdc6609083eea74986b3342dd6c6372774d
-doccontainersize 22456048
-doccontainerchecksum e8bde36661b903988cb5e285a89bfc738d182f1a820ceac66c8fbca0db07db30da3984d792f29cd17c221a8b25c03def62fc1027f24508aa77b51191cc9a107e
-docfiles size=5676
+containersize 21084
+containerchecksum c97bafd1333eafe2f2ccba2df5f64fededce4883d7fc9c617f849c13ed49450668f624aa94d5d4b6c52fe8d2db956df01297a0e2d9eee82644d23865517f1674
+doccontainersize 22583660
+doccontainerchecksum 49677270a846c809d0a1a39f6bc4f07f13b4059cb786b3fc43797217a634b41bba2b03a3fbc4135a5e6c6c46f181ea665143d811cecf0bc1022d55838c33afe9
+docfiles size=5708
RELOC/doc/latex/mercatormap/CHANGES.md
RELOC/doc/latex/mercatormap/README.md details="Readme"
RELOC/doc/latex/mercatormap/mercatormap-example.tex
@@ -214731,7 +214731,7 @@ catalogue-contact-home https://github.com/T-F-S/mercatormap
catalogue-ctan /macros/latex/contrib/mercatormap
catalogue-license lppl1.3
catalogue-topics cartography pgf-tikz graphics expl3
-catalogue-version 1.1.0
+catalogue-version 1.2.0
name merriweather
category Package
@@ -328347,7 +328347,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 71974
+revision 71977
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.
@@ -328355,10 +328355,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 114424
-containerchecksum 2df1601dfa1f50c7cdc0ea0e08308a18e2524eb4490b4ea0b89920ce0736b66c4b0e8e3caafe7b735450ed823702e718f354d4cc7a86a9f477cc5cecd77a2eaa
-doccontainersize 436836
-doccontainerchecksum a450bc0a1eba6401fb9e19d070342645aadae51101caf002e2af6b8ba4e79da6527cdd1d7fef08f5163e9fb9911a4b9fa6dc00eed65d0192a4d1ef341074c5dd
+containersize 114444
+containerchecksum c1a3906c00dfc6a497035b5e18106316da929420e47b2174c0622db702f6f2cb4b21e5614a3e667f96723713f23807984aa944da3e98ac6c9263cb995b8c82ad
+doccontainersize 436832
+doccontainerchecksum 5534cd47269350a44ff45767fcf71a9694316f26dac4e9fc98defd4d83c1b5fced79ef6ac737aeabfc25776416f5a4306ba6e7ec8bab9bca1110e31d03d1059f
docfiles size=572
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 6022789b03..dd5227dc81 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-3bc1b7467f60a5df55b40f44da9764da texlive.tlpdb
+54abc3dc5dea3233ae4c77664d1bac19 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index cddf8da1fe..0f270d6ae8 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-92091a30daeea6b0acad9d43272425e3a131fcf5348fd7e2eee1d5c24e69f04a42d7f6797ba13119faeef70dd59a8424973e04221149ad808a47d44452cd0400 texlive.tlpdb
+1245ac1799023e1bdf7bd83008ebf8e2ad8f5ead59697eaec57b4e630ec39f3a6e0723e5ca30484ff1c2889683528c52d970011685e5db84c026052367fc897d texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 35690d506c..6fc4e7ce05 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+QqiBBqTOGHfhlDjHAFAmawEw8ACgkQTOGHfhlD
-jHBr6QgAgu0QoqNgMPWoJgfq0/K2CPEtxySPOA0c00/KNXIUlyZ+hhn/ISyvo9eH
-OKsayBdUldsAHJWxLLDcfPEZ314Ef022ZXBF4VSoCkTfLw1qt9MeHTcO90kkM/ga
-08jcuJUN2YRQiZYpQVU7f7KWDW0FOW0WHP20tRiYnEpGga4PsvgRsnN5vjVe7CfA
-GTnlUESyAruDc7HKU6QcsDIUCrW579jYLhZXtH32hwCZ+PfQ9sVKEpR7CcYeU1jl
-wiVkiH1OAzubhFt0128Zz7iWdcwm4nemEbCw2vZrkaLN8jiR5KDdPs/RqkzugGcq
-rEguLYx0FzqkILEIjffaWQv2rEtBug==
-=LilQ
+iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmaxZRMACgkQTOGHfhlD
+jHBioQgAj6Wg5Fmg+qjsDMt68mSf0TWI5WtrzCP3v5leNJ3I4ZpqO3f1DcZD9IjG
++SGzp19AC74pQiXPWv51Gqu/AGE14LgUttI97T+RURhm07tzLH1QuaVM/wroDBoO
+vWjvLTY4aAovtf7p3NTTqFJWRyR06spJfVbl2FBrT+5QRJuw0fFfdWA/OB5wJ4vF
+LWHNCMxq09aYj7oHEA764+oXagfhdnQyKmuggVJ4U7DcURu5IdYWRNzQsi67XsnG
+9oHVBvBDxMkF08Es9zrTPK+CkfGs1t3Ip1awANzvXaq1UDjVC2KKfKbdH7V6h5q1
+/k0v539DBJ3gVDxKAzYCFqa4qjtw3g==
+=/1UT
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index f1cb664f46..c9c76217bd 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/timestamp b/timestamp
index c101682b87..d62c19fd74 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2024-08-05-02-02
+2024-08-06-02-02