summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FILES.byname606
-rw-r--r--FILES.byname.gzbin2334719 -> 2334780 bytes
-rw-r--r--FILES.last07days660
-rw-r--r--fonts/charissil/README34
-rw-r--r--fonts/charissil/doc/CharisSILCompact-samples.pdfbin74003 -> 0 bytes
-rw-r--r--fonts/charissil/doc/CharisSILCompact-samples.tex40
-rw-r--r--fonts/charissil/latex/CharisSILCompact.sty45
-rw-r--r--fonts/charissil/truetype/CharisSIL-LiteracyCompact-B.ttfbin1513456 -> 0 bytes
-rw-r--r--fonts/charissil/truetype/CharisSIL-LiteracyCompact-BI.ttfbin1574460 -> 0 bytes
-rw-r--r--fonts/charissil/truetype/CharisSIL-LiteracyCompact-I.ttfbin1579632 -> 0 bytes
-rw-r--r--fonts/charissil/truetype/CharisSIL-LiteracyCompact-R.ttfbin1577756 -> 0 bytes
-rw-r--r--fonts/newcomputermodern/README18
-rw-r--r--fonts/newcomputermodern/tex/NewCM10-Book.fontspec26
-rw-r--r--fonts/newcomputermodern/tex/NewCM10-Regular.fontspec26
-rw-r--r--fonts/newcomputermodern/tex/NewCMMono10-Book.fontspec (renamed from fonts/newcomputermodern/tex/NewComputerModernMonoBook.fontspec)2
-rw-r--r--fonts/newcomputermodern/tex/NewCMMono10-Regular.fontspec (renamed from fonts/newcomputermodern/tex/NewComputerModernMono.fontspec)2
-rw-r--r--fonts/newcomputermodern/tex/NewCMSans10-Book.fontspec21
-rw-r--r--fonts/newcomputermodern/tex/NewCMSans10-Regular.fontspec20
-rw-r--r--fonts/newcomputermodern/tex/NewComputerModern.fontspec26
-rw-r--r--fonts/newcomputermodern/tex/NewComputerModernBook.fontspec26
-rw-r--r--fonts/newcomputermodern/tex/NewComputerModernSans.fontspec20
-rw-r--r--fonts/newcomputermodern/tex/NewComputerModernSansBook.fontspec21
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md236
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex8
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdfbin1915138 -> 1918787 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex103
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987.bbx206
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987.cbx13
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987ay.bbx202
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987ay.cbx21
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005.bbx54
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005.cbx15
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005ay.bbx52
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005ay.cbx13
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx98
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx8
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx95
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx4
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx165
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.cbx190
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx206
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.cbx2
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx6
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin590649 -> 590670 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex6
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.pdfbin470144 -> 471024 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.tex89
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.dtx524
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.pdfbin1377012 -> 1380062 bytes
-rw-r--r--macros/latex/contrib/phonenumbers/README4
-rw-r--r--macros/latex/contrib/phonenumbers/doc/Literatur.bib71
-rw-r--r--macros/latex/contrib/phonenumbers/doc/phonenumbers-de.pdfbin1889747 -> 1927261 bytes
-rw-r--r--macros/latex/contrib/phonenumbers/doc/phonenumbers-de.tex117
-rw-r--r--macros/latex/contrib/phonenumbers/doc/phonenumbers-en.pdfbin1888276 -> 1913835 bytes
-rw-r--r--macros/latex/contrib/phonenumbers/doc/phonenumbers-en.tex117
-rw-r--r--macros/latex/contrib/phonenumbers/tex/phn-AT_Ortsnamen.tex26
-rw-r--r--macros/latex/contrib/phonenumbers/tex/phn-DE_Ortsnamen.tex21
-rw-r--r--macros/latex/contrib/phonenumbers/tex/phn-DE_Vorwahlen.tex7
-rw-r--r--macros/latex/contrib/phonenumbers/tex/phn-FR_Ortsnamen.tex24
-rw-r--r--macros/latex/contrib/phonenumbers/tex/phn-FR_Vorwahlen.tex26
-rw-r--r--macros/latex/contrib/phonenumbers/tex/phn-UK_Ortsnamen.tex22
-rw-r--r--macros/latex/contrib/phonenumbers/tex/phn-UK_Vorwahlen.tex14
-rw-r--r--macros/latex/contrib/phonenumbers/tex/phn-US_Ortsnamen.tex29
-rw-r--r--macros/latex/contrib/phonenumbers/tex/phn-US_Vorwahlen.tex72
-rw-r--r--macros/latex/contrib/phonenumbers/tex/phonenumbers.sty688
-rw-r--r--support/tikztosvg/CHANGELOG.md10
-rw-r--r--support/tikztosvg/Makefile9
-rw-r--r--support/tikztosvg/README.md65
-rw-r--r--support/tikztosvg/example/example.svg72
-rw-r--r--support/tikztosvg/example/example.tikz4
-rwxr-xr-xsupport/tikztosvg/install.sh66
-rw-r--r--support/tikztosvg/man/man.adoc18
-rw-r--r--support/tikztosvg/man/tikztosvg.140
-rwxr-xr-xsupport/tikztosvg/tikztosvg59
-rw-r--r--support/tikztosvg/tikztosvg.pdfbin170837 -> 173448 bytes
-rw-r--r--systems/mac/mactex/ExtrasFolder.pdfbin38111 -> 38113 bytes
-rw-r--r--systems/mac/mactex/Licenses.txt4
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl1
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb139
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.md52
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha5122
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc14
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.xzbin2332080 -> 2330344 bytes
-rw-r--r--systems/win32/miktex/tm/packages/next/pr.ini8
-rw-r--r--systems/win32/miktex/tm/packages/pr.ini8
-rw-r--r--timestamp2
86 files changed, 3362 insertions, 2308 deletions
diff --git a/FILES.byname b/FILES.byname
index f0f2b159fa..cdeef4ab8c 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -1916,7 +1916,7 @@
1989/12/11 | 6196 | biblio/tib/tib.man
1989/03/29 | 23265 | biblio/tib/vitaMake
2005/12/15 | 366385 | biblio/tib.zip
-2021/08/18 | 16871 | CTAN.sites
+2021/08/20 | 16845 | CTAN.sites
1990/10/03 | 5032 | dviware/beebe/00readme.txt
1990/10/03 | 479 | dviware/beebe/doc/00dir.cmd
1990/10/03 | 1209 | dviware/beebe/doc/00dir.lst
@@ -5100,7 +5100,7 @@
1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp
1990/10/02 | 812 | dviware/vutex/vaxvms.ins
1990/10/02 | 127576 | dviware/vutex/vutex.web
-2021/08/19 | 49424 | FILES.last07days
+2021/08/20 | 59256 | 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
@@ -18339,8 +18339,6 @@
2010/05/26 | 228 | fonts/cfr-lm/vf/u-clmvtto10.vf
2015/02/02 | 3801582 | fonts/cfr-lm.zip
2021/08/19 | 36786 | fonts/charissil/doc/about.pdf
-2021/08/19 | 74003 | fonts/charissil/doc/CharisSILCompact-samples.pdf
-2021/08/19 | 580 | fonts/charissil/doc/CharisSILCompact-samples.tex
2021/08/19 | 70505 | fonts/charissil/doc/CharisSIL-samples.pdf
2021/08/19 | 565 | fonts/charissil/doc/CharisSIL-samples.tex
2021/08/19 | 35261 | fonts/charissil/doc/charset.pdf
@@ -18355,18 +18353,13 @@
2021/08/19 | 29829 | fonts/charissil/doc/resources.pdf
2021/08/19 | 18776 | fonts/charissil/doc/support.pdf
2021/08/19 | 35791 | fonts/charissil/doc/versions.pdf
-2021/08/19 | 1110 | fonts/charissil/latex/CharisSILCompact.sty
2021/08/19 | 1070 | fonts/charissil/latex/CharisSIL.sty
-2021/08/19 | 1427 | fonts/charissil/README
+2021/08/20 | 1317 | fonts/charissil/README
2021/08/19 | 777260 | fonts/charissil/truetype/CharisSIL-BoldItalic.ttf
2021/08/19 | 714200 | fonts/charissil/truetype/CharisSIL-Bold.ttf
2021/08/19 | 750536 | fonts/charissil/truetype/CharisSIL-Italic.ttf
-2021/08/19 | 1574460 | fonts/charissil/truetype/CharisSIL-LiteracyCompact-BI.ttf
-2021/08/19 | 1513456 | fonts/charissil/truetype/CharisSIL-LiteracyCompact-B.ttf
-2021/08/19 | 1579632 | fonts/charissil/truetype/CharisSIL-LiteracyCompact-I.ttf
-2021/08/19 | 1577756 | fonts/charissil/truetype/CharisSIL-LiteracyCompact-R.ttf
2021/08/19 | 728064 | fonts/charissil/truetype/CharisSIL-Regular.ttf
-2021/08/19 | 4212969 | fonts/charissil.zip
+2021/08/20 | 1898837 | fonts/charissil.zip
1998/11/27 | 21626 | fonts/charter/bchb8a.afm
1998/11/27 | 33799 | fonts/charter/bchb8a.pfb
1998/11/27 | 22099 | fonts/charter/bchbi8a.afm
@@ -81495,7 +81488,7 @@
2021/05/25 | 554196 | fonts/newcomputermodern/otf/NewCMSans10-Book.otf
2021/05/25 | 266200 | fonts/newcomputermodern/otf/NewCMSans10-Oblique.otf
2021/05/25 | 282320 | fonts/newcomputermodern/otf/NewCMSans10-Regular.otf
-2021/05/26 | 9879 | fonts/newcomputermodern/README
+2021/08/20 | 10098 | fonts/newcomputermodern/README
2021/05/26 | 4811273 | fonts/newcomputermodern/sfd/NewCM08-BookItalic.sfd
2021/05/26 | 4920052 | fonts/newcomputermodern/sfd/NewCM08-Book.sfd
2021/05/26 | 4247884 | fonts/newcomputermodern/sfd/NewCM08-Italic.sfd
@@ -81524,14 +81517,14 @@
2021/05/26 | 3302525 | fonts/newcomputermodern/sfd/NewCMSans10-Book.sfd
2021/05/26 | 2642365 | fonts/newcomputermodern/sfd/NewCMSans10-Oblique.sfd
2021/05/26 | 2830022 | fonts/newcomputermodern/sfd/NewCMSans10-Regular.sfd
-2021/05/01 | 1096 | fonts/newcomputermodern/tex/NewComputerModernBook.fontspec
-2021/05/01 | 1068 | fonts/newcomputermodern/tex/NewComputerModern.fontspec
-2021/02/19 | 243 | fonts/newcomputermodern/tex/NewComputerModernMonoBook.fontspec
-2021/02/19 | 237 | fonts/newcomputermodern/tex/NewComputerModernMono.fontspec
-2021/05/01 | 946 | fonts/newcomputermodern/tex/NewComputerModernSansBook.fontspec
-2021/05/01 | 937 | fonts/newcomputermodern/tex/NewComputerModernSans.fontspec
+2021/08/20 | 1014 | fonts/newcomputermodern/tex/NewCM10-Book.fontspec
+2021/08/20 | 1034 | fonts/newcomputermodern/tex/NewCM10-Regular.fontspec
+2021/08/20 | 232 | fonts/newcomputermodern/tex/NewCMMono10-Book.fontspec
+2021/08/20 | 234 | fonts/newcomputermodern/tex/NewCMMono10-Regular.fontspec
+2021/08/20 | 887 | fonts/newcomputermodern/tex/NewCMSans10-Book.fontspec
+2021/08/20 | 886 | fonts/newcomputermodern/tex/NewCMSans10-Regular.fontspec
2021/02/19 | 341 | fonts/newcomputermodern/tex/newcomputermodern.sty
-2021/05/26 | 35703693 | fonts/newcomputermodern.zip
+2021/08/20 | 35703614 | fonts/newcomputermodern.zip
2020/06/03 | 5405 | fonts/newpx/afm/NewPXBMI.afm
2019/09/10 | 4864 | fonts/newpx/afm/NewPXBMI_gnu.afm
2020/06/03 | 5651 | fonts/newpx/afm/NewPXMI.afm
@@ -172896,7 +172889,7 @@
2019/06/24 | 2863898 | install/fonts/cantarell.tds.zip
2014/08/20 | 3922638 | install/fonts/carlito.tds.zip
2017/10/30 | 120633 | install/fonts/ccicons.tds.zip
-2021/08/19 | 4215957 | install/fonts/charissil.tds.zip
+2021/08/20 | 4199302 | install/fonts/charissil.tds.zip
2019/10/15 | 776510 | install/fonts/cinzel.tds.zip
2019/10/25 | 2401518 | install/fonts/clearsans.tds.zip
2016/02/14 | 739416 | install/fonts/cm/cmtiup.tds.zip
@@ -186545,7 +186538,7 @@
2013/04/01 | 14776 | macros/context/contrib/context-visualcounter/tex/context/third/visualcounter/t-visualcounter.mkvi
2018/03/05 | 11 | macros/context/contrib/context-visualcounter/VERSION
2018/03/22 | 276789 | macros/context/contrib/context-visualcounter.zip
-2021/08/10 | 116984902 | macros/context/latest/cont-tmf.zip
+2021/08/19 | 116995991 | macros/context/latest/cont-tmf.zip
2016/04/21 | 32846 | macros/cstex/base/cmexb.tar.gz
2016/06/26 | 1728262 | macros/cstex/base/csfonts-t1.tar.gz
2007/03/01 | 187106 | macros/cstex/base/csfonts.tar.gz
@@ -193013,23 +193006,31 @@
2017/11/21 | 1662 | macros/latex/contrib/biblatex-contrib/biblatex-fiwi/latex/dbx/fiwi.dbx
2017/11/21 | 2941 | macros/latex/contrib/biblatex-contrib/biblatex-fiwi/README
2017/11/21 | 793984 | macros/latex/contrib/biblatex-contrib/biblatex-fiwi.zip
-2021/05/06 | 1915138 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
-2021/01/03 | 17212 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex
-2021/05/06 | 190426 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
-2021/01/03 | 9268 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.bbx
-2021/01/03 | 5181 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.cbx
-2021/01/04 | 131796 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/example.bib
-2021/05/06 | 164525 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
-2021/05/06 | 14286 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx
-2021/05/06 | 166368 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
-2021/05/06 | 15555 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx
-2021/01/03 | 924 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015-gbk.def
-2021/05/06 | 115199 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx
-2021/05/06 | 5946 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.cbx
-2021/05/06 | 133848 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx
-2021/05/06 | 15514 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.cbx
-2021/05/06 | 71908 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
-2021/05/06 | 1928549 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015.zip
+2021/08/20 | 1918787 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
+2021/08/20 | 17218 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex
+2021/08/20 | 191852 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
+2021/08/19 | 9268 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.bbx
+2021/08/19 | 5181 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.cbx
+2021/08/19 | 131796 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/example.bib
+2021/08/19 | 7077 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987ay.bbx
+2021/08/19 | 780 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987ay.cbx
+2021/08/19 | 7058 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987.bbx
+2021/08/19 | 516 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987.cbx
+2021/08/19 | 1957 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005ay.bbx
+2021/08/19 | 520 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005ay.cbx
+2021/08/19 | 2083 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005.bbx
+2021/08/19 | 643 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005.cbx
+2021/08/20 | 165570 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
+2021/08/20 | 14360 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx
+2021/08/20 | 166952 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
+2021/08/20 | 15772 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx
+2021/08/19 | 924 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015-gbk.def
+2021/08/20 | 118148 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx
+2021/08/20 | 556 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.cbx
+2021/08/20 | 138625 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx
+2021/08/20 | 15514 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.cbx
+2021/08/20 | 72505 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
+2021/08/20 | 1940544 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015.zip
2020/11/15 | 162517 | macros/latex/contrib/biblatex-contrib/biblatex-german-legal/biblatex-german-legal.pdf
2020/11/15 | 15845 | macros/latex/contrib/biblatex-contrib/biblatex-german-legal/biblatex-german-legal.tex
2020/11/15 | 8950 | macros/latex/contrib/biblatex-contrib/biblatex-german-legal/german-legal-book.bbx
@@ -197878,12 +197879,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
-2021/08/19 | 79465 | macros/latex/contrib/easybook/easybook.dtx
+2021/08/20 | 79465 | macros/latex/contrib/easybook/easybook.dtx
2021/08/16 | 2081 | macros/latex/contrib/easybook/easybook.ins
-2021/08/19 | 590649 | macros/latex/contrib/easybook/easybook.pdf
-2021/08/19 | 80739 | macros/latex/contrib/easybook/easybook.tex
+2021/08/20 | 590670 | macros/latex/contrib/easybook/easybook.pdf
+2021/08/20 | 80745 | macros/latex/contrib/easybook/easybook.tex
2021/08/16 | 1632 | macros/latex/contrib/easybook/README.md
-2021/08/19 | 631813 | macros/latex/contrib/easybook.zip
+2021/08/20 | 631840 | 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
@@ -207423,13 +207424,13 @@
1996/03/22 | 18862 | macros/latex/contrib/niceframe/umrandb.mf
2015/01/17 | 1370 | macros/latex/contrib/niceframe/umrand.mf
2015/01/17 | 287910 | macros/latex/contrib/niceframe.zip
-2021/08/10 | 650267 | macros/latex/contrib/nicematrix/nicematrix.dtx
-2021/08/10 | 470144 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
-2021/08/10 | 173285 | macros/latex/contrib/nicematrix/nicematrix-french.tex
+2021/08/20 | 652374 | macros/latex/contrib/nicematrix/nicematrix.dtx
+2021/08/20 | 471024 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2021/08/20 | 173905 | macros/latex/contrib/nicematrix/nicematrix-french.tex
2021/01/07 | 1423 | macros/latex/contrib/nicematrix/nicematrix.ins
-2021/08/10 | 1377012 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2021/08/20 | 1380062 | macros/latex/contrib/nicematrix/nicematrix.pdf
2020/06/07 | 1005 | macros/latex/contrib/nicematrix/README.md
-2021/08/10 | 1960723 | macros/latex/contrib/nicematrix.zip
+2021/08/20 | 1963514 | macros/latex/contrib/nicematrix.zip
2015/11/21 | 217 | macros/latex/contrib/nicetext/ANNOUNCE.txt
2012/03/18 | 254582 | macros/latex/contrib/nicetext/demo/arseneau.pdf
2011/09/14 | 10 | macros/latex/contrib/nicetext/demo/iso.txt
@@ -209333,25 +209334,25 @@
2020/11/16 | 129174 | macros/latex/contrib/philosophersimprint/sample.pdf
2016/07/20 | 8521 | macros/latex/contrib/philosophersimprint/sample.tex
2020/11/16 | 491729 | macros/latex/contrib/philosophersimprint.zip
-2019/08/18 | 9243 | macros/latex/contrib/phonenumbers/doc/Literatur.bib
-2019/08/18 | 1889747 | macros/latex/contrib/phonenumbers/doc/phonenumbers-de.pdf
-2019/08/18 | 48190 | macros/latex/contrib/phonenumbers/doc/phonenumbers-de.tex
-2019/08/18 | 1888276 | macros/latex/contrib/phonenumbers/doc/phonenumbers-en.pdf
-2019/08/18 | 46125 | macros/latex/contrib/phonenumbers/doc/phonenumbers-en.tex
-2019/08/18 | 1490 | macros/latex/contrib/phonenumbers/README
-2017/10/22 | 64047 | macros/latex/contrib/phonenumbers/tex/phn-AT_Ortsnamen.tex
-2017/10/22 | 7592 | macros/latex/contrib/phonenumbers/tex/phn-AT_Vorwahlen.tex
-2018/08/05 | 319312 | macros/latex/contrib/phonenumbers/tex/phn-DE_Ortsnamen.tex
-2018/08/05 | 38237 | macros/latex/contrib/phonenumbers/tex/phn-DE_Vorwahlen.tex
-2017/10/22 | 1803 | macros/latex/contrib/phonenumbers/tex/phn-FR_Ortsnamen.tex
-2017/04/08 | 296 | macros/latex/contrib/phonenumbers/tex/phn-FR_Vorwahlen.tex
-2017/04/08 | 1147 | macros/latex/contrib/phonenumbers/tex/phn-Landeskennzahlen.tex
-2018/08/05 | 76194 | macros/latex/contrib/phonenumbers/tex/phn-UK_Ortsnamen.tex
-2018/08/05 | 9376 | macros/latex/contrib/phonenumbers/tex/phn-UK_Vorwahlen.tex
-2018/08/05 | 22395 | macros/latex/contrib/phonenumbers/tex/phn-US_Ortsnamen.tex
-2018/08/05 | 3434 | macros/latex/contrib/phonenumbers/tex/phn-US_Vorwahlen.tex
-2019/08/18 | 95559 | macros/latex/contrib/phonenumbers/tex/phonenumbers.sty
-2019/08/19 | 3395684 | macros/latex/contrib/phonenumbers.zip
+2021/08/20 | 9152 | macros/latex/contrib/phonenumbers/doc/Literatur.bib
+2021/08/20 | 1927261 | macros/latex/contrib/phonenumbers/doc/phonenumbers-de.pdf
+2021/08/20 | 49444 | macros/latex/contrib/phonenumbers/doc/phonenumbers-de.tex
+2021/08/20 | 1913835 | macros/latex/contrib/phonenumbers/doc/phonenumbers-en.pdf
+2021/08/20 | 47311 | macros/latex/contrib/phonenumbers/doc/phonenumbers-en.tex
+2021/08/20 | 1490 | macros/latex/contrib/phonenumbers/README
+2021/08/20 | 64166 | macros/latex/contrib/phonenumbers/tex/phn-AT_Ortsnamen.tex
+2021/08/20 | 7592 | macros/latex/contrib/phonenumbers/tex/phn-AT_Vorwahlen.tex
+2021/08/20 | 318907 | macros/latex/contrib/phonenumbers/tex/phn-DE_Ortsnamen.tex
+2021/08/20 | 38214 | macros/latex/contrib/phonenumbers/tex/phn-DE_Vorwahlen.tex
+2021/08/20 | 3898 | macros/latex/contrib/phonenumbers/tex/phn-FR_Ortsnamen.tex
+2021/08/20 | 447 | macros/latex/contrib/phonenumbers/tex/phn-FR_Vorwahlen.tex
+2021/08/20 | 1147 | macros/latex/contrib/phonenumbers/tex/phn-Landeskennzahlen.tex
+2021/08/20 | 76866 | macros/latex/contrib/phonenumbers/tex/phn-UK_Ortsnamen.tex
+2021/08/20 | 9421 | macros/latex/contrib/phonenumbers/tex/phn-UK_Vorwahlen.tex
+2021/08/20 | 23907 | macros/latex/contrib/phonenumbers/tex/phn-US_Ortsnamen.tex
+2021/08/20 | 4704 | macros/latex/contrib/phonenumbers/tex/phn-US_Vorwahlen.tex
+2021/08/20 | 101996 | macros/latex/contrib/phonenumbers/tex/phonenumbers.sty
+2021/08/20 | 3455031 | macros/latex/contrib/phonenumbers.zip
2017/04/21 | 43917 | macros/latex/contrib/phonrule/phonrule-doc.pdf
2017/04/21 | 5814 | macros/latex/contrib/phonrule/phonrule-doc.tex
2017/04/21 | 1634 | macros/latex/contrib/phonrule/phonrule.sty
@@ -263544,18 +263545,17 @@
2018/09/08 | 20212 | support/thumbpdf/thumbpdf.sty
2018/09/08 | 8477 | support/thumbpdf/thumbpdf.tex
2018/09/08 | 31754 | support/thumbpdf.zip
-2021/07/29 | 781 | support/tikztosvg/CHANGELOG.md
-2021/07/29 | 7723 | support/tikztosvg/example/example.svg
-2021/07/29 | 153 | support/tikztosvg/example/example.tikz
-2021/07/29 | 1482 | support/tikztosvg/install.sh
+2021/08/20 | 1044 | support/tikztosvg/CHANGELOG.md
+2021/08/20 | 7876 | support/tikztosvg/example/example.svg
+2021/08/20 | 157 | support/tikztosvg/example/example.tikz
2021/07/29 | 35149 | support/tikztosvg/LICENSE
-2021/07/29 | 842 | support/tikztosvg/Makefile
-2021/07/29 | 1887 | support/tikztosvg/man/man.adoc
-2021/07/29 | 2604 | support/tikztosvg/man/tikztosvg.1
-2021/07/29 | 2458 | support/tikztosvg/README.md
-2021/07/29 | 4218 | support/tikztosvg/tikztosvg
-2021/07/29 | 170837 | support/tikztosvg/tikztosvg.pdf
-2021/07/29 | 193153 | support/tikztosvg.zip
+2021/08/20 | 884 | support/tikztosvg/Makefile
+2021/08/20 | 2258 | support/tikztosvg/man/man.adoc
+2021/08/20 | 3114 | support/tikztosvg/man/tikztosvg.1
+2021/08/20 | 3081 | support/tikztosvg/README.md
+2021/08/20 | 4498 | support/tikztosvg/tikztosvg
+2021/08/20 | 173448 | support/tikztosvg/tikztosvg.pdf
+2021/08/20 | 195459 | support/tikztosvg.zip
2000/02/25 | 2120 | support/tiny_c2l/0changes.txt
2000/02/25 | 16384 | support/tiny_c2l/asm_uebung.dvi
1998/07/07 | 6799 | support/tiny_c2l/asm_uebung.s
@@ -266708,9 +266708,9 @@
2019/02/28 | 324 | systems/texlive/tlnet/archive/amstex.x86_64-solaris.r18442.tar.xz
2019/02/28 | 100012 | systems/texlive/tlnet/archive/amsthdoc-it.doc.r45662.tar.xz
2019/02/28 | 288 | systems/texlive/tlnet/archive/amsthdoc-it.r45662.tar.xz
-2021/06/12 | 3143984 | systems/texlive/tlnet/archive/animate.doc.r59555.tar.xz
-2021/06/12 | 23304 | systems/texlive/tlnet/archive/animate.r59555.tar.xz
-2021/06/12 | 30180 | systems/texlive/tlnet/archive/animate.source.r59555.tar.xz
+2021/08/20 | 3143724 | systems/texlive/tlnet/archive/animate.doc.r60274.tar.xz
+2021/08/20 | 23312 | systems/texlive/tlnet/archive/animate.r60274.tar.xz
+2021/08/20 | 30200 | systems/texlive/tlnet/archive/animate.source.r60274.tar.xz
2020/07/30 | 1134124 | systems/texlive/tlnet/archive/annee-scolaire.doc.r55988.tar.xz
2020/07/30 | 1404 | systems/texlive/tlnet/archive/annee-scolaire.r55988.tar.xz
2020/07/30 | 5896 | systems/texlive/tlnet/archive/annee-scolaire.source.r55988.tar.xz
@@ -268165,8 +268165,8 @@
2019/02/28 | 186732 | systems/texlive/tlnet/archive/chapterfolder.doc.r15878.tar.xz
2019/02/28 | 1588 | systems/texlive/tlnet/archive/chapterfolder.r15878.tar.xz
2019/02/28 | 2884 | systems/texlive/tlnet/archive/chapterfolder.source.r15878.tar.xz
-2020/07/24 | 807284 | systems/texlive/tlnet/archive/charissil.doc.r55920.tar.xz
-2020/07/24 | 1193728 | systems/texlive/tlnet/archive/charissil.r55920.tar.xz
+2021/08/20 | 9960 | systems/texlive/tlnet/archive/charissil.doc.r60281.tar.xz
+2021/08/20 | 2005908 | systems/texlive/tlnet/archive/charissil.r60281.tar.xz
2019/02/28 | 800 | systems/texlive/tlnet/archive/charter.doc.r15878.tar.xz
2019/02/28 | 175180 | systems/texlive/tlnet/archive/charter.r15878.tar.xz
2019/02/28 | 169552 | systems/texlive/tlnet/archive/chbibref.doc.r17120.tar.xz
@@ -268571,7 +268571,7 @@
2020/03/04 | 560 | systems/texlive/tlnet/archive/collection-fontsrecommended.r54074.tar.xz
2020/12/08 | 528 | systems/texlive/tlnet/archive/collection-fontutils.r57089.tar.xz
2020/03/04 | 568 | systems/texlive/tlnet/archive/collection-formatsextra.r54074.tar.xz
-2021/04/18 | 536 | systems/texlive/tlnet/archive/collection-games.r58896.tar.xz
+2021/08/20 | 540 | systems/texlive/tlnet/archive/collection-games.r60276.tar.xz
2020/10/07 | 588 | systems/texlive/tlnet/archive/collection-humanities.r56575.tar.xz
2021/06/15 | 456 | systems/texlive/tlnet/archive/collection-langarabic.r59594.tar.xz
2021/04/23 | 540 | systems/texlive/tlnet/archive/collection-langchinese.r58965.tar.xz
@@ -268580,7 +268580,7 @@
2020/03/04 | 372 | systems/texlive/tlnet/archive/collection-langczechslovak.r54074.tar.xz
2021/07/01 | 840 | systems/texlive/tlnet/archive/collection-langenglish.r59766.tar.xz
2021/03/22 | 704 | systems/texlive/tlnet/archive/collection-langeuropean.r58626.tar.xz
-2021/01/22 | 596 | systems/texlive/tlnet/archive/collection-langfrench.r57491.tar.xz
+2021/08/20 | 604 | systems/texlive/tlnet/archive/collection-langfrench.r60273.tar.xz
2020/07/01 | 628 | systems/texlive/tlnet/archive/collection-langgerman.r55706.tar.xz
2020/03/07 | 428 | systems/texlive/tlnet/archive/collection-langgreek.r54139.tar.xz
2020/05/14 | 432 | systems/texlive/tlnet/archive/collection-langitalian.r55129.tar.xz
@@ -268590,7 +268590,7 @@
2020/03/04 | 408 | systems/texlive/tlnet/archive/collection-langpolish.r54074.tar.xz
2020/03/04 | 392 | systems/texlive/tlnet/archive/collection-langportuguese.r54074.tar.xz
2020/03/07 | 380 | systems/texlive/tlnet/archive/collection-langspanish.r54141.tar.xz
-2021/08/19 | 6436 | systems/texlive/tlnet/archive/collection-latexextra.r60268.tar.xz
+2021/08/20 | 6436 | systems/texlive/tlnet/archive/collection-latexextra.r60277.tar.xz
2020/12/03 | 696 | systems/texlive/tlnet/archive/collection-latex.r57048.tar.xz
2021/02/24 | 772 | systems/texlive/tlnet/archive/collection-latexrecommended.r57862.tar.xz
2021/07/15 | 744 | systems/texlive/tlnet/archive/collection-luatex.r59928.tar.xz
@@ -269921,9 +269921,9 @@
2021/07/19 | 313228 | systems/texlive/tlnet/archive/easing.doc.r59975.tar.xz
2021/07/19 | 2220 | systems/texlive/tlnet/archive/easing.r59975.tar.xz
2021/07/19 | 7876 | systems/texlive/tlnet/archive/easing.source.r59975.tar.xz
-2021/08/19 | 611560 | systems/texlive/tlnet/archive/easybook.doc.r60266.tar.xz
-2021/08/19 | 17224 | systems/texlive/tlnet/archive/easybook.r60266.tar.xz
-2021/08/19 | 17256 | systems/texlive/tlnet/archive/easybook.source.r60266.tar.xz
+2021/08/20 | 611472 | systems/texlive/tlnet/archive/easybook.doc.r60275.tar.xz
+2021/08/20 | 17216 | systems/texlive/tlnet/archive/easybook.r60275.tar.xz
+2021/08/20 | 17264 | systems/texlive/tlnet/archive/easybook.source.r60275.tar.xz
2019/02/28 | 4540 | systems/texlive/tlnet/archive/easy.doc.r19440.tar.xz
2020/09/08 | 175976 | systems/texlive/tlnet/archive/easyfig.doc.r56291.tar.xz
2020/09/08 | 1936 | systems/texlive/tlnet/archive/easyfig.r56291.tar.xz
@@ -271053,6 +271053,9 @@
2019/02/28 | 2328 | systems/texlive/tlnet/archive/galois.r15878.tar.xz
2019/02/28 | 6452 | systems/texlive/tlnet/archive/galois.source.r15878.tar.xz
2019/02/28 | 219896 | systems/texlive/tlnet/archive/gamebook.doc.r24714.tar.xz
+2021/08/20 | 382964 | systems/texlive/tlnet/archive/gamebooklib.doc.r60276.tar.xz
+2021/08/20 | 3164 | systems/texlive/tlnet/archive/gamebooklib.r60276.tar.xz
+2021/08/20 | 12844 | systems/texlive/tlnet/archive/gamebooklib.source.r60276.tar.xz
2019/02/28 | 1696 | systems/texlive/tlnet/archive/gamebook.r24714.tar.xz
2019/02/28 | 4640 | systems/texlive/tlnet/archive/gamebook.source.r24714.tar.xz
2020/09/23 | 3276 | systems/texlive/tlnet/archive/gammas.doc.r56403.tar.xz
@@ -272204,6 +272207,9 @@
2019/04/07 | 146072 | systems/texlive/tlnet/archive/keyindex.doc.r50828.tar.xz
2019/04/07 | 1388 | systems/texlive/tlnet/archive/keyindex.r50828.tar.xz
2019/04/07 | 3464 | systems/texlive/tlnet/archive/keyindex.source.r50828.tar.xz
+2021/08/20 | 560836 | systems/texlive/tlnet/archive/keyparse.doc.r60277.tar.xz
+2021/08/20 | 1620 | systems/texlive/tlnet/archive/keyparse.r60277.tar.xz
+2021/08/20 | 4836 | systems/texlive/tlnet/archive/keyparse.source.r60277.tar.xz
2019/02/28 | 233148 | systems/texlive/tlnet/archive/keyreader.doc.r28195.tar.xz
2019/02/28 | 9192 | systems/texlive/tlnet/archive/keyreader.r28195.tar.xz
2019/02/28 | 33556 | systems/texlive/tlnet/archive/keystroke.doc.r17992.tar.xz
@@ -272396,9 +272402,9 @@
2019/02/28 | 130024 | systems/texlive/tlnet/archive/lambda-lists.doc.r31402.tar.xz
2019/02/28 | 1548 | systems/texlive/tlnet/archive/lambda-lists.r31402.tar.xz
2019/02/28 | 47360 | systems/texlive/tlnet/archive/lambda.r45756.tar.xz
-2021/08/19 | 472 | systems/texlive/tlnet/archive/lambdax.doc.r60268.tar.xz
-2021/08/19 | 1984 | systems/texlive/tlnet/archive/lambdax.r60268.tar.xz
-2021/08/19 | 4264 | systems/texlive/tlnet/archive/lambdax.source.r60268.tar.xz
+2021/08/20 | 541164 | systems/texlive/tlnet/archive/lambdax.doc.r60278.tar.xz
+2021/08/20 | 1992 | systems/texlive/tlnet/archive/lambdax.r60278.tar.xz
+2021/08/20 | 4292 | systems/texlive/tlnet/archive/lambdax.source.r60278.tar.xz
2019/02/28 | 313268 | systems/texlive/tlnet/archive/langcode.doc.r27764.tar.xz
2019/02/28 | 3032 | systems/texlive/tlnet/archive/langcode.r27764.tar.xz
2019/02/28 | 2064 | systems/texlive/tlnet/archive/langcode.source.r27764.tar.xz
@@ -274300,9 +274306,9 @@
2019/02/28 | 4628 | systems/texlive/tlnet/archive/mylatexformat.r21392.tar.xz
2019/02/28 | 12888 | systems/texlive/tlnet/archive/mylatexformat.source.r21392.tar.xz
2020/10/25 | 3976 | systems/texlive/tlnet/archive/mylatex.r56751.tar.xz
-2019/02/28 | 225920 | systems/texlive/tlnet/archive/mynsfc.doc.r41996.tar.xz
-2019/02/28 | 3420 | systems/texlive/tlnet/archive/mynsfc.r41996.tar.xz
-2019/02/28 | 4404 | systems/texlive/tlnet/archive/mynsfc.source.r41996.tar.xz
+2021/08/20 | 450800 | systems/texlive/tlnet/archive/mynsfc.doc.r60280.tar.xz
+2021/08/20 | 2816 | systems/texlive/tlnet/archive/mynsfc.r60280.tar.xz
+2021/08/20 | 6004 | systems/texlive/tlnet/archive/mynsfc.source.r60280.tar.xz
2019/02/28 | 978596 | systems/texlive/tlnet/archive/na-box.doc.r45130.tar.xz
2019/02/28 | 2952 | systems/texlive/tlnet/archive/na-box.r45130.tar.xz
2019/02/28 | 438652 | systems/texlive/tlnet/archive/nag.doc.r24741.tar.xz
@@ -275554,9 +275560,9 @@
2019/02/28 | 2324 | systems/texlive/tlnet/archive/progressbar.r33822.tar.xz
2019/02/28 | 80808 | systems/texlive/tlnet/archive/progress.doc.r19519.tar.xz
2019/02/28 | 4192 | systems/texlive/tlnet/archive/progress.r19519.tar.xz
-2021/08/18 | 672356 | systems/texlive/tlnet/archive/projlib.doc.r60261.tar.xz
-2021/08/18 | 12556 | systems/texlive/tlnet/archive/projlib.r60261.tar.xz
-2021/08/18 | 36884 | systems/texlive/tlnet/archive/projlib.source.r60261.tar.xz
+2021/08/20 | 673752 | systems/texlive/tlnet/archive/projlib.doc.r60279.tar.xz
+2021/08/20 | 12560 | systems/texlive/tlnet/archive/projlib.r60279.tar.xz
+2021/08/20 | 36880 | systems/texlive/tlnet/archive/projlib.source.r60279.tar.xz
2019/05/23 | 372132 | systems/texlive/tlnet/archive/proof-at-the-end.doc.r51194.tar.xz
2019/05/23 | 4440 | systems/texlive/tlnet/archive/proof-at-the-end.r51194.tar.xz
2019/05/23 | 12500 | systems/texlive/tlnet/archive/proof-at-the-end.source.r51194.tar.xz
@@ -278740,6 +278746,8 @@
2021/08/01 | 347268 | systems/texlive/tlnet/archive/vhistory.doc.r60124.tar.xz
2021/08/01 | 8400 | systems/texlive/tlnet/archive/vhistory.r60124.tar.xz
2021/08/10 | 5182308 | systems/texlive/tlnet/archive/visualfaq.doc.r60200.tar.xz
+2021/08/20 | 4578308 | systems/texlive/tlnet/archive/visualfaq-fr.doc.r60273.tar.xz
+2021/08/20 | 788 | systems/texlive/tlnet/archive/visualfaq-fr.r60273.tar.xz
2021/08/10 | 568 | systems/texlive/tlnet/archive/visualfaq.r60200.tar.xz
2019/02/28 | 13043468 | systems/texlive/tlnet/archive/visualpstricks.doc.r39799.tar.xz
2019/02/28 | 432 | systems/texlive/tlnet/archive/visualpstricks.r39799.tar.xz
@@ -279358,16 +279366,16 @@
2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
2021/05/02 | 105152 | systems/texlive/tlnet/install-tl
-2021/08/19 | 6811279 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/08/19 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/08/19 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/08/20 | 6811182 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/08/20 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/08/20 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat
-2021/08/19 | 20810050 | systems/texlive/tlnet/install-tl-windows.exe
-2021/08/19 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/08/19 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/08/19 | 25585327 | systems/texlive/tlnet/install-tl.zip
-2021/08/19 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/08/19 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/08/20 | 20809935 | systems/texlive/tlnet/install-tl-windows.exe
+2021/08/20 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/08/20 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/08/20 | 25585327 | systems/texlive/tlnet/install-tl.zip
+2021/08/20 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/08/20 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2021/04/01 | 1229 | systems/texlive/tlnet/README.md
2021/04/01 | 0 | systems/texlive/tlnet/TEXLIVE_2021
2021/07/03 | 7181 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -279419,12 +279427,12 @@
2021/05/16 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/05/16 | 5402 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2021/05/16 | 27555 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2021/08/19 | 17362667 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2021/08/19 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/08/20 | 17369641 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/08/20 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2021/05/16 | 86511 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2021/08/19 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/08/19 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/08/19 | 2331932 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/08/20 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/08/20 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/08/20 | 2332080 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/05/16 | 58801 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2021/05/16 | 42084 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2021/05/16 | 16103 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -284307,7 +284315,7 @@
2020/10/03 | 318630 | systems/win32/miktex/tm/packages/filehook.tar.lzma
2012/12/04 | 924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
2011/09/21 | 281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2021/08/19 | 594084 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/08/20 | 594084 | systems/win32/miktex/tm/packages/files.csv.lzma
2001/05/14 | 5617 | systems/win32/miktex/tm/packages/finbib.tar.lzma
2015/10/20 | 44379 | systems/win32/miktex/tm/packages/findhyph.tar.lzma
2011/10/21 | 89323 | systems/win32/miktex/tm/packages/fink.tar.lzma
@@ -285669,9 +285677,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2021/08/07 | 39000 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2021/08/07 | 43393 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/08/19 | 235985 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/08/19 | 1330117 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/08/19 | 1236651 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/08/20 | 235986 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/08/20 | 1329483 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/08/20 | 1235306 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2021/08/07 | 13446 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2021/08/07 | 14327 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma
2016/07/15 | 35914 | systems/win32/miktex/tm/packages/mil3.tar.lzma
@@ -285871,189 +285879,189 @@
2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
2021/03/17 | 232249 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2021/08/19 | 594002 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/08/19 | 51112 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/08/19 | 56477 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/08/19 | 975018 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/08/19 | 1077989 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2021/08/19 | 29036 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/08/19 | 31352 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/08/19 | 29841 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/08/19 | 34665 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/08/19 | 50152 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/08/19 | 57547 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/08/19 | 83540 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/08/19 | 95402 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/08/19 | 67818 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/08/19 | 75792 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/08/19 | 27198 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2021/08/19 | 30823 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/08/19 | 330786 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/08/19 | 392792 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/08/19 | 32672 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/08/19 | 36629 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2021/08/19 | 51310 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/08/19 | 56686 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/08/19 | 241811 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/08/19 | 263957 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/08/19 | 180011 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/08/19 | 195637 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/08/19 | 54632 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/08/19 | 61813 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2021/08/19 | 21226 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/08/19 | 23363 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/08/19 | 461811 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/08/19 | 45905 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/08/19 | 51202 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/08/19 | 284580 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/08/19 | 325043 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2021/08/19 | 41193 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2021/08/19 | 45310 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2021/08/19 | 119819 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/08/19 | 133864 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/08/19 | 1291300 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/08/19 | 1421867 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/08/19 | 100625 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2021/08/19 | 112984 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/08/19 | 43027 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/08/19 | 48253 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/08/19 | 25020 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/08/19 | 28180 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/08/19 | 56318 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/08/19 | 62787 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/08/19 | 136816 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/08/19 | 154423 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/08/19 | 73196 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/08/19 | 77951 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/08/19 | 71668 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/08/19 | 80448 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/08/19 | 258880 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2021/08/19 | 295203 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2021/08/19 | 22049 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2021/08/19 | 24996 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/08/19 | 97339 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/08/19 | 112089 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/08/19 | 64427 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/08/19 | 73147 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/08/19 | 96634 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2021/08/19 | 115352 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/08/19 | 38140 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/08/19 | 43004 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/08/19 | 483653 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/08/19 | 566526 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/08/19 | 147371 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/08/19 | 159578 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/08/19 | 94799 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/08/19 | 109031 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/08/19 | 16357 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2021/08/19 | 17981 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/08/19 | 28390 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/08/19 | 30059 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/08/19 | 629399 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/08/19 | 681251 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/08/19 | 531850 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/08/19 | 596929 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/08/19 | 476920 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/08/19 | 510588 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/08/19 | 94311 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2021/08/19 | 103400 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/08/19 | 1713892 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/08/19 | 2009905 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/08/19 | 67618 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/08/19 | 74210 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2021/08/19 | 27358 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/08/19 | 31620 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/08/19 | 7721 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/08/19 | 8769 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/08/19 | 196871 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/08/19 | 215250 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/08/19 | 250264 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/08/19 | 284023 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/08/19 | 98380 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/08/19 | 103205 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/08/19 | 60636 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/08/19 | 68023 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/08/19 | 124282 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2021/08/19 | 136824 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/08/19 | 178354 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/08/19 | 196740 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/08/19 | 199731 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/08/19 | 180120 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/08/19 | 67485 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/08/19 | 76825 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/08/19 | 31231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/08/19 | 35084 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/08/19 | 37804 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/08/19 | 42711 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/08/19 | 42890 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/08/19 | 46907 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/08/19 | 45970 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/08/19 | 52524 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/08/19 | 194382 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2021/08/19 | 206604 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/08/19 | 35692 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2021/08/19 | 40230 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/08/19 | 744117 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/08/19 | 815243 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/08/19 | 198169 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/08/19 | 202797 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/08/19 | 208048 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/08/19 | 243427 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/08/19 | 78773 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/08/19 | 87776 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/08/19 | 1169717 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/08/19 | 1301191 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/08/19 | 20137 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/08/19 | 23902 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/08/19 | 31539 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/08/19 | 37238 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/08/19 | 64184 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/08/19 | 72207 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/08/19 | 50394 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/08/19 | 57730 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/08/19 | 1340928 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/08/19 | 1464204 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/08/19 | 42386 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2021/08/19 | 51751 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/08/19 | 56513 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/08/19 | 60038 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/08/19 | 25291 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/08/19 | 27391 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/08/19 | 16412 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/08/19 | 18177 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/08/19 | 63776 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/08/19 | 69914 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2021/08/19 | 154805 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/08/19 | 169243 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2021/08/19 | 57011 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/08/19 | 65786 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/08/19 | 98259 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/08/19 | 105223 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/08/19 | 2672609 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/08/19 | 2796726 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/08/19 | 56357 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/08/19 | 62229 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/08/19 | 33545 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/08/19 | 37359 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/08/19 | 27728 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/08/19 | 33634 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/08/19 | 65619 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2021/08/19 | 70648 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/08/19 | 312108 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/08/19 | 345737 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/08/19 | 55498 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/08/19 | 57140 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/08/19 | 589838 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2021/08/19 | 624652 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/08/19 | 39130 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/08/19 | 43426 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/08/19 | 236016 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/08/19 | 1330477 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/08/19 | 1235020 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/08/19 | 13466 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/08/19 | 14349 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/08/20 | 594002 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/08/20 | 51112 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/08/20 | 56474 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/08/20 | 975018 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/08/20 | 1077989 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/08/20 | 29035 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/08/20 | 31350 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/08/20 | 29841 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/08/20 | 34665 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/08/20 | 50150 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/08/20 | 57548 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/08/20 | 83540 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/08/20 | 95401 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/08/20 | 67820 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/08/20 | 75791 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/08/20 | 27198 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/08/20 | 30822 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/08/20 | 330786 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/08/20 | 392792 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/08/20 | 32672 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/08/20 | 36628 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/08/20 | 51308 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/08/20 | 56684 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/08/20 | 241811 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/08/20 | 263958 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/08/20 | 180011 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/08/20 | 195636 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/08/20 | 54631 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/08/20 | 61813 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/08/20 | 21224 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/08/20 | 23364 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/08/20 | 461812 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/08/20 | 45905 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/08/20 | 51202 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/08/20 | 284579 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/08/20 | 325043 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/08/20 | 41193 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/08/20 | 45308 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/08/20 | 119819 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/08/20 | 133864 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/08/20 | 1291301 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/08/20 | 1421867 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/08/20 | 100624 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/08/20 | 112982 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/08/20 | 43027 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/08/20 | 48252 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/08/20 | 25018 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/08/20 | 28180 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/08/20 | 56317 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/08/20 | 62786 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/08/20 | 136816 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/08/20 | 154426 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/08/20 | 73195 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/08/20 | 77951 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/08/20 | 71668 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/08/20 | 80447 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/08/20 | 258882 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/08/20 | 295204 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/08/20 | 22048 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/08/20 | 24994 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/08/20 | 97338 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/08/20 | 112088 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/08/20 | 64427 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/08/20 | 73143 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/08/20 | 96631 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/08/20 | 115350 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/08/20 | 38140 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/08/20 | 43002 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/08/20 | 483651 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/08/20 | 566529 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/08/20 | 147372 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/08/20 | 159578 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/08/20 | 94798 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/08/20 | 109029 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/08/20 | 16356 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/08/20 | 17980 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/08/20 | 28389 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/08/20 | 30058 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/08/20 | 629399 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/08/20 | 681250 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/08/20 | 531850 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/08/20 | 596929 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/08/20 | 476921 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/08/20 | 510587 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/08/20 | 94311 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/08/20 | 103399 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/08/20 | 1713891 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/08/20 | 2009903 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/08/20 | 67617 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/08/20 | 74208 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/08/20 | 27357 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/08/20 | 31619 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/08/20 | 7720 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/08/20 | 8768 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/08/20 | 196871 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/08/20 | 215248 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/08/20 | 250264 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/08/20 | 284024 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/08/20 | 98380 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/08/20 | 103204 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/08/20 | 60638 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/08/20 | 68022 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/08/20 | 124282 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/08/20 | 136819 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/08/20 | 178354 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/08/20 | 196741 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/08/20 | 199733 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/08/20 | 180121 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/08/20 | 67483 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/08/20 | 76826 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/08/20 | 31231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/08/20 | 35085 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/08/20 | 37805 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/08/20 | 42709 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/08/20 | 42890 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/08/20 | 46905 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/08/20 | 45970 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/08/20 | 52524 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/08/20 | 194383 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/08/20 | 206603 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/08/20 | 35690 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/08/20 | 40228 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/08/20 | 744118 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/08/20 | 815244 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/08/20 | 198169 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/08/20 | 202796 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/08/20 | 208047 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/08/20 | 243426 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/08/20 | 78774 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/08/20 | 87778 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/08/20 | 1169716 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/08/20 | 1301193 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/08/20 | 20136 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/08/20 | 23902 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/08/20 | 31537 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/08/20 | 37240 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/08/20 | 64186 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/08/20 | 72207 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/08/20 | 50393 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/08/20 | 57729 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/08/20 | 1340931 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/08/20 | 1464202 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/08/20 | 42384 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/08/20 | 51748 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/08/20 | 56513 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/08/20 | 60039 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/08/20 | 25290 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/08/20 | 27389 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/08/20 | 16412 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/08/20 | 18175 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/08/20 | 63777 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/08/20 | 69913 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/08/20 | 154804 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/08/20 | 169242 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/08/20 | 57013 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/08/20 | 65786 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/08/20 | 98260 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/08/20 | 105221 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/08/20 | 2672609 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/08/20 | 2796724 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/08/20 | 56355 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/08/20 | 62226 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/08/20 | 33544 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/08/20 | 37358 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/08/20 | 27727 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/08/20 | 33630 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/08/20 | 65618 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/08/20 | 70647 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/08/20 | 312108 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/08/20 | 345738 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/08/20 | 55498 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/08/20 | 57138 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/08/20 | 589842 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/08/20 | 624656 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/08/20 | 39127 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/08/20 | 43425 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/08/20 | 236004 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/08/20 | 1330319 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/08/20 | 1235557 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/08/20 | 13464 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/08/20 | 14347 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2019/03/12 | 1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma
-2021/08/19 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/08/20 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
2018/07/06 | 145915 | systems/win32/miktex/tm/packages/nexus-otf.tar.lzma
2017/03/30 | 191149 | systems/win32/miktex/tm/packages/nfssext-cfr.tar.lzma
2012/12/20 | 612251 | systems/win32/miktex/tm/packages/nicefilelist.tar.lzma
@@ -286429,7 +286437,7 @@
2020/10/20 | 342254 | systems/win32/miktex/tm/packages/preview.tar.lzma
2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
2021/04/23 | 274028 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2021/08/19 | 935 | systems/win32/miktex/tm/packages/pr.ini
+2021/08/20 | 935 | systems/win32/miktex/tm/packages/pr.ini
2010/09/27 | 248469 | systems/win32/miktex/tm/packages/printlen.tar.lzma
2008/06/17 | 77313 | systems/win32/miktex/tm/packages/proba.tar.lzma
2017/07/12 | 988486 | systems/win32/miktex/tm/packages/probsoln.tar.lzma
@@ -288003,7 +288011,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2021/08/20 | 186 | timestamp
+2021/08/21 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2021/08/04 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index afa5b34d06..7962220002 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index 914e18b5dc..f7eeb478e6 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,290 +1,424 @@
+2021/08/20 | 9960 | systems/texlive/tlnet/archive/charissil.doc.r60281.tar.xz
+2021/08/20 | 98380 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/08/20 | 98260 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/08/20 | 975018 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/08/20 | 97338 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/08/20 | 96631 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/08/20 | 95401 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/08/20 | 94798 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/08/20 | 94311 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/08/20 | 9421 | macros/latex/contrib/phonenumbers/tex/phn-UK_Vorwahlen.tex
+2021/08/20 | 935 | systems/win32/miktex/tm/packages/pr.ini
+2021/08/20 | 9152 | macros/latex/contrib/phonenumbers/doc/Literatur.bib
+2021/08/20 | 887 | fonts/newcomputermodern/tex/NewCMSans10-Book.fontspec
+2021/08/20 | 886 | fonts/newcomputermodern/tex/NewCMSans10-Regular.fontspec
+2021/08/20 | 884 | support/tikztosvg/Makefile
+2021/08/20 | 87778 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/08/20 | 8768 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/08/20 | 83540 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/08/20 | 815244 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/08/20 | 80745 | macros/latex/contrib/easybook/easybook.tex
+2021/08/20 | 80447 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/08/20 | 79465 | macros/latex/contrib/easybook/easybook.dtx
+2021/08/20 | 788 | systems/texlive/tlnet/archive/visualfaq-fr.r60273.tar.xz
+2021/08/20 | 78774 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/08/20 | 7876 | support/tikztosvg/example/example.svg
+2021/08/20 | 77951 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/08/20 | 7720 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/08/20 | 76866 | macros/latex/contrib/phonenumbers/tex/phn-UK_Ortsnamen.tex
+2021/08/20 | 76826 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/08/20 | 7592 | macros/latex/contrib/phonenumbers/tex/phn-AT_Vorwahlen.tex
+2021/08/20 | 75791 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/08/20 | 744118 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/08/20 | 74208 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/08/20 | 73195 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/08/20 | 73143 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/08/20 | 72505 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
+2021/08/20 | 72207 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/08/20 | 71668 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/08/20 | 70647 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/08/20 | 69913 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/08/20 | 681250 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/08/20 | 6811182 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/08/20 | 68022 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/08/20 | 67820 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/08/20 | 67617 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/08/20 | 67483 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/08/20 | 673752 | systems/texlive/tlnet/archive/projlib.doc.r60279.tar.xz
+2021/08/20 | 65786 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/08/20 | 65618 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/08/20 | 652374 | macros/latex/contrib/nicematrix/nicematrix.dtx
+2021/08/20 | 64427 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/08/20 | 6436 | systems/texlive/tlnet/archive/collection-latexextra.r60277.tar.xz
+2021/08/20 | 64186 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/08/20 | 64166 | macros/latex/contrib/phonenumbers/tex/phn-AT_Ortsnamen.tex
+2021/08/20 | 63777 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/08/20 | 631840 | macros/latex/contrib/easybook.zip
+2021/08/20 | 629399 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/08/20 | 62786 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/08/20 | 624656 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/08/20 | 62226 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/08/20 | 61813 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/08/20 | 611472 | systems/texlive/tlnet/archive/easybook.doc.r60275.tar.xz
+2021/08/20 | 60638 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/08/20 | 604 | systems/texlive/tlnet/archive/collection-langfrench.r60273.tar.xz
+2021/08/20 | 6004 | systems/texlive/tlnet/archive/mynsfc.source.r60280.tar.xz
+2021/08/20 | 60039 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/08/20 | 596929 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/08/20 | 594084 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/08/20 | 594002 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/08/20 | 590670 | macros/latex/contrib/easybook/easybook.pdf
+2021/08/20 | 589842 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/08/20 | 57729 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/08/20 | 57548 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/08/20 | 57138 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/08/20 | 57013 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/08/20 | 56684 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/08/20 | 566529 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/08/20 | 56513 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/08/20 | 56474 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/08/20 | 56355 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/08/20 | 56317 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/08/20 | 560836 | systems/texlive/tlnet/archive/keyparse.doc.r60277.tar.xz
+2021/08/20 | 556 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.cbx
+2021/08/20 | 55498 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/08/20 | 54631 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/08/20 | 541164 | systems/texlive/tlnet/archive/lambdax.doc.r60278.tar.xz
+2021/08/20 | 540 | systems/texlive/tlnet/archive/collection-games.r60276.tar.xz
+2021/08/20 | 531850 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/08/20 | 52524 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/08/20 | 51748 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/08/20 | 51308 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/08/20 | 51202 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/08/20 | 51112 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/08/20 | 510587 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/08/20 | 50393 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/08/20 | 50150 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/08/20 | 49444 | macros/latex/contrib/phonenumbers/doc/phonenumbers-de.tex
+2021/08/20 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/08/20 | 4836 | systems/texlive/tlnet/archive/keyparse.source.r60277.tar.xz
+2021/08/20 | 483651 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/08/20 | 48252 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/08/20 | 476921 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/08/20 | 47311 | macros/latex/contrib/phonenumbers/doc/phonenumbers-en.tex
+2021/08/20 | 471024 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2021/08/20 | 4704 | macros/latex/contrib/phonenumbers/tex/phn-US_Vorwahlen.tex
+2021/08/20 | 46905 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/08/20 | 461812 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/08/20 | 45970 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/08/20 | 45905 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/08/20 | 4578308 | systems/texlive/tlnet/archive/visualfaq-fr.doc.r60273.tar.xz
+2021/08/20 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/08/20 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/08/20 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/08/20 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/08/20 | 45308 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/08/20 | 450800 | systems/texlive/tlnet/archive/mynsfc.doc.r60280.tar.xz
+2021/08/20 | 4498 | support/tikztosvg/tikztosvg
+2021/08/20 | 447 | macros/latex/contrib/phonenumbers/tex/phn-FR_Vorwahlen.tex
+2021/08/20 | 43425 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/08/20 | 43027 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/08/20 | 43002 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/08/20 | 4292 | systems/texlive/tlnet/archive/lambdax.source.r60278.tar.xz
+2021/08/20 | 42890 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/08/20 | 42709 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/08/20 | 42384 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/08/20 | 4199302 | install/fonts/charissil.tds.zip
+2021/08/20 | 41193 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/08/20 | 40228 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/08/20 | 392792 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/08/20 | 39127 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/08/20 | 3898 | macros/latex/contrib/phonenumbers/tex/phn-FR_Ortsnamen.tex
+2021/08/20 | 382964 | systems/texlive/tlnet/archive/gamebooklib.doc.r60276.tar.xz
+2021/08/20 | 38214 | macros/latex/contrib/phonenumbers/tex/phn-DE_Vorwahlen.tex
+2021/08/20 | 38140 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/08/20 | 37805 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/08/20 | 37358 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/08/20 | 37240 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/08/20 | 36880 | systems/texlive/tlnet/archive/projlib.source.r60279.tar.xz
+2021/08/20 | 36628 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/08/20 | 35703614 | fonts/newcomputermodern.zip
+2021/08/20 | 35690 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/08/20 | 35085 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/08/20 | 34665 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/08/20 | 345738 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/08/20 | 3455031 | macros/latex/contrib/phonenumbers.zip
+2021/08/20 | 33630 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/08/20 | 33544 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/08/20 | 330786 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/08/20 | 32672 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/08/20 | 325043 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/08/20 | 318907 | macros/latex/contrib/phonenumbers/tex/phn-DE_Ortsnamen.tex
+2021/08/20 | 3164 | systems/texlive/tlnet/archive/gamebooklib.r60276.tar.xz
+2021/08/20 | 31619 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/08/20 | 31537 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/08/20 | 3143724 | systems/texlive/tlnet/archive/animate.doc.r60274.tar.xz
+2021/08/20 | 31350 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/08/20 | 31231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/08/20 | 312108 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/08/20 | 3114 | support/tikztosvg/man/tikztosvg.1
+2021/08/20 | 30822 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/08/20 | 3081 | support/tikztosvg/README.md
+2021/08/20 | 30200 | systems/texlive/tlnet/archive/animate.source.r60274.tar.xz
+2021/08/20 | 30058 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/08/20 | 29841 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/08/20 | 295204 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/08/20 | 29035 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/08/20 | 284579 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/08/20 | 284024 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/08/20 | 28389 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/08/20 | 28180 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/08/20 | 2816 | systems/texlive/tlnet/archive/mynsfc.r60280.tar.xz
+2021/08/20 | 2796724 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/08/20 | 27727 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/08/20 | 27389 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/08/20 | 27357 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/08/20 | 27198 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/08/20 | 2672609 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/08/20 | 263958 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/08/20 | 258882 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/08/20 | 25585327 | systems/texlive/tlnet/install-tl.zip
+2021/08/20 | 25290 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/08/20 | 250264 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/08/20 | 25018 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/08/20 | 24994 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/08/20 | 243426 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/08/20 | 241811 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/08/20 | 23907 | macros/latex/contrib/phonenumbers/tex/phn-US_Ortsnamen.tex
+2021/08/20 | 23902 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/08/20 | 236004 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/08/20 | 235986 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/08/20 | 234 | fonts/newcomputermodern/tex/NewCMMono10-Regular.fontspec
+2021/08/20 | 23364 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/08/20 | 2332080 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/08/20 | 23312 | systems/texlive/tlnet/archive/animate.r60274.tar.xz
+2021/08/20 | 232 | fonts/newcomputermodern/tex/NewCMMono10-Book.fontspec
+2021/08/20 | 2258 | support/tikztosvg/man/man.adoc
+2021/08/20 | 22048 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/08/20 | 215248 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/08/20 | 21224 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/08/20 | 20809935 | systems/texlive/tlnet/install-tl-windows.exe
+2021/08/20 | 208047 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/08/20 | 206603 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/08/20 | 202796 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/08/20 | 20136 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/08/20 | 2009903 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/08/20 | 2005908 | systems/texlive/tlnet/archive/charissil.r60281.tar.xz
+2021/08/20 | 199733 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/08/20 | 1992 | systems/texlive/tlnet/archive/lambdax.r60278.tar.xz
+2021/08/20 | 198169 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/08/20 | 196871 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/08/20 | 196741 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/08/20 | 1963514 | macros/latex/contrib/nicematrix.zip
+2021/08/20 | 195636 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/08/20 | 195459 | support/tikztosvg.zip
+2021/08/20 | 194383 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/08/20 | 1940544 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015.zip
+2021/08/20 | 1927261 | macros/latex/contrib/phonenumbers/doc/phonenumbers-de.pdf
+2021/08/20 | 1918787 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
+2021/08/20 | 191852 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
+2021/08/20 | 1913835 | macros/latex/contrib/phonenumbers/doc/phonenumbers-en.pdf
+2021/08/20 | 1898837 | fonts/charissil.zip
+2021/08/20 | 18175 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/08/20 | 180121 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/08/20 | 180011 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/08/20 | 17980 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/08/20 | 178354 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/08/20 | 173905 | macros/latex/contrib/nicematrix/nicematrix-french.tex
+2021/08/20 | 17369641 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/08/20 | 173448 | support/tikztosvg/tikztosvg.pdf
+2021/08/20 | 17264 | systems/texlive/tlnet/archive/easybook.source.r60275.tar.xz
+2021/08/20 | 17218 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex
+2021/08/20 | 17216 | systems/texlive/tlnet/archive/easybook.r60275.tar.xz
+2021/08/20 | 1713891 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/08/20 | 169242 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/08/20 | 16845 | CTAN.sites
+2021/08/20 | 166952 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
+2021/08/20 | 165570 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
+2021/08/20 | 16412 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/08/20 | 16356 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/08/20 | 1620 | systems/texlive/tlnet/archive/keyparse.r60277.tar.xz
+2021/08/20 | 159578 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/08/20 | 157 | support/tikztosvg/example/example.tikz
+2021/08/20 | 15772 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx
+2021/08/20 | 15514 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.cbx
+2021/08/20 | 154804 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/08/20 | 154426 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/08/20 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/08/20 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/08/20 | 1490 | macros/latex/contrib/phonenumbers/README
+2021/08/20 | 147372 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/08/20 | 1464202 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/08/20 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/08/20 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/08/20 | 14360 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx
+2021/08/20 | 14347 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/08/20 | 1421867 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/08/20 | 138625 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx
+2021/08/20 | 1380062 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2021/08/20 | 136819 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/08/20 | 136816 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/08/20 | 13464 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/08/20 | 1340931 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/08/20 | 133864 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/08/20 | 1330319 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/08/20 | 1329483 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/08/20 | 1317 | fonts/charissil/README
+2021/08/20 | 1301193 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/08/20 | 1291301 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/08/20 | 12844 | systems/texlive/tlnet/archive/gamebooklib.source.r60276.tar.xz
+2021/08/20 | 12560 | systems/texlive/tlnet/archive/projlib.r60279.tar.xz
+2021/08/20 | 124282 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/08/20 | 1235557 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/08/20 | 1235306 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/08/20 | 119819 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/08/20 | 118148 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx
+2021/08/20 | 1169716 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/08/20 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/08/20 | 115350 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/08/20 | 1147 | macros/latex/contrib/phonenumbers/tex/phn-Landeskennzahlen.tex
+2021/08/20 | 112982 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/08/20 | 112088 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/08/20 | 109029 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/08/20 | 1077989 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/08/20 | 105221 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/08/20 | 1044 | support/tikztosvg/CHANGELOG.md
+2021/08/20 | 1034 | fonts/newcomputermodern/tex/NewCM10-Regular.fontspec
+2021/08/20 | 103399 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/08/20 | 103204 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/08/20 | 101996 | macros/latex/contrib/phonenumbers/tex/phonenumbers.sty
+2021/08/20 | 1014 | fonts/newcomputermodern/tex/NewCM10-Book.fontspec
+2021/08/20 | 10098 | fonts/newcomputermodern/README
+2021/08/20 | 100624 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
2021/08/19 | 99210 | systems/win32/miktex/tm/packages/colorist__doc.tar.lzma
2021/08/19 | 9852 | systems/win32/miktex/tm/packages/colorist.tar.lzma
-2021/08/19 | 98380 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/08/19 | 98259 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
2021/08/19 | 9806 | systems/win32/miktex/tm/packages/uni-titlepage.tar.lzma
-2021/08/19 | 975018 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/08/19 | 97339 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
2021/08/19 | 96643 | macros/latex/contrib/projlib/ProjLib-doc.dtx
-2021/08/19 | 96634 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
2021/08/19 | 95899 | systems/win32/miktex/tm/packages/ekdosis__source.tar.lzma
2021/08/19 | 95612 | systems/texlive/tlnet/archive/ekdosis.source.r60271.tar.xz
-2021/08/19 | 95402 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
2021/08/19 | 951 | systems/win32/miktex/tm/packages/lambdax__doc.tar.lzma
-2021/08/19 | 94799 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/08/19 | 94311 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
2021/08/19 | 9425 | systems/win32/miktex/tm/packages/thesis-ekf__source.tar.lzma
-2021/08/19 | 935 | systems/win32/miktex/tm/packages/pr.ini
+2021/08/19 | 9268 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.bbx
+2021/08/19 | 924 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015-gbk.def
2021/08/19 | 89368 | macros/latex/contrib/projlib/ProjLib.dtx
-2021/08/19 | 87776 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/08/19 | 8769 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
2021/08/19 | 8701 | systems/win32/miktex/tm/packages/minimalist__source.tar.lzma
2021/08/19 | 857 | macros/latex/contrib/projlib/ProjLib-doc.ins
2021/08/19 | 8436 | systems/win32/miktex/tm/packages/colorist__source.tar.lzma
2021/08/19 | 84029 | macros/latex/contrib/animate/animate.tex
-2021/08/19 | 83540 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
2021/08/19 | 8267 | systems/win32/miktex/tm/packages/makelabels__source.tar.lzma
-2021/08/19 | 815243 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/08/19 | 80739 | macros/latex/contrib/easybook/easybook.tex
-2021/08/19 | 80448 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/08/19 | 79465 | macros/latex/contrib/easybook/easybook.dtx
2021/08/19 | 790228 | systems/texlive/tlnet/archive/ekdosis.doc.r60271.tar.xz
2021/08/19 | 790217 | systems/win32/miktex/tm/packages/ekdosis__doc.tar.lzma
-2021/08/19 | 78773 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/08/19 | 77951 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/08/19 | 780 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987ay.cbx
2021/08/19 | 777260 | fonts/charissil/truetype/CharisSIL-BoldItalic.ttf
2021/08/19 | 776351 | systems/win32/miktex/tm/packages/geradwp__doc.tar.lzma
2021/08/19 | 7757 | systems/win32/miktex/tm/packages/beamer-rl.tar.lzma
-2021/08/19 | 7721 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/08/19 | 76825 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
2021/08/19 | 762024 | macros/latex/contrib/projlib.zip
-2021/08/19 | 75792 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
2021/08/19 | 755030 | systems/win32/miktex/tm/packages/bytefield__doc.tar.lzma
2021/08/19 | 754116 | systems/texlive/tlnet/archive/bytefield.doc.r60265.tar.xz
2021/08/19 | 75148 | systems/win32/miktex/tm/packages/hvlogos__doc.tar.lzma
2021/08/19 | 750536 | fonts/charissil/truetype/CharisSIL-Italic.ttf
-2021/08/19 | 744117 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/08/19 | 74210 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
2021/08/19 | 7401 | systems/win32/miktex/tm/packages/minimalist.tar.lzma
-2021/08/19 | 74003 | fonts/charissil/doc/CharisSILCompact-samples.pdf
2021/08/19 | 7344 | systems/texlive/tlnet/archive/ejpecp.source.r60267.tar.xz
-2021/08/19 | 73196 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/08/19 | 73147 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
2021/08/19 | 728064 | fonts/charissil/truetype/CharisSIL-Regular.ttf
-2021/08/19 | 72207 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/08/19 | 71668 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
2021/08/19 | 715357 | systems/win32/miktex/tm/packages/makelabels__doc.tar.lzma
2021/08/19 | 714200 | fonts/charissil/truetype/CharisSIL-Bold.ttf
-2021/08/19 | 70648 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/08/19 | 7077 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987ay.bbx
+2021/08/19 | 7058 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987.bbx
2021/08/19 | 70505 | fonts/charissil/doc/CharisSIL-samples.pdf
2021/08/19 | 70451 | fonts/charissil/doc/history.pdf
2021/08/19 | 704239 | systems/win32/miktex/tm/packages/verifiche__doc.tar.lzma
2021/08/19 | 703432 | systems/texlive/tlnet/archive/verifiche.doc.r60269.tar.xz
-2021/08/19 | 69914 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
2021/08/19 | 687723 | systems/win32/miktex/tm/packages/beaulivre__doc.tar.lzma
2021/08/19 | 681 | macros/latex/contrib/gamebooklib/Makefile
-2021/08/19 | 681251 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/08/19 | 6811279 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/08/19 | 68023 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/08/19 | 67818 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/08/19 | 67618 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/08/19 | 67485 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/08/19 | 65786 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/08/19 | 65619 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
2021/08/19 | 653533 | systems/win32/miktex/tm/packages/projlib__doc.tar.lzma
-2021/08/19 | 64427 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/08/19 | 6436 | systems/texlive/tlnet/archive/collection-latexextra.r60268.tar.xz
+2021/08/19 | 643 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005.cbx
2021/08/19 | 643449 | systems/win32/miktex/tm/packages/simplivre__doc.tar.lzma
-2021/08/19 | 64184 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/08/19 | 63776 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/08/19 | 631813 | macros/latex/contrib/easybook.zip
-2021/08/19 | 629399 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/08/19 | 62787 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/08/19 | 624652 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/08/19 | 62229 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/08/19 | 61813 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
2021/08/19 | 61471 | systems/win32/miktex/tm/packages/siunitx.tar.lzma
-2021/08/19 | 611560 | systems/texlive/tlnet/archive/easybook.doc.r60266.tar.xz
-2021/08/19 | 60636 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/08/19 | 60038 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/08/19 | 596929 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/08/19 | 594084 | systems/win32/miktex/tm/packages/files.csv.lzma
-2021/08/19 | 594002 | systems/win32/miktex/tm/packages/next/files.csv.lzma
2021/08/19 | 593860 | systems/win32/miktex/tm/packages/easybook__doc.tar.lzma
2021/08/19 | 5930 | systems/win32/miktex/tm/packages/tipauni.tar.lzma
-2021/08/19 | 590649 | macros/latex/contrib/easybook/easybook.pdf
-2021/08/19 | 589838 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
2021/08/19 | 5893 | systems/win32/miktex/tm/packages/ejpecp.tar.lzma
2021/08/19 | 5878 | systems/win32/miktex/tm/packages/geradwp.tar.lzma
2021/08/19 | 5836420 | info/visualfaq-fr.zip
-2021/08/19 | 580 | fonts/charissil/doc/CharisSILCompact-samples.tex
-2021/08/19 | 57730 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
2021/08/19 | 575937 | systems/win32/miktex/tm/packages/lebhart__doc.tar.lzma
-2021/08/19 | 57547 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/08/19 | 57140 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/08/19 | 57011 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/08/19 | 56686 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/08/19 | 566526 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
2021/08/19 | 565 | fonts/charissil/doc/CharisSIL-samples.tex
2021/08/19 | 5656 | systems/texlive/tlnet/archive/ejpecp.r60267.tar.xz
-2021/08/19 | 56513 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/08/19 | 56477 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/08/19 | 56357 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/08/19 | 56318 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
2021/08/19 | 562819 | systems/win32/miktex/tm/packages/keyparse__doc.tar.lzma
2021/08/19 | 5572 | systems/win32/miktex/tm/packages/zref-check.tar.lzma
-2021/08/19 | 55498 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/08/19 | 54632 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
2021/08/19 | 545313 | systems/win32/miktex/tm/packages/einfart__doc.tar.lzma
2021/08/19 | 544362 | macros/latex/contrib/lambdax.zip
2021/08/19 | 5364 | systems/texlive/tlnet/archive/zref-check.r60270.tar.xz
-2021/08/19 | 531850 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/08/19 | 52524 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/08/19 | 51751 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/08/19 | 520 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005ay.cbx
+2021/08/19 | 5181 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.cbx
+2021/08/19 | 516 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987.cbx
2021/08/19 | 516818 | systems/win32/miktex/tm/packages/jlreq__doc.tar.lzma
2021/08/19 | 5150 | systems/win32/miktex/tm/packages/keyparse__source.tar.lzma
2021/08/19 | 514001 | systems/win32/miktex/tm/packages/yquant__doc.tar.lzma
-2021/08/19 | 51310 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
2021/08/19 | 51267 | systems/win32/miktex/tm/packages/cryptocode__source.tar.lzma
2021/08/19 | 5121 | systems/win32/miktex/tm/packages/bytefield.tar.lzma
-2021/08/19 | 51202 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/08/19 | 51112 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/08/19 | 510588 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
2021/08/19 | 50675 | systems/win32/miktex/tm/packages/yquant.tar.lzma
-2021/08/19 | 50394 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/08/19 | 50152 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
2021/08/19 | 49286 | systems/win32/miktex/tm/packages/yquant__source.tar.lzma
-2021/08/19 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2021/08/19 | 4892 | systems/texlive/tlnet/archive/bytefield.r60265.tar.xz
-2021/08/19 | 483653 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/08/19 | 48253 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/08/19 | 476920 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/08/19 | 472 | systems/texlive/tlnet/archive/lambdax.doc.r60268.tar.xz
-2021/08/19 | 46907 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
2021/08/19 | 464024 | install/macros/xetex/latex/mynsfc.tds.zip
2021/08/19 | 4639 | systems/win32/miktex/tm/packages/verifiche.tar.lzma
2021/08/19 | 4625 | systems/win32/miktex/tm/packages/lambdax__source.tar.lzma
-2021/08/19 | 461811 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/08/19 | 45970 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/08/19 | 45905 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
2021/08/19 | 456428 | systems/win32/miktex/tm/packages/tipauni__doc.tar.lzma
-2021/08/19 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/08/19 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2021/08/19 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/08/19 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
-2021/08/19 | 45310 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
2021/08/19 | 4411 | fonts/charissil/doc/OFL.txt
2021/08/19 | 4360 | systems/texlive/tlnet/archive/verifiche.r60269.tar.xz
2021/08/19 | 4348 | macros/latex/contrib/projlib/README.md
-2021/08/19 | 43426 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/08/19 | 43027 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/08/19 | 43004 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/08/19 | 42890 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/08/19 | 42711 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/08/19 | 4264 | systems/texlive/tlnet/archive/lambdax.source.r60268.tar.xz
-2021/08/19 | 42386 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2021/08/19 | 4215957 | install/fonts/charissil.tds.zip
-2021/08/19 | 4212969 | fonts/charissil.zip
-2021/08/19 | 41193 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
2021/08/19 | 4107 | systems/win32/miktex/tm/packages/einfart.tar.lzma
2021/08/19 | 41044 | fonts/charissil/doc/design.pdf
2021/08/19 | 4084 | systems/win32/miktex/tm/packages/simplivre.tar.lzma
-2021/08/19 | 40230 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
2021/08/19 | 4004 | systems/win32/miktex/tm/packages/lebhart.tar.lzma
2021/08/19 | 399680 | systems/texlive/tlnet/archive/texlive-scripts.doc.r60264.tar.xz
2021/08/19 | 3987 | systems/win32/miktex/tm/packages/beaulivre.tar.lzma
2021/08/19 | 394964 | macros/latex/contrib/gamebooklib.zip
-2021/08/19 | 392792 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/08/19 | 39130 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
2021/08/19 | 38934 | macros/latex/contrib/gamebooklib/gamebooklib.dtx
2021/08/19 | 3878981 | macros/latex/contrib/animate/animate.pdf
2021/08/19 | 38757 | systems/win32/miktex/tm/packages/easybook__source.tar.lzma
2021/08/19 | 38635 | fonts/charissil/doc/faq.pdf
-2021/08/19 | 38140 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/08/19 | 37804 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
2021/08/19 | 3755141 | systems/win32/miktex/tm/packages/media9__doc.tar.lzma
-2021/08/19 | 37359 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
2021/08/19 | 37261 | systems/win32/miktex/tm/packages/projlib__source.tar.lzma
-2021/08/19 | 37238 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
2021/08/19 | 36786 | fonts/charissil/doc/about.pdf
-2021/08/19 | 36629 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
2021/08/19 | 364912 | systems/texlive/tlnet/archive/ejpecp.doc.r60267.tar.xz
2021/08/19 | 3591 | systems/win32/miktex/tm/packages/tikzbricks__source.tar.lzma
2021/08/19 | 35791 | fonts/charissil/doc/versions.pdf
-2021/08/19 | 35692 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
2021/08/19 | 35261 | fonts/charissil/doc/charset.pdf
-2021/08/19 | 35084 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
2021/08/19 | 347339 | systems/win32/miktex/tm/packages/ejpecp__doc.tar.lzma
-2021/08/19 | 34665 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/08/19 | 345737 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/08/19 | 33634 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/08/19 | 33545 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
2021/08/19 | 33490 | systems/win32/miktex/tm/packages/xindex.tar.lzma
2021/08/19 | 3308 | systems/win32/miktex/tm/packages/makelabels.tar.lzma
-2021/08/19 | 330786 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
2021/08/19 | 32928 | fonts/charissil/doc/developer.pdf
-2021/08/19 | 32672 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/08/19 | 325043 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
2021/08/19 | 324041 | systems/win32/miktex/tm/packages/thesis-ekf__doc.tar.lzma
2021/08/19 | 3232521 | install/macros/latex/contrib/animate.tds.zip
2021/08/19 | 3230248 | macros/latex/contrib/animate.zip
2021/08/19 | 319918 | macros/latex/contrib/projlib/ProjLib-doc-cn.pdf
-2021/08/19 | 31620 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/08/19 | 31539 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/08/19 | 31352 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/08/19 | 31231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/08/19 | 312108 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/08/19 | 30823 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/08/19 | 30059 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
2021/08/19 | 300158 | systems/win32/miktex/tm/packages/xindex__doc.tar.lzma
-2021/08/19 | 29841 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
2021/08/19 | 29841 | systems/win32/miktex/tm/packages/bytefield__source.tar.lzma
2021/08/19 | 29829 | fonts/charissil/doc/resources.pdf
2021/08/19 | 29556 | systems/texlive/tlnet/archive/bytefield.source.r60265.tar.xz
-2021/08/19 | 295203 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2021/08/19 | 29036 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/08/19 | 284580 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/08/19 | 284023 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/08/19 | 28390 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
2021/08/19 | 2832 | macros/latex/contrib/projlib/ProjLib.ins
-2021/08/19 | 28180 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/08/19 | 2796726 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/08/19 | 27728 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/08/19 | 27391 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/08/19 | 27358 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/08/19 | 27198 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
2021/08/19 | 2675 | systems/win32/miktex/tm/packages/hvlogos.tar.lzma
-2021/08/19 | 2672609 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
2021/08/19 | 265430 | macros/latex/contrib/gamebooklib/gamebooklib.pdf
-2021/08/19 | 263957 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
2021/08/19 | 2618 | macros/latex/contrib/gamebooklib/gamebooklib_test.tex
2021/08/19 | 26087 | systems/win32/miktex/tm/packages/ejpecp__source.tar.lzma
-2021/08/19 | 258880 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
2021/08/19 | 255980 | macros/xetex/latex/mynsfc.zip
-2021/08/19 | 25585327 | systems/texlive/tlnet/install-tl.zip
2021/08/19 | 253867 | systems/win32/miktex/tm/packages/tikzbricks__doc.tar.lzma
-2021/08/19 | 25291 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
2021/08/19 | 252736 | macros/xetex/latex/mynsfc/mynsfc.pdf
-2021/08/19 | 250264 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/08/19 | 25020 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/08/19 | 24996 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
2021/08/19 | 24470 | fonts/charissil/doc/index.pdf
-2021/08/19 | 243427 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/08/19 | 241811 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/08/19 | 23902 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/08/19 | 236016 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/08/19 | 235985 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/08/19 | 23363 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/08/19 | 2331932 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/08/19 | 22798 | systems/win32/miktex/tm/packages/uni-titlepage__source.tar.lzma
2021/08/19 | 2218 | systems/win32/miktex/tm/packages/lambdax.tar.lzma
-2021/08/19 | 22049 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
2021/08/19 | 21824 | systems/win32/miktex/tm/packages/cryptocode.tar.lzma
2021/08/19 | 217529 | systems/win32/miktex/tm/packages/beamer-rl__doc.tar.lzma
-2021/08/19 | 215250 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
2021/08/19 | 2148 | systems/win32/miktex/tm/packages/tikzbricks.tar.lzma
2021/08/19 | 21428 | systems/win32/miktex/tm/packages/geradwp__source.tar.lzma
2021/08/19 | 21270 | systems/win32/miktex/tm/packages/ekdosis.tar.lzma
-2021/08/19 | 21226 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
2021/08/19 | 21148 | systems/texlive/tlnet/archive/ekdosis.r60271.tar.xz
-2021/08/19 | 20810050 | systems/texlive/tlnet/install-tl-windows.exe
-2021/08/19 | 208048 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/08/19 | 206604 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/08/19 | 2083 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005.bbx
2021/08/19 | 20419 | systems/win32/miktex/tm/packages/zref-check__source.tar.lzma
2021/08/19 | 2033590 | systems/win32/miktex/tm/packages/siunitx__doc.tar.lzma
-2021/08/19 | 202797 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/08/19 | 20137 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/08/19 | 2009905 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
2021/08/19 | 200190 | macros/latex/contrib/projlib/ProjLib-doc-fr.pdf
-2021/08/19 | 199731 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
2021/08/19 | 199267 | macros/latex/contrib/projlib/ProjLib-doc-en.pdf
-2021/08/19 | 1984 | systems/texlive/tlnet/archive/lambdax.r60268.tar.xz
2021/08/19 | 1983 | systems/win32/miktex/tm/packages/hvlogos__source.tar.lzma
-2021/08/19 | 198169 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/08/19 | 196871 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/08/19 | 196740 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/08/19 | 195637 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/08/19 | 194382 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/08/19 | 1957 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005ay.bbx
2021/08/19 | 19106 | macros/latex/contrib/projlib/LICENSE
2021/08/19 | 19104 | systems/texlive/tlnet/archive/zref-check.source.r60270.tar.xz
2021/08/19 | 1900770 | systems/win32/miktex/tm/packages/media9.tar.lzma
@@ -293,90 +427,39 @@
2021/08/19 | 18591 | systems/win32/miktex/tm/packages/simplivre__source.tar.lzma
2021/08/19 | 18589 | fonts/charissil/doc/FONTLOG.txt
2021/08/19 | 1820 | systems/win32/miktex/tm/packages/keyparse.tar.lzma
-2021/08/19 | 18177 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/08/19 | 180120 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/08/19 | 180011 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/08/19 | 17981 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
2021/08/19 | 17912 | systems/win32/miktex/tm/packages/lebhart__source.tar.lzma
-2021/08/19 | 178354 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
2021/08/19 | 1782284 | systems/win32/miktex/tm/packages/media9__source.tar.lzma
2021/08/19 | 17605 | systems/win32/miktex/tm/packages/beaulivre__source.tar.lzma
-2021/08/19 | 17362667 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
2021/08/19 | 17277 | systems/win32/miktex/tm/packages/verifiche__source.tar.lzma
-2021/08/19 | 17256 | systems/texlive/tlnet/archive/easybook.source.r60266.tar.xz
-2021/08/19 | 17224 | systems/texlive/tlnet/archive/easybook.r60266.tar.xz
-2021/08/19 | 1713892 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/08/19 | 169243 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
2021/08/19 | 168566 | systems/win32/miktex/tm/packages/xindex__source.tar.lzma
-2021/08/19 | 16412 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/08/19 | 16357 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
2021/08/19 | 16139 | systems/win32/miktex/tm/packages/easybook.tar.lzma
-2021/08/19 | 159578 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
2021/08/19 | 15937 | macros/xetex/latex/mynsfc/mynsfc.dtx
-2021/08/19 | 1579632 | fonts/charissil/truetype/CharisSIL-LiteracyCompact-I.ttf
-2021/08/19 | 1577756 | fonts/charissil/truetype/CharisSIL-LiteracyCompact-R.ttf
-2021/08/19 | 1574460 | fonts/charissil/truetype/CharisSIL-LiteracyCompact-BI.ttf
-2021/08/19 | 154805 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/08/19 | 154423 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
2021/08/19 | 154401 | systems/win32/miktex/tm/packages/light-latex-make__doc.tar.lzma
-2021/08/19 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/08/19 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
2021/08/19 | 15204 | systems/texlive/tlnet/archive/verifiche.source.r60269.tar.xz
-2021/08/19 | 1513456 | fonts/charissil/truetype/CharisSIL-LiteracyCompact-B.ttf
-2021/08/19 | 147371 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/08/19 | 1464204 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/08/19 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
2021/08/19 | 1452404 | systems/win32/miktex/tm/packages/uni-titlepage__doc.tar.lzma
-2021/08/19 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/08/19 | 14349 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
-2021/08/19 | 1427 | fonts/charissil/README
-2021/08/19 | 1421867 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
2021/08/19 | 139272 | systems/win32/miktex/tm/packages/jlreq.tar.lzma
2021/08/19 | 13745 | systems/win32/miktex/tm/packages/tipauni__source.tar.lzma
2021/08/19 | 137290 | systems/win32/miktex/tm/packages/fancyvrb__doc.tar.lzma
2021/08/19 | 136883 | macros/latex/contrib/animate/animate.sty
-2021/08/19 | 136824 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/08/19 | 136816 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/08/19 | 13466 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
2021/08/19 | 13459 | systems/win32/miktex/tm/packages/light-latex-make.tar.lzma
-2021/08/19 | 1340928 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/08/19 | 133864 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/08/19 | 1330477 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/08/19 | 1330117 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/08/19 | 1301191 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/08/19 | 1291300 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/08/19 | 131796 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/example.bib
2021/08/19 | 12886 | systems/win32/miktex/tm/packages/projlib.tar.lzma
2021/08/19 | 126534 | fonts/charissil/doc/features.pdf
-2021/08/19 | 124282 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
2021/08/19 | 12403 | macros/latex/contrib/animate/ChangeLog
-2021/08/19 | 1236651 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2021/08/19 | 1235020 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
2021/08/19 | 12056 | systems/win32/miktex/tm/packages/fancyvrb.tar.lzma
-2021/08/19 | 119819 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
2021/08/19 | 117057 | macros/latex/contrib/gamebooklib/gamebooklib_test.pdf
+2021/08/19 | 116995991 | macros/context/latest/cont-tmf.zip
2021/08/19 | 11698 | systems/win32/miktex/tm/packages/light-latex-make__source.tar.lzma
-2021/08/19 | 1169717 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/08/19 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
-2021/08/19 | 115352 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
2021/08/19 | 113397 | systems/win32/miktex/tm/packages/thesis-ekf.tar.lzma
-2021/08/19 | 112984 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/08/19 | 112089 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/08/19 | 1110 | fonts/charissil/latex/CharisSILCompact.sty
-2021/08/19 | 109031 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
2021/08/19 | 10837 | systems/win32/miktex/tm/packages/fancyvrb__source.tar.lzma
2021/08/19 | 108300 | systems/texlive/tlnet/archive/texlive-scripts.r60264.tar.xz
-2021/08/19 | 1077989 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
2021/08/19 | 1070 | fonts/charissil/latex/CharisSIL.sty
2021/08/19 | 106797 | systems/win32/miktex/tm/packages/siunitx__source.tar.lzma
-2021/08/19 | 105223 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
2021/08/19 | 1049716 | systems/win32/miktex/tm/packages/cryptocode__doc.tar.lzma
-2021/08/19 | 103400 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/08/19 | 103205 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
2021/08/19 | 102201 | systems/win32/miktex/tm/packages/minimalist__doc.tar.lzma
2021/08/19 | 1019664 | systems/win32/miktex/tm/packages/zref-check__doc.tar.lzma
2021/08/19 | 1018292 | systems/texlive/tlnet/archive/zref-check.doc.r60270.tar.xz
2021/08/19 | 1008 | macros/xetex/latex/mynsfc/README.md
-2021/08/19 | 100625 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
2021/08/18 | 939765 | install/macros/luatex/latex/ekdosis.tds.zip
2021/08/18 | 930575 | macros/luatex/latex/ekdosis/ekdosis.pdf
2021/08/18 | 914203 | macros/luatex/latex/ekdosis.zip
@@ -387,7 +470,6 @@
2021/08/18 | 715945 | macros/latex/contrib/verifiche.zip
2021/08/18 | 6957 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2021/08/18 | 6851 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1-tei.xml
-2021/08/18 | 672356 | systems/texlive/tlnet/archive/projlib.doc.r60261.tar.xz
2021/08/18 | 630473 | macros/latex/contrib/bytefield/bytefield.pdf
2021/08/18 | 61936 | systems/texlive/tlnet/archive/siunitx.r60258.tar.xz
2021/08/18 | 58 | systems/mac/mactex/MacTeXtras-20210818.zip.md5
@@ -404,7 +486,6 @@
2021/08/18 | 3977 | macros/luatex/latex/ekdosis/Makefile
2021/08/18 | 3903 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.tex
2021/08/18 | 38111 | systems/mac/mactex/ExtrasFolder.pdf
-2021/08/18 | 36884 | systems/texlive/tlnet/archive/projlib.source.r60261.tar.xz
2021/08/18 | 333 | macros/latex/contrib/keyparse/README.md
2021/08/18 | 332 | macros/latex/contrib/lambdax/README.md
2021/08/18 | 23535 | macros/latex/contrib/bytefield/bf-example.tex
@@ -421,11 +502,9 @@
2021/08/18 | 1711 | systems/mac/mactex/Licenses.txt
2021/08/18 | 1710 | macros/latex/contrib/bytefield/README
2021/08/18 | 1710 | macros/latex/contrib/bytefield/bytefield.ins
-2021/08/18 | 16871 | CTAN.sites
2021/08/18 | 1569 | macros/latex/contrib/gamebooklib/README
2021/08/18 | 14320 | macros/latex/contrib/keyparse/keyparse.dtx
2021/08/18 | 140900 | macros/latex/contrib/bytefield/bytefield.dtx
-2021/08/18 | 12556 | systems/texlive/tlnet/archive/projlib.r60261.tar.xz
2021/08/18 | 12114 | macros/latex/contrib/lambdax/lambdax.dtx
2021/08/18 | 11925 | macros/luatex/latex/ekdosis/ekdosis.el
2021/08/18 | 1145 | macros/latex/contrib/lambdax/lambdax.bib
@@ -634,132 +713,3 @@
2021/08/14 | 2388 | systems/texlive/tlnet/archive/hvlogos.r60236.tar.xz
2021/08/14 | 1952 | systems/texlive/tlnet/archive/tikzbricks.r60234.tar.xz
2021/08/14 | 14467 | graphics/pgf/contrib/yquant/tex/yquant-circuit.tex
-2021/08/13 | 98 | indexing/upmendex/source/version.h
-2021/08/13 | 9878 | graphics/pgf/contrib/tikzbricks/tikzbricks-doc.tex
-2021/08/13 | 97946 | macros/latex/contrib/media9/pdfbase.sty
-2021/08/13 | 96 | indexing/upmendex/source/tests/pprecA-2.ind
-2021/08/13 | 96 | indexing/upmendex/source/tests/pprecA-1.ind
-2021/08/13 | 96 | indexing/upmendex/source/tests/pprecA-0.ind
-2021/08/13 | 9497 | indexing/upmendex/source/convert.c
-2021/08/13 | 93159 | macros/latex/contrib/media9/doc/media9.tex
-2021/08/13 | 9064 | systems/texlive/tlnet/archive/thesis-ekf.source.r60228.tar.xz
-2021/08/13 | 872 | indexing/upmendex/doc/samples/option/japanese.idx
-2021/08/13 | 868 | indexing/upmendex/source/exkana.h
-2021/08/13 | 839 | indexing/upmendex/doc/samples/mdxsty02.ist
-2021/08/13 | 8208 | systems/texlive/tlnet/archive/jlreq.source.r60225.tar.xz
-2021/08/13 | 8200 | systems/texlive/tlnet/archive/pwebmac.r60229.tar.xz
-2021/08/13 | 7869 | indexing/upmendex/source/main.c
-2021/08/13 | 77950 | macros/latex/contrib/hvlogos.zip
-2021/08/13 | 776584 | systems/texlive/tlnet/archive/geradwp.doc.r60227.tar.xz
-2021/08/13 | 766 | indexing/upmendex/source/tests/uni.ind
-2021/08/13 | 76488 | macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf
-2021/08/13 | 749 | indexing/upmendex/doc/samples/option/Makefile
-2021/08/13 | 7472636 | install/macros/latex/contrib/media9.tds.zip
-2021/08/13 | 7467346 | macros/latex/contrib/media9.zip
-2021/08/13 | 7394 | indexing/upmendex/source/ChangeLog
-2021/08/13 | 714562 | indexing/upmendex/source/configure
-2021/08/13 | 68 | indexing/upmendex/source/tests/foo.idx
-2021/08/13 | 6757 | indexing/upmendex/source/kana.h
-2021/08/13 | 65 | indexing/upmendex/doc/samples/alphabet/mdxsty_es1.ist
-2021/08/13 | 64 | indexing/upmendex/source/tests/uni.dict
-2021/08/13 | 61 | indexing/upmendex/source/tests/rangetwo.ind
-2021/08/13 | 614 | indexing/upmendex/doc/samples/russian.idx
-2021/08/13 | 60 | indexing/upmendex/doc/samples/alphabet/mdxsty_es2.ist
-2021/08/13 | 58 | indexing/upmendex/source/tests/foo.ind
-2021/08/13 | 5883 | graphics/pgf/contrib/tikzbricks/tikzbricks.sty
-2021/08/13 | 5842 | indexing/upmendex/source/qsort.c
-2021/08/13 | 5712 | systems/texlive/tlnet/archive/geradwp.r60227.tar.xz
-2021/08/13 | 5477 | macros/latex/contrib/hvlogos/latex/hvlogos.sty
-2021/08/13 | 521 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh22.ist
-2021/08/13 | 513700 | systems/texlive/tlnet/archive/jlreq.doc.r60225.tar.xz
-2021/08/13 | 4922 | indexing/upmendex/source/c-auto.in
-2021/08/13 | 480 | indexing/xindex/doc/tests/HADW.tex
-2021/08/13 | 46 | indexing/upmendex/source/tests/rangetwo.idx
-2021/08/13 | 46897 | indexing/upmendex/source/Makefile.in
-2021/08/13 | 463 | indexing/upmendex/doc/samples/german.idx
-2021/08/13 | 462 | indexing/upmendex/doc/samples/multi.idx
-2021/08/13 | 461 | graphics/pgf/contrib/tikzbricks/README.md
-2021/08/13 | 459671 | indexing/upmendex.zip
-2021/08/13 | 456405 | info/biblio/texbook2.bib
-2021/08/13 | 4485 | indexing/upmendex/doc/samples/alphabet/alpha_zhr.idx
-2021/08/13 | 44238 | indexing/upmendex/source/aclocal.m4
-2021/08/13 | 43 | indexing/upmendex/doc/samples/alphabet/mdxsty_es.ist
-2021/08/13 | 435 | indexing/upmendex/source/tests/uni.idx
-2021/08/13 | 435 | indexing/upmendex/doc/samples/french.idx
-2021/08/13 | 415 | indexing/xindex/doc/tests/buch.tex
-2021/08/13 | 412 | indexing/upmendex/source/exhanzi.h
-2021/08/13 | 406 | indexing/upmendex/source/kp.h
-2021/08/13 | 4039 | indexing/upmendex/doc/samples/alphabet/alpha_zh.idx
-2021/08/13 | 4016 | indexing/upmendex/README.md
-2021/08/13 | 400 | indexing/upmendex/source/qsort.h
-2021/08/13 | 3748085 | macros/latex/contrib/media9/doc/media9.pdf
-2021/08/13 | 3736830 | info/biblio/tugboat.bib
-2021/08/13 | 371 | indexing/upmendex/doc/samples/Makefile
-2021/08/13 | 3579 | info/biblio/tugboat.ltx
-2021/08/13 | 3517 | macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex
-2021/08/13 | 340 | indexing/upmendex/doc/samples/greek.idx
-2021/08/13 | 337 | indexing/upmendex/source/ac/withenable.ac
-2021/08/13 | 334 | indexing/upmendex/doc/samples/option/mdxsty_rule0.ist
-2021/08/13 | 333 | indexing/upmendex/source/indexsty
-2021/08/13 | 322100 | systems/texlive/tlnet/archive/thesis-ekf.doc.r60228.tar.xz
-2021/08/13 | 30688 | indexing/upmendex/source/fwrite.c
-2021/08/13 | 295 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh31.ist
-2021/08/13 | 295 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh21.ist
-2021/08/13 | 295 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh11.ist
-2021/08/13 | 291 | indexing/upmendex/doc/samples/mdxsty01.ist
-2021/08/13 | 285 | indexing/upmendex/doc/samples/option/mdxsty_j02.ist
-2021/08/13 | 279 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh2.ist
-2021/08/13 | 278 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh1.ist
-2021/08/13 | 272 | indexing/upmendex/source/tests/uni.ist
-2021/08/13 | 271 | indexing/upmendex/doc/samples/option/mdxsty_j01.ist
-2021/08/13 | 271 | indexing/upmendex/doc/samples/option/mdxsty_j00.ist
-2021/08/13 | 261 | indexing/upmendex/doc/samples/alphabet/mdxsty_head2.ist
-2021/08/13 | 260 | indexing/upmendex/doc/samples/mdxsty00.ist
-2021/08/13 | 260 | indexing/upmendex/doc/samples/alphabet/mdxsty_head3.ist
-2021/08/13 | 260 | indexing/upmendex/doc/samples/alphabet/mdxsty_head1.ist
-2021/08/13 | 259649 | graphics/pgf/contrib/tikzbricks/tikzbricks-doc.pdf
-2021/08/13 | 256369 | graphics/pgf/contrib/tikzbricks.zip
-2021/08/13 | 252502 | indexing/upmendex/man/upmendex.man1.pdf
-2021/08/13 | 2441 | indexing/upmendex/source/mendex.h
-2021/08/13 | 23 | indexing/upmendex/source/tests/rangetwo.ist
-2021/08/13 | 2311 | indexing/upmendex/source/configure.ac
-2021/08/13 | 2198 | indexing/upmendex/source/var.h
-2021/08/13 | 215 | macros/latex/contrib/hvlogos/Changes
-2021/08/13 | 2144 | indexing/upmendex/doc/samples/alphabet/alpha_zhz.idx
-2021/08/13 | 213 | indexing/upmendex/source/tests/pprecA.idx
-2021/08/13 | 20972 | systems/texlive/tlnet/archive/geradwp.source.r60227.tar.xz
-2021/08/13 | 1992 | indexing/upmendex/doc/samples/alphabet/alpha_es.idx
-2021/08/13 | 19515 | indexing/upmendex/source/hanzi.h
-2021/08/13 | 1891 | indexing/upmendex/doc/samples/alphabet/alpha_zhp.idx
-2021/08/13 | 1842 | indexing/upmendex/source/ktable.h
-2021/08/13 | 182 | indexing/upmendex/source/tests/pprec0.ist
-2021/08/13 | 1807 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh14.ist
-2021/08/13 | 1807 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh13.ist
-2021/08/13 | 1807 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh12.ist
-2021/08/13 | 179 | indexing/upmendex/source/tests/pprec2.ist
-2021/08/13 | 179 | indexing/upmendex/source/tests/pprec1.ist
-2021/08/13 | 17810 | indexing/upmendex/doc/upmendex.ja.txt
-2021/08/13 | 17756 | indexing/upmendex/man/upmendex.1
-2021/08/13 | 1753 | indexing/upmendex/source/tests/upmendex.test
-2021/08/13 | 159762 | macros/latex/contrib/media9/media9.sty
-2021/08/13 | 158 | indexing/upmendex/source/tests/uni1.ist
-2021/08/13 | 1564 | systems/texlive/tlnet/archive/collection-publishers.r60227.tar.xz
-2021/08/13 | 15172 | macros/latex/contrib/media9/ChangeLog
-2021/08/13 | 1477 | indexing/upmendex/doc/samples/korean.idx
-2021/08/13 | 146660 | systems/texlive/tlnet/archive/fancyvrb.doc.r60226.tar.xz
-2021/08/13 | 1464 | indexing/upmendex/COPYRIGHT
-2021/08/13 | 14125 | indexing/upmendex/source/sort.c
-2021/08/13 | 139 | indexing/upmendex/source/tests/uni2.ist
-2021/08/13 | 1379 | indexing/upmendex/doc/samples/alphabet/Makefile
-2021/08/13 | 136784 | systems/texlive/tlnet/archive/jlreq.r60225.tar.xz
-2021/08/13 | 1351 | indexing/upmendex/source/exvar.h
-2021/08/13 | 13316 | indexing/upmendex/source/fread.c
-2021/08/13 | 1326 | indexing/upmendex/source/Makefile.am
-2021/08/13 | 1240 | indexing/upmendex/doc/samples/option/attri1.idx
-2021/08/13 | 1200 | indexing/upmendex/doc/samples/alphabet/alpha_zhs.idx
-2021/08/13 | 1190 | indexing/upmendex/source/kp.c
-2021/08/13 | 11804 | systems/texlive/tlnet/archive/fancyvrb.r60226.tar.xz
-2021/08/13 | 113096 | systems/texlive/tlnet/archive/thesis-ekf.r60228.tar.xz
-2021/08/13 | 10984 | indexing/upmendex/source/styfile.c
-2021/08/13 | 1054 | indexing/upmendex/source/pageread.c
-2021/08/13 | 10512 | systems/texlive/tlnet/archive/pwebmac.doc.r60229.tar.xz
diff --git a/fonts/charissil/README b/fonts/charissil/README
index ec531f1432..8a3ee49246 100644
--- a/fonts/charissil/README
+++ b/fonts/charissil/README
@@ -1,34 +1,28 @@
This is the README for the charissil package, version 6.001,
-release 2021-08-19.
+release 2021-08-20.
-This package provides the CharisSIL and
-CharisSIL-LiteracyCompact families of TrueType fonts adapted
-by SIL International from Bitstream Charter. Because of the
-Reserved Font Name licensing restrictions, type1 versions
-are not available and documents must be processed using
-xelatex or lualatex.
+This package provides the CharisSIL family of TrueType fonts
+adapted by SIL International from Bitstream Charter. Because
+of the Reserved Font Name licensing restrictions, type1
+versions are not available and documents must be processed
+using xelatex or lualatex.
To install this package on a TDS-compliant
TeX system download the file
-"tex-archive"/install/fonts/charissil.tds.zip where the
-preferred URL for "tex-archive" is http://mirrors.ctan.org.
-Unzip the archive at the root of an appropriate texmf tree,
-likely a personal or local tree. If necessary, update the
-file-name database (e.g., texhash).
+"tex-archive"/install/fonts/charissil.tds.zip
+where the preferred URL for "tex-archive" is
+http://mirrors.ctan.org. Unzip the archive at the root of an
+appropriate texmf tree, likely a personal or local tree. If
+necessary, update the file-name database (e.g., texhash).
To use, add
\usepackage{CharisSIL}
-or
-
-\usepackage{CharisSILCompact}
-
to the preamble of your document. This will activate
-CharisSIL or CharisSIL-LeteracyCompact, respectively as
-the main (serifed) text font. Regular, Italic, Bold and
-BoldItalic styles are available. The only figure style is
-tabular-lining.
+CharisSIL as the main (serifed) text font. Regular, Italic,
+Bold and BoldItalic styles are available. The only figure
+style is tabular-lining.
Options scaled=<number> or scale=<number> may be used to
scale the fonts.
diff --git a/fonts/charissil/doc/CharisSILCompact-samples.pdf b/fonts/charissil/doc/CharisSILCompact-samples.pdf
deleted file mode 100644
index be171b63d4..0000000000
--- a/fonts/charissil/doc/CharisSILCompact-samples.pdf
+++ /dev/null
Binary files differ
diff --git a/fonts/charissil/doc/CharisSILCompact-samples.tex b/fonts/charissil/doc/CharisSILCompact-samples.tex
deleted file mode 100644
index e6c0ad0630..0000000000
--- a/fonts/charissil/doc/CharisSILCompact-samples.tex
+++ /dev/null
@@ -1,40 +0,0 @@
-\documentclass{article}
-\usepackage{iftex}
-\usepackage[scale=1.0]{CharisSILCompact}
-\usepackage{babel,lipsum}
-\begin{document}
-\thispagestyle{empty}
-
-\begin{center}\huge\bf CharisSIL Compact
-\end{center}
-
-
-\section*{Regular}
-\lipsum[1]
-
-\section*{Small Caps}
-\textsc{\lipsum[1]}
-
-\section*{Italic}
-\textit{\lipsum[2]}
-
-\section*{Bold}
-
-\textbf{\lipsum[3]}
-
-\section*{Bold Italic}
-
-
-\textbf{\textit{\lipsum[4]}}
-
-\section*{Numbers}
-
-0123456789
-
-\section*{Cyrillic}
-
-
-Съешь ещё Ñтих мÑгких французÑких булок да
-выпей чаю!
-
-\end{document}
diff --git a/fonts/charissil/latex/CharisSILCompact.sty b/fonts/charissil/latex/CharisSILCompact.sty
deleted file mode 100644
index c3164ac6c8..0000000000
--- a/fonts/charissil/latex/CharisSILCompact.sty
+++ /dev/null
@@ -1,45 +0,0 @@
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{CharisSILCompact}
- [2021/08/19 (Bob Tennent) Style file for CharisSILCompact fonts.]
-
-\RequirePackage{iftex,xkeyval}
-
-\ifpdftex
-\PackageError{charissilcompact}{%
- **********************************\MessageBreak
- Process using xelatex or lualatex\MessageBreak
- **********************************}
-\fi
-
-
-\newcommand*{\CharisSILCompact@scale}{1}
-\DeclareOptionX{scaled}{\renewcommand*{\CharisSILCompact@scale}{#1}}
-\DeclareOptionX{scale}{\renewcommand*{\CharisSILCompact@scale}{#1}}
-
-\ProcessOptionsX\relax
-
-\RequirePackage{fontspec}
-
-\ifxetex\XeTeXtracingfonts=1\fi
-\defaultfontfeatures{
- Ligatures = TeX ,
- Scale = \CharisSILCompact@scale ,
- Extension = .ttf }
-\setmainfont
- [ UprightFont = *-R,
- ItalicFont = *-I,
- BoldFont = *-B,
- BoldItalicFont = *-B,
- ]
- {CharisSIL-LiteracyCompact}
-\newfontfamily\CharisSILCompact
- [ UprightFont = *-R,
- ItalicFont = *-I,
- BoldFont = *-B,
- BoldItalicFont = *-B,
- ]
- {CharisSIL-LiteracyCompact}
-
-\defaultfontfeatures{}
-
-\endinput
diff --git a/fonts/charissil/truetype/CharisSIL-LiteracyCompact-B.ttf b/fonts/charissil/truetype/CharisSIL-LiteracyCompact-B.ttf
deleted file mode 100644
index bf5b8289a4..0000000000
--- a/fonts/charissil/truetype/CharisSIL-LiteracyCompact-B.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/charissil/truetype/CharisSIL-LiteracyCompact-BI.ttf b/fonts/charissil/truetype/CharisSIL-LiteracyCompact-BI.ttf
deleted file mode 100644
index 8e9b240bc1..0000000000
--- a/fonts/charissil/truetype/CharisSIL-LiteracyCompact-BI.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/charissil/truetype/CharisSIL-LiteracyCompact-I.ttf b/fonts/charissil/truetype/CharisSIL-LiteracyCompact-I.ttf
deleted file mode 100644
index a2373c64ce..0000000000
--- a/fonts/charissil/truetype/CharisSIL-LiteracyCompact-I.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/charissil/truetype/CharisSIL-LiteracyCompact-R.ttf b/fonts/charissil/truetype/CharisSIL-LiteracyCompact-R.ttf
deleted file mode 100644
index b9adea960a..0000000000
--- a/fonts/charissil/truetype/CharisSIL-LiteracyCompact-R.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/newcomputermodern/README b/fonts/newcomputermodern/README
index 24e49610d7..7f43f3cb10 100644
--- a/fonts/newcomputermodern/README
+++ b/fonts/newcomputermodern/README
@@ -1,17 +1,18 @@
New Computer Modern Fonts
- (Package version 3.91, GustFLv1 or later)
+ (Package version 3.92, GustFLv1 or later)
Antonis Tsolomitis
Samos, Greece, 2019--2021
This is a release of a new assembly of ComputerModern
fonts plus glyphs for non latin alphabets which are considered
-compatible in style to CM fonts.
+compatible in style to CM fonts.
=======================================================================
Use with:
+
\usepackage[default]{fontsetup} (loads the Book weight)
or
\usepackage{newcomputermodern}
@@ -21,6 +22,15 @@ OR
\usepackage[olddefault]{fontsetup} (loads the Regular weight)
or
\usepackage[regular]{newcomputermodern} (loads the Regular weight)
+
+OR
+
+\usepackage{fontspec}
+\setmainfont{NewCM10-Book}
+\setsansfont{NewCMSans10-Book}
+\setmonofont{NewCMMono10-Book}
+
+and similarly for the Regular weight.
=======================================================================
The fonts contain Latin and accented latin letters and combinations,
@@ -35,6 +45,10 @@ of Mathematics providing the widest possible Mathematical coverage.
Latest additions/improvements:
+Version 3.92
+
+Fixes a naming problem of the .fontspec files.
+
Version 3.91
Fixes a problem with internal names of fonts and families.
diff --git a/fonts/newcomputermodern/tex/NewCM10-Book.fontspec b/fonts/newcomputermodern/tex/NewCM10-Book.fontspec
new file mode 100644
index 0000000000..4c45b25222
--- /dev/null
+++ b/fonts/newcomputermodern/tex/NewCM10-Book.fontspec
@@ -0,0 +1,26 @@
+\defaultfontfeatures[NewCM10-Book]
+ {
+ Extension = .otf ,
+ SizeFeatures={%
+ {Size=-8, Font=NewCM08-Book,
+ ItalicFont=NewCM08-BookItalic,%
+ BoldFont=NewCM10-Bold,%
+ BoldItalicFont=NewCM10-BoldItalic,%
+ SlantedFont=NewCM08-Book,%
+ BoldSlantedFont=NewCM10-Bold,%
+ SmallCapsFeatures={Numbers=OldStyle}},
+ {Size=8, Font=NewCM08-Book,
+ ItalicFont=NewCM08-BookItalic,%
+ BoldFont=NewCM10-Bold,%
+ BoldItalicFont=NewCM10-BoldItalic,%
+ SlantedFont=NewCM08-Book,%
+ BoldSlantedFont=NewCM10-Bold,%
+ SmallCapsFeatures={Numbers=OldStyle}},
+ {Size= 9-, Font = NewCM10-Book,
+ ItalicFont=NewCM10-BookItalic,%
+ BoldFont=NewCM10-Bold,%
+ BoldItalicFont=NewCM10-BoldItalic,%
+ SlantedFont=NewCM10-Book,%
+ BoldSlantedFont=NewCM10-Bold,%
+ SmallCapsFeatures={Numbers=OldStyle}}%
+ }}
diff --git a/fonts/newcomputermodern/tex/NewCM10-Regular.fontspec b/fonts/newcomputermodern/tex/NewCM10-Regular.fontspec
new file mode 100644
index 0000000000..e6428fca73
--- /dev/null
+++ b/fonts/newcomputermodern/tex/NewCM10-Regular.fontspec
@@ -0,0 +1,26 @@
+\defaultfontfeatures[NewCM10-Regular]
+ {
+ Extension = .otf ,
+ SizeFeatures={%
+ {Size=-8, Font = NewCM08-Regular,
+ ItalicFont = NewCM08-Italic,%
+ BoldFont = NewCM10-Bold,%
+ BoldItalicFont = NewCM10-BoldItalic,%
+ SlantedFont = NewCM08-Regular,%
+ BoldSlantedFont = NewCM10-Bold,%
+ SmallCapsFeatures = {Numbers=OldStyle}},
+ {Size=8, Font = NewCM08-Regular,
+ ItalicFont = NewCM08-Italic,%
+ BoldFont = NewCM10-Bold,%
+ BoldItalicFont = NewCM10-BoldItalic,%
+ SlantedFont = NewCM08-Regular,%
+ BoldSlantedFont = NewCM10-Bold,%
+ SmallCapsFeatures = {Numbers=OldStyle}},
+ {Size= 9-, Font = NewCM10-Regular,
+ ItalicFont = NewCM10-Italic,%
+ BoldFont = NewCM10-Bold,%
+ BoldItalicFont = NewCM10-BoldItalic,%
+ SlantedFont = NewCM10-Regular,%
+ BoldSlantedFont = NewCM10-Bold,%
+ SmallCapsFeatures = {Numbers=OldStyle}}%
+ }}
diff --git a/fonts/newcomputermodern/tex/NewComputerModernMonoBook.fontspec b/fonts/newcomputermodern/tex/NewCMMono10-Book.fontspec
index b3fdc49093..364563fe97 100644
--- a/fonts/newcomputermodern/tex/NewComputerModernMonoBook.fontspec
+++ b/fonts/newcomputermodern/tex/NewCMMono10-Book.fontspec
@@ -1,4 +1,4 @@
-\defaultfontfeatures[NewComputerModern Mono Book]
+\defaultfontfeatures[NewCMMono10-Book]
{
Extension = .otf ,
UprightFont = NewCMMono10-Book,
diff --git a/fonts/newcomputermodern/tex/NewComputerModernMono.fontspec b/fonts/newcomputermodern/tex/NewCMMono10-Regular.fontspec
index c4bb5441c4..f38fad9c24 100644
--- a/fonts/newcomputermodern/tex/NewComputerModernMono.fontspec
+++ b/fonts/newcomputermodern/tex/NewCMMono10-Regular.fontspec
@@ -1,4 +1,4 @@
-\defaultfontfeatures[NewComputerModern Mono]
+\defaultfontfeatures[NewCMMono10-Regular]
{
Extension = .otf ,
UprightFont = NewCMMono10-Regular,
diff --git a/fonts/newcomputermodern/tex/NewCMSans10-Book.fontspec b/fonts/newcomputermodern/tex/NewCMSans10-Book.fontspec
new file mode 100644
index 0000000000..31a704f961
--- /dev/null
+++ b/fonts/newcomputermodern/tex/NewCMSans10-Book.fontspec
@@ -0,0 +1,21 @@
+\defaultfontfeatures[NewCMSans10-Book]
+ {
+ Extension = .otf ,
+ SizeFeatures={%
+ {Size= -8, Font=NewCMSans08-Book,%
+ ItalicFont=NewCMSans08-BookOblique,%
+ BoldFont=NewCMSans10-Bold,%
+ BoldItalicFont=NewCMSans10-BoldOblique,%
+ SmallCapsFeatures={Numbers=OldStyle}},
+ {Size= 8, Font=NewCMSans08-Book,%
+ ItalicFont=NewCMSans08-BookOblique,%
+ BoldFont=NewCMSans10-Bold,%
+ BoldItalicFont=NewCMSans10-BoldOblique,%
+ SmallCapsFeatures={Numbers=OldStyle}},
+ {Size= 9-, Font=NewCMSans10-Book,%
+ ItalicFont=NewCMSans10-BookOblique,%
+ BoldFont=NewCMSans10-Bold,%
+ BoldItalicFont=NewCMSans10-BoldOblique,%
+ SmallCapsFeatures={Numbers=OldStyle}}
+ }}
+
diff --git a/fonts/newcomputermodern/tex/NewCMSans10-Regular.fontspec b/fonts/newcomputermodern/tex/NewCMSans10-Regular.fontspec
new file mode 100644
index 0000000000..ae36030f0c
--- /dev/null
+++ b/fonts/newcomputermodern/tex/NewCMSans10-Regular.fontspec
@@ -0,0 +1,20 @@
+\defaultfontfeatures[NewCMSans10-Regular]
+ {
+ Extension = .otf ,
+ SizeFeatures={%
+ {Size= -8, Font=NewCMSans08-Regular,%
+ ItalicFont=NewCMSans08-Oblique,%
+ BoldFont=NewCMSans10-Bold,%
+ BoldItalicFont=NewCMSans10-BoldOblique,%
+ SmallCapsFeatures={Numbers=OldStyle}},
+ {Size= 8, Font=NewCMSans08-Regular,%
+ ItalicFont=NewCMSans08-Oblique,%
+ BoldFont=NewCMSans10-Bold,%
+ BoldItalicFont=NewCMSans10-BoldOblique,%
+ SmallCapsFeatures={Numbers=OldStyle}},
+ {Size= 9-, Font=NewCMSans10-Regular,%
+ ItalicFont=NewCMSans10-Oblique,%
+ BoldFont=NewCMSans10-Bold,%
+ BoldItalicFont=NewCMSans10-BoldOblique,%
+ SmallCapsFeatures={Numbers=OldStyle}}
+ }}
diff --git a/fonts/newcomputermodern/tex/NewComputerModern.fontspec b/fonts/newcomputermodern/tex/NewComputerModern.fontspec
deleted file mode 100644
index 8652f3a518..0000000000
--- a/fonts/newcomputermodern/tex/NewComputerModern.fontspec
+++ /dev/null
@@ -1,26 +0,0 @@
-\defaultfontfeatures[NewComputerModern]
- {
- Extension = .otf ,
- SizeFeatures={%
- {Size=-8, Font=NewCM08-Regular.otf,
- ItalicFont=NewCM08-Italic.otf,%
- BoldFont=NewCM10-Bold.otf,%
- BoldItalicFont=NewCM10-BoldItalic.otf,%
- SlantedFont=NewCM08-Regular.otf,%
- BoldSlantedFont=NewCM10-Bold.otf,%
- SmallCapsFeatures={Numbers=OldStyle}},
- {Size=8, Font=NewCM08-Regular.otf,
- ItalicFont=NewCM08-Italic.otf,%
- BoldFont=NewCM10-Bold.otf,%
- BoldItalicFont=NewCM10-BoldItalic.otf,%
- SlantedFont=NewCM08-Regular.otf,%
- BoldSlantedFont=NewCM10-Bold.otf,%
- SmallCapsFeatures={Numbers=OldStyle}},
- {Size= 9-, Font = NewCM10-Regular.otf,
- ItalicFont=NewCM10-Italic.otf,%
- BoldFont=NewCM10-Bold.otf,%
- BoldItalicFont=NewCM10-BoldItalic.otf,%
- SlantedFont=NewCM10-Regular.otf,%
- BoldSlantedFont=NewCM10-Bold.otf,%
- SmallCapsFeatures={Numbers=OldStyle}}%
- }}
diff --git a/fonts/newcomputermodern/tex/NewComputerModernBook.fontspec b/fonts/newcomputermodern/tex/NewComputerModernBook.fontspec
deleted file mode 100644
index 8eaa902e69..0000000000
--- a/fonts/newcomputermodern/tex/NewComputerModernBook.fontspec
+++ /dev/null
@@ -1,26 +0,0 @@
-\defaultfontfeatures[NewComputerModern Book]
- {
- Extension = .otf ,
- SizeFeatures={%
- {Size=-8, Font=NewCM08-Book.otf,
- ItalicFont=NewCM08-BookItalic.otf,%
- BoldFont=NewCM10-Bold.otf,%
- BoldItalicFont=NewCM10-BoldItalic.otf,%
- SlantedFont=NewCM08-Book.otf,%
- BoldSlantedFont=NewCM10-Bold.otf,%
- SmallCapsFeatures={Numbers=OldStyle}},
- {Size=8, Font=NewCM08-Book.otf,
- ItalicFont=NewCM08-BookItalic.otf,%
- BoldFont=NewCM10-Bold.otf,%
- BoldItalicFont=NewCM10-BoldItalic.otf,%
- SlantedFont=NewCM08-Book.otf,%
- BoldSlantedFont=NewCM10-Bold.otf,%
- SmallCapsFeatures={Numbers=OldStyle}},
- {Size= 9-, Font = NewCM10-Book.otf,
- ItalicFont=NewCM10-BookItalic.otf,%
- BoldFont=NewCM10-Bold.otf,%
- BoldItalicFont=NewCM10-BoldItalic.otf,%
- SlantedFont=NewCM10-Book.otf,%
- BoldSlantedFont=NewCM10-Bold.otf,%
- SmallCapsFeatures={Numbers=OldStyle}}%
- }}
diff --git a/fonts/newcomputermodern/tex/NewComputerModernSans.fontspec b/fonts/newcomputermodern/tex/NewComputerModernSans.fontspec
deleted file mode 100644
index d55736d0bd..0000000000
--- a/fonts/newcomputermodern/tex/NewComputerModernSans.fontspec
+++ /dev/null
@@ -1,20 +0,0 @@
-\defaultfontfeatures[NewComputerModern Sans]
- {
- Extension = .otf ,
- SizeFeatures={%
- {Size= -8, Font=NewCMSans08-Regular.otf,%
- ItalicFont=NewCMSans08-Oblique.otf,%
- BoldFont=NewCMSans10-Bold.otf,%
- BoldItalicFont=NewCMSans10-BoldOblique.otf,%
- SmallCapsFeatures={Numbers=OldStyle}},
- {Size= 8, Font=NewCMSans08-Regular.otf,%
- ItalicFont=NewCMSans08-Oblique.otf,%
- BoldFont=NewCMSans10-Bold.otf,%
- BoldItalicFont=NewCMSans10-BoldOblique.otf,%
- SmallCapsFeatures={Numbers=OldStyle}},
- {Size= 9-, Font=NewCMSans10-Regular.otf,%
- ItalicFont=NewCMSans10-Oblique.otf,%
- BoldFont=NewCMSans10-Bold.otf,%
- BoldItalicFont=NewCMSans10-BoldOblique.otf,%
- SmallCapsFeatures={Numbers=OldStyle}}
- }}
diff --git a/fonts/newcomputermodern/tex/NewComputerModernSansBook.fontspec b/fonts/newcomputermodern/tex/NewComputerModernSansBook.fontspec
deleted file mode 100644
index 9220d05935..0000000000
--- a/fonts/newcomputermodern/tex/NewComputerModernSansBook.fontspec
+++ /dev/null
@@ -1,21 +0,0 @@
-\defaultfontfeatures[NewComputerModern Sans Book]
- {
- Extension = .otf ,
- SizeFeatures={%
- {Size= -8, Font=NewCMSans08-Book.otf,%
- ItalicFont=NewCMSans08-BookOblique.otf,%
- BoldFont=NewCMSans10-Bold.otf,%
- BoldItalicFont=NewCMSans10-BoldOblique.otf,%
- SmallCapsFeatures={Numbers=OldStyle}},
- {Size= 8, Font=NewCMSans08-Book.otf,%
- ItalicFont=NewCMSans08-BookOblique.otf,%
- BoldFont=NewCMSans10-Bold.otf,%
- BoldItalicFont=NewCMSans10-BoldOblique.otf,%
- SmallCapsFeatures={Numbers=OldStyle}},
- {Size= 9-, Font=NewCMSans10-Book.otf,%
- ItalicFont=NewCMSans10-BookOblique.otf,%
- BoldFont=NewCMSans10-Bold.otf,%
- BoldItalicFont=NewCMSans10-BoldOblique.otf,%
- SmallCapsFeatures={Numbers=OldStyle}}
- }}
-
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
index 94f53b41ca..8df188541e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
@@ -1,4 +1,4 @@
-<b>Date of last change: 2021-05-06 to version v1.0y</b>
+<b>Date of last change: 2021-08-19 to version v1.0z</b>
# biblatex-gb7714-2015: a biblatex style package
@@ -38,9 +38,13 @@ biblatex-gb7714-2015 å®åŒ…是中文å‚考文献著录/标注标准 `GB/T 7714-2
## Need to do:
+ * 注æ„:ms.bbxæ ·å¼å¼•å…¥å†…容时需è¦ç‰¹åˆ«æ³¨æ„空格的引入
+ * 注æ„:mx.cbxæ ·å¼æ²¡æœ‰æ›´æ–°ä¸€äº›æ–°çš„设置(比如2篇文献就压缩等),若有需è¦å¯ä»¥å‚考15.cbxå’Œ15ay.cbx修改。
+ * 应该说ç»è¿‡è¿™äº›å¹´çš„使用,很多corner caseå·²ç»å¤„ç†è¿‡äº†ï¼Œä½†è¿˜æ˜¯å¯èƒ½ä¼šå­˜åœ¨ä¸€äº›ï¼Œç‰¹åˆ«æ˜¯mså’Œmx两个样å¼ä½¿ç”¨çš„少。
* special characters in all fields?
* entry without author: the delimiter between title and year?
* TEST FOR texlive 2015,2016,2017
+
## Applications
@@ -1162,122 +1166,125 @@ biblatex中处ç†é¡ºåºæ•°å­—ç¼–ç åŽ‹ç¼©çš„代ç é»˜è®¤ä»Ž3个连续编ç å¼€å§
### 6. 测试文件说明
+ egfigure
- - ![egciteay.tex](egfigure\egciteay.tex) 测试gb7714-2015ay的标注样å¼ï¼Œæ˜¯å¦æ»¡è¶³GBè¦æ±‚
- - ![egciteaytab.tex](egfigure\egciteaytab.tex) 测试gb7714-2015ay的标注样å¼ï¼Œç»˜åˆ¶æˆè¡¨ç”¨äºŽbiblatex-gb7714-2015.pdf
- - ![egciteaytp.tex](egfigure\egciteaytp.tex) 测试gb7714-2015ay使用natbib的常用标注命令
- - ![egcitenum.tex](egfigure\egcitenum.tex) 测试gb7714-2015的标注样å¼ï¼Œæ˜¯å¦æ»¡è¶³GBè¦æ±‚
- - ![egcitenumtp.tex](egfigure\egcitenumtp.tex) 测试gb7714-2015使用natbib的常用标注命令
- - ![egcitetab.tex](egfigure\egcitetab.tex) 测试gb7714-2015的标注样å¼ï¼Œç»˜åˆ¶æˆè¡¨ç”¨äºŽbiblatex-gb7714-2015.pdf
- - ![egcitesay.tex](egfigure\egcitesay.tex) 测试gb7714-2015ay使用å¤æ•°å½¢å¼çš„命令
- - ![egcitesnum.tex](egfigure\egcitesnum.tex) 测试gb7714-2015使用å¤æ•°å½¢å¼çš„命令
- - ![egcontentfmt.tex](egfigure\egcontentfmt.tex) 测试gb7714-2015æ ·å¼é€‰é¡¹gbnamefmt=givenahead,gbbiblabel=dot,gbtitlelink=true
- - ![egcontentfmtb.tex](egfigure\egcontentfmtb.tex) 测试gb7714-2015msæ ·å¼é€‰é¡¹gbnamefmt=lowercase,gbstyle=false,sorting=nyt
- - ![egcontentfmtc.tex](egfigure\egcontentfmtc.tex) 测试gb7714-2015ayæ ·å¼é€‰é¡¹maxcitenames=2,mincitenames=1,sorting=gbynta(UCAS-资环类)
- - ![egdoublelan.tex](egfigure\egdoublelan.tex) 测试gb7714-2015æ ·å¼å®žçŽ°çš„åŒè¯­å¯¹ç…§æ–‡çŒ®è¡¨ï¼Œå…³è”æ¡ç›®æ–¹æ³•
- - ![egdoublelanb.tex](egfigure\egdoublelanb.tex) 测试gb7714-2015æ ·å¼å®žçŽ°çš„åŒè¯­å¯¹ç…§æ–‡çŒ®è¡¨ï¼Œå…³è”æ¡ç›®æ–¹æ³•ï¼Œï¼ˆgbnamefmt=pinyin 国内æŸæœŸåˆŠï¼‰
- - ![eggbfootstyle.tex](egfigure\eggbfootstyle.tex) 测试gb7714-2015æ ·å¼å®žçŽ°å›½æ ‡è¦æ±‚的脚注文献表
- - ![egfootstyle.tex](egfigure\egfootstyle.tex) 测试gb7714-2015æ ·å¼ä¸€èˆ¬çš„脚注文献表
- - ![egmsinabiblio.tex](egfigure\egmsinabiblio.tex) 测试gb7714-2015msæ ·å¼åœ¨ä¸€ç¯‡æ–‡æ¡£ä¸­ä½¿ç”¨ä¸¤ç§æ ¼å¼è®¾ç½®ï¼Œä¸­æ–‡ï¼šGB,英文:biblatex标准样å¼
- - ![egmxindfrefsec.tex](egfigure\egmxindfrefsec.tex) 测试gb7714-2015mxæ ·å¼åœ¨ä¸åŒçš„å‚考文献分节中使用顺åºç¼–ç å’Œä½œè€…年制两ç§ä¸åŒæ ·å¼
- - ![egmultilan.tex](egfigure\egmultilan.tex) 测试gb7714-2015æ ·å¼å®žçŽ°çš„多语言混åˆçš„文献表
- - ![egmwe.tex](egfigure\egmwe.tex) 测试gb7714-2015æ ·å¼æœ€å°ç¤ºä¾‹ï¼Œç”¨äºŽbiblatex-gb7714-2015.PDF
- - ![egparfmt.tex](egfigure\egparfmt.tex) 测试gb7714-2015æ ·å¼æ–‡çŒ®è¡¨æ®µè½æ ¼å¼è®¾ç½®ï¼ŒåŒ…括缩进,颜色,字体,间è·ç­‰
- - ![tgbbiblio.tex](egfigure\tgbbiblio.tex) 实现GB/T 7714-2015 标准的附录的文献表示例(gb7714-2015æ ·å¼ï¼‰
- - ![tgbbiblioms.tex](egfigure\tgbbiblioms.tex) 实现GB/T 7714-2015 标准的附录的文献表示例(gb7714-2015msæ ·å¼ï¼‰
- - ![tgbcitation.tex](egfigure\tgbcitation.tex) 实现GB/T 7714-2015 标准2-10节给出的顺åºç¼–ç åˆ¶ç¤ºä¾‹ï¼ˆgb7714-2015æ ·å¼ï¼‰
- - ![tgbcitationms.tex](egfigure\tgbcitationms.tex) 实现GB/T 7714-2015 标准2-10节给出的顺åºç¼–ç åˆ¶ç¤ºä¾‹ï¼ˆgb7714-2015msæ ·å¼ï¼‰
- - ![tngbcitationay.tex](egfigure\tngbcitationay.tex) 实现GB/T 7714-2015 标准2-10节给出的著者年份制示例(gb7714-2015ayæ ·å¼ï¼‰
- - ![tngbcitationaynew.tex](egfigure\tngbcitationaynew.tex) 实现GB/T 7714-2015 标准2-10节给出的著者年份制示例(gb7714-2015ayæ ·å¼ï¼Œnohashothers=true)
+ - ![egciteay.tex](egfigure/egciteay.tex) 测试gb7714-2015ay的标注样å¼ï¼Œæ˜¯å¦æ»¡è¶³GBè¦æ±‚
+ - ![egciteaytab.tex](egfigure/egciteaytab.tex) 测试gb7714-2015ay的标注样å¼ï¼Œç»˜åˆ¶æˆè¡¨ç”¨äºŽbiblatex-gb7714-2015.pdf
+ - ![egciteaytp.tex](egfigure/egciteaytp.tex) 测试gb7714-2015ay使用natbib的常用标注命令
+ - ![egcitenum.tex](egfigure/egcitenum.tex) 测试gb7714-2015的标注样å¼ï¼Œæ˜¯å¦æ»¡è¶³GBè¦æ±‚
+ - ![egcitenumtp.tex](egfigure/egcitenumtp.tex) 测试gb7714-2015使用natbib的常用标注命令
+ - ![egcitetab.tex](egfigure/egcitetab.tex) 测试gb7714-2015的标注样å¼ï¼Œç»˜åˆ¶æˆè¡¨ç”¨äºŽbiblatex-gb7714-2015.pdf
+ - ![egcitesay.tex](egfigure/egcitesay.tex) 测试gb7714-2015ay使用å¤æ•°å½¢å¼çš„命令
+ - ![egcitesnum.tex](egfigure/egcitesnum.tex) 测试gb7714-2015使用å¤æ•°å½¢å¼çš„命令
+ - ![egcontentfmt.tex](egfigure/egcontentfmt.tex) 测试gb7714-2015æ ·å¼é€‰é¡¹gbnamefmt=givenahead,gbbiblabel=dot,gbtitlelink=true
+ - ![egcontentfmtb.tex](egfigure/egcontentfmtb.tex) 测试gb7714-2015msæ ·å¼é€‰é¡¹gbnamefmt=lowercase,gbstyle=false,sorting=nyt
+ - ![egcontentfmtc.tex](egfigure/egcontentfmtc.tex) 测试gb7714-2015ayæ ·å¼é€‰é¡¹maxcitenames=2,mincitenames=1,sorting=gbynta(UCAS-资环类)
+ - ![egdoublelan.tex](egfigure/egdoublelan.tex) 测试gb7714-2015æ ·å¼å®žçŽ°çš„åŒè¯­å¯¹ç…§æ–‡çŒ®è¡¨ï¼Œå…³è”æ¡ç›®æ–¹æ³•
+ - ![egdoublelanb.tex](egfigure/egdoublelanb.tex) 测试gb7714-2015æ ·å¼å®žçŽ°çš„åŒè¯­å¯¹ç…§æ–‡çŒ®è¡¨ï¼Œå…³è”æ¡ç›®æ–¹æ³•ï¼Œï¼ˆgbnamefmt=pinyin 国内æŸæœŸåˆŠï¼‰
+ - ![eggbfootstyle.tex](egfigure/eggbfootstyle.tex) 测试gb7714-2015æ ·å¼å®žçŽ°å›½æ ‡è¦æ±‚的脚注文献表
+ - ![egfootstyle.tex](egfigure/egfootstyle.tex) 测试gb7714-2015æ ·å¼ä¸€èˆ¬çš„脚注文献表
+ - ![egmsinabiblio.tex](egfigure/egmsinabiblio.tex) 测试gb7714-2015msæ ·å¼åœ¨ä¸€ç¯‡æ–‡æ¡£ä¸­ä½¿ç”¨ä¸¤ç§æ ¼å¼è®¾ç½®ï¼Œä¸­æ–‡ï¼šGB,英文:biblatex标准样å¼
+ - ![egmxindfrefsec.tex](egfigure/egmxindfrefsec.tex) 测试gb7714-2015mxæ ·å¼åœ¨ä¸åŒçš„å‚考文献分节中使用顺åºç¼–ç å’Œä½œè€…年制两ç§ä¸åŒæ ·å¼
+ - ![egmultilan.tex](egfigure/egmultilan.tex) 测试gb7714-2015æ ·å¼å®žçŽ°çš„多语言混åˆçš„文献表
+ - ![egmwe.tex](egfigure/egmwe.tex) 测试gb7714-2015æ ·å¼æœ€å°ç¤ºä¾‹ï¼Œç”¨äºŽbiblatex-gb7714-2015.PDF
+ - ![egparfmt.tex](egfigure/egparfmt.tex) 测试gb7714-2015æ ·å¼æ–‡çŒ®è¡¨æ®µè½æ ¼å¼è®¾ç½®ï¼ŒåŒ…括缩进,颜色,字体,间è·ç­‰
+ - ![tgbbiblio.tex](egfigure/tgbbiblio.tex) 实现GB/T 7714-2015 标准的附录的文献表示例(gb7714-2015æ ·å¼ï¼‰
+ - ![tgbbiblioms.tex](egfigure/tgbbiblioms.tex) 实现GB/T 7714-2015 标准的附录的文献表示例(gb7714-2015msæ ·å¼ï¼‰
+ - ![tgbcitation.tex](egfigure/tgbcitation.tex) 实现GB/T 7714-2015 标准2-10节给出的顺åºç¼–ç åˆ¶ç¤ºä¾‹ï¼ˆgb7714-2015æ ·å¼ï¼‰
+ - ![tgbcitationms.tex](egfigure/tgbcitationms.tex) 实现GB/T 7714-2015 标准2-10节给出的顺åºç¼–ç åˆ¶ç¤ºä¾‹ï¼ˆgb7714-2015msæ ·å¼ï¼‰
+ - ![tngbcitationay.tex](egfigure/tngbcitationay.tex) 实现GB/T 7714-2015 标准2-10节给出的著者年份制示例(gb7714-2015ayæ ·å¼ï¼‰
+ - ![tngbcitationaynew.tex](egfigure/tngbcitationaynew.tex) 实现GB/T 7714-2015 标准2-10节给出的著者年份制示例(gb7714-2015ayæ ·å¼ï¼Œnohashothers=true)
+ egphoto
- - ![opt-citexref-false.tex](egphoto\opt-citexref-false.tex) 测试citexref=false选项
- - ![opt-citexref-true.tex](egphoto\opt-citexref-true.tex) 测试citexref=true选项
- - ![opt-gbalign-center.tex](egphoto\opt-gbalign-center.tex) 测试gbalign=center选项
- - ![opt-gbalign-gb.tex](egphoto\opt-gbalign-gb.tex) 测试gbalign=gb7714-2015选项
- - ![opt-gbalign-left.tex](egphoto\opt-gbalign-left.tex) 测试gbalign=left选项
- - ![opt-gbalign-right.tex](egphoto\opt-gbalign-right.tex) 测试gbalign=right选项
- - ![opt-gbannote-false.tex](egphoto\opt-gbannote-false.tex) 测试gbannote=false选项
- - ![opt-gbannote-true.tex](egphoto\opt-gbannote-true.tex) 测试gbannote=true选项
- - ![opt-gbannote-true.tex](egphoto\opt-gbannote-true.tex) 测试gbannote=true选项
- - ![opt-gbbiblabela.tex](egphoto\opt-gbbiblabela.tex) 测试gbbiblabel=box选项
- - ![opt-gbbiblabelb.tex](egphoto\opt-gbbiblabelb.tex) 测试gbbiblabel=bracket选项
- - ![opt-gbbiblabelc.tex](egphoto\opt-gbbiblabelc.tex) 测试gbbiblabel=parens选项
- - ![opt-gbbiblabeld.tex](egphoto\opt-gbbiblabeld.tex) 测试gbbiblabel=dot选项
- - ![opt-gbbiblabele.tex](egphoto\opt-gbbiblabele.tex) 测试gbbiblabel=plain选项
- - ![opt-gbbiblabelf.tex](egphoto\opt-gbbiblabelf.tex) 测试gbbiblabel=circle选项
- - ![opt-gbnoauthor-false.tex](egphoto\opt-gbnoauthor-false.tex) 测试gbnoauthor=false选项
- - ![opt-gbnoauthor-true.tex](egphoto\opt-gbnoauthor-true.tex) 测试gbnoauthor=true选项
- - ![opt-gbpub-false.tex](egphoto\opt-gbpub-false.tex) 测试gbpub=false选项
- - ![opt-gbpub-true.tex](egphoto\opt-gbpub-true.tex) 测试gbpub=true选项
- - ![opt-gbpunctin-false.tex](egphoto\opt-gbpunctin-false.tex) 测试gbpunctin=false选项
- - ![opt-gbpunctin-true.tex](egphoto\opt-gbpunctin-true.tex) 测试gbpunctin=true选项
- - ![opt-gbtitlelink-false.tex](egphoto\opt-gbtitlelink-false.tex) 测试gbtitlelink=false选项
- - ![opt-gbtitlelink-true.tex](egphoto\opt-gbtitlelink-true.tex) 测试gbtitlelink=true选项
- - ![opt-gbtype-false.tex](egphoto\opt-gbtype-false.tex) 测试gbtype=false选项
- - ![opt-gbtype-true.tex](egphoto\opt-gbtype-true.tex) 测试gbtype=true选项
- - ![opt-mergedate-a.tex](egphoto\opt-mergedate-a.tex) 测试mergedate默认选项(gb7714-2015ay)
- - ![opt-mergedate-b.tex](egphoto\opt-mergedate-b.tex) 测试mergedate=true选项(gb7714-2015ay)
- - ![opt-mergedate-c.tex](egphoto\opt-mergedate-c.tex) 测试mergedate=false选项(gb7714-2015ay)
- - ![opt-mergedate-d.tex](egphoto\opt-mergedate-d.tex) 测试mergedate=none选项(gb7714-2015ay)
+ - ![opt-citexref-false.tex](egphoto/opt-citexref-false.tex) 测试citexref=false选项
+ - ![opt-citexref-true.tex](egphoto/opt-citexref-true.tex) 测试citexref=true选项
+ - ![opt-gbalign-center.tex](egphoto/opt-gbalign-center.tex) 测试gbalign=center选项
+ - ![opt-gbalign-gb.tex](egphoto/opt-gbalign-gb.tex) 测试gbalign=gb7714-2015选项
+ - ![opt-gbalign-left.tex](egphoto/opt-gbalign-left.tex) 测试gbalign=left选项
+ - ![opt-gbalign-right.tex](egphoto/opt-gbalign-right.tex) 测试gbalign=right选项
+ - ![opt-gbannote-false.tex](egphoto/opt-gbannote-false.tex) 测试gbannote=false选项
+ - ![opt-gbannote-true.tex](egphoto/opt-gbannote-true.tex) 测试gbannote=true选项
+ - ![opt-gbannote-true.tex](egphoto/opt-gbannote-true.tex) 测试gbannote=true选项
+ - ![opt-gbbiblabela.tex](egphoto/opt-gbbiblabela.tex) 测试gbbiblabel=box选项
+ - ![opt-gbbiblabelb.tex](egphoto/opt-gbbiblabelb.tex) 测试gbbiblabel=bracket选项
+ - ![opt-gbbiblabelc.tex](egphoto/opt-gbbiblabelc.tex) 测试gbbiblabel=parens选项
+ - ![opt-gbbiblabeld.tex](egphoto/opt-gbbiblabeld.tex) 测试gbbiblabel=dot选项
+ - ![opt-gbbiblabele.tex](egphoto/opt-gbbiblabele.tex) 测试gbbiblabel=plain选项
+ - ![opt-gbbiblabelf.tex](egphoto/opt-gbbiblabelf.tex) 测试gbbiblabel=circle选项
+ - ![opt-gbnoauthor-false.tex](egphoto/opt-gbnoauthor-false.tex) 测试gbnoauthor=false选项
+ - ![opt-gbnoauthor-true.tex](egphoto/opt-gbnoauthor-true.tex) 测试gbnoauthor=true选项
+ - ![opt-gbpub-false.tex](egphoto/opt-gbpub-false.tex) 测试gbpub=false选项
+ - ![opt-gbpub-true.tex](egphoto/opt-gbpub-true.tex) 测试gbpub=true选项
+ - ![opt-gbpunctin-false.tex](egphoto/opt-gbpunctin-false.tex) 测试gbpunctin=false选项
+ - ![opt-gbpunctin-true.tex](egphoto/opt-gbpunctin-true.tex) 测试gbpunctin=true选项
+ - ![opt-gbtitlelink-false.tex](egphoto/opt-gbtitlelink-false.tex) 测试gbtitlelink=false选项
+ - ![opt-gbtitlelink-true.tex](egphoto/opt-gbtitlelink-true.tex) 测试gbtitlelink=true选项
+ - ![opt-gbtype-false.tex](egphoto/opt-gbtype-false.tex) 测试gbtype=false选项
+ - ![opt-gbtype-true.tex](egphoto/opt-gbtype-true.tex) 测试gbtype=true选项
+ - ![opt-mergedate-a.tex](egphoto/opt-mergedate-a.tex) 测试mergedate默认选项(gb7714-2015ay)
+ - ![opt-mergedate-b.tex](egphoto/opt-mergedate-b.tex) 测试mergedate=true选项(gb7714-2015ay)
+ - ![opt-mergedate-c.tex](egphoto/opt-mergedate-c.tex) 测试mergedate=false选项(gb7714-2015ay)
+ - ![opt-mergedate-d.tex](egphoto/opt-mergedate-d.tex) 测试mergedate=none选项(gb7714-2015ay)
+ egthesis
- - ![thesis-bupt-numeric.tex](egthesis\thesis-bupt-numeric.tex)
- - ![thesis-cau-numeric.tex](egthesis\thesis-cau-numeric.tex)
- - ![thesis-ecnu-numeric.tex](egthesis\thesis-ecnu-numeric.tex)
- - ![thesis-fdu-numeric.tex](egthesis\thesis-fdu-numeric.tex)
- - ![thesis-nwafu-ay.tex](egthesis\thesis-nwafu-ay.tex) 测试西北农林科技大学(å¯ä»¥å‚考:特殊的ayæ ·å¼è°ƒæ•´ï¼‰
- - ![thesis-seu-numeric.tex](egthesis\thesis-seu-numeric.tex) 测试东å—大学(å¯ä»¥å‚考:gb7714-2015æ ·å¼è°ƒæ•´ï¼‰
- - ![thesis-sjtu-numeric.tex](egthesis\thesis-sjtu-numeric.tex)
- - ![thesis-thu-author-year.tex](egthesis\thesis-thu-author-year.tex)
- - ![thesis-thu-numeric.tex](egthesis\thesis-thu-numeric.tex)
- - ![thesis-tongji.tex](egthesis\thesis-tongji.tex)
- - ![thesis-ucas-m.tex](egthesis\thesis-ucas-m.tex) 测试中科院大学(å¯ä»¥å‚考:ayæ ·å¼è°ƒæ•´ï¼‰
- - ![thesis-ucas-x.tex](egthesis\thesis-ucas-x.tex)
- - ![thesis-uibe-numeric.tex](egthesis\thesis-uibe-numeric.tex) 测试对外ç»è´¸å¤§å­¦ï¼ˆå¯ä»¥å‚考:中文标点ã€å·æœŸæ ¼å¼ï¼›ä¸­è‹±æ–‡ä¸åŒï¼‰
- - ![thesis-ustc-all.tex](egthesis\thesis-ustc-all.tex) 测试中科大(å¯ä»¥å‚考:一文中使用两ç§æ ·å¼ï¼‰
- - ![thesis-ustc-authoryear.tex](egthesis\thesis-ustc-authoryear.tex)
- - ![thesis-ustc-numeric.tex](egthesis\thesis-ustc-numeric.tex)
- - ![thesis-xjtu-numeric.tex](egthesis\thesis-xjtu-numeric.tex)
- - ![thesis-zju-numeric.tex](egthesis\thesis-zju-numeric.tex)
- - ![thesistest.tex](egthesis\thesistest.tex)
+ - ![thesis-bupt-numeric.tex](egthesis/thesis-bupt-numeric.tex)
+ - ![thesis-cau-numeric.tex](egthesis/thesis-cau-numeric.tex)
+ - ![thesis-ecnu-numeric.tex](egthesis/thesis-ecnu-numeric.tex)
+ - ![thesis-fdu-numeric.tex](egthesis/thesis-fdu-numeric.tex)
+ - ![thesis-nwafu-ay.tex](egthesis/thesis-nwafu-ay.tex) 测试西北农林科技大学(å¯ä»¥å‚考:特殊的ayæ ·å¼è°ƒæ•´ï¼‰
+ - ![thesis-seu-numeric.tex](egthesis/thesis-seu-numeric.tex) 测试东å—大学(å¯ä»¥å‚考:gb7714-2015æ ·å¼è°ƒæ•´ï¼‰
+ - ![thesis-sjtu-numeric.tex](egthesis/thesis-sjtu-numeric.tex)
+ - ![thesis-thu-author-year.tex](egthesis/thesis-thu-author-year.tex)
+ - ![thesis-thu-numeric.tex](egthesis/thesis-thu-numeric.tex)
+ - ![thesis-tongji.tex](egthesis/thesis-tongji.tex)
+ - ![thesis-ucas-m.tex](egthesis/thesis-ucas-m.tex) 测试中科院大学(å¯ä»¥å‚考:ayæ ·å¼è°ƒæ•´ï¼‰
+ - ![thesis-ucas-x.tex](egthesis/thesis-ucas-x.tex)
+ - ![thesis-uibe-numeric.tex](egthesis/thesis-uibe-numeric.tex) 测试对外ç»è´¸å¤§å­¦ï¼ˆå¯ä»¥å‚考:中文标点ã€å·æœŸæ ¼å¼ï¼›ä¸­è‹±æ–‡ä¸åŒï¼‰
+ - ![thesis-ustc-all.tex](egthesis/thesis-ustc-all.tex) 测试中科大(å¯ä»¥å‚考:一文中使用两ç§æ ·å¼ï¼‰
+ - ![thesis-ustc-authoryear.tex](egthesis/thesis-ustc-authoryear.tex)
+ - ![thesis-ustc-numeric.tex](egthesis/thesis-ustc-numeric.tex)
+ - ![thesis-xjtu-numeric.tex](egthesis/thesis-xjtu-numeric.tex)
+ - ![thesis-zju-numeric.tex](egthesis/thesis-zju-numeric.tex)
+ - ![thesistest.tex](egthesis/thesistest.tex)
+ example
- - ![cls-beamer.tex](example\cls-beamer.tex) 测试beamer中的使用(gb7714-2015æ ·å¼ï¼‰
- - ![cls-beameray.tex](example\cls-beameray.tex) 测试beamer中的使用(gb7714-2015ayæ ·å¼ï¼‰
- - ![codeopt-gbcodegbk.tex](example\codeopt-gbcodegbk.tex) 测试gb7714-2015ã€ayæ ·å¼ï¼Œå¯¹äºŽGBKç¼–ç æ–‡æ¡£çš„兼容性
- - ![eg-opt-gbstyle.tex](example\eg-opt-gbstyle.tex) 测试gb7714-2015msæ ·å¼ä¸€ç¯‡æ–‡æ¡£ä¸­ä¸­è‹±æ–‡ä¸¤ç§æ ¼å¼è®¾ç½®ï¼Œå¤šè¯­è¨€å¯¹ç…§ï¼Œå¤šè¯­è¨€æ··åˆæ–‡çŒ®è¡¨
- - ![testallformat.tex](example\testallformat.tex) 测试全é¢çš„类型ã€æ ¼å¼
- - ![egtest.tex](example\egtest.tex) 测试示例
- - ![opt-autolang-multilan.tex](example\opt-autolang-multilan.tex) 测试多语言混åˆçš„文献表,å„语言ä¸åŒçš„本地化字符串
- - ![opt-eg-multilan.tex](example\opt-eg-multilan.tex) 测试多语言混åˆçš„文献表
- - ![opt-eg-authoryear.tex](example\opt-eg-authoryear.tex) 测试ayæ ·å¼
- - ![opt-eg-dblang.tex](example\opt-eg-dblang.tex) 测试åŒè¯­å¯¹ç…§æ–‡çŒ®-两ç§æ–¹æ³•ï¼ˆæ¡ç›®é›†ã€å…³è”æ¡ç›®ï¼‰
- - ![opt-gbalign-center.tex](example\opt-gbalign-center.tex) 测试gbalign选项
- - ![opt-gbalign-gb.tex](example\opt-gbalign-gb.tex) 测试gbalign选项
- - ![opt-gbalign-left.tex](example\opt-gbalign-left.tex) 测试gbalign选项
- - ![opt-gbannote.tex](example\opt-gbannote.tex) 测试gbannote选项,在文献表中加上附加信æ¯ç”¨ä»¥è¯´æ˜Žä¸‰å¤§ç´¢å¼•æƒ…况
- - ![opt-gbbiblabel.tex](example\opt-gbbiblabel.tex) 测试gbbiblabel选项
- - ![opt-gbctexset.tex](example\opt-gbctexset.tex) 测试gbctexset选项,使å¯ä»¥åˆ©ç”¨ctex的设置对文献表的标题进行修改
- - ![opt-gbfieldstd.tex](example\opt-gbfieldstd.tex) 测试gbfiledstd选项,著录格å¼è¿˜åŽŸä¸ºbiblatex标准样å¼çš„æ ¼å¼
- - ![opt-gbfootbib.tex](example\opt-gbfootbib.tex) 测试实现国标è¦æ±‚的脚注文献表
- - ![opt-gblanorder-chineseahead.tex](example\opt-gblanorder-chineseahead.tex) 测试文献表排åºï¼Œä¸­æ–‡åœ¨å‰
- - ![opt-gblanorder-englishahead.tex](example\opt-gblanorder-englishahead.tex) 测试文献表排åºï¼Œè‹±æ–‡åœ¨å‰
- - ![opt-gblanorder-udforder.tex](example\opt-gblanorder-udforder.tex) 测试文献表排åºï¼Œè‡ªå®šä¹‰é¡ºåº
- - ![opt-sorting-multilan.tex](example\opt-sorting-multilan.tex) 测试多语言混åˆæ–‡çŒ®è¡¨æŽ’åº
- - ![opt-gblocal.tex](example\opt-gblocal.tex) 测试本地化字符串设置(引用标注标签ã€æ–‡çŒ®è¡¨ï¼‰
- - ![test-setlocal.tex](example\test-setlocal.tex) 测试本地化字符串设置(多ç§æ–¹æ³•å±€éƒ¨è°ƒæ•´ï¼‰
- - ![test-setlocal-multilan.tex](example\test-setlocal-multilan.tex) 测试本地化字符串设置(多ç§è¯­è¨€çš„局部调整)
- - ![opt-gbnamefmt.tex](example\opt-gbnamefmt.tex) 测试gbnamefmt对于作者姓åæ ¼å¼çš„控制
- - ![opt-gbnamefmt-default.tex](example\opt-gbnamefmt-default.tex) 测试gbnamefmt对于作者姓åæ ¼å¼çš„控制
- - ![opt-gbnamefmt-quanpin.tex](example\opt-gbnamefmt-quanpin.tex) 测试gbnamefmt对于作者姓åæ ¼å¼çš„控制
- - ![opt-gbnoauthor-false.tex](example\opt-gbnoauthor-false.tex) 测试gbnoauthor选项
- - ![opt-gbnoauthor-true.tex](example\opt-gbnoauthor-true.tex) 测试gbnoauthor选项
- - ![opt-gbpub-true.tex](example\opt-gbpub-true.tex) 测试gbpub选项
- - ![opt-gbpunctin.tex](example\opt-gbpunctin.tex) 测试gbpunctin选项
- - ![opt-gbtitlelink.tex](example\opt-gbtitlelink.tex) 测试gbtitlelink选项
- - ![opt-gbtype.tex](example\opt-gbtype.tex) 测试gbtype选项
- - ![opt-hyperref-backref.tex](example\opt-hyperref-backref.tex) 测试backrref选项,åå‘超链接
- - ![teststyleerj.tex](example\teststyleerj.tex) 测试chinese-erjæ ·å¼
- - ![test-translator-in-other-lan.tex](example\test-translator-in-other-lan.tex) 测试译著的其它语言的译者格å¼
- - ![test-space-after-citelabel-inCJKline.tex](example\test-space-after-citelabel-inCJKline.tex) 测试删除标注åŽå› ä¸ºxeCJK加入的空格
- - ![test-special-chars-in-fields.tex](test-special-chars-in-fields.tex) 测试ä¸åŒåŸŸä¸­å­˜åœ¨çš„特殊字符处ç†
+ - ![cls-beamer.tex](example/cls-beamer.tex) 测试beamer中的使用(gb7714-2015æ ·å¼ï¼‰
+ - ![cls-beameray.tex](example/cls-beameray.tex) 测试beamer中的使用(gb7714-2015ayæ ·å¼ï¼‰
+ - ![codeopt-gbcodegbk.tex](example/codeopt-gbcodegbk.tex) 测试gb7714-2015ã€ayæ ·å¼ï¼Œå¯¹äºŽGBKç¼–ç æ–‡æ¡£çš„兼容性
+ - ![eg-opt-gbstyle.tex](example/eg-opt-gbstyle.tex) 测试gb7714-2015msæ ·å¼ä¸€ç¯‡æ–‡æ¡£ä¸­ä¸­è‹±æ–‡ä¸¤ç§æ ¼å¼è®¾ç½®ï¼Œå¤šè¯­è¨€å¯¹ç…§ï¼Œå¤šè¯­è¨€æ··åˆæ–‡çŒ®è¡¨
+ - ![testallformat.tex](example/testallformat.tex) 测试全é¢çš„类型ã€æ ¼å¼
+ - ![egtest.tex](example/egtest.tex) 测试示例
+ - ![opt-autolang-multilan.tex](example/opt-autolang-multilan.tex) 测试多语言混åˆçš„文献表,å„语言ä¸åŒçš„本地化字符串
+ - ![opt-eg-multilan.tex](example/opt-eg-multilan.tex) 测试多语言混åˆçš„文献表
+ - ![opt-eg-authoryear.tex](example/opt-eg-authoryear.tex) 测试ayæ ·å¼
+ - ![opt-eg-dblang.tex](example/opt-eg-dblang.tex) 测试åŒè¯­å¯¹ç…§æ–‡çŒ®-两ç§æ–¹æ³•ï¼ˆæ¡ç›®é›†ã€å…³è”æ¡ç›®ï¼‰
+ - ![opt-gbalign-center.tex](example/opt-gbalign-center.tex) 测试gbalign选项
+ - ![opt-gbalign-gb.tex](example/opt-gbalign-gb.tex) 测试gbalign选项
+ - ![opt-gbalign-left.tex](example/opt-gbalign-left.tex) 测试gbalign选项
+ - ![opt-gbannote.tex](example/opt-gbannote.tex) 测试gbannote选项,在文献表中加上附加信æ¯ç”¨ä»¥è¯´æ˜Žä¸‰å¤§ç´¢å¼•æƒ…况
+ - ![opt-gbbiblabel.tex](example/opt-gbbiblabel.tex) 测试gbbiblabel选项
+ - ![opt-gbctexset.tex](example/opt-gbctexset.tex) 测试gbctexset选项,使å¯ä»¥åˆ©ç”¨ctex的设置对文献表的标题进行修改
+ - ![opt-gbfieldstd.tex](example/opt-gbfieldstd.tex) 测试gbfiledstd选项,著录格å¼è¿˜åŽŸä¸ºbiblatex标准样å¼çš„æ ¼å¼
+ - ![opt-gbfootbib.tex](example/opt-gbfootbib.tex) 测试实现国标è¦æ±‚的脚注文献表
+ - ![opt-gblanorder-chineseahead.tex](example/opt-gblanorder-chineseahead.tex) 测试文献表排åºï¼Œä¸­æ–‡åœ¨å‰
+ - ![opt-gblanorder-englishahead.tex](example/opt-gblanorder-englishahead.tex) 测试文献表排åºï¼Œè‹±æ–‡åœ¨å‰
+ - ![opt-gblanorder-udforder.tex](example/opt-gblanorder-udforder.tex) 测试文献表排åºï¼Œè‡ªå®šä¹‰é¡ºåº
+ - ![opt-sorting-multilan.tex](example/opt-sorting-multilan.tex) 测试多语言混åˆæ–‡çŒ®è¡¨æŽ’åº
+ - ![opt-gblocal.tex](example/opt-gblocal.tex) 测试本地化字符串设置(引用标注标签ã€æ–‡çŒ®è¡¨ï¼‰
+ - ![test-setlocal.tex](example/test-setlocal.tex) 测试本地化字符串设置(多ç§æ–¹æ³•å±€éƒ¨è°ƒæ•´ï¼‰
+ - ![test-setlocal-multilan.tex](example/test-setlocal-multilan.tex) 测试本地化字符串设置(多ç§è¯­è¨€çš„局部调整)
+ - ![opt-gbnamefmt.tex](example/opt-gbnamefmt.tex) 测试gbnamefmt对于作者姓åæ ¼å¼çš„控制
+ - ![opt-gbnamefmt-default.tex](example/opt-gbnamefmt-default.tex) 测试gbnamefmt对于作者姓åæ ¼å¼çš„控制
+ - ![opt-gbnamefmt-quanpin.tex](example/opt-gbnamefmt-quanpin.tex) 测试gbnamefmt对于作者姓åæ ¼å¼çš„控制
+ - ![opt-gbnoauthor-false.tex](example/opt-gbnoauthor-false.tex) 测试gbnoauthor选项
+ - ![opt-gbnoauthor-true.tex](example/opt-gbnoauthor-true.tex) 测试gbnoauthor选项
+ - ![opt-gbpub-true.tex](example/opt-gbpub-true.tex) 测试gbpub选项
+ - ![opt-gbpunctin.tex](example/opt-gbpunctin.tex) 测试gbpunctin选项
+ - ![opt-gbtitlelink.tex](example/opt-gbtitlelink.tex) 测试gbtitlelink选项
+ - ![opt-gbtype.tex](example/opt-gbtype.tex) 测试gbtype选项
+ - ![opt-hyperref-backref.tex](example/opt-hyperref-backref.tex) 测试backrref选项,åå‘超链接
+ - ![teststyleerj.tex](example/teststyleerj.tex) 测试chinese-erjæ ·å¼
+ - ![test-translator-in-other-lan.tex](example/test-translator-in-other-lan.tex) 测试译著的其它语言的译者格å¼
+ - ![test-space-after-citelabel-inCJKline.tex](example/test-space-after-citelabel-inCJKline.tex) 测试删除标注åŽå› ä¸ºxeCJK加入的空格
+ - ![test-special-chars-in-fields.tex](example/test-special-chars-in-fields.tex) 测试ä¸åŒåŸŸä¸­å­˜åœ¨çš„特殊字符处ç†
+ - ![test-gbt-7714-1987.tex](example/test-gbt-7714-1987.tex) 测试GB/T7714-1987标准的样å¼
+ - ![test-gbt-7714-2005.tex](example/test-gbt-7714-2005.tex) 测试GB/T7714-2005标准的样å¼
+
---------------------------------------------------------
@@ -1507,6 +1514,7 @@ please see the file 'biblatex-gb7714-2015.pdf' for further information!
* 2021/01/19 v1.0w,ctan
* 2021/04/03 v1.0x,ctan
* 2021/05/06 v1.0y,ctan
+* 2021/08/19 v1.0z,ctan
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex
index 89a481574e..d3a20e962a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex
@@ -113,7 +113,7 @@ bookmarksdepth=4,]{hyperref}
\titlespacing{\paragraph}{2em}{0.5\baselineskip}{1em}
%这里利用titleformat*简å•åšè®¾ç½®ï¼Œä¹Ÿå¯ä»¥åˆ©ç”¨titleformatåšè¯¦ç»†è®¾ç½®
\titleformat*{\section}{\zihao{-3}\bfseries\heiti}
-\titleformat*{\subsection}{\zihao{4}\bfseries\songti}
+\titleformat*{\subsection}{\zihao{4}\bfseries\heiti}
\titleformat*{\subsubsection}{\zihao{-4}\bfseries\kaiti}
%å‚考文献
@@ -225,7 +225,7 @@ bookmarksdepth=4,]{hyperref}
\usepackage{tikz,pgf}
\usetikzlibrary{calc}
-\newenvironment{example}[3][{\large\faFileCodeO}]%
+\newenvironment{example}[3][{\footnotesize\faFileCodeO}]%
{\list{}{\begingroup\codecaption{#2}\label{#3}\endgroup
\setlength{\topsep}{0pt}
\setlength{\partopsep}{0pt}
@@ -247,10 +247,10 @@ breaklines=true,
%showspaces=true,
extendedchars=false,
columns=fullflexible,%flexible,
-aboveskip=2pt,
+%aboveskip=2pt,
boxpos=t,
rulesep=0pt,
-frame=tb,
+frame=t,
framesep=0pt,
rulecolor=\color{gblabelcolor},
fontadjust=true,
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
index 43553a6da0..a15d4208b7 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
index df72492e10..1d80d67bda 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
@@ -145,11 +145,20 @@ GB/T 7714标准的ç†è§£å’Œè§£é‡Šï¼ˆ\ref{sec:gbt:std}节)ã€
\subsection{å®åŒ…结构}
-å®åŒ…文件结构如图\ref{fig:pkg:structure}所示:
+å®åŒ…文件结构如图\ref{fig:pkg:structure}所示。
+\zd{gb7714-2015.bbx/cbx}ã€\zd{gb7714-2015ay.bbx/cbx}分别为国标å‚考文献样å¼2015版本的顺åºç¼–ç åˆ¶å’Œè‘—者年份制样å¼æ–‡ä»¶ã€‚
+对应的\zd{gb7714-1987/ay.bbx/cbx}ã€\zd{gb7714-2005/ay.bbx/cbx}则是1987å’Œ2005版本的国标样å¼ã€‚
+\zd{gb7714-2015ms.bbx/cbx}是混åˆæ ·å¼ï¼Œæ”¯æŒåŒºåˆ†ä¸­è‹±æ–‡è¯­è¨€åˆ†è®¾ä¸åŒæ ‡å‡†çš„著录格å¼ã€‚
+\zd{gb7714-2015mx.bbx/cbx}是混åˆæ ·å¼ï¼Œæ”¯æŒåœ¨ä¸åŒçš„å‚考文献分节中使用ä¸åŒçš„编制样å¼ï¼Œæ¯”如有的节使用顺åºç¼–ç åˆ¶ï¼Œæœ‰çš„节使用著者年份制。
+\zd{gb7715-2015-gbk.def}为GBKç¼–ç æ–‡æ¡£ç¼–译所需的支撑文件。
+\zd{chinese-erj.bbx/cbx} 是ç»æµŽå­¦ç ”究期刊的文献样å¼ã€‚åŽä¸‰è€…仅支æŒè¾ƒæ–°çš„biblatex版本。
+\zd{biblatex-gb7714-2015.tex} 为å®åŒ…说明文档,\zd{example}目录下为å„ç§é€‰é¡¹çš„测试用例,
+\zd{egfigure}目录下为说明文档中的图例文档,\zd{egthesis}为国内一些大学学ä½è®ºæ–‡æ–‡çŒ®æ ·å¼çš„测试用例,包括完全按照国标的BUPTã€CAUã€ECNUã€FDUã€SJTUã€THUã€USTCã€XJTUã€ZJU,与国标略有差异的UCAS,以åŠä¸Žå›½æ ‡æœ‰è¾ƒå¤§å·®å¼‚çš„NWAFUã€SEU等。\zd{*.bat}ã€\zd{*.sh}分别为windowså’Œlinux下说明文档的编译脚本。\zd{*.pl}为gb7714æ ¼å¼è‘—录文献表到bib文件的perl转æ¢è„šæœ¬ï¼Œ\zd{*.dat}为转æ¢æµ‹è¯•æ–‡çŒ®è¡¨ã€‚
+
\begin{figure}[!htb]
-\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
-width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
-leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
+%\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
+%width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
+%leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\centering\footnotesize
\begin{tikzpicture}[node distance=1.5cm]
%\definecolor{bluea}{rgb}{0.05,0.62,0.94}
@@ -164,11 +173,11 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\draw[color=cyan,thick] (script.north) -- ($(script.north)+(0mm,3mm)$) ;
\draw[color=cyan,thick] ($(style.north)+(0mm,3mm)$) -- ($(script.north)+(0mm,3mm)$);
-\node[below of=style,fill=gbgrey!20,yshift=0.5cm,xshift=2mm,text width=2cm] (numcbbx) {\tiny \textcolor{black}{gb7715-2015.c/bbx}};
-\node[below of=numcbbx,fill=gbgrey!20,yshift=8mm,text width=2cm] (aycbbx) {\tiny \textcolor{black}{gb7715-2015ay.c/bbx}};
+\node[below of=style,fill=gbgrey!20,yshift=0.5cm,xshift=2mm,text width=2cm] (numcbbx) {\tiny \textcolor{black}{gb7715-2015/ay.c/bbx}};
+\node[below of=numcbbx,fill=gbgrey!20,yshift=8mm,text width=2cm] (aycbbx) {\tiny \textcolor{black}{gb7715-1987/ay.c/bbx}};
\node[below of=aycbbx,fill=gbgrey!20,yshift=8mm,text width=2cm] (mscbbx) {\tiny \textcolor{black}{gb7715-2015ms.c/bbx}};
\node[below of=mscbbx,fill=gbgrey!20,yshift=8mm,text width=2cm] (mxcbbx) {\tiny \textcolor{black}{gb7715-2015mx.c/bbx}};
-\node[below of=mxcbbx,fill=gbgrey!20,yshift=8mm,text width=2cm] (gbkdef) {\tiny \textcolor{black}{gb7715-2015-gbk.def}};
+\node[below of=mxcbbx,fill=gbgrey!20,yshift=8mm,text width=2cm] (gbkdef) {\tiny \textcolor{black}{gb7715-2005/ay.c/bbx}};
\node[below of=gbkdef,fill=gbgrey!20,yshift=8mm,text width=2cm] (erjcbbx) {\tiny \textcolor{black}{chinese-erj.c/bbx}};
%\node[below of=msbbx,fill=gbgrey!20,yshift=8mm,text width=2cm] (mscbx) {\tiny \textcolor{black}{gb7715-2015ms.cbx}};
@@ -204,19 +213,13 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\draw[color=orange,semithick] (plspt.west) -- ($(plspt.west)+(-3mm,0mm)$) ;
\draw[color=orange,semithick] ($(plspt.west)+(-3mm,0mm)$) -- ($(plspt.west)+(-3mm,28.1mm)$) ;
\end{tikzpicture}
-\end{tcolorbox}
+%\end{tcolorbox}
\caption{å®åŒ…文件结构}\label{fig:pkg:structure}
\end{figure}
-其中,\zd{gb7714-2015.bbx/cbx}ã€\zd{gb7714-2015ay.bbx/cbx}分别为顺åºç¼–ç åˆ¶å’Œè‘—者年份制样å¼æ–‡ä»¶ã€‚
-\zd{gb7714-2015ms.bbx/cbx}是混åˆæ ·å¼ï¼Œæ”¯æŒåŒºåˆ†ä¸­è‹±æ–‡è¯­è¨€åˆ†è®¾ä¸åŒæ ‡å‡†çš„著录格å¼ã€‚
-\zd{gb7714-2015mx.bbx/cbx}是混åˆæ ·å¼ï¼Œæ”¯æŒåœ¨ä¸åŒçš„å‚考文献分节中使用ä¸åŒçš„编制样å¼ï¼Œæ¯”如有的节使用顺åºç¼–ç åˆ¶ï¼Œæœ‰çš„节使用著者年份制。
-\zd{gb7715-2015-gbk.def}为GBKç¼–ç æ–‡æ¡£ç¼–译所需的支撑文件。
-\zd{chinese-erj.bbx/cbx} 是ç»æµŽå­¦ç ”究期刊的文献样å¼ã€‚åŽä¸‰è€…仅支æŒè¾ƒæ–°çš„biblatex版本。
-\zd{biblatex-gb7714-2015.tex} 为å®åŒ…说明文档,\zd{example}目录下为å„ç§é€‰é¡¹çš„测试用例,
-\zd{egfigure}目录下为说明文档中的图例文档,\zd{egthesis}为国内一些大学学ä½è®ºæ–‡æ–‡çŒ®æ ·å¼çš„测试用例,包括完全按照国标的BUPTã€CAUã€ECNUã€FDUã€SJTUã€THUã€USTCã€XJTUã€ZJU,与国标略有差异的UCAS,以åŠä¸Žå›½æ ‡æœ‰è¾ƒå¤§å·®å¼‚çš„NWAFUã€SEU等。\zd{*.bat}ã€\zd{*.sh}分别为windowså’Œlinux下说明文档的编译脚本。\zd{*.pl}为gb7714æ ¼å¼è‘—录文献表到bib文件的perl转æ¢è„šæœ¬ï¼Œ\zd{*.dat}为转æ¢æµ‹è¯•æ–‡çŒ®è¡¨ã€‚
+
\subsection{最å°ç¤ºä¾‹}
@@ -278,9 +281,9 @@ latexmk -xelatex jobname.tex
\begin{refsection}
\begin{figure}[!htb]
\centering
-\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
-width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
-leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
+%\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
+%width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
+%leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\includegraphics*[page=1,viewport=0cm 0.4cm 14cm 6.1cm,clip=true]{egfigure/egmwe.pdf}
%\deflength{\textparwd}{\linewidth-1.5cm}
%\begin{minipage}{\textparwd}
@@ -296,7 +299,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
%\par}
%}}
%\end{minipage}
-\end{tcolorbox}
+%\end{tcolorbox}
\caption{最å°å·¥ä½œç¤ºä¾‹ç¼–译生æˆçš„PDF文档}\label{fig:eg:ref}
\end{figure}
\end{refsection}
@@ -328,7 +331,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\begin{texlist}
%简å•æ–¹å¼ï¼š
\usepackage[backend=biber,style=gb7714-2015ay]{biblatex}
-%设置gbnoauthor=true以使用佚å或NOAUTHOR填补缺失的authorä¿¡æ¯:
+%设置gbnoauthor=true以使用佚å或Anon填补缺失的authorä¿¡æ¯:
\usepackage[backend=biber,style=gb7714-2015ay,gbnoauthor=true]{biblatex}
\end{texlist}
\end{example}
@@ -358,7 +361,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
æ ¼å¼æ•ˆæžœå¦‚图\ref{fig:eg:mx}所示。
-\begin{example}{å‚考文献文本转æ¢ä¸ºbib文件perl脚本使用方å¼}{eg:transtobib}
+\begin{example}{顺åºç¼–ç å‚考文献文本转æ¢ä¸ºbib文件perl脚本使用方å¼}{eg:transtobib}
\begin{texlist}
perl gb7714texttobib.pl in=textfilename out=bibfilename
\end{texlist}
@@ -366,7 +369,7 @@ perl gb7714texttobib.pl in=textfilename out=bibfilename
其中,v1.0m版本增加的gb7714-2015msæ ·å¼æ–‡ä»¶ï¼Œä¸»è¦æ˜¯ä¸ºäº†åœ¨ä¸€ä¸ªæ–‡çŒ®è¡¨ä¸­é’ˆå¯¹ä¸åŒè¯­è¨€ä½¿ç”¨ä¸åŒå¤šç§æ ·å¼ï¼Œæ¯”如中文文献使用GB/T 7714-2015规定的著录格å¼ï¼Œè€Œå…¶å®ƒè¯­è¨€æ–‡çŒ®ä½¿ç”¨biblatexæ供的标准样å¼ã€‚v1.0r版本增加了gb7714-2015mxæ ·å¼ï¼Œä¸»è¦æ˜¯ä¸ºäº†åœ¨ä¸€ä¸ªæ–‡æ¡£ä¸­é’ˆå¯¹ä¸åŒå‚考文献分节使用ä¸åŒçš„å‚考文献样å¼ï¼Œæ¯”如æŸäº›èŠ‚使用著者年份制,æŸäº›èŠ‚使用顺åºç¼–ç åˆ¶ã€‚尽管这些方å¼ä¸å¸¸ç”¨ï¼Œä½†å¶å°”也有需求,所以都åšäº†å®žçŽ°ã€‚
-å¦å¤–应ddswhuè¦æ±‚,v1.0r版本增加了chinese-erjæ ·å¼ç”¨äºŽç”Ÿæˆç»æµŽç ”究期刊的文献。且在egthesis文件夹内,针对国内一些大学的学ä½è®ºæ–‡æ–‡çŒ®è¦æ±‚,基于国标样å¼åšäº†ä¸€äº›å®šåˆ¶å’Œæµ‹è¯•ã€‚
+å¦å¤–应东å‡è¦æ±‚,v1.0r版本增加了chinese-erjæ ·å¼ç”¨äºŽç”Ÿæˆç»æµŽç ”究期刊的文献。且在egthesis文件夹内,针对国内一些大学的学ä½è®ºæ–‡æ–‡çŒ®è¦æ±‚,基于国标样å¼åšäº†ä¸€äº›å®šåˆ¶å’Œæµ‹è¯•ã€‚
\pdfbookmark[4]{chinese-erj}{chinese-erj}
\begin{example}{ç»æµŽç ”究期刊文献样å¼(chinese-erj)}{eg:gbchineseerj}
@@ -376,6 +379,25 @@ perl gb7714texttobib.pl in=textfilename out=bibfilename
\end{texlist}
\end{example}
+尽管国标1987å’Œ2005版本已ç»è¿‡æ—¶ï¼Œä½†ä»ç„¶æœ‰äº›åœ°æ–¹è¿˜åœ¨ä½¿ç”¨ï¼Œæ‰€ä»¥1.0z版本增加了gb7714-1987å’Œgb7714-2005两个版本的样å¼ï¼Œä¹Ÿåˆ†é¡ºåºç¼–ç å’Œè‘—者年份制:
+
+\pdfbookmark[4]{gb7714-1987}{gb7714-1987}
+\pdfbookmark[4]{gb7714-1987ay}{gb7714-1987ay}
+\pdfbookmark[4]{gb7714-2005}{gb7714-2005}
+\pdfbookmark[4]{gb7714-2005ay}{gb7714-2005ay}
+\begin{example}{1987å’Œ2005版的国标样å¼}{eg:gb87and2005}
+\begin{texlist}
+%国标1987顺åºç¼–ç åˆ¶
+\usepackage[backend=biber,style=gb7714-1987]{biblatex}
+%国标1987著者年份制
+\usepackage[backend=biber,style=gb7714-1987ay]{biblatex}
+%国标2005顺åºç¼–ç åˆ¶
+\usepackage[backend=biber,style=gb7714-2005]{biblatex}
+%国标2005著者年份制
+\usepackage[backend=biber,style=gb7714-2005ay]{biblatex}
+\end{texlist}
+\end{example}
+
\subsubsection{新增选项}\label{sec:added:opt}
æ ·å¼åŒ…新增了一些选项,用于标签对é½æ–¹å¼ã€å‡ºç‰ˆé¡¹ç¼ºçœå¤„ç†ã€è´£ä»»è€…(作者)缺çœå¤„ç†ç­‰åŠŸèƒ½çš„控制,其使用方å¼ä¸Žbiblatexå®åŒ…选项完全相åŒ:
@@ -404,7 +426,7 @@ perl gb7714texttobib.pl in=textfilename out=bibfilename
\begin{figure}[!htb]
\centering
\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
-width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
+width=\linewidth,colframe=white,colback=white,arc=0pt,%gblabelcolor
leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\subfigure[\heiti gbalign=right å³å³å¯¹é½]{\parbox{0.5\linewidth}{\includegraphics*[page=4,viewport=1cm 0cm 8cm 4.5cm,clip=true]{egphoto/opt-gbalign-right.pdf}}}
\subfigure[\heiti gbalign=left å³å·¦å¯¹é½]{\parbox{0.5\linewidth}{\includegraphics*[page=4,viewport=1cm 0cm 8cm 4.5cm,clip=true]{egphoto/opt-gbalign-left.pdf}}}\\
@@ -430,7 +452,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\begin{figure}[!htb]
\centering
\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
-width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
+width=\linewidth,colframe=white,colback=white,arc=0pt,%gblabelcolor
leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\subfigure[\heiti gbpub=false 出版项缺çœ]{\parbox{0.5\linewidth}{\includegraphics*[page=1,viewport=1cm 0cm 9cm 4.5cm,clip=true]{egphoto/opt-gbpub-false.pdf}}}
\subfigure[\heiti gbpub=true 出版项补充]{\parbox{0.5\linewidth}{\includegraphics*[page=1,viewport=1cm 0cm 10cm 4.5cm,clip=true]{egphoto/opt-gbpub-true.pdf}}}
@@ -454,7 +476,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\begin{figure}[!htb]
\centering
\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
-width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
+width=\linewidth,colframe=white,colback=white,arc=0pt,%gblabelcolor
leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\subfigure[\heiti gbnoauthor=true] {\parbox{0.5\linewidth}{\includegraphics*[page=1,viewport=1cm 0.4cm 7.5cm 2.8cm,clip=true]{egphoto/opt-gbnoauthor-true.pdf}}}
\subfigure[\heiti gbnoauthor=false] {\parbox{0.5\linewidth}{\includegraphics*[page=1,viewport=1cm 0.4cm 7.5cm 2.8cm,clip=true]{egphoto/opt-gbnoauthor-false.pdf}}}
@@ -479,7 +501,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\begin{figure}[!htb]
\centering
\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
-width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
+width=\linewidth,colframe=white,colback=white,arc=0pt,%gblabelcolor
leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\subfigure[\heiti gbbiblabel=box] {\parbox{0.5\linewidth}{\includegraphics*[page=1,viewport=1cm 0.2cm 8cm 2.8cm,clip=true]{egphoto/opt-gbbiblabela.pdf}}}
\subfigure[\heiti gbbiblabel=bracket] {\parbox{0.5\linewidth}{\includegraphics*[page=1,viewport=1cm 0.2cm 8cm 2.8cm,clip=true]{egphoto/opt-gbbiblabelb.pdf}}}\\
@@ -515,7 +537,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\begin{figure}[!htb]
\centering
\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
-width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
+width=\linewidth,colframe=white,colback=white,arc=0pt,%gblabelcolor
leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\subfigure[\heiti gbnamefmt=uppercase] {\parbox{0.5\linewidth}{\includegraphics*[page=1,viewport=1cm 0.2cm 8cm 2.8cm,clip=true]{egphoto/opt-gbnamefmt-a.pdf}}}
\subfigure[\heiti gbnamefmt=lowercase] {\parbox{0.5\linewidth}{\includegraphics*[page=1,viewport=1cm 0.2cm 8cm 2.8cm,clip=true]{egphoto/opt-gbnamefmt-b.pdf}}}\\
@@ -541,7 +563,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\begin{figure}[!htb]
\centering
\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
-width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
+width=\linewidth,colframe=white,colback=white,arc=0pt,%gblabelcolor
leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\subfigure[\heiti gbtype=true] {\parbox{0.5\linewidth}{\includegraphics*[page=1,viewport=1cm 0.2cm 8cm 2.8cm,clip=true]{egphoto/opt-gbtype-true.pdf}}}
\subfigure[\heiti gbtype=false] {\parbox{0.5\linewidth}{\includegraphics*[page=1,viewport=1cm 0.2cm 8cm 2.8cm,clip=true]{egphoto/opt-gbtype-false.pdf}}}
@@ -564,7 +586,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\begin{figure}[!htb]
\centering
\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
-width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
+width=\linewidth,colframe=white,colback=white,arc=0pt,%gblabelcolor
leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\subfigure[\heiti gbmedium=true] {\parbox{0.5\linewidth}{\includegraphics*[page=1,viewport=1cm 0.2cm 8cm 2.8cm,clip=true]{egphoto/opt-gbmedium-true.pdf}}}
\subfigure[\heiti gbmedium=false] {\parbox{0.5\linewidth}{\includegraphics*[page=1,viewport=1cm 0.2cm 8cm 2.8cm,clip=true]{egphoto/opt-gbmedium-false.pdf}}}
@@ -596,7 +618,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\begin{figure}[!htb]
\centering
\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
-width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
+width=\linewidth,colframe=white,colback=white,arc=0pt,%gblabelcolor
leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\subfigure[\heiti gbfieldtype=true] {\parbox{0.5\linewidth}{\includegraphics*[page=1,viewport=8cm 0.2cm 14.5cm 2.8cm,clip=true]{egphoto/opt-gbfieldtype-true.pdf}}}
\subfigure[\heiti gbfieldtype=false] {\parbox{0.5\linewidth}{\includegraphics*[page=1,viewport=8cm 0.2cm 14.5cm 2.8cm,clip=true]{egphoto/opt-gbfieldtype-false.pdf}}}
@@ -620,7 +642,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\begin{figure}[!htb]
\centering
\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
-width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
+width=\linewidth,colframe=white,colback=white,arc=0pt,%gblabelcolor
leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\subfigure[\heiti gbpunctin=true] {\parbox{0.5\linewidth}{\includegraphics*[page=1,viewport=1cm 0.2cm 7.5cm 2.8cm,clip=true]{egphoto/opt-gbpunctin-true.pdf}}}
\subfigure[\heiti gbpunctin=false] {\parbox{0.5\linewidth}{\includegraphics*[page=1,viewport=1cm 0.2cm 7.5cm 2.8cm,clip=true]{egphoto/opt-gbpunctin-false.pdf}}}
@@ -643,7 +665,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\begin{figure}[!htb]
\centering
\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
-width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
+width=\linewidth,colframe=white,colback=white,arc=0pt,%gblabelcolor
leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\subfigure[\heiti gbtitlelink=true] {\parbox{0.5\linewidth}{\includegraphics*[page=1,viewport=1cm 0.2cm 7.5cm 2.8cm,clip=true]{egphoto/opt-gbtitlelink-true.pdf}}}
\subfigure[\heiti gbtitlelink=false] {\parbox{0.5\linewidth}{\includegraphics*[page=1,viewport=1cm 0.2cm 7.5cm 2.8cm,clip=true]{egphoto/opt-gbtitlelink-false.pdf}}}
@@ -684,7 +706,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\begin{figure}[!htb]
\centering
\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
-width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
+width=\linewidth,colframe=white,colback=white,arc=0pt,%gblabelcolor
leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\centering
\subfigure[\heiti gblocal=gb7714-2015] {\parbox{0.45\linewidth}{\includegraphics*[page=1,viewport=1cm 0.2cm 7.5cm 2.8cm,clip=true]{egphoto/opt-gblocal-gb.pdf}}}\hfill
@@ -709,7 +731,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\begin{figure}[!htb]
\centering
\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
-width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
+width=\linewidth,colframe=white,colback=white,arc=0pt,%gblabelcolor
leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\subfigure[\heiti mergedate ä¸ç»™å‡º] {\parbox{\linewidth}{\includegraphics*[page=1,viewport=1cm 0.2cm 14.5cm 2.8cm,clip=true]{egphoto/opt-mergedate-a.pdf}}}\\
\subfigure[\heiti mergedate=true] {\parbox{\linewidth}{\includegraphics*[page=1,viewport=1cm 0.2cm 14.5cm 2.8cm,clip=true]{egphoto/opt-mergedate-b.pdf}}}\\
@@ -736,7 +758,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\begin{figure}[!htb]
\centering
\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
-width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
+width=\linewidth,colframe=white,colback=white,arc=0pt,%gblabelcolor
leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\centering
\subfigure[\heiti gblanorder=chineseahead] {\parbox{0.45\linewidth}{\includegraphics*[page=1,viewport=1cm 0.2cm 7.5cm 4.0cm,clip=true]{egphoto/opt-gblanorder-chineseahead.pdf}}}\hfill
@@ -762,7 +784,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\begin{figure}[!htb]
\centering
\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
-width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
+width=\linewidth,colframe=white,colback=white,arc=0pt,%gblabelcolor
leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\subfigure[\heiti citexref=true] {\parbox{7.5cm}{\includegraphics*[page=1,viewport=0.2cm 0.2cm 7.5cm 8cm,clip=true]{egphoto/opt-citexref-true.pdf}}}
\subfigure[\heiti citexref=false] {\parbox{7.5cm}{\includegraphics*[page=1,viewport=0.5cm 0.2cm 8cm 8cm,clip=true]{egphoto/opt-citexref-false.pdf}}}
@@ -785,7 +807,7 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\begin{figure}[!htb]
\centering
\begin{tcolorbox}[left skip=0pt,right skip=0pt,%
-width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,%
+width=\linewidth,colframe=white,colback=white,arc=0pt,%gblabelcolor
leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt]
\subfigure[\heiti gbannote=true] {\parbox{\linewidth}{\includegraphics*[page=1,viewport=1cm 0.2cm 16cm 2.8cm,clip=true]{egphoto/opt-gbannote-true.pdf}}}\\
\subfigure[\heiti gbannote=false] {\parbox{\linewidth}{\includegraphics*[page=1,viewport=1cm 0.2cm 16cm 2.8cm,clip=true]{egphoto/opt-gbannote-false.pdf}}}
@@ -1604,7 +1626,12 @@ biber -l zh__stroke jobname
\end{texlist}
\end{example}
-其中,排åºæ¨¡æ¿ä¼˜å…ˆä½¿ç”¨persort域进行排åºï¼ŒæŽ¥ç€æ˜¯ä¸Žæ–‡ç§ç›¸å…³çš„lansortorder域,接ç€æ˜¯sortkey域(该域在biblatex中就是key域的别å),接ç€æ˜¯sortname等作者姓å相关的域,è¦è®©æ–‡çŒ®æ ¹æ®å¤šéŸ³å­—习惯音进行排åºï¼Œé‚£ä¹ˆå°±åœ¨key域中设置文献作者姓å的习惯音。比如三篇文献作者分别是[æŽå››]ã€[J. B. Conway]ã€[曾三]。在设置sorting=multipinyin, gblanorder=chineseahead, sortlocale=zh\_\_pinyin的情况下,根æ®ä¸Šè¿°çš„multipinyin排åºæ¨¡æ¿ï¼Œé¦–先根æ®æ–‡ç§å’Œä½œè€…ä¿¡æ¯å°†ä¸­æ–‡æ–‡çŒ®[曾三][æŽå››]排在å‰é¢ï¼ŒæŽ¥ç€æ˜¯[J. B. Conway],因为默认情况下,曾字考虑的读音是ceng2。但若对key域手动设置中文的拼音,比如[æŽå››]文献设置key=\{li3si4\},而[曾三]文献设置key=\{zeng1san1\},那么中文文献ä»ç„¶æŽ’在å‰é¢ï¼Œä½†æ ¹æ®key域的设置会将[æŽå››]文献排列在[曾三]å‰é¢ã€‚因此手动设置作者姓å的习惯拼音åŽï¼Œæ–‡çŒ®æŽ’列顺åºä¸º:[æŽå››][曾三][J. B. Conway]。
+其中,排åºæ¨¡æ¿ä¼˜å…ˆä½¿ç”¨persort域进行排åºï¼ŒæŽ¥ç€æ˜¯ä¸Žæ–‡ç§ç›¸å…³çš„lansortorder域,接ç€æ˜¯sortkey域(该域在biblatex中就是key域的别å),接ç€æ˜¯sortname等作者姓å相关的域,è¦è®©æ–‡çŒ®æ ¹æ®å¤šéŸ³å­—习惯音进行排åºï¼Œé‚£ä¹ˆå°±åœ¨key域中设置文献作者姓å的习惯音。比如三篇文献作者分别是[æŽå››]ã€[J. B. Conway]ã€[曾三]。在设置sorting=multipinyin, gblanorder=chineseahead, sortlocale=zh\_\_pinyin的情况下,根æ®ä¸Šè¿°çš„multipinyin排åºæ¨¡æ¿ï¼Œé¦–先根æ®æ–‡ç§å’Œä½œè€…ä¿¡æ¯å°†ä¸­æ–‡æ–‡çŒ®[曾三][æŽå››]排在å‰é¢ï¼ŒæŽ¥ç€æ˜¯[J. B. Conway],因为默认情况下,曾字考虑的读音是ceng2,但这ä¸æ˜¯æˆ‘们希望得到的。
+
+所以需è¦æ‰‹åŠ¨å°†key域设置为中文的拼音,比如[æŽå››]文献设置key=\{li3si4\},而[曾三]文献设置key=\{zeng1san1\},那么中文文献ä»ç„¶æŽ’在å‰é¢ï¼Œä½†æ ¹æ®key域的设置会将[æŽå››]文献排列在[曾三]å‰é¢ã€‚因此手动设置作者姓å的习惯拼音åŽï¼Œæ–‡çŒ®æŽ’列正确,顺åºä¸º:[æŽå››][曾三][J. B. Conway]。 需è¦æ³¨æ„的是:手动设置拼音是一个ä¸è½»æ¾çš„活,所以我们å¯ä»¥ä½¿ç”¨è‡ªåŠ¨è®¾ç½®æ‹¼éŸ³çš„工具,详è§
+\href{https://www.latexstudio.net/index/details/index/ids/1546}{为中文å‚考文献自动添加排åºç”¨çš„拼音信æ¯åŸŸ},\href{https://github.com/hushidong/biblatex-map}{bibmapå®åŒ…}。
+
+
其中,与文ç§ç›¸å…³çš„排åºåŸŸlansortorder是由gblanorder选项设置的,当选项值为chineseahead时,语言顺åºä¸ºcn;jp;kr;en;fr;ru,会将中文文献的lansortorder域设置为1,日语文献设置为2,韩语文献设置为3,英文文献设置为4,法语文献设置为5,俄语文献设置为6。排åºè¿‡ç¨‹ä¸­æŒ‰å‡åºæŽ’åºï¼Œé‚£ä¹ˆè‡ªç„¶ä¸­æ–‡æ–‡çŒ®åœ¨å‰è‹±æ–‡æ–‡çŒ®åœ¨åŽã€‚若对gblanorder选择设置一个自定义的字符串如:cn;en;ru;fr;jp;kr,那么文ç§çš„排列顺åºä¸ºä¸­æ–‡ã€è‹±æ–‡ã€ä¿„语ã€æ³•è¯­ã€æ—¥è¯­ã€éŸ©è¯­ã€‚
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987.bbx
new file mode 100644
index 0000000000..708655f76f
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987.bbx
@@ -0,0 +1,206 @@
+%%
+%% ---------------------------------------------------------------
+%% Maintained by huzhenzhen
+%% E-mail: hzzmail@163.com
+%% Released under the LaTeX Project Public License v1.3c or later
+%% ---------------------------------------------------------------
+%%注æ„因为使用了stylemap所以åªå…¼å®¹äº†biblatex3.7以åŽçš„版本
+\ProvidesFile{gb7714-1987.bbx}[2021/05/16 v1.0 a biblatex bibliography style for GB/T 7714-1987]
+
+
+%==================================================
+%加载gbæ ·å¼
+%==================================================
+\RequireBibliographyStyle{gb7714-2015}
+
+%==================================================
+% 2005与2015的主è¦å·®å¼‚:
+%1.æ— doi
+%2.文献类型标志(电å­æ–‡çŒ®å¿…备,其他文献任选),引用日期(è”机文献必备,其他电å­æ–‡çŒ®ä»»é€‰),这æ¡å·®å¼‚无需处ç†
+%3.用汉语拼音书写的中国著者姓åä¸å¾—缩写。标准说是这么说的,但没有任何示例。需è¦çš„è¯å¯ä»¥åœ¨bibæ¡ç›®ä¸­è®¾ç½®nameformat=quanpin
+%4.无关于页ç ã€èŽ·å–和访问路径的说明。这æ¡å·®å¼‚无需处ç†
+%5.没有A/CM/DS/Z等新的类型
+%==================================================
+% 1987与2005的主è¦å·®å¼‚:
+%1. 没有电å­æ–‡çŒ®ã€‚主è¦è€ƒè™‘将高版本的电å­æ–‡çŒ®è½¬æ¢ä¸ºmisc
+%2. å„类文献没有引用日期,获å–和访问路径。考虑去掉urlå’Œurldate
+%3. 没有文献标志类型。考虑去掉文献类型标志和文献载体标志。
+%4. 专著存在文献数é‡ã€ä¸›ç¼–项ã€é™„注项ã€æ–‡çŒ®æ ‡å‡†ç¼–å·ã€‚这一æ¡ä¸è€ƒè™‘。
+%5. æžå‡ºæ–‡çŒ®ï¼šä¸­æ–‡ç”¨è§:,英文用In:
+%6. 页ç ä¹‹é—´çš„连接符用~
+%7. 英文作者的姓åªæ˜¯é¦–å­—æ¯å¤§å†™
+%8. 作者年份制中;文献表中,最åŽä¸€ä¸ªä½œè€…与年份之间的标点用.加空格。但引用的标注标签上是空格
+%9. å­¦ä½è®ºæ–‡ï¼šç”¨å­¦ä½è®ºæ–‡å’Œdissertation表示。
+%10. 编者会加上编者角色信æ¯ã€‚
+%11. 专利输出国别和类型。å¯ä»¥å…¨éƒ¨æ”¾åˆ°number中处ç†ã€‚专利的日期也有特点。特殊处ç†ã€‚
+%==================================================
+
+
+%==================================================
+%选项设置
+%==================================================
+\ExecuteBibliographyOptions{
+ gbtype=false,
+ gbnamefmt=lowercase,
+ gbfieldtype=true,
+ gbpunctin=false,
+ doi=false,
+ url=false,
+ }
+
+%==================================================
+%标点设置
+%==================================================
+\DefineBibliographyExtras{english}{\renewcommand*{\bibrangedash}{$\sim$}}
+\DeclareFieldFormat%将期刊等文献的标题中原æ¥å¸¦çš„引å·åŽ»æŽ‰
+ [thesis]
+ {title}{#1}%\mkbibquote{#1\isdot}
+
+%==================================================
+%字符串设置
+%==================================================
+\DefineBibliographyStrings{english}{
+ %andincitecn = {和},
+ %andincite = {and},
+ mathesiscn={å­¦ä½è®ºæ–‡},
+ phdthesiscn={å­¦ä½è®ºæ–‡},
+ mathesis={[dissertation]},
+ phdthesis={[dissertation]},
+ in={In:\addspace},
+ incn={è§:\addspace},
+ editorscn={ç¼–},
+ editorcn={ç¼–},
+}
+
+
+%==================================================
+%类型转æ¢å›žæ¥
+%==================================================
+ \DeclareStyleSourcemap{
+ \maps[datatype=bibtex]{
+ \map{
+ \step[typesource=online, typetarget=misc, final]
+ }
+ \map{
+ \step[typesource=electronic, typetarget=misc, final]
+ }
+ \map{
+ \step[typesource=www, typetarget=misc, final]
+ }
+ }
+ }
+
+%==================================================
+%域格å¼è®¾ç½®
+%==================================================
+%专著如果责任者是editor,也输入相关类型
+\renewbibmacro*{editor+others}{%
+ \ifboolexpr{
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }
+ {\usebibmacro{editor}%
+ \clearname{editor}}
+ {}}
+
+%è¦æ³¨æ„è¦ä½¿ç”¨translator那么需è¦å¼€å¯usetranslator选项的。
+\renewbibmacro*{translator+others}{%
+ \ifboolexpr{
+ test \ifusetranslator
+ and
+ not test {\ifnameundef{translator}}
+ }
+ {\renewcommand{\aftertransdelim}{\adddot\addspace}\printnames{translator}%
+ \clearname{translator}}
+ {}}
+
+
+%专利的日期
+\renewbibmacro*{newsdate}{%%新增加一个公告日期,公开日期或新闻日期
+ \iffieldundef{year}{}{\printfield{year}%
+ \iffieldundef{month}{}{\adddot\printtext{\thefield{month}}%
+ \iffieldundef{day}{}{\adddot\printfield{day}}}}%
+ }
+
+%
+% é‡è®¾ä¸“利title的输出,将文献类型标识符输出出去
+%
+\newbibmacro*{patenttitle}{%原输出æ¥è‡ªbiblatex.def文件
+ \ifboolexpr{%
+ test{\iffieldundef{title}}%
+ and%
+ test{\iffieldundef{subtitle}}%
+ }%
+ {}%
+ {\printtext[title]{\bibtitlefont%
+ \printfield[titlecase]{title}%
+ \ifboolexpr{test {\iffieldundef{subtitle}}}%这里增加了对å­æ ‡é¢˜çš„判断,解决ä¸åˆ¤æ–­å¤šä¸€ä¸ªç‚¹çš„问题
+ {}{\setunit{\subtitlepunct}%
+ \printfield[titlecase]{subtitle}}%
+ \iffieldundef{titleaddon}{}%判断一下titleaddon,å¦åˆ™ç›´æŽ¥åŠ å¯èƒ½å¤šä¸€ä¸ªç©ºæ ¼
+ {\setunit{\subtitlepunct}\printfield{titleaddon}}%
+ \newunit\printfield{number}%写专利å·
+ \iftoggle{bbx:gbtype}{\printfield[gbtypeflag]{usera}}{}%
+ %\iffieldundef{booktitle}{\newunit}{}%当title是æžå‡ºæ—¶ï¼Œä¸è¦æ ‡ç‚¹
+ %\newunit
+ }%
+}%
+}
+
+
+%==================================================
+%æ¡ç›®çš„输出驱动
+%==================================================
+%
+% 论文类型å•ç‹¬å¤„ç†ï¼šå¢žåŠ è®ºæ–‡ç±»åž‹ä¿¡æ¯
+%
+%
+\DeclareBibliographyDriver{thesis}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/translator+others}%
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+ \usebibmacro{title}%
+ \iftoggle{bbx:gbstrict}{}{%
+ \newunit%
+ \printlist{language}%
+ \newunit\newblock
+ \usebibmacro{byauthor}}%
+ \newunit\newblock
+ \usebibmacro{byeditor+others}%增加的译者信æ¯
+ \newunit\newblock
+ \iftoggle{bbx:gbfieldtype}{%
+ \setunit{\addcolon\addspace}%
+ \printfield{type}%
+ \setunit*{\addspace}}{}%
+ \printfield{number}%
+ \newunit\newblock
+ \printfield{version}%
+ \newunit
+ \printfield{note}%
+ \newunit\newblock
+ \usebibmacro{institution+location+date}%
+ %\newunit\newblock
+ \usebibmacro{chapter+pages}%
+ \iffieldundef{url}{}{%当没有网å€æ—¶ä¹Ÿä¸è¾“出修改或更新日期
+ \usebibmacro{modifydate}}%修改或更新日期为带括å·çš„时间
+ \usebibmacro{doi+eprint+url}%
+ \newunit
+ \printfield{pagetotal}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isrn}}
+ {}%
+ \newunit\newblock
+% \usebibmacro{doi+eprint+url}%
+% \newunit\newblock
+ \usebibmacro{addendum+pubstate}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \newunit\newblock
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{finentry}\usebibmacro{annotation}}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987.cbx
new file mode 100644
index 0000000000..6f92454b87
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987.cbx
@@ -0,0 +1,13 @@
+%%
+%% ---------------------------------------------------------------
+%% Maintained by huzhenzhen
+%% E-mail: hzzmail@163.com
+%% Released under the LaTeX Project Public License v1.3c or later
+%% ---------------------------------------------------------------
+%%
+\ProvidesFile{gb7714-1987.cbx}[2021/05/16 v1.0 a biblatex bibliography style for GB/T 7714-1987]
+
+%==================================================
+%加载gbæ ·å¼
+%==================================================
+\RequireCitationStyle{gb7714-2015} %
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987ay.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987ay.bbx
new file mode 100644
index 0000000000..c9004dd7ec
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987ay.bbx
@@ -0,0 +1,202 @@
+%%
+%% ---------------------------------------------------------------
+%% Maintained by huzhenzhen
+%% E-mail: hzzmail@163.com
+%% Released under the LaTeX Project Public License v1.3c or later
+%% ---------------------------------------------------------------
+%%注æ„因为使用了stylemap所以åªå…¼å®¹äº†biblatex3.7以åŽçš„版本
+\ProvidesFile{gb7714-1987ay.bbx}[2021/05/16 v1.0 a biblatex bibliography style for GB/T 7714-1987]
+
+
+%==================================================
+%加载gbæ ·å¼
+%==================================================
+\RequireBibliographyStyle{gb7714-2015ay}
+
+%==================================================
+% 2005与2015的主è¦å·®å¼‚:
+%1.æ— doi
+%2.文献类型标志(电å­æ–‡çŒ®å¿…备,其他文献任选),引用日期(è”机文献必备,其他电å­æ–‡çŒ®ä»»é€‰),这æ¡å·®å¼‚无需处ç†
+%3.用汉语拼音书写的中国著者姓åä¸å¾—缩写。标准说是这么说的,但没有任何示例。需è¦çš„è¯å¯ä»¥åœ¨bibæ¡ç›®ä¸­è®¾ç½®nameformat=quanpin
+%4.无关于页ç ã€èŽ·å–和访问路径的说明。这æ¡å·®å¼‚无需处ç†
+%5.没有A/CM/DS/Z等新的类型
+%==================================================
+% 1987与2005的主è¦å·®å¼‚:
+%1. 没有电å­æ–‡çŒ®ã€‚主è¦è€ƒè™‘将高版本的电å­æ–‡çŒ®è½¬æ¢ä¸ºmisc
+%2. å„类文献没有引用日期,获å–和访问路径。考虑去掉urlå’Œurldate
+%3. 没有文献标志类型。考虑去掉文献类型标志和文献载体标志。
+%4. 专著存在文献数é‡ã€ä¸›ç¼–项ã€é™„注项ã€æ–‡çŒ®æ ‡å‡†ç¼–å·ã€‚这一æ¡ä¸è€ƒè™‘。
+%5. æžå‡ºæ–‡çŒ®ï¼šä¸­æ–‡ç”¨è§:,英文用In:
+%6. 页ç ä¹‹é—´çš„连接符用~
+%7. 英文作者的姓åªæ˜¯é¦–å­—æ¯å¤§å†™
+%8. 作者年份制中;文献表中,最åŽä¸€ä¸ªä½œè€…与年份之间的标点用.加空格。但引用的标注标签上是空格
+%9. å­¦ä½è®ºæ–‡ï¼šç”¨å­¦ä½è®ºæ–‡å’Œdissertation表示。
+%10. 编者会加上编者角色信æ¯ã€‚
+%11. 专利输出国别和类型。å¯ä»¥å…¨éƒ¨æ”¾åˆ°number中处ç†ã€‚专利的日期也有特点。特殊处ç†ã€‚
+%==================================================
+
+
+%==================================================
+%选项设置
+%==================================================
+\ExecuteBibliographyOptions{
+ gbtype=false,
+ gbnamefmt=lowercase,
+ gbfieldtype=true,
+ gbpunctin=false,
+ doi=false,
+ url=false,
+ }
+
+%==================================================
+%标点设置
+%==================================================
+\DefineBibliographyExtras{english}{\renewcommand*{\bibrangedash}{$\sim$}}
+\DeclareFieldFormat%将期刊等文献的标题中原æ¥å¸¦çš„引å·åŽ»æŽ‰
+ [thesis]
+ {title}{#1}%\mkbibquote{#1\isdot}
+\DeclareDelimFormat[bib,biblist]{nameyeardelim}{\adddot\space}
+
+%==================================================
+%字符串设置
+%==================================================
+\DefineBibliographyStrings{english}{
+ %andincitecn = {和},
+ %andincite = {and},
+ mathesiscn={å­¦ä½è®ºæ–‡},
+ phdthesiscn={å­¦ä½è®ºæ–‡},
+ mathesis={[dissertation]},
+ phdthesis={[dissertation]},
+ in={In:\addspace},
+ incn={è§:\addspace},
+ editorscn={ç¼–},
+ editorcn={ç¼–},
+}
+
+
+%==================================================
+%类型转æ¢å›žæ¥
+%==================================================
+ \DeclareStyleSourcemap{
+ \maps[datatype=bibtex]{
+ \map{
+ \step[typesource=online, typetarget=misc, final]
+ }
+ \map{
+ \step[typesource=electronic, typetarget=misc, final]
+ }
+ \map{
+ \step[typesource=www, typetarget=misc, final]
+ }
+ }
+ }
+
+%==================================================
+%域格å¼è®¾ç½®
+%==================================================
+%专著如果责任者是editor,也输入相关类型
+\renewbibmacro*{editor+others}{%
+ \ifboolexpr{
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }
+ {\usebibmacro{bbx:dashcheck}
+ {\bibnamedash}
+ {\usebibmacro{editor}%
+ \usebibmacro{bbx:savehash}}%
+ \clearname{editor}%
+ \setunit{\printdelim{nameyeardelim}}}%
+ {\global\undef\bbx@lasthash
+ \usebibmacro{labeltitle}%
+ \setunit*{\printdelim{nonameyeardelim}}}%
+ \usebibmacro{date+extradate}}
+
+%专利的日期
+\renewbibmacro*{newsdate}{%%新增加一个公告日期,公开日期或新闻日期
+ \iffieldundef{year}{}{\printfield{year}%
+ \iffieldundef{month}{}{\adddot\printtext{\thefield{month}}%
+ \iffieldundef{day}{}{\adddot\printfield{day}}}}%
+ }
+
+%
+% é‡è®¾ä¸“利title的输出,将文献类型标识符输出出去
+%
+\newbibmacro*{patenttitle}{%原输出æ¥è‡ªbiblatex.def文件
+ \ifboolexpr{%
+ test{\iffieldundef{title}}%
+ and%
+ test{\iffieldundef{subtitle}}%
+ }%
+ {}%
+ {\printtext[title]{\bibtitlefont%
+ \printfield[titlecase]{title}%
+ \ifboolexpr{test {\iffieldundef{subtitle}}}%这里增加了对å­æ ‡é¢˜çš„判断,解决ä¸åˆ¤æ–­å¤šä¸€ä¸ªç‚¹çš„问题
+ {}{\setunit{\subtitlepunct}%
+ \printfield[titlecase]{subtitle}}%
+ \iffieldundef{titleaddon}{}%判断一下titleaddon,å¦åˆ™ç›´æŽ¥åŠ å¯èƒ½å¤šä¸€ä¸ªç©ºæ ¼
+ {\setunit{\subtitlepunct}\printfield{titleaddon}}%
+ \newunit\printfield{number}%写专利å·
+ \iftoggle{bbx:gbtype}{\printfield[gbtypeflag]{usera}}{}%
+ %\iffieldundef{booktitle}{\newunit}{}%当title是æžå‡ºæ—¶ï¼Œä¸è¦æ ‡ç‚¹
+ %\newunit
+ }%
+}%
+}
+
+
+%==================================================
+%æ¡ç›®çš„输出驱动
+%==================================================
+%
+% 论文类型å•ç‹¬å¤„ç†ï¼šå¢žåŠ è®ºæ–‡ç±»åž‹ä¿¡æ¯
+%
+%
+\DeclareBibliographyDriver{thesis}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/translator+others}%
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+ \usebibmacro{title}%
+ \iftoggle{bbx:gbstrict}{}{%
+ \newunit%
+ \printlist{language}%
+ \newunit\newblock
+ \usebibmacro{byauthor}}%
+ \newunit\newblock
+ \usebibmacro{byeditor+others}%增加的译者信æ¯
+ \newunit\newblock
+ \iftoggle{bbx:gbfieldtype}{%
+ \setunit{\addcolon\addspace}%
+ \printfield{type}%
+ \setunit*{\addspace}}{}%
+ \printfield{number}%
+ \newunit\newblock
+ \printfield{version}%
+ \newunit
+ \printfield{note}%
+ \newunit\newblock
+ \usebibmacro{institution+location+date}%
+ %\newunit\newblock
+ \usebibmacro{chapter+pages}%
+ \iffieldundef{url}{}{%当没有网å€æ—¶ä¹Ÿä¸è¾“出修改或更新日期
+ \usebibmacro{modifydate}}%修改或更新日期为带括å·çš„时间
+ \usebibmacro{doi+eprint+url}%
+ \newunit
+ \printfield{pagetotal}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isrn}}
+ {}%
+ \newunit\newblock
+% \usebibmacro{doi+eprint+url}%
+% \newunit\newblock
+ \usebibmacro{addendum+pubstate}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \newunit\newblock
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{finentry}\usebibmacro{annotation}}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987ay.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987ay.cbx
new file mode 100644
index 0000000000..c32bde0d93
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-1987ay.cbx
@@ -0,0 +1,21 @@
+%%
+%% ---------------------------------------------------------------
+%% Maintained by huzhenzhen
+%% E-mail: hzzmail@163.com
+%% Released under the LaTeX Project Public License v1.3c or later
+%% ---------------------------------------------------------------
+%%
+\ProvidesFile{gb7714-1987ay.cbx}[2021/05/16 v1.0 a biblatex bibliography style for GB/T 7714-1987]
+
+%==================================================
+%加载gbæ ·å¼
+%==================================================
+\RequireCitationStyle{gb7714-2015ay} %
+
+\ExecuteBibliographyOptions{
+ uniquename=false,%ä¸å¤„ç†å§“å歧义
+ uniquelist=false
+}
+
+\DeclareDelimFormat[cite,parencite,pagescite]{nameyeardelim}{\space}%\addcomma\space
+\DeclareDelimFormat[citet,citep,textcite]{nameyeardelim}{\space}%\addcomma\space
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005.bbx
new file mode 100644
index 0000000000..12271aa8a8
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005.bbx
@@ -0,0 +1,54 @@
+%%
+%% ---------------------------------------------------------------
+%% erj.bbx --- A bibliography style of Economic Research Journal in china
+%% modified from gb7714-2015ay at the request of ddswhu
+%% Maintained by huzhenzhen
+%% E-mail: hzzmail@163.com
+%% Released under the LaTeX Project Public License v1.3c or later
+%% ---------------------------------------------------------------
+%%注æ„因为使用了stylemap所以åªå…¼å®¹äº†biblatex3.7以åŽçš„版本
+\ProvidesFile{gb7714-2005.bbx}[2021/05/16 v1.0 a biblatex bibliography style for GB/T 7714-2005]
+
+
+%==================================================
+%加载gbæ ·å¼
+%==================================================
+\RequireBibliographyStyle{gb7714-2015}
+
+%==================================================
+%与2015的主è¦å·®å¼‚:
+%1.æ— doi
+%2.文献类型标志(电å­æ–‡çŒ®å¿…备,其他文献任选),引用日期(è”机文献必备,其他电å­æ–‡çŒ®ä»»é€‰),这æ¡å·®å¼‚无需处ç†
+%3.用汉语拼音书写的中国著者姓åä¸å¾—缩写。标准说是这么说的,但没有任何示例。需è¦çš„è¯å¯ä»¥åœ¨bibæ¡ç›®ä¸­è®¾ç½®nameformat=quanpin
+%4.无关于页ç ã€èŽ·å–和访问路径的说明。这æ¡å·®å¼‚无需处ç†
+%5.没有A/CM/DS/Z等新的类型
+%==================================================
+
+
+%==================================================
+%选项设置
+%==================================================
+ \ExecuteBibliographyOptions{
+ doi=false,
+ url=false,
+ }
+
+%==================================================
+%类型转æ¢å›žæ¥
+%==================================================
+ \DeclareStyleSourcemap{
+ \maps[datatype=bibtex]{
+ \map[overwrite]{%
+ \pertype{dataset}
+ \step[fieldset=usera, fieldvalue={Z}]%
+ }
+ \map[overwrite]{%
+ \pertype{archive}
+ \step[fieldset=usera, fieldvalue={Z}]%
+ }
+ \map[overwrite]{%
+ \pertype{map}
+ \step[fieldset=usera, fieldvalue={Z}]%
+ }
+ }
+ }
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005.cbx
new file mode 100644
index 0000000000..fc9f2d1437
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005.cbx
@@ -0,0 +1,15 @@
+%%
+%% ---------------------------------------------------------------
+%% erj.cbx --- A citation style of Economic Research Journal in china
+%% modified from gb7714-2015ay for the request by ddswhu
+%% Maintained by huzhenzhen
+%% E-mail: hzzmail@163.com
+%% Released under the LaTeX Project Public License v1.3c or later
+%% ---------------------------------------------------------------
+%%
+\ProvidesFile{gb7714-2005.cbx}[2021/05/16 v1.0 a biblatex bibliography style for GB/T 7714-2005]
+
+%==================================================
+%加载gbæ ·å¼
+%==================================================
+\RequireCitationStyle{gb7714-2015} %
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005ay.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005ay.bbx
new file mode 100644
index 0000000000..44d089fddd
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005ay.bbx
@@ -0,0 +1,52 @@
+%%
+%% ---------------------------------------------------------------
+%% Maintained by huzhenzhen
+%% E-mail: hzzmail@163.com
+%% Released under the LaTeX Project Public License v1.3c or later
+%% ---------------------------------------------------------------
+%%注æ„因为使用了stylemap所以åªå…¼å®¹äº†biblatex3.7以åŽçš„版本
+\ProvidesFile{gb7714-2005ay.bbx}[2021/05/16 v1.0 a biblatex bibliography style for GB/T 7714-2005]
+
+
+%==================================================
+%加载gbæ ·å¼
+%==================================================
+\RequireBibliographyStyle{gb7714-2015ay}
+
+%==================================================
+%与2015的主è¦å·®å¼‚:
+%1.æ— doi
+%2.文献类型标志(电å­æ–‡çŒ®å¿…备,其他文献任选),引用日期(è”机文献必备,其他电å­æ–‡çŒ®ä»»é€‰),这æ¡å·®å¼‚无需处ç†
+%3.用汉语拼音书写的中国著者姓åä¸å¾—缩写。标准说是这么说的,但没有任何示例。需è¦çš„è¯å¯ä»¥åœ¨bibæ¡ç›®ä¸­è®¾ç½®nameformat=quanpin
+%4.无关于页ç ã€èŽ·å–和访问路径的说明。这æ¡å·®å¼‚无需处ç†
+%5.没有A/CM/DS/Z等新的类型
+%==================================================
+
+
+%==================================================
+%选项设置
+%==================================================
+ \ExecuteBibliographyOptions{
+ doi=false,
+ url=false,
+ }
+
+%==================================================
+%类型转æ¢å›žæ¥
+%==================================================
+ \DeclareStyleSourcemap{
+ \maps[datatype=bibtex]{
+ \map[overwrite]{%
+ \pertype{dataset}
+ \step[fieldset=usera, fieldvalue={Z}]%
+ }
+ \map[overwrite]{%
+ \pertype{archive}
+ \step[fieldset=usera, fieldvalue={Z}]%
+ }
+ \map[overwrite]{%
+ \pertype{map}
+ \step[fieldset=usera, fieldvalue={Z}]%
+ }
+ }
+ }
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005ay.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005ay.cbx
new file mode 100644
index 0000000000..5c2ba2a92a
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005ay.cbx
@@ -0,0 +1,13 @@
+%%
+%% ---------------------------------------------------------------
+%% Maintained by huzhenzhen
+%% E-mail: hzzmail@163.com
+%% Released under the LaTeX Project Public License v1.3c or later
+%% ---------------------------------------------------------------
+%%
+\ProvidesFile{gb7714-2005ay.cbx}[2021/05/16 v1.0 a biblatex bibliography style for GB/T 7714-2005]
+
+%==================================================
+%加载gbæ ·å¼
+%==================================================
+\RequireCitationStyle{gb7714-2015ay} %
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
index 2ebf228c61..d4beba03b6 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
@@ -11,7 +11,7 @@
%
% 版本和时间信æ¯
%
-\def\versionofgbtstyle{2021/05/06 v1.0y}
+\def\versionofgbtstyle{2021/08/19 v1.0z}
\def\versionofbiblatex{\abx@version}
\ProvidesFile{gb7714-2015.bbx}[\versionofgbtstyle biblatex bibliography style]
%\RequireBiber[3]%显å¼æŒ‡å®šç”¨biberåŽç«¯ï¼Œå½“用bibtex时会报错,但其实ä¸ä¼šå½±å“编译,åªæ˜¯é‡‡ç”¨bibtexåŽæ— æ³•è¾¾æˆæ ¼å¼éœ€æ±‚
@@ -753,7 +753,7 @@
\ifstrequal{#1}{familyahead}{\setcounter{gbnamefmtcase}{3}}{}
\ifstrequal{#1}{pinyin}{\setcounter{gbnamefmtcase}{4}}{}%family-given
\ifstrequal{#1}{reverseorder}{\setcounter{gbnamefmtcase}{5}}{}%family-given/given-family
- \ifstrequal{#1}{quanpin}{\setcounter{gbnamefmtcase}{6}}{}%family-given
+ \ifstrequal{#1}{quanpin}{\setcounter{gbnamefmtcase}{6}}{}%全拼
}
\ExecuteBibliographyOptions{gbnamefmt}
@@ -1002,21 +1002,17 @@
\DeclareSourcemap{
\maps[datatype=bibtex]{%
- \map{%当没有作者时将editor转æˆauthor
- \pernottype{inbook}%因为in系列中editorå¯èƒ½ç”¨æ¥è¡¨ç¤ºbookauthor,所以排除
- \pernottype{inproceedings}
- \pernottype{incollection}
- \pernottype{periodical}%因为peridical直接使用editor,所以排除
- %注æ„notfield在低版本biblatex中没有
- %\step[notfield=author,final]%当authorä¸å­˜åœ¨ï¼Œå°†editorå¤åˆ¶ç»™author
- \step[fieldsource=editor,fieldtarget=author]%并删除editor
+ \map{%如果author或者editor或者translator存在,那么设置namea便于åŽé¢åˆ¤æ–­ã€‚
+ \step[fieldsource=author,final]
+ \step[fieldset=namea,origfieldval]
}
- \map{%当没有作者时将translator转æˆauthor
- \pernottype{inbook}
- \pernottype{inproceedings}
- \pernottype{incollection}
- %\step[notfield=author,final]%当authorä¸å­˜åœ¨ï¼Œå°†translatorå¤åˆ¶ç»™author
- \step[fieldsource=translator,fieldtarget=author]%并删除translator
+ \map{%
+ \step[fieldsource=editor,final]
+ \step[fieldset=namea,origfieldval]
+ }
+ \map{%
+ \step[fieldsource=translator,final]
+ \step[fieldset=namea,origfieldval]
}
\map{%让addresså’ŒlocationåŒæ­¥ï¼Œbiblatex中address是location的别å
%因此输出的时候åªæœ‰locationä¿¡æ¯ï¼Œä½†å¤„ç†è¿‡ç¨‹ä¸­æ˜¯å¯ä»¥å­˜åœ¨address的。
@@ -1049,7 +1045,7 @@
\step[fieldsource=nameformat,match=pinyin,final]
\step[fieldset=namefmtid,fieldvalue={4}]
}
- \map{%处ç†åœ¨bib文件中直接给出文献的姓åæ ¼å¼ä¸ºpinyin的情况
+ \map{%处ç†åœ¨bib文件中直接给出文献的姓åæ ¼å¼ä¸ºå…¨æ‹¼çš„情况
\step[fieldsource=nameformat,match=quanpin,final]
\step[fieldset=namefmtid,fieldvalue={6}]
}
@@ -2178,6 +2174,8 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
% 这里调整一下两ç§è¯­è¨€å‚考文献的间隔,æºæ¥è‡ªbiblatex.def
\renewcommand*{\entrysetpunct}{\adddot\newline\nobreak}
\renewcommand*{\bibpagespunct}{\addcolon\addthinspace}%%页ç å¼•ç”¨æ ¼å¼çš„修改,修改为用冒å·
+% 2021.08.19,增加出版地和出版社之间的标点,hzz
+\newcommand{\publocpunct}{\addcolon\addspace}%出版项中:出版社地å€åŽé¢çš„标点
%\renewcommand{\relateddelim}{}%\par
%=====================================================================
@@ -2362,6 +2360,7 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
% v1.0w,20210401,hzz,针对其它语言的译者åŽçš„标点与中文ä¸åŒåšå¤„ç†
% 原ç†æ–¹æ³•:判断作者或译者是å¦ä¸­æ–‡ï¼Œè‹¥ä¸­æ–‡ç”¨å­—符等,å¦åˆ™ç”¨et al. 。
% \printnames由start-stop控制项数,默认是1和maxnames/minnames
+\newcommand{\aftertransdelim}{\addcomma\addthinspace}
\renewbibmacro*{name:andothers}{\bibauthorfont%
\ifboolexpr{
test {\ifnumequal{\value{listcount}}{\value{liststop}}}
@@ -2375,7 +2374,7 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
%è¢è®­æ¥, 陈哲, 肖书海, ç­‰.
%胡泳, 范海燕, 译.
%潘惠霞, é­å©§, æ¨è‰³, 等译.
-\ifcurrentname{translator}{\iffieldequalstr{usere}{chinese}{\addcomma\addthinspace}{}}{}%为了实现上述第二个示例情况åšçš„处ç†
+\ifcurrentname{translator}{\iffieldequalstr{usere}{chinese}{\aftertransdelim}{}}{}%为了实现上述第二个示例情况åšçš„处ç†
}}
@@ -3185,7 +3184,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
}{%
\iflistundef{location}{\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress]}}{\printtext{[S.l.\adddot]}}}%
{\printlist{location}}%
-\addcolon\addspace%
+\publocpunct%
\iflistundef{institution}{%
\iftoggle{ifCJKforgbt}{\printtext{[\str@nopublisher]}}{\printtext{\mkbibbrackets{s.n.}}}}%
{\printlist{institution}}}%
@@ -3198,7 +3197,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
{\printlist{location}%
\iflistundef{institution}%
{\setunit*{\addcomma\space}}
- {\setunit*{\addcolon\space}}%
+ {\setunit*{\publocpunct}}%
\printlist{institution}%
\setunit*{\addcomma\space}%
\usebibmacro{date}%
@@ -3217,8 +3216,8 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
{\iffieldequalstr{note}{standard}{}{\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress}\space :\space\str@nopublisher]}{\printtext{[S.l.\space :\space s.n.\adddot]}}}}%
{\iflistundef{location}{%\adddot
\iffieldequalstr{note}{standard}{}%%从gbt7714-2015标准第19页看到,标准存在出版项时输出,没有时完全çœç•¥ã€‚
- {\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress]}\addcolon\addspace}{\printtext{[S.l.\adddot]}\addcolon\addspace}}}% \bibstring{noaddress}
- {\printlist{location}\addcolon\addspace}%%\addcolon\addspace%
+ {\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress]}\addcolon\addspace}{\printtext{[S.l.\adddot]}\publocpunct}}}% \bibstring{noaddress}
+ {\printlist{location}\publocpunct}%%\addcolon\addspace%
\iflistundef{publisher}{%
\iffieldequalstr{note}{standard}{}%
{\iftoggle{ifCJKforgbt}{\printtext{[\str@nopublisher]}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}%
@@ -3230,7 +3229,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
{\printlist{location}%
\iflistundef{publisher}
{\setunit*{\addcomma\space}}
- {\setunit*{\addcolon\space}}%
+ {\setunit*{\publocpunct}}%
\printlist{publisher}%
\setunit*{\addcomma\space}%
\usebibmacro{date}%%\newunit
@@ -3246,7 +3245,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
{\printlist{location}%%加了一个编组é¿å…\usebibmacro{date}把monthå’Œdayä¿¡æ¯åŽ»æŽ‰
\iflistundef{institution}
{\setunit*{\addcomma\space}}
- {\setunit*{\addcolon\space}}%
+ {\setunit*{\publocpunct}}%
\printlist{institution}%
\setunit*{\addcomma\space}%
\usebibmacro{date}%
@@ -3504,6 +3503,31 @@ incollection,proceedings,inproceedings]{number}{%
}%
}
+% 责任者如果没有author用editor或translator替代
+% 20210521 v1.0y hzz
+%专著如果责任者是editor那么ä¸ç”¨è¾“出类型信æ¯
+\renewbibmacro*{editor+others}{%
+ \ifboolexpr{
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }
+ {\printnames{editor}%
+ \clearname{editor}}
+ {}}
+%è¦æ³¨æ„è¦ä½¿ç”¨translator那么需è¦å¼€å¯usetranslator选项的。
+%注æ„其中的标点处ç†ã€‚
+\renewbibmacro*{translator+others}{%
+ \ifboolexpr{
+ test \ifusetranslator
+ and
+ not test {\ifnameundef{translator}}
+ }
+ {\renewcommand{\aftertransdelim}{\adddot\addspace}{\adddot\addspace}\printnames{translator}%
+ \clearname{translator}}
+ {}}
+
+
%
% 修改期刊的标题
%
@@ -3647,11 +3671,11 @@ incollection,proceedings,inproceedings]{number}{%
%
% bookæ¡ç›®ç±»çš„驱动
%
- \DeclareBibliographyDriver{book}{%æºæ¥è‡ªstandard.bbx文件
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
+\DeclareBibliographyDriver{book}{%æºæ¥è‡ªstandard.bbx文件
+\usebibmacro{bibindex}%
+\usebibmacro{begentry}%
\usebibmacro{author/editor+others/translator+others}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{maintitle+title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit
@@ -3837,7 +3861,7 @@ incollection,proceedings,inproceedings]{number}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor+others/translator+others}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit%
@@ -3884,8 +3908,8 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{
\DeclareBibliographyDriver{report}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+ \usebibmacro{author/editor+others/translator+others}%
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit%
@@ -3933,8 +3957,8 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{
\DeclareBibliographyDriver{manual}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+ \usebibmacro{author/editor+others/translator+others}%
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit%
@@ -3986,7 +4010,7 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor+others/translator+others}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit
@@ -4060,7 +4084,11 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/translator+others}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+ \ifboolexpr{
+ test {\ifnameundef{author}}
+ and
+ test {\ifnameundef{translator}}
+ }{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{title}%
\usebibmacro{in:}%
%\printtext{\texttt{//}\addthinspace}%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx
index a407be98e0..b95d7cd3d8 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx
@@ -7,7 +7,7 @@
%% Released under the LaTeX Project Public License v1.3c or later
%% ---------------------------------------------------------------
%%
-\def\versionofgbtstyle{2021/05/06 v1.0y}
+\def\versionofgbtstyle{2021/08/19 v1.0z}
\ProvidesFile{gb7714-2015.cbx}[\versionofgbtstyle biblatex citation style]
%
@@ -65,8 +65,14 @@
}
+%
+%设置标注中å„篇文献之间的标点
+%20210530,v1.0y,hzz
%textcite标注命令中的标点设置
%\DeclareDelimFormat[textcite]{andothersdelim}{\addspace}%
+\renewcommand*{\compcitedelim}{\addcomma}%\addcomma\addthinspace
+\renewcommand*{\supercitedelim}{\addcomma}
+\renewcommand*{\multicitedelim}{\addcomma}
%
%将连续3篇文献压缩改为连续2篇文献压缩
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
index 2ecd604b01..fb67497c2f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
@@ -10,7 +10,7 @@
%
% 版本和时间信æ¯
%
-\def\versionofgbtstyle{2021/05/06 v1.0y}
+\def\versionofgbtstyle{2021/08/19 v1.0z}
\def\versionofbiblatex{\abx@version}
\ProvidesFile{gb7714-2015ay.bbx}[\versionofgbtstyle biblatex bibliography style]
%\RequireBiber[3]%显å¼æŒ‡å®šç”¨biberåŽç«¯ï¼Œå½“用bibtex时会报错,但其实ä¸ä¼šå½±å“编译,åªæ˜¯é‡‡ç”¨bibtexåŽæ— æ³•è¾¾æˆæ ¼å¼éœ€æ±‚
@@ -951,21 +951,17 @@
\DeclareSourcemap{
\maps[datatype=bibtex]{%
- \map{%当没有作者时将editor转æˆauthor
- \pernottype{inbook}%因为in系列中editorå¯èƒ½ç”¨æ¥è¡¨ç¤ºbookauthor,所以排除
- \pernottype{inproceedings}
- \pernottype{incollection}
- \pernottype{periodical}%因为peridical直接使用editor,所以排除
- %注æ„notfield在低版本biblatex中没有
- %\step[notfield=author,final]%当authorä¸å­˜åœ¨ï¼Œå°†editorå¤åˆ¶ç»™author
- \step[fieldsource=editor,fieldtarget=author]%并删除editor
+ \map{%如果author或者editor或者translator存在,那么设置namea便于åŽé¢åˆ¤æ–­ã€‚
+ \step[fieldsource=author,final]
+ \step[fieldset=namea,origfieldval]
}
- \map{%当没有作者时将translator转æˆauthor
- \pernottype{inbook}
- \pernottype{inproceedings}
- \pernottype{incollection}
- %\step[notfield=author,final]%当authorä¸å­˜åœ¨ï¼Œå°†translatorå¤åˆ¶ç»™author
- \step[fieldsource=translator,fieldtarget=author]%并删除translator
+ \map{%
+ \step[fieldsource=editor,final]
+ \step[fieldset=namea,origfieldval]
+ }
+ \map{%
+ \step[fieldsource=translator,final]
+ \step[fieldset=namea,origfieldval]
}
\map{%让addresså’ŒlocationåŒæ­¥ï¼Œbiblatex中address是location的别å
%因此输出的时候åªæœ‰locationä¿¡æ¯ï¼Œä½†å¤„ç†è¿‡ç¨‹ä¸­æ˜¯å¯ä»¥å­˜åœ¨address的。
@@ -2033,6 +2029,8 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
% 这里调整一下两ç§è¯­è¨€å‚考文献的间隔,æºæ¥è‡ªbiblatex.def
\renewcommand*{\entrysetpunct}{\adddot\par\nobreak}%ayæ ·å¼ç”¨par也å¯ä»¥ï¼Œå› ä¸ºæ²¡æœ‰æ‚¬æŒ‚对é½é—®é¢˜
\renewcommand*{\bibpagespunct}{\addcolon\addthinspace}%%页ç å¼•ç”¨æ ¼å¼çš„修改,修改为用冒å·
+% 2021.08.19,增加出版地和出版社之间的标点,hzz
+\newcommand{\publocpunct}{\addcolon\addspace}%出版项中:出版社地å€åŽé¢çš„标点
%\renewcommand{\relateddelim}{}%\par
%=====================================================================
@@ -2215,6 +2213,7 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
% v1.0w,20210401,hzz,针对其它语言的译者åŽçš„标点与中文ä¸åŒåšå¤„ç†
% 原ç†æ–¹æ³•:判断作者或译者是å¦ä¸­æ–‡ï¼Œè‹¥ä¸­æ–‡ç”¨å­—符等,å¦åˆ™ç”¨et al. 。
% \printnames由start-stop控制项数,默认是1和maxnames/minnames
+\newcommand{\aftertransdelim}{\addcomma\addthinspace}
\renewbibmacro*{name:andothers}{\bibauthorfont%
\ifboolexpr{
test {\ifnumequal{\value{listcount}}{\value{liststop}}}
@@ -2228,7 +2227,7 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7
%è¢è®­æ¥, 陈哲, 肖书海, ç­‰.
%胡泳, 范海燕, 译.
%潘惠霞, é­å©§, æ¨è‰³, 等译.
-\ifcurrentname{translator}{\iffieldequalstr{usere}{chinese}{\addcomma\addthinspace}{}}{}%为了实现上述第二个示例情况åšçš„处ç†
+\ifcurrentname{translator}{\iffieldequalstr{usere}{chinese}{\aftertransdelim}{}}{}%为了实现上述第二个示例情况åšçš„处ç†
}}
% 修改çœç•¥ä½œè€…åŽçš„本地化字符串,比如et al.
@@ -3008,7 +3007,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
}{%
\iflistundef{location}{\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress]}}{\printtext{[S.l.\adddot]}}}%
{\printlist{location}}%
-\addcolon\addspace%
+\publocpunct%
\iflistundef{institution}{%
\iftoggle{ifCJKforgbt}{\printtext{[\str@nopublisher]}}{\printtext{\mkbibbrackets{s.n.}}}}% \bibstring{nopublisher}%[s.n.\adddot]
{\printlist{institution}}}%
@@ -3021,7 +3020,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
{ \printlist{location}%
\iflistundef{institution}%
{\setunit*{\addcomma\space}}
- {\setunit*{\addcolon\space}}%
+ {\setunit*{\publocpunct}}%
\printlist{institution}%
\setunit*{\addcomma\space}%
\usebibmacro{date}%
@@ -3040,8 +3039,8 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
{\iffieldequalstr{note}{standard}{}{\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress}\space :\space\str@nopublisher]}{\printtext{[S.l.\space :\space s.n.\adddot]}}}}%
{\iflistundef{location}{%\adddot
\iffieldequalstr{note}{standard}{}%%从gbt7714-2015标准第19页看到,标准存在出版项时输出,没有时完全çœç•¥ã€‚
- {\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress]}\addcolon\addspace}{\printtext{[S.l.\adddot]}\addcolon\addspace}}}% \bibstring{noaddress}
- {\printlist{location}\addcolon\addspace}%%\addcolon\addspace%
+ {\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress]}\addcolon\addspace}{\printtext{[S.l.\adddot]}\publocpunct}}}% \bibstring{noaddress}
+ {\printlist{location}\publocpunct}%%\addcolon\addspace%
\iflistundef{publisher}{%
\iffieldequalstr{note}{standard}{}%
{\iftoggle{ifCJKforgbt}{\printtext{[\str@nopublisher]}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}%
@@ -3053,7 +3052,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
{\printlist{location}%
\iflistundef{publisher}
{\setunit*{\addcomma\space}}
- {\setunit*{\addcolon\space}}%
+ {\setunit*{\publocpunct}}%
\printlist{publisher}%
\setunit*{\addcomma\space}%
\usebibmacro{date}%%\newunit
@@ -3069,7 +3068,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
{\printlist{location}%%加了一个编组é¿å…\usebibmacro{date}把monthå’Œdayä¿¡æ¯åŽ»æŽ‰
\iflistundef{institution}
{\setunit*{\addcomma\space}}
- {\setunit*{\addcolon\space}}%
+ {\setunit*{\publocpunct}}%
\printlist{institution}%
\setunit*{\addcomma\space}%
\usebibmacro{date}%
@@ -3507,6 +3506,44 @@ test {\ifentrytype{conference}}
}%
}
+% 责任者如果没有author用editor或translator替代
+% 20210521 v1.0y hzz
+%专著如果责任者是editor那么ä¸ç”¨è¾“出类型信æ¯
+\renewbibmacro*{editor+others}{%
+ \ifboolexpr{
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }
+ {\usebibmacro{bbx:dashcheck}
+ {\bibnamedash}
+ {\printnames{editor}%
+ \usebibmacro{bbx:savehash}}%
+ \clearname{editor}%
+ \setunit{\printdelim{nameyeardelim}}}%
+ {\global\undef\bbx@lasthash
+ \usebibmacro{labeltitle}%
+ \setunit*{\printdelim{nonameyeardelim}}}%
+ \usebibmacro{date+extradate}}
+%è¦æ³¨æ„è¦ä½¿ç”¨translator那么需è¦å¼€å¯usetranslator选项的。
+%注æ„其中的标点处ç†ã€‚
+\renewbibmacro*{translator+others}{%
+ \ifboolexpr{
+ test \ifusetranslator
+ and
+ not test {\ifnameundef{translator}}
+ }
+{\usebibmacro{bbx:dashcheck}
+ {\bibnamedash}
+ {\renewcommand{\aftertransdelim}{\adddot\addspace}\printnames{translator}%
+ \usebibmacro{bbx:savehash}}%
+ \clearname{translator}%
+ \setunit{\printdelim{nameyeardelim}}}%
+ {\global\undef\bbx@lasthash
+ \usebibmacro{labeltitle}%
+ \setunit*{\printdelim{nonameyeardelim}}}%
+ \usebibmacro{date+extradate}}
+
%
% 修改期刊的标题
%
@@ -3655,7 +3692,7 @@ test {\ifentrytype{conference}}
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor+others/translator+others}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{maintitle+title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit
@@ -3842,7 +3879,7 @@ test {\ifentrytype{conference}}
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor+others/translator+others}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit%
@@ -3891,8 +3928,8 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{
\DeclareBibliographyDriver{report}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+ \usebibmacro{author/editor+others/translator+others}%
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit%
@@ -3940,8 +3977,8 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{
\DeclareBibliographyDriver{manual}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+ \usebibmacro{author/editor+others/translator+others}%
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit%
@@ -3994,7 +4031,7 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor+others/translator+others}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx
index e965dc84f8..6149ee149f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx
@@ -7,7 +7,7 @@
%% Released under the LaTeX Project Public License v1.3c or later
%% ---------------------------------------------------------------
%%
-\def\versionofgbtstyle{2021/05/06 v1.0y}
+\def\versionofgbtstyle{2021/08/19 v1.0z}
\ProvidesFile{gb7714-2015ay.cbx}[\versionofgbtstyle biblatex citation style]
%
@@ -97,7 +97,7 @@ test {\iftoggle{iftlseven}}%3.7=biblatex
{\iffieldequals{namehash}{\cbx@lasthash}
{\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
\(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
- {\setunit{\addcomma}%
+ {\setunit{\addcomma\addthinspace}%åŒä¸€ä½œè€…的年份之间的标点,示例è§thesis-nwafu-ay
\usebibmacro{cite:extradate}}
{\setunit{\compcitedelim}%
\usebibmacro{cite:labeldate+extradate}%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx
index f325830019..2ae26b511e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx
@@ -11,7 +11,7 @@
%
% 版本和时间信æ¯
%
-\def\versionofgbtstyle{2021/05/06 v1.0y}
+\def\versionofgbtstyle{2021/08/19 v1.0z}
\def\versionofbiblatex{\abx@version}
\ProvidesFile{gb7714-2015ms.bbx}[\versionofgbtstyle biblatex bibliography style]
%\RequireBiber[3]%显å¼æŒ‡å®šç”¨biberåŽç«¯ï¼Œå½“用bibtex时会报错,但其实ä¸ä¼šå½±å“编译,åªæ˜¯é‡‡ç”¨bibtexåŽæ— æ³•è¾¾æˆæ ¼å¼éœ€æ±‚
@@ -31,10 +31,13 @@
% 20180629,v1.0k,hzz
%
% 原ç†æ–¹æ³•:适用于3.10以上版本的biblatex,å¦åˆ™ç»™å‡ºè­¦å‘Š
- \@ifpackagelater{biblatex}{2017/12/28}{}{
+ \providetoggle{iftlatest}
+ \@ifpackagelater{biblatex}{2017/12/28}{%
+ \toggletrue{iftlatest} %å‡è®¾æ˜¯æœ€æ–°ç‰ˆbiblatex
+ }{%
\blx@warning@noline{%
biblatex version is too old for this style\MessageBreak
- if errors raised,Please update biblatex to the latest version.}
+ if errors raised,Please update biblatex to the latest version.}%
}
@@ -525,6 +528,7 @@
\ifstrequal{#1}{familyahead}{\setcounter{gbnamefmtcase}{3}}{}
\ifstrequal{#1}{pinyin}{\setcounter{gbnamefmtcase}{4}}{}%family-given
\ifstrequal{#1}{reverseorder}{\setcounter{gbnamefmtcase}{5}}{}%family-given/given-family
+ \ifstrequal{#1}{quanpin}{\setcounter{gbnamefmtcase}{6}}{}%全拼
}
@@ -537,6 +541,7 @@
\ifstrequal{#1}{left}{\setcounter{gbalignlabel}{1}}{}
\ifstrequal{#1}{center}{\setcounter{gbalignlabel}{2}}{}
\ifstrequal{#1}{gb7714-2015}{\setaligngbstyle}{}
+ \ifstrequal{#1}{gb7714-2015ay}{\setaligngbstyleay}{}
}
@@ -708,21 +713,17 @@
\DeclareSourcemap{%\perdatasource{examples.bib}
\maps[datatype=bibtex]{%
- \map{%当没有作者时将editor转æˆauthor
- \pernottype{inbook}%因为in系列中editorå¯èƒ½ç”¨æ¥è¡¨ç¤ºbookauthor,所以排除
- \pernottype{inproceedings}
- \pernottype{incollection}
- \pernottype{periodical}%因为peridical直接使用editor,所以排除
- %注æ„notfield在低版本biblatex中没有
- %\step[notfield=author,final]%当authorä¸å­˜åœ¨ï¼Œå°†editorå¤åˆ¶ç»™author
- \step[fieldsource=editor,fieldtarget=author]%并删除editor
+ \map{%如果author或者editor或者translator存在,那么设置namea便于åŽé¢åˆ¤æ–­ã€‚
+ \step[fieldsource=author,final]
+ \step[fieldset=namea,origfieldval]
}
- \map{%当没有作者时将translator转æˆauthor
- \pernottype{inbook}
- \pernottype{inproceedings}
- \pernottype{incollection}
- %\step[notfield=author,final]%当authorä¸å­˜åœ¨ï¼Œå°†translatorå¤åˆ¶ç»™author
- \step[fieldsource=translator,fieldtarget=author]%并删除translator
+ \map{%
+ \step[fieldsource=editor,final]
+ \step[fieldset=namea,origfieldval]
+ }
+ \map{%
+ \step[fieldsource=translator,final]
+ \step[fieldset=namea,origfieldval]
}
\map{%让addresså’ŒlocationåŒæ­¥ï¼Œbiblatex中address是location的别å
%因此输出的时候åªæœ‰locationä¿¡æ¯ï¼Œä½†å¤„ç†è¿‡ç¨‹ä¸­æ˜¯å¯ä»¥å­˜åœ¨address的。
@@ -755,6 +756,10 @@
\step[fieldsource=nameformat,match=pinyin,final]
\step[fieldset=namefmtid,fieldvalue={4}]
}
+ \map{%处ç†åœ¨bib文件中直接给出文献的姓åæ ¼å¼ä¸ºpinyin的情况
+ \step[fieldsource=nameformat,match=quanpin,final]
+ \step[fieldset=namefmtid,fieldvalue={6}]
+ }
\map{%æ ¹æ®article确定文献类型标识符
\pertype{article}
\step[fieldset=usera, fieldvalue={J}]
@@ -1281,13 +1286,13 @@
\newlength{\lengthid}
\newlength{\lengthlw}
\newcommand{\itemcmd}{%
-\settowidth{\lengthid}{\mkgbnumlabel{\printfield{labelnumber}}}
-\addtolength{\lengthid}{\biblabelsep}
-\setlength{\lengthlw}{\textwidth}
-\addtolength{\lengthlw}{-\lengthid}
+\settowidth{\lengthid}{\mkgbnumlabel{\printfield{labelnumber}}}%
+\addtolength{\lengthid}{\biblabelsep}%
+\setlength{\lengthlw}{\textwidth}%
+\addtolength{\lengthlw}{-\lengthid}%
\addvspace{\bibitemsep}%æ¢å¤\bibitemsep的作用
%\parshape 2 0em \textwidth \lengthid \lengthlw
-\hangindent\lengthid
+\hangindent\lengthid%
\mkgbnumlabel{\printfield{labelnumber}}%
\hspace{\biblabelsep}}
%
@@ -1298,6 +1303,25 @@
{\itemcmd}}
+%
+% 增加一个作者年制文献表格å¼çš„文献表输出环境。
+% 20210411,hzz,v1.0x
+\def\setaligngbstyleay{%
+\setlength{\bibhang}{1em}
+\setlength{\bibitemindent}{-\bibhang}
+\setlength{\bibitemsep}{4.5pt}
+\defbibenvironment{bibliography}
+ {\list
+ {}
+ {\setlength{\leftmargin}{\bibhang}%
+ \setlength{\itemindent}{\bibitemindent}%
+ \setlength{\itemsep}{\bibitemsep}%
+ \setlength{\parsep}{\bibparsep}}}
+ {\endlist}
+ {\item}
+}
+
+
%=====================================================================
% 设置å•å…ƒæˆ–å—等的标点
%=====================================================================
@@ -1311,6 +1335,8 @@
% 这里调整一下两ç§è¯­è¨€å‚考文献的间隔,æºæ¥è‡ªbiblatex.def
\renewcommand*{\entrysetpunct}{\adddot\newline\nobreak}
\renewcommand*{\bibpagespunct}{\addcolon\addthinspace}%%页ç å¼•ç”¨æ ¼å¼çš„修改,修改为用冒å·
+% 2021.08.19,增加出版地和出版社之间的标点,hzz
+\newcommand{\publocpunct}{\addcolon\addspace}%出版项中:出版社地å€åŽé¢çš„标点
%\renewcommand{\relateddelim}{}%\par
%=====================================================================
@@ -1464,6 +1490,12 @@
{\namepartgiven}
{\namepartprefix}
{\namepartsuffix}}}%
+\or
+\usebibmacro{name:gbquanpin}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}%
\fi
\usebibmacro{name:andothers}}
@@ -1560,6 +1592,36 @@
\ifdefvoid{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}%
}
+%中文常è§é£Žæ ¼ï¼Œæ±‰è¯­æ‹¼éŸ³å…¨æ‹¼æ¨¡å¼
+\newbibmacro*{name:gbquanpin}[4]{\bibauthorfont%
+\renewrobustcmd*{\bibinitperiod}{}%å°†å字简写åŽçš„点去掉,%æ¥æºbiblatex2.STY
+\renewcommand*{\revsdnamepunct}{}%%æ¥æºbiblatex.def
+\renewrobustcmd*{\bibnamedelima}{}%
+ \ifuseprefix
+ {\usebibmacro{name:delim}{#3#1}%
+ \usebibmacro{name:hook}{#3#1}%
+ \ifdefvoid{#3}{}{%
+ \ifcapital
+ {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
+ {\mkbibnameprefix{#3}\isdot}%
+ \ifprefchar{}{\bibnamedelimc}}%
+ \ifdefvoid{#2}{\mkbibnamefamily{\MakeCapital{#1}}}{\mkbibnamefamily{\MakeCapital{#1}}}\isdot%
+ \ifdefvoid{#2}{}{\revsdnamepunct\bibnamedelimd\MakeSentenceCase{\mkbibnamegiven{#2}}\isdot}%\MakeCapital
+ \ifdefvoid{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}
+ {\usebibmacro{name:delim}{#1}%
+ \usebibmacro{name:hook}{#1}%
+ \ifdefvoid{#2}{\mkbibnamefamily{\MakeCapital{#1}}}{\mkbibnamefamily{\MakeCapital{#1}}}\isdot%
+ \ifboolexpe{%
+ test {\ifdefvoid{#2}}
+ and
+ test {\ifdefvoid{#3}}}
+ {}
+ {\revsdnamepunct}%
+ \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{\MakeCapital{#2}}\isdot}%\MakeCapital
+ \ifdefvoid{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}
+ \ifdefvoid{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}%
+}
+
\def\UrlFont{\rmfamily}%设置url字体为roman字体%\ttfamily
%\urlstyle{rm} %使用这å¥ä¹Ÿä¸€æ ·
@@ -1744,6 +1806,8 @@
%=====================================================================
%设置驱动格å¼
%=====================================================================
+%定义译者åŽé¢çš„标点,便于在ä¸åŒçŽ¯å¢ƒä¸‹ä¿®æ”¹ã€‚
+\newcommand{\aftertransdelim}{\addcomma\addthinspace}%
%中文环境的局部化代ç 
\def\localsetchinesecode{%
@@ -1792,7 +1856,7 @@ togl{bbx:gbstyle} or test {\iffieldequalstr{userd}{chinese}}%
\iffieldequalstr{usere}{chinese}{\usebibmacro{bytranslator+othersstrg}}{}%“译â€çš„ä½ç½®æ¢åˆ°ä¸‹é¢æ¥ï¼Œå³æ”¾åˆ°è¯‘者åŽé¢ã€‚
%\setunit{\addspace}%
\newunit}%
- \usebibmacro{withothers}}
+ \usebibmacro{withothers}}%
%
\renewbibmacro*{bytranslator+othersstrg}{%
\def\abx@tempa{bytranslator}%
@@ -1814,7 +1878,7 @@ togl{bbx:gbstyle} or test {\iffieldequalstr{userd}{chinese}}%
\clearname{afterword}}
{}}}%
\iffieldequalstr{usere}{chinese}{\bibstring{bytranslatorcn}}
- {\bibstring{\abx@tempa}}}
+ {\bibstring{\abx@tempa}}}%
%
% 修改作者数é‡è¶…过é™å®šå€¼ï¼Œåšçœç•¥æ—¶çš„处ç†æ ¼å¼
% v1.0,20160701,hzz
@@ -1835,8 +1899,8 @@ togl{bbx:gbstyle} or test {\iffieldequalstr{userd}{chinese}}%
%è¢è®­æ¥, 陈哲, 肖书海, ç­‰.
%胡泳, 范海燕, 译.
%潘惠霞, é­å©§, æ¨è‰³, 等译.
-\ifcurrentname{translator}{\iffieldequalstr{usere}{chinese}{\addcomma\addthinspace}{}}{}%为了实现上述第二个示例情况åšçš„处ç†
-}}
+\ifcurrentname{translator}{\iffieldequalstr{usere}{chinese}{\aftertransdelim}{}}{}%为了实现上述第二个示例情况åšçš„处ç†
+}}%
%
% 修改çœç•¥ä½œè€…åŽçš„本地化字符串,比如et al.
% v1.0o,20190103,hzz
@@ -1993,7 +2057,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
}{%
\iflistundef{location}{\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress]}}{\printtext{[S.l.\adddot]}}}%
{\printlist{location}}%
-\addcolon\addspace%
+\publocpunct%
\iflistundef{institution}{%
\iftoggle{ifCJKforgbt}{\printtext{[\str@nopublisher]}}{\printtext{\mkbibbrackets{s.n.}}}}% \bibstring{nopublisher}%[s.n.\adddot]
{\printlist{institution}}}%
@@ -2006,7 +2070,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
{\printlist{location}%
\iflistundef{institution}%
{\setunit*{\addcomma\space}}
- {\setunit*{\addcolon\space}}%
+ {\setunit*{\publocpunct}}%
\printlist{institution}%
\setunit*{\addcomma\space}%
\usebibmacro{date}%
@@ -2025,8 +2089,8 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
{\iffieldequalstr{note}{standard}{}{\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress}\space :\space\str@nopublisher]}{\printtext{[S.l.\space :\space s.n.\adddot]}}}}%
{\iflistundef{location}{%\adddot
\iffieldequalstr{note}{standard}{}%%从gbt7714-2015标准第19页看到,标准存在出版项时输出,没有时完全çœç•¥ã€‚
- {\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress]}\addcolon\addspace}{\printtext{[S.l.\adddot]}\addcolon\addspace}}}% \bibstring{noaddress}
- {\printlist{location}\addcolon\addspace}%%\addcolon\addspace%
+ {\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress]}\addcolon\addspace}{\printtext{[S.l.\adddot]}\publocpunct}}}% \bibstring{noaddress}
+ {\printlist{location}\publocpunct}%%\addcolon\addspace%
\iflistundef{publisher}{%
\iffieldequalstr{note}{standard}{}%
{\iftoggle{ifCJKforgbt}{\printtext{[\str@nopublisher]}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}%
@@ -2038,7 +2102,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
{\printlist{location}%
\iflistundef{publisher}
{\setunit*{\addcomma\space}}
- {\setunit*{\addcolon\space}}%
+ {\setunit*{\publocpunct}}%
\printlist{publisher}%
\setunit*{\addcomma\space}%
\usebibmacro{date}%%\newunit
@@ -2053,7 +2117,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
{\printlist{location}%%加了一个编组é¿å…\usebibmacro{date}把monthå’Œdayä¿¡æ¯åŽ»æŽ‰
\iflistundef{institution}
{\setunit*{\addcomma\space}}
- {\setunit*{\addcolon\space}}%
+ {\setunit*{\publocpunct}}%
\printlist{institution}%
\setunit*{\addcomma\space}%
\usebibmacro{date}%
@@ -2252,6 +2316,29 @@ incollection,proceedings,inproceedings]{number}{%
{}{\printnames{bookauthor}}%
}%
}%
+% 责任者如果没有author用editor或translator替代
+% 20210521 v1.0y hzz
+%专著如果责任者是editor那么ä¸ç”¨è¾“出类型信æ¯
+\renewbibmacro*{editor+others}{%
+ \ifboolexpr{%
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}%
+ }%
+ {\printnames{editor}%
+ \clearname{editor}}%
+ {}}%
+%è¦æ³¨æ„è¦ä½¿ç”¨translator那么需è¦å¼€å¯usetranslator选项的。
+%注æ„其中的标点处ç†ã€‚
+\renewbibmacro*{translator+others}{%
+ \ifboolexpr{%
+ test \ifusetranslator
+ and
+ not test {\ifnameundef{translator}}%
+ }%
+ {\renewcommand{\aftertransdelim}{\adddot\addspace}\printnames{translator}%
+ \clearname{translator}}%
+ {}}%
%
% 修改期刊的标题
%
@@ -2339,7 +2426,7 @@ incollection,proceedings,inproceedings]{number}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor+others/translator+others}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{maintitle+title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit
@@ -2517,7 +2604,7 @@ incollection,proceedings,inproceedings]{number}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor+others/translator+others}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit%
@@ -2562,8 +2649,8 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{
\csdef{blx@bbx@report}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+ \usebibmacro{author/editor+others/translator+others}%
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit%
@@ -2611,8 +2698,8 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{
\csdef{blx@bbx@manual}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+ \usebibmacro{author/editor+others/translator+others}%
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit%
@@ -2663,7 +2750,7 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor+others/translator+others}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.cbx
index b718fde050..5160edfcfc 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.cbx
@@ -7,194 +7,10 @@
%% Released under the LaTeX Project Public License v1.3c or later
%% ---------------------------------------------------------------
%%
-\def\versionofgbtstyle{2021/05/06 v1.0y}
+\def\versionofgbtstyle{2021/08/19 v1.0z}
\ProvidesFile{gb7714-2015ms.cbx}[\versionofgbtstyle biblatex citation style]
%
-% 加载标准样å¼
+% 加载样å¼
%
-\RequireCitationStyle{numeric-comp} %numeric
-
-
-%
-% 选项设置
-%
-\ExecuteBibliographyOptions{
- autocite = superscript ,
- autopunct = true ,
- %sorting = none ,
- maxcitenames=1,
- mincitenames=1,
-}
-
-%textcite标注命令中的标点设置
-%\DeclareDelimFormat[textcite]{andothersdelim}{\addspace}%
-
-%修改\mkbibsuperscriptå®åœ¨æœ€åŽåŠ ä¸Šä¸€ä¸ªç©ºç™½ä½¿å¾—xeCJKä¸ä¼šè‡ªåŠ¨åœ¨å¼•ç”¨æ ‡ç­¾åŽé¢åŠ ä¸Šä¸­è‹±æ–‡ä¹‹é—´çš„空白
-%hzz,v1.0w,2021-0401
-\renewrobustcmd{\mkbibsuperscript}[1]{%
- \unspace\allowhyphens\textsuperscript{%
- \begingroup
- \protected\long\def\mkbibsuperscript##1{%
- \blx@warning{Nested superscript}%
- \mkbibbrackets{##1}}%
- #1\endgroup}\kern\z@}
-
-%
-% 定义一个上标方括å·wrapper
-%
-\newcommand*\mkbibsuperbracket[1]{%
- \mkbibsuperscript{\mkbibbrackets{#1}}%
-}
-
-% 修改postnote的输出格å¼
-\DeclareFieldFormat{postnote}{#1}
-
-%
-% é‡å®šä¹‰cite命令
-%
-% 方法:\DeclareCiteCommand{\cite}[\mkbibparens]{precode}{loopcode}{sepcode}{postcode}
-% v1.0p版åŽå°†cite的处ç†æ–¹å¼ä¿®æ”¹ä¸ºç±»ä¼¼pagescite,而ä¸å†ä½¿ç”¨biblatex的标准方å¼
-\DeclareCiteCommand{\cite}[\mkbibsuperscript]%利用mkbibsuperbracket添加方括å·
- {[\usebibmacro{cite:init}%
- \usebibmacro{prenote}}
- {\usebibmacro{citeindex}%
- \usebibmacro{cite:comp}}
- {}
- {\usebibmacro{cite:dump}]%
- \printfield{postnote}}
-% v1.0p 以å‰ç”¨çš„æ–¹å¼
-%\DeclareCiteCommand{\cite}[\mkbibsuperbracket]%利用mkbibsuperbracket添加方括å·
-% {\usebibmacro{cite:init}%
-% \usebibmacro{prenote}}
-% {\usebibmacro{citeindex}%
-% \usebibmacro{cite:comp}}
-% {}
-% {\usebibmacro{cite:dump}%
-% \usebibmacro{postnote}}
-
-%
-% 定义upcite命令
-% 20180604,v1.0l,hzz
-% 20190409,v1.0r,hzz
-% 方法:对supercite增加[]
-\newrobustcmd*{\upcite}{%
- \cite}
-
-%
-% é‡å®šä¹‰parencite命令,以满足标签带页ç çš„国标è¦æ±‚
-%
-\DeclareCiteCommand{\parencite}%[\mkbibbrackets]
- {[\usebibmacro{cite:init}%]
- \usebibmacro{prenote}}%
- {\usebibmacro{citeindex}%
- \usebibmacro{cite:comp}}
- {}
- {%[
- \usebibmacro{cite:dump}]%
- \mkbibsuperscript{\printfield{postnote}}}
-
-%
-% 新定义pagescite命令,以满足标签带页ç çš„国标è¦æ±‚
-%
-% 原ç†æ–¹æ³•:
-% 1.新增页ç è¾“出å®
-\newbibmacro*{postpages}{%
- \iffieldundef{postnote}
- {\printfield[postnote]{pages}}
- {\printfield{postnote}}}
-% 2.新增\pagescite引用命令
-\DeclareCiteCommand{\pagescite}[\mkbibsuperscript]%\mkbibbrackets,ä»ç„¶ç”¨ä¸Šæ ‡
- {[\usebibmacro{cite:init}%]直接添加方括å·
- \usebibmacro{prenote}%
- }
- {\usebibmacro{citeindex}%
- \usebibmacro{cite:comp}}
- {}
- {\usebibmacro{cite:dump}]%
- \usebibmacro{postpages}}
-
-%
-% 定义yearpagescite,为与ayæ ·å¼å…¼å®¹ï¼Œç­‰åŒäºŽ\pagescite
-%
-\DeclareCiteCommand{\yearpagescite}[\mkbibsuperscript]%\mkbibbrackets,ä»ç„¶ç”¨ä¸Šæ ‡
- {[\usebibmacro{cite:init}%]直接添加方括å·
- \usebibmacro{prenote}%
- }
- {\usebibmacro{citeindex}%
- \usebibmacro{cite:comp}}
- {}
- {\usebibmacro{cite:dump}]%
- \usebibmacro{postpages}}
-
-
-
-%
-% 定义\yearcite命令,为与ayæ ·å¼å…¼å®¹ï¼Œä¸”æä¾›ä¸è¾“出页ç çš„标签格å¼ï¼Œ
-%
-% 原ç†æ–¹æ³•:ç­‰åŒäºŽ\pagescite,但ä¸è¦é¡µç 
-\DeclareCiteCommand{\yearcite}[\mkbibsuperscript]%\mkbibbrackets,ä»ç„¶ç”¨ä¸Šæ ‡
- {[\usebibmacro{cite:init}%]直接添加方括å·
- \usebibmacro{prenote}%
- }
- {\usebibmacro{citeindex}%
- \usebibmacro{cite:comp}}
- {}
- {\usebibmacro{cite:dump}]}
-
-%
-% 定义\authornumcite命令,输出作者信æ¯ï¼Œç„¶åŽåœ¨åŽé¢å¸¦ä¸Šé¡ºåºç¼–ç 
-% 20180427,v1.0k,增加,hzz
-% gb7714æ ·å¼æ–°å®šä¹‰çš„命令都把cite放到最åŽï¼Œæ¯”如å‰é¢çš„pagescite,yearcite,这里的\authornumcite
-% 区别于biblatex定义的命令都把cite放到å‰é¢ï¼Œæ¯”如citeauthor等。
-%è§numeric.CBX
-\newbibmacro*{cite}{%
- \printtext[bibhyperref]{%
- \printfield{labelprefix}%
- \printfield{labelnumber}%
- \ifbool{bbx:subentry}
- {\printfield{entrysetcount}}
- {}}}
-%è§numeric.CBX,\DeclareCiteCommand{\cite},
-\DeclareCiteCommand{\authornumcite}%[\mkbibsuperscript]
- {\usebibmacro{prenote}}
- {\iffieldequalstr{userf}{cn}{\renewcommand*{\andothersdelim}{\addthinspace}}%\addthinspace
- {\renewcommand*{\andothersdelim}{\addspace}}%
- \printnames{labelname}\mkbibsuperscript{\mkbibbrackets{\usebibmacro{citeindex}%
- \usebibmacro{cite}}}}
- {\multicitedelim}
- {\mkbibsuperscript{\printfield{postnote}}}
-
-
-%
-% 增加如下多个命令
-% 20190409,v1.0r,hzz
-% 方法:利用newcommand或newrobustcmd命令进行定义
-% 注æ„\citetå’Œ\citep命令之所以ä¸ç”¨newrobustcmd,是为é¿å…加载natbib模å—åŽäº§ç”Ÿå†²çª
-\DeclareCiteCommand{\citet}%
- {\usebibmacro{prenote}}
- {\iffieldequalstr{userf}{cn}{\renewcommand*{\andothersdelim}{\addthinspace}}%\addthinspace
- {\renewcommand*{\andothersdelim}{\addspace}}%
- \printnames{labelname}\mkbibsuperscript{\mkbibbrackets{\usebibmacro{citeindex}%
- \usebibmacro{cite}}}}
- {\multicitedelim}
- {\mkbibsuperscript{\printfield{postnote}}}
-
-
-\DeclareCiteCommand{\citep}[\mkbibsuperscript]%利用mkbibsuperbracket添加方括å·
- {[\usebibmacro{cite:init}%
- \usebibmacro{prenote}}
- {\usebibmacro{citeindex}%
- \usebibmacro{cite:comp}}
- {}
- {\usebibmacro{cite:dump}]%
- \printfield{postnote}}
-
-\newrobustcmd*{\citetns}%
- {\textcite}
-
-\newrobustcmd*{\citepns}%
- {\parencite}
-
-\newrobustcmd*{\inlinecite}%
- {\parencite}
+\RequireCitationStyle{gb7714-2015} %numeric
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx
index 49a4f328c6..475f9bee60 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx
@@ -11,7 +11,7 @@
%
% 版本和时间信æ¯
%
-\def\versionofgbtstyle{2021/05/06 v1.0y}
+\def\versionofgbtstyle{2021/08/19 v1.0z}
\def\versionofbiblatex{\abx@version}
\ProvidesFile{gb7714-2015mx.bbx}[\versionofgbtstyle biblatex bibliography style]
%\RequireBiber[3]%显å¼æŒ‡å®šç”¨biberåŽç«¯ï¼Œå½“用bibtex时会报错,但其实ä¸ä¼šå½±å“编译,åªæ˜¯é‡‡ç”¨bibtexåŽæ— æ³•è¾¾æˆæ ¼å¼éœ€æ±‚
@@ -591,6 +591,7 @@
\ifstrequal{#1}{familyahead}{\setcounter{gbnamefmtcase}{3}}{}
\ifstrequal{#1}{pinyin}{\setcounter{gbnamefmtcase}{4}}{}%family-given
\ifstrequal{#1}{reverseorder}{\setcounter{gbnamefmtcase}{5}}{}%family-given/given-family
+ \ifstrequal{#1}{quanpin}{\setcounter{gbnamefmtcase}{6}}{}%全拼
}
\ExecuteBibliographyOptions{gbnamefmt}
@@ -603,6 +604,7 @@
\ifstrequal{#1}{left}{\setcounter{gbalignlabel}{1}}{}
\ifstrequal{#1}{center}{\setcounter{gbalignlabel}{2}}{}
\ifstrequal{#1}{gb7714-2015}{\setaligngbstyle}{}
+ \ifstrequal{#1}{gb7714-2015ay}{\setaligngbstyleay}{}
}
\ExecuteBibliographyOptions{
@@ -759,21 +761,17 @@
\DeclareSourcemap{
\maps[datatype=bibtex]{%
- \map{%当没有作者时将editor转æˆauthor
- \pernottype{inbook}%因为in系列中editorå¯èƒ½ç”¨æ¥è¡¨ç¤ºbookauthor,所以排除
- \pernottype{inproceedings}
- \pernottype{incollection}
- \pernottype{periodical}%因为peridical直接使用editor,所以排除
- %注æ„notfield在低版本biblatex中没有
- %\step[notfield=author,final]%当authorä¸å­˜åœ¨ï¼Œå°†editorå¤åˆ¶ç»™author
- \step[fieldsource=editor,fieldtarget=author]%并删除editor
+ \map{%如果author或者editor或者translator存在,那么设置namea便于åŽé¢åˆ¤æ–­ã€‚
+ \step[fieldsource=author,final]
+ \step[fieldset=namea,origfieldval]
}
- \map{%当没有作者时将translator转æˆauthor
- \pernottype{inbook}
- \pernottype{inproceedings}
- \pernottype{incollection}
- %\step[notfield=author,final]%当authorä¸å­˜åœ¨ï¼Œå°†translatorå¤åˆ¶ç»™author
- \step[fieldsource=translator,fieldtarget=author]%并删除translator
+ \map{%
+ \step[fieldsource=editor,final]
+ \step[fieldset=namea,origfieldval]
+ }
+ \map{%
+ \step[fieldsource=translator,final]
+ \step[fieldset=namea,origfieldval]
}
\map{%让addresså’ŒlocationåŒæ­¥ï¼Œbiblatex中address是location的别å
%因此输出的时候åªæœ‰locationä¿¡æ¯ï¼Œä½†å¤„ç†è¿‡ç¨‹ä¸­æ˜¯å¯ä»¥å­˜åœ¨address的。
@@ -806,6 +804,10 @@
\step[fieldsource=nameformat,match=pinyin,final]
\step[fieldset=namefmtid,fieldvalue={4}]
}
+ \map{%处ç†åœ¨bib文件中直接给出文献的姓åæ ¼å¼ä¸ºå…¨æ‹¼çš„情况
+ \step[fieldsource=nameformat,match=quanpin,final]
+ \step[fieldset=namefmtid,fieldvalue={6}]
+ }
\map{%æ ¹æ®article确定文献类型标识符
\pertype{article}
\step[fieldset=usera, fieldvalue={J}]
@@ -1589,6 +1591,44 @@
{\endgroup}
{\itemcmd}}
+%
+% 增加一个作者年制文献表格å¼çš„文献表输出环境。
+% 20210411,hzz,v1.0x
+\def\setaligngbstyleay{%
+\setlength{\bibhang}{1em}
+\setlength{\bibitemindent}{-\bibhang}
+\setlength{\bibitemsep}{4.5pt}
+\defbibenvironment{bibliography}
+ {\list
+ {}
+ {\setlength{\leftmargin}{\bibhang}%
+ \setlength{\itemindent}{\bibitemindent}%
+ \setlength{\itemsep}{\bibitemsep}%
+ \setlength{\parsep}{\bibparsep}}}
+ {\endlist}
+ {\item}
+}
+
+\defbibenvironment{numerical}%作者年制中数字标签的文献表环境
+ {\setlength{\bibhang}{\biblabelsep}%
+ \setlength{\labelnumberwidth}{2em}%
+ \setlength{\bibitemindent}{0pt}%
+ \setlength{\biblabelextend}{0pt}%
+ \setlength{\biblabelextend}{0pt}%
+ \list
+ {\printtext[labelnumberwidth]{\arabic{refnumeric}}}
+ {\usecounter{refnumeric}%
+ \addtolength{\labelnumberwidth}{\biblabelextend}%
+ \setlength{\labelwidth}{\labelnumberwidth}%
+ \setlength{\labelsep}{\biblabelsep}%
+ \setlength{\leftmargin}{\bibhang}%
+ \addtolength{\leftmargin}{\labelnumberwidth}%
+ \setlength{\itemindent}{\bibitemindent}%
+ \setlength{\itemsep}{\bibitemsep}%
+ \setlength{\parsep}{\bibparsep}}%
+ \renewcommand*{\makelabel}[1]{\hss##1}}
+ {\endlist}
+ {\item}
%=====================================================================
% 设置å•å…ƒæˆ–å—等的标点
@@ -1603,6 +1643,8 @@
% 这里调整一下两ç§è¯­è¨€å‚考文献的间隔,æºæ¥è‡ªbiblatex.def
\renewcommand*{\entrysetpunct}{\adddot\newline\nobreak}
\renewcommand*{\bibpagespunct}{\addcolon\addthinspace}%%页ç å¼•ç”¨æ ¼å¼çš„修改,修改为用冒å·
+% 2021.08.19,增加出版地和出版社之间的标点,hzz
+\newcommand{\publocpunct}{\addcolon\addspace}%出版项中:出版社地å€åŽé¢çš„标点
%\renewcommand{\relateddelim}{}%\par
%=====================================================================
@@ -1781,6 +1823,7 @@
% v1.0w,20210401,hzz,针对其它语言的译者åŽçš„标点与中文ä¸åŒåšå¤„ç†
% 原ç†æ–¹æ³•:判断作者或译者是å¦ä¸­æ–‡ï¼Œè‹¥ä¸­æ–‡ç”¨å­—符等,å¦åˆ™ç”¨et al. 。
% \printnames由start-stop控制项数,默认是1和maxnames/minnames
+\newcommand{\aftertransdelim}{\addcomma\addthinspace}
\renewbibmacro*{name:andothers}{\bibauthorfont%
\ifboolexpr{
test {\ifnumequal{\value{listcount}}{\value{liststop}}}
@@ -1794,10 +1837,11 @@
%è¢è®­æ¥, 陈哲, 肖书海, ç­‰.
%胡泳, 范海燕, 译.
%潘惠霞, é­å©§, æ¨è‰³, 等译.
-\ifcurrentname{translator}{\iffieldequalstr{usere}{chinese}{\addcomma\addthinspace}{}}{}%为了实现上述第二个示例情况åšçš„处ç†
+\ifcurrentname{translator}{\iffieldequalstr{usere}{chinese}{\aftertransdelim}{}}{}%为了实现上述第二个示例情况åšçš„处ç†
}}
+
%
% 修改çœç•¥ä½œè€…åŽçš„本地化字符串,比如et al.
% v1.0o,20190103,hzz
@@ -2021,6 +2065,12 @@
{\namepartgiven}
{\namepartprefix}
{\namepartsuffix}}}%
+\or
+\usebibmacro{name:gbquanpin}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}%
\fi
\usebibmacro{name:andothers}}
@@ -2117,6 +2167,37 @@
\ifdefvoid{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}%
}
+%中文常è§é£Žæ ¼ï¼Œæ±‰è¯­æ‹¼éŸ³å…¨æ‹¼æ¨¡å¼
+\newbibmacro*{name:gbquanpin}[4]{\bibauthorfont%
+\renewrobustcmd*{\bibinitperiod}{}%å°†å字简写åŽçš„点去掉,%æ¥æºbiblatex2.STY
+\renewcommand*{\revsdnamepunct}{}%%æ¥æºbiblatex.def
+\renewrobustcmd*{\bibnamedelima}{}%
+ \ifuseprefix
+ {\usebibmacro{name:delim}{#3#1}%
+ \usebibmacro{name:hook}{#3#1}%
+ \ifdefvoid{#3}{}{%
+ \ifcapital
+ {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
+ {\mkbibnameprefix{#3}\isdot}%
+ \ifprefchar{}{\bibnamedelimc}}%
+ \ifdefvoid{#2}{\mkbibnamefamily{\MakeCapital{#1}}}{\mkbibnamefamily{\MakeCapital{#1}}}\isdot%
+ \ifdefvoid{#2}{}{\revsdnamepunct\bibnamedelimd\MakeSentenceCase{\mkbibnamegiven{#2}}\isdot}%\MakeCapital
+ \ifdefvoid{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}
+ {\usebibmacro{name:delim}{#1}%
+ \usebibmacro{name:hook}{#1}%
+ \ifdefvoid{#2}{\mkbibnamefamily{\MakeCapital{#1}}}{\mkbibnamefamily{\MakeCapital{#1}}}\isdot%
+ \ifboolexpe{%
+ test {\ifdefvoid{#2}}
+ and
+ test {\ifdefvoid{#3}}}
+ {}
+ {\revsdnamepunct}%
+ \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{\MakeCapital{#2}}\isdot}%\MakeCapital
+ \ifdefvoid{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}
+ \ifdefvoid{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}%
+}
+
+
%
% urlå’Œurl日期格å¼
@@ -2254,7 +2335,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
}{%
\iflistundef{location}{\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress]}}{\printtext{[S.l.\adddot]}}}%
{\printlist{location}}%
-\addcolon\addspace%
+\publocpunct%
\iflistundef{institution}{%
\iftoggle{ifCJKforgbt}{\printtext{[\str@nopublisher]}}{\printtext{\mkbibbrackets{s.n.}}}}%
{\printlist{institution}}}%
@@ -2267,7 +2348,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
{\printlist{location}%
\iflistundef{institution}%
{\setunit*{\addcomma\space}}
- {\setunit*{\addcolon\space}}%
+ {\setunit*{\publocpunct}}%
\printlist{institution}%
\setunit*{\addcomma\space}%
\usebibmacro{date}%
@@ -2286,8 +2367,8 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
{\iffieldequalstr{note}{standard}{}{\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress}\space :\space\str@nopublisher]}{\printtext{[S.l.\space :\space s.n.\adddot]}}}}%
{\iflistundef{location}{%\adddot
\iffieldequalstr{note}{standard}{}%%从gbt7714-2015标准第19页看到,标准存在出版项时输出,没有时完全çœç•¥ã€‚
- {\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress]}\addcolon\addspace}{\printtext{[S.l.\adddot]}\addcolon\addspace}}}% \bibstring{noaddress}
- {\printlist{location}\addcolon\addspace}%%\addcolon\addspace%
+ {\iftoggle{ifCJKforgbt}{\printtext{[\str@noaddress]}\addcolon\addspace}{\printtext{[S.l.\adddot]}\publocpunct}}}% \bibstring{noaddress}
+ {\printlist{location}\publocpunct}%%\addcolon\addspace%
\iflistundef{publisher}{%
\iffieldequalstr{note}{standard}{}%
{\iftoggle{ifCJKforgbt}{\printtext{[\str@nopublisher]}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}%
@@ -2299,7 +2380,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
{\printlist{location}%
\iflistundef{publisher}
{\setunit*{\addcomma\space}}
- {\setunit*{\addcolon\space}}%
+ {\setunit*{\publocpunct}}%
\printlist{publisher}%
\setunit*{\addcomma\space}%
\usebibmacro{date}%%\newunit
@@ -2315,7 +2396,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}%
{\printlist{location}%%加了一个编组é¿å…\usebibmacro{date}把monthå’Œdayä¿¡æ¯åŽ»æŽ‰
\iflistundef{institution}
{\setunit*{\addcomma\space}}
- {\setunit*{\addcolon\space}}%
+ {\setunit*{\publocpunct}}%
\printlist{institution}%
\setunit*{\addcomma\space}%
\usebibmacro{date}%
@@ -2573,6 +2654,31 @@ incollection,proceedings,inproceedings]{number}{%
}%
}
+% 责任者如果没有author用editor或translator替代
+% 20210521 v1.0y hzz
+%专著如果责任者是editor那么ä¸ç”¨è¾“出类型信æ¯
+\renewbibmacro*{editor+others}{%
+ \ifboolexpr{
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }
+ {\printnames{editor}%
+ \clearname{editor}}
+ {}}
+%è¦æ³¨æ„è¦ä½¿ç”¨translator那么需è¦å¼€å¯usetranslator选项的。
+%注æ„其中的标点处ç†ã€‚
+\renewbibmacro*{translator+others}{%
+ \ifboolexpr{
+ test \ifusetranslator
+ and
+ not test {\ifnameundef{translator}}
+ }
+ {\renewcommand{\aftertransdelim}{\adddot\addspace}\printnames{translator}%
+ \clearname{translator}}
+ {}}
+
+
%
% 修改期刊的标题
%
@@ -2722,7 +2828,7 @@ incollection,proceedings,inproceedings]{number}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor+others/translator+others}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{maintitle+title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit
@@ -2907,8 +3013,8 @@ incollection,proceedings,inproceedings]{number}{%
\DeclareBibliographyDriver{online}{%æºæ¥è‡ªstandard.BBX
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author/editor+others/translator+others}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+\usebibmacro{author/editor+others/translator+others}%
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit%
@@ -2955,8 +3061,8 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{
\DeclareBibliographyDriver{report}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+\usebibmacro{author/editor+others/translator+others}%
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit%
@@ -3004,8 +3110,8 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{
\DeclareBibliographyDriver{manual}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+\usebibmacro{author/editor+others/translator+others}%
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit%
@@ -3056,8 +3162,8 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{
\DeclareBibliographyDriver{misc}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author/editor+others/translator+others}%
-\ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
+\usebibmacro{author/editor+others/translator+others}%
+\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å­˜åœ¨æ—¶å¤šå‡ºçš„标点
\usebibmacro{title}%
\iftoggle{bbx:gbstrict}{}{%
\newunit
@@ -3345,6 +3451,44 @@ test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{
{}%
{\usebibmacro{date+extradate}}}
+% 责任者如果没有author用editor或translator替代
+% 20210521 v1.0y hzz
+%专著如果责任者是editor那么ä¸ç”¨è¾“出类型信æ¯
+\renewbibmacro*{editor+others}{%
+ \ifboolexpr{
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }
+ {\usebibmacro{bbx:dashcheck}
+ {\bibnamedash}
+ {\printnames{editor}%
+ \usebibmacro{bbx:savehash}}%
+ \clearname{editor}%
+ \setunit{\printdelim{nameyeardelim}}}%
+ {\global\undef\bbx@lasthash
+ \usebibmacro{labeltitle}%
+ \setunit*{\printdelim{nonameyeardelim}}}%
+ \usebibmacro{date+extradate}}
+%è¦æ³¨æ„è¦ä½¿ç”¨translator那么需è¦å¼€å¯usetranslator选项的。
+%注æ„其中的标点处ç†ã€‚
+\renewbibmacro*{translator+others}{%
+ \ifboolexpr{
+ test \ifusetranslator
+ and
+ not test {\ifnameundef{translator}}
+ }
+{\usebibmacro{bbx:dashcheck}
+ {\bibnamedash}
+ {\renewcommand{\aftertransdelim}{\adddot\addspace}\printnames{translator}%
+ \usebibmacro{bbx:savehash}}%
+ \clearname{translator}%
+ \setunit{\printdelim{nameyeardelim}}}%
+ {\global\undef\bbx@lasthash
+ \usebibmacro{labeltitle}%
+ \setunit*{\printdelim{nonameyeardelim}}}%
+ \usebibmacro{date+extradate}}
+
}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.cbx
index 4ab0cd5427..6b64e85bae 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.cbx
@@ -7,7 +7,7 @@
%% Released under the LaTeX Project Public License v1.3c or later
%% ---------------------------------------------------------------
%%
-\def\versionofgbtstyle{2021/05/06 v1.0y}
+\def\versionofgbtstyle{2021/08/19 v1.0z}
\ProvidesFile{gb7714-2015mx.cbx}[\versionofgbtstyle biblatex citation style]
%
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 23cdec1049..5b3b53d4aa 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/08/18}{1.29c}
+\ProvidesExplClass{easybook}{2021/08/20}{1.29d}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -297,7 +297,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/08/18}{1.29c}
+\ProvidesExplPackage{easybase}{2021/08/20}{1.29d}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_add:Nn { NV,Nv }
@@ -2394,7 +2394,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/18}{1.29c}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/20}{1.29d}
{Customization of tcolorbox for easybook}
\tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 281479c7dd..a577e025b6 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 eba882bc04..4107882ddb 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -12,8 +12,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK 使用手册,
- version = v1.29c,
- date = 2021/08/18,
+ version = v1.29d,
+ date = 2021/08/20,
authors = 瞿毅,
info = 排版简体中文学ä½è®ºæ–‡å’Œä¹¦ç±,
email = quee123@foxmail.com,
@@ -253,7 +253,7 @@
\command{listoftables}[\sarg\parg\oarg{键值列表}]
输出表格目录命令。带有星å·çš„目录命令ä¸å°†ç›®å½•æ ‡é¢˜æ·»åŠ è¿›ä¸»æ–‡æ¡£ç›®å½•ï¼Œå¸¦æœ‰ \parg{} å·çš„目录命令å¯ä»¥ä½¿å½“å‰æ ‡é¢˜ç¼–å·ã€‚
\command{listoflstlistings}[\sarg\parg\oarg{键值列表}]
- 输出代ç ç›®å½•å‘½ä»¤ã€‚带有星å·çš„目录命令ä¸å°†ç›®å½•æ ‡é¢˜æ·»åŠ è¿›ä¸»æ–‡æ¡£ç›®å½•ï¼Œå¸¦æœ‰ \parg{} å·çš„目录命令å¯ä»¥ä½¿å½“å‰æ ‡é¢˜ç¼–å·ã€‚以上命令å¯é€‰å‚æ•°çš„ \meta{键值列表} 如下:
+ 输出代ç ç›®å½•å‘½ä»¤ã€‚带有星å·çš„目录命令ä¸å°†ç›®å½•æ ‡é¢˜æ·»åŠ è¿›ä¸»æ–‡æ¡£ç›®å½•ï¼Œå¸¦æœ‰ \parg{} å·çš„目录命令å¯ä»¥ä½¿å½“å‰æ ‡é¢˜ç¼–å·ã€‚以上命令å¯é€‰å‚æ•° \meta{键值列表} 的选项如下:
\end{commands}
\begin{options}
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.pdf b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
index 7a1973e08e..0ae9b00165 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.tex b/macros/latex/contrib/nicematrix/nicematrix-french.tex
index 7d7d915bc3..52aee27992 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.tex
@@ -118,7 +118,7 @@ avec une distribution TeX comme MiKTeX, TeXlive ou MacTeX.
\emph{Remarque} : Si vous utilisez un service LaTeX via Internet (ex. :
Overleaf) vous pouvez télécharger le fichier |nicematrix.sty| dans le dossier de
votre projet pour bénéficier de la dernière version de
-\pkg{nicematrix}.\footnote{La dernière version de \verb|nicematrix.sty| peut
+\pkg{nicematrix}.\footnote{La dernière version de |nicematrix.sty| peut
être téléchargée sur le serveur \textsc{svn} de TeXLive : \newline \small
\url{https:www.tug.org/svn/texlive/trunk/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty}}
@@ -166,10 +166,10 @@ L'extension \pkg{nicematrix} définit les nouveaux environnements suivants :
\begin{tabular}{llll}
\{NiceTabular\} & \{NiceArray\} & \{NiceMatrix\} \\
\{NiceTabular*\} & \{pNiceArray\} & \{pNiceMatrix\} \\
- & \{bNiceArray\} & \{bNiceMatrix\} \\
- & \{BNiceArray\} & \{BNiceMatrix\} \\
- & \{vNiceArray\} & \{vNiceMatrix\} \\
- & \{VNiceArray\} & \{VNiceMatrix\}
+\{NiceTabularX\} & \{bNiceArray\} & \{bNiceMatrix\} \\
+ & \{BNiceArray\} & \{BNiceMatrix\} \\
+ & \{vNiceArray\} & \{vNiceMatrix\} \\
+ & \{VNiceArray\} & \{VNiceMatrix\}
\end{tabular}
\end{ttfamily}
@@ -179,6 +179,7 @@ Les environnements |{NiceArray}|, |{NiceTabular}| et |{NiceTabular*}| sont
similaires aux environnements |{array}|, |{tabular}| et |{tabular*}| de
l'extension \pkg{array} (qui est chargée par \pkg{nicematrix}).
+
\medskip
Les environnements |{pNiceArray}|, |{bNiceArray}|, etc. n'ont pas d'équivalents
dans \pkg{array}.
@@ -189,6 +190,14 @@ environnements correspondants de l'\pkg{amsmath} (qui est chargée par
\pkg{nicematrix}) : |{matrix}|, |{pmatrix}|, etc.
\medskip
+L'environnement |{NiceTabularX}| est similaire à l'environnement |{tabularx}| de
+l'extension éponyme.\footnote{Néanmoins, on peut aussi utiliser directement les
+ colonnes |X| dans l'environnement |{NiceTabular}|, la largeur
+ souhaitée pour le tableau étant spécifiée par la clé |width|: cf.
+ p.~\pageref{colonne-X}.}
+
+
+\medskip
\textbf{On conseille d'utiliser prioritairement les environnements classiques et de
n'utiliser les environnements de \pkg{nicematrix} que lorsqu'on utilise les
fonctionnalités supplémentaires offertes par ces environnements (cela permet
@@ -362,7 +371,7 @@ u_n & 1 & 2 & 4 & 8 & 16 & 32 \\
\bigskip
On peut aussi utiliser la clé |baseline| pour aligner une matrice sur un filet
horizontal (tracé par |\hline|). On doit pour cela donner la valeur
-|line-|\textsl{i} où \textsl{i} est le numéro de la rangée qui suit ce filet
+|line-|\textsl{i} où \textsl{i} est le numéro de la rangée qui \emph{suit} ce filet
horizontal.
\smallskip
@@ -372,7 +381,7 @@ horizontal.
\smallskip
\begin{BVerbatim}[baseline=c,boxwidth=9cm]
-$A=\begin{pNiceArray}{cc|cc}[baseline=line-3]
+$A=\begin{pNiceArray}{cc|cc}~emphase#[baseline=line-3]@
\dfrac1A & \dfrac1B & 0 & 0 \\
\dfrac1C & \dfrac1D & 0 & 0 \\
\hline
@@ -402,7 +411,7 @@ $A=\begin{pNiceArray}{cc|cc}[baseline=line-3]
Dans les environnements de \pkg{nicematrix}, on peut utiliser la commande
|\Block| pour placer un élément au centre d'un rectangle de cases
-fusionnées.\footnote{Les espaces situés après une commande \verb|\Block| sont supprimés.}
+fusionnées.\footnote{Les espaces situés après une commande |\Block| sont supprimés.}
La commande |\Block| doit être utilisée dans la case supérieure gauche du bloc
avec deux arguments obligatoires.
@@ -729,10 +738,9 @@ Rang & \Block{1-3}{Premier groupe} & & & \Block{1-3}{Deuxième groupe} \\
\end{center}
\medskip
-\colorbox{yellow!50}{\bfseries Nouveau 5.17}\enskip Pour avoir un positionnement
-horizontal du contenu du bloc qui s'appuie sur les limites des colonnes du
-tableau LaTeX (et non sur le contenu de ces colonnes), il faut utiliser les clés
-|L|, |R| et |C| de la commande |\Block|.
+Pour avoir un positionnement horizontal du contenu du bloc qui s'appuie sur les
+limites des colonnes du tableau LaTeX (et non sur le contenu de ces colonnes),
+il faut utiliser les clés |L|, |R| et |C| de la commande |\Block|.
\section{Les filets horizontaux et verticaux}
@@ -800,7 +808,7 @@ a & b & c & d \\
\bigskip
Il reste néanmoins possible de définir un spécificateur, nommé par exemple
-\verb|I|, pour tracer des filets verticaux avec le comportement standard de
+|I|, pour tracer des filets verticaux avec le comportement standard de
\pkg{array} :
%
\begin{Verbatim}
@@ -941,8 +949,8 @@ préambule) ;
\begin{itemize}
\item Les blocs en question sont :
\begin{itemize}
-\item ceux créés par la commande |\Block|\footnote{Et aussi la commande \verb|\multicolumn| même s'il
- est recommandé d'utiliser plutôt \verb|\Block| quand on utilise l'extension
+\item ceux créés par la commande |\Block|\footnote{Et aussi la commande |\multicolumn| même s'il
+ est recommandé d'utiliser plutôt |\Block| quand on utilise l'extension
\pkg{nicematrix}.} de \pkg{nicematrix} présentée
p.~\pageref{Block};
\item ceux délimités implicitement par des lignes en pointillés continues, créées
@@ -1010,9 +1018,8 @@ arum & iris & jacinthe & muguet
\bigskip
-\colorbox{yellow!50}{\textbf{Nouveau 5.17}}\enskip La clé
-|hvlines-except-borders| est similaire à la clé |hvlines| mais ne trace pas les
-filets sur les bords horizontaux et verticaux du tableau.
+La clé |hvlines-except-borders| est similaire à la clé |hvlines| mais ne trace
+pas les filets sur les bords horizontaux et verticaux du tableau.
\bigskip
\subsubsection{Les coins (vides)}
@@ -1300,7 +1307,7 @@ l'environnement.
De nouvelles commandes sont disponibles dans ce |\CodeBefore|:
|\cellcolor|, |\rectanglecolor|, |\rowcolor|, |\columncolor|, |\rowcolors|,
|\rowlistcolors|, |\chessboardcolors| et |\arraycolor|.\footnote{On pourra remarquer que, dans le
- \verb|\CodeBefore|, des nœuds PGF/Tikz de la forme \verb+(i-|j)+ correspondant
+ |\CodeBefore|, des nœuds PGF/Tikz de la forme \verb+(i-|j)+ correspondant
à la position des filets éventuels sont également accessibles : cf. p.~\pageref{noeuds-i}.}
\label{code-before}
@@ -1779,23 +1786,33 @@ chacune des cases restantes sur la rangée en cours.
\medskip
Elle prend aussi en premier argument optionnel, entre crochets, une liste de
-couples clé-valeur. Les clés disponibles sont |cell-space-top-limit|,
-|cell-space-bottom-limit| et |cell-space-limits| avec le même effet que les clés
-globales de même nom (cf. p.~\pageref{cell-space}).
+couples clé-valeur.
+\begin{itemize}
+\item Les clés |cell-space-top-limit|, |cell-space-bottom-limit|
+et |cell-space-limits| sont disponibles avec le même effet que les clés globales
+de même nom (cf. p.~\pageref{cell-space}).
+\item \colorbox{yellow!50}{\bfseries Nouveau 6.1}\enskip La clé |color| fixe la
+couleur du texte.\footnote{La clé |color| utilise la commande |\color|
+mais insère aussi une instruction |\leavevmode| devant. Cela évite un
+espace vertical parasite dans les cellules qui correspondent à des colonnes de
+type |p|, |b|, |m| et |X| (qui débutent en mode vertical).}
+\end{itemize}
\medskip
\begin{BVerbatim}[boxwidth=11cm,baseline=c]
-\begin{NiceTabular}{cccc}[hlines,colortbl-like]
+\begin{NiceTabular}{cccc}[colortbl-like]
+\hline
~emphase#\RowStyle[cell-space-limits=3pt]{\rotate}@
premier & deuxième & troisième & quatrième \\
-\rowcolor{blue!50}~emphase#\RowStyle{\color{white}\sffamily}@
+\rowcolor{blue!50}~emphase#\RowStyle[color=white]{\sffamily}@
1 & 2 & 3 & 4 \\
\end{NiceTabular}
\end{BVerbatim}
-\begin{NiceTabular}{cccc}[hlines,colortbl-like]
+\begin{NiceTabular}{cccc}[colortbl-like]
+\hline
\RowStyle[cell-space-limits=3pt]{\rotate}
premier & deuxième & troisième & quatrième \\
-\rowcolor{blue!50}\RowStyle{\color{white}\sffamily}
+\rowcolor{blue!50}\RowStyle[color=white]{\sffamily}
1 & 2 & 3 & 4 \\
\end{NiceTabular}
@@ -1942,6 +1959,8 @@ $\begin{array}{c}
\subsection{Les colonnes X}
+\label{colonne-X}
+
\colorbox{yellow!50}{\textbf{Nouveau 6.0}}
L'environnement |{NiceTabular}| propose aussi des colonnes |X| similaires à
@@ -2029,7 +2048,7 @@ préambule de spécification de colonne pour les éventuelles première et derni
colonne : ce sera automatiquement (et nécessairement) une colonne |r| pour la
première colonne et une colonne |l| pour la dernière.\footnote{Si on souhaite
une colonne extérieure avec un autre type d'alignement, on aura intérêt à
- considérer la commande \verb|\SubMatrix| disponible dans le \verb|\CodeAfter|
+ considérer la commande |\SubMatrix| disponible dans le |\CodeAfter|
(cf. p.~\pageref{sub-matrix}).}
\item On peut se demander comment \pkg{nicematrix} détermine le nombre de rangées et de colonnes nécessaires à la
@@ -2391,7 +2410,7 @@ $\begin{pNiceMatrix}
\emph{Remarque} : Contrairement à la commande |\hdotsfor| de \pkg{amsmath}, la
commande |\Hdotsfor| est utilisable même lorsque l'extension
\pkg{colortbl}\footnote{On rappelle que lorsque l'extension \pkg{xcolor} est
- chargée avec l'option \verb|table|, l'extension \pkg{colortbl} est chargée.}
+ chargée avec l'option |table|, l'extension \pkg{colortbl} est chargée.}
est chargée (mais vous risquez d'avoir des problèmes si vous utilisez
|\rowcolor| sur la même rangée que |\Hdotsfor|).
@@ -2623,7 +2642,7 @@ Les lignes pointillées délimitent des blocs virtuels qui ont le même
comportement vis à vis des filets que les blocs créés par |\Block| (les filets
spécifiés par le spécificateur \verb+|+ dans le préambule, la commande |\Hline|
et par les clés |vlines|, |hlines|, |hvlines| et |hvlines-except-borders| ne
-sont pas tracés dans les blocs).\footnote{En revanche, la commande \verb|\line| dans le \verb|\CodeAfter|
+sont pas tracés dans les blocs).\footnote{En revanche, la commande |\line| dans le |\CodeAfter|
(cf.~p.~\pageref{line-in-code-after}) ne crée pas de bloc.}
\medskip
@@ -2745,10 +2764,10 @@ la syntaxe $i$|-|$j$ où $i$ est le numéro de rangée et $j$ le numéro de colo
\item la quatrième argument est le délimiteur droit ;
\item le cinquième argument, optionnel, entre crochets, est une liste de couples
clé-valeur.\footnote{Il n'y a pas d'argument optionnel entre crochets en première
-position car un crochet ouvrant juste après \verb|\SubMatrix| doit pouvoir être
-interprété comme le premier argument (obligatoire) de \verb|\SubMatrix|: ce
+position car un crochet ouvrant juste après |\SubMatrix| doit pouvoir être
+interprété comme le premier argument (obligatoire) de |\SubMatrix|: ce
crochet est alors le délimiteur gauche de la sous-matrice (ex. :
-\verb|\SubMatrix[{2-2}{4-7}]|).}
+|\SubMatrix[{2-2}{4-7}]|).}
\end{itemize}
On remarquera que la commande |\SubMatrix| trace les délimiteurs après la
@@ -2907,7 +2926,7 @@ PGF/Tikz : voir p.~\pageref{node-sub-matrix}.
\bigskip
Il est également possible de spécifier des délimiteurs\footnote{Les délimiteurs
- en question sont \verb|(|, \verb|[| et \verb|\{| et les fermants correspondants.
+ en question sont |(|, |[| et |\{| et les fermants correspondants.
On peut bien sûr aussi mettre des \verb+|+ et des \verb+||+ dans le
préambule.} en les plaçant dans le préambule de l'environnement (pour les
environnements à préambule : |{NiceArray}|, |{pNiceArray}|, etc.). Cette syntaxe
@@ -4405,7 +4424,7 @@ L'extension \pkg{nicematrix} n'est pas compatible avec la classe \cls{ieeeaccess
\begin{Verbatim}
\ttfamily \small
-\begin{NiceTabular}{m{4.5cm}m{4.5cm}m{4.5cm}}[hvlines]
+\begin{NiceTabular}{X[m]X[m]X[m]}[hvlines,cell-space-limits=3pt]
\Block[~emphase#tikz={pattern=grid,pattern color=lightgray}@]{}
{pattern = grid,\\ pattern color = lightgray}
& \Block[~emphase#tikz={pattern = north west lines,pattern color=blue}@]{}
@@ -4421,7 +4440,7 @@ L'extension \pkg{nicematrix} n'est pas compatible avec la classe \cls{ieeeaccess
\begin{center}
\ttfamily \small
-\begin{NiceTabular}{m{4.5cm}m{4.5cm}m{4.5cm}}[hvlines]
+\begin{NiceTabular}{X[m]X[m]X[m]}[hvlines,cell-space-limits=3pt]
\Block[tikz={pattern=grid,pattern color=lightgray}]{}
{pattern = grid,\\ pattern color = lightgray}
& \Block[tikz={pattern = north west lines,pattern color=blue}]{}
diff --git a/macros/latex/contrib/nicematrix/nicematrix.dtx b/macros/latex/contrib/nicematrix/nicematrix.dtx
index f2ecb695bc..2f7bfdc597 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.dtx
+++ b/macros/latex/contrib/nicematrix/nicematrix.dtx
@@ -15,8 +15,8 @@
%
% \fi
% \iffalse
-\def\myfileversion{6.0}
-\def\myfiledate{2021/08/10}
+\def\myfileversion{6.1}
+\def\myfiledate{2021/08/20}
%
%
%<*batchfile>
@@ -65,7 +65,7 @@ version 2005/12/01 or later.
\usepackage{titlesec}
\titlespacing*{\section}{0pt}{6.5ex plus 1ex minus .2ex}{4.3ex plus .2ex}
\titlespacing*{\subsection}{0pt}{4.5ex plus 1ex minus .2ex}{2ex plus .2ex}
-\usepackage{footnotehyper}
+\usepackage[hyperfootnotes=false]{footnotehyper}
\usepackage{varwidth}
\def\LetterAt{@}
\parindent 0pt
@@ -165,7 +165,7 @@ version 2005/12/01 or later.
% can upload the file |nicematrix.sty| in the repertory of your
% project in order to take full advantage of the latest version de
% \pkg{nicematrix}.\footnote{The latest version of the file
-% \verb|nicematrix.sty| may be downloaded from the \textsc{svn} server of
+% |nicematrix.sty| may be downloaded from the \textsc{svn} server of
% TeXLive:\newline
% \small
% \url{https:www.tug.org/svn/texlive/trunk/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty}}
@@ -216,7 +216,7 @@ version 2005/12/01 or later.
% \begin{tabular}{llll}
% \{NiceTabular\} & \{NiceArray\} & \{NiceMatrix\} \\
% \{NiceTabular*\} & \{pNiceArray\} & \{pNiceMatrix\} \\
-% & \{bNiceArray\} & \{bNiceMatrix\} \\
+% \{NiceTabularX\} & \{bNiceArray\} & \{bNiceMatrix\} \\
% & \{BNiceArray\} & \{BNiceMatrix\} \\
% & \{vNiceArray\} & \{vNiceMatrix\} \\
% & \{VNiceArray\} & \{VNiceMatrix\}
@@ -241,6 +241,12 @@ version 2005/12/01 or later.
% \pkg{nicematrix}): |{matrix}|, |{pmatrix}|, etc.
%
% \medskip
+% L'environnement |{NiceTabularX}| is similar to the environment |{tabularx}|
+% from the eponymous package.\footnote{In fact, it's possible to use directly the
+% |X| columns in the environnement |{NiceTabular}| (and the required
+% width for the tabular is fixed by the key |width|): cf. p.~\pageref{X-columns}}.
+%
+% \medskip
% \textbf{It's recommended to use primarily the classical environments and to use the
% environments of \pkg{nicematrix} only when some feature provided by these
% environments is used (this will save memory).}
@@ -412,7 +418,7 @@ version 2005/12/01 or later.
% \bigskip
% It's also possible to use the key |baseline| to align a matrix on an
% horizontal rule (drawn by |\hline|). In this aim, one should give the value
-% |line-|\textsl{i} where \textsl{i} is the number of the row following the
+% |line-|\textsl{i} where \textsl{i} is the number of the row \emph{following} the
% horizontal rule.
%
% \smallskip
@@ -422,7 +428,7 @@ version 2005/12/01 or later.
%
% \smallskip
% \begin{BVerbatim}[baseline=c,boxwidth=9cm]
-% $A=\begin{pNiceArray}{cc|cc}[baseline=line-3]
+% $A=\begin{pNiceArray}{cc|cc}~emphase#[baseline=line-3]@
% \dfrac1A & \dfrac1B & 0 & 0 \\
% \dfrac1C & \dfrac1D & 0 & 0 \\
% \hline
@@ -449,14 +455,14 @@ version 2005/12/01 or later.
%
% In the environments of \pkg{nicematrix}, it's possible to use the command
% |\Block| in order to place an element in the center of a rectangle of merged
-% cells of the array.\footnote{The spaces after a command \verb|\Block| are deleted.}
+% cells of the array.\footnote{The spaces after a command |\Block| are deleted.}
%
% The command |\Block| must be used in the upper leftmost cell of the array with
% two arguments.
%
% \begin{itemize}
% \item The first argument is the size of the block with the syntax
-% $i$\verb|-|$j$ where $i$ is the number of rows of the block and $j$ its number
+% $i$|-|$j$ where $i$ is the number of rows of the block and $j$ its number
% of columns.
%
% If this argument is empty, its default
@@ -689,7 +695,7 @@ version 2005/12/01 or later.
% \item It's possible do draw a frame around the cell with the key |draw| of the
% command |\Block| and to fill the background with rounded corners with the keys
% |fill| and |rounded-corners|.\footnote{If one simply wishes to color the
-% background of a unique celle, there is no point using the command |\Block|:
+% background of a unique cell, there is no point using the command |\Block|:
% it's possible to use the command |\cellcolor| (when the key |colortbl-like| is
% used).}
%
@@ -767,10 +773,10 @@ version 2005/12/01 or later.
% \end{center}
%
% \medskip
-% \colorbox{yellow!50}{\bfseries New 5.17}\enskip In order to have an horizontal
-% positionning of the content of the block computed with the limits of the
-% columns of the LaTeX array (and not with the contents of those columns), one
-% may use the key |L|, |R| and |C| of the command |\Block|.
+% In order to have an horizontal positionning of the content of the block
+% computed with the limits of the columns of the LaTeX array (and not with the
+% contents of those columns), one may use the key |L|, |R| and |C| of the
+% command |\Block|.
%
%
% \section{The rules}
@@ -965,7 +971,7 @@ version 2005/12/01 or later.
% \begin{itemize}
% \item These blocks are:
% \begin{itemize}
-% \item the blocks created by the command |\Block|\footnote{And also the command \verb|\multicolumn| but
+% \item the blocks created by the command |\Block|\footnote{And also the command |\multicolumn| but
% it's recommended to use instead |\Block| in the environments of
% \pkg{nicematrix}.} presented
% p.~\pageref{Block};
@@ -1032,9 +1038,8 @@ version 2005/12/01 or later.
% \end{center}
%
% \bigskip
-% \colorbox{yellow!50}{\bfseries New 5.17}\enskip The key
-% |hvlines-except-borders| is similar to the key |hvlines| but does not draw the
-% rules on the horizontal and vertical borders of the array.
+% The key |hvlines-except-borders| is similar to the key |hvlines| but does not
+% draw the rules on the horizontal and vertical borders of the array.
%
% \subsubsection{The (empty) corners}
%
@@ -1306,7 +1311,7 @@ version 2005/12/01 or later.
% New commands are available in that |\CodeBefore|: |\cellcolor|,
% |\rectanglecolor|, |\rowcolor|, |\columncolor|, |\rowcolors|,
% |\rowlistcolors|, |\chessboardcolors| and |arraycolor|.\footnote{Remark that,
-% in the \verb|\CodeBefore|, PGF/Tikz nodes of the form ``\verb+(i-|j)+'' are
+% in the |\CodeBefore|, PGF/Tikz nodes of the form ``\verb+(i-|j)+'' are
% also available to indicate the position to the potential rules:
% cf.~p.~\pageref{nodes-i}.}
% \label{code-before}
@@ -1768,23 +1773,34 @@ version 2005/12/01 or later.
%
% \medskip
% That command also takes in as optional argument (between square brackets)
-% a list of key-value pairs. The available keys are |cell-space-top-limit|,
-% |cell-space-bottom-limit| and |cell-space-limits| with the same meaning that
-% the corresponding global keys (cf. p.~\pageref{cell-space}).
-%
+% a list of key-value pairs.
+% \begin{itemize}
+% \item The keys |cell-space-top-limit|, |cell-space-bottom-limit| and
+% |cell-space-limits| are available with the same meaning that the corresponding
+% global keys (cf. p.~\pageref{cell-space}).
+% \item \colorbox{yellow!50}{\bfseries New 6.1}\enskip The key |color| sets the
+% color of the text.\footnote{The key |color| uses the command
+% |\color| but inserts also an instruction |\leavevmode| before. This
+% instruction prevents a extra vertical space in the cells which belong to
+% columns of type |p|, |b|, |m| and |X| (which start in
+% vertical mode).}
+% \end{itemize}
+%
% \medskip
% \begin{BVerbatim}[boxwidth=11cm,baseline=c]
-% \begin{NiceTabular}{cccc}[hlines,colortbl-like]
+% \begin{NiceTabular}{cccc}[colortbl-like]
+% \hline
% ~emphase#\RowStyle[cell-space-limits=3pt]{\rotate}@
% first & second & third & fourth \\
-% \rowcolor{blue!50}~emphase#\RowStyle{\color{white}\sffamily}@
+% \rowcolor{blue!50}~emphase#\RowStyle[color=white]{\sffamily}@
% 1 & 2 & 3 & 4 \\
% \end{NiceTabular}
% \end{BVerbatim}
-% \begin{NiceTabular}{cccc}[hlines,colortbl-like]
+% \begin{NiceTabular}{cccc}[colortbl-like]
+% \hline
% \RowStyle[cell-space-limits=3pt]{\rotate}
% first & second & third & fourth \\
-% \rowcolor{blue!50}\RowStyle{\color{white}\sffamily}
+% \rowcolor{blue!50}\RowStyle[color=white]{\sffamily}
% 1 & 2 & 3 & 4 \\
% \end{NiceTabular}
%
@@ -1926,6 +1942,7 @@ version 2005/12/01 or later.
%
% \subsection{The columns X}
%
+% \label{X-columns}
% \colorbox{yellow!50}{\textbf{New 6.0}}
%
% The environment |{NiceTabular}| provides |X| columns similar to those provided
@@ -2247,7 +2264,7 @@ version 2005/12/01 or later.
%
%
% Consider the following matrix composed classicaly with the environment
-% \verb|{pmatrix}| of \pkg{amsmath}.\par\nobreak
+% |{pmatrix}| of \pkg{amsmath}.\par\nobreak
%
% \medskip
% \begin{BVerbatim}[baseline=c,boxwidth=10cm]
@@ -2263,7 +2280,7 @@ version 2005/12/01 or later.
%
%
% \bigskip
-% If we add \verb|\ldots| instructions in the second row, the geometry of the
+% If we add |\ldots| instructions in the second row, the geometry of the
% matrix is modified.\par\nobreak
%
% \medskip
@@ -2279,8 +2296,8 @@ version 2005/12/01 or later.
% \end{pmatrix}$
%
% \bigskip
-% By default, with \pkg{nicematrix}, if we replace \verb|{pmatrix}| by
-% \verb|{pNiceMatrix}| and \verb|\ldots| by \verb|\Ldots|, the geometry of the matrix is not
+% By default, with \pkg{nicematrix}, if we replace |{pmatrix}| by
+% |{pNiceMatrix}| and |\ldots| by |\Ldots|, the geometry of the matrix is not
% changed.\par\nobreak
%
% \medskip
@@ -2298,7 +2315,7 @@ version 2005/12/01 or later.
% \bigskip
% However, one may prefer the geometry of the first matrix $A$ and would like to
% have such a geometry with a dotted line in the second row. It's possible by
-% using the option \verb|nullify-dots| (and only one instruction \verb|\Ldots| is
+% using the option |nullify-dots| (and only one instruction |\Ldots| is
% necessary).\par\nobreak
%
% \medskip
@@ -2369,7 +2386,7 @@ version 2005/12/01 or later.
% \medskip
% Remark: Unlike the command |\hdotsfor| of \pkg{amsmath}, the command
% |\Hdotsfor| may be used even when the package \pkg{colortbl}\footnote{We
-% recall that when \pkg{xcolor} is loaded with the option \verb|table|, the
+% recall that when \pkg{xcolor} is loaded with the option |table|, the
% package \pkg{colortbl} is loaded.} is loaded (but you might have problem if
% you use |\rowcolor| on the same row as |\Hdotsfor|).
%
@@ -2591,8 +2608,8 @@ version 2005/12/01 or later.
% regarding the rules (the rules specified by the specifier \verb+|+ in the
% preamble, by the command |\Hline| and by the keys |hlines|, |vlines|,
% |hvlines| and |hvlines-except-borders| are not drawn within the
-% blocks).\footnote{On the other side, the command \verb|\line| in the
-% \verb|\CodeAfter| (cf.~p.~\pageref{line-in-code-after}) does \emph{not} create
+% blocks).\footnote{On the other side, the command |\line| in the
+% |\CodeAfter| (cf.~p.~\pageref{line-in-code-after}) does \emph{not} create
% block.}
%
% \medskip
@@ -2877,7 +2894,7 @@ version 2005/12/01 or later.
%
% \bigskip
% It's also possible to specify some delimiters\footnote{Those delimiters are
-% \verb|(|, \verb|[|, |\{| and the closing ones. Of course, it's also
+% |(|, |[|, |\{| and the closing ones. Of course, it's also
% possible to put \verb+|+ and \verb+||+ in the preamble of the environement.}
% by placing them in the preamble of the environment (for the environments with
% a preamble: |{NiceArray}|, |{pNiceArray}|, etc.). This syntax is inspired by
@@ -3294,7 +3311,7 @@ version 2005/12/01 or later.
% rotation of 90° in the direct sens.
%
% In the following command, we use that command in the
-% |code-for-first-row|.\footnote{It can also be used in \verb|RowStyle|
+% |code-for-first-row|.\footnote{It can also be used in |\RowStyle|
% (cf.~p.~\pageref{RowStyle}.}
%
%\bigskip
@@ -3393,9 +3410,9 @@ version 2005/12/01 or later.
% \medskip
% In fact, the option |small| corresponds to the following tuning:
% \begin{itemize}
-% \item the cells of the array are composed with \verb|\scriptstyle|;
-% \item \verb|\arraystretch| is set to $0.47$;
-% \item \verb|\arraycolsep| is set to $1.45$~pt;
+% \item the cells of the array are composed with |\scriptstyle|;
+% \item |\arraystretch| is set to $0.47$;
+% \item |\arraycolsep| is set to $1.45$~pt;
% \item the characteristics of the dotted lines are also modified.
% \end{itemize}
%
@@ -4336,7 +4353,7 @@ version 2005/12/01 or later.
%
% \begin{Verbatim}
% \ttfamily \small
-% \begin{NiceTabular}{m{4.5cm}m{4.5cm}m{4.5cm}}[hvlines]
+% \begin{NiceTabular}{X[m]X[m]X[m]}[hvlines,cell-space-limits=3pt]
% \Block[~emphase#tikz={pattern=grid,pattern color=lightgray}@]{}
% {pattern = grid,\\ pattern color = lightgray}
% & \Block[~emphase#tikz={pattern = north west lines,pattern color=blue}@]{}
@@ -4352,7 +4369,7 @@ version 2005/12/01 or later.
%
% \begin{center}
% \ttfamily \small
-% \begin{NiceTabular}{m{4.5cm}m{4.5cm}m{4.5cm}}[hvlines]
+% \begin{NiceTabular}{X[m]X[m]X[m]}[hvlines,cell-space-limits=3pt]
% \Block[tikz={pattern=grid,pattern color=lightgray}]{}
% {pattern = grid,\\ pattern color = lightgray}
% & \Block[tikz={pattern = north west lines,pattern color=blue}]{}
@@ -5528,52 +5545,18 @@ version 2005/12/01 or later.
\bool_if:nTF { ! \c_@@_siunitx_loaded_bool }
{ \cs_set_eq:NN \@@_renew_NC@rewrite@S: \prg_do_nothing: }
{
-% \end{macrocode}
-% For version of \pkg{siunitx} at least equal to 3.0, the adaptation is different
-% from previous ones. We test the version of \pkg{siunitx} by the existence of the
-% control sequence |\siunitx_cell_begin:w|.
-% \begin{macrocode}
- \cs_if_exist:NTF \siunitx_cell_begin:w
+ \cs_new_protected:Npn \@@_renew_NC@rewrite@S:
{
- \cs_new_protected:Npn \@@_renew_NC@rewrite@S:
+ \renewcommand*{\NC@rewrite@S}[1][]
{
- \renewcommand*{\NC@rewrite@S}[1][]
- {
- \@temptokena \exp_after:wN
- {
- \tex_the:D \@temptokena
- > {
- \@@_Cell:
- \keys_set:nn { siunitx } { ##1 }
- \siunitx_cell_begin:w
- }
-% \end{macrocode}
-% |\@@_true_c:| will be replaced statically by |c| at the end of the construction
-% of the preamble.
-% \begin{macrocode}
- \@@_true_c:
- < { \siunitx_cell_end: \@@_end_Cell: }
- }
- \NC@find
- }
+% \end{macrocode}
+% |\@temptokena| is a toks (not supported by \pkg{expl3}).
+% \begin{macrocode}
+ \@temptokena \exp_after:wN
+ { \tex_the:D \@temptokena \@@_S: [ ##1 ] }
+ \NC@find
}
- }
- {
- \cs_new_protected:Npn \@@_renew_NC@rewrite@S:
- {
- \renewcommand*{\NC@rewrite@S}[1][]
- {
- \@temptokena \exp_after:wN
- {
- \tex_the:D \@temptokena
- > { \@@_Cell: \c_@@_table_collect_begin_tl S {##1} }
- \@@_true_c:
- < { \c_@@_table_print_tl \@@_end_Cell: }
- }
- \NC@find
- }
- }
- }
+ }
}
}
% \end{macrocode}
@@ -6002,10 +5985,11 @@ version 2005/12/01 or later.
% \begin{macrocode}
\seq_new:N \g_@@_blocks_seq
% \end{macrocode}
-% We also manage a sequence of the \emph{positions} of the blocks. Of course,
-% it's redundant with the previous sequence, but it's for efficiency. In that
+% We also manage a sequence of the \emph{positions} of the blocks. In that
% sequence, each block is represented by only the four first components:
-% |{|\textsl{imin}|}{|\textsl{jmin}|}{|\textsl{imax}|}{|\textsl{jmax}|}|.
+% |{|\textsl{imin}|}{|\textsl{jmin}|}{|\textsl{imax}|}{|\textsl{jmax}|}|. A
+% block with the key |hvlines| won't appear in that sequence (otherwise, the
+% lines in that block would not be drawn!).
% \begin{macrocode}
\seq_new:N \g_@@_pos_of_blocks_seq
% \end{macrocode}
@@ -6038,9 +6022,9 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \medskip
-% If the user has used the key |corners| (or the key |hvlines-except-corners|),
-% all the cells which are in an (empty) corner will be stored in the following
-% sequence.
+% If the user has used the key |corners| (or the key |hvlines-except-corners|,
+% even though that key is deprecated), all the cells which are in an (empty)
+% corner will be stored in the following sequence.
% \begin{macrocode}
\seq_new:N \l_@@_corners_cells_seq
% \end{macrocode}
@@ -7293,13 +7277,13 @@ version 2005/12/01 or later.
% \bigskip
% \subsection*{Important code used by \{NiceArrayWithDelims\} }
%
-% The pseudo-environment |\@@_Cell:|--|\@@_end_Cell:| will be used to format the
+% The pseudo-environment |\@@_cell_begin:w|--|\@@_cell_end:| will be used to format the
% cells of the array. In the code, the affectations are global because this
% pseudo-environment will be used in the cells of a |\halign| (via an
% environment |{array}|).
%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_Cell:
+\cs_new_protected:Npn \@@_cell_begin:w
{
% \end{macrocode}
% The token list |\g_@@_post_action_cell_tl| will be set during the
@@ -7328,7 +7312,7 @@ version 2005/12/01 or later.
% \end{macrocode}
% The content of the cell is composed in the box |\l_@@_cell_box| because we want
% to compute some dimensions of the box. The |\hbox_set_end:| corresponding to
-% this |\hbox_set:Nw| will be in the |\@@_end_Cell:| (and the potential
+% this |\hbox_set:Nw| will be in the |\@@_cell_end:| (and the potential
% |\c_math_toggle_token| also).
% \begin{macrocode}
\hbox_set:Nw \l_@@_cell_box
@@ -7462,7 +7446,7 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_end_Cell:
+\cs_new_protected:Npn \@@_cell_end:
{
\@@_math_toggle_token:
\hbox_set_end:
@@ -7644,9 +7628,9 @@ version 2005/12/01 or later.
% \smallskip
% \begin{scope}
% \color{gray}
-% \verb|\@@_draw_Cdots:nnn {2}{2}{}|
+% |\@@_draw_Cdots:nnn {2}{2}{}|
%
-% \verb|\@@_draw_Cdots:nnn {3}{2}{color=red}|
+% |\@@_draw_Cdots:nnn {3}{2}{color=red}|
% \end{scope}
%
%
@@ -7858,6 +7842,10 @@ version 2005/12/01 or later.
\cs_new_protected:Npn \@@_pre_array_ii:
{
% \end{macrocode}
+% The number of letters |X| in the preamble of the array.
+% \begin{macrocode}
+ \int_gzero:N \g_@@_total_X_weight_int
+% \end{macrocode}
% If \pkg{booktabs} is loaded, we have to patch the macro |\@BTnormal| which is
% a macro of \pkg{booktabs}. The macro |\@BTnormal| draws an horizontal rule but
% it occurs after a vertical skip done by a low level TeX command. When this
@@ -8028,7 +8016,7 @@ version 2005/12/01 or later.
% The counter |\c@jCol| will be used to count the columns of the array.
% Since we want to know the total number of columns of the matrix, we also
% create a counter |\g_@@_col_total_int|. These counters are updated in the
-% command |\@@_Cell:| executed at the beginning of each cell.
+% command |\@@_cell_begin:w| executed at the beginning of each cell.
% \begin{macrocode}
\int_gzero_new:N \g_@@_col_total_int
% \end{macrocode}
@@ -8104,7 +8092,7 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \bigskip
-% If there is a exterior row, we patch a command used in |\@@_Cell:| in order to
+% If there is a exterior row, we patch a command used in |\@@_cell_begin:w| in order to
% keep track of some dimensions needed to the construction of that ``last row''.
% \begin{macrocode}
\int_compare:nNnT \l_@@_last_row_int > { -2 }
@@ -8252,6 +8240,13 @@ version 2005/12/01 or later.
cell-space-top-limit = #1 ,
cell-space-bottom-limit = #1 ,
} ,
+ color .code:n =
+ {
+ \leavevmode \color { #1 }
+ \tl_gput_right:Nn \g_@@_row_style_tl
+ { \leavevmode \color { #1 } }
+ } ,
+ color .value_required:n = true ,
unknown .code:n = \@@_error:n { Unknown~key~for~RowStyle }
}
% \end{macrocode}
@@ -8276,7 +8271,7 @@ version 2005/12/01 or later.
{
% \end{macrocode}
% First, we give values to the LaTeX counters |iRow| and |jCol|. We remind that,
-% in the |code-before| (and in the |\CodeAfter|) they represent the numbers of
+% in the |\CodeBefore| (and in the |\CodeAfter|) they represent the numbers of
% rows and columns of the array (without the potential last row and last
% column). The value of |\g_@@_row_total_int| is the number of the last row
% (with potentially a last exterior row) and |\g_@@_col_total_int| is the number
@@ -8550,8 +8545,8 @@ version 2005/12/01 or later.
%
% The sequence |\g_@@_blocks_seq| will contain the carateristics of the blocks
% (specified by |\Block|) of the array. The sequence |\g_@@_pos_of_blocks_seq|
-% will contain only the position of the blocks. Of course, this is redundant but
-% it's for efficiency.
+% will contain only the position of the blocks (except the blocks with the key
+% |hvlines|).
% \begin{macrocode}
\seq_gclear:N \g_@@_blocks_seq
\seq_gclear:N \g_@@_pos_of_blocks_seq
@@ -8605,15 +8600,16 @@ version 2005/12/01 or later.
% \begin{macrocode}
\tl_if_empty:NF \l_@@_rules_color_tl
{ \exp_after:wN \@@_set_CT@arc@: \l_@@_rules_color_tl \q_stop }
-% \bigskip
% \end{macrocode}
+%
+% \bigskip
% The argument |#6| is the last argument of |{NiceArrayWithDelims}|. With that
% argument of type ``|t \CodeBefore|'', we test whether there is the keyword
-% |\CodeBefore| at the beginning of the environment. If that keyword is present,
-% we have now to extract all the content between that keyword |\CodeBefore| and
-% the (other) keyword |\Body|. It's the job that will do the command
-% |\@@_pre_array_i:w|. After that job, the command |\@@_pre_array_i:w| will go
-% on with |\@@_pre_array:|.
+% |\CodeBefore| at the beginning of the body of the environment. If that keyword
+% is present, we have now to extract all the content between that keyword
+% |\CodeBefore| and the (other) keyword |\Body|. It's the job that will do the
+% command |\@@_pre_array_i:w|. After that job, the command |\@@_pre_array_i:w|
+% will go on with |\@@_pre_array:|.
% \begin{macrocode}
\IfBooleanTF { #6 } \@@_pre_array_i:w \@@_pre_array:
}
@@ -8644,25 +8640,34 @@ version 2005/12/01 or later.
% \bigskip
% Now, if there is at least one |X|-column in the environment, we compute the
% width that those columns will have (in the next compilation). In fact,
-% |l_@@_X_columns_dim| will the the width of a column of weight $1$. For a
+% |l_@@_X_columns_dim| will be the width of a column of weight $1$. For a
% |X|-column of weight~$n$, the width will be |l_@@_X_columns_dim| multiplied
% by~$n$.
% \begin{macrocode}
\int_compare:nNnT \g_@@_total_X_weight_int > 0
{
- \bool_if:NTF \l_@@_X_columns_aux_bool
- { \dim_set_eq:NN \l_tmpa_dim \l_@@_X_columns_dim }
- {
- \dim_set:Nn \l_tmpa_dim
- {
- ( \l_@@_width_dim - \box_wd:N \l_@@_the_array_box )
- / \int_use:N \g_@@_total_X_weight_int
- }
- }
\tl_gput_right:Nx \g_@@_aux_tl
{
\bool_set_true:N \l_@@_X_columns_aux_bool
- \dim_set:Nn \l_@@_X_columns_dim { \dim_use:N \l_tmpa_dim }
+ \dim_set:Nn \l_@@_X_columns_dim
+ {
+ \dim_compare:nNnTF
+ {
+ \dim_abs:n
+ { \l_@@_width_dim - \box_wd:N \l_@@_the_array_box }
+ }
+ <
+ { 0.001 pt }
+ { \dim_use:N \l_@@_X_columns_dim }
+ {
+ \dim_eval:n
+ {
+ ( \l_@@_width_dim - \box_wd:N \l_@@_the_array_box )
+ / \int_use:N \g_@@_total_X_weight_int
+ + \l_@@_X_columns_dim
+ }
+ }
+ }
}
}
% \end{macrocode}
@@ -8959,10 +8964,6 @@ version 2005/12/01 or later.
}
}
% \end{macrocode}
-% The number of letters |X| in the preamble of the array.
-% \begin{macrocode}
- \int_gzero:N \g_@@_total_X_weight_int
-% \end{macrocode}
% The sequence |\g_@@_cols_vlsim_seq| will contain the numbers of the columns
% where you will to have to draw vertical lines in the potential sub-matrices
% (hence the name |vlism|).
@@ -9075,7 +9076,7 @@ version 2005/12/01 or later.
m { \@@_patch_preamble_iv:n #1 }
\@@_w: { \@@_patch_preamble_v:nnnn { } #1 }
\@@_W: { \@@_patch_preamble_v:nnnn { \cs_set_eq:NN \hss \hfil } #1 }
- \@@_true_c: { \@@_patch_preamble_vi:n #1 }
+ \@@_S: { \@@_patch_preamble_vi:n }
( { \@@_patch_preamble_vii:nn #1 }
[ { \@@_patch_preamble_vii:nn #1 }
\{ { \@@_patch_preamble_vii:nn #1 }
@@ -9119,9 +9120,9 @@ version 2005/12/01 or later.
{
\tl_gput_right:Nn \g_@@_preamble_tl
{
- > { \@@_Cell: \str_set:Nn \l_@@_hpos_cell_str { #1 } }
+ > { \@@_cell_begin:w \str_set:Nn \l_@@_hpos_cell_str { #1 } }
#1
- < \@@_end_Cell:
+ < \@@_cell_end:
}
% \end{macrocode}
%
@@ -9177,10 +9178,12 @@ version 2005/12/01 or later.
}
}
\tl_gput_right:Nx \g_@@_internal_code_after_tl
- { \@@_vline:nn { \@@_succ:n \c@jCol } { \int_use:N \l_tmpa_int } }
+ {
+ \@@_vline:nnnn
+ { \@@_succ:n \c@jCol } { \int_use:N \l_tmpa_int } { 1 } { }
+ }
\int_zero:N \l_tmpa_int
- \str_if_eq:nnT { #1 } { \q_stop }
- { \bool_gset_true:N \g_tmpb_bool }
+ \str_if_eq:nnT { #1 } { \q_stop } { \bool_gset_true:N \g_tmpb_bool }
\@@_patch_preamble:n #1
}
}
@@ -9204,13 +9207,15 @@ version 2005/12/01 or later.
c .value_forbidden:n = true ,
l .code:n = \str_set:Nn \l_@@_hpos_col_str { l } ,
l .value_forbidden:n = true ,
+ si .code:n = \str_set:Nn \l_@@_hpos_col_str { si } ,
+ si .value_forbidden:n = true ,
p .code:n = \str_set:Nn \l_@@_vpos_col_str { p } ,
p .value_forbidden:n = true ,
t .meta:n = p ,
m .code:n = \str_set:Nn \l_@@_vpos_col_str { m } ,
m .value_forbidden:n = true ,
b .code:n = \str_set:Nn \l_@@_vpos_col_str { b } ,
- b .value_forbidden:n = true
+ b .value_forbidden:n = true ,
}
% \end{macrocode}
%
@@ -9269,19 +9274,22 @@ version 2005/12/01 or later.
{
\use:x
{
- \@@_patch_preamble_iv_v:nnnn
+ \@@_patch_preamble_iv_v:nnnnnn
{ \str_if_eq:VnTF \l_@@_vpos_col_str { p } { t } { b } }
{ \dim_eval:n { #1 } }
{
% \end{macrocode}
% The parameter |\l_@@_hpos_col_str| (as |\l_@@_vpos_col_str|) exists only
-% during the contruction of the preamble. During the composition of the array
+% during the construction of the preamble. During the composition of the array
% itself, you will have, in each cell, the parameter |\l_@@_hpos_cell_str| which
-% will provide
+% will provide the horizontal alignment of the column to which belongs the cell.
% \begin{macrocode}
\str_if_eq:VnTF \l_@@_hpos_col_str j
{ \str_set:Nn \exp_not:N \l_@@_hpos_cell_str { c } }
- { \str_set:Nn \exp_not:N \l_@@_hpos_cell_str \l_@@_hpos_col_str }
+ {
+ \str_set:Nn \exp_not:N \l_@@_hpos_cell_str
+ { \l_@@_hpos_col_str }
+ }
\str_case:Vn \l_@@_hpos_col_str
{
c { \exp_not:N \centering }
@@ -9290,6 +9298,8 @@ version 2005/12/01 or later.
}
}
{ \str_if_eq:VnT \l_@@_vpos_col_str { m } \@@_center_cell_box: }
+ { \str_if_eq:VnT \l_@@_hpos_col_str { si } \siunitx_cell_begin:w }
+ { \str_if_eq:VnT \l_@@_hpos_col_str { si } \siunitx_cell_end: }
}
% \end{macrocode}
%
@@ -9313,8 +9323,12 @@ version 2005/12/01 or later.
%
% |#4| is an extra-code which contains |\l_@@_center_cell_box| (when the column
% is a |m| column) or nothing (in the other cases).
+%
+% |#5| is a code put just before the |c|.
+%
+% |#6| is a code put just after the |c|.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_patch_preamble_iv_v:nnnn #1 #2 #3 #4
+\cs_new_protected:Npn \@@_patch_preamble_iv_v:nnnnnn #1 #2 #3 #4 #5 #6
{
\tl_gput_right:Nn \g_@@_preamble_tl
{
@@ -9325,7 +9339,7 @@ version 2005/12/01 or later.
% mono-column blocks.
% \begin{macrocode}
\dim_set:Nn \l_@@_col_width_dim { #2 }
- \@@_Cell:
+ \@@_cell_begin:w
\begin { minipage } [ #1 ] { #2 }
% \end{macrocode}
% The following lines have been taken from |array.sty|.
@@ -9342,14 +9356,14 @@ version 2005/12/01 or later.
#3
% \end{macrocode}
% The following code is to allow something like |\centering| in |\RowStyle|.
-% However, there is extra vertical space if |\color{...}| is used in
-% |\RowStyle| (we should try to add a key |color| to the command |\RowStyle|.
% \begin{macrocode}
\g_@@_row_style_tl
\arraybackslash
+ #5
}
c
< {
+ #6
% \end{macrocode}
% The following line has been taken from |array.sty|.
% \begin{macrocode}
@@ -9360,7 +9374,7 @@ version 2005/12/01 or later.
% |\@@_center_cell_box:| (see just below).
% \begin{macrocode}
#4
- \@@_end_Cell:
+ \@@_cell_end:
}
}
}
@@ -9417,12 +9431,12 @@ version 2005/12/01 or later.
% \begin{macrocode}
\dim_set:Nn \l_@@_col_width_dim { #4 }
\hbox_set:Nw \l_@@_cell_box
- \@@_Cell:
+ \@@_cell_begin:w
\str_set:Nn \l_@@_hpos_cell_str { #3 }
}
c
< {
- \@@_end_Cell:
+ \@@_cell_end:
#1
\hbox_set_end:
\bool_if:NT \g_@@_rotate_bool \@@_rotate_cell_box:
@@ -9439,17 +9453,65 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \medskip
-% For |\@@_true_c:| which will appear in our redefinition of the columns of type
-% |S| (of \pkg{siunitx}).
+% For |\@@_S:|. If the user has used |S[...]|, |S| has been replaced by |\@@_S:|
+% during the first expansion of the preamble (done with the tools of standard
+% LaTeX and \pkg{array}).
% \begin{macrocode}
\cs_new_protected:Npn \@@_patch_preamble_vi:n #1
{
- \tl_gput_right:Nn \g_@@_preamble_tl { c }
+ \str_if_eq:nnTF { #1 } { [ }
+ { \@@_patch_preamble_vi_i:w [ }
+ { \@@_patch_preamble_vi_i:w [ ] { #1 } }
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_patch_preamble_vi_i:w [ #1 ]
+ { \@@_patch_preamble_vi_ii:n { #1 } }
+% \end{macrocode}
+%
+% For version of \pkg{siunitx} at least equal to 3.0, the adaptation is different
+% from previous ones. We test the version of \pkg{siunitx} by the existence of the
+% control sequence |\siunitx_cell_begin:w|. When we will decide that only the
+% previous posterior to 3.0 are supported by \pkg{nicematrix}, we will delete
+% the second definition of |\@@_patch_preamble_vi_ii:n|.
+% \begin{macrocode}
+\AtBeginDocument
+ {
+ \cs_if_exist:NTF \siunitx_cell_begin:w
+ {
+ \cs_new_protected:Npn \@@_patch_preamble_vi_ii:n #1
+ {
+ \tl_gput_right:Nn \g_@@_preamble_tl
+ {
+ > {
+ \@@_cell_begin:w
+ \keys_set:nn { siunitx } { #1 }
+ \siunitx_cell_begin:w
+ }
+ c
+ < { \siunitx_cell_end: \@@_cell_end: }
+ }
% \end{macrocode}
% We increment the counter of columns and then we test for the presence of a |<|.
% \begin{macrocode}
- \int_gincr:N \c@jCol
- \@@_patch_preamble_x:n
+ \int_gincr:N \c@jCol
+ \@@_patch_preamble_x:n
+ }
+ }
+ {
+ \cs_new_protected:Npn \@@_patch_preamble_vi_ii:n #1
+ {
+ \tl_gput_right:Nn \g_@@_preamble_tl
+ {
+ > { \@@_cell_begin:w \c_@@_table_collect_begin_tl S { #1 } }
+ c
+ < { \c_@@_table_print_tl \@@_cell_end: }
+ }
+ \int_gincr:N \c@jCol
+ \@@_patch_preamble_x:n
+ }
+ }
}
% \end{macrocode}
%
@@ -9585,7 +9647,7 @@ version 2005/12/01 or later.
%
% \medskip
% The following set of keys is for the specifier |X| in the preamble of the
-% array. Such specifier may have as key all the keys of
+% array. Such specifier may have as keys all the keys of
% |{ WithArrows / p-column }| but also a key as 1, 2, 3, etc. The following set
% of keys will be used to retrieve that value (in the counter |\l_@@_weight_int|).
% \begin{macrocode}
@@ -9617,7 +9679,7 @@ version 2005/12/01 or later.
% initial value is $1$). The user may specify a different value (such as $2$,
% $3$, etc.) by putting that value in the optional argument of the specifier.
% The weights of the |X| columns are used in the computation of the actual width
-% of those columns.
+% of those columns as in \pkg{tabu} of \pkg{tabularray}.
% \begin{macrocode}
\int_zero_new:N \l_@@_weight_int
\int_set:Nn \l_@@_weight_int { 1 }
@@ -9626,9 +9688,9 @@ version 2005/12/01 or later.
\int_gadd:Nn \g_@@_total_X_weight_int \l_@@_weight_int
% \end{macrocode}
%
-% We test whether we know the width of the |X|-columns by reading the |aux| file.
+% We test whether we know the width of the |X|-columns by reading the |aux| file
% (after the first compilation, the width of the |X|-columns is computed and
-% written on the |aux| file).
+% written in the |aux| file).
% \begin{macrocode}
\bool_if:NTF \l_@@_X_columns_aux_bool
{ \@@_patch_preamble_iv_iv:n { \l_@@_weight_int \l_@@_X_columns_dim } }
@@ -9636,7 +9698,7 @@ version 2005/12/01 or later.
\tl_gput_right:Nn \g_@@_preamble_tl
{
> {
- \@@_Cell:
+ \@@_cell_begin:w
\bool_set_true:N \l_@@_X_column_bool
% \end{macrocode}
% The following code will nullify the box of the cell.
@@ -9652,7 +9714,7 @@ version 2005/12/01 or later.
c
< {
\end { minipage }
- \@@_end_Cell:
+ \@@_cell_end:
}
}
\int_gincr:N \c@jCol
@@ -9832,9 +9894,9 @@ version 2005/12/01 or later.
{
\tl_gput_right:Nn \g_@@_preamble_tl
{
- > { \@@_Cell: \str_set:Nn \l_@@_hpos_cell_str { #1 } }
+ > { \@@_cell_begin:w \str_set:Nn \l_@@_hpos_cell_str { #1 } }
#1
- < \@@_end_Cell:
+ < \@@_cell_end:
}
% \end{macrocode}
%
@@ -9873,7 +9935,7 @@ version 2005/12/01 or later.
\tl_gput_right:Nn \g_@@_preamble_tl
{
> {
- \@@_Cell:
+ \@@_cell_begin:w
\begin { minipage } [ #1 ] { \dim_eval:n { #3 } }
\mode_leave_vertical:
\arraybackslash
@@ -9883,7 +9945,7 @@ version 2005/12/01 or later.
< {
\vrule height 0 pt depth \box_dp:N \@arstrutbox width 0 pt
\end { minipage }
- \@@_end_Cell:
+ \@@_cell_end:
}
}
% \end{macrocode}
@@ -9902,12 +9964,12 @@ version 2005/12/01 or later.
{
> {
\hbox_set:Nw \l_@@_cell_box
- \@@_Cell:
+ \@@_cell_begin:w
\str_set:Nn \l_@@_hpos_cell_str { #3 }
}
c
< {
- \@@_end_Cell:
+ \@@_cell_end:
#1
\hbox_set_end:
\bool_if:NT \g_@@_rotate_bool \@@_rotate_cell_box:
@@ -10895,7 +10957,7 @@ version 2005/12/01 or later.
\c@MaxMatrixCols
{ \@@_pred:n \l_@@_last_col_int }
}
- { > \@@_Cell: #2 < \@@_end_Cell: }
+ { > \@@_cell_begin:w #2 < \@@_cell_end: }
}
}
% \end{macrocode}
@@ -11136,16 +11198,16 @@ version 2005/12/01 or later.
% etc.) and no corners. In that case, we switch to a shortcut version of
% |\@@_vline_i:nn| and |\@@_hline:nn|.
% \begin{macrocode}
- \bool_lazy_all:nT
- {
- { \seq_if_empty_p:N \g_@@_pos_of_blocks_seq }
- { \seq_if_empty_p:N \g_@@_pos_of_xdots_seq }
- { \seq_if_empty_p:N \l_@@_corners_cells_seq }
- }
- {
- \cs_set_eq:NN \@@_vline_i:nn \@@_vline_i_complete:nn
- \cs_set_eq:NN \@@_hline_i:nn \@@_hline_i_complete:nn
- }
+ % \bool_lazy_all:nT
+ % {
+ % { \seq_if_empty_p:N \g_@@_pos_of_blocks_seq }
+ % { \seq_if_empty_p:N \g_@@_pos_of_xdots_seq }
+ % { \seq_if_empty_p:N \l_@@_corners_cells_seq }
+ % }
+ % {
+ % \cs_set_eq:NN \@@_vline_i:nn \@@_vline_i_complete:nn
+ % \cs_set_eq:NN \@@_hline_i:nn \@@_hline_i_complete:nn
+ % }
\tl_if_empty:NF \l_@@_hlines_clist \@@_draw_hlines:
\tl_if_empty:NF \l_@@_vlines_clist \@@_draw_vlines:
% \end{macrocode}
@@ -13779,7 +13841,7 @@ version 2005/12/01 or later.
}
}
% \end{macrocode}
-% This definition may seem complicated by we must remind that the number of row
+% This definition may seem complicated but we must remind that the number of row
% |\c@iRow| is incremented in the first cell of the row, \emph{after} a
% potential vertical rule on the left side of the first cell.
%
@@ -13801,26 +13863,29 @@ version 2005/12/01 or later.
% \bigskip
% The following command will be executed in the |internal-code-after|. The rule
% will be drawn \emph{before} the column |#1| (that is to say on the left side).
-% |#2| is the number of consecutive occurrences of \verb+|+.
+% |#2| is the number of consecutive occurrences of \verb+|+. |#3| and |#4| are
+% numbers of rows that define the delimitation of the horizontal rule that we
+% have to draw. If |#4| is empty, that means that the rule extends until the
+% last row.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_vline:nn #1 #2
- {
+\cs_new_protected:Npn \@@_vline:nnnn #1 #2 #3 #4
+ {
% \end{macrocode}
-% The following test is for the case where the user don't use all the columns
+% The following test is for the case where the user does not use all the columns
% specified in the preamble of the environment (for instance, a preamble of
% \verb+|c|c|c|+ but only two columns used).
% \begin{macrocode}
\int_compare:nNnT { #1 } < { \c@jCol + 2 }
{
\pgfpicture
- \@@_vline_i:nn { #1 } { #2 }
+ \@@_vline_i:nnnn { #1 } { #2 } { #3 } { #4 }
\endpgfpicture
}
}
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_vline_i:nn #1 #2
+\cs_new_protected:Npn \@@_vline_i:nnnn #1 #2 #3 #4
{
% \end{macrocode}
% |\l_tmpa_tl| is the number of row and |\l_tmpb_tl| the number of column. When
@@ -13829,7 +13894,10 @@ version 2005/12/01 or later.
% \begin{macrocode}
\tl_set:Nx \l_tmpb_tl { #1 }
\tl_clear_new:N \l_tmpc_tl
- \int_step_variable:nNn \c@iRow \l_tmpa_tl
+ \int_step_variable:nnNn
+ { #3 }
+ { \tl_if_blank:nTF { #4 } { \int_use:N \c@iRow } { #4 } }
+ \l_tmpa_tl
{
% \end{macrocode}
% The boolean |\g_tmpa_bool| indicates whether the small vertical rule will be
@@ -13845,8 +13913,7 @@ version 2005/12/01 or later.
{ \@@_test_vline_in_block:nnnn ##1 }
\seq_map_inline:Nn \g_@@_pos_of_stroken_blocks_seq
{ \@@_test_vline_in_stroken_block:nnnn ##1 }
- \clist_if_empty:NF \l_@@_corners_clist
- \@@_test_in_corner_v:
+ \clist_if_empty:NF \l_@@_corners_clist \@@_test_in_corner_v:
\bool_if:NTF \g_tmpa_bool
{
\tl_if_empty:NT \l_tmpc_tl
@@ -13873,7 +13940,7 @@ version 2005/12/01 or later.
{ #1 }
{ #2 }
\l_tmpc_tl
- { \int_use:N \c@iRow }
+ { \tl_if_blank:nTF { #4 } { \int_use:N \c@iRow } { #4 } }
\tl_clear:N \l_tmpc_tl
}
}
@@ -13988,7 +14055,7 @@ version 2005/12/01 or later.
{
\tl_if_eq:NnF \l_@@_vlines_clist { all }
{ \clist_if_in:NnT \l_@@_vlines_clist { ##1 } }
- { \@@_vline:nn { ##1 } 1 }
+ { \@@_vline:nnnn { ##1 } 1 1 { } }
}
}
% \end{macrocode}
@@ -14000,18 +14067,20 @@ version 2005/12/01 or later.
% \bigskip
% The following command will be executed in the |internal-code-after|. The rule
% will be drawn \emph{before} the row |#1|. |#2| is the number of consecutive
-% occurrences of |\Hline|.
+% occurrences of |\Hline|. |#3| and |#4| are numbers of columns that define the
+% delimitation of the horizontal rule that we have to draw. If |#4| is empty,
+% that means that the rule extends until the last column.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_hline:nn #1 #2
+\cs_new_protected:Npn \@@_hline:nnnn #1 #2 #3 #4
{
\pgfpicture
- \@@_hline_i:nn { #1 } { #2 }
+ \@@_hline_i:nnnn { #1 } { #2 } { #3 } { #4 }
\endpgfpicture
}
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_hline_i:nn #1 #2
+\cs_new_protected:Npn \@@_hline_i:nnnn #1 #2 #3 #4
{
% \end{macrocode}
% |\l_tmpa_tl| is the number of row and |\l_tmpb_tl| the number of column. When
@@ -14020,7 +14089,10 @@ version 2005/12/01 or later.
% \begin{macrocode}
\tl_set:Nn \l_tmpa_tl { #1 }
\tl_clear_new:N \l_tmpc_tl
- \int_step_variable:nNn \c@jCol \l_tmpb_tl
+ \int_step_variable:nnNn
+ { #3 }
+ { \tl_if_blank:nTF { #4 } { \int_use:N \c@jCol } { #4 } }
+ \l_tmpb_tl
{
% \end{macrocode}
% The boolean |\g_tmpa_bool| indicates whether the small horizontal rule will be
@@ -14063,7 +14135,7 @@ version 2005/12/01 or later.
{ #1 }
{ #2 }
\l_tmpc_tl
- { \int_use:N \c@jCol }
+ { \tl_if_blank:nTF { #4 } { \int_use:N \c@jCol } { #4 } }
\tl_clear:N \l_tmpc_tl
}
}
@@ -14172,7 +14244,7 @@ version 2005/12/01 or later.
{
\tl_if_eq:NnF \l_@@_hlines_clist { all }
{ \clist_if_in:NnT \l_@@_hlines_clist { ##1 } }
- { \@@_hline:nn { ##1 } 1 }
+ { \@@_hline:nnnn { ##1 } 1 1 { } }
}
}
% \end{macrocode}
@@ -14209,7 +14281,7 @@ version 2005/12/01 or later.
+ \doublerulesep * ( \int_max:nn 0 { #1 - 1 } )
}
\tl_gput_right:Nx \g_@@_internal_code_after_tl
- { \@@_hline:nn { \@@_succ:n { \c@iRow } } { #1 } }
+ { \@@_hline:nnnn { \@@_succ:n { \c@iRow } } { #1 } 1 { } }
\ifnum 0 = `{ \fi }
}
% \end{macrocode}
@@ -15150,7 +15222,7 @@ version 2005/12/01 or later.
b .code:n = \str_set:Nn \l_@@_vpos_of_block_tl b ,
b .value_forbidden:n = true ,
color .tl_set:N = \l_@@_color_tl ,
- color .value_required:n = true ,
+ color .value_required:n = true
}
% \end{macrocode}
%
@@ -15627,21 +15699,14 @@ version 2005/12/01 or later.
\cs_new_protected:Npn \@@_Block_v:nnnnnn #1 #2 #3 #4 #5 #6
{
% \end{macrocode}
-% The sequence of the positions of the blocks will be used when drawing the rules
-% (in fact, there is also the |\multicolumn| and the |\diagbox| in that sequence).
-% \begin{macrocode}
- \seq_gput_left:Nn \g_@@_pos_of_blocks_seq { { #1 } { #2 } { #3 } { #4 } }
-% \end{macrocode}
-%
% The group is for the keys.
% \begin{macrocode}
\group_begin:
\keys_set:nn { NiceMatrix / Block / SecondPass } { #5 }
% \end{macrocode}
%
-%
% \begin{macrocode}
- \bool_if:NT \l_@@_hvlines_block_bool
+ \bool_if:NTF \l_@@_hvlines_block_bool
{
\tl_gput_right:Nx \g_nicematrix_code_after_tl
{
@@ -15651,6 +15716,15 @@ version 2005/12/01 or later.
{ \int_use:N \l_@@_last_row_int - \int_use:N \l_@@_last_col_int }
}
}
+ {
+% \end{macrocode}
+% The sequence of the positions of the blocks (excepted the blocks with the key
+% |hvlines|) will be used when drawing the rules (in fact, there is also the
+% |\multicolumn| and the |\diagbox| in that sequence).
+% \begin{macrocode}
+ \seq_gput_left:Nn \g_@@_pos_of_blocks_seq
+ { { #1 } { #2 } { #3 } { #4 } }
+ }
% \end{macrocode}
%
% \begin{macrocode}
@@ -16096,7 +16170,7 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
-
+%
% \bigskip
% The first argument of |\@@_hvlines_block:nnn| is a list of options for the
% rules that we will draw. The second argument is the upper-left cell of the
@@ -16113,40 +16187,16 @@ version 2005/12/01 or later.
\@@_cut_on_hyphen:w #3 \q_stop
\tl_set:Nx \l_tmpa_tl { \int_eval:n { \l_tmpa_tl + 1 } }
\tl_set:Nx \l_tmpb_tl { \int_eval:n { \l_tmpb_tl + 1 } }
- \pgfpicture
- \pgfrememberpicturepositiononpagetrue
- \pgf@relevantforpicturesizefalse
- \CT@arc@
- \pgfsetlinewidth { 1.1 \l_@@_line_width_dim }
-% \end{macrocode}
-% First, the vertical rules.
-% \begin{macrocode}
- \@@_qpoint:n { row - \l_tmpa_tl }
- \dim_set_eq:NN \l_tmpa_dim \pgf@y
- \@@_qpoint:n { row - \l_tmpc_tl }
- \dim_set_eq:NN \l_tmpb_dim \pgf@y
\int_step_inline:nnn \l_tmpd_tl \l_tmpb_tl
- {
- \@@_qpoint:n { col - ##1 }
- \pgfpathmoveto { \pgfpoint \pgf@x \l_tmpa_dim }
- \pgfpathlineto { \pgfpoint \pgf@x \l_tmpb_dim }
- \pgfusepathqstroke
- }
-% \end{macrocode}
-% Now, the horizontal rules.
-% \begin{macrocode}
- \@@_qpoint:n { col - \l_tmpb_tl }
- \dim_set:Nn \l_tmpa_dim { \pgf@x + 0.5 \arrayrulewidth }
- \@@_qpoint:n { col - \l_tmpd_tl }
- \dim_set:Nn \l_tmpb_dim { \pgf@x - 0.5 \arrayrulewidth }
+ {
+ \use:x
+ { \@@_vline:nnnn { ##1 } 1 { \l_tmpc_tl } { \@@_pred:n \l_tmpa_tl } }
+ }
\int_step_inline:nnn \l_tmpc_tl \l_tmpa_tl
- {
- \@@_qpoint:n { row - ##1 }
- \pgfpathmoveto { \pgfpoint \l_tmpa_dim \pgf@y }
- \pgfpathlineto { \pgfpoint \l_tmpb_dim \pgf@y }
- \pgfusepathqstroke
- }
- \endpgfpicture
+ {
+ \use:x
+ { \@@_hline:nnnn { ##1 } 1 { \l_tmpd_tl } { \@@_pred:n \l_tmpb_tl } }
+ }
}
% \end{macrocode}
%
@@ -17562,8 +17612,8 @@ version 2005/12/01 or later.
% \begin{macrocode}
\@@_msg_new:nn { Unknown~key~for~RowStyle }
{
- As~for~now,~there~is~only~three~keys~available~here:~'cell-space-top-limit',~
- 'cell-space-bottom-limit~and~'cell-space-limits'~(and~you~try~to~use~
+ As~for~now,~there~is~only~four~keys~available~here:~'cell-space-top-limit',~
+ 'cell-space-bottom-limit~'cell-space-limits'~and~color~(and~you~try~to~use~
'\l_keys_key_str').~If~you~go~on,~this~key~will~be~ignored.
}
% \end{macrocode}
@@ -18705,6 +18755,14 @@ version 2005/12/01 or later.
%
% The key |define-L-C-R| has been deleted.
%
+%
+% \subsection*{Changes between versions 6.0 and 6.1}
+%
+% Better computation of the widths of the |X| columns.
+%
+% Key |\color| for the command |\RowStyle|.
+%
+%
% \PrintIndex
%
% \tableofcontents
diff --git a/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf
index 12158c8954..026c149a49 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix.pdf
Binary files differ
diff --git a/macros/latex/contrib/phonenumbers/README b/macros/latex/contrib/phonenumbers/README
index 7d743b9cf3..d39c143524 100644
--- a/macros/latex/contrib/phonenumbers/README
+++ b/macros/latex/contrib/phonenumbers/README
@@ -9,8 +9,8 @@ number is valid according to the national rules. It also allows to link phone
numbers using the hyperref package.
Package author: K. Wehr
-Version: 2.2
-Date: 18th August 2019
+Version: 2.3
+Date: 20th August 2021
The phonenumbers package is subject to the LaTeX Project Public License,
version 1.3 or later.
diff --git a/macros/latex/contrib/phonenumbers/doc/Literatur.bib b/macros/latex/contrib/phonenumbers/doc/Literatur.bib
index 512f9aeee0..ff0bc59087 100644
--- a/macros/latex/contrib/phonenumbers/doc/Literatur.bib
+++ b/macros/latex/contrib/phonenumbers/doc/Literatur.bib
@@ -1,5 +1,5 @@
% phonenumbers package: references
-% Datum: 5. August 2018
+% Datum: 20. August 2021
@book{duden,
title = {Duden},
subtitle = {Die deutsche Rechtschreibung},
@@ -26,7 +26,7 @@
author = {{Bundesnetzagentur}},
title = {Preisfestlegungsverfahren für (0)137},
date = {2007-08-15},
- url = {https://www.bundesnetzagentur.de/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Nummerierung/Rufnummern/0137/Preisfestsetzungsverfahren/PreisfestlegungsVerfhrn0137_Basepage.html?nn=268384}
+ url = {https://www.bundesnetzagentur.de/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Nummerierung/0137/Preisfestsetzungsverfahren/PreisfestlegungsVerfhrn0137_Basepage.html?nn=326370}
}
@online{BNA-01801,
@@ -38,9 +38,9 @@
@online{BNA-01806,
author = {{Bundesnetzagentur}},
- title = {(0)180 Rufnummern für Service-Dienste; Rufnummernteilbereich (0)180-6 und (0)180-7; Preisfestlegung und Veröffentlichung nach §\,67 Abs. 2 TKG},
+ title = {(0)180 Rufnummern für Service-Dienste; Rufnummernteilbereiche (0)180-6 und (0)180-7; Preisfestlegung und Veröffentlichung nach §\,67 Abs. 2 TKG},
date = {2012-08-08},
- url = {https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Nummerierung/Rufnummern/0180/Preisfestlegung%20(0)180-6%20und%20(0)180-7.pdf?__blob=publicationFile&v=1}
+ url = {https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Nummerierung/Rufnummern/0180/Preisfestlegung0180-6_0180-7.pdf?__blob=publicationFile&v=1}
}
@online{BNA-019,
@@ -66,76 +66,75 @@
@online{BNA-ortsvorwahlen,
author = {{Bundesnetzagentur}},
- title = {Verzeichnis der Ortsnetze der Bundesrepublik Deutschland},
- subtitle = {Liste der Ortsnetzkennzahlen in numerischer Folge},
+ title = {Ortsnetzkennzahlen in nummerischer Reihenfolge},
date = {2010-12-31},
- url = {http://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Nummerierung/Rufnummern/ONVerzeichnisse/ONBVerzeichnis/B-ListeOrtsnetzenumerisch.pdf?__blob=publicationFile&v=3},
+ url = {https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Nummerierung/Rufnummern/ONRufnr/ONK_num.pdf?__blob=publicationFile&v=1}
}
@online{BNA-mobil,
author = {{Bundesnetzagentur}},
title = {Mobile Dienste, zugeteilte RNB},
- date = {2017-10-24},
- url = {http://www.bundesnetzagentur.de/cln_1432/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Nummerierung/Rufnummern/MobileDienste/zugeteilte%20RNB/MobileDiensteBelegteRNB_Basepage.html?nn=268384#download=1}
+ date = {2021-07-07},
+ url = {https://www.bundesnetzagentur.de/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Nummerierung/MobileDienste/zugeteilte%20RNB/MobileDiensteBelegteRNB_Basepage.html?nn=397488#download=1}
}
@online{BNA-Struktur,
author = {{Bundesnetzagentur}},
title = {Struktur und Ausgestaltung des Nummernbereichs für Ortsnetzrufnummern},
- date = {2017-12-20},
- url = {https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Nummerierung/Rufnummern/ONRufnr/Vfg_25_2006_konsFassung.pdf?__blob=publicationFile&v=2}
+ date = {2020-05-06},
+ url = {https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Nummerierung/Rufnummern/ONRufnr/Vfg_25_2006_konsFassung.pdf?__blob=publicationFile&v=8}
}
@online{RTR-Liste,
author = {{Rundfunk- und Telekom-Regulierungs-GmbH}},
title = {Presentation of E.164 National Numbering for Country Code 43, Austria},
date = {2011-03-30},
- url = {https://www.rtr.at/de/tk/E129/Austrian_Numbering_Plan_2011-03-30.pdf}
+ url = {https://www.rtr.at/TKP/was_wir_tun/telekommunikation/nummerierung/Austrian_Numbering_Plan_2011-03-30.pdf}
}
@online{RTR-Verordnung,
author = {{Rundfunk- und Telekom-Regulierungs-GmbH}},
- title = {Aktuelle Fassung der Kommunikationsparameter-, Entgelt- und Mehrwertdiensteverordnung 2009},
+ title = {Kommunikationsparameter-, Entgelt- und Mehrwertdiensteverordnung 2009},
date = {2017-10-25},
- url = {https://www.rtr.at/de/tk/KEMV2009kons}
+ url = {https://www.ris.bka.gv.at/GeltendeFassung.wxe?Abfrage=Bundesnormen&Gesetzesnummer=20006383}
}
@inreference{wikipedia-AT,
title = {Telefonvorwahl (Österreich)},
booktitle = {Wikipedia},
booksubtitle = {Die freie Enzyklopädie},
- date = {2018-06-19},
- url = {https://de.wikipedia.org/wiki/Telefonvorwahl_(%C3%96sterreich)}
+ url = {https://de.wikipedia.org/wiki/Telefonvorwahl_(%C3%96sterreich)},
+ urldate = {2021-08-18}
}
@online{ARCEP,
author = {{Autorité de régulation des communications électroniques et des postes}},
- title = {Plan national de numérotation téléphonique},
- date = {2015-10-22},
- url = {http://www.arcep.fr/uploads/tx_gsavis/05-1085.pdf}
+ title = {Plan national de numérotation},
+ date = {2019-08-01},
+ url = {https://www.arcep.fr/uploads/tx_gsavis/19-0954.pdf}
}
@inreference{wikipedia-FR-fr,
title = {Plan de numérotation en France},
booktitle = {Wikipédia en fran\c{c}ais},
- date = {2018-07-11},
url = {https://fr.wikipedia.org/wiki/Plan_de_num%C3%A9rotation_en_France},
+ urldate = {2021-08-18}
}
@inreference{wikipedia-FR-de,
title = {Telefonvorwahl (Frankreich)},
booktitle = {Wikipedia},
booksubtitle = {Die freie Enzyklopädie},
- date = {2017-11-22},
- url = {https://de.wikipedia.org/wiki/Telefonvorwahl_(Frankreich)}
+ url = {https://de.wikipedia.org/wiki/Telefonvorwahl_(Frankreich)},
+ urldate = {2021-08-18}
}
@inreference{wikipedia-NANP,
title = {North American Numbering Plan},
booktitle = {Wikipedia},
booksubtitle = {The Free Encyclopedia},
- date = {2018-07-15},
- url = {https://en.wikipedia.org/wiki/North_American_Numbering_Plan}
+ url = {https://en.wikipedia.org/wiki/North_American_Numbering_Plan},
+ urldate = {2021-08-16}
}
@inreference{wikipedia-conventions,
@@ -150,41 +149,41 @@
author = {{North American Numbering Plan Association}},
title = {Geographic NPAs in Service Sorted by Number},
url = {https://www.nationalnanpa.com/enas/geoAreaCodeNumberReport.do},
- urldate = {2018-07-29}
+ urldate = {2021-08-16}
}
@online{NANPA-non-geographic,
author = {{North American Numbering Plan Association}},
title = {Non-Geographic NPAs in Service},
url = {https://www.nationalnanpa.com/enas/nonGeoNpaServiceReport.do},
- urldate = {2018-07-29}
+ urldate = {2021-08-16}
}
@online{NANPA-ten-years,
author = {{North American Numbering Plan Association}},
title = {NPAs Introduced over the Last 10 Years},
url = {https://www.nationalnanpa.com/enas/npasOverLast10YearsReport.do},
- urldate = {2018-07-29}
+ urldate = {2021-08-16}
}
@online{NANPA-not-yet,
author = {{North American Numbering Plan Association}},
title = {Planned NPAs Not Yet in Service},
url = {https://www.nationalnanpa.com/enas/plannedNpasNotInServiceReport.do},
- urldate = {2018-07-29}
+ urldate = {2021-08-16}
}
@online{NANPA-ten-digit,
author = {{North American Numbering Plan Association}},
title = {Area Codes Requiring 10 Digit Dialing},
url = {https://www.nationalnanpa.com/enas/npasRequiring10DigitReport.do},
- urldate = {2018-07-29}
+ urldate = {2021-08-16}
}
@online{hyperref,
author = {Sebastian Rahtz and Heiko Oberdiek},
title = {hyperref},
- version = {6.86},
+ version = {7.00},
url = {http://ctan.org/pkg/hyperref}
}
@@ -206,27 +205,27 @@
title = {Telephone numbers in the United Kingdom},
booktitle = {Wikipedia},
booksubtitle = {The Free Encyclopedia},
- date = {2018-07-18},
- url = {https://en.wikipedia.org/wiki/Telephone_numbers_in_the_United_Kingdom}
+ url = {https://en.wikipedia.org/wiki/Telephone_numbers_in_the_United_Kingdom},
+ urldate = {2021-08-17}
}
@online{UK-formatting,
title = {Phone Number Formatting},
subtitle = {How to write UK telephone numbers},
url = {http://www.area-codes.org.uk/formatting.php},
- urldate = {2018-07-30}
+ urldate = {2021-08-17}
}
@online{UK-area-codes,
title = {UK Area Codes and Phone Number Information},
url = {http://www.area-codes.org.uk/},
- urldate = {2018-07-30}
+ urldate = {2021-08-17}
}
@online{Ofcom-plan,
author = {Ofcom},
title = {The National Telephone Numbering Plan},
- date = {2018-04-26},
+ date = {2021-01-04},
url = {https://www.ofcom.org.uk/__data/assets/pdf_file/0013/102613/national-numbering-plan.pdf}
}
@@ -234,5 +233,5 @@
author = {Ofcom},
title = {Ofcom Numbering Site},
url = {http://static.ofcom.org.uk/static/numbering/index.htm},
- urldate = {2018-07-30}
+ urldate = {2021-08-17}
}
diff --git a/macros/latex/contrib/phonenumbers/doc/phonenumbers-de.pdf b/macros/latex/contrib/phonenumbers/doc/phonenumbers-de.pdf
index 2844e5790a..bc0f466a74 100644
--- a/macros/latex/contrib/phonenumbers/doc/phonenumbers-de.pdf
+++ b/macros/latex/contrib/phonenumbers/doc/phonenumbers-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/phonenumbers/doc/phonenumbers-de.tex b/macros/latex/contrib/phonenumbers/doc/phonenumbers-de.tex
index 386d2b7702..ea51e371aa 100644
--- a/macros/latex/contrib/phonenumbers/doc/phonenumbers-de.tex
+++ b/macros/latex/contrib/phonenumbers/doc/phonenumbers-de.tex
@@ -1,6 +1,6 @@
% phonenumbers package: German manual
-% Version 2.2
-% Datum: 18. August 2019
+% Version 2.3
+% Datum: 20. August 2021
\documentclass[numbers=noenddot]{scrreprt}
\usepackage[french,ngerman]{babel}
\usepackage{fontspec}
@@ -12,7 +12,6 @@
\usepackage{scrlayer-scrpage}
\usepackage{multicol}
\usepackage{metalogo}
-\usepackage[toc]{multitoc}
\usepackage[ngerman]{isodate}
\usepackage{cnltx-example}
\usepackage{cnltx-tools}
@@ -46,8 +45,8 @@
\renewcommand\@pnumwidth{2em}
\makeatother
-\DeclareTOCStyleEntry[raggedentrytext=on]{tocline}{chapter}
-\DeclareTOCStyleEntry[raggedentrytext=on]{tocline}{section}
+\BeforeStartingTOC{\begin{multicols}{2}}
+\AfterStartingTOC{\end{multicols}}
\addbibresource{Literatur.bib}
@@ -72,7 +71,7 @@
\makeatother
\DeclareNewLayer[background,bottommargin,mode=picture,hoffset=7cm,
- contents={\includegraphics{Telefonhörer}}]{Telefonebene}
+ contents={\includegraphics{Telefonhoerer}}]{Telefonebene}
\AddLayersToPageStyle{plain}{Telefonebene}
\AddLayersToPageStyle{scrheadings}{Telefonebene}
@@ -184,19 +183,25 @@ Am Ende der Teilnehmerrufnummer kann eine abgetrennte Durchwahlnummer stehen, di
\includegraphics{Titelbild-de}
\vfill
-\Large
+\large
\textit{Paketautor}
-\medskip
+\smallskip
Keno Wehr
-\large
+\bigskip
+\textit{Fehlermeldungen}
+
\smallskip
-\url{wehr@abgol.de}
+\normalsize
+\url{https://github.com/wehro/phonenumbers/issues}
\end{center}
-\vfill
+\bigskip
\noindent Dieses Paket ermöglicht es, Telefonnummern unterschiedlichen nationalen Konventionen entsprechend zu setzen und bei Bedarf auch zu verlinken. Unterstützt werden deutsche, österreichische, französische, britische und nordamerikanische Telefonnummern. Nummern aus anderen Ländern werden rudimentär unterstützt.
+
+\bigskip
+\noindent An English version of this manual is available in the file \texttt{phonenumbers-en.pdf}.
\end{titlepage}
\tableofcontents
@@ -212,7 +217,7 @@ Keno Wehr
\phonenumber[area-code-sep=brackets]{020432632194}
\end{sidebyside}
\begin{sidebyside}
- \phonenumber[area-code=place,area-code-sep=space]{0409188423}
+ \phonenumber[area-code=place,area-code-sep=space]{04066969123}
\end{sidebyside}
\begin{sidebyside}
\phonenumber[foreign]{0209576342}
@@ -237,13 +242,13 @@ Keno Wehr
\section{Frankreich}
\begin{sidebyside}
- \phonenumber[country=FR]{0123456789}
+ \phonenumber[country=FR]{0199006789}
\end{sidebyside}
\begin{sidebyside}
- \phonenumber[country=FR,area-code=place-and-number]{0123456789}
+ \phonenumber[country=FR,area-code=place-and-number]{0199006789}
\end{sidebyside}
\begin{sidebyside}
- \phonenumber[country=FR,foreign]{0123456789}
+ \phonenumber[country=FR,foreign]{0199006789}
\end{sidebyside}
\section{Großbritannien}
@@ -292,11 +297,11 @@ Das Ziel des Pakets \phone\ ist es, das Setzen von Telefonnummern zu ermögliche
Beispielsweise werden in den meisten Ländern Vorwahlen graphisch von der Rufnummer getrennt. Für die Darstellung der Telefonnummer mit dem Paket \phone\ braucht der Nutzer nicht zu wissen, welche Ziffern zur Vorwahl und welche zur Rufnummer gehören. Das Paket kennt alle Vorwahlen der unterstützten Länder und stellt diese automatisch richtig dar.
\begin{sidebyside}
- \phonenumber{0305226789}
+ \phonenumber{03023125789}
\end{sidebyside}
Hier wurden die ersten drei Ziffern als Vorwahl von Berlin erkannt. Dagegen können im folgenden Beispiel die ersten sechs Ziffern als Vorwahl von Bad Schandau identifiziert werden.
\begin{sidebyside}
- \phonenumber{0350226789}
+ \phonenumber{03502225789}
\end{sidebyside}
Das Paket hat nicht das Ziel, eine bestimmte Norm umzusetzen; es orientiert sich an den üblichen Gepflogenheiten zur Darstellung von Telefonnummern. Durch das Setzen von Optionen kann der Anwender das Land festlegen, aus dem die Telefonnummer stammt, sowie zwischen mehreren Formatierungsvarianten wählen. Hierzu zählt auch die zusätzliche Ausgabe der Auslandsvorwahl.
@@ -313,7 +318,7 @@ Setzt die \meta{Optionen} für alle folgenden Telefonnummern, für die nichts an
Setzt eine Telefonnummer. Die \meta{Optionen} gelten nur für diese Telefonnummer.
Die \meta{Nummer} kann im lokalen oder im internationalen Format eingegeben werden. Das lokale Format ist nur für unterstützte Länder möglich; das zugehörige Land ist durch die Option
-\option{country}
+\option{country}
festzulegen
\vglAbschnitt{optionen-allgemein}.
Das internationale Format beginnt stets mit
@@ -379,15 +384,15 @@ Gibt an, ob und in welcher Form die Auslandsvorwahl ausgegeben werden soll.
Mit \code{foreign=international} oder einfach \code{foreign} erhält man eine Auslandsvorwahl, die aus einem Pluszeichen gefolgt von der Landeskennzahl (z.\,B. 49 für deutsche Nummern) besteht. In dieser Form kann sie auf Mobiltelefonen direkt verwendet werden. Im Festnetz muss das + durch die am Ort des Anrufers verwendeten internationalen Verkehrsausscheidungsziffern ersetzt werden.
\begin{sidebyside}
- \phonenumber[foreign=international]{0305226789}
+ \phonenumber[foreign=international]{03023125789}
\end{sidebyside}
Die Variante \code{american} lässt die Auslandsvorwahl mit 011 beginnen, den in Nordamerika gebräuchlichen internationalen Verkehrsausscheidungsziffern.
\begin{sidebyside}
- \phonenumber[foreign=american]{0305226789}
+ \phonenumber[foreign=american]{03023125789}
\end{sidebyside}
Bei Auswahl von \code{european} beginnt die Nummer mit einer Doppelnull, wie sie in den meisten Ländern Europas und weiteren Teilen der Welt verwendet wird.
\begin{sidebyside}
- \phonenumber[foreign=european]{0305226789}
+ \phonenumber[foreign=european]{03023125789}
\end{sidebyside}
Bei Nummern aus nicht unterstützten Ländern wird die Wahl
@@ -413,7 +418,7 @@ Legt das Heimatland fest. Für Nummern aus diesem Land wird unabhängig vom Wert
\begin{sidebyside}
\setphonenumbers{foreign,home-country=FR}
\phonenumber[country=DE]{0441343396} \\
- \phonenumber[country=FR]{0123456789} \\
+ \phonenumber[country=FR]{0199006789} \\
\phonenumber[country=US]{2125550123}
\end{sidebyside}
@@ -427,7 +432,7 @@ Vor der Heimatvorwahl sollte das Heimatland mit der Option \option{home-country}
\setphonenumbers{home-country=US,home-area-code=242,foreign}
\phonenumber[country=US]{2125550123} \\
\phonenumber[country=US]{2425550124} \\
- \phonenumber[country=DE]{02581639737}
+ \phonenumber[country=DE]{0258163970}
\end{sidebyside}
Die Angabe einer Heimatvorwahl ist nur für Gebiete zulässig, in denen die Vorwahl bei Ortsgesprächen weggelassen werden kann.
\end{Befehlsliste}
@@ -486,15 +491,15 @@ Der zugehörige Tarif kann mit Hilfe der Option
\OptionsvariantenAreaCodeSep
\OptionsbeschreibungAreaCodeSep
\begin{sidebyside}
- \phonenumber[area-code-sep=space]{02581639737} \\
- \phonenumber[area-code-sep=hyphen]{01738642753}
+ \phonenumber[area-code-sep=space]{0258163970} \\
+ \phonenumber[area-code-sep=hyphen]{01749091317}
\end{sidebyside}
\WertbeschreibungBrackets
\begin{sidebyside}
\setphonenumbers{area-code-sep=brackets}
\phonenumber{02581639737} \\
- \phonenumber{01738642753}
+ \phonenumber{01749091317}
\end{sidebyside}
\HinweisForeignAreaCodeSep
@@ -505,7 +510,7 @@ Der zugehörige Tarif kann mit Hilfe der Option
\begin{sidebyside}
\setphonenumbers{area-code=place}
\phonenumber{08942630845} \\
- \phonenumber{01738642753} \\
+ \phonenumber{01749091317} \\
\phonenumber[foreign]{04414363524}
\end{sidebyside}
@@ -513,7 +518,7 @@ Der zugehörige Tarif kann mit Hilfe der Option
\begin{sidebyside}
\setphonenumbers{area-code=place-and-number}
\phonenumber{08942630845} \\
- \phonenumber{01738642753} \\
+ \phonenumber{01749091317} \\
\phonenumber{01803635341} \\
\phonenumber[foreign]{04414363524}
\end{sidebyside}
@@ -679,20 +684,26 @@ Er gilt hingegen nicht für die Pazifikgebiete Wallis und Futuna, Französisch-P
\UeberschriftAufbau
Französische Telefonnummern sind generell zehnstellig und werden in Zweiergruppen gegliedert. Die erste Ziffer ist immer eine 0.
\begin{sidebyside}
- \phonenumber[country=FR]{0123456789}
+ \phonenumber[country=FR]{0199006789}
\end{sidebyside}
-Die zweite Ziffer ermöglicht die Zuordnung der Nummer zu einem von fünf geographischen Bereichen bzw. einer besonderen Verwendung (z.\,B. Mobilfunk). Die folgenden Stellen erlauben prinzipiell eine genauere geographische Zuordnung der Nummer, doch macht das Paket \phone\ hiervon nur zur Identifikation von Nummern aus Überseegebieten Gebrauch
+Die zweite Ziffer ermöglicht die Zuordnung der Nummer zu einem von fünf geographischen Bereichen bzw. einer besonderen Verwendung (z.\,B. Mobilfunk). Bestimmte Nummerngruppen sind für Überseegebiete reserviert
\vglAnhang{vorwahlen-FR}.
\begin{sidebyside}
\setphonenumbers{country=FR,area-code=place-and-number}
- \phonenumber{0123456789} \\
- \phonenumber{0512345678} \\
+ \phonenumber{0199006789} \\
+ \phonenumber{0536495678} \\
\phonenumber{0596123456}
\end{sidebyside}
Bei Anrufen aus dem Ausland entfällt die führende 0 der Rufnummer.
\begin{sidebyside}
- \phonenumber[country=FR,foreign]{0123456789}
+ \phonenumber[country=FR,foreign]{0199006789}
+\end{sidebyside}
+
+Nummern für die maschinelle Kommunikation, die mit 07\,00 beginnen, haben mehr als zehn Ziffern. Sie sind im Mutterland 14-stellig, in den Überseegebieten 13-stellig \cite[19]{ARCEP}.
+\begin{sidebyside}
+ \phonenumber[country=FR]{07000123456789} \\
+ \phonenumber[country=FR]{0700512345678}
\end{sidebyside}
Einige Firmen und Institutionen haben vierstellige Kurznummern, die stets mit einer 3 beginnen.
@@ -717,19 +728,19 @@ Die erste Nummer im folgenden Beispiel stammt aus Mayotte und verwendet daher di
\begin{sidebyside}
\setphonenumbers{country=FR,foreign}
\phonenumber{0269123456} \\
- \phonenumber{0296123456}
+ \phonenumber{0261913456}
\end{sidebyside}
Die Auslandsvorwahl führt für einige Gebiete zu einer Verdopplung der ersten drei Ziffern, z.\,B. im Fall von Martinique (Regionalvorwahl 05\,96).
\begin{sidebyside}
\phonenumber[country=FR,foreign]{0596123456}
\end{sidebyside}
-Dagegen entfällt für Saint-Pierre und Miquelon die Regionalvorwahl 05\,08 bei Auslandsanrufen vollständig \cite[4]{ARCEP}.
+Dagegen entfällt für Saint-Pierre und Miquelon die Regionalvorwahl 05\,08 bei Auslandsanrufen vollständig \cite[13]{ARCEP}.
\begin{sidebyside}
\phonenumber[country=FR,foreign]{0508123456}
\end{sidebyside}
-In Saint-Pierre und Miquelon ist es außerdem möglich, bei lokalen Gesprächen die Vorwahl wegzulassen und nur sechs Ziffern zu wählen \cite[4]{ARCEP}.
+In Saint-Pierre und Miquelon ist es außerdem möglich, bei lokalen Gesprächen die Vorwahl wegzulassen und nur sechs Ziffern zu wählen \cite[13]{ARCEP}.
\begin{sidebyside}
\setphonenumbers{country=FR,home-area-code=0508}
\phonenumber{0508123456}
@@ -744,30 +755,31 @@ Da dies in anderen Gebieten Frankreichs nicht möglich ist, ist \code{0508} der
\WertbeschreibungPlaceAndNumber
\begin{sidebyside}
\setphonenumbers{country=FR,area-code=place-and-number}
- \phonenumber{0123456789} \\
+ \phonenumber{0199006789} \\
\phonenumber{0596123456} \\
\phonenumber{0612345678} \\
- \phonenumber[foreign]{0123456789}
+ \phonenumber[foreign]{0199006789}
\end{sidebyside}
\WertbeschreibungPlace
\ Da die Vorwahl in Frankreich stets mitgewählt werden muss, ist von der Verwendung dieser Option abzuraten.
\begin{sidebyside}
\setphonenumbers{country=FR,area-code=place}
- \phonenumber{0123456789} \\
+ \phonenumber{0199006789} \\
\phonenumber{0596123456} \\
\phonenumber{0612345678} \\
- \phonenumber[foreign]{0123456789}
+ \phonenumber[foreign]{0199006789}
\end{sidebyside}
\end{Befehlsliste}
\UeberschriftUngueltig
\WarnungWenn
\begin{itemize}
-\item die Nummer nicht genau 10 oder 4 Stellen hat,
+\item die Nummer nicht genau 10 oder 4 Stellen hat (außer bei Nummern, die mit 07\,00 beginnen),
\item eine Nummer mit 10 Stellen nicht mit einer 0 beginnt,
\item eine Nummer mit 4 Stellen nicht mir einer 3 beginnt,
-\item eine Nummer mit 10 Stellen keine gültige Vorwahl beinhaltet.
+\item eine Nummer mit 10 Stellen keine gültige Vorwahl beinhaltet,
+\item eine Nummer, die mit 07\,00 beginnt, nicht 14 oder 13 Stellen hat.
\end{itemize}
\chapter{Britische Telefonnummern}
@@ -993,9 +1005,9 @@ Gibt an, ob die Verkehrsausscheidungsziffer 1 für Ferngespräche ausgegeben wer
\chapter{Technische Hinweise}
Das Paket \phone\ verwendet das Paket
-\Paket{ltxcmds}
-sowie die experimentellen \LaTeX-3-Pakete
-\Paket{expl3}, \Paket{xparse} und \Paket{l3keys2e}.
+\Paket{ltxcmds}
+sowie das \LaTeX-3-Paket
+\Paket{l3keys2e}.
Bindestriche innerhalb von Telefonnummern werden durch
\verbcode:\kern1pt-\kern1pt: realisiert, das heißt sie werden mit einem Zusatzabstand von 1 Punkt zu den umgebenden Ziffern gesetzt. Das gilt auch für Schrägstriche, die als
@@ -1058,14 +1070,14 @@ expandiert.
\Schmalschrift
\AreaCodesGeographic[country=FR]
\egroup
-\Quellen \cite[5]{ARCEP}, \cite{wikipedia-FR-fr}, \cite{wikipedia-FR-de}
+\Quellen \cite[14\psq]{ARCEP}, \cite{wikipedia-FR-fr}, \cite{wikipedia-FR-de}
\UeberschriftSondervorwahlen
\bgroup
\Schmalschrift
\AreaCodesNonGeographic[country=FR]
\egroup
-\Quellen \cite[6--15]{ARCEP}, \cite{wikipedia-FR-fr}, \cite{wikipedia-FR-de}
+\Quellen \cite[17--25]{ARCEP}, \cite{wikipedia-FR-fr}, \cite{wikipedia-FR-de}
\chapter{Britische Vorwahlen}
\UeberschriftOrtsvorwahlen
@@ -1183,6 +1195,17 @@ am Anfang
\item Ermöglichung von Makros als Befehlsargumenten
\item leichte Veränderung der Warnmeldungen
\end{itemize}
+\item[2.3] \today
+\begin{itemize}
+\item Ergänzung der neuen deutschen Mobilfunkvorwahl 01\,50\,19
+\item Entfernung der deutschen Mobilfunkvorwahlen 01\,50\,20, 01\,50\,50, 01\,50\,80, 01\,55\,55
+\item Berücksichtigung der mit 07\,00 beginnenden französischen Machine-to-machine-Nummern (einschließlich derjenigen aus den Überseegebieten) mit 14 bzw. 13 Stellen
+\item Berücksichtigung der mit 09\,47 und 09\,76 beginnenden Nummern aus den französischen Überseegebieten
+\item Ergänzung der neuen britischen Vorwahlen 05604, 07354, 07355, 07357, 07359, 07360, 07361, 07362, 07363, 07364 und 0897
+\item Entfernung der britischen Vorwahl 07439
+\item Ergänzung der neuen nordamerikanischen Vorwahlen 227, 274, 341, 368, 428, 447, 448, 464, 474, 523, 524, 525, 526, 572, 582, 656, 659, 689, 730, 742, 771, 826, 839, 840, 943, 945 und 948
+\item Revision des Paketcodes
+\end{itemize}
\end{description}
\end{document}
diff --git a/macros/latex/contrib/phonenumbers/doc/phonenumbers-en.pdf b/macros/latex/contrib/phonenumbers/doc/phonenumbers-en.pdf
index e028bb23cb..526bac2a33 100644
--- a/macros/latex/contrib/phonenumbers/doc/phonenumbers-en.pdf
+++ b/macros/latex/contrib/phonenumbers/doc/phonenumbers-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/phonenumbers/doc/phonenumbers-en.tex b/macros/latex/contrib/phonenumbers/doc/phonenumbers-en.tex
index a16d6e56ce..f0533d6304 100644
--- a/macros/latex/contrib/phonenumbers/doc/phonenumbers-en.tex
+++ b/macros/latex/contrib/phonenumbers/doc/phonenumbers-en.tex
@@ -1,6 +1,6 @@
% phonenumbers package: English manual
-% Version 2.2
-% Datum: 18. August 2019
+% Version 2.3
+% Datum: 20. August 2021
\documentclass[numbers=noenddot]{scrreprt}
\usepackage[french,UKenglish]{babel}
\usepackage{fontspec}
@@ -12,7 +12,6 @@
\usepackage{scrlayer-scrpage}
\usepackage{multicol}
\usepackage{metalogo}
-
\usepackage[UKenglish]{isodate}
\usepackage{cnltx-example}
\usepackage{cnltx-tools}
@@ -46,8 +45,8 @@
\renewcommand\@pnumwidth{2em}
\makeatother
-\DeclareTOCStyleEntry[raggedentrytext=on]{tocline}{chapter}
-\DeclareTOCStyleEntry[raggedentrytext=on]{tocline}{section}
+
+
\addbibresource{Literatur.bib}
@@ -72,7 +71,7 @@
\makeatother
\DeclareNewLayer[background,bottommargin,mode=picture,hoffset=7cm,
- contents={\includegraphics{Telefonhörer}}]{Telefonebene}
+ contents={\includegraphics{Telefonhoerer}}]{Telefonebene}
\AddLayersToPageStyle{plain}{Telefonebene}
\AddLayersToPageStyle{scrheadings}{Telefonebene}
@@ -184,19 +183,25 @@ The subscriber number can end in a separate extension, which can be input by an
\includegraphics{Titelbild-en}
\vfill
-\Large
+\large
\textit{Package author}
-\medskip
+\smallskip
Keno Wehr
-\large
+\bigskip
+\textit{Bug reports}
+
\smallskip
-\url{wehr@abgol.de}
+\normalsize
+\url{https://github.com/wehro/phonenumbers/issues}
\end{center}
-\vfill
+\bigskip
\noindent This package makes it possible to typeset telephone numbers according to different national conventions and to link them when required. German, Austrian, French, British, and North American phone numbers are supported. Phone numbers from other countries are supported rudimentarily.
+
+\bigskip
+\noindent A German version of this manual is available in the file \texttt{phonenumbers-de.pdf}.
\end{titlepage}
\tableofcontents
@@ -212,7 +217,7 @@ Keno Wehr
\phonenumber[area-code-sep=brackets]{020432632194}
\end{sidebyside}
\begin{sidebyside}
- \phonenumber[area-code=place,area-code-sep=space]{0409188423}
+ \phonenumber[area-code=place,area-code-sep=space]{04066969123}
\end{sidebyside}
\begin{sidebyside}
\phonenumber[foreign]{0209576342}
@@ -237,13 +242,13 @@ Keno Wehr
\section{France}
\begin{sidebyside}
- \phonenumber[country=FR]{0123456789}
+ \phonenumber[country=FR]{0199006789}
\end{sidebyside}
\begin{sidebyside}
- \phonenumber[country=FR,area-code=place-and-number]{0123456789}
+ \phonenumber[country=FR,area-code=place-and-number]{0199006789}
\end{sidebyside}
\begin{sidebyside}
- \phonenumber[country=FR,foreign]{0123456789}
+ \phonenumber[country=FR,foreign]{0199006789}
\end{sidebyside}
\section{United Kingdom}
@@ -292,11 +297,11 @@ The \phone\ package aims to enable the user to typeset telephone numbers without
For instance, area codes are separated from the subscriber number in most countries. To typeset the phone number with the aid of the \phone\ package the user does not need to know which digits belong to the area code and which to the subscriber number. The package knows all area codes of the supported countries and will automatically typeset them correctly.
\begin{sidebyside}
- \phonenumber{0305226789}
+ \phonenumber{03023125789}
\end{sidebyside}
The first three digits of this German phone number are recognized as the area code of Berlin, whereas in the following example the first six digits can be identified as the area code of the German spa town of Bad Schandau.
\begin{sidebyside}
- \phonenumber{0350226789}
+ \phonenumber{03502225789}
\end{sidebyside}
The package does not aim to implement a particular norm. Rather, it follows the usual conventions for typesetting phone numbers. By setting options the user can determine the country the number is belonging to and select from various formatting options. This includes the additional output of the country calling code.
@@ -313,7 +318,7 @@ Sets the \meta{options} for all following phone numbers not having contradictory
Typesets a telephone number. The \meta{options} are valid only for this phone number.
The \meta{number} can be input in the local or in the international format. The local format is possible for supported countries only; the country has to be set by the
-\option{country}
+\option{country}
option
\vglAbschnitt{optionen-allgemein}.
The international format always begins with
@@ -379,15 +384,15 @@ Specifies whether and in which form the country calling code will be output.
With \code{foreign=international} or simply \code{foreign} you will get a country calling code consisting of a plus sign followed by the country code (\eg\ 49 for German numbers). In this form the country calling code can be directly used on mobile phones. For landline calls the + has to be replaced by the international call prefix used in the country of the caller.
\begin{sidebyside}
- \phonenumber[foreign=international]{0305226789}
+ \phonenumber[foreign=international]{03023125789}
\end{sidebyside}
The choice \code{american} lets the country calling code begin with 011, the international call prefix used in North America.
\begin{sidebyside}
- \phonenumber[foreign=american]{0305226789}
+ \phonenumber[foreign=american]{03023125789}
\end{sidebyside}
With the choice \code{european} the number will begin with a double zero, used in most of Europe and further parts of the world.
\begin{sidebyside}
- \phonenumber[foreign=european]{0305226789}
+ \phonenumber[foreign=european]{03023125789}
\end{sidebyside}
For numbers from unsupported countries the choice
@@ -413,7 +418,7 @@ Sets the home country. Numbers from this country will be typeset without the cou
\begin{sidebyside}
\setphonenumbers{foreign,home-country=FR}
\phonenumber[country=DE]{0441343396} \\
- \phonenumber[country=FR]{0123456789} \\
+ \phonenumber[country=FR]{0199006789} \\
\phonenumber[country=US]{2125550123}
\end{sidebyside}
@@ -427,7 +432,7 @@ The \option{home-country} option should to be set before the home area code. If
\setphonenumbers{home-country=US,home-area-code=242,foreign}
\phonenumber[country=US]{2125550123} \\
\phonenumber[country=US]{2425550124} \\
- \phonenumber[country=DE]{02581639737}
+ \phonenumber[country=DE]{0258163970}
\end{sidebyside}
Setting a home area code is allowed only for areas where the area code can be left out for local calls.
\end{Befehlsliste}
@@ -486,15 +491,15 @@ The relevant tariff can be output using the
\OptionsvariantenAreaCodeSep
\OptionsbeschreibungAreaCodeSep
\begin{sidebyside}
- \phonenumber[area-code-sep=space]{02581639737} \\
- \phonenumber[area-code-sep=hyphen]{01738642753}
+ \phonenumber[area-code-sep=space]{0258163970} \\
+ \phonenumber[area-code-sep=hyphen]{01749091317}
\end{sidebyside}
\WertbeschreibungBrackets
\begin{sidebyside}
\setphonenumbers{area-code-sep=brackets}
\phonenumber{02581639737} \\
- \phonenumber{01738642753}
+ \phonenumber{01749091317}
\end{sidebyside}
\HinweisForeignAreaCodeSep
@@ -505,7 +510,7 @@ The relevant tariff can be output using the
\begin{sidebyside}
\setphonenumbers{area-code=place}
\phonenumber{08942630845} \\
- \phonenumber{01738642753} \\
+ \phonenumber{01749091317} \\
\phonenumber[foreign]{04414363524}
\end{sidebyside}
@@ -513,7 +518,7 @@ The relevant tariff can be output using the
\begin{sidebyside}
\setphonenumbers{area-code=place-and-number}
\phonenumber{08942630845} \\
- \phonenumber{01738642753} \\
+ \phonenumber{01749091317} \\
\phonenumber{01803635341} \\
\phonenumber[foreign]{04414363524}
\end{sidebyside}
@@ -679,20 +684,26 @@ However, it is not used for the Pacific territories Wallis and Futuna, French Po
\UeberschriftAufbau
French phone numbers generally have ten digits and are structured in groups of two digits. The first digit is always 0.
\begin{sidebyside}
- \phonenumber[country=FR]{0123456789}
+ \phonenumber[country=FR]{0199006789}
\end{sidebyside}
-The second digit makes it possible to assign a number to one of five geographic zones or to a special purpose (\eg\ mobile telephony), respectively. The following digits theoretically allow a more precise geographic assignment of the number, but the \phone\ package uses them only to identify numbers from the overseas territories
+The second digit makes it possible to assign a number to one of five geographic zones or to a special purpose (\eg\ mobile telephony). Certain number ranges are reserved for overseas territories
\vglAnhang{vorwahlen-FR}.
\begin{sidebyside}
\setphonenumbers{country=FR,area-code=place-and-number}
- \phonenumber{0123456789} \\
- \phonenumber{0512345678} \\
+ \phonenumber{0199006789} \\
+ \phonenumber{0536495678} \\
\phonenumber{0596123456}
\end{sidebyside}
The leading 0 is omitted for calls from abroad.
\begin{sidebyside}
- \phonenumber[country=FR,foreign]{0123456789}
+ \phonenumber[country=FR,foreign]{0199006789}
+\end{sidebyside}
+
+Numbers for machine to machine communication beginning with 07\,00 have more than ten digits. They have 14 digits in metropolitan France and 13 digits in the overseas territories \cite[19]{ARCEP}.
+\begin{sidebyside}
+ \phonenumber[country=FR]{07000123456789} \\
+ \phonenumber[country=FR]{0700512345678}
\end{sidebyside}
Some companies and institutions have four-digit short numbers, which always begin with 3.
@@ -717,19 +728,19 @@ The first number of the following example is from Mayotte and thus using the cou
\begin{sidebyside}
\setphonenumbers{country=FR,foreign}
\phonenumber{0269123456} \\
- \phonenumber{0296123456}
+ \phonenumber{0261913456}
\end{sidebyside}
For some areas the country code leads to doubling the first three digits, \eg\ in the case of Martinique (area code 05\,96).
\begin{sidebyside}
\phonenumber[country=FR,foreign]{0596123456}
\end{sidebyside}
-However, for Saint Pierre and Miquelon the area code 05\,08 is entirely omitted for calls from abroad \cite[4]{ARCEP}.
+However, for Saint Pierre and Miquelon the area code 05\,08 is entirely omitted for calls from abroad \cite[13]{ARCEP}.
\begin{sidebyside}
\phonenumber[country=FR,foreign]{0508123456}
\end{sidebyside}
-In Saint Pierre and Miquelon it is possible as well to omit the area code for local calls and to dial six digits only \cite[4]{ARCEP}.
+In Saint Pierre and Miquelon it is possible as well to omit the area code for local calls and to dial six digits only \cite[13]{ARCEP}.
\begin{sidebyside}
\setphonenumbers{country=FR,home-area-code=0508}
\phonenumber{0508123456}
@@ -744,30 +755,31 @@ Since this is not possible in other areas of France, \code{0508} is the only leg
\WertbeschreibungPlaceAndNumber
\begin{sidebyside}
\setphonenumbers{country=FR,area-code=place-and-number}
- \phonenumber{0123456789} \\
+ \phonenumber{0199006789} \\
\phonenumber{0596123456} \\
\phonenumber{0612345678} \\
- \phonenumber[foreign]{0123456789}
+ \phonenumber[foreign]{0199006789}
\end{sidebyside}
\WertbeschreibungPlace
\ The use of this option is deprecated because the area code has always to be dialled in France.
\begin{sidebyside}
\setphonenumbers{country=FR,area-code=place}
- \phonenumber{0123456789} \\
+ \phonenumber{0199006789} \\
\phonenumber{0596123456} \\
\phonenumber{0612345678} \\
- \phonenumber[foreign]{0123456789}
+ \phonenumber[foreign]{0199006789}
\end{sidebyside}
\end{Befehlsliste}
\UeberschriftUngueltig
\WarnungWenn
\begin{itemize}
-\item the number does not have exactly 10 or 4 digits,
+\item the number does not have exactly 10 or 4 digits (except for numbers beginning with 07\,00),
\item a 10-digit number does not begin with 0,
\item a 4-digit number does not begin with 3,
-\item a 10-digit number does not contain a valid area code.
+\item a 10-digit number does not contain a valid area code,
+\item a number beginning with 07\,00 does not have 14 or 13 digits.
\end{itemize}
\chapter{British Phone Numbers}
@@ -993,9 +1005,9 @@ Specifies whether the trunk prefix 1 for long-distance calls will be output. Ins
\chapter{Technical Remarks}
The \phone\ package uses the
-\Paket{ltxcmds}
-package as well as the experimental \LaTeX\ 3 packages
-\Paket{expl3}, \Paket{xparse}, and \Paket{l3keys2e}.
+\Paket{ltxcmds}
+package as well as the \LaTeX\ 3 package
+\Paket{l3keys2e}.
Hyphens within phone numbers are realized by
\verbcode:\kern1pt-\kern1pt:, \ie\ they are typeset with an additional distance of 1 point from the surrounding digits. The same goes for slashes too, which are output as
@@ -1058,14 +1070,14 @@ will be expanded to
\Schmalschrift
\AreaCodesGeographic[country=FR]
\egroup
-\Quellen \cite[5]{ARCEP}, \cite{wikipedia-FR-fr}, \cite{wikipedia-FR-de}
+\Quellen \cite[14\psq]{ARCEP}, \cite{wikipedia-FR-fr}, \cite{wikipedia-FR-de}
\UeberschriftSondervorwahlen
\bgroup
\Schmalschrift
\AreaCodesNonGeographic[country=FR]
\egroup
-\Quellen \cite[6--15]{ARCEP}, \cite{wikipedia-FR-fr}, \cite{wikipedia-FR-de}
+\Quellen \cite[17--25]{ARCEP}, \cite{wikipedia-FR-fr}, \cite{wikipedia-FR-de}
\chapter{British Area Codes}
\UeberschriftOrtsvorwahlen
@@ -1183,6 +1195,17 @@ option for the area code separator in numbers with country calling code
\item Making macros possible as command arguments
\item Slight change of the warning messages
\end{itemize}
+\item[2.3] \today
+\begin{itemize}
+\item Addition of the new German mobile phone area code 01\,50\,19
+\item Removal of the German mobile phone area codes 01\,50\,20, 01\,50\,50, 01\,50\,80, 01\,55\,55
+\item Taking into account French machine to machine numbers beginning with 07\,00 (including those from the overseas territories) having 14 or 13 digits
+\item Taking into account the numbers from the French overseas territories beginning with 09\,47 and 09\,76
+\item Addition of the new British area codes 05604, 07354, 07355, 07357, 07359, 07360, 07361, 07362, 07363, 07364, and 0897
+\item Removal of the British area code 07439
+\item Addition of the new North American area codes 227, 274, 341, 368, 428, 447, 448, 464, 474, 523, 524, 525, 526, 572, 582, 656, 659, 689, 730, 742, 771, 826, 839, 840, 943, 945, and 948
+\item Revision of the package code
+\end{itemize}
\end{description}
\end{document}
diff --git a/macros/latex/contrib/phonenumbers/tex/phn-AT_Ortsnamen.tex b/macros/latex/contrib/phonenumbers/tex/phn-AT_Ortsnamen.tex
index e6954c431f..ea6b95577f 100644
--- a/macros/latex/contrib/phonenumbers/tex/phn-AT_Ortsnamen.tex
+++ b/macros/latex/contrib/phonenumbers/tex/phn-AT_Ortsnamen.tex
@@ -1,5 +1,5 @@
% phonenumbers package: Austrian place names
-% Datum: 22. Oktober 2017
+% Datum: 20. August 2021
\tl_const:cn {c_phone_AT_ortsname_01_tl} {Wien}
\tl_const:cn {c_phone_AT_ortsname_02142_tl} {Gattendorf}
\tl_const:cn {c_phone_AT_ortsname_02143_tl} {Kittsee}
@@ -222,7 +222,7 @@
\tl_const:cn {c_phone_AT_ortsname_02824_tl} {Allentsteig}
\tl_const:cn {c_phone_AT_ortsname_02825_tl} {G\"opfritz~an~der~Wild}
\tl_const:cn {c_phone_AT_ortsname_02826_tl} {Rastenfeld}
-\tl_const:cn {c_phone_AT_ortsname_02827_tl} {Sch\"onbach}
+\tl_const:cn {c_phone_AT_ortsname_02827_tl} {Sch\"onbach~(Nieder\"osterreich)}
\tl_const:cn {c_phone_AT_ortsname_02828_tl} {Rappottenstein}
\tl_const:cn {c_phone_AT_ortsname_02829_tl} {Schweiggers}
\tl_const:cn {c_phone_AT_ortsname_02841_tl} {Vitis}
@@ -383,7 +383,7 @@
\tl_const:cn {c_phone_AT_ortsname_03464_tl} {Gro\ss\ Sankt~Florian}
\tl_const:cn {c_phone_AT_ortsname_03465_tl} {P\"olfing-Brunn}
\tl_const:cn {c_phone_AT_ortsname_03466_tl} {Eibiswald}
-\tl_const:cn {c_phone_AT_ortsname_03467_tl} {Schwanberg}
+\tl_const:cn {c_phone_AT_ortsname_03467_tl} {Bad~Schwanberg}
\tl_const:cn {c_phone_AT_ortsname_03468_tl} {Sankt~Oswald~ob~Eibiswald}
\tl_const:cn {c_phone_AT_ortsname_03469_tl} {Sankt~Oswald~in~Freiland}
\tl_const:cn {c_phone_AT_ortsname_03472_tl} {Mureck}
@@ -539,7 +539,7 @@
\tl_const:cn {c_phone_AT_ortsname_04279_tl} {Sirnitz}
\tl_const:cn {c_phone_AT_ortsname_04282_tl} {Hermagor}
\tl_const:cn {c_phone_AT_ortsname_04283_tl} {St.~Stefan~im~Gailtal}
-\tl_const:cn {c_phone_AT_ortsname_04284_tl} {Kirchbach}
+\tl_const:cn {c_phone_AT_ortsname_04284_tl} {Kirchbach~(K\"arnten)}
\tl_const:cn {c_phone_AT_ortsname_04285_tl} {Tr\"opolach}
\tl_const:cn {c_phone_AT_ortsname_04286_tl} {Wei\ss briach}
\tl_const:cn {c_phone_AT_ortsname_04350_tl} {Bad~St.~Leonhard~im~Lavanttal}
@@ -635,7 +635,7 @@
\tl_const:cn {c_phone_AT_ortsname_05279_tl} {St.~Jodok~am~Brenner}
\tl_const:cn {c_phone_AT_ortsname_05280_tl} {Hochf\"ugen}
\tl_const:cn {c_phone_AT_ortsname_05282_tl} {Zell~am~Ziller}
-\tl_const:cn {c_phone_AT_ortsname_05283_tl} {Kaltenbach}
+\tl_const:cn {c_phone_AT_ortsname_05283_tl} {Kaltenbach~(Tirol)}
\tl_const:cn {c_phone_AT_ortsname_05284_tl} {Gerlos}
\tl_const:cn {c_phone_AT_ortsname_05285_tl} {Mayrhofen}
\tl_const:cn {c_phone_AT_ortsname_05286_tl} {Ginzling}
@@ -644,7 +644,7 @@
\tl_const:cn {c_phone_AT_ortsname_05289_tl} {H\"ausling}
\tl_const:cn {c_phone_AT_ortsname_05331_tl} {Brandenberg}
\tl_const:cn {c_phone_AT_ortsname_05332_tl} {W\"orgl}
-\tl_const:cn {c_phone_AT_ortsname_05333_tl} {S\"oll}
+\tl_const:cn {c_phone_AT_ortsname_05333_tl} {S\"oll~(Tirol)}
\tl_const:cn {c_phone_AT_ortsname_05334_tl} {Westendorf}
\tl_const:cn {c_phone_AT_ortsname_05335_tl} {Hopfgarten~im~Brixental}
\tl_const:cn {c_phone_AT_ortsname_05336_tl} {Alpbach}
@@ -726,7 +726,7 @@
\tl_const:cn {c_phone_AT_ortsname_05674_tl} {Bichlbach}
\tl_const:cn {c_phone_AT_ortsname_05675_tl} {Tannheim}
\tl_const:cn {c_phone_AT_ortsname_05676_tl} {Jungholz}
-\tl_const:cn {c_phone_AT_ortsname_05677_tl} {Vils}
+\tl_const:cn {c_phone_AT_ortsname_05677_tl} {Vils~(Tirol)}
\tl_const:cn {c_phone_AT_ortsname_05678_tl} {Wei\ss enbach~am~Lech}
\tl_const:cn {c_phone_AT_ortsname_06131_tl} {Obertraun}
\tl_const:cn {c_phone_AT_ortsname_06132_tl} {Bad~Ischl}
@@ -766,7 +766,7 @@
\tl_const:cn {c_phone_AT_ortsname_06272_tl} {Oberndorf~bei~Salzburg}
\tl_const:cn {c_phone_AT_ortsname_06274_tl} {Lamprechtshausen}
\tl_const:cn {c_phone_AT_ortsname_06276_tl} {Nu\ss dorf~am~Haunsberg}
-\tl_const:cn {c_phone_AT_ortsname_06277_tl} {St.~Pantaleon}
+\tl_const:cn {c_phone_AT_ortsname_06277_tl} {St.~Pantaleon~(Ober\"osterreich)}
\tl_const:cn {c_phone_AT_ortsname_06278_tl} {Ostermiething}
\tl_const:cn {c_phone_AT_ortsname_06412_tl} {Sankt~Johann~im~Pongau}
\tl_const:cn {c_phone_AT_ortsname_06413_tl} {Wagrain}
@@ -830,7 +830,7 @@
\tl_const:cn {c_phone_AT_ortsname_07215_tl} {Hellmons\"odt}
\tl_const:cn {c_phone_AT_ortsname_07216_tl} {Helfenberg}
\tl_const:cn {c_phone_AT_ortsname_07217_tl} {St.~Veit~im~M\"uhlkreis}
-\tl_const:cn {c_phone_AT_ortsname_07218_tl} {Gro\ss traberg}
+\tl_const:cn {c_phone_AT_ortsname_07218_tl} {Gro\ss traberg~(Oberneukirchen)}
\tl_const:cn {c_phone_AT_ortsname_07219_tl} {Vorderwei\ss enbach}
\tl_const:cn {c_phone_AT_ortsname_07221_tl} {H\"orsching}
\tl_const:cn {c_phone_AT_ortsname_07223_tl} {Enns}
@@ -919,12 +919,12 @@
\tl_const:cn {c_phone_AT_ortsname_07472_tl} {Amstetten}
\tl_const:cn {c_phone_AT_ortsname_07473_tl} {Blindenmarkt}
\tl_const:cn {c_phone_AT_ortsname_07474_tl} {Euratsfeld}
-\tl_const:cn {c_phone_AT_ortsname_07475_tl} {Ulmerfeld-Hausmening-Neufurth}
+\tl_const:cn {c_phone_AT_ortsname_07475_tl} {Hausmening~(Neuhofen~an~der~Ybbs)}
\tl_const:cn {c_phone_AT_ortsname_07476_tl} {Aschbach-Markt}
\tl_const:cn {c_phone_AT_ortsname_07477_tl} {St.~Peter~in~der~Au}
\tl_const:cn {c_phone_AT_ortsname_07478_tl} {Oed-Oehling}
\tl_const:cn {c_phone_AT_ortsname_07479_tl} {Ardagger}
-\tl_const:cn {c_phone_AT_ortsname_07480_tl} {Langau}
+\tl_const:cn {c_phone_AT_ortsname_07480_tl} {Langau~(Gaming)}
\tl_const:cn {c_phone_AT_ortsname_07482_tl} {Scheibbs}
\tl_const:cn {c_phone_AT_ortsname_07483_tl} {Oberndorf~an~der~Melk}
\tl_const:cn {c_phone_AT_ortsname_07484_tl} {G\"ostling~an~der~Ybbs}
@@ -936,7 +936,7 @@
\tl_const:cn {c_phone_AT_ortsname_07562_tl} {Windischgarsten}
\tl_const:cn {c_phone_AT_ortsname_07563_tl} {Spital~am~Pyhrn}
\tl_const:cn {c_phone_AT_ortsname_07564_tl} {Hinterstoder}
-\tl_const:cn {c_phone_AT_ortsname_07565_tl} {St.~Pankraz}
+\tl_const:cn {c_phone_AT_ortsname_07565_tl} {St.~Pankraz~(Ober\"osterreich)}
\tl_const:cn {c_phone_AT_ortsname_07566_tl} {Rosenau~am~Hengstpa\ss}
\tl_const:cn {c_phone_AT_ortsname_07582_tl} {Kirchdorf~an~der~Krems}
\tl_const:cn {c_phone_AT_ortsname_07583_tl} {Kremsm\"unster}
@@ -951,7 +951,7 @@
\tl_const:cn {c_phone_AT_ortsname_07615_tl} {Scharnstein}
\tl_const:cn {c_phone_AT_ortsname_07616_tl} {Gr\"unau~im~Almtal}
\tl_const:cn {c_phone_AT_ortsname_07617_tl} {Traunkirchen}
-\tl_const:cn {c_phone_AT_ortsname_07618_tl} {Neukirchen~(Gemeinde~Altm\"unster)}
+\tl_const:cn {c_phone_AT_ortsname_07618_tl} {Neukirchen~(Altm\"unster)}
\tl_const:cn {c_phone_AT_ortsname_07619_tl} {Kirchham}
\tl_const:cn {c_phone_AT_ortsname_07662_tl} {Seewalchen~am~Attersee}
\tl_const:cn {c_phone_AT_ortsname_07663_tl} {Steinbach~am~Attersee}
diff --git a/macros/latex/contrib/phonenumbers/tex/phn-DE_Ortsnamen.tex b/macros/latex/contrib/phonenumbers/tex/phn-DE_Ortsnamen.tex
index 370693cf8e..fc9b19ab8a 100644
--- a/macros/latex/contrib/phonenumbers/tex/phn-DE_Ortsnamen.tex
+++ b/macros/latex/contrib/phonenumbers/tex/phn-DE_Ortsnamen.tex
@@ -1,5 +1,5 @@
% phonenumbers package: German place names
-% Datum: 5. August 2018
+% Datum: 20. August 2021
\tl_const:cn {c_phone_DE_ortsname_0201_tl} {Essen}
\tl_const:cn {c_phone_DE_ortsname_0202_tl} {Wuppertal}
\tl_const:cn {c_phone_DE_ortsname_0203_tl} {Duisburg}
@@ -191,7 +191,7 @@
\tl_const:cn {c_phone_DE_ortsname_02421_tl} {D\"uren}
\tl_const:cn {c_phone_DE_ortsname_02422_tl} {Kreuzau}
\tl_const:cn {c_phone_DE_ortsname_02423_tl} {Langerwehe}
-\tl_const:cn {c_phone_DE_ortsname_02424_tl} {Vettweiß}
+\tl_const:cn {c_phone_DE_ortsname_02424_tl} {Vettwei\ss}
\tl_const:cn {c_phone_DE_ortsname_02425_tl} {Nideggen-Embken}
\tl_const:cn {c_phone_DE_ortsname_02426_tl} {N\"orvenich}
\tl_const:cn {c_phone_DE_ortsname_02427_tl} {Nideggen}
@@ -5209,9 +5209,7 @@
\tl_const:cn {c_phone_DE_ortsname_01377_tl} {Massenverkehrsdienst~(1\nobreakspace Euro/Anruf)}
\tl_const:cn {c_phone_DE_ortsname_01378_tl} {Massenverkehrsdienst~(50\,ct/Anruf)}
\tl_const:cn {c_phone_DE_ortsname_01379_tl} {Massenverkehrsdienst~(50\,ct/Anruf)}
-\tl_const:cn {c_phone_DE_ortsname_015020_tl} {Mobilfunk}
-\tl_const:cn {c_phone_DE_ortsname_015050_tl} {Mobilfunk}
-\tl_const:cn {c_phone_DE_ortsname_015080_tl} {Mobilfunk}
+\tl_const:cn {c_phone_DE_ortsname_015019_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_01511_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_01512_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_01514_tl} {Mobilfunk}
@@ -5225,7 +5223,6 @@
\tl_const:cn {c_phone_DE_ortsname_01525_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_01526_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_01529_tl} {Mobilfunk}
-\tl_const:cn {c_phone_DE_ortsname_015555_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_015566_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_015630_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_015678_tl} {Mobilfunk}
@@ -5236,7 +5233,6 @@
\tl_const:cn {c_phone_DE_ortsname_01578_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_01579_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_015888_tl} {Mobilfunk}
-\tl_const:cn {c_phone_DE_ortsname_015890_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_01590_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_0160_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_0162_tl} {Mobilfunk}
@@ -5254,7 +5250,6 @@
\tl_const:cn {c_phone_DE_ortsname_0177_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_0178_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_0179_tl} {Mobilfunk}
-\tl_const:cn {c_phone_DE_ortsname_01800_tl} {Service-Dienst}
\tl_const:cn {c_phone_DE_ortsname_01801_tl} {Service-Dienst~(3,9\,ct/min)}
\tl_const:cn {c_phone_DE_ortsname_01802_tl} {Service-Dienst~(6\,ct/Anruf)}
\tl_const:cn {c_phone_DE_ortsname_01803_tl} {Service-Dienst~(9\,ct/min)}
@@ -5262,8 +5257,6 @@
\tl_const:cn {c_phone_DE_ortsname_01805_tl} {Service-Dienst~(14\,ct/min)}
\tl_const:cn {c_phone_DE_ortsname_01806_tl} {Service-Dienst~(20\,ct/Anruf)}
\tl_const:cn {c_phone_DE_ortsname_01807_tl} {Service-Dienst~(30\,s~frei,~danach~14\,ct/min)}
-\tl_const:cn {c_phone_DE_ortsname_01808_tl} {Service-Dienst}
-\tl_const:cn {c_phone_DE_ortsname_01809_tl} {Service-Dienst}
\tl_const:cn {c_phone_DE_ortsname_0181_tl} {Internationales~virtuelles~privates~Netz}
\tl_const:cn {c_phone_DE_ortsname_0182_tl} {Virtuelles~privates~Netz}
\tl_const:cn {c_phone_DE_ortsname_0183_tl} {Virtuelles~privates~Netz}
@@ -5273,10 +5266,10 @@
\tl_const:cn {c_phone_DE_ortsname_0187_tl} {Virtuelles~privates~Netz}
\tl_const:cn {c_phone_DE_ortsname_0188_tl} {Virtuelles~privates~Netz}
\tl_const:cn {c_phone_DE_ortsname_0189_tl} {Virtuelles~privates~Netz}
-\tl_const:cn {c_phone_DE_ortsname_0191_tl} {Onlinedienst}
-\tl_const:cn {c_phone_DE_ortsname_0192_tl} {Onlinedienst}
-\tl_const:cn {c_phone_DE_ortsname_0193_tl} {Onlinedienst}
-\tl_const:cn {c_phone_DE_ortsname_0194_tl} {Onlinedienst}
+\tl_const:cn {c_phone_DE_ortsname_0191_tl} {Online-Dienst}
+\tl_const:cn {c_phone_DE_ortsname_0192_tl} {Online-Dienst}
+\tl_const:cn {c_phone_DE_ortsname_0193_tl} {Online-Dienst}
+\tl_const:cn {c_phone_DE_ortsname_0194_tl} {Online-Dienst}
\tl_const:cn {c_phone_DE_ortsname_032_tl} {Nationale~Teilnehmerrufnummer}
\tl_const:cn {c_phone_DE_ortsname_0700_tl} {Pers\"onliche~Rufnummer}
\tl_const:cn {c_phone_DE_ortsname_0800_tl} {Entgeltfreier~Telefondienst}
diff --git a/macros/latex/contrib/phonenumbers/tex/phn-DE_Vorwahlen.tex b/macros/latex/contrib/phonenumbers/tex/phn-DE_Vorwahlen.tex
index aba6b8b89a..9f188e30d3 100644
--- a/macros/latex/contrib/phonenumbers/tex/phn-DE_Vorwahlen.tex
+++ b/macros/latex/contrib/phonenumbers/tex/phn-DE_Vorwahlen.tex
@@ -1,5 +1,5 @@
% phonenumbers package: German area codes
-% Datum: 5. August 2018
+% Datum: 20. August 2021
\clist_const:Nn \c_phone_DE_ortsvorwahlen_clist {0201,
0202,
0203,
@@ -5209,9 +5209,7 @@
01377,
01378,
01379,
-015020,
-015050,
-015080,
+015019,
01511,
01512,
01514,
@@ -5225,7 +5223,6 @@
01525,
01526,
01529,
-015555,
015566,
015630,
015678,
diff --git a/macros/latex/contrib/phonenumbers/tex/phn-FR_Ortsnamen.tex b/macros/latex/contrib/phonenumbers/tex/phn-FR_Ortsnamen.tex
index 5ec797c1bd..eda23d4664 100644
--- a/macros/latex/contrib/phonenumbers/tex/phn-FR_Ortsnamen.tex
+++ b/macros/latex/contrib/phonenumbers/tex/phn-FR_Ortsnamen.tex
@@ -1,9 +1,10 @@
% phonenumbers package: French place names
-% Datum: 22. Oktober 2017
+% Datum: 20. August 2021
\tl_const:cn {c_phone_FR_ortsname_01_tl} {\^{I}le-de-France}
\tl_const:cn {c_phone_FR_ortsname_02_tl} {Nord-ouest}
\tl_const:cn {c_phone_FR_ortsname_0262_tl} {La~R\a'{e}union}
\tl_const:cn {c_phone_FR_ortsname_026200_tl} {Terres~australes~et~antarctiques~fran\c{c}aises}
+\tl_const:cn {c_phone_FR_ortsname_0263_tl} {La~R\a'{e}union}
\tl_const:cn {c_phone_FR_ortsname_0269_tl} {Mayotte}
\tl_const:cn {c_phone_FR_ortsname_03_tl} {Nord-est}
\tl_const:cn {c_phone_FR_ortsname_04_tl} {Sud-est}
@@ -22,5 +23,26 @@
\tl_const:cn {c_phone_FR_ortsname_0696_tl} {T\a'{e}l\a'{e}phone~mobile~(Martinique)}
\tl_const:cn {c_phone_FR_ortsname_0697_tl} {T\a'{e}l\a'{e}phone~mobile~(Martinique)}
\tl_const:cn {c_phone_FR_ortsname_07_tl} {T\a'{e}l\a'{e}phone~mobile}
+\tl_const:cn {c_phone_FR_ortsname_0700_tl} {Communication~machine~\a`{a}~machine}
+\tl_const:cn {c_phone_FR_ortsname_07005_tl} {Communication~machine~\a`{a}~machine~(Guadeloupe)}
+\tl_const:cn {c_phone_FR_ortsname_07006_tl} {Communication~machine~\a`{a}~machine~(Guyane)}
+\tl_const:cn {c_phone_FR_ortsname_07007_tl} {Communication~machine~\a`{a}~machine~(Martinique)}
+\tl_const:cn {c_phone_FR_ortsname_07008_tl} {Communication~machine~\a`{a}~machine~(Mayotte)}
+\tl_const:cn {c_phone_FR_ortsname_07009_tl} {Communication~machine~\a`{a}~machine~(La~R\a'{e}union)}
\tl_const:cn {c_phone_FR_ortsname_08_tl} {Service~\a`{a}~valeur~ajout\a'{e}e}
\tl_const:cn {c_phone_FR_ortsname_09_tl} {Service~t\a'{e}l\a'{e}phonique~en~VoIP}
+\tl_const:cn {c_phone_FR_ortsname_09475_tl} {Service~t\a'{e}l\a'{e}phonique~en~VoIP~(Guadeloupe)}
+\tl_const:cn {c_phone_FR_ortsname_09476_tl} {Service~t\a'{e}l\a'{e}phonique~en~VoIP~(Guyane)}
+\tl_const:cn {c_phone_FR_ortsname_09477_tl} {Service~t\a'{e}l\a'{e}phonique~en~VoIP~(Martinique)}
+\tl_const:cn {c_phone_FR_ortsname_09478_tl} {Service~t\a'{e}l\a'{e}phonique~en~VoIP~(Mayotte)}
+\tl_const:cn {c_phone_FR_ortsname_09479_tl} {Service~t\a'{e}l\a'{e}phonique~en~VoIP~(La~R\a'{e}union)}
+\tl_const:cn {c_phone_FR_ortsname_09760_tl} {Service~t\a'{e}l\a'{e}phonique~en~VoIP~(Guadeloupe)}
+\tl_const:cn {c_phone_FR_ortsname_09761_tl} {Service~t\a'{e}l\a'{e}phonique~en~VoIP~(Guadeloupe)}
+\tl_const:cn {c_phone_FR_ortsname_09762_tl} {Service~t\a'{e}l\a'{e}phonique~en~VoIP~(La~R\a'{e}union)}
+\tl_const:cn {c_phone_FR_ortsname_09763_tl} {Service~t\a'{e}l\a'{e}phonique~en~VoIP~(La~R\a'{e}union)}
+\tl_const:cn {c_phone_FR_ortsname_09764_tl} {Service~t\a'{e}l\a'{e}phonique~en~VoIP~(Guyane)}
+\tl_const:cn {c_phone_FR_ortsname_09765_tl} {Service~t\a'{e}l\a'{e}phonique~en~VoIP~(Guyane)}
+\tl_const:cn {c_phone_FR_ortsname_09766_tl} {Service~t\a'{e}l\a'{e}phonique~en~VoIP~(Martinique)}
+\tl_const:cn {c_phone_FR_ortsname_09767_tl} {Service~t\a'{e}l\a'{e}phonique~en~VoIP~(Martinique)}
+\tl_const:cn {c_phone_FR_ortsname_09768_tl} {Service~t\a'{e}l\a'{e}phonique~en~VoIP~(Guadeloupe)}
+\tl_const:cn {c_phone_FR_ortsname_09769_tl} {Service~t\a'{e}l\a'{e}phonique~en~VoIP~(La~R\a'{e}union)}
diff --git a/macros/latex/contrib/phonenumbers/tex/phn-FR_Vorwahlen.tex b/macros/latex/contrib/phonenumbers/tex/phn-FR_Vorwahlen.tex
index 94658cbce0..965c0259b0 100644
--- a/macros/latex/contrib/phonenumbers/tex/phn-FR_Vorwahlen.tex
+++ b/macros/latex/contrib/phonenumbers/tex/phn-FR_Vorwahlen.tex
@@ -1,9 +1,10 @@
% phonenumbers package: French area codes
-% Datum: 6. November 2016
+% Datum: 20. August 2021
\clist_const:Nn \c_phone_FR_ortsvorwahlen_clist {01,
02,
0262,
026200,
+0263,
0269,
03,
04,
@@ -22,5 +23,26 @@
0696,
0697,
07,
+0700,
+07005,
+07006,
+07007,
+07008,
+07009,
08,
-09}
+09,
+09475,
+09476,
+09477,
+09478,
+09479,
+09760,
+09761,
+09762,
+09763,
+09764,
+09765,
+09766,
+09767,
+09768,
+09769}
diff --git a/macros/latex/contrib/phonenumbers/tex/phn-UK_Ortsnamen.tex b/macros/latex/contrib/phonenumbers/tex/phn-UK_Ortsnamen.tex
index ac203278d8..29c8c2d138 100644
--- a/macros/latex/contrib/phonenumbers/tex/phn-UK_Ortsnamen.tex
+++ b/macros/latex/contrib/phonenumbers/tex/phn-UK_Ortsnamen.tex
@@ -1,5 +1,5 @@
% phonenumbers package: British place names
-% Datum: 5. August 2018
+% Datum: 20. August 2021
\tl_const:cn {c_phone_UK_ortsname_0113_tl} {Leeds}
\tl_const:cn {c_phone_UK_ortsname_0114_tl} {Sheffield}
\tl_const:cn {c_phone_UK_ortsname_0115_tl} {Nottingham}
@@ -234,7 +234,7 @@
\tl_const:cn {c_phone_UK_ortsname_01493_tl} {Great~Yarmouth}
\tl_const:cn {c_phone_UK_ortsname_01494_tl} {High~Wycombe}
\tl_const:cn {c_phone_UK_ortsname_01495_tl} {Pontypool}
-\tl_const:cn {c_phone_UK_ortsname_01496_tl} {Islay}
+\tl_const:cn {c_phone_UK_ortsname_01496_tl} {Islay~and~Jura}
\tl_const:cn {c_phone_UK_ortsname_01497_tl} {Hay-on-Wye}
\tl_const:cn {c_phone_UK_ortsname_01499_tl} {Inveraray}
\tl_const:cn {c_phone_UK_ortsname_01501_tl} {Harthill}
@@ -522,7 +522,7 @@
\tl_const:cn {c_phone_UK_ortsname_01876_tl} {North~Uist,~Outer~Hebrides}
\tl_const:cn {c_phone_UK_ortsname_01877_tl} {Callander}
\tl_const:cn {c_phone_UK_ortsname_01878_tl} {South~Uist,~Outer~Hebrides}
-\tl_const:cn {c_phone_UK_ortsname_01879_tl} {Scarinish}
+\tl_const:cn {c_phone_UK_ortsname_01879_tl} {Tiree~and~Coll,~Inner~Hebrides}
\tl_const:cn {c_phone_UK_ortsname_01880_tl} {Tarbert}
\tl_const:cn {c_phone_UK_ortsname_01882_tl} {Kinloch~Rannoch}
\tl_const:cn {c_phone_UK_ortsname_01883_tl} {Caterham}
@@ -631,6 +631,7 @@
\tl_const:cn {c_phone_UK_ortsname_05601_tl} {Electronic~communications~service}
\tl_const:cn {c_phone_UK_ortsname_05602_tl} {Electronic~communications~service}
\tl_const:cn {c_phone_UK_ortsname_05603_tl} {Electronic~communications~service}
+\tl_const:cn {c_phone_UK_ortsname_05604_tl} {Electronic~communications~service}
\tl_const:cn {c_phone_UK_ortsname_07000_tl} {Personal~number}
\tl_const:cn {c_phone_UK_ortsname_07002_tl} {Personal~number}
\tl_const:cn {c_phone_UK_ortsname_07003_tl} {Personal~number}
@@ -742,6 +743,15 @@
\tl_const:cn {c_phone_UK_ortsname_07340_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07341_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07342_tl} {Mobile~phone}
+\tl_const:cn {c_phone_UK_ortsname_07354_tl} {Mobile~phone}
+\tl_const:cn {c_phone_UK_ortsname_07355_tl} {Mobile~phone}
+\tl_const:cn {c_phone_UK_ortsname_07357_tl} {Mobile~phone}
+\tl_const:cn {c_phone_UK_ortsname_07359_tl} {Mobile~phone}
+\tl_const:cn {c_phone_UK_ortsname_07360_tl} {Mobile~phone}
+\tl_const:cn {c_phone_UK_ortsname_07361_tl} {Mobile~phone}
+\tl_const:cn {c_phone_UK_ortsname_07362_tl} {Mobile~phone}
+\tl_const:cn {c_phone_UK_ortsname_07363_tl} {Mobile~phone}
+\tl_const:cn {c_phone_UK_ortsname_07364_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07365_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07366_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07367_tl} {Mobile~phone}
@@ -811,7 +821,6 @@
\tl_const:cn {c_phone_UK_ortsname_07436_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07437_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07438_tl} {Mobile~phone}
-\tl_const:cn {c_phone_UK_ortsname_07439_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07440_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07441_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07442_tl} {Mobile~phone}
@@ -1071,7 +1080,7 @@
\tl_const:cn {c_phone_UK_ortsname_07778_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07779_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07780_tl} {Mobile~phone}
-\tl_const:cn {c_phone_UK_ortsname_07781_tl} {Mobile~phone}
+\tl_const:cn {c_phone_UK_ortsname_07781_tl} {Mobile~phone~(Guernsey)}
\tl_const:cn {c_phone_UK_ortsname_07782_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07783_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07784_tl} {Mobile~phone}
@@ -1087,7 +1096,7 @@
\tl_const:cn {c_phone_UK_ortsname_07794_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07795_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07796_tl} {Mobile~phone}
-\tl_const:cn {c_phone_UK_ortsname_07797_tl} {Mobile~phone}
+\tl_const:cn {c_phone_UK_ortsname_07797_tl} {Mobile~phone~(Jersey)}
\tl_const:cn {c_phone_UK_ortsname_07798_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07799_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07800_tl} {Mobile~phone}
@@ -1291,6 +1300,7 @@
\tl_const:cn {c_phone_UK_ortsname_0870_tl} {Special~service~higher~rate}
\tl_const:cn {c_phone_UK_ortsname_0871_tl} {Special~service~higher~rate}
\tl_const:cn {c_phone_UK_ortsname_0872_tl} {Special~service~higher~rate}
+\tl_const:cn {c_phone_UK_ortsname_0897_tl} {Inserted~network~number}
\tl_const:cn {c_phone_UK_ortsname_0899_tl} {Inbound~routing~code}
\tl_const:cn {c_phone_UK_ortsname_0900_tl} {Special~service~premium~rate}
\tl_const:cn {c_phone_UK_ortsname_0901_tl} {Special~service~premium~rate}
diff --git a/macros/latex/contrib/phonenumbers/tex/phn-UK_Vorwahlen.tex b/macros/latex/contrib/phonenumbers/tex/phn-UK_Vorwahlen.tex
index b471389c15..62a5ab2422 100644
--- a/macros/latex/contrib/phonenumbers/tex/phn-UK_Vorwahlen.tex
+++ b/macros/latex/contrib/phonenumbers/tex/phn-UK_Vorwahlen.tex
@@ -1,5 +1,5 @@
% phonenumbers package: British area codes
-% Datum: 5. August 2018
+% Datum: 20. August 2021
\clist_const:Nn \c_phone_UK_ortsvorwahlen_clist {0113,
0114,
0115,
@@ -637,6 +637,7 @@
05601,
05602,
05603,
+05604,
07000,
07002,
07003,
@@ -748,6 +749,15 @@
07340,
07341,
07342,
+07354,
+07355,
+07357,
+07359,
+07360,
+07361,
+07362,
+07363,
+07364,
07365,
07366,
07367,
@@ -817,7 +827,6 @@
07436,
07437,
07438,
-07439, % nicht mehr in Gebrauch
07440,
07441,
07442,
@@ -1297,6 +1306,7 @@
0870,
0871,
0872,
+0897,
0899,
0900,
0901,
diff --git a/macros/latex/contrib/phonenumbers/tex/phn-US_Ortsnamen.tex b/macros/latex/contrib/phonenumbers/tex/phn-US_Ortsnamen.tex
index 11c6978dac..a53bf4dec7 100644
--- a/macros/latex/contrib/phonenumbers/tex/phn-US_Ortsnamen.tex
+++ b/macros/latex/contrib/phonenumbers/tex/phn-US_Ortsnamen.tex
@@ -1,5 +1,5 @@
% phonenumbers package: place names of the North American Numbering Plan
-% Datum: 5. August 2018
+% Datum: 20. August 2021
\tl_const:cn {c_phone_US_ortsname_201_tl} {New~Jersey}
\tl_const:cn {c_phone_US_ortsname_202_tl} {Washington,~D.\,C.}
\tl_const:cn {c_phone_US_ortsname_203_tl} {Connecticut}
@@ -23,6 +23,7 @@
\tl_const:cn {c_phone_US_ortsname_224_tl} {Illinois}
\tl_const:cn {c_phone_US_ortsname_225_tl} {Louisiana}
\tl_const:cn {c_phone_US_ortsname_226_tl} {Ontario}
+\tl_const:cn {c_phone_US_ortsname_227_tl} {Maryland}
\tl_const:cn {c_phone_US_ortsname_228_tl} {Mississippi}
\tl_const:cn {c_phone_US_ortsname_229_tl} {Georgia}
\tl_const:cn {c_phone_US_ortsname_231_tl} {Michigan}
@@ -48,6 +49,7 @@
\tl_const:cn {c_phone_US_ortsname_269_tl} {Michigan}
\tl_const:cn {c_phone_US_ortsname_270_tl} {Kentucky}
\tl_const:cn {c_phone_US_ortsname_272_tl} {Pennsylvania}
+\tl_const:cn {c_phone_US_ortsname_274_tl} {Wisconsin}
\tl_const:cn {c_phone_US_ortsname_276_tl} {Virginia}
\tl_const:cn {c_phone_US_ortsname_279_tl} {California}
\tl_const:cn {c_phone_US_ortsname_281_tl} {Texas}
@@ -84,6 +86,7 @@
\tl_const:cn {c_phone_US_ortsname_337_tl} {Louisiana}
\tl_const:cn {c_phone_US_ortsname_339_tl} {Massachusetts}
\tl_const:cn {c_phone_US_ortsname_340_tl} {U.\,S.~Virgin~Islands}
+\tl_const:cn {c_phone_US_ortsname_341_tl} {California}
\tl_const:cn {c_phone_US_ortsname_343_tl} {Ontario}
\tl_const:cn {c_phone_US_ortsname_345_tl} {Cayman~Islands}
\tl_const:cn {c_phone_US_ortsname_346_tl} {Texas}
@@ -95,6 +98,7 @@
\tl_const:cn {c_phone_US_ortsname_364_tl} {Kentucky}
\tl_const:cn {c_phone_US_ortsname_365_tl} {Ontario}
\tl_const:cn {c_phone_US_ortsname_367_tl} {Quebec}
+\tl_const:cn {c_phone_US_ortsname_368_tl} {Alberta}
\tl_const:cn {c_phone_US_ortsname_380_tl} {Ohio}
\tl_const:cn {c_phone_US_ortsname_385_tl} {Utah}
\tl_const:cn {c_phone_US_ortsname_386_tl} {Florida}
@@ -119,6 +123,7 @@
\tl_const:cn {c_phone_US_ortsname_423_tl} {Tennessee}
\tl_const:cn {c_phone_US_ortsname_424_tl} {California}
\tl_const:cn {c_phone_US_ortsname_425_tl} {Washington}
+\tl_const:cn {c_phone_US_ortsname_428_tl} {New~Brunswick}
\tl_const:cn {c_phone_US_ortsname_430_tl} {Texas}
\tl_const:cn {c_phone_US_ortsname_431_tl} {Manitoba}
\tl_const:cn {c_phone_US_ortsname_432_tl} {Texas}
@@ -131,12 +136,16 @@
\tl_const:cn {c_phone_US_ortsname_442_tl} {California}
\tl_const:cn {c_phone_US_ortsname_443_tl} {Maryland}
\tl_const:cn {c_phone_US_ortsname_445_tl} {Pennsylvania}
+\tl_const:cn {c_phone_US_ortsname_447_tl} {Illinois}
+\tl_const:cn {c_phone_US_ortsname_448_tl} {Florida}
\tl_const:cn {c_phone_US_ortsname_450_tl} {Quebec}
\tl_const:cn {c_phone_US_ortsname_458_tl} {Oregon}
\tl_const:cn {c_phone_US_ortsname_463_tl} {Indiana}
+\tl_const:cn {c_phone_US_ortsname_464_tl} {Illinois}
\tl_const:cn {c_phone_US_ortsname_469_tl} {Texas}
\tl_const:cn {c_phone_US_ortsname_470_tl} {Georgia}
\tl_const:cn {c_phone_US_ortsname_473_tl} {Grenada}
+\tl_const:cn {c_phone_US_ortsname_474_tl} {Saskatchewan}
\tl_const:cn {c_phone_US_ortsname_475_tl} {Connecticut}
\tl_const:cn {c_phone_US_ortsname_478_tl} {Georgia}
\tl_const:cn {c_phone_US_ortsname_479_tl} {Arkansas}
@@ -177,12 +186,14 @@
\tl_const:cn {c_phone_US_ortsname_567_tl} {Ohio}
\tl_const:cn {c_phone_US_ortsname_570_tl} {Pennsylvania}
\tl_const:cn {c_phone_US_ortsname_571_tl} {Virginia}
+\tl_const:cn {c_phone_US_ortsname_572_tl} {Oklahoma}
\tl_const:cn {c_phone_US_ortsname_573_tl} {Missouri}
\tl_const:cn {c_phone_US_ortsname_574_tl} {Indiana}
\tl_const:cn {c_phone_US_ortsname_575_tl} {New~Mexico}
\tl_const:cn {c_phone_US_ortsname_579_tl} {Quebec}
\tl_const:cn {c_phone_US_ortsname_580_tl} {Oklahoma}
\tl_const:cn {c_phone_US_ortsname_581_tl} {Quebec}
+\tl_const:cn {c_phone_US_ortsname_582_tl} {Pennsylvania}
\tl_const:cn {c_phone_US_ortsname_585_tl} {New~York}
\tl_const:cn {c_phone_US_ortsname_586_tl} {Michigan}
\tl_const:cn {c_phone_US_ortsname_587_tl} {Alberta}
@@ -220,8 +231,10 @@
\tl_const:cn {c_phone_US_ortsname_649_tl} {Turks~and~Caicos~Islands}
\tl_const:cn {c_phone_US_ortsname_650_tl} {California}
\tl_const:cn {c_phone_US_ortsname_651_tl} {Minnesota}
+\tl_const:cn {c_phone_US_ortsname_656_tl} {Florida}
\tl_const:cn {c_phone_US_ortsname_657_tl} {California}
\tl_const:cn {c_phone_US_ortsname_658_tl} {Jamaica}
+\tl_const:cn {c_phone_US_ortsname_659_tl} {Alabama}
\tl_const:cn {c_phone_US_ortsname_660_tl} {Missouri}
\tl_const:cn {c_phone_US_ortsname_661_tl} {California}
\tl_const:cn {c_phone_US_ortsname_662_tl} {Mississippi}
@@ -236,6 +249,7 @@
\tl_const:cn {c_phone_US_ortsname_681_tl} {West~Virginia}
\tl_const:cn {c_phone_US_ortsname_682_tl} {Texas}
\tl_const:cn {c_phone_US_ortsname_684_tl} {American~Samoa}
+\tl_const:cn {c_phone_US_ortsname_689_tl} {Florida}
\tl_const:cn {c_phone_US_ortsname_701_tl} {North~Dakota}
\tl_const:cn {c_phone_US_ortsname_702_tl} {Nevada}
\tl_const:cn {c_phone_US_ortsname_703_tl} {Virginia}
@@ -259,11 +273,13 @@
\tl_const:cn {c_phone_US_ortsname_725_tl} {Nevada}
\tl_const:cn {c_phone_US_ortsname_726_tl} {Texas}
\tl_const:cn {c_phone_US_ortsname_727_tl} {Florida}
+\tl_const:cn {c_phone_US_ortsname_730_tl} {Illinois}
\tl_const:cn {c_phone_US_ortsname_731_tl} {Tennessee}
\tl_const:cn {c_phone_US_ortsname_732_tl} {New~Jersey}
\tl_const:cn {c_phone_US_ortsname_734_tl} {Michigan}
\tl_const:cn {c_phone_US_ortsname_737_tl} {Texas}
\tl_const:cn {c_phone_US_ortsname_740_tl} {Ohio}
+\tl_const:cn {c_phone_US_ortsname_742_tl} {Ontario}
\tl_const:cn {c_phone_US_ortsname_743_tl} {North~Carolina}
\tl_const:cn {c_phone_US_ortsname_747_tl} {California}
\tl_const:cn {c_phone_US_ortsname_754_tl} {Florida}
@@ -276,6 +292,7 @@
\tl_const:cn {c_phone_US_ortsname_767_tl} {Dominica}
\tl_const:cn {c_phone_US_ortsname_769_tl} {Mississippi}
\tl_const:cn {c_phone_US_ortsname_770_tl} {Georgia}
+\tl_const:cn {c_phone_US_ortsname_771_tl} {Washington,~D.\,C.}
\tl_const:cn {c_phone_US_ortsname_772_tl} {Florida}
\tl_const:cn {c_phone_US_ortsname_773_tl} {Illinois}
\tl_const:cn {c_phone_US_ortsname_774_tl} {Massachusetts}
@@ -309,12 +326,15 @@
\tl_const:cn {c_phone_US_ortsname_819_tl} {Quebec}
\tl_const:cn {c_phone_US_ortsname_820_tl} {California}
\tl_const:cn {c_phone_US_ortsname_825_tl} {Alberta}
+\tl_const:cn {c_phone_US_ortsname_826_tl} {Virginia}
\tl_const:cn {c_phone_US_ortsname_828_tl} {North~Carolina}
\tl_const:cn {c_phone_US_ortsname_829_tl} {Dominican~Republic}
\tl_const:cn {c_phone_US_ortsname_830_tl} {Texas}
\tl_const:cn {c_phone_US_ortsname_831_tl} {California}
\tl_const:cn {c_phone_US_ortsname_832_tl} {Texas}
\tl_const:cn {c_phone_US_ortsname_838_tl} {New~York}
+\tl_const:cn {c_phone_US_ortsname_839_tl} {South~Carolina}
+\tl_const:cn {c_phone_US_ortsname_840_tl} {California}
\tl_const:cn {c_phone_US_ortsname_843_tl} {South~Carolina}
\tl_const:cn {c_phone_US_ortsname_845_tl} {New~York}
\tl_const:cn {c_phone_US_ortsname_847_tl} {Illinois}
@@ -371,7 +391,10 @@
\tl_const:cn {c_phone_US_ortsname_939_tl} {Puerto~Rico}
\tl_const:cn {c_phone_US_ortsname_940_tl} {Texas}
\tl_const:cn {c_phone_US_ortsname_941_tl} {Florida}
+\tl_const:cn {c_phone_US_ortsname_943_tl} {Georgia}
+\tl_const:cn {c_phone_US_ortsname_945_tl} {Texas}
\tl_const:cn {c_phone_US_ortsname_947_tl} {Michigan}
+\tl_const:cn {c_phone_US_ortsname_948_tl} {Virginia}
\tl_const:cn {c_phone_US_ortsname_949_tl} {California}
\tl_const:cn {c_phone_US_ortsname_951_tl} {California}
\tl_const:cn {c_phone_US_ortsname_952_tl} {Minnesota}
@@ -392,6 +415,10 @@
\tl_const:cn {c_phone_US_ortsname_500_tl} {Non-Geographic~Service}
\tl_const:cn {c_phone_US_ortsname_521_tl} {Non-Geographic~Service}
\tl_const:cn {c_phone_US_ortsname_522_tl} {Non-Geographic~Service}
+\tl_const:cn {c_phone_US_ortsname_523_tl} {Non-Geographic~Service}
+\tl_const:cn {c_phone_US_ortsname_524_tl} {Non-Geographic~Service}
+\tl_const:cn {c_phone_US_ortsname_525_tl} {Non-Geographic~Service}
+\tl_const:cn {c_phone_US_ortsname_526_tl} {Non-Geographic~Service}
\tl_const:cn {c_phone_US_ortsname_533_tl} {Non-Geographic~Service}
\tl_const:cn {c_phone_US_ortsname_544_tl} {Non-Geographic~Service}
\tl_const:cn {c_phone_US_ortsname_566_tl} {Non-Geographic~Service}
diff --git a/macros/latex/contrib/phonenumbers/tex/phn-US_Vorwahlen.tex b/macros/latex/contrib/phonenumbers/tex/phn-US_Vorwahlen.tex
index b8989839b5..c79902373d 100644
--- a/macros/latex/contrib/phonenumbers/tex/phn-US_Vorwahlen.tex
+++ b/macros/latex/contrib/phonenumbers/tex/phn-US_Vorwahlen.tex
@@ -1,5 +1,5 @@
% phonenumbers package: area codes of the North American Numbering Plan
-% Datum: 5. August 2018
+% Datum: 20. August 2021
\clist_const:Nn \c_phone_US_ortsvorwahlen_clist {201,
202,
203,
@@ -23,6 +23,7 @@
224,
225,
226,
+227, % Freischaltungsdatum noch unklar
228,
229,
231,
@@ -48,6 +49,7 @@
269,
270,
272,
+274, % Freischaltungsdatum noch unklar
276,
279,
281,
@@ -84,6 +86,7 @@
337,
339,
340,
+341,
343,
345,
346,
@@ -95,6 +98,7 @@
364,
365,
367,
+368, % ab 2022-04-23
380,
385,
386,
@@ -119,6 +123,7 @@
423,
424,
425,
+428, % ab 2023-04-29
430,
431,
432,
@@ -131,12 +136,16 @@
442,
443,
445,
+447,
+448,
450,
458,
463,
+464, % Freischaltungsdatum noch unklar
469,
470,
473,
+474, % ab 2021-10-02
475,
478,
479,
@@ -177,12 +186,14 @@
567,
570,
571,
+572,
573,
574,
575,
579,
580,
581,
+582,
585,
586,
587,
@@ -220,8 +231,10 @@
649,
650,
651,
+656, % ab 2022-02-22
657,
658,
+659,
660,
661,
662,
@@ -236,6 +249,7 @@
681,
682,
684,
+689,
701,
702,
703,
@@ -259,11 +273,13 @@
725,
726,
727,
+730, % Freischaltungsdatum noch unklar
731,
732,
734,
737,
740,
+742, % ab 2021-10-16
743,
747,
754,
@@ -276,6 +292,7 @@
767,
769,
770,
+771, % ab 2021-11-09
772,
773,
774,
@@ -309,12 +326,15 @@
819,
820,
825,
+826, % ab 2022-06-14
828,
829,
830,
831,
832,
838,
+839,
+840,
843,
845,
847,
@@ -371,7 +391,10 @@
939,
940,
941,
+943, % ab 2022-03-15
+945,
947,
+948, % ab 2022-05-09
949,
951,
952,
@@ -390,8 +413,10 @@
986,
989}
\clist_const:Nn \c_phone_US_obligatorische_ortsvorwahlen_clist {201,
+% 202, bisher 7D, demnächst 10D (Einführung von 771)
203,
204,
+205,
206,
208,
210,
@@ -399,10 +424,12 @@
213,
214,
215,
+217,
220,
223,
224,
226,
+227, % Freischaltungsdatum noch unklar
234,
236,
240,
@@ -414,6 +441,7 @@
267,
270,
272,
+274, % Freischaltungsdatum noch unklar
279,
281,
289,
@@ -432,6 +460,7 @@
332,
336,
339,
+341,
343,
346,
347,
@@ -440,11 +469,13 @@
364,
365,
367,
+368, % ab 2022-04-23
380,
385,
402,
403,
404,
+405,
407,
408,
410,
@@ -455,6 +486,7 @@
419,
424,
425,
+428, % ab 2023-04-29
430,
431,
437,
@@ -462,15 +494,21 @@
442,
443,
445,
+447,
+448,
450,
458,
463,
+464, % Freischaltungsdatum noch unklar
469,
470,
+474, % ab 2021-10-02
475,
484,
503,
+% 506, bisher 7D, demnächst 10D (Einführung von 428)
508,
+510,
512,
514,
518,
@@ -478,6 +516,7 @@
531,
534,
539,
+% 540, bisher 7D, demnächst 10D (Einführung von 826)
541,
548,
551,
@@ -485,8 +524,10 @@
567,
570,
571,
+572,
579,
581,
+582,
587,
601,
604,
@@ -496,6 +537,7 @@
614,
615,
617,
+% 618, bisher 7D, demnächst 10D (Einführung von 730)
619,
628,
629,
@@ -505,8 +547,10 @@
640,
646,
647,
+656, % ab 2022-02-22
657,
658,
+659,
667,
669,
672,
@@ -514,30 +558,34 @@
680,
681,
682,
+689,
702,
703,
704,
706,
-% 709, Bisher 7D, demnächst 10D (Einführung von 879 in Neufundland)
+% 708, bisher 7D, demnächst 10D (Einführung von 464)
713,
714,
-715,
+% 715, 2021-08-16 nicht mehr in der Liste aufgeführt, aber Overlay zu 534
717,
718,
720,
724,
725,
726,
+730, % Freischaltungsdatum noch unklar
732,
737,
740,
743,
747,
754,
+% 757, bisher 7D, demnächst 10D (Einführung von 948)
760,
762,
769,
770,
+771, % ab 2021-11-09
773,
774,
778,
@@ -548,22 +596,29 @@
786,
787,
801,
+803,
805,
809,
812,
+% 813, bisher 7D, demnächst 10D (Einführung von 656)
+814,
815,
817,
818,
819,
820,
825,
+826, % ab 2022-06-14
829,
832,
838,
+839,
+840,
843,
847,
848,
849,
+850,
854,
857,
858,
@@ -572,20 +627,25 @@
872,
873,
878,
-879,
902,
903,
905,
+909,
916,
917,
918,
919,
+% 920, bisher 7D, demnächst 10D (Einführung von 274)
929,
930,
934,
+937,
938,
939,
+943, % ab 2022-03-15
+945,
947,
+948, % ab 2022-05-09
954,
959,
971,
@@ -598,6 +658,10 @@
\clist_const:Nn \c_phone_US_sondervorwahlen_clist {500,
521,
522,
+523,
+524,
+525,
+526,
533,
544,
566,
diff --git a/macros/latex/contrib/phonenumbers/tex/phonenumbers.sty b/macros/latex/contrib/phonenumbers/tex/phonenumbers.sty
index c91c3254a5..5b060f7b6e 100644
--- a/macros/latex/contrib/phonenumbers/tex/phonenumbers.sty
+++ b/macros/latex/contrib/phonenumbers/tex/phonenumbers.sty
@@ -2,8 +2,8 @@
% LaTeX-Paket zur Formatierung von Telefonnummern
% LaTeX package for formatting telephone numbers
% Autor: K. Wehr
-% Version: 2.2
-% Datum: 18. August 2019
+% Version: 2.3
+% Datum: 20. August 2021
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -14,8 +14,7 @@
% version 2005/12/01 or later.
-\RequirePackage{xparse}
-\ProvidesExplPackage {phonenumbers} {2019/08/18} {2.2} {Telephone number package}
+\ProvidesExplPackage {phonenumbers} {2021-08-20} {2.3} {Telephone number package}
\RequirePackage{l3keys2e}
\RequirePackage{ltxcmds}
@@ -23,9 +22,9 @@
\clist_const:Nn \c_phone_ziffern_clist {0,1,2,3,4,5,6,7,8,9}
\clist_const:Nn \c_phone_gliederungszeichen_clist {(,),[,],/}
-\tl_const:Nn \c_phone_bindestrich_tl {\kern1pt - \kern1pt}
-\tl_const:Nn \c_phone_schraegstrich_tl {\kern1pt \slash \kern1pt}
-\tl_const:Nn \c_phone_pluszeichen_tl {+ \kern1pt}
+\tl_const:Nn \c_phone_bindestrich_tl { \kern 1pt - \kern 1pt }
+\tl_const:Nn \c_phone_schraegstrich_tl { \kern 1pt \slash \kern 1pt }
+\tl_const:Nn \c_phone_pluszeichen_tl { + \kern 1pt }
\str_new:N \l_phone_land_str
\str_new:N \l_phone_heimatland_str
@@ -35,6 +34,7 @@
\str_new:N \l_phone_vorwahltrennung_str
\str_new:N \l_phone_auslandsvorwahltrennung_str
\str_new:N \l_phone_heimatvorwahl_str
+\str_new:N \l_phone_rufnummer_str
\str_new:N \l_phone_bereinigte_nummer_str
\str_new:N \l_phone_bereinigte_durchwahl_str
\str_new:N \l_phone_linktext_str
@@ -55,11 +55,10 @@
\cs_generate_variant:Nn \str_if_eq:nnT {xnT}
\cs_generate_variant:Nn \str_if_eq:nnF {xnF}
\cs_generate_variant:Nn \str_if_eq:nnTF {xnTF}
-\cs_generate_variant:Nn \str_case:nn {Vn,xn}
+\cs_generate_variant:Nn \str_case:nn {xn}
\cs_generate_variant:Nn \str_case:nnT {xnT}
-\cs_generate_variant:Nn \str_case:nnF {VnF,xnF}
-\cs_generate_variant:Nn \str_case:nnTF {VnTF,xnTF}
-\cs_generate_variant:Nn \str_put_right:Nn {NV}
+\cs_generate_variant:Nn \str_case:nnF {xnF}
+\cs_generate_variant:Nn \str_case:nnTF {xnTF}
\cs_generate_variant:Nn \str_tail:n {x}
\cs_generate_variant:Nn \tl_put_right:Nn {Nv}
\cs_generate_variant:Nn \msg_warning:nnn {onn}
@@ -68,17 +67,20 @@
\msg_new:nnn {phonenumbers} {illegal character}
{
- illegal~character~'#1'~in~phone~number~\msg_line_context:
+ illegal~character~'#1'~in~phone~number~
+ \msg_line_context:
}
\msg_new:nnn {phonenumbers} {empty input}
{
- empty~phone~number~\msg_line_context:
+ empty~phone~number~
+ \msg_line_context:
}
\msg_new:nnn {phonenumbers} {empty extension}
{
- empty~extension~(Durchwahl)~\msg_line_context:
+ empty~extension~(Durchwahl)~
+ \msg_line_context:
}
\msg_new:nnn {phonenumbers} {illegal extension}
@@ -118,47 +120,79 @@
\msg_new:nnn {phonenumbers} {illegal start of subscriber number}
{
- subscriber~number~(Teilnehmerrufnummer)~starts~with~#1~in~\phone_landesadjektiv:V \l_phone_land_str\ phone~number~\msg_line_context:
- }
+ subscriber~number~(Teilnehmerrufnummer)~starts~with~#1~in~
+ \phone_landesadjektiv:V \l_phone_land_str
+ \c_space_tl
+ phone~number~
+ \msg_line_context:
+ }
\msg_new:nnn {phonenumbers} {missing subscriber number}
{
- no~subscriber~number~(Teilnehmerrufnummer)~given~in~\phone_landesadjektiv:V \l_phone_land_str\ phone~number~\msg_line_context:
+ no~subscriber~number~(Teilnehmerrufnummer)~given~in~
+ \phone_landesadjektiv:V \l_phone_land_str
+ \c_space_tl
+ phone~number~
+ \msg_line_context:
}
\msg_new:nnn {phonenumbers} {invalid area code}
{
- unknown~area~code~(Vorwahl)~in~\phone_landesadjektiv:V \l_phone_land_str\ phone~number~\msg_line_context:
+ unknown~area~code~(Vorwahl)~in~
+ \phone_landesadjektiv:V \l_phone_land_str
+ \c_space_tl
+ phone~number~
+ \msg_line_context:
}
\msg_new:nnn {phonenumbers} {number too short}
{
- \phone_landesadjektiv:V \l_phone_land_str\ #1~number~has~less~than~#2~digits~\msg_line_context:
+ \phone_landesadjektiv:V \l_phone_land_str
+ \c_space_tl
+ #1~number~has~less~than~#2~digits~
+ \msg_line_context:
}
\msg_new:nnn {phonenumbers} {number too long}
{
- \phone_landesadjektiv:V \l_phone_land_str\ #1~number~has~more~than~#2~digits~\msg_line_context:
+ \phone_landesadjektiv:V \l_phone_land_str
+ \c_space_tl
+ #1~number~has~more~than~#2~digits~
+ \msg_line_context:
}
\msg_new:nnn {phonenumbers} {home country set}
{
- home~country~set~to~\l_phone_heimatland_str\ \msg_line_context:
+ home~country~set~to~
+ \l_phone_heimatland_str
+ \c_space_tl
+ \msg_line_context:
}
\msg_new:nnn {phonenumbers} {home country cleared}
{
- home~country~\l_phone_heimatland_str\ has~been~deleted~\msg_line_context:
+ home~country~
+ \l_phone_heimatland_str
+ \c_space_tl
+ has~been~deleted~
+ \msg_line_context:
}
\msg_new:nnn {phonenumbers} {home area code set}
{
- Your~home~is~in~\tl_use:c {c_phone_\l_phone_heimatland_str _ortsname_#1_tl}~(area~code~#1)~according~to~line~\msg_line_number:.
+ Your~home~is~in~
+ \tl_use:c {c_phone_\l_phone_heimatland_str _ortsname_#1_tl}
+ \c_space_tl
+ (area~code~#1)~according~to~line~
+ \msg_line_number:.
}
\msg_new:nnn {phonenumbers} {home area code cleared}
{
- home~area~code~\l_phone_heimatvorwahl_str\ has~been~deleted~\msg_line_context:
+ home~area~code~
+ \l_phone_heimatvorwahl_str
+ \c_space_tl
+ has~been~deleted~\msg_line_context:
}
\msg_new:nnn {phonenumbers} {invalid home area code}
@@ -172,12 +206,14 @@
\msg_new:nnn {phonenumbers} {invalid country code}
{
- illegal~country~code~\msg_line_context:
+ illegal~country~code~
+ \msg_line_context:
}
\msg_new:nnn {phonenumbers} {country code only}
{
- phone~number~consists~of~a~country~code~only~\msg_line_context:
+ phone~number~consists~of~a~country~code~only~
+ \msg_line_context:
}
\cs_new:Npn \phone_landesadjektiv:n #1
@@ -372,30 +408,53 @@
}
}
-\cs_new:Npn \phone_gruppierte_ziffernfolge_schreiben:n #1
+
+\cs_new_protected:Npn \phone_von_vorne_gruppiert_schreiben:n #1
{
- \int_set:Nn \l_phone_ziffernzahl_int {\tl_count:n {#1}}
+ \int_set:Nn \l_phone_ziffernzahl_int { \tl_count:n {#1} }
+ \tl_clear:N \l_phone_formatierte_nummer_tl
+
+ \int_step_inline:nn {\l_phone_ziffernzahl_int}
+ {
+ \tl_put_right:Nx \l_phone_formatierte_nummer_tl { \tl_item:nn {#1} {##1} }
+
+ \int_if_even:nT {##1}
+ {
+ \int_compare:nNnT {##1} < {\l_phone_ziffernzahl_int}
+ { \tl_put_right:Nn \l_phone_formatierte_nummer_tl {\,} }
+ }
+ }
+
+ \tl_put_right:NV \l_phone_ausgabetext_tl \l_phone_formatierte_nummer_tl
+ }
+
+\cs_generate_variant:Nn \phone_von_vorne_gruppiert_schreiben:n {x,V}
+
+
+\cs_new_protected:Npn \phone_von_hinten_gruppiert_schreiben:n #1
+ {
+ \int_set:Nn \l_phone_ziffernzahl_int { \tl_count:n {#1} }
\tl_clear:N \l_phone_formatierte_nummer_tl
\int_step_inline:nnnn {\l_phone_ziffernzahl_int} {-1} {1}
{
- \tl_put_left:Nx \l_phone_formatierte_nummer_tl {\tl_item:nn {#1} {##1}}
+ \tl_put_left:Nx \l_phone_formatierte_nummer_tl { \tl_item:nn {#1} {##1} }
- \int_if_even:nT {\l_phone_ziffernzahl_int + 1 - ##1}
+ \int_if_even:nT { \l_phone_ziffernzahl_int + 1 - ##1 }
{
\int_compare:nNnT {##1} > {1}
- {\tl_put_left:Nn \l_phone_formatierte_nummer_tl {\,}}
+ { \tl_put_left:Nn \l_phone_formatierte_nummer_tl {\,} }
}
}
\tl_put_right:NV \l_phone_ausgabetext_tl \l_phone_formatierte_nummer_tl
}
-\cs_generate_variant:Nn \phone_gruppierte_ziffernfolge_schreiben:n {V,x}
+\cs_generate_variant:Nn \phone_von_hinten_gruppiert_schreiben:n {x,V}
% #1: Landeskennzahl
-\cs_new:Npn \phone_auslandsvorwahl_schreiben:n #1
+\cs_new_protected:Npn \phone_auslandsvorwahl_schreiben:n #1
{
\str_case:VnTF \l_phone_land_str
{
@@ -406,9 +465,9 @@
{
\str_case:Vn \l_phone_auslandsvorwahltyp_str
{
- {international} {\tl_put_right:Nn \l_phone_ausgabetext_tl {\c_phone_pluszeichen_tl #1}}
- {european} {\phone_gruppierte_ziffernfolge_schreiben:n {00#1}}
- {american} {\phone_gruppierte_ziffernfolge_schreiben:n {011#1}}
+ {international} { \tl_put_right:Nn \l_phone_ausgabetext_tl { \c_phone_pluszeichen_tl #1 } }
+ {european} { \phone_von_hinten_gruppiert_schreiben:n {00#1} }
+ {american} { \phone_von_hinten_gruppiert_schreiben:n {011#1} }
}
}
{
@@ -461,7 +520,7 @@
% Ziffer eingelesen
\str_put_right:Nn \l_phone_bereinigte_nummer_str {##1}
- \bool_lazy_and:nnT {\l_phone_erstes_zeichen_bool} {\str_if_eq_p:nn {##1} {0}}
+ \bool_lazy_and:nnT {\l_phone_erstes_zeichen_bool} { \str_if_eq_p:nn {##1} {0} }
{
\bool_set_true:N \l_phone_null_am_anfang_bool
}
@@ -470,9 +529,9 @@
{
\bool_set_false:N \l_phone_zweites_zeichen_bool
- \bool_lazy_and:nnT {\l_phone_null_am_anfang_bool} {\str_if_eq_p:nn {##1} {0}}
+ \bool_lazy_and:nnT {\l_phone_null_am_anfang_bool} { \str_if_eq_p:nn {##1} {0} }
{
- \bool_set_true:N \l_phone_auslandsnummer_bool
+ \bool_set_true:N \l_phone_auslandsnummer_bool
\str_clear:N \l_phone_bereinigte_nummer_str
}
}
@@ -510,39 +569,39 @@
\bool_if:NT \l_phone_auslandsnummer_bool
{
- \int_set:Nn \l_tmpa_int {\str_count:N \l_phone_bereinigte_nummer_str}
+ \int_set:Nn \l_tmpa_int { \str_count:N \l_phone_bereinigte_nummer_str }
\int_compare:nNnTF {\l_tmpa_int} > {1}
{
- \str_if_eq:xnTF {\str_head:N \l_phone_bereinigte_nummer_str} {1}
+ \str_if_eq:xnTF { \str_head:N \l_phone_bereinigte_nummer_str } {1}
{
\str_set:Nn \l_phone_land_str {US}
- \str_set:Nx \l_phone_bereinigte_nummer_str {\str_range:Nnn \l_phone_bereinigte_nummer_str {2} {-1}}
+ \str_set:Nx \l_phone_bereinigte_nummer_str { \str_range:Nnn \l_phone_bereinigte_nummer_str {2} {-1} }
}
{
\int_compare:nNnTF {\l_tmpa_int} > {2}
{
- \str_case:xnTF {\str_range:Nnn \l_phone_bereinigte_nummer_str {1} {2}}
+ \str_case:xnTF { \str_range:Nnn \l_phone_bereinigte_nummer_str {1} {2} }
{
- {33} {\str_set:Nn \l_phone_land_str {FR}}
- {43} {\str_set:Nn \l_phone_land_str {AT}}
- {44} {\str_set:Nn \l_phone_land_str {UK}}
- {49} {\str_set:Nn \l_phone_land_str {DE}}
+ {33} { \str_set:Nn \l_phone_land_str {FR} }
+ {43} { \str_set:Nn \l_phone_land_str {AT} }
+ {44} { \str_set:Nn \l_phone_land_str {UK} }
+ {49} { \str_set:Nn \l_phone_land_str {DE} }
}
{
- \str_set:Nx \l_phone_bereinigte_nummer_str {\str_range:Nnn \l_phone_bereinigte_nummer_str {3} {-1}}
+ \str_set:Nx \l_phone_bereinigte_nummer_str { \str_range:Nnn \l_phone_bereinigte_nummer_str {3} {-1} }
\str_put_left:Nn \l_phone_bereinigte_nummer_str {0}
}
{
\int_compare:nNnTF {\l_tmpa_int} > {3}
{
- \str_case:xnTF {\str_range:Nnn \l_phone_bereinigte_nummer_str {1} {3}}
+ \str_case:xnTF { \str_range:Nnn \l_phone_bereinigte_nummer_str {1} {3} }
{
- {262} {\str_set:Nx \l_phone_bereinigte_nummer_str {\str_range:Nnn \l_phone_bereinigte_nummer_str {4} {-1}}}
+ {262} { \str_set:Nx \l_phone_bereinigte_nummer_str { \str_range:Nnn \l_phone_bereinigte_nummer_str {4} {-1} } }
{508} { } % Saint-Pierre-et-Miquelon
- {590} {\str_set:Nx \l_phone_bereinigte_nummer_str {\str_range:Nnn \l_phone_bereinigte_nummer_str {4} {-1}}}
- {594} {\str_set:Nx \l_phone_bereinigte_nummer_str {\str_range:Nnn \l_phone_bereinigte_nummer_str {4} {-1}}}
- {596} {\str_set:Nx \l_phone_bereinigte_nummer_str {\str_range:Nnn \l_phone_bereinigte_nummer_str {4} {-1}}}
+ {590} { \str_set:Nx \l_phone_bereinigte_nummer_str { \str_range:Nnn \l_phone_bereinigte_nummer_str {4} {-1} } }
+ {594} { \str_set:Nx \l_phone_bereinigte_nummer_str { \str_range:Nnn \l_phone_bereinigte_nummer_str {4} {-1} } }
+ {596} { \str_set:Nx \l_phone_bereinigte_nummer_str { \str_range:Nnn \l_phone_bereinigte_nummer_str {4} {-1} } }
}
{
\str_set:Nn \l_phone_land_str {FR}
@@ -569,7 +628,7 @@
\bool_lazy_and:nnT
{
- \bool_lazy_or_p:nn {\str_if_eq_p:Vn \l_phone_land_str {DE}} {\str_if_eq_p:Vn \l_phone_land_str {AT}}
+ \bool_lazy_or_p:nn { \str_if_eq_p:Vn \l_phone_land_str {DE} } { \str_if_eq_p:Vn \l_phone_land_str {AT} }
}
{
\str_if_empty_p:N \l_phone_bereinigte_durchwahl_str
@@ -592,7 +651,7 @@
\int_compare:nNnF {\l_phone_bindestrichposition_int} = {-1}
{
% Nummer enthält einen Bindestrich
- \str_set:Nx \l_tmpa_str { \str_range:Nnn \l_phone_bereinigte_nummer_str {1} {\l_phone_bindestrichposition_int - 1} }
+ \str_set:Nx \l_tmpa_str { \str_range:Nnn \l_phone_bereinigte_nummer_str {1} { \l_phone_bindestrichposition_int - 1 } }
\tl_remove_all:Nn \l_tmpa_str {-}
\phone_enthaelt_vorwahl:NT \l_tmpa_str
@@ -607,13 +666,13 @@
\str_if_eq:xnF { \str_head:N \l_tmpa_str } {0}
{
\bool_set_true:N \l_tmpa_bool
- % Nummer beginnt nicht mit 0 (ist also eine reine Teilnehmerrufnummer)
+ % Nummer beginnt nicht mit 0 (ist also eine reine Teilnehmerrufnummer)
}
\bool_if:NT \l_tmpa_bool
{
% Teil nach dem Bindestrich als Durchwahl abtrennen
- \phone_durchwahl_ueberpruefen:x { \str_range:Nnn \l_phone_bereinigte_nummer_str {\l_phone_bindestrichposition_int + 1} {-1} }
+ \phone_durchwahl_ueberpruefen:x { \str_range:Nnn \l_phone_bereinigte_nummer_str { \l_phone_bindestrichposition_int + 1 } {-1} }
\str_set_eq:NN \l_phone_bereinigte_nummer_str \l_tmpa_str
}
}
@@ -626,7 +685,7 @@
% #1: eingebene Durchwahl
-\cs_new:Npn \phone_durchwahl_ueberpruefen:n #1
+\cs_new_protected:Npn \phone_durchwahl_ueberpruefen:n #1
{
\tl_if_blank:nTF {#1}
{
@@ -654,7 +713,7 @@
\cs_generate_variant:Nn \phone_durchwahl_ueberpruefen:n {x}
-\cs_new:Npn \phone_nummer_ausgeben:
+\cs_new_protected:Npn \phone_nummer_ausgeben:
{
\bool_if:NF \l_phone_eingabe_leer_bool
{
@@ -671,11 +730,11 @@
}
}
- \bool_lazy_and:nnTF {\l_phone_nummer_verlinken_bool} {!\str_if_empty_p:N \l_phone_linktext_str}
+ \bool_lazy_and:nnTF {\l_phone_nummer_verlinken_bool} { ! \str_if_empty_p:N \l_phone_linktext_str }
{
\ltx@ifpackageloaded {hyperref}
{
- \href{tel\c_colon_str\l_phone_linktext_str}{\l_phone_ausgabetext_tl}
+ \href { tel \c_colon_str \l_phone_linktext_str } {\l_phone_ausgabetext_tl}
}
{
\l_phone_ausgabetext_tl
@@ -686,17 +745,18 @@
}
}
-\cs_new:Npn \phone_vorwahlliste_ausgeben:n #1
+\cs_new_protected:Npn \phone_vorwahlliste_ausgeben:n #1
{
\begin{tabbing}
\str_case:VnF \l_phone_land_str
{
- {US} {\hspace{3em}}
+ {US} { \hspace {3em} }
}
{
- \hspace{4em}
+ \hspace {4em}
}
- \= \kill
+ \=
+ \kill
\bool_set_false:N \l_phone_zeilenumbruch_bool
@@ -721,9 +781,9 @@
\tl_use:N \l_phone_ausgabetext_tl
}
{
- \bool_if:nTF {\str_if_eq_p:Vn \l_phone_land_str {FR}}
+ \bool_if:nTF { \str_if_eq_p:Vn \l_phone_land_str {FR} }
{
- \phone_gruppierte_ziffernfolge_schreiben:n {##1}
+ \phone_von_vorne_gruppiert_schreiben:n {##1}
\tl_use:N \l_phone_ausgabetext_tl
}
{
@@ -764,7 +824,7 @@
\IfValueT {#3}
{
- \bool_lazy_or:nnF {\str_if_eq_p:Vn \l_phone_land_str {DE}} {\str_if_eq_p:Vn \l_phone_land_str {AT}}
+ \bool_lazy_or:nnF { \str_if_eq_p:Vn \l_phone_land_str {DE} } { \str_if_eq_p:Vn \l_phone_land_str {AT} }
{
\bool_if:NF \l_phone_durchwahl_leer_bool
{
@@ -829,15 +889,15 @@
{
\bool_set_false:N \l_phone_vorwahl_gefunden_bool
- \int_set:Nn \l_phone_pruefnummerlaenge_int {\str_count:N #1}
+ \int_set:Nn \l_phone_pruefnummerlaenge_int { \str_count:N #1 }
\int_step_inline:nnnn {6} {-1} {2}
{
\bool_if:NF \l_phone_vorwahl_gefunden_bool
{
- \int_compare:nT {\l_phone_pruefnummerlaenge_int >= ##1}
+ \int_compare:nT { \l_phone_pruefnummerlaenge_int >= ##1 }
{
- \str_set:Nx \l_phone_vorwahl_str {\str_range:Nnn #1 {1} {##1}}
+ \str_set:Nx \l_phone_vorwahl_str { \str_range:Nnn #1 {1} {##1} }
\clist_if_in:cVT {c_phone_\l_phone_land_str _vorwahlen_clist} \l_phone_vorwahl_str
{
@@ -858,12 +918,12 @@
% #1: Vorwahl, #2: Soll die führende null ausgegeben werden?
-\cs_new:Npn \phone_gruppierte_vorwahl_schreiben:nN #1#2
+\cs_new_protected:Npn \phone_gruppierte_vorwahl_schreiben:nN #1#2
{
\str_if_eq:VnTF \l_phone_land_str {UK}
{
% britische Vorwahl
- \int_compare:nNnTF {\str_count:n {#1}} = {6}
+ \int_compare:nNnTF { \str_count:n {#1} } = {6}
{
% sechsstellige britische Vorwahl: Gliederung vor der zweitletzten Ziffer
\bool_if:NTF #2
@@ -871,11 +931,11 @@
\tl_put_right:Nx \l_phone_ausgabetext_tl { \str_range:nnn {#1} {1} {4} }
}
{
- \tl_put_right:Nx \l_phone_ausgabetext_tl { \str_tail:x {\str_range:nnn {#1} {1} {4}} }
+ \tl_put_right:Nx \l_phone_ausgabetext_tl { \str_tail:x { \str_range:nnn {#1} {1} {4} } }
}
\tl_put_right:Nn \l_phone_ausgabetext_tl {\,}
- \tl_put_right:Nx \l_phone_ausgabetext_tl {\str_range:nnn {#1} {5} {6}}
+ \tl_put_right:Nx \l_phone_ausgabetext_tl { \str_range:nnn {#1} {5} {6} }
}
{
% nicht sechsstellige britische Vorwahl
@@ -884,29 +944,29 @@
\tl_put_right:Nn \l_phone_ausgabetext_tl {#1}
}
{
- \tl_put_right:Nx \l_phone_ausgabetext_tl {\str_tail:n {#1}}
+ \tl_put_right:Nx \l_phone_ausgabetext_tl { \str_tail:n {#1} }
}
}
}
{
% nichtbritische Vorwahl
- \bool_lazy_and:nnTF {\str_if_eq_p:Vn \l_phone_land_str {DE}} {\int_compare_p:nNn {\str_count:n {#1}} = {5}}
+ \bool_lazy_and:nnTF { \str_if_eq_p:Vn \l_phone_land_str {DE} } { \int_compare_p:nNn { \str_count:n {#1} } = {5} }
{
% fünfstellige deutsche Vorwahl
- \str_set:Nx \l_tmpa_str {\str_range:nnn {#1} {1} {4}}
- \str_set:Nx \l_tmpb_str {\str_range:nnn {#1} {5} {5}}
-
- \bool_lazy_or:nnTF {\str_if_eq_p:Vn \l_tmpa_str {0137}} {\str_if_eq_p:Vn \l_tmpa_str {0180}}
+ \str_set:Nx \l_tmpa_str { \str_range:nnn {#1} {1} {4} }
+ \str_set:Nx \l_tmpb_str { \str_range:nnn {#1} {5} {5} }
+
+ \bool_lazy_or:nnTF { \str_if_eq_p:Vn \l_tmpa_str {0137} } { \str_if_eq_p:Vn \l_tmpa_str {0180} }
{
% fünfstellige deutsche Vorwahl mit Tarifkennung: letzte Ziffer steht allein
\bool_if:NTF #2
{
- \phone_gruppierte_ziffernfolge_schreiben:V \l_tmpa_str
+ \phone_von_hinten_gruppiert_schreiben:V \l_tmpa_str
}
{
- \phone_gruppierte_ziffernfolge_schreiben:x {\str_tail:N \l_tmpa_str}
+ \phone_von_hinten_gruppiert_schreiben:x { \str_tail:N \l_tmpa_str }
}
-
+
\tl_put_right:Nn \l_phone_ausgabetext_tl {\,}
\tl_put_right:NV \l_phone_ausgabetext_tl \l_tmpb_str
}
@@ -914,10 +974,10 @@
% fünfstellige deutsche Vorwahl ohne Tarifkennung
\bool_if:NTF #2
{
- \phone_gruppierte_ziffernfolge_schreiben:n {#1}
+ \phone_von_hinten_gruppiert_schreiben:n {#1}
}
{
- \phone_gruppierte_ziffernfolge_schreiben:x {\str_tail:n {#1}}
+ \phone_von_hinten_gruppiert_schreiben:x { \str_tail:n {#1} }
}
}
}
@@ -925,17 +985,17 @@
% sonstige Vorwahl
\bool_if:NTF #2
{
- \phone_gruppierte_ziffernfolge_schreiben:n {#1}
+ \phone_von_hinten_gruppiert_schreiben:n {#1}
}
{
- \phone_gruppierte_ziffernfolge_schreiben:x {\str_tail:n {#1}}
+ \phone_von_hinten_gruppiert_schreiben:x { \str_tail:n {#1} }
}
}
}
}
% #1: Vorwahl, #2: Soll die führende null ausgegeben werden?
-\cs_new:Npn \phone_geklammerte_vorwahl_schreiben:nN #1#2
+\cs_new_protected:Npn \phone_geklammerte_vorwahl_schreiben:nN #1#2
{
% Klammern werden nur bei Ortsvorwahlen gesetzt
\clist_if_in:cnTF {c_phone_\l_phone_land_str _ortsvorwahlen_clist} {#1}
@@ -950,9 +1010,9 @@
}
% #1: Nummer, #2: Mindestlänge, #3: Höchstlänge, #4: Nummernart
-\cs_new:Npn \phone_nummernlaenge_ueberpruefen:nnnn #1#2#3#4
+\cs_new_protected:Npn \phone_nummernlaenge_ueberpruefen:nnnn #1#2#3#4
{
- \int_set:Nn \l_tmpa_int {\str_count:n {#1}}
+ \int_set:Nn \l_tmpa_int { \str_count:n {#1} }
\int_compare:nNnTF {\l_tmpa_int} < {#2}
{
@@ -982,9 +1042,9 @@
% #1: Vorwahl, #2: Folgt eine Rufnummer?
-\cs_new:Npn \phone_DE_AT_vorwahl_schreiben:nn #1 #2
+\cs_new_protected:Npn \phone_DE_AT_vorwahl_schreiben:nn #1 #2
{
- \bool_lazy_or:nnTF {\str_if_eq_p:Vn \l_phone_auslandsvorwahltyp_str {off}} {\str_if_eq_p:NN \l_phone_heimatland_str \l_phone_land_str}
+ \bool_lazy_or:nnTF { \str_if_eq_p:Vn \l_phone_auslandsvorwahltyp_str {off} } { \str_if_eq_p:NN \l_phone_heimatland_str \l_phone_land_str }
{
\clist_if_in:cnT {c_phone_\l_phone_land_str _sondervorwahlen_clist} {#1}
{
@@ -994,7 +1054,7 @@
}
}
- \bool_lazy_and:nnF {\str_if_eq_p:NN \l_phone_heimatland_str \l_phone_land_str} {\str_if_eq_p:Vn \l_phone_heimatvorwahl_str {#1}}
+ \bool_lazy_and:nnF { \str_if_eq_p:NN \l_phone_heimatland_str \l_phone_land_str } { \str_if_eq_p:Vn \l_phone_heimatvorwahl_str {#1} }
{
\str_case:Vn \l_phone_vorwahldarstellung_str
{
@@ -1009,7 +1069,7 @@
}
{
\phone_gruppierte_vorwahl_schreiben:nN {#1} \c_true_bool
-
+
\tl_put_right:Nx \l_phone_ausgabetext_tl
{
\str_case:VnF \l_phone_vorwahltrennung_str
@@ -1035,7 +1095,7 @@
{
\tl_put_right:Nn \l_phone_ausgabetext_tl {(}
}
-
+
\tl_if_exist:cTF {c_phone_\l_phone_land_str _ortsname_#1_tl}
{
\tl_put_right:Nv \l_phone_ausgabetext_tl {c_phone_\l_phone_land_str _ortsname_#1_tl}
@@ -1043,7 +1103,7 @@
{
\phone_gruppierte_vorwahl_schreiben:nN {#1} \c_true_bool
}
-
+
\tl_put_right:Nx \l_phone_ausgabetext_tl
{
\str_case:VnF \l_phone_vorwahltrennung_str
@@ -1074,11 +1134,11 @@
\tl_put_right:Nv \l_phone_ausgabetext_tl {c_phone_\l_phone_land_str _ortsname_#1_tl}
\tl_put_right:NV \l_phone_ausgabetext_tl \c_space_tl
}
-
+
\str_if_eq:VnTF \l_phone_vorwahltrennung_str {brackets}
{
\phone_geklammerte_vorwahl_schreiben:nN {#1} \c_true_bool
-
+
\bool_if:nT {#2}
{
\tl_put_right:NV \l_phone_ausgabetext_tl \c_space_tl
@@ -1086,7 +1146,7 @@
}
{
\phone_gruppierte_vorwahl_schreiben:nN {#1} \c_true_bool
-
+
\bool_if:nT {#2}
{
\tl_put_right:Nx \l_phone_ausgabetext_tl
@@ -1138,7 +1198,7 @@
{
\str_if_eq:VnTF \l_phone_land_str {DE} {+49} {+43}
}
- \str_put_right:Nx \l_phone_linktext_str {\str_tail:n {#1}}
+ \str_put_right:Nx \l_phone_linktext_str { \str_tail:n {#1} }
}
}
@@ -1146,11 +1206,11 @@
% #1: Vorwahl, #2: Teilnehmerrufnummer
-\cs_new:Npn \phone_DE_festnetzteilnehmerrufnummernlaenge_ueberpruefen:Nn #1#2
+\cs_new_protected:Npn \phone_DE_festnetzteilnehmerrufnummernlaenge_ueberpruefen:Nn #1#2
{
- \int_set:Nn \l_tmpa_int {\str_count:N #1}
- \int_add:Nn \l_tmpa_int {\str_count:n {#2}}
- \int_add:Nn \l_tmpa_int {\str_count:N \l_phone_bereinigte_durchwahl_str}
+ \int_set:Nn \l_tmpa_int { \str_count:N #1 }
+ \int_add:Nn \l_tmpa_int { \str_count:n {#2} }
+ \int_add:Nn \l_tmpa_int { \str_count:N \l_phone_bereinigte_durchwahl_str }
\int_compare:nNnTF {\l_tmpa_int} > {13}
{
@@ -1158,8 +1218,8 @@
\msg_warning:nnnn {phonenumbers} {number too long} {landline} {13}
}
{
- \int_set:Nn \l_tmpa_int {\str_count:n {#2}}
- \int_add:Nn \l_tmpa_int {\str_count:N \l_phone_bereinigte_durchwahl_str}
+ \int_set:Nn \l_tmpa_int { \str_count:n {#2} }
+ \int_add:Nn \l_tmpa_int { \str_count:N \l_phone_bereinigte_durchwahl_str }
\int_compare:nNnTF {\l_tmpa_int} < {3}
{
@@ -1173,10 +1233,10 @@
}
% #1: Nummer
-\cs_new:Npn \phone_DE_MABEZnummernlaenge_ueberpruefen:N #1
+\cs_new_protected:Npn \phone_DE_MABEZnummernlaenge_ueberpruefen:N #1
{
- \int_set:Nn \l_tmpa_int {\str_count:N #1}
- \int_add:Nn \l_tmpa_int {\str_count:N \l_phone_bereinigte_durchwahl_str}
+ \int_set:Nn \l_tmpa_int { \str_count:N #1 }
+ \int_add:Nn \l_tmpa_int { \str_count:N \l_phone_bereinigte_durchwahl_str }
\int_compare:nNnTF {\l_tmpa_int} > {11}
{
@@ -1196,7 +1256,7 @@
}
% #1: Vorwahl, #2: Teilnehmerrufnummer
-\cs_new:Npn \phone_DE_teilnehmerrufnummer_schreiben:Nn #1 #2
+\cs_new_protected:Npn \phone_DE_teilnehmerrufnummer_schreiben:Nn #1 #2
{
% Überprüfen der Nummernlänge
\str_if_empty:NTF #1
@@ -1211,7 +1271,7 @@
\clist_if_in:NVTF \c_phone_DE_ortsvorwahlen_clist #1
{
% Festnetznummer
- \str_if_eq:xnTF {\str_head:n {#2}} {0}
+ \str_if_eq:xnTF { \str_head:n {#2} } {0}
{
\msg_warning:nnn {phonenumbers} {illegal start of subscriber number} {0}
}
@@ -1224,37 +1284,37 @@
\str_set_eq:NN \l_tmpa_str #1
\str_put_right:Nn \l_tmpa_str {#2}
- \str_if_eq:xnTF {\str_range:Nnn #1 {1} {5}} {09009}
+ \str_if_eq:xnTF { \str_range:Nnn #1 {1} {5} } {09009}
{
\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {12} {12} {09009}
}
{
- \str_case:xnF {\str_range:Nnn #1 {1} {4}}
+ \str_case:xnF { \str_range:Nnn #1 {1} {4} }
{
- {0137} {\phone_DE_MABEZnummernlaenge_ueberpruefen:N \l_tmpa_str}
- {0160} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {11} {12} {mobile~phone}}
- {0162} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {11} {12} {mobile~phone}}
- {0163} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {11} {12} {mobile~phone}}
- {0164} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {5} {14} {0164}} % Funkruf
- {0168} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {5} {15} {0168}} % Funkruf
- {0169} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {5} {15} {0169}} % Funkruf
- {0180} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {11} {11} {0180}}
- {0181} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {8} {15} {0181}}
- {0191} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {5} {14} {0191}}
- {0192} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {5} {14} {0192}}
- {0193} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {5} {14} {0193}}
- {0194} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {7} {14} {0194}}
- {0700} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {12} {12} {0700}}
- {0800} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {11} {14} {freephone}}
- {0900} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {11} {11} {premium~service}}
+ {0137} { \phone_DE_MABEZnummernlaenge_ueberpruefen:N \l_tmpa_str }
+ {0160} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {11} {12} {mobile~phone} }
+ {0162} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {11} {12} {mobile~phone} }
+ {0163} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {11} {12} {mobile~phone} }
+ {0164} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {5} {14} {0164} } % Funkruf
+ {0168} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {5} {15} {0168} } % Funkruf
+ {0169} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {5} {15} {0169} } % Funkruf
+ {0180} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {11} {11} {0180} }
+ {0181} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {8} {15} {0181} }
+ {0191} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {5} {14} {0191} }
+ {0192} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {5} {14} {0192} }
+ {0193} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {5} {14} {0193} }
+ {0194} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {7} {14} {0194} }
+ {0700} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {12} {12} {0700} }
+ {0800} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {11} {14} {freephone} }
+ {0900} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {11} {11} {premium~service} }
}
{
\str_case:xn {\str_range:Nnn #1 {1} {3}}
{
- {015} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {12} {12} {mobile~phone}}
- {017} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {11} {12} {mobile~phone}}
- {018} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {12} {12} {018}}
- {032} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {12} {12} {032}}
+ {015} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {12} {12} {mobile~phone} }
+ {017} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {11} {12} {mobile~phone} }
+ {018} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {12} {12} {018} }
+ {032} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {12} {12} {032} }
}
}
}
@@ -1262,7 +1322,7 @@
\str_if_empty:NF \l_phone_bereinigte_durchwahl_str
{
% Mobilfunk- und Sondernummern dürfen keine Durchwahl enthalten (ausgenommen MABEZ-Nummern)
- \str_if_eq:xnF {\str_range:Nnn #1 {1} {4}} {0137}
+ \str_if_eq:xnF { \str_range:Nnn #1 {1} {4} } {0137}
{
\msg_warning:nn {phonenumbers} {odd extension}
}
@@ -1283,7 +1343,7 @@
\bool_if:NTF \l_phone_teilnehmerrufnummer_gueltig_bool
{
- \phone_gruppierte_ziffernfolge_schreiben:n {#2}
+ \phone_von_hinten_gruppiert_schreiben:n {#2}
}
{
\str_put_right:Nn \l_phone_ausgabetext_tl {#2}
@@ -1292,7 +1352,7 @@
\str_if_empty:NF \l_phone_bereinigte_durchwahl_str
{
\tl_put_right:NV \l_phone_ausgabetext_tl \c_phone_bindestrich_tl
- \phone_gruppierte_ziffernfolge_schreiben:V \l_phone_bereinigte_durchwahl_str
+ \phone_von_hinten_gruppiert_schreiben:V \l_phone_bereinigte_durchwahl_str
}
}
@@ -1304,12 +1364,12 @@
\cs_new_protected:Npn \phone_DE_AT_nummer_schreiben:
{
- \str_if_eq:xnTF {\str_head:N \l_phone_bereinigte_nummer_str} {0}
+ \str_if_eq:xnTF { \str_head:N \l_phone_bereinigte_nummer_str } {0}
{
\phone_enthaelt_vorwahl:NTF \l_phone_bereinigte_nummer_str
{
- \int_set:Nn \l_phone_DE_AT_hauptnummerlaenge_int {\str_count:N \l_phone_bereinigte_nummer_str}
- \int_set:Nn \l_phone_DE_AT_vorwahllaenge_int {\str_count:N \l_phone_vorwahl_str}
+ \int_set:Nn \l_phone_DE_AT_hauptnummerlaenge_int { \str_count:N \l_phone_bereinigte_nummer_str }
+ \int_set:Nn \l_phone_DE_AT_vorwahllaenge_int { \str_count:N \l_phone_vorwahl_str }
\phone_DE_AT_vorwahl_schreiben:Vx \l_phone_vorwahl_str
{
@@ -1323,7 +1383,7 @@
{
\use:c {phone_\l_phone_land_str _teilnehmerrufnummer_schreiben:Nx} \l_phone_vorwahl_str
{
- \str_range:Nnn \l_phone_bereinigte_nummer_str {\l_phone_DE_AT_vorwahllaenge_int + 1} {-1}
+ \str_range:Nnn \l_phone_bereinigte_nummer_str { \l_phone_DE_AT_vorwahllaenge_int + 1 } {-1}
}
}
}
@@ -1349,11 +1409,11 @@
% #1: Vorwahl, #2: Teilnehmerrufnummer
-\cs_new:Npn \phone_AT_festnetzteilnehmerrufnummernlaenge_ueberpruefen:Nn #1#2
+\cs_new_protected:Npn \phone_AT_festnetzteilnehmerrufnummernlaenge_ueberpruefen:Nn #1#2
{
- \int_set:Nn \l_tmpa_int {\str_count:N #1}
- \int_add:Nn \l_tmpa_int {\str_count:n {#2}}
- \int_add:Nn \l_tmpa_int {\str_count:N \l_phone_bereinigte_durchwahl_str}
+ \int_set:Nn \l_tmpa_int { \str_count:N #1 }
+ \int_add:Nn \l_tmpa_int { \str_count:n {#2} }
+ \int_add:Nn \l_tmpa_int { \str_count:N \l_phone_bereinigte_durchwahl_str }
\int_compare:nNnTF {\l_tmpa_int} > {13}
{
@@ -1361,8 +1421,8 @@
\msg_warning:nnnn {phonenumbers} {number too long} {landline} {13}
}
{
- \int_set:Nn \l_tmpa_int {\str_count:n {#2}}
- \int_add:Nn \l_tmpa_int {\str_count:N \l_phone_bereinigte_durchwahl_str}
+ \int_set:Nn \l_tmpa_int { \str_count:n {#2} }
+ \int_add:Nn \l_tmpa_int { \str_count:N \l_phone_bereinigte_durchwahl_str }
\int_compare:nNnTF {\l_tmpa_int} < {5}
{
@@ -1370,25 +1430,25 @@
\msg_warning:nnn {phonenumbers} {subscriber number too short} {5}
}
{
- \bool_lazy_and:nnTF {\str_if_eq_p:Vn #1 {01}} {\int_compare_p:nNn {\l_tmpa_int} < {7}}
+ \bool_lazy_and:nnTF { \str_if_eq_p:Vn #1 {01} } { \int_compare_p:nNn {\l_tmpa_int} < {7} }
{
% Wiener Teilnehmerrufnummer hat weniger als 7 Stellen
\msg_warning:nnn {phonenumbers} {subscriber number too short} {7}
}
- {
+ {
\bool_lazy_and:nnTF
{
\bool_lazy_any_p:n
{
- {\str_if_eq_p:Vn #1 {02236}}
- {\str_if_eq_p:Vn #1 {02252}}
- {\str_if_eq_p:Vn #1 {0316}}
- {\str_if_eq_p:Vn #1 {0463}}
- {\str_if_eq_p:Vn #1 {0512}}
- {\str_if_eq_p:Vn #1 {05572}}
- {\str_if_eq_p:Vn #1 {0662}}
- {\str_if_eq_p:Vn #1 {07242}}
- {\str_if_eq_p:Vn #1 {0732}}
+ { \str_if_eq_p:Vn #1 {02236} }
+ { \str_if_eq_p:Vn #1 {02252} }
+ { \str_if_eq_p:Vn #1 {0316} }
+ { \str_if_eq_p:Vn #1 {0463} }
+ { \str_if_eq_p:Vn #1 {0512} }
+ { \str_if_eq_p:Vn #1 {05572} }
+ { \str_if_eq_p:Vn #1 {0662} }
+ { \str_if_eq_p:Vn #1 {07242} }
+ { \str_if_eq_p:Vn #1 {0732} }
}
}
{
@@ -1414,11 +1474,11 @@
}
% #1: Vorwahl, #2: Teilnehmerrufnummer
-\cs_new:Npn \phone_AT_festnetzteilnehmerrufnummer_ueberpruefen:Nn #1#2
+\cs_new_protected:Npn \phone_AT_festnetzteilnehmerrufnummer_ueberpruefen:Nn #1#2
{
- \str_set:Nx \l_tmpa_str {\str_head:n {#2}}
+ \str_set:Nx \l_tmpa_str { \str_head:n {#2} }
- \bool_lazy_or:nnTF {\str_if_eq_p:Vn \l_tmpa_str {0}} {\str_if_eq_p:Vn \l_tmpa_str {1}}
+ \bool_lazy_or:nnTF { \str_if_eq_p:Vn \l_tmpa_str {0} } { \str_if_eq_p:Vn \l_tmpa_str {1} }
{
\msg_warning:nnV {phonenumbers} {illegal start of subscriber number} \l_tmpa_str
}
@@ -1428,7 +1488,7 @@
}
% #1: Vorwahl, #2: Teilnehmerrufnummer
-\cs_new:Npn \phone_AT_teilnehmerrufnummer_schreiben:Nn #1 #2
+\cs_new_protected:Npn \phone_AT_teilnehmerrufnummer_schreiben:Nn #1 #2
{
\str_if_empty:NTF #1
{
@@ -1451,33 +1511,33 @@
\str_case:VnF #1
{
- {0517} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {9} {13} {VPN}}
- {0718} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {dial~up}}
- {0720} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {location~independant}}
- {0780} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {convergent~service}}
- {0800} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {freephone}}
- {0804} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {dial~up}}
- {0810} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {service}}
- {0820} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {service}}
- {0821} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {service}}
- {0828} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {service}}
- {0900} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {premium~service}}
- {0901} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {premium~service}}
- {0930} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {premium~service}}
- {0931} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {premium~service}}
- {0939} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {premium~service}}
- }
- {
- \str_case:xn {\str_range:Nnn #1 {1} {3}}
+ {0517} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {9} {13} {VPN} }
+ {0718} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {dial~up} }
+ {0720} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {location~independant} }
+ {0780} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {convergent~service} }
+ {0800} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {freephone} }
+ {0804} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {dial~up} }
+ {0810} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {service} }
+ {0820} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {service} }
+ {0821} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {service} }
+ {0828} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {service} }
+ {0900} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {premium~service} }
+ {0901} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {premium~service} }
+ {0930} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {premium~service} }
+ {0931} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {premium~service} }
+ {0939} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {10} {13} {premium~service} }
+ }
+ {
+ \str_case:xn { \str_range:Nnn #1 {1} {3} }
{
- {050} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {9} {13} {VPN}}
- {057} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {9} {13} {VPN}}
- {059} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {9} {13} {VPN}}
- {065} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {9} {13} {mobile~phone}}
- {066} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {9} {13} {mobile~phone}}
- {067} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {9} {13} {mobile~phone}}
- {068} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {9} {13} {mobile~phone}}
- {069} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {9} {13} {mobile~phone}}
+ {050} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {9} {13} {VPN} }
+ {057} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {9} {13} {VPN} }
+ {059} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {9} {13} {VPN} }
+ {065} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {9} {13} {mobile~phone} }
+ {066} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {9} {13} {mobile~phone} }
+ {067} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {9} {13} {mobile~phone} }
+ {068} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {9} {13} {mobile~phone} }
+ {069} { \phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {9} {13} {mobile~phone} }
}
}
@@ -1501,7 +1561,7 @@
\bool_if:NTF \l_phone_teilnehmerrufnummer_gueltig_bool
{
- \phone_gruppierte_ziffernfolge_schreiben:n {#2}
+ \phone_von_hinten_gruppiert_schreiben:n {#2}
}
{
\str_put_right:Nn \l_phone_ausgabetext_tl {#2}
@@ -1510,7 +1570,7 @@
\str_if_empty:NF \l_phone_bereinigte_durchwahl_str
{
\tl_put_right:NV \l_phone_ausgabetext_tl \c_phone_bindestrich_tl
- \phone_gruppierte_ziffernfolge_schreiben:V \l_phone_bereinigte_durchwahl_str
+ \phone_von_hinten_gruppiert_schreiben:V \l_phone_bereinigte_durchwahl_str
}
}
@@ -1543,6 +1603,7 @@
{
{0262} {262}
{026200} {262}
+ {0263} {262}
{0269} {262}
{0508} {508}
{0590} {590}
@@ -1556,16 +1617,36 @@
{0694} {594}
{0696} {596}
{0697} {596}
+ {07005} {590}
+ {07006} {594}
+ {07007} {596}
+ {07008} {262}
+ {07009} {262}
+ {09475} {590}
+ {09476} {594}
+ {09477} {596}
+ {09478} {262}
+ {09479} {262}
+ {09760} {590}
+ {09761} {590}
+ {09762} {262}
+ {09763} {262}
+ {09764} {594}
+ {09765} {594}
+ {09766} {596}
+ {09767} {596}
+ {09768} {590}
+ {09769} {262}
}
{
33
}
}
-% #1: Vorwahl
-\cs_new:Npn \phone_FR_vorwahl_schreiben:n #1
+% #1: Vorwahl, #2: Rufnummer
+\cs_new_protected:Npn \phone_FR_vorwahl_schreiben:nn #1#2
{
- \bool_lazy_or:nnTF {\str_if_eq_p:Vn \l_phone_auslandsvorwahltyp_str {off}} {\str_if_eq_p:Vn \l_phone_heimatland_str {FR}}
+ \bool_lazy_or:nnTF { \str_if_eq_p:Vn \l_phone_auslandsvorwahltyp_str {off} } { \str_if_eq_p:Vn \l_phone_heimatland_str {FR} }
{
\clist_if_in:NnT \c_phone_FR_sondervorwahlen_clist {#1}
{
@@ -1575,14 +1656,15 @@
}
}
- \bool_lazy_and:nnF {\str_if_eq_p:Vn \l_phone_heimatland_str {FR}} {\str_if_eq_p:Vn \l_phone_heimatvorwahl_str {#1}}
+ \bool_lazy_and:nnF { \str_if_eq_p:Vn \l_phone_heimatland_str {FR} } { \str_if_eq_p:Vn \l_phone_heimatvorwahl_str {#1} }
{
\str_case:Vn \l_phone_vorwahldarstellung_str
{
{number}
{
- \phone_gruppierte_ziffernfolge_schreiben:n {#1}
- \tl_put_right:Nn \l_phone_ausgabetext_tl {\,}
+ \phone_von_vorne_gruppiert_schreiben:n {#1}
+ \int_if_even:nT { \str_count:n {#1} }
+ { \tl_put_right:Nn \l_phone_ausgabetext_tl {\,} }
}
{place}
{
@@ -1592,8 +1674,9 @@
\tl_put_right:NV \l_phone_ausgabetext_tl \c_space_tl
}
{
- \phone_gruppierte_ziffernfolge_schreiben:n {#1}
- \tl_put_right:Nn \l_phone_ausgabetext_tl {\,}
+ \phone_von_vorne_gruppiert_schreiben:n {#1}
+ \int_if_even:nT { \str_count:n {#1} }
+ { \tl_put_right:Nn \l_phone_ausgabetext_tl {\,} }
}
}
{place-and-number}
@@ -1603,43 +1686,60 @@
\tl_put_right:Nv \l_phone_ausgabetext_tl {c_phone_FR_ortsname_#1_tl}
\tl_put_right:NV \l_phone_ausgabetext_tl \c_space_tl
}
-
- \phone_gruppierte_ziffernfolge_schreiben:n {#1}
- \tl_put_right:NV \l_phone_ausgabetext_tl {\,}
+
+ \phone_von_vorne_gruppiert_schreiben:n {#1}
+ \int_if_even:nT { \str_count:n {#1} }
+ { \tl_put_right:Nn \l_phone_ausgabetext_tl {\,} }
}
}
}
}
{
- \phone_auslandsvorwahl_schreiben:x {\phone_FR_ermittle_landeskennzahl:n {#1}}
+ \phone_auslandsvorwahl_schreiben:x { \phone_FR_ermittle_landeskennzahl:n {#1} }
\tl_put_right:NV \l_phone_ausgabetext_tl \c_space_tl
\str_if_eq:nnF {#1} {0508} % in Saint-Pierre-et-Miquelon entfällt die Ortsvorwahl
{
- \phone_gruppierte_ziffernfolge_schreiben:x {\str_tail:n {#1}}
- \tl_put_right:Nn \l_phone_ausgabetext_tl {\,}
+ \int_if_even:nTF { \str_count:n {#2} }
+ {
+ % Rufnummer hat gerade Stellenanzahl
+ \phone_von_hinten_gruppiert_schreiben:x { \str_tail:n {#1} }
+ \tl_put_right:Nn \l_phone_ausgabetext_tl {\,}
+ }
+ {
+ \int_if_even:nTF { \str_count:n {#1} }
+ {
+ % Rufnummer hat ungerade Stellenanzahl, die Vorwahl ohne die 0 auch
+ \phone_von_vorne_gruppiert_schreiben:x { \str_tail:n {#1} }
+ }
+ {
+ % Rufnummer hat ungerade Stellenanzahl, die Vorwahl ohne die 0 hat gerade Stellenanzahl
+ \tl_put_right:Nx \l_phone_ausgabetext_tl { \str_item:nn {#1} {2} \, }
+ \phone_von_vorne_gruppiert_schreiben:x { \str_range:nnn {#1} {3} {-1} }
+ }
+ }
}
}
- \str_put_right:Nx \l_phone_linktext_str {+\phone_FR_ermittle_landeskennzahl:n {#1}}
+ \str_put_right:Nx \l_phone_linktext_str { + \phone_FR_ermittle_landeskennzahl:n {#1} }
\str_if_eq:nnF {#1} {0508} % in Saint-Pierre-et-Miquelon entfällt die Ortsvorwahl
{
- \str_put_right:Nx \l_phone_linktext_str {\str_tail:n {#1}}
+ \str_put_right:Nx \l_phone_linktext_str { \str_tail:n {#1} }
}
}
-\cs_generate_variant:Nn \phone_FR_vorwahl_schreiben:n {V}
+\cs_generate_variant:Nn \phone_FR_vorwahl_schreiben:nn {VV,xV}
-\cs_new:Npn \phone_FR_nummer_schreiben:
+\cs_new_protected:Npn \phone_FR_nummer_schreiben:
{
- \int_set:Nn \l_phone_nummerlaenge_int {\str_count:N \l_phone_bereinigte_nummer_str}
-
+ \int_set:Nn \l_phone_nummerlaenge_int { \str_count:N \l_phone_bereinigte_nummer_str }
+
\int_compare:nNnTF {\l_phone_nummerlaenge_int} < {10}
{
- \str_if_eq:xnTF {\str_head:N \l_phone_bereinigte_nummer_str} {3}
+ \str_if_eq:xnTF { \str_head:N \l_phone_bereinigte_nummer_str } {3}
{
\int_compare:nNnTF {\l_phone_nummerlaenge_int} < {4}
{
@@ -1650,10 +1750,10 @@
\int_compare:nNnTF {\l_phone_nummerlaenge_int} > {4}
{
\msg_warning:nnnn {phonenumbers} {number too long} {short} {4}
- \tl_put_right:NV \l_phone_ausgabetext_tl \l_phone_bereinigte_nummer_str
+ \tl_put_right:NV \l_phone_ausgabetext_tl \l_phone_bereinigte_nummer_str
}
{
- \phone_gruppierte_ziffernfolge_schreiben:V \l_phone_bereinigte_nummer_str
+ \phone_von_vorne_gruppiert_schreiben:V \l_phone_bereinigte_nummer_str
\str_put_right:NV \l_phone_linktext_str \l_phone_bereinigte_nummer_str
}
}
@@ -1666,36 +1766,80 @@
{
\int_compare:nNnTF {\l_phone_nummerlaenge_int} > {10}
{
- \msg_warning:nnnn {phonenumbers} {number too long} {phone} {10}
- \tl_put_right:NV \l_phone_ausgabetext_tl \l_phone_bereinigte_nummer_str
+ \str_if_eq:xnTF { \str_range:Nnn \l_phone_bereinigte_nummer_str {1} {4} } {0700}
+ {
+ \int_compare:nNnTF { \str_item:Nn \l_phone_bereinigte_nummer_str {5} } < {5}
+ {
+ % überlange Mobilfunknummer (machine to machine) im Mutterland (14 Stellen)
+ \str_set:Nx \l_phone_rufnummer_str { \str_range:Nnn \l_phone_bereinigte_nummer_str {5} {-1} }
+ \phone_FR_vorwahl_schreiben:xV { \str_range:Nnn \l_phone_bereinigte_nummer_str {1} {4} } \l_phone_rufnummer_str
+ \phone_nummernlaenge_ueberpruefen:Vnnn \l_phone_bereinigte_nummer_str {14} {14} {machine~to~machine}
+ \bool_if:NT \l_phone_teilnehmerrufnummer_gueltig_bool
+ {
+ \phone_von_vorne_gruppiert_schreiben:V \l_phone_rufnummer_str
+ }
+ }
+ {
+ % überlange Mobilfunknummer (machine to machine) in den Überseegebieten (13 Stellen)
+ \str_set:Nx \l_phone_rufnummer_str { \str_range:Nnn \l_phone_bereinigte_nummer_str {6} {-1} }
+ \phone_FR_vorwahl_schreiben:xV { \str_range:Nnn \l_phone_bereinigte_nummer_str {1} {5} } \l_phone_rufnummer_str
+ \phone_nummernlaenge_ueberpruefen:Vnnn \l_phone_bereinigte_nummer_str {13} {13} {machine~to~machine}
+ \bool_if:NT \l_phone_teilnehmerrufnummer_gueltig_bool
+ {
+ \bool_lazy_or:nnTF { \str_if_eq_p:Vn \l_phone_auslandsvorwahltyp_str {off} } { \str_if_eq_p:Vn \l_phone_heimatland_str {FR} }
+ {
+ % ohne Auslandsvorwahl steht am Ende eine Einzelziffer
+ \tl_put_right:Nx \l_phone_ausgabetext_tl { \str_head:N \l_phone_rufnummer_str \, }
+ \phone_von_vorne_gruppiert_schreiben:x { \str_tail:N \l_phone_rufnummer_str }
+ }
+ {
+ % mit Auslandsvorwahl ergeben sich durchgehend Zweiergruppen
+ \phone_von_vorne_gruppiert_schreiben:V \l_phone_rufnummer_str
+ }
+ }
+ }
+
+ \bool_if:NTF \l_phone_teilnehmerrufnummer_gueltig_bool
+ {
+ % Für gültige Nummern Linktext schreiben:
+ \str_put_right:NV \l_phone_linktext_str \l_phone_rufnummer_str
+ }
+ {
+ % Für ungültige Nummern Linktext löschen und ungruppierte Nummer schreiben:
+ \str_clear:N \l_phone_linktext_str
+ \tl_put_right:NV \l_phone_ausgabetext_tl \l_phone_rufnummer_str
+ }
+ }
+ {
+ \msg_warning:nnnn {phonenumbers} {number too long} {phone} {10}
+ \tl_put_right:NV \l_phone_ausgabetext_tl \l_phone_bereinigte_nummer_str
+ }
}
{
- \str_if_eq:xnTF {\str_head:N \l_phone_bereinigte_nummer_str} {0}
+ \str_if_eq:xnTF { \str_head:N \l_phone_bereinigte_nummer_str } {0}
{
\bool_set_false:N \l_phone_vorwahl_gefunden_bool
-
+
\int_step_inline:nnnn {6} {-1} {2}
{
\bool_if:NF \l_phone_vorwahl_gefunden_bool
{
- \int_compare:nT {\l_phone_nummerlaenge_int >= ##1}
+ \int_compare:nT { \l_phone_nummerlaenge_int >= ##1 }
{
- \str_set:Nx \l_tmpa_str {\str_range:Nnn \l_phone_bereinigte_nummer_str {1} {##1}}
-
+ \str_set:Nx \l_tmpa_str { \str_range:Nnn \l_phone_bereinigte_nummer_str {1} {##1} }
+
\clist_if_in:NVT \c_phone_FR_vorwahlen_clist \l_tmpa_str
{
\bool_set_true:N \l_phone_vorwahl_gefunden_bool
-
- \phone_FR_vorwahl_schreiben:V \l_tmpa_str
-
- \str_set:Nx \l_tmpb_str {\str_range:Nnn \l_phone_bereinigte_nummer_str {##1 + 1} {-1}}
- \phone_gruppierte_ziffernfolge_schreiben:V \l_tmpb_str
- \str_put_right:NV \l_phone_linktext_str \l_tmpb_str
+ \str_set:Nx \l_phone_rufnummer_str { \str_range:Nnn \l_phone_bereinigte_nummer_str {##1 + 1} {-1} }
+ \phone_FR_vorwahl_schreiben:VV \l_tmpa_str \l_phone_rufnummer_str
+ \phone_von_hinten_gruppiert_schreiben:V \l_phone_rufnummer_str
+ \str_put_right:NV \l_phone_linktext_str \l_phone_rufnummer_str
}
}
}
}
-
+
\bool_if:NF \l_phone_vorwahl_gefunden_bool
{
\msg_warning:nn {phonenumbers} {invalid area code}
@@ -1727,13 +1871,13 @@
\msg_new:nnn {phonenumbers} {UK/national dialling required}
{
British~subscriber~number~starting~with~0~or~1~requires~an~area~code~\msg_line_context:
- }
+ }
% #1: Vorwahl, #2: Folgt eine Rufnummer?
-\cs_new:Npn \phone_UK_vorwahl_schreiben:nn #1 #2
+\cs_new_protected:Npn \phone_UK_vorwahl_schreiben:nn #1 #2
{
- \bool_lazy_or:nnTF {\str_if_eq_p:Vn \l_phone_auslandsvorwahltyp_str {off}} {\str_if_eq_p:Vn \l_phone_heimatland_str {UK}}
+ \bool_lazy_or:nnTF { \str_if_eq_p:Vn \l_phone_auslandsvorwahltyp_str {off} } { \str_if_eq_p:Vn \l_phone_heimatland_str {UK} }
{
\clist_if_in:NnT \c_phone_UK_sondervorwahlen_clist {#1}
{
@@ -1743,7 +1887,7 @@
}
}
- \bool_lazy_and:nnF {\str_if_eq_p:Vn \l_phone_heimatland_str {UK}} {\str_if_eq_p:Vn \l_phone_heimatvorwahl_str {#1}}
+ \bool_lazy_and:nnF { \str_if_eq_p:Vn \l_phone_heimatland_str {UK} } { \str_if_eq_p:Vn \l_phone_heimatvorwahl_str {#1} }
{
\str_case:Vn \l_phone_vorwahldarstellung_str
{
@@ -1773,7 +1917,7 @@
{
\tl_put_right:Nn \l_phone_ausgabetext_tl {(}
}
-
+
\tl_if_exist:cTF {c_phone_UK_ortsname_#1_tl}
{
\tl_put_right:Nv \l_phone_ausgabetext_tl {c_phone_UK_ortsname_#1_tl}
@@ -1781,7 +1925,7 @@
{
\phone_gruppierte_vorwahl_schreiben:nN {#1} \c_true_bool
}
-
+
\str_if_eq:VnF \l_phone_vorwahltrennung_str {space}
{
\tl_put_right:Nn \l_phone_ausgabetext_tl {)}
@@ -1806,7 +1950,7 @@
\tl_put_right:Nv \l_phone_ausgabetext_tl {c_phone_UK_ortsname_#1_tl}
\tl_put_right:NV \l_phone_ausgabetext_tl \c_space_tl
}
-
+
\str_if_eq:VnTF \l_phone_vorwahltrennung_str {space}
{
\phone_gruppierte_vorwahl_schreiben:nN {#1} \c_true_bool
@@ -1846,7 +1990,7 @@
\bool_if:nT {#2}
{
\str_put_right:Nn \l_phone_linktext_str {+44}
- \str_put_right:Nx \l_phone_linktext_str {\str_tail:n {#1}}
+ \str_put_right:Nx \l_phone_linktext_str { \str_tail:n {#1} }
}
}
@@ -1854,7 +1998,7 @@
% #1: Vorwahl, #2: Teilnehmerrufnummer
-\cs_new:Npn \phone_UK_teilnehmerrufnummer_schreiben:Nn #1 #2
+\cs_new_protected:Npn \phone_UK_teilnehmerrufnummer_schreiben:Nn #1 #2
{
% Überprüfen der Nummernlänge
\str_if_empty:NTF #1
@@ -1863,7 +2007,7 @@
\phone_nummernlaenge_ueberpruefen:nnnn {#2} {4} {8} {landline}
% Nummern, die mit 0 oder 1 beginnen, erfordern das Wählen der Vorwahl
- \str_case:xnT {\str_head:n {#2}}
+ \str_case:xnT { \str_head:n {#2} }
{
{0} { }
{1} { }
@@ -1877,7 +2021,7 @@
{
% Festnetznummer, muss in der Regel 11 Ziffern umfassen
% Ausnahme: Bei den Vorwahlen 01XXX und 016977 sind auch 10 Ziffern möglich.
- \bool_lazy_or:nnTF {\str_if_eq_p:Vn #1 {016977}} {\int_compare_p:nNn {\str_count:N #1} = {5}}
+ \bool_lazy_or:nnTF { \str_if_eq_p:Vn #1 {016977} } { \int_compare_p:nNn { \str_count:N #1 } = {5} }
{
\phone_nummernlaenge_ueberpruefen:onnn {#1#2} {10} {11} {landline}
}
@@ -1887,7 +2031,7 @@
}
{
% Mobilfunk-/Sondernummer
- \str_if_eq:xnTF {\str_range:Nnn #1 {1} {4}} {0800}
+ \str_if_eq:xnTF { \str_range:Nnn #1 {1} {4} } {0800}
{
% 0800er-Nummern haben 10 oder 11 Ziffern; Ausnahme: 0800 1111
\str_if_eq:nnTF {#2} {1111}
@@ -1917,12 +2061,12 @@
\bool_if:NTF \l_phone_teilnehmerrufnummer_gueltig_bool
{
- \int_compare:nNnTF {\str_count:n {#2}} > {6}
+ \int_compare:nNnTF { \str_count:n {#2} } > {6}
{
% Nummern mit mehr als 6 Ziffern werden in Vierergruppen gegliedert
- \str_put_right:Nx \l_phone_ausgabetext_tl {\str_range:nnn {#2} {1} {-5}}
+ \str_put_right:Nx \l_phone_ausgabetext_tl { \str_range:nnn {#2} {1} {-5} }
\tl_put_right:Nn \l_phone_ausgabetext_tl {\,}
- \str_put_right:Nx \l_phone_ausgabetext_tl {\str_range:nnn {#2} {-4} {-1}}
+ \str_put_right:Nx \l_phone_ausgabetext_tl { \str_range:nnn {#2} {-4} {-1} }
}
{
\str_put_right:Nn \l_phone_ausgabetext_tl {#2}
@@ -1938,9 +2082,9 @@
\cs_new_protected:Npn \phone_UK_nummer_schreiben:
{
- \int_set:Nn \l_phone_nummerlaenge_int {\str_count:N \l_phone_bereinigte_nummer_str}
+ \int_set:Nn \l_phone_nummerlaenge_int { \str_count:N \l_phone_bereinigte_nummer_str }
- \str_if_eq:xnTF {\str_head:N \l_phone_bereinigte_nummer_str} {0}
+ \str_if_eq:xnTF { \str_head:N \l_phone_bereinigte_nummer_str } {0}
{
\bool_set_false:N \l_phone_vorwahl_gefunden_bool
@@ -1948,22 +2092,22 @@
{
\bool_if:NF \l_phone_vorwahl_gefunden_bool
{
- \int_compare:nT {\l_phone_nummerlaenge_int >= ##1}
+ \int_compare:nT { \l_phone_nummerlaenge_int >= ##1 }
{
- \str_set:Nx \l_phone_vorwahl_str {\str_range:Nnn \l_phone_bereinigte_nummer_str {1} {##1}}
+ \str_set:Nx \l_phone_vorwahl_str { \str_range:Nnn \l_phone_bereinigte_nummer_str {1} {##1} }
\clist_if_in:NVT \c_phone_UK_vorwahlen_clist \l_phone_vorwahl_str
{
\bool_set_true:N \l_phone_vorwahl_gefunden_bool
- \phone_UK_vorwahl_schreiben:Vx \l_phone_vorwahl_str {\int_compare_p:nNn {##1} < {\l_phone_nummerlaenge_int}}
-
+ \phone_UK_vorwahl_schreiben:Vx \l_phone_vorwahl_str { \int_compare_p:nNn {##1} < {\l_phone_nummerlaenge_int} }
+
\int_compare:nNnTF {##1} = {\l_phone_nummerlaenge_int}
{
\msg_warning:nn {phonenumbers} {missing subscriber number}
}
{
- \phone_UK_teilnehmerrufnummer_schreiben:Nx \l_phone_vorwahl_str {\str_range:Nnn \l_phone_bereinigte_nummer_str {##1 + 1} {-1}}
+ \phone_UK_teilnehmerrufnummer_schreiben:Nx \l_phone_vorwahl_str { \str_range:Nnn \l_phone_bereinigte_nummer_str {##1 + 1} {-1} }
}
}
}
@@ -2025,11 +2169,11 @@
% #1: Vorwahl, #2: Folgt eine Rufnummer?
-\cs_new:Npn \phone_US_vorwahl_schreiben:nN #1 #2
+\cs_new_protected:Npn \phone_US_vorwahl_schreiben:nN #1 #2
{
- \bool_lazy_or:nnTF {\str_if_eq_p:Vn \l_phone_auslandsvorwahltyp_str {off}} {\str_if_eq_p:Vn \l_phone_heimatland_str {US}}
+ \bool_lazy_or:nnTF { \str_if_eq_p:Vn \l_phone_auslandsvorwahltyp_str {off} } { \str_if_eq_p:Vn \l_phone_heimatland_str {US} }
{
- \bool_lazy_and:nnF {\str_if_eq_p:Vn \l_phone_heimatland_str {US}} {\str_if_eq_p:Vn \l_phone_heimatvorwahl_str {#1}}
+ \bool_lazy_and:nnF { \str_if_eq_p:Vn \l_phone_heimatland_str {US} } { \str_if_eq_p:Vn \l_phone_heimatvorwahl_str {#1} }
{
\bool_if:NTF \l_phone_US_ferngespraechspraefix_bool
{
@@ -2145,7 +2289,7 @@
\tl_use:c {c_phone_US_ortsname_#1_tl}
\c_space_tl
}
-
+
\bool_if:NTF #2
{
\str_case:VnF \l_phone_vorwahltrennung_str
@@ -2202,9 +2346,9 @@
% #1: Ortsvorwahl, #2: Vermittlungsstellennummer
-\cs_new:Npn \phone_US_vermittlungsstellennummer_schreiben:nn #1 #2
+\cs_new_protected:Npn \phone_US_vermittlungsstellennummer_schreiben:nn #1 #2
{
- \str_case:xnTF {\str_head:n {#2}}
+ \str_case:xnTF { \str_head:n {#2} }
{
{0} { }
{1} { }
@@ -2228,7 +2372,7 @@
\bool_if:NTF \l_tmpa_bool
{
- \str_if_eq:xnT {\str_range:nnn {#2} {2} {3}} {11}
+ \str_if_eq:xnT { \str_range:nnn {#2} {2} {3} } {11}
{
\msg_warning:nnn {phonenumbers} {US/invalid central office code} {#2}
}
@@ -2243,7 +2387,7 @@
\tl_put_right:Nn \l_phone_ausgabetext_tl {#2}
- \bool_lazy_or:nnTF {\str_if_eq_p:Vn \l_phone_auslandsvorwahltyp_str {off}} {\str_if_eq_p:Vn \l_phone_heimatland_str {US}}
+ \bool_lazy_or:nnTF { \str_if_eq_p:Vn \l_phone_auslandsvorwahltyp_str {off} } { \str_if_eq_p:Vn \l_phone_heimatland_str {US} }
{
\tl_put_right:NV \l_phone_ausgabetext_tl \c_phone_bindestrich_tl
}
@@ -2267,9 +2411,9 @@
\cs_generate_variant:Nn \phone_US_vermittlungsstellennummer_schreiben:nn {Vx}
-\cs_new:Npn \phone_US_nummer_schreiben:
+\cs_new_protected:Npn \phone_US_nummer_schreiben:
{
- \int_case:nnF {\str_count:N \l_phone_bereinigte_nummer_str}
+ \int_case:nnF { \str_count:N \l_phone_bereinigte_nummer_str }
{
{3}
{
@@ -2285,13 +2429,13 @@
}
{7}
{
- \phone_US_vermittlungsstellennummer_schreiben:Vx \c_empty_tl {\str_range:Nnn \l_phone_bereinigte_nummer_str {1} {3}}
+ \phone_US_vermittlungsstellennummer_schreiben:Vx \c_empty_tl { \str_range:Nnn \l_phone_bereinigte_nummer_str {1} {3} }
- \tl_put_right:Nx \l_phone_ausgabetext_tl {\str_range:Nnn \l_phone_bereinigte_nummer_str {4} {7}}
+ \tl_put_right:Nx \l_phone_ausgabetext_tl { \str_range:Nnn \l_phone_bereinigte_nummer_str {4} {7} }
}
{10}
{
- \str_set:Nx \l_tmpa_str {\str_range:Nnn \l_phone_bereinigte_nummer_str {1} {3}}
+ \str_set:Nx \l_tmpa_str { \str_range:Nnn \l_phone_bereinigte_nummer_str {1} {3} }
\clist_if_in:NVF \c_phone_US_vorwahlen_clist \l_tmpa_str
{
@@ -2300,14 +2444,14 @@
\phone_US_vorwahl_schreiben:VN \l_tmpa_str \c_true_bool
- \phone_US_vermittlungsstellennummer_schreiben:Vx \l_tmpa_str {\str_range:Nnn \l_phone_bereinigte_nummer_str {4} {6}}
+ \phone_US_vermittlungsstellennummer_schreiben:Vx \l_tmpa_str { \str_range:Nnn \l_phone_bereinigte_nummer_str {4} {6} }
- \tl_put_right:Nx \l_phone_ausgabetext_tl {\str_range:Nnn \l_phone_bereinigte_nummer_str {7} {10}}
- \str_put_right:Nx \l_phone_linktext_str {\str_range:Nnn \l_phone_bereinigte_nummer_str {7} {10}}
+ \tl_put_right:Nx \l_phone_ausgabetext_tl { \str_range:Nnn \l_phone_bereinigte_nummer_str {7} {10} }
+ \str_put_right:Nx \l_phone_linktext_str { \str_range:Nnn \l_phone_bereinigte_nummer_str {7} {10} }
}
}
{
- \int_compare:nNnTF {\str_count:N \l_phone_bereinigte_nummer_str} < {10}
+ \int_compare:nNnTF { \str_count:N \l_phone_bereinigte_nummer_str } < {10}
{
\msg_warning:nnnn {phonenumbers} {number too short} {phone} {10}
}
@@ -2322,9 +2466,9 @@
%%%%%%%%%%%%%%%%%%%% SONSTIGE LÄNDER %%%%%%%%%%%%%%%%%%%%
-\cs_new:Npn \phone_SONST_nummer_schreiben:
+\cs_new_protected:Npn \phone_SONST_nummer_schreiben:
{
- \int_set:Nn \l_phone_nummerlaenge_int {\str_count:N \l_phone_bereinigte_nummer_str}
+ \int_set:Nn \l_phone_nummerlaenge_int { \str_count:N \l_phone_bereinigte_nummer_str }
\bool_set_false:N \l_phone_vorwahl_gefunden_bool
@@ -2332,10 +2476,10 @@
{
\bool_if:NF \l_phone_vorwahl_gefunden_bool
{
- \int_compare:nT {\l_phone_nummerlaenge_int >= ##1}
+ \int_compare:nT { \l_phone_nummerlaenge_int >= ##1 }
{
- \str_set:Nx \l_tmpa_str {\str_range:Nnn \l_phone_bereinigte_nummer_str {1} {##1}}
-
+ \str_set:Nx \l_tmpa_str { \str_range:Nnn \l_phone_bereinigte_nummer_str {1} {##1} }
+
\clist_if_in:NVT \c_phone_landeskennzahlen_clist \l_tmpa_str
{
\bool_set_true:N \l_phone_vorwahl_gefunden_bool
@@ -2348,7 +2492,7 @@
}
{
\tl_put_right:NV \l_phone_ausgabetext_tl \c_space_tl
- \phone_gruppierte_ziffernfolge_schreiben:x {\str_range:Nnn \l_phone_bereinigte_nummer_str {##1 + 1} {-1}}
+ \phone_von_hinten_gruppiert_schreiben:x { \str_range:Nnn \l_phone_bereinigte_nummer_str {##1 + 1} {-1} }
\str_put_right:Nn \l_phone_linktext_str {+}
\str_put_right:NV \l_phone_linktext_str \l_phone_bereinigte_nummer_str
diff --git a/support/tikztosvg/CHANGELOG.md b/support/tikztosvg/CHANGELOG.md
index 65dc1bae6e..58d445434d 100644
--- a/support/tikztosvg/CHANGELOG.md
+++ b/support/tikztosvg/CHANGELOG.md
@@ -1,10 +1,18 @@
# CHANGELOG
+## Release 0.3.0
+
+* Made the TeX engine configurable via command-line flags (see the updated
+ manpage)
+* Made LuaTeX the default TeX engine (the previous one was XeTeX)
+* Removed runtime checks for dependencies
+* Removed the install shell script from the repo
+
## Release 0.2.1
* Fixed #1
* Improved the installation scripts
-* Added aditional links in the documentation
+* Added additional links in the documentation
## Release 0.2.0
diff --git a/support/tikztosvg/Makefile b/support/tikztosvg/Makefile
index 1d5779d30a..4c33b05869 100644
--- a/support/tikztosvg/Makefile
+++ b/support/tikztosvg/Makefile
@@ -1,14 +1,17 @@
.PHONY: package install
+BIN_TARGET ?= /usr/bin/
+MAN_TARGET ?= /usr/share/man/man1/
+
# Packages the application for CTAN
package: tikztosvg.tar.gz
install: man/tikztosvg.1 tikztosvg
# Install the executable
- install -g 0 -o 0 -m 755 tikztosvg /usr/bin/
+ install -g 0 -o 0 -m 755 tikztosvg "$(BIN_TARGET)"
# Install the manpage
- install -g 0 -o 0 -m 644 man/tikztosvg.1 /usr/share/man/man1/
+ install -g 0 -o 0 -m 644 man/tikztosvg.1 "$(MAN_TARGET)"
man/tikztosvg.1: man/man.adoc
asciidoctor -b manpage -o $@ $^
@@ -20,7 +23,7 @@ example/%.svg: example/%.tikz
sh ./tikztosvg -p xfrac -p relsize -o $@ $^
# Try to compress the image with svgo
- svgo --pretty --enable=sortAttrs $@ || exit 0
+ svgo --pretty $@ || exit 0
# Packages the application for CTAN
tikztosvg.tar.gz: tikztosvg man/tikztosvg.1 tikztosvg.pdf README.md example/example.tikz example/example.svg CHANGELOG.md LICENSE
diff --git a/support/tikztosvg/README.md b/support/tikztosvg/README.md
index b8710da39f..97678fddfa 100644
--- a/support/tikztosvg/README.md
+++ b/support/tikztosvg/README.md
@@ -1,7 +1,7 @@
# tikztosvg(1)
The `tikztosvg(1)` command renders TikZ diagrams to SVG, using
-[XeTeX](http://xetex.sourceforge.net/) and
+[TeXLive](https://tug.org/texlive/) and
[pdf2svg](https://github.com/dawbarton/pdf2svg).
## Usage
@@ -14,66 +14,77 @@ If *INPUT\_PATH* is set to *-* the input will be read from stdin.
### Options
-**-o, --output**=*OUTPUT\_PATH*
+**-o, \-\-output**=*OUTPUT\_PATH*
Write output to file *OUTPUT\_PATH*. If set to *-* the output will be written
to stdout. Defaults to the base name of the input file suffixed with the *.svg*
extension. The file is resolved relative to the working directory.
-**-p, --package**=+*PACKAGE*
+**-p, \-\-package**=+*PACKAGE*
Include `\usepackage{PACKAGE}` when rendering the diagram. The tikz, tikz-cd,
pgfplots, amsmath and amssymb packages are always included by default.
-**-l, --library**=+*LIBRARY*
+**-l, \-\-library**=+*LIBRARY*
Include `\usetikzlibrary{LIBRARY}` when rendering the diagram.
-**-q, --quiet**
+**-q, \-\-quiet**
Silence application log messages and script warnings.
-**-h, --help**
+**\-\-lualatex**
+Use [LuaTeX](http://luatex.org/) as the TeX engine. LuaTeX is already the
+default, so this option doesn't really do much.
+
+**\-\-xelatex**
+Use [XeTeX](http://xetex.sourceforge.net/) as the TeX engine.
+
+**\-\-pdflatex**
+Use [pdfTeX](https://www.tug.org/applications/pdftex/) as the TeX engine.
+
+**-h, \-\-help**
Print a help message.
-**-v, --version**
+**-v, \-\-version**
Print version information.
## Example
-Let’s say you want to convert the file `example.tikz` to SVG:
+Let’s say you want to convert the file `example.tikz` to SVG
``` latex
\begin{tikzcd}
- G \arrow[r, "\varphi"] \arrow[d, "\psi"', two heads] & H \\
- \mathlarger{\sfrac{G}{\ker \varphi}} \arrow[ru, dotted] &
+ G \arrow{r}{\varphi} \arrow[two heads]{d} & H \\
+ \mathlarger{\sfrac{G}{\ker \varphi}} \arrow[dotted]{ru} &
\end{tikzcd}
```
-You could achieve this by running:
+You could achieve this by running
``` sh
-# xfrac and relsize are only there so that we can
-# call \sfrac and \mathlarger
+$ # xfrac and relsize are only there so that we can
+$ # call \sfrac and \mathlarger
$ tikztosvg -p xfrac -p relsize example.tikz
```
The results will be stored in the file `example.svg`.
-## Installation
+## Dependencies
-The `tikztosvg(1)` command and it’s man page can be installed in Unix systems
-by running
-
-``` sh
-$ curl -s https://git.sr.ht/~pablo-pie/tikztosvg/blob/master/install.sh | sudo sh
-```
+* A regular TeXLive installation: you'll need LuaTeX and optionally XeTeX and
+ pdfTeX
+* pdf2svg
-or it can be installed via Git with
+## Installation
+The `tikztosvg(1)` command and it’s man page can be installed in Unix systems
+via Git by running
``` sh
$ git clone https://git.sr.ht/~pablo-pie/tikztosvg
$ cd tikztosvg
$ sudo make install
```
-The executable is installed in `/usr/bin/` and the man-page is
-installed in `/usr/share/man/man1/`.
+The `BIN_TARGET` Make variable (defaults to `/usr/bin/`) controls the
+directory the binary is installed in, while the `MAN_TARGET` Make variable
+(defaults to `/usr/share/man/man1/`) controls the directory the man page
+is installed in.
## Resources
@@ -83,6 +94,14 @@ installed in `/usr/share/man/man1/`.
**CTAN package:** <https://www.ctan.org/pkg/tikztosvg>
+**TeXLive** <https://tug.org/texlive/>
+
+**LuaTeX** <http://luatex.org/>
+
+**XeTeX** <http://xetex.sourceforge.net/>
+
+**pdfTeX** <https://www.tug.org/applications/pdftex/>
+
## Authors
**tikztosvg** was written by [Pablo](mailto:pablo-escobar@riseup.net).
diff --git a/support/tikztosvg/example/example.svg b/support/tikztosvg/example/example.svg
index 4c258f4f36..92387322ce 100644
--- a/support/tikztosvg/example/example.svg
+++ b/support/tikztosvg/example/example.svg
@@ -1,48 +1,46 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="78.29pt" height="66.92" viewBox="0 0 78.29 50.19">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="104.385" height="66.916" viewBox="0 0 78.289 50.187">
<defs>
- <symbol id="a" overflow="visible">
- <path d="M7.578-6.922c0-.031-.016-.11-.11-.11-.03 0-.046.016-.155.126l-.688.765c-.094-.14-.547-.89-1.656-.89C2.734-7.031.5-4.828.5-2.516.5-.922 1.61.22 3.219.22c.437 0 .89-.094 1.25-.235.5-.203.687-.406.86-.609.093.25.359.61.452.61.047 0 .078-.032.078-.032.016-.015.11-.406.157-.61l.187-.765.14-.516c.11-.437.11-.468.688-.468.047 0 .157-.016.157-.203 0-.079-.047-.11-.125-.11-.235 0-.829.031-1.047.031-.313 0-1.094-.03-1.407-.03-.078 0-.203 0-.203.202 0 .11.078.11.297.11.016 0 .297 0 .531.015.266.032.313.063.313.188 0 .094-.11.531-.219.906C5.047-.203 3.766-.094 3.406-.094c-.953 0-2-.562-2-2.094 0-.312.094-1.953 1.14-3.25.548-.671 1.517-1.28 2.5-1.28 1.016 0 1.61.765 1.61 1.921 0 .406-.031.406-.031.516 0 .093.11.093.14.093.126 0 .126-.015.188-.203zm0 0"/>
+ <symbol overflow="visible" id="a">
+ <path style="stroke:none" d="M7.578-6.922c0-.031-.016-.11-.11-.11-.03 0-.046.016-.155.126l-.688.765c-.094-.14-.547-.89-1.656-.89C2.734-7.031.5-4.828.5-2.516.5-.922 1.61.22 3.219.22c.437 0 .89-.094 1.25-.235.5-.203.687-.406.86-.609.093.25.359.61.452.61.047 0 .078-.032.078-.032.016-.015.11-.406.157-.61l.187-.765.14-.516c.11-.437.11-.468.688-.468.047 0 .157-.016.157-.203 0-.079-.047-.11-.125-.11-.235 0-.829.031-1.047.031-.313 0-1.094-.03-1.407-.03-.078 0-.203 0-.203.202 0 .11.078.11.297.11.016 0 .297 0 .531.015.266.032.313.063.313.188 0 .094-.11.531-.219.906C5.047-.203 3.766-.094 3.406-.094c-.953 0-2-.562-2-2.094 0-.312.094-1.953 1.14-3.25.548-.671 1.517-1.28 2.5-1.28 1.016 0 1.61.765 1.61 1.921 0 .406-.031.406-.031.516 0 .093.11.093.14.093.126 0 .126-.015.188-.203zm0 0"/>
</symbol>
- <symbol id="b" overflow="visible">
- <path d="M7.61-6.047c.093-.36.109-.453.827-.453.266 0 .344 0 .344-.203 0-.11-.11-.11-.14-.11-.282 0-1 .032-1.282.032-.28 0-.984-.032-1.28-.032-.079 0-.188 0-.188.204 0 .109.093.109.28.109.016 0 .204 0 .376.016.187.03.266.03.266.171 0 .032 0 .047-.032.188l-.593 2.422H3.14l.593-2.344c.079-.36.11-.453.829-.453.265 0 .343 0 .343-.203 0-.11-.11-.11-.14-.11-.282 0-1 .032-1.282.032-.28 0-.984-.032-1.28-.032-.079 0-.188 0-.188.204 0 .109.093.109.28.109.017 0 .204 0 .376.016.172.03.265.03.265.171 0 .032 0 .063-.03.188L1.561-.781c-.093.39-.109.469-.906.469-.172 0-.265 0-.265.203C.39 0 .516 0 .53 0c.281 0 .985-.031 1.266-.031.203 0 .422.015.64.015.22 0 .438.016.641.016.078 0 .203 0 .203-.203 0-.11-.094-.11-.281-.11-.375 0-.64 0-.64-.171 0-.063.015-.11.015-.172l.688-2.735h3.03c-.405 1.657-.64 2.61-.687 2.75-.093.329-.281.329-.906.329-.14 0-.234 0-.234.203 0 .109.125.109.14.109.282 0 .985-.031 1.266-.031.203 0 .422.015.64.015.22 0 .438.016.641.016.078 0 .203 0 .203-.203 0-.11-.093-.11-.281-.11-.36 0-.64 0-.64-.171 0-.063.015-.11.03-.172zm0 0"/>
+ <symbol overflow="visible" id="b">
+ <path style="stroke:none" d="M7.61-6.047c.093-.36.109-.453.827-.453.266 0 .344 0 .344-.203 0-.11-.11-.11-.14-.11-.282 0-1 .032-1.282.032-.28 0-.984-.032-1.28-.032-.079 0-.188 0-.188.204 0 .109.093.109.28.109.016 0 .204 0 .376.016.187.03.266.03.266.171 0 .032 0 .047-.032.188l-.593 2.422H3.14l.593-2.344c.079-.36.11-.453.829-.453.265 0 .343 0 .343-.203 0-.11-.11-.11-.14-.11-.282 0-1 .032-1.282.032-.28 0-.984-.032-1.28-.032-.079 0-.188 0-.188.204 0 .109.093.109.28.109.017 0 .204 0 .376.016.172.03.265.03.265.171 0 .032 0 .063-.03.188L1.561-.781c-.093.39-.109.469-.906.469-.172 0-.265 0-.265.203C.39 0 .516 0 .53 0c.281 0 .985-.031 1.266-.031.203 0 .422.015.64.015.22 0 .438.016.641.016.078 0 .203 0 .203-.203 0-.11-.094-.11-.281-.11-.375 0-.64 0-.64-.171 0-.063.015-.11.015-.172l.688-2.735h3.03c-.405 1.657-.64 2.61-.687 2.75-.093.329-.281.329-.906.329-.14 0-.234 0-.234.203 0 .109.125.109.14.109.282 0 .985-.031 1.266-.031.203 0 .422.015.64.015.22 0 .438.016.641.016.078 0 .203 0 .203-.203 0-.11-.093-.11-.281-.11-.36 0-.64 0-.64-.171 0-.063.015-.11.03-.172zm0 0"/>
</symbol>
- <symbol id="d" overflow="visible">
- <path d="M4.375-7.094c.047-.14.047-.172.047-.187 0-.11-.078-.203-.188-.203-.078 0-.14.03-.171.093l-3.47 9.5c-.046.141-.046.172-.046.188 0 .11.094.203.203.203.125 0 .156-.078.219-.25zm0 0"/>
+ <symbol overflow="visible" id="d">
+ <path style="stroke:none" d="M4.375-7.094c.047-.14.047-.172.047-.187 0-.11-.078-.203-.188-.203-.078 0-.14.03-.171.093l-3.47 9.5c-.046.141-.046.172-.046.188 0 .11.094.203.203.203.125 0 .156-.078.219-.25zm0 0"/>
</symbol>
- <symbol id="c" overflow="visible">
- <path d="M5.875-4.813c0-.03-.016-.093-.094-.093-.047 0-.062.015-.125.093l-.5.532c-.062-.078-.453-.625-1.312-.625-1.703 0-3.36 1.5-3.36 3.078C.484-.75 1.313.14 2.641.14c.625 0 1.265-.157 1.625-.547.078.14.265.406.343.406.063 0 .079-.031.11-.188l.14-.53c.032-.126.125-.548.157-.626.078-.312.078-.328.5-.328.046 0 .156 0 .156-.14 0-.079-.063-.11-.11-.11-.234 0-.53.031-.765.031-.172 0-.406 0-.578-.015-.172 0-.375-.016-.547-.016-.063 0-.156 0-.156.156 0 .094.078.094.25.094.125 0 .265 0 .406.016.219.015.219.047.219.125 0 .031 0 .047-.047.234-.047.188-.125.5-.157.578-.187.422-.843.61-1.39.61-.688 0-1.61-.344-1.61-1.516 0-.75.36-1.672.875-2.203.72-.703 1.454-.813 1.844-.813.813 0 1.281.579 1.281 1.36 0 .187-.015.25-.015.281 0 .094.094.094.125.094.11 0 .11-.016.14-.156zm0 0"/>
+ <symbol overflow="visible" id="c">
+ <path style="stroke:none" d="M5.875-4.813c0-.03-.016-.093-.094-.093-.047 0-.062.015-.125.093l-.5.532c-.062-.078-.453-.625-1.312-.625-1.703 0-3.36 1.5-3.36 3.078C.484-.75 1.313.14 2.641.14c.625 0 1.265-.157 1.625-.547.078.14.265.406.343.406.063 0 .079-.031.11-.188l.14-.53c.032-.126.125-.548.157-.626.078-.312.078-.328.5-.328.046 0 .156 0 .156-.14 0-.079-.063-.11-.11-.11-.234 0-.53.031-.765.031-.172 0-.406 0-.578-.015-.172 0-.375-.016-.547-.016-.063 0-.156 0-.156.156 0 .094.078.094.25.094.125 0 .265 0 .406.016.219.015.219.047.219.125 0 .031 0 .047-.047.234-.047.188-.125.5-.157.578-.187.422-.843.61-1.39.61-.688 0-1.61-.344-1.61-1.516 0-.75.36-1.672.875-2.203.72-.703 1.454-.813 1.844-.813.813 0 1.281.579 1.281 1.36 0 .187-.015.25-.015.281 0 .094.094.094.125.094.11 0 .11-.016.14-.156zm0 0"/>
</symbol>
- <symbol id="h" overflow="visible">
- <path d="M2.203.063h.235c1.25 0 2.406-1.016 2.406-2.126 0-.609-.375-1.015-.907-1.015-.968 0-1.484 1.234-1.671 1.75-.094.266-.25.75-.282.875C1.22-.547.72-.906.72-1.422c0 0 .047-.781.61-1.406.046-.047.062-.063.062-.094C1.39-3 1.297-3 1.28-3c-.062 0-.093 0-.234.156-.39.469-.563 1.203-.563 1.5C.484-.719.938-.187 1.828 0c-.344 1.094-.39 1.219-.39 1.281 0 .188.171.219.234.219.078 0 .219-.047.281-.14.047-.11.11-.47.25-1.298zm.094-.47c.14-.812.187-1.124.531-1.577.313-.422.672-.61 1.031-.61.47 0 .735.313.735.672 0 .703-.875 1.516-2.078 1.516h-.22zm0 0"/>
+ <symbol overflow="visible" id="h">
+ <path style="stroke:none" d="M2.203.063h.235c1.25 0 2.406-1.016 2.406-2.126 0-.609-.375-1.015-.907-1.015-.968 0-1.484 1.234-1.671 1.75-.094.266-.25.75-.282.875C1.22-.547.72-.906.72-1.422c0 0 .047-.781.61-1.406.046-.047.062-.063.062-.094C1.39-3 1.297-3 1.28-3c-.062 0-.093 0-.234.156-.39.469-.563 1.203-.563 1.5C.484-.719.938-.187 1.828 0c-.344 1.094-.39 1.219-.39 1.281 0 .188.171.219.234.219.078 0 .219-.047.281-.14.047-.11.11-.47.25-1.298zm.094-.47c.14-.812.187-1.124.531-1.577.313-.422.672-.61 1.031-.61.47 0 .735.313.735.672 0 .703-.875 1.516-2.078 1.516h-.22zm0 0"/>
</symbol>
- <symbol id="i" overflow="visible">
- <path d="M3.797-4.64c.015-.079.015-.11.015-.11 0-.094-.093-.094-.109-.094-.11 0-.11.032-.14.157L2.421-.141c-.563-.062-.875-.312-.875-.78 0-.11 0-.298.344-1.157.062-.156.109-.281.109-.39 0-.376-.313-.61-.656-.61C.64-3.078.328-2.125.328-2c0 .078.094.078.125.078.094 0 .094-.031.125-.11.156-.562.469-.843.735-.843.125 0 .171.078.171.234 0 .172-.046.297-.125.516-.343.875-.343 1.031-.343 1.156 0 .797.843 1 1.359 1.031a47.669 47.669 0 00-.313 1.266c0 .094.079.094.11.094.094 0 .11-.031.14-.14L2.61.061c.282 0 .922 0 1.657-.718a2.42 2.42 0 00.5-.75C4.859-1.641 5-2.203 5-2.531c0-.547-.328-.547-.344-.547a.403.403 0 00-.375.375c0 .11.063.172.094.187.11.094.281.266.281.579 0 .578-.797 1.812-2 1.812zm0 0"/>
+ <symbol overflow="visible" id="e">
+ <path style="stroke:none" d="M2.25-1.89c.86-.657 1.094-.844 1.563-.86V-3c-.141.016-.329.031-.47.031-.28 0-.562-.015-.827-.031v.25c.078.016.125.063.125.125 0 .11-.141.234-.22.297l-1.03.797v-3.313l-1.047.078v.25c.469 0 .515.063.515.391v3.578C.86-.25.797-.25.344-.25V0c.25-.016.515-.031.765-.031.266 0 .516.015.782.031v-.25c-.454 0-.532 0-.532-.297v-.672l.516-.39.75.953c.078.078.156.187.156.281 0 .11-.125.125-.187.125V0c.094 0 .578-.031.781-.031.203 0 .406.015.61.031v-.25c-.25 0-.407-.016-.61-.266zm0 0"/>
</symbol>
- <symbol id="e" overflow="visible">
- <path d="M2.25-1.89c.86-.657 1.094-.844 1.563-.86V-3c-.141.016-.329.031-.47.031-.28 0-.562-.015-.827-.031v.25c.078.016.125.063.125.125 0 .11-.141.234-.22.297l-1.03.797v-3.313l-1.047.078v.25c.469 0 .515.063.515.391v3.578C.86-.25.797-.25.344-.25V0c.25-.016.515-.031.765-.031.266 0 .516.015.782.031v-.25c-.454 0-.532 0-.532-.297v-.672l.516-.39.75.953c.078.078.156.187.156.281 0 .11-.125.125-.187.125V0c.094 0 .578-.031.781-.031.203 0 .406.015.61.031v-.25c-.25 0-.407-.016-.61-.266zm0 0"/>
+ <symbol overflow="visible" id="f">
+ <path style="stroke:none" d="M3.063-1.594c.156 0 .203 0 .203-.14 0-.625-.344-1.375-1.391-1.375a1.59 1.59 0 0 0-1.61 1.578c0 .89.782 1.593 1.704 1.593.937 0 1.297-.75 1.297-.906 0-.015-.016-.094-.125-.094-.094 0-.11.047-.125.11-.22.562-.75.672-1 .672-.329 0-.641-.14-.844-.406-.266-.329-.266-.75-.266-1.032zM.905-1.766c.078-.984.703-1.14.969-1.14.86 0 .89.969.906 1.14zm0 0"/>
</symbol>
- <symbol id="f" overflow="visible">
- <path d="M3.063-1.594c.156 0 .203 0 .203-.14 0-.625-.344-1.375-1.391-1.375a1.59 1.59 0 00-1.61 1.578c0 .89.782 1.593 1.704 1.593.937 0 1.297-.75 1.297-.906 0-.015-.016-.094-.125-.094-.094 0-.11.047-.125.11-.22.562-.75.672-1 .672-.329 0-.641-.14-.844-.406-.266-.329-.266-.75-.266-1.032zM.905-1.766c.078-.984.703-1.14.969-1.14.86 0 .89.969.906 1.14zm0 0"/>
- </symbol>
- <symbol id="g" overflow="visible">
- <path d="M1.39-1.594c0-.578.266-1.281.938-1.281a.325.325 0 00-.125.25c0 .234.188.313.313.313.171 0 .328-.11.328-.313 0-.234-.235-.453-.563-.453-.344 0-.734.219-.937.75v-.75L.344-3v.25c.469 0 .515.047.515.39v1.813C.86-.25.797-.25.344-.25V0c.031 0 .5-.031.797-.031.296 0 .593.015.906.031v-.25h-.14c-.516 0-.516-.078-.516-.313zm0 0"/>
+ <symbol overflow="visible" id="g">
+ <path style="stroke:none" d="M1.39-1.594c0-.578.266-1.281.938-1.281a.325.325 0 0 0-.125.25c0 .234.188.313.313.313.171 0 .328-.11.328-.313 0-.234-.235-.453-.563-.453-.344 0-.734.219-.937.75v-.75L.344-3v.25c.469 0 .515.047.515.39v1.813C.86-.25.797-.25.344-.25V0c.031 0 .5-.031.797-.031.296 0 .593.015.906.031v-.25h-.14c-.516 0-.516-.078-.516-.313zm0 0"/>
</symbol>
</defs>
- <use x="14.432" y="11.346" xlink:href="#a"/>
- <use x="64.904" y="11.346" xlink:href="#b"/>
- <use x="4.293" y="41.808" xlink:href="#c"/>
- <use x="9.942" y="44.05" xlink:href="#d"/>
- <use x="15.177" y="44.05" xlink:href="#e"/>
- <use x="19.153" y="44.05" xlink:href="#f"/>
- <use x="22.695" y="44.05" xlink:href="#g"/>
- <use x="27.165" y="44.05" xlink:href="#h"/>
- <path fill="none" stroke="#000" stroke-miterlimit="10" stroke-width=".398" d="M26.758 8.855h33.254"/>
- <path fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width=".398" d="M58.14 6.465c.38 1.433 1.223 2.11 2.07 2.39-.847.278-1.69.957-2.07 2.391"/>
- <use x="40.965" y="5.152" xlink:href="#h"/>
- <path fill="none" stroke="#000" stroke-miterlimit="10" stroke-width=".398" d="M18.348 15.195v17.137"/>
- <path fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width=".398" d="M20.738 29.023c-1.433.38-2.11 1.223-2.39 2.07-.278-.847-.953-1.69-2.391-2.07"/>
- <path fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width=".398" d="M20.738 30.457c-1.433.379-2.11 1.223-2.39 2.074-.278-.851-.953-1.695-2.391-2.074"/>
- <use x="10.481" y="25.705" xlink:href="#i"/>
- <path fill="none" stroke="#000" stroke-dasharray=".39848,1.99255" stroke-miterlimit="10" stroke-width=".398" d="M32.145 32.73l27.93-17.878"/>
- <path fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width=".39801990000000004" d="M57.207 13.848c1.094 1.004 2.168 1.117 3.035.894-.566.695-.91 1.719-.457 3.133"/>
+ <use xlink:href="#a" x="14.433" y="11.342" style="fill:#000;fill-opacity:1"/>
+ <use xlink:href="#b" x="64.904" y="11.342" style="fill:#000;fill-opacity:1"/>
+ <use xlink:href="#c" x="4.294" y="41.805" style="fill:#000;fill-opacity:1"/>
+ <use xlink:href="#d" x="9.943" y="44.046" style="fill:#000;fill-opacity:1"/>
+ <use xlink:href="#e" x="15.178" y="44.046" style="fill:#000;fill-opacity:1"/>
+ <g style="fill:#000;fill-opacity:1">
+ <use xlink:href="#f" x="19.154" y="44.046"/>
+ <use xlink:href="#g" x="22.697" y="44.046"/>
+ </g>
+ <use xlink:href="#h" x="27.166" y="44.046" style="fill:#000;fill-opacity:1"/>
+ <path style="fill:none;stroke-width:.39848;stroke-linecap:butt;stroke-linejoin:miter;stroke:#000;stroke-opacity:1;stroke-miterlimit:10" d="M-12.386 16.684h33.254" transform="matrix(1 0 0 -1 39.144 25.536)"/>
+ <path style="fill:none;stroke-width:.39848;stroke-linecap:round;stroke-linejoin:round;stroke:#000;stroke-opacity:1;stroke-miterlimit:10" d="M-2.07 2.39C-1.693.958-.849.278 0 0c-.848-.277-1.692-.957-2.07-2.39" transform="matrix(1 0 0 -1 60.211 8.851)"/>
+ <use xlink:href="#h" x="40.965" y="5.149" style="fill:#000;fill-opacity:1"/>
+ <path style="fill:none;stroke-width:.39848;stroke-linecap:butt;stroke-linejoin:miter;stroke:#000;stroke-opacity:1;stroke-miterlimit:10" d="M-20.796 10.345V-6.792" transform="matrix(1 0 0 -1 39.144 25.536)"/>
+ <path style="fill:none;stroke-width:.39848;stroke-linecap:round;stroke-linejoin:round;stroke:#000;stroke-opacity:1;stroke-miterlimit:10" d="M-2.072 2.389C-1.694.955-.85.279.002-.001-.85-.28-1.694-.956-2.072-2.393" transform="matrix(0 1 1 0 18.35 31.092)"/>
+ <path style="fill:none;stroke-width:.39848;stroke-linecap:round;stroke-linejoin:round;stroke:#000;stroke-opacity:1;stroke-miterlimit:10" d="M-2.073 2.389C-1.695.955-.851.279 0-.001-.851-.28-1.695-.956-2.073-2.393" transform="matrix(0 1 1 0 18.35 32.527)"/>
+ <path style="fill:none;stroke-width:.39848;stroke-linecap:butt;stroke-linejoin:miter;stroke:#000;stroke-opacity:1;stroke-dasharray:.39848,1.99255;stroke-miterlimit:10" d="m-7-7.19 27.93 17.878" transform="matrix(1 0 0 -1 39.144 25.536)"/>
+ <path style="fill:none;stroke-width:.39848;stroke-linecap:round;stroke-linejoin:round;stroke:#000;stroke-opacity:1;stroke-miterlimit:10" d="M-2.074 2.392C-1.694.957-.852.279 0-.001c-.85-.277-1.692-.954-2.072-2.39" transform="scale(.99994 -.99994) rotate(32.622 55.311 95.57)"/>
</svg>
diff --git a/support/tikztosvg/example/example.tikz b/support/tikztosvg/example/example.tikz
index 416d667e54..563ae63d89 100644
--- a/support/tikztosvg/example/example.tikz
+++ b/support/tikztosvg/example/example.tikz
@@ -1,4 +1,4 @@
\begin{tikzcd}
- G \arrow[r, "\varphi"] \arrow[d, "\psi"', two heads] & H \\
- \mathlarger{\sfrac{G}{\ker \varphi}} \arrow[ru, dotted] &
+ G \arrow{r}{\varphi} \arrow[two heads]{d} & H \\
+ \mathlarger{\sfrac{G}{\ker \varphi}} \arrow[dotted]{ru} &
\end{tikzcd}
diff --git a/support/tikztosvg/install.sh b/support/tikztosvg/install.sh
deleted file mode 100755
index 1d6a22957b..0000000000
--- a/support/tikztosvg/install.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-#
-# 2021 (C) Pablo
-# Free use of this software is granted under the terms of the GPL-3.0 License
-
-puts ()
-{
- printf "\033[1m\033[38;5;%sm[%s]\033[m %s\n\n" "$3" "$1" "$2"
-}
-
-error ()
-{
- puts ERROR "$1" 9
- exit 1
-}
-
-dependencyWarning ()
-{
- puts WARNING "$(printf "The command '%s' could not be found.\nPlease make sure it is included in the \$PATH enviroment variable or follow the installation instructions on %s." "$1" "$2")" 3
-}
-
-message ()
-{
- puts INSTALLER "$1" 2
-}
-
-if [ "$(id -u)" -ne "0" ]
-then
- error "This script requires administrator-privileges"
-fi
-
-if ! [ -x "$(command -v xelatex)" ]
-then
- dependencyWarning "xelatex" "https://tug.org/texlive/"
-fi
-
-if ! [ -x "$(command -v pdf2svg)" ]
-then
- dependencyWarning "pdf2svg" "https://github.com/dawbarton/pdf2svg"
-fi
-
-message "Installing tikztosvg(1)"
-
-if [ -f "$HOME/.local/bin/tikztosvg" ]
-then
- rm "$HOME/.local/bin/tikztosvg"
-fi
-
-tmp="$(mktemp -d)"
-wget https://git.sr.ht/~pablo-pie/tikztosvg/blob/master/tikztosvg -P "$tmp" \
- && install -g 0 -o 0 -m 755 "$tmp/tikztosvg" /usr/bin/ \
- || exit 1
-
-message "Installing manual entry for tikztosvg(1)"
-wget https://git.sr.ht/~pablo-pie/tikztosvg/blob/master/man/tikztosvg.1 -P "$tmp" \
- && install -g 0 -o 0 -m 644 "$tmp/tikztosvg.1" /usr/share/man/man1/ \
- || exit 1
-
-if [ -f "/usr/share/man/man1/tikztosvg.1.gz" ]
-then
- rm "/usr/share/man/man1/tikztosvg.1.gz"
-fi
-
-gzip "/usr/share/man/man1/tikztosvg.1"
-rm "$tmp" -r
-
diff --git a/support/tikztosvg/man/man.adoc b/support/tikztosvg/man/man.adoc
index ad5d8cca2a..fa4f829267 100644
--- a/support/tikztosvg/man/man.adoc
+++ b/support/tikztosvg/man/man.adoc
@@ -1,7 +1,7 @@
= tikztosvg(1)
:doctype: manpage
:man-manual: tikztosvg Manual
-:man-source: tikztosvg 0.2.1
+:man-source: tikztosvg 0.3.0
:page-layout: base
== NAME
@@ -36,6 +36,16 @@ If _INPUT_PATH_ is set to _-_ the input will be read from stdin.
*-q, --quiet*::
Silence application log messages and script warnings.
+*--lualatex*::
+ Use LuaTeX as the TeX engine. LuaTeX is already the
+ default, so this option doesn't really do much.
+
+*--xelatex*::
+ Use XeTeX as the TeX engine.
+
+*--pdflatex*::
+ Use pdfTeX as the TeX engine.
+
*-h, --help*::
Print a help message.
@@ -70,6 +80,12 @@ Matthew Flaschen <matthew.flaschen@gatech.edu>.
Git source repository on sourcehut:: https://git.sr.ht/~pablo-pie/tikztosvg
Bug tracker:: https://todo.sr.ht/~pablo-pie/tikztosvg
CTAN package:: https://www.ctan.org/pkg/tikztosvg
+TeXLive:: https://tug.org/texlive/
+LuaTeX:: http://luatex.org/
+XeTeX:: http://xetex.sourceforge.net/
+
+**pdfTeX** <https://www.tug.org/applications/pdftex/>
+
== COPYING
diff --git a/support/tikztosvg/man/tikztosvg.1 b/support/tikztosvg/man/tikztosvg.1
index 37b1840770..d4d08a8585 100644
--- a/support/tikztosvg/man/tikztosvg.1
+++ b/support/tikztosvg/man/tikztosvg.1
@@ -1,13 +1,13 @@
'\" t
.\" Title: tikztosvg
.\" Author: [see the "AUTHOR(S)" section]
-.\" Generator: Asciidoctor 2.0.15
-.\" Date: 2021-07-29
+.\" Generator: Asciidoctor 2.0.16
+.\" Date: 2021-08-19
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "TIKZTOSVG" "1" "2021-07-29" "\ \&" "\ \&"
+.TH "TIKZTOSVG" "1" "2021-08-19" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
@@ -63,6 +63,22 @@ Include \fI\(rsusetikzlibrary{LIBRARY}\fP when rendering the diagram.
Silence application log messages and script warnings.
.RE
.sp
+\fB\-\-lualatex\fP
+.RS 4
+Use LuaTeX as the TeX engine. LuaTeX is already the
+default, so this option doesn\(cqt really do much.
+.RE
+.sp
+\fB\-\-xelatex\fP
+.RS 4
+Use XeTeX as the TeX engine.
+.RE
+.sp
+\fB\-\-pdflatex\fP
+.RS 4
+Use pdfTeX as the TeX engine.
+.RE
+.sp
\fB\-h, \-\-help\fP
.RS 4
Print a help message.
@@ -118,6 +134,24 @@ CTAN package
.RS 4
.URL "https://www.ctan.org/pkg/tikztosvg" "" ""
.RE
+.sp
+TeXLive
+.RS 4
+.URL "https://tug.org/texlive/" "" ""
+.RE
+.sp
+LuaTeX
+.RS 4
+.URL "http://luatex.org/" "" ""
+.RE
+.sp
+XeTeX
+.RS 4
+.URL "http://xetex.sourceforge.net/" "" ""
+.RE
+.sp
+\fBpdfTeX\fP \c
+.URL "https://www.tug.org/applications/pdftex/" "" ""
.SH "COPYING"
.sp
Copyright (C) 2021 Pablo.
diff --git a/support/tikztosvg/tikztosvg b/support/tikztosvg/tikztosvg
index d1b1f8bb29..96d1af6ca9 100755
--- a/support/tikztosvg/tikztosvg
+++ b/support/tikztosvg/tikztosvg
@@ -38,7 +38,7 @@ showHelp()
showVersion()
{
- echo 0.2.1
+ echo 0.3.0
exit 0
}
@@ -46,15 +46,8 @@ showVersion()
packages="tikz tikz-cd pgfplots amsmath amssymb"
libraries=""
-if ! [ -x "$(command -v xelatex)" ]
-then
- error "xelatex could not be found"
-fi
-
-if ! [ -x "$(command -v pdf2svg)" ]
-then
- error "pdf2svg could not be found"
-fi
+# The default TeX engine
+texengine='lualatex'
# Parsing the arguments
while [ $# -gt 1 ]
@@ -113,6 +106,27 @@ do
quiet=1
shift
;;
+ --lualatex)
+ shift
+ ;;
+ --xelatex)
+ if command -v xelatex > /dev/null
+ then
+ texengine='xelatex'
+ else
+ error "Couldn't find xelatex: required by the --xelatex option"
+ fi
+ shift
+ ;;
+ --pdflatex)
+ if command -v pdflatex > /dev/null
+ then
+ texengine='pdflatex'
+ else
+ error "Couldn't find pdflatex: required by the --pdflatex option"
+ fi
+ shift
+ ;;
*)
error "Unexpected token: \"$1\""
;;
@@ -126,10 +140,10 @@ case "$1" in
-v|--version)
showVersion
;;
- "")
+ '')
error "No input path provided"
;;
- "-")
+ -)
input=/dev/stdin
;;
*)
@@ -145,11 +159,8 @@ case "$output" in
;;
# If no output path is provided, use the basename of the input
- "")
- if [ -x "$(command -v dirname)" ]
- then
- output="$(dirname "$input")/$(basename "$input" | cut -d "." -f1).svg"
- fi
+ '')
+ output="$(dirname "$input")/$(basename "$input" | cut -d "." -f1).svg"
;;
# If the output path is provided, but it resolves to directory, output a
@@ -163,14 +174,14 @@ tmp_dir="$(mktemp -d)"
tex_file="$tmp_dir/tmp.tex"
# Generate the LaTeX document
-printf "\documentclass[crop,tikz,multi=false]{standalone}\n" > "$tex_file"
+printf '\\documentclass[crop,tikz,multi=false]{standalone}\n' > "$tex_file"
-for package in $(echo "$packages" | tr " " "\n" | sort | uniq)
+for package in $packages
do
printf '\\usepackage{%s}\n' "$package" >> "$tex_file"
done
-for library in $(echo "$libraries" | tr " " "\n" | sort | uniq)
+for library in $libraries
do
printf '\\usetikzlibrary{%s}\n' "$library" >> "$tex_file"
done
@@ -189,18 +200,19 @@ printf "\\\end{document}\n" >> "$tex_file"
if [ -z "$quiet" ]
then
message "Rendering the LaTeX document. . ."
- xelatex -halt-on-error -output-directory="$tmp_dir" "$tex_file"
+ $texengine -halt-on-error -output-directory="$tmp_dir" "$tex_file"
else
- xelatex -halt-on-error -output-directory="$tmp_dir" "$tex_file" 1> /dev/null 2>&1
+ $texengine -halt-on-error -output-directory="$tmp_dir" "$tex_file" 1> /dev/null 2>&1
fi
+# TODO: Make this less horrible?
S=$?
if [ $S -ne 0 ]
then
rm "$tmp_dir" -r
if [ -z "$quiet" ]
then
- error "xelatex exited with code $S" $S
+ error "$texengine exited with code $S" $S
else
exit $S
fi
@@ -213,6 +225,7 @@ fi
pdf2svg "$tmp_dir/tmp.pdf" "$output" 1
+# TODO: Make this less horrible?
S=$?
if [ $S -ne 0 ]
then
diff --git a/support/tikztosvg/tikztosvg.pdf b/support/tikztosvg/tikztosvg.pdf
index 3fb78c6fb4..18b291edee 100644
--- a/support/tikztosvg/tikztosvg.pdf
+++ b/support/tikztosvg/tikztosvg.pdf
Binary files differ
diff --git a/systems/mac/mactex/ExtrasFolder.pdf b/systems/mac/mactex/ExtrasFolder.pdf
index 53aeb4fc72..5d88293d91 100644
--- a/systems/mac/mactex/ExtrasFolder.pdf
+++ b/systems/mac/mactex/ExtrasFolder.pdf
Binary files differ
diff --git a/systems/mac/mactex/Licenses.txt b/systems/mac/mactex/Licenses.txt
index deb1551840..d1b56ac8b3 100644
--- a/systems/mac/mactex/Licenses.txt
+++ b/systems/mac/mactex/Licenses.txt
@@ -1,6 +1,6 @@
$Id: Licenses.txt,v 1.14 2007/02/28 14:23:19 herbs Exp $
-Brief summary of the licensing of the various applications included as of 2021/08/18
+Brief summary of the licensing of the various applications included as of 2021/08/20
Aquamacs Emacs (Intel) - 3.5 - gpl - http://aquamacs.org/
Aquatkbibtex - 1.3 - gpl - http://aquatkbibtex.sourceforge.net/
@@ -17,5 +17,5 @@ Skim (10.10+) - 1.6.4 - bsd - http://skim-app.sourceforge
Symbols Widget - 1.4.3 - gpl - http://vocaro.com/trevor/software/widgets/
TeX FoG (10.4+) - 1.3.2 - gpl - http://homepage.mac.com/marco_coisson/TeXFoG/
TeX Live Utility (10.9+) - 1.49 - bsd - https://github.com/amaxwell/tlutility/releases
-TexMaker (10.12+) - 5.1.0 - gpl - http://www.xm1math.net/texmaker/
+TexMaker (10.12+) - 5.1.1 - gpl - http://www.xm1math.net/texmaker/
TeXShop (10.12+) - 4.66 - gpl - http://www.uoregon.edu/~koch/texshop/texshop.html
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index f6b5ffdc3f..fa30d2ee62 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -134,7 +134,6 @@ $mirrors = {
},
'Poland' => {
'https://ctan.mirrors.tworzy.net/' => 1,
- 'https://ftp.gust.org.pl/TeX/' => 1,
'https://repo.skni.umcs.pl/ctan/' => 1,
'https://sunsite.icm.edu.pl/pub/CTAN/' => 1,
},
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index b231ba4977..ea94347bb4 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/2021
-depend revision/60281
+depend revision/60289
name 00texlive.image
category TLCore
@@ -4448,7 +4448,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 60264
+revision 60283
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
@@ -37528,7 +37528,7 @@ catalogue-version 1.7
name biblatex-gb7714-2015
category Package
-revision 59101
+revision 60286
shortdesc A BibLaTeX implementation of the GBT7714-2015 bibliography style for Chinese users
relocated 1
longdesc This package provides an implementation of the GBT7714-2015
@@ -37536,19 +37536,27 @@ longdesc bibliography style. This implementation follows the
longdesc GBT7714-2015 standard and can be used by simply loading
longdesc BibLaTeX with the appropriate option. A demonstration database
longdesc is provided to show how to format input for the style.
-containersize 40548
-containerchecksum 77e698ff10013102ef99be65711b8977b67a0a96528c1ff2219827f052ca304f2e5e26ad9414a4c65f2048f302f3f9d1e297bc9be209cb6eb26d7e717c4bda0c
-doccontainersize 1616860
-doccontainerchecksum f61e22f663bf2690a34b3640f4ef3ad175a64cdada2090b1d46ef9df5a0f79eef6d61f105f417b09da0e7069fa20af891ac7393916e2040a0a094dbdc5df3d9c
-docfiles size=571
+containersize 42412
+containerchecksum da06b3559567bcc30faa16621c1066f12ea21cbd5ab1c2f081a63a7a0013dba5582125b19f1b6694668ae82d555d9c0597684aa4a115935e2ca07ae6bc7e6cd2
+doccontainersize 1603644
+doccontainerchecksum a43acb3583cf8e2b988a1305ddcd194c958bbd6fb021b32707a1fe5c5324e205ceaceaade1c7549ce4946abd786cc83d111f30a1ece4a453bd533f9f279a10c2
+docfiles size=572
RELOC/doc/latex/biblatex-gb7714-2015/README.md details="Readme"
RELOC/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex
RELOC/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf details="Package documentation (Chinese)" language="zh"
RELOC/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.tex
RELOC/doc/latex/biblatex-gb7714-2015/example.bib
-runfiles size=164
+runfiles size=174
RELOC/tex/latex/biblatex-gb7714-2015/chinese-erj.bbx
RELOC/tex/latex/biblatex-gb7714-2015/chinese-erj.cbx
+ RELOC/tex/latex/biblatex-gb7714-2015/gb7714-1987.bbx
+ RELOC/tex/latex/biblatex-gb7714-2015/gb7714-1987.cbx
+ RELOC/tex/latex/biblatex-gb7714-2015/gb7714-1987ay.bbx
+ RELOC/tex/latex/biblatex-gb7714-2015/gb7714-1987ay.cbx
+ RELOC/tex/latex/biblatex-gb7714-2015/gb7714-2005.bbx
+ RELOC/tex/latex/biblatex-gb7714-2015/gb7714-2005.cbx
+ RELOC/tex/latex/biblatex-gb7714-2015/gb7714-2005ay.bbx
+ RELOC/tex/latex/biblatex-gb7714-2015/gb7714-2005ay.cbx
RELOC/tex/latex/biblatex-gb7714-2015/gb7714-2015-gbk.def
RELOC/tex/latex/biblatex-gb7714-2015/gb7714-2015.bbx
RELOC/tex/latex/biblatex-gb7714-2015/gb7714-2015.cbx
@@ -37562,7 +37570,7 @@ catalogue-contact-repository https://github.com/hushidong/biblatex-gb7714-2015
catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015
catalogue-license lppl1.3c
catalogue-topics biblatex chinese
-catalogue-version 1.0y
+catalogue-version 1.0z
name biblatex-german-legal
category Package
@@ -52685,16 +52693,16 @@ catalogue-version 2.0.1
name charissil
category Package
-revision 60281
+revision 60284
shortdesc CharisSIL fonts with support for XeLaTeX or LuaLaTeX
relocated 1
longdesc This package provides the CharisSIL family of fonts adapted by
longdesc SIL International from Bitstream Charter in TrueType format,
longdesc with support for XeLaTeX or LuaLaTeX.
-containersize 2005908
-containerchecksum 942c333ee39a453767f8bc029e0208da6618e55cafdcd75aa49c67ec9d474db57b1d74aabb23351ab8839cb4973ef27070c408dd2967cd09924a8c8f2ab3904a
-doccontainersize 9960
-doccontainerchecksum ceee1ec1bbd2eae52d1c437d33cf1df8d5390f7850a829b7d6ee7b4eaf9cdb77c7ee0799a47068623180027f8cc134a016123098ccfeb56ba6dee884d875b2a9
+containersize 1995500
+containerchecksum ec13084fc7d114312496cee63f53ecd802b8bb67228c2a36f0d7a61a4c175c4c6c1e7a1c7a13065f487b6a1779510e0fcdaa9da19ecd007955f4924494d3a813
+doccontainersize 9924
+doccontainerchecksum a402e11369b205051df19012498467c959f841e66b0f779d6c2246792fbbc41d7f3364d798307d524211c5b69eca389e8b7f49aec7c02c951c39a663e43d1bd0
docfiles size=11
RELOC/doc/fonts/charissil/CharisSIL-samples.tex
RELOC/doc/fonts/charissil/CharisSILCompact-samples.tex
@@ -52702,15 +52710,15 @@ docfiles size=11
RELOC/doc/fonts/charissil/OFL.txt
RELOC/doc/fonts/charissil/README details="Readme"
RELOC/doc/fonts/charissil/README.TEXLIVE
-runfiles size=2256
+runfiles size=2176
RELOC/fonts/truetype/SIL/charissil/CharisSIL-Bold.ttf
RELOC/fonts/truetype/SIL/charissil/CharisSIL-BoldItalic.ttf
RELOC/fonts/truetype/SIL/charissil/CharisSIL-Italic.ttf
- RELOC/fonts/truetype/SIL/charissil/CharisSIL-LiteracyCompact-B.ttf
- RELOC/fonts/truetype/SIL/charissil/CharisSIL-LiteracyCompact-BI.ttf
- RELOC/fonts/truetype/SIL/charissil/CharisSIL-LiteracyCompact-I.ttf
- RELOC/fonts/truetype/SIL/charissil/CharisSIL-LiteracyCompact-R.ttf
RELOC/fonts/truetype/SIL/charissil/CharisSIL-Regular.ttf
+ RELOC/fonts/truetype/SIL/charissil/CharisSILCompact-B.ttf
+ RELOC/fonts/truetype/SIL/charissil/CharisSILCompact-BI.ttf
+ RELOC/fonts/truetype/SIL/charissil/CharisSILCompact-I.ttf
+ RELOC/fonts/truetype/SIL/charissil/CharisSILCompact-R.ttf
RELOC/tex/latex/charissil/CharisSIL.sty
RELOC/tex/latex/charissil/CharisSILCompact.sty
catalogue-contact-home https://software.sil.org/charis/
@@ -99074,21 +99082,21 @@ catalogue-topics notes editorial
name easybook
category Package
-revision 60275
+revision 60287
shortdesc Typeset Chinese theses or books
relocated 1
longdesc Easybook is a minimalist style template based on the ctexbook
longdesc book document class.
containersize 17216
-containerchecksum 297a225fd8a547707a3f567ae0664c3dc2854985e00b251e9a00ecc4bed9d94b3221edba33a2791e0d7b98c1654fcc4e7e79377afed7b25104d3c0bb7e6eec3d
-doccontainersize 611472
-doccontainerchecksum dd61a1707904ed4f4af0dc82ec10a6ae67d31244c628a8cd65052ff2fabed9074d297ee7d9f51091dbed7bb344b3c501cf7958b8fec7c77f6e9f0f11dedea284
+containerchecksum 276dd54b1a2a9139ef5b149a60ed1699c09a72401a6f15f39668e81262a591c1b8dfd0c762f0ae2885198ee53bde43c7b37f6d39715d29951a6e73f1edf32a61
+doccontainersize 611516
+doccontainerchecksum ccf37c359917dae7022867c8f6f5c679a74748599467376f981a2b9e5e5cbc6c5460bf06b58bd6755ed658a68b7fdc2ee54d4cff6ed48ed05c1af185bddd8361
docfiles size=166
RELOC/doc/latex/easybook/README.md details="Readme"
RELOC/doc/latex/easybook/easybook.pdf details="Package documentation" language="zh"
RELOC/doc/latex/easybook/easybook.tex
-srccontainersize 17264
-srccontainerchecksum f69bf554f319525eea70f8143beac6377714afd4d4c009d57a518f8b1b816a36a0f3a10db7d9bd8c3135f6b086ebd66930bd0070cbea8949e1b875a4c49c5f08
+srccontainersize 17248
+srccontainerchecksum 78e39bdd9d52a03313666c46f36dd25ba01496629c86556d59bbc40f485ac317d675b27f2c52c38c1f6defb97a06eadd5aa63d6d62e9ffadeef18c5065e12534
srcfiles size=21
RELOC/source/latex/easybook/easybook.dtx
RELOC/source/latex/easybook/easybook.ins
@@ -99101,7 +99109,7 @@ catalogue-contact-repository https://gitee.com/texl3/easybook
catalogue-ctan /macros/latex/contrib/easybook
catalogue-license lppl1.3c
catalogue-topics book-pub class chinese expl3
-catalogue-version 1.29c
+catalogue-version 1.29d
name easyfig
category Package
@@ -213327,17 +213335,17 @@ catalogue-version 2.0
name newcomputermodern
category Package
-revision 59353
+revision 60285
shortdesc Computer Modern fonts including matching non-latin alphabets
relocated 1
longdesc This is a new assembly of Computer Modern fonts plus glyphs for
longdesc non Latin alphabets which are considered compatible in style to
longdesc CM fonts. In addition to the Regular weight of Computer Modern,
longdesc it provides a Book weight for heavier printing.
-containersize 7082996
-containerchecksum 8fe21d89b8989f63527151e1ba5e14f210a899726579d48abfc3e3e90be1f2cafe8a1af3b3a118a4fa2b5413337c95b7aea73442cc4abe991682892ded2979cf
-doccontainersize 1443380
-doccontainerchecksum 99fd9eab601c884e2dfbe8bbfa93e5a682ea882871986127de4491e3c9f4f75ac11ed9678b140ff26aa6b03948e308f0f84eeeadfd105dfdd03f30be114066ab
+containersize 7082984
+containerchecksum a9b806532b8b8d7a5b7a7b38760820733e96cf8a91c9d6a71a55263e8e3d2a5d56b3fca8110306158bf70c4d1c6f5451ed112cbddf97b8e156ddd6b75c890117
+doccontainersize 1443476
+doccontainerchecksum d6c080a94e54047c22dc39f0f819d77aaab2ad68843211498113ce556d59fc49e31f5b295f24dd1d92355b4e4b1102860a36511ee1854c866f099c3104425217
docfiles size=362
RELOC/doc/fonts/newcomputermodern/README details="Readme"
RELOC/doc/fonts/newcomputermodern/newcm-unimath-symbols.ltx
@@ -213345,7 +213353,7 @@ docfiles size=362
RELOC/doc/fonts/newcomputermodern/newcomputermodern-sample.pdf details="Font samples"
RELOC/doc/fonts/newcomputermodern/newcomputermodern-sample.tex
srccontainersize 14020516
-srccontainerchecksum b50d40c41d4a49bc4d069140dd4c37b447214cbc4cf283d60faa3e02247d23f76f3520d3378eecb78d30465c4d822a331a7f52b12a17b4f1d8221210e39da0fb
+srccontainerchecksum 4f83d9f90b83a6a58c6cbf15a8df2191da76a667d3be4e4453be38864963b126f18405e39d53335834da3ce99c63ea18d8f5a27fa8149093331dd88293904897
srcfiles size=27996
RELOC/source/fonts/newcomputermodern/NewCM08-Book.sfd
RELOC/source/fonts/newcomputermodern/NewCM08-BookItalic.sfd
@@ -213404,18 +213412,18 @@ runfiles size=4944
RELOC/fonts/opentype/public/newcomputermodern/NewCMSans10-BookOblique.otf
RELOC/fonts/opentype/public/newcomputermodern/NewCMSans10-Oblique.otf
RELOC/fonts/opentype/public/newcomputermodern/NewCMSans10-Regular.otf
- RELOC/tex/latex/newcomputermodern/NewComputerModern.fontspec
- RELOC/tex/latex/newcomputermodern/NewComputerModernBook.fontspec
- RELOC/tex/latex/newcomputermodern/NewComputerModernMono.fontspec
- RELOC/tex/latex/newcomputermodern/NewComputerModernMonoBook.fontspec
- RELOC/tex/latex/newcomputermodern/NewComputerModernSans.fontspec
- RELOC/tex/latex/newcomputermodern/NewComputerModernSansBook.fontspec
+ RELOC/tex/latex/newcomputermodern/NewCM10-Book.fontspec
+ RELOC/tex/latex/newcomputermodern/NewCM10-Regular.fontspec
+ RELOC/tex/latex/newcomputermodern/NewCMMono10-Book.fontspec
+ RELOC/tex/latex/newcomputermodern/NewCMMono10-Regular.fontspec
+ RELOC/tex/latex/newcomputermodern/NewCMSans10-Book.fontspec
+ RELOC/tex/latex/newcomputermodern/NewCMSans10-Regular.fontspec
RELOC/tex/latex/newcomputermodern/newcomputermodern.sty
catalogue-alias newcm
catalogue-ctan /fonts/newcomputermodern
catalogue-license gfl
catalogue-topics font font-cm font-body font-proportional font-mono font-serif font-sans font-multilingual font-greek font-cyrillic font-hebrew font-maths font-otf cherokee font-supp
-catalogue-version 3.91
+catalogue-version 3.92
name newenviron
category Package
@@ -244485,7 +244493,7 @@ catalogue-version 1.5
name phonenumbers
category Package
-revision 51933
+revision 60288
shortdesc Typesetting telephone numbers with LaTeX
relocated 1
longdesc The phonenumbers package makes it possible to typeset telephone
@@ -244497,18 +244505,18 @@ longdesc options, including the additional output of the country calling
longdesc code. The package is able to check if a phone number is valid
longdesc according to the national rules. It also allows to link phone
longdesc numbers using the hyperref package.
-containersize 69988
-containerchecksum 79f875543181adada6e60d57adbc225efef89440666aa179ce69eef0118c528bb603436cb7df5dba95c75f60bd57bbe321f169358e247842a42cafee14cffef9
-doccontainersize 1094648
-doccontainerchecksum 85a496e3ff30df0bb1a852e1e21cf0fd8434124f3ec1b460fbd3c0da05573a1ac85136d3caec4f4d59993d47ad82fc0f123afcbf272982bd614dd2e1f318394f
-docfiles size=952
+containersize 70892
+containerchecksum 9a7f6dd040cafbdc388e5d2dcfb49fc394ff4b7d15889739e0ad3e3da088ba0d6543b68e95f9a420d77d5a1315423bcae7a68a2e1f18f425a1fe156ef26ef4e1
+doccontainersize 1114408
+doccontainerchecksum e4b696978deae4059d8d85e6b21addeb1e84d83b82a87babc68d111a6e0601df305dc69e435546da70a64387c64a4c5928e56e16ea9a3af6eb3c7952330fc7ed
+docfiles size=968
RELOC/doc/latex/phonenumbers/Literatur.bib
RELOC/doc/latex/phonenumbers/README details="Readme"
RELOC/doc/latex/phonenumbers/phonenumbers-de.pdf details="German package documentation" language="de"
RELOC/doc/latex/phonenumbers/phonenumbers-de.tex
- RELOC/doc/latex/phonenumbers/phonenumbers-en.pdf details="English package documentation" language="en-gb"
+ RELOC/doc/latex/phonenumbers/phonenumbers-en.pdf details="English package documentation"
RELOC/doc/latex/phonenumbers/phonenumbers-en.tex
-runfiles size=162
+runfiles size=164
RELOC/tex/latex/phonenumbers/phn-AT_Ortsnamen.tex
RELOC/tex/latex/phonenumbers/phn-AT_Vorwahlen.tex
RELOC/tex/latex/phonenumbers/phn-DE_Ortsnamen.tex
@@ -244521,10 +244529,12 @@ runfiles size=162
RELOC/tex/latex/phonenumbers/phn-US_Ortsnamen.tex
RELOC/tex/latex/phonenumbers/phn-US_Vorwahlen.tex
RELOC/tex/latex/phonenumbers/phonenumbers.sty
+catalogue-contact-bugs https://github.com/wehro/phonenumbers/issues
+catalogue-contact-repository https://github.com/wehro/phonenumbers
catalogue-ctan /macros/latex/contrib/phonenumbers
catalogue-license lppl1.3
-catalogue-topics addr-list numbers
-catalogue-version 2.2
+catalogue-topics addr-list numbers expl3
+catalogue-version 2.3
name phonetic
category Package
@@ -301650,7 +301660,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 60264
+revision 60283
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.
@@ -301658,11 +301668,11 @@ 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 108300
-containerchecksum c36090580a8fe7caa5493a3bd2878553a2046cbaf73a653b79efd22d253cb75619b760414006f9a6785e10547801b5989fa31df79da94466a238aacf3747d406
-doccontainersize 399680
-doccontainerchecksum fa9d56e8b27946a88eba404096d673036d6cb89097fe595dcafa8e73b45ba69c903b57a8d1e65c89ad3a7530a712c5006b675a9ecf4d50fc58d430c0c0df687b
-docfiles size=494
+containersize 108296
+containerchecksum 5521403a0febb576c3dd7aaa9d42b4065373b9c6083b6b241587336eee6e5fe0797b2703ab073839ece13b93e7b28a795184787464a2e751aabeb7e866554aa9
+doccontainersize 399648
+doccontainerchecksum 084e8fcdcdc9e1189d281f23c3535f3457d7a87885db9884563fc438949295757c461cc4ca82975b30e0ab09cc9b621b270d38842d0367dca2453bc892decb99
+docfiles size=495
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
texmf-dist/doc/man/man1/fmtutil-sys.man1.pdf
@@ -308476,15 +308486,15 @@ catalogue-version 4.10c
name tikztosvg
category TLCore
-revision 60114
+revision 60289
shortdesc A utility for rendering TikZ diagrams to SVG
longdesc This package provides a shell script that calls XeTeX and
longdesc pdf2svg to convert TikZ environments to SVG files.
depend tikztosvg.ARCH
-containersize 1996
-containerchecksum f309f12e9476df4641d9a00b25076e3f2d263ae361877270005c21bbfb4da7c99e7a6e957ae2834c72518c748b8403f7d38443a95c68ff00593570e1a8b4a703
-doccontainersize 210356
-doccontainerchecksum 910dd2bbe1cfbb00f523382ab6df2824de928f862f6c19f28308b1a942e239dadc8575cc4270400a523942eb256b5552b85fb4d243592ea5f83323c4f755de44
+containersize 2052
+containerchecksum 0957b87c9a06771afab350de769e3fa9f97ec0aa09e4e740d0f916992948a65740a96446a0f8ac144273e94f228db2c6c0ddb22bd01ea9f0f66abe5adfe0125c
+doccontainersize 213584
+doccontainerchecksum 3d90c0963c570a115390603bcd5f39a224a155faea8ac6eec511b9689ab98383386d3d6e92076129e0f704d69bd18da52cf2f89f5db024a4d5c34a75c1edf279
docfiles size=67
texmf-dist/doc/man/man1/tikztosvg.1
texmf-dist/doc/man/man1/tikztosvg.man1.pdf
@@ -308494,21 +308504,20 @@ docfiles size=67
texmf-dist/doc/support/tikztosvg/README.md details="Readme"
texmf-dist/doc/support/tikztosvg/example.svg
texmf-dist/doc/support/tikztosvg/example.tikz
- texmf-dist/doc/support/tikztosvg/install.sh
texmf-dist/doc/support/tikztosvg/man.adoc
texmf-dist/doc/support/tikztosvg/tikztosvg.pdf details="Manual page (PDF)"
runfiles size=2
texmf-dist/scripts/tikztosvg/tikztosvg
catalogue-contact-announce https://lists.sr.ht/~pablo-pie/tikztosvg
-catalogue-contact-bugs https://todo.sr.ht/~pablo-pie/tikztosvg
+catalogue-contact-bugs https://lists.sr.ht/~pablo-pie/tikztosvg
catalogue-contact-development https://lists.sr.ht/~pablo-pie/tikztosvg
catalogue-contact-home https://git.sr.ht/~pablo-pie/tikztosvg
catalogue-contact-repository https://git.sr.ht/~pablo-pie/tikztosvg
-catalogue-contact-support https://lists.sr.ht/~pablo-pie/tikztosvg
+catalogue-contact-support https://todo.sr.ht/~pablo-pie/tikztosvg
catalogue-ctan /support/tikztosvg
catalogue-license gpl3
catalogue-topics cvt-other graphics pgf-tikz
-catalogue-version 0.2.1
+catalogue-version 0.3.0
name tikztosvg.aarch64-linux
category TLCore
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 9eb375087d..776235c659 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-bca5cfdae3a815b024da1ed6a5cf9457 texlive.tlpdb
+bb5dff707410f9d00f7fb821ec289e9a texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index cba5558bab..3ff6e110f2 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-7eee6d5a3355d22af83424d66afde9e7426b1f0e2a50faf02492513c517212e2ff17de2f0dca11d0736743fee42b4122bb3b04cb943515ab78781c6d5e64b124 texlive.tlpdb
+3906971fce4da7edd1f1ba5c26a1ab3658f494d42f00b98e8118052db0e56015ac9c6d2f0b1c39d2e2fd4c302a163f8432ed238cdc645643270832f8ec7ede10 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index d3d6e42961..cc68ac7fbc 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
@@ -1,10 +1,10 @@
-----BEGIN PGP SIGNATURE-----
-iQEcBAEBCgAGBQJhHu7RAAoJEEzhh34ZQ4xwGboH/Ar899u3z9BTqCtcuXL92vv1
-MnEUSySYDKFKlT40nMN642cQ+u0q6N8Z5oMs5C7hgXN28gQm+tuLn7a0Gx6gAkha
-vnNWp0x6S7W7GDr95HlNyDljsml5+yVlnIcozMnnUw2FInwjOkvfQK9FhCZKAd9n
-z1UnNEv6sHlltlsLbMLGcDSXhoi78kWmVrfSpi8Z2OHvEYyCL2VnFHYFhV3pAQsP
-gKHyoz0v2BIWcv1uKbdcdUxE8XDpu3+ptvify93TjAze198Xz7UWWHdmalKP0kRs
-HZYYpqw4zlxTne6MWip3b7bYezcZUDF9tkyN4a7Xo2e24/EZ0lBJLDjc1m/YiHs=
-=da8R
+iQEcBAEBCgAGBQJhIECWAAoJEEzhh34ZQ4xwSfgH/3Fl3VtK5fhftlwe9P6l+yf+
+bf4jyQLz3jIH+/LcZ5oQCzPfAZvtEAELf3VEBjWLDRNRkXAMtR4gkax515ZeqDCY
+142aDw2dQcCwfZ4BLQIFrNyLOnv2HdgWnqk9+4vvAO6NeKmXbDFgHpypz8id77+x
+9/HhZMTYQ0J7K5GSLZFCW2+4sA5DIeYp6nHYd+zAFY6rFby9PJCZNdgIv4GbhlmC
+wKNRZaQMYtdDe4DHDuY0w6woW9AIa9KKdW0PLhD1WV31+8VQqEUPhOe/0i5ulr7L
+MKiihddEjJJlnSZBpHgttTMSbjfEliOJaPjvy6A4WSR5GbLt4vcEK122b7pVHQc=
+=7tY8
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index ade5ab8736..d14a11d055 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index a86584b48a..3798045294 100644
--- a/systems/win32/miktex/tm/packages/next/pr.ini
+++ b/systems/win32/miktex/tm/packages/next/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1629404216
+date=1629490505
lastupd=miktex-arctrl-bin-2.9 miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-2.9 miktex-asymptote-bin-x64-2.9 miktex-autosp-bin-2.9 miktex-autosp-bin-x64-2.9 miktex-axohelp-bin-2.9 miktex-axohelp-bin-x64-2.9 miktex-bibarts-bin-2.9 miktex-bibarts-bin-x64-2.9 miktex-bibtex-bin-2.9 miktex-bibtex-bin-x64-2.9 miktex-bibtex8bit-bin-2.9 miktex-bibtex8bit-bin-x64-2.9 miktex-bzip2-bin-2.9 miktex-bzip2-bin-x64-2.9 miktex-cairo-bin-2.9 miktex-cairo-bin-x64-2.9 miktex-chktex-bin-2.9 miktex-chktex-bin-x64-2.9
-lstdigest=b6f241ceb8b8772e0a8b94e206b04e28
+lstdigest=d865c77a3137df9761705768c678e7b1
numpkg=4689
relstate=next
-version=7901
+version=7902
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: U1QwprAWJ8UKTKt3nJbPVcLYQS3aXfTDvWqxElcnicS6Kc5DK4v0OoEDf/V0hJ4B7acUT5ltoQRPcRztTsQycJKviV9oZ3jOgANJJeVrCS/ulXPSAglx9g5JrDmfQGmQGa1XGmoC/F/LHsHIVhCqbZ5TJ+9CJcWmOrXDdpqRYvsq0llkgb4pl/WEa2ersFSvMpUJCH3aWDO8cbvd4Xq6obpYaKJVqBYVGdNUFX/OO9jk9R0WM7gHSCF3pCfDrQvQH5MscUEJxwIHrzjOlhGvrzUC6M883Qz58E9i6P7ZqF/CgQ15V14DkihriJQr70rncXMNnDCSSyL7iP/6NynQcg==
+;;;; signature/miktex: hG/M7hN0E/1uPibk/UkQDVwIlduypSvl/q4bwgoEc1a4mkpA5zva0+O+5gr+bkE8MLe/GWAFcmyKuDfQKr2+92dQ02fg3SAFBYxZaQf2kMGjQjJWGG4PFjDjWWQO8MXidq4ah7XXRBJaTjndxqvN763Bi1wiNfV0vqGVwdsIEA2E7K/Tbo9CkXtecdzGZW+iaG52Z4LyI0OGOjUaqWA9yXFmrNBg/hrxsE2iA8KHX5PwCyJttGn9DMEL7fyQHo5hURoSrbWZr5bSk4Et7wqRRYGCyy5r9zgjMLzt8oA4yYNkKR4oZQzvqPaB8AR21tZas/TDPhhU1sEWaH4j+CXbig==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index 17a67a7464..cfce07fc71 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1629403909
+date=1629490301
lastupd=beamer-rl beamer-rl__doc beaulivre beaulivre__doc beaulivre__source bytefield bytefield__doc bytefield__source colorist colorist__doc colorist__source cryptocode cryptocode__doc cryptocode__source easybook easybook__doc easybook__source einfart einfart__doc einfart__source
-lstdigest=f95dd12669eab0f3472d3b252b39e3d7
+lstdigest=48a3f21518fb343aa469d179212a7fd3
numpkg=4689
relstate=stable
-version=7901
+version=7902
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: m2JhduP5JMitXu3LlQwdaV/VWlRuGoj/7tA590lOlY7fVZ4PtQCxDKqHMRUpKPWDFugA4815c2X8eMc7NGvCeWQliXDCBjChABDXwOFujUwo85QfMQDOf5Y3l7tE+1sBup5JvWqM/8GkQqYR5iSZfE2z94R5rYkv3W875HkYiyh9XjPEkFq0EpVjGMfi3loNo4mSyR9wkEWnY6bsW0ztaHKNXbohEgAbLr5a+Hp3N23j7DRM3ds96zSqaxstY5a3CWCW7GQsB4KfKF41tNF23aywRR7Cz81LoEVhEJbWZa0VP2gaZULlDZ8y1OaSdmdErfOCxn3LGbCPdDugupu53w==
+;;;; signature/miktex: EHv5MEwhSKgcn1bIqKFk2zjrQsSlXrZiSRsG15lB6sP3YXWH7UXzFPpj2r/S4UAJHAzVUSDAChlxddVrhHRKcf9X1s0CP8Q4XZFU/y+q1rQlX4Jxx9igKui5GzDK07FLWuHILfylHbbf7YyTp+qcEqgEj5jBDQwOYAEP52EyqsWDPGUT3G3hSLQacvtcGUF+xFDc+PflNdr9ptoVRHrPoJl3DBGmVSyxrDu6MHWPbNW4CPry2ikyzBkff8r5sn30996L6EyIsHOgEIsQF2SngcCFWFlp7dktXdfGenkoEMXcGlhpycanGzQ2N4otgadG5GUKiV4zmPuiMkYcEYtHEQ==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index 965a40aa40..73d9021d69 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2021-08-20-02-02
+2021-08-21-02-02