diff options
140 files changed, 4189 insertions, 2253 deletions
diff --git a/FILES.byname b/FILES.byname index 3425411347..943c983064 100644 --- a/FILES.byname +++ b/FILES.byname @@ -2218,7 +2218,7 @@ 1989/12/11 | 6196 | biblio/tib/tib.man 1989/03/29 | 23265 | biblio/tib/vitaMake 2005/12/15 | 366385 | biblio/tib.zip -2023/04/22 | 18221 | CTAN.sites +2023/04/24 | 18085 | 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 @@ -5417,7 +5417,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 -2023/04/23 | 172660 | FILES.last07days +2023/04/24 | 109791 | 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 @@ -67376,12 +67376,12 @@ 2021/02/26 | 6624 | fonts/libertinus-fonts/README.md 2021/02/26 | 3278864 | fonts/libertinus-fonts.zip 2020/05/06 | 847 | fonts/libertinus/latex/libertinus.sty -2021/07/23 | 1957 | fonts/libertinus-otf/Changes -2021/07/23 | 626124 | fonts/libertinus-otf/doc/libertinus-otf-doc.pdf -2021/07/23 | 60980 | fonts/libertinus-otf/doc/libertinus-otf-doc.tex -2021/07/23 | 25475 | fonts/libertinus-otf/latex/libertinus-otf.sty +2023/04/24 | 2091 | fonts/libertinus-otf/Changes +2023/04/24 | 659151 | fonts/libertinus-otf/doc/libertinus-otf-doc.pdf +2023/04/24 | 61114 | fonts/libertinus-otf/doc/libertinus-otf-doc.tex +2023/04/24 | 25947 | fonts/libertinus-otf/latex/libertinus-otf.sty 2020/06/07 | 408 | fonts/libertinus-otf/README.md -2021/07/23 | 598910 | fonts/libertinus-otf.zip +2023/04/24 | 632835 | fonts/libertinus-otf.zip 2020/05/06 | 489 | fonts/libertinus/README.md 2017/08/18 | 5490 | fonts/libertinust1math/afm/BDXsfmi-bol.afm 2017/08/12 | 5698 | fonts/libertinust1math/afm/BDXsfmi-reg.afm @@ -160770,12 +160770,12 @@ 2019/08/15 | 53372 | graphics/pgf/contrib/tikz-network/tikz-network.sty 2019/08/15 | 145240 | graphics/pgf/contrib/tikz-network/tikz-network.tex 2019/08/15 | 1017759 | graphics/pgf/contrib/tikz-network.zip -2023/03/27 | 13803 | graphics/pgf/contrib/tikz-nfold/pgflibrarybezieroffset.code.tex -2023/03/27 | 706 | graphics/pgf/contrib/tikz-nfold/README.md -2023/03/27 | 32220 | graphics/pgf/contrib/tikz-nfold/tikzlibrarynfold.code.tex -2023/03/27 | 289815 | graphics/pgf/contrib/tikz-nfold/tikz-nfold-doc.pdf -2023/03/27 | 27521 | graphics/pgf/contrib/tikz-nfold/tikz-nfold-doc.tex -2023/03/27 | 276096 | graphics/pgf/contrib/tikz-nfold.zip +2023/04/23 | 16016 | graphics/pgf/contrib/tikz-nfold/pgflibrarybezieroffset.code.tex +2023/04/23 | 706 | graphics/pgf/contrib/tikz-nfold/README.md +2023/04/24 | 47614 | graphics/pgf/contrib/tikz-nfold/tikzlibrarynfold.code.tex +2023/04/24 | 302366 | graphics/pgf/contrib/tikz-nfold/tikz-nfold-doc.pdf +2023/04/24 | 31568 | graphics/pgf/contrib/tikz-nfold/tikz-nfold-doc.tex +2023/04/24 | 292443 | graphics/pgf/contrib/tikz-nfold.zip 2014/01/23 | 19106 | graphics/pgf/contrib/tikz-opm/LICENSE 2014/01/23 | 215 | graphics/pgf/contrib/tikz-opm/README 2014/01/23 | 74999 | graphics/pgf/contrib/tikz-opm/tikz-opm.pdf @@ -194370,7 +194370,7 @@ 2019/12/15 | 441325 | install/macros/latex/contrib/intcalc.tds.zip 2008/07/31 | 81728 | install/macros/latex/contrib/inversepath.tds.zip 2022/02/09 | 1035078 | install/macros/latex/contrib/jmlr.tds.zip -2023/04/17 | 9949201 | install/macros/latex/contrib/koma-script.tds.zip +2023/04/24 | 9753485 | install/macros/latex/contrib/koma-script.tds.zip 2015/12/09 | 171418 | install/macros/latex/contrib/ksp-thesis.tds.zip 2019/12/19 | 302191 | install/macros/latex/contrib/kvdefinekeys.tds.zip 2023/04/19 | 972462 | install/macros/latex/contrib/l3backend.tds.zip @@ -214243,13 +214243,15 @@ 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 -2023/04/03 | 1711461 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf +2023/04/24 | 1711489 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf 2022/04/05 | 17207 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex -2023/04/02 | 211295 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex -2023/04/02 | 23181 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.bbx -2023/04/02 | 3439 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.cbx +2023/04/24 | 213084 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex +2023/04/10 | 33217 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.bbx +2023/04/24 | 5121 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.cbx 2023/04/02 | 10735 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.bbx -2023/04/03 | 5922 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.cbx +2023/04/24 | 5888 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.cbx +2023/04/24 | 26158 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.bbx +2023/04/24 | 6465 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.cbx 2022/04/16 | 132176 | 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 @@ -214259,9 +214261,9 @@ 2021/08/19 | 520 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2005ay.cbx 2021/12/11 | 3184 | 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 -2023/04/03 | 173293 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx +2023/04/24 | 174325 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx 2022/06/26 | 16158 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx -2023/04/03 | 174811 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx +2023/04/24 | 175876 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx 2023/04/03 | 18609 | 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 2022/11/07 | 124583 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx @@ -214276,8 +214278,8 @@ 2022/03/14 | 415 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-SEU.cbx 2021/09/11 | 56865 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714texttobib.pl 2023/04/03 | 5620 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/makeall.py -2023/04/03 | 75501 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md -2023/04/03 | 1743424 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015.zip +2023/04/24 | 75685 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md +2023/04/24 | 1754813 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015.zip 2023/02/22 | 167639 | macros/latex/contrib/biblatex-contrib/biblatex-german-legal/biblatex-german-legal.pdf 2023/02/22 | 18622 | macros/latex/contrib/biblatex-contrib/biblatex-german-legal/biblatex-german-legal.tex 2023/02/22 | 11374 | macros/latex/contrib/biblatex-contrib/biblatex-german-legal/german-legal-book.bbx @@ -227055,240 +227057,240 @@ 2012/01/04 | 12594 | macros/latex/contrib/koma-moderncvclassic/koma-moderncvclassic.sty 2012/01/04 | 1274 | macros/latex/contrib/koma-moderncvclassic/README 2012/01/04 | 194292 | macros/latex/contrib/koma-moderncvclassic.zip -2023/04/17 | 2687 | macros/latex/contrib/koma-script/doc/authorpart-de.tex -2023/04/17 | 2519 | macros/latex/contrib/koma-script/doc/authorpart-en.tex -2023/04/17 | 8059 | macros/latex/contrib/koma-script/doc/common-compatibility-de.tex -2023/04/17 | 7532 | macros/latex/contrib/koma-script/doc/common-compatibility-en.tex -2023/04/17 | 11368 | macros/latex/contrib/koma-script/doc/common-dictum-de.tex -2023/04/17 | 9589 | macros/latex/contrib/koma-script/doc/common-dictum-en.tex -2023/04/17 | 4478 | macros/latex/contrib/koma-script/doc/common-draftmode-de.tex -2023/04/17 | 4320 | macros/latex/contrib/koma-script/doc/common-draftmode-en.tex -2023/04/17 | 9387 | macros/latex/contrib/koma-script/doc/common-fontsize-de.tex -2023/04/17 | 7876 | macros/latex/contrib/koma-script/doc/common-fontsize-en.tex -2023/04/17 | 31623 | macros/latex/contrib/koma-script/doc/common-footnotes-de.tex -2023/04/17 | 26283 | macros/latex/contrib/koma-script/doc/common-footnotes-en.tex -2023/04/17 | 2132 | macros/latex/contrib/koma-script/doc/common-footnotes-experts-de.tex -2023/04/17 | 2021 | macros/latex/contrib/koma-script/doc/common-footnotes-experts-en.tex -2023/04/17 | 7590 | macros/latex/contrib/koma-script/doc/common-headfootheight-de.tex -2023/04/17 | 6640 | macros/latex/contrib/koma-script/doc/common-headfootheight-en.tex -2023/04/17 | 15650 | macros/latex/contrib/koma-script/doc/common-interleafpage-de.tex -2023/04/17 | 14241 | macros/latex/contrib/koma-script/doc/common-interleafpage-en.tex -2023/04/17 | 36339 | macros/latex/contrib/koma-script/doc/common-lists-de.tex -2023/04/17 | 33613 | macros/latex/contrib/koma-script/doc/common-lists-en.tex -2023/04/17 | 4913 | macros/latex/contrib/koma-script/doc/common-marginpar-de.tex -2023/04/17 | 4549 | macros/latex/contrib/koma-script/doc/common-marginpar-en.tex -2023/04/17 | 5376 | macros/latex/contrib/koma-script/doc/common-oddorevenpage-de.tex -2023/04/17 | 4720 | macros/latex/contrib/koma-script/doc/common-oddorevenpage-en.tex -2023/04/17 | 10677 | macros/latex/contrib/koma-script/doc/common-options-de.tex -2023/04/17 | 9226 | macros/latex/contrib/koma-script/doc/common-options-en.tex -2023/04/17 | 53667 | macros/latex/contrib/koma-script/doc/common-pagestylemanipulation-de.tex -2023/04/17 | 46863 | macros/latex/contrib/koma-script/doc/common-pagestylemanipulation-en.tex -2023/04/17 | 12139 | macros/latex/contrib/koma-script/doc/common-parmarkup-de.tex -2023/04/17 | 11848 | macros/latex/contrib/koma-script/doc/common-parmarkup-en.tex -2023/04/17 | 48503 | macros/latex/contrib/koma-script/doc/common-textmarkup-de.tex -2023/04/17 | 43924 | macros/latex/contrib/koma-script/doc/common-textmarkup-en.tex -2023/04/17 | 31871 | macros/latex/contrib/koma-script/doc/common-titles-de.tex -2023/04/17 | 28736 | macros/latex/contrib/koma-script/doc/common-titles-en.tex -2023/04/17 | 3026 | macros/latex/contrib/koma-script/doc/common-typearea-de.tex -2023/04/17 | 2911 | macros/latex/contrib/koma-script/doc/common-typearea-en.tex -2023/04/17 | 2145 | macros/latex/contrib/koma-script/doc/expertpart-de.tex -2023/04/17 | 2109 | macros/latex/contrib/koma-script/doc/expertpart-en.tex -2023/04/17 | 20494 | macros/latex/contrib/koma-script/doc/introduction-de.tex -2023/04/17 | 16794 | macros/latex/contrib/koma-script/doc/introduction-en.tex -2023/04/17 | 25450 | macros/latex/contrib/koma-script/doc/japanlco-en.tex -2023/04/17 | 15210 | macros/latex/contrib/koma-script/doc/letter-example-00-de.pdf -2023/04/17 | 16099 | macros/latex/contrib/koma-script/doc/letter-example-00-en.pdf -2023/04/17 | 17614 | macros/latex/contrib/koma-script/doc/letter-example-01-de.pdf -2023/04/17 | 18856 | macros/latex/contrib/koma-script/doc/letter-example-01-en.pdf -2023/04/17 | 17869 | macros/latex/contrib/koma-script/doc/letter-example-02-de.pdf -2023/04/17 | 19155 | macros/latex/contrib/koma-script/doc/letter-example-02-en.pdf -2023/04/17 | 17904 | macros/latex/contrib/koma-script/doc/letter-example-03-de.pdf -2023/04/17 | 19188 | macros/latex/contrib/koma-script/doc/letter-example-03-en.pdf -2023/04/17 | 17958 | macros/latex/contrib/koma-script/doc/letter-example-04-de.pdf -2023/04/17 | 19229 | macros/latex/contrib/koma-script/doc/letter-example-04-en.pdf -2023/04/17 | 18053 | macros/latex/contrib/koma-script/doc/letter-example-05-de.pdf -2023/04/17 | 19248 | macros/latex/contrib/koma-script/doc/letter-example-05-en.pdf -2023/04/17 | 18059 | macros/latex/contrib/koma-script/doc/letter-example-06-de.pdf -2023/04/17 | 19246 | macros/latex/contrib/koma-script/doc/letter-example-06-en.pdf -2023/04/17 | 17934 | macros/latex/contrib/koma-script/doc/letter-example-07-de.pdf -2023/04/17 | 19204 | macros/latex/contrib/koma-script/doc/letter-example-07-en.pdf -2023/04/17 | 30698 | macros/latex/contrib/koma-script/doc/letter-example-08-de.pdf -2023/04/17 | 32389 | macros/latex/contrib/koma-script/doc/letter-example-08-en.pdf -2023/04/17 | 30680 | macros/latex/contrib/koma-script/doc/letter-example-09-de.pdf -2023/04/17 | 32367 | macros/latex/contrib/koma-script/doc/letter-example-09-en.pdf -2023/04/17 | 30698 | macros/latex/contrib/koma-script/doc/letter-example-10-de.pdf -2023/04/17 | 32389 | macros/latex/contrib/koma-script/doc/letter-example-10-en.pdf -2023/04/17 | 30699 | macros/latex/contrib/koma-script/doc/letter-example-11-de.pdf -2023/04/17 | 32391 | macros/latex/contrib/koma-script/doc/letter-example-11-en.pdf -2023/04/17 | 30698 | macros/latex/contrib/koma-script/doc/letter-example-12-de.pdf -2023/04/17 | 32389 | macros/latex/contrib/koma-script/doc/letter-example-12-en.pdf -2023/04/17 | 31442 | macros/latex/contrib/koma-script/doc/letter-example-13-de.pdf -2023/04/17 | 33659 | macros/latex/contrib/koma-script/doc/letter-example-13-en.pdf -2023/04/17 | 31416 | macros/latex/contrib/koma-script/doc/letter-example-14-de.pdf -2023/04/17 | 33630 | macros/latex/contrib/koma-script/doc/letter-example-14-en.pdf -2023/04/17 | 31442 | macros/latex/contrib/koma-script/doc/letter-example-15-de.pdf -2023/04/17 | 33658 | macros/latex/contrib/koma-script/doc/letter-example-15-en.pdf -2023/04/17 | 32439 | macros/latex/contrib/koma-script/doc/letter-example-16-de.pdf -2023/04/17 | 34650 | macros/latex/contrib/koma-script/doc/letter-example-16-en.pdf -2023/04/17 | 32464 | macros/latex/contrib/koma-script/doc/letter-example-17-de.pdf -2023/04/17 | 34683 | macros/latex/contrib/koma-script/doc/letter-example-17-en.pdf -2023/04/17 | 32462 | macros/latex/contrib/koma-script/doc/letter-example-18-de.pdf -2023/04/17 | 34675 | macros/latex/contrib/koma-script/doc/letter-example-18-en.pdf -2023/04/17 | 32958 | macros/latex/contrib/koma-script/doc/letter-example-19-de.pdf -2023/04/17 | 34954 | macros/latex/contrib/koma-script/doc/letter-example-19-en.pdf -2023/04/17 | 32937 | macros/latex/contrib/koma-script/doc/letter-example-20-de.pdf -2023/04/17 | 34966 | macros/latex/contrib/koma-script/doc/letter-example-20-en.pdf -2023/04/17 | 44230 | macros/latex/contrib/koma-script/doc/letter-example-21-de.pdf -2023/04/17 | 46083 | macros/latex/contrib/koma-script/doc/letter-example-21-en.pdf -2023/04/17 | 44537 | macros/latex/contrib/koma-script/doc/letter-example-22-de.pdf -2023/04/17 | 46388 | macros/latex/contrib/koma-script/doc/letter-example-22-en.pdf -2023/04/17 | 44537 | macros/latex/contrib/koma-script/doc/letter-example-23-de.pdf -2023/04/17 | 46388 | macros/latex/contrib/koma-script/doc/letter-example-23-en.pdf -2023/04/17 | 3980 | macros/latex/contrib/koma-script/doc/linkalias.tex -2023/04/17 | 15234 | macros/latex/contrib/koma-script/doc/plength-tikz.tex -2023/04/17 | 5532 | macros/latex/contrib/koma-script/doc/preface-de.tex -2023/04/17 | 4980 | macros/latex/contrib/koma-script/doc/preface-en.tex -2023/04/17 | 10531 | macros/latex/contrib/koma-script/doc/scraddr-de.tex -2023/04/17 | 9346 | macros/latex/contrib/koma-script/doc/scraddr-en.tex -2023/04/17 | 2425 | macros/latex/contrib/koma-script/doc/scraddr.html -2023/04/17 | 2564 | macros/latex/contrib/koma-script/doc/scrartcl.html -2023/04/17 | 2570 | macros/latex/contrib/koma-script/doc/scrarticle.html -2023/04/17 | 95730 | macros/latex/contrib/koma-script/doc/scrbase-de.tex -2023/04/17 | 83762 | macros/latex/contrib/koma-script/doc/scrbase-en.tex -2023/04/17 | 2439 | macros/latex/contrib/koma-script/doc/scrbase.html -2023/04/17 | 2561 | macros/latex/contrib/koma-script/doc/scrbook.html -2023/04/17 | 248858 | macros/latex/contrib/koma-script/doc/scrbookreportarticle-de.tex -2023/04/17 | 222145 | macros/latex/contrib/koma-script/doc/scrbookreportarticle-en.tex -2023/04/17 | 101157 | macros/latex/contrib/koma-script/doc/scrbookreportarticle-experts-de.tex -2023/04/17 | 88170 | macros/latex/contrib/koma-script/doc/scrbookreportarticle-experts-en.tex -2023/04/17 | 13094 | macros/latex/contrib/koma-script/doc/scrdate-de.tex -2023/04/17 | 13210 | macros/latex/contrib/koma-script/doc/scrdate-en.tex -2023/04/17 | 2383 | macros/latex/contrib/koma-script/doc/scrdate.html -2023/04/17 | 9631 | macros/latex/contrib/koma-script/doc/scrextend-de.tex -2023/04/17 | 8177 | macros/latex/contrib/koma-script/doc/scrextend-en.tex -2023/04/17 | 2793 | macros/latex/contrib/koma-script/doc/scrextend.html -2023/04/17 | 23434 | macros/latex/contrib/koma-script/doc/scrguide.bib -2023/04/17 | 2992 | macros/latex/contrib/koma-script/doc/scrguide-body.tex -2023/04/17 | 99290 | macros/latex/contrib/koma-script/doc/scrguide.cls -2023/04/17 | 3303507 | macros/latex/contrib/koma-script/doc/scrguide-de.pdf -2023/04/17 | 1371 | macros/latex/contrib/koma-script/doc/scrguide-de.tex -2023/04/17 | 3217575 | macros/latex/contrib/koma-script/doc/scrguide-en.pdf -2023/04/17 | 1371 | macros/latex/contrib/koma-script/doc/scrguide-en.tex -2023/04/17 | 2210 | macros/latex/contrib/koma-script/doc/scrguide.gst -2023/04/17 | 1787 | macros/latex/contrib/koma-script/doc/scrguide.ist -2023/04/17 | 16159 | macros/latex/contrib/koma-script/doc/scrhack-de.tex -2023/04/17 | 14318 | macros/latex/contrib/koma-script/doc/scrhack-en.tex -2023/04/17 | 2447 | macros/latex/contrib/koma-script/doc/scrhack.html -2023/04/17 | 58093 | macros/latex/contrib/koma-script/doc/scrjura-de.tex -2023/04/17 | 49833 | macros/latex/contrib/koma-script/doc/scrjura-en.tex -2023/04/17 | 62562 | macros/latex/contrib/koma-script/doc/scrjura-example-de.pdf -2023/04/17 | 3731 | macros/latex/contrib/koma-script/doc/scrjura-example-de.tex -2023/04/17 | 61102 | macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf -2023/04/17 | 3416 | macros/latex/contrib/koma-script/doc/scrjura-example-en.tex -2023/04/17 | 2465 | macros/latex/contrib/koma-script/doc/scrjura.html -2023/04/17 | 2713 | macros/latex/contrib/koma-script/doc/scrkbase.html -2023/04/17 | 93786 | macros/latex/contrib/koma-script/doc/scrlayer-de.tex -2023/04/17 | 78876 | macros/latex/contrib/koma-script/doc/scrlayer-en.tex -2023/04/17 | 2492 | macros/latex/contrib/koma-script/doc/scrlayer.html -2023/04/17 | 38864 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-de.tex -2023/04/17 | 32799 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-en.tex -2023/04/17 | 161997 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.pdf -2023/04/17 | 3787 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.tex -2023/04/17 | 159442 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.pdf -2023/04/17 | 3542 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.tex -2023/04/17 | 2463 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn.html -2023/04/17 | 59521 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage-de.tex -2023/04/17 | 53457 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage-en.tex -2023/04/17 | 20683 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage-experts-de.tex -2023/04/17 | 17513 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage-experts-en.tex -2023/04/17 | 2478 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage.html -2023/04/17 | 2565 | macros/latex/contrib/koma-script/doc/scrletter.html -2023/04/17 | 35969 | macros/latex/contrib/koma-script/doc/scrlfile-de.tex -2023/04/17 | 32098 | macros/latex/contrib/koma-script/doc/scrlfile-en.tex -2023/04/17 | 2647 | macros/latex/contrib/koma-script/doc/scrlfile-hook-3.34.html -2023/04/17 | 2602 | macros/latex/contrib/koma-script/doc/scrlfile-hook.html -2023/04/17 | 2484 | macros/latex/contrib/koma-script/doc/scrlfile.html -2023/04/17 | 2683 | macros/latex/contrib/koma-script/doc/scrlfile-patcholdlatex.html -2023/04/17 | 2632 | macros/latex/contrib/koma-script/doc/scrlogo-de.tex -2023/04/17 | 2494 | macros/latex/contrib/koma-script/doc/scrlogo-en.tex -2023/04/17 | 2459 | macros/latex/contrib/koma-script/doc/scrlogo.html -2023/04/17 | 236358 | macros/latex/contrib/koma-script/doc/scrlttr2-de.tex -2023/04/17 | 206209 | macros/latex/contrib/koma-script/doc/scrlttr2-en.tex -2023/04/17 | 13393 | macros/latex/contrib/koma-script/doc/scrlttr2-examples.dtx -2023/04/17 | 40627 | macros/latex/contrib/koma-script/doc/scrlttr2-experts-de.tex -2023/04/17 | 34196 | macros/latex/contrib/koma-script/doc/scrlttr2-experts-en.tex -2023/04/17 | 2562 | macros/latex/contrib/koma-script/doc/scrlttr2.html -2023/04/17 | 2567 | macros/latex/contrib/koma-script/doc/scrreport.html -2023/04/17 | 2564 | macros/latex/contrib/koma-script/doc/scrreprt.html -2023/04/17 | 5516 | macros/latex/contrib/koma-script/doc/scrtime-de.tex -2023/04/17 | 5045 | macros/latex/contrib/koma-script/doc/scrtime-en.tex -2023/04/17 | 2379 | macros/latex/contrib/koma-script/doc/scrtime.html -2023/04/17 | 2424 | macros/latex/contrib/koma-script/doc/scrwfile-de.tex -2023/04/17 | 2350 | macros/latex/contrib/koma-script/doc/scrwfile-en.tex -2023/04/17 | 20368 | macros/latex/contrib/koma-script/doc/terms-de.tex -2023/04/17 | 19100 | macros/latex/contrib/koma-script/doc/terms-en.tex -2023/04/17 | 146085 | macros/latex/contrib/koma-script/doc/tocbasic-de.tex -2023/04/17 | 129391 | macros/latex/contrib/koma-script/doc/tocbasic-en.tex -2023/04/17 | 2446 | macros/latex/contrib/koma-script/doc/tocbasic.html -2023/04/17 | 101021 | macros/latex/contrib/koma-script/doc/typearea-de.tex -2023/04/17 | 88016 | macros/latex/contrib/koma-script/doc/typearea-en.tex -2023/04/17 | 14138 | macros/latex/contrib/koma-script/doc/typearea-experts-de.tex -2023/04/17 | 12016 | macros/latex/contrib/koma-script/doc/typearea-experts-en.tex -2023/04/17 | 2448 | macros/latex/contrib/koma-script/doc/typearea.html -2023/04/17 | 8277 | macros/latex/contrib/koma-script/doc/variables-tikz.tex -2023/04/17 | 15116 | macros/latex/contrib/koma-script/japanlco.dtx -2023/04/17 | 27484 | macros/latex/contrib/koma-script/koma-script-source-doc.dtx -2023/04/17 | 25055 | macros/latex/contrib/koma-script/lppl-de.txt -2023/04/17 | 19110 | macros/latex/contrib/koma-script/lppl.txt -2023/04/17 | 9525 | macros/latex/contrib/koma-script/MANIFEST.md -2023/04/17 | 27888 | macros/latex/contrib/koma-script/README.md -2023/04/17 | 10632 | macros/latex/contrib/koma-script/scraddr.dtx -2023/04/17 | 13221 | macros/latex/contrib/koma-script/scrdoc.cls -2023/04/17 | 5658 | macros/latex/contrib/koma-script/scrdocstrip.tex -2023/04/17 | 9337 | macros/latex/contrib/koma-script/scrextend.dtx -2023/04/17 | 73295 | macros/latex/contrib/koma-script/scrhack.dtx -2023/04/17 | 70314 | macros/latex/contrib/koma-script/scrjura.dtx -2023/04/17 | 6304 | macros/latex/contrib/koma-script/scrkernel-addressfiles.dtx -2023/04/17 | 199121 | macros/latex/contrib/koma-script/scrkernel-basics.dtx -2023/04/17 | 27859 | macros/latex/contrib/koma-script/scrkernel-bibliography.dtx -2023/04/17 | 26547 | macros/latex/contrib/koma-script/scrkernel-compatibility.dtx -2023/04/17 | 73006 | macros/latex/contrib/koma-script/scrkernel-floats.dtx -2023/04/17 | 84871 | macros/latex/contrib/koma-script/scrkernel-fonts.dtx -2023/04/17 | 22719 | macros/latex/contrib/koma-script/scrkernel-footnotes.dtx -2023/04/17 | 14360 | macros/latex/contrib/koma-script/scrkernel-index.dtx -2023/04/17 | 75565 | macros/latex/contrib/koma-script/scrkernel-language.dtx -2023/04/17 | 59496 | macros/latex/contrib/koma-script/scrkernel-letterclassoptions.dtx -2023/04/17 | 17278 | macros/latex/contrib/koma-script/scrkernel-listsandtabulars.dtx -2023/04/17 | 48286 | macros/latex/contrib/koma-script/scrkernel-listsof.dtx -2023/04/17 | 40053 | macros/latex/contrib/koma-script/scrkernel-miscellaneous.dtx -2023/04/17 | 180460 | macros/latex/contrib/koma-script/scrkernel-notepaper.dtx -2023/04/17 | 30001 | macros/latex/contrib/koma-script/scrkernel-pagestyles.dtx -2023/04/17 | 27244 | macros/latex/contrib/koma-script/scrkernel-paragraphs.dtx -2023/04/17 | 12410 | macros/latex/contrib/koma-script/scrkernel-pseudolengths.dtx -2023/04/17 | 265785 | macros/latex/contrib/koma-script/scrkernel-sections.dtx -2023/04/17 | 34127 | macros/latex/contrib/koma-script/scrkernel-title.dtx -2023/04/17 | 107653 | macros/latex/contrib/koma-script/scrkernel-tocstyle.dtx -2023/04/17 | 126816 | macros/latex/contrib/koma-script/scrkernel-typearea.dtx -2023/04/17 | 16857 | macros/latex/contrib/koma-script/scrkernel-variables.dtx -2023/04/17 | 9738 | macros/latex/contrib/koma-script/scrkernel-version.dtx -2023/04/17 | 167532 | macros/latex/contrib/koma-script/scrlayer.dtx -2023/04/17 | 59932 | macros/latex/contrib/koma-script/scrlayer-notecolumn.dtx -2023/04/17 | 95609 | macros/latex/contrib/koma-script/scrlayer-scrpage.dtx -2023/04/17 | 10005 | macros/latex/contrib/koma-script/scrlfile.dtx -2023/04/17 | 25281 | macros/latex/contrib/koma-script/scrlfile-hook.dtx -2023/04/17 | 47300 | macros/latex/contrib/koma-script/scrlfile-patcholdlatex.dtx -2023/04/17 | 4447 | macros/latex/contrib/koma-script/scrlogo.dtx -2023/04/17 | 20746 | macros/latex/contrib/koma-script/scrmain.ins -2023/04/17 | 3464 | macros/latex/contrib/koma-script/scrstrip.inc -2023/04/17 | 1975 | macros/latex/contrib/koma-script/scrstrop.inc -2023/04/17 | 25737 | macros/latex/contrib/koma-script/scrtime.dtx +2023/04/24 | 2687 | macros/latex/contrib/koma-script/doc/authorpart-de.tex +2023/04/24 | 2519 | macros/latex/contrib/koma-script/doc/authorpart-en.tex +2023/04/24 | 8059 | macros/latex/contrib/koma-script/doc/common-compatibility-de.tex +2023/04/24 | 7532 | macros/latex/contrib/koma-script/doc/common-compatibility-en.tex +2023/04/24 | 11863 | macros/latex/contrib/koma-script/doc/common-dictum-de.tex +2023/04/24 | 10089 | macros/latex/contrib/koma-script/doc/common-dictum-en.tex +2023/04/24 | 4478 | macros/latex/contrib/koma-script/doc/common-draftmode-de.tex +2023/04/24 | 4320 | macros/latex/contrib/koma-script/doc/common-draftmode-en.tex +2023/04/24 | 9387 | macros/latex/contrib/koma-script/doc/common-fontsize-de.tex +2023/04/24 | 7876 | macros/latex/contrib/koma-script/doc/common-fontsize-en.tex +2023/04/24 | 31623 | macros/latex/contrib/koma-script/doc/common-footnotes-de.tex +2023/04/24 | 26283 | macros/latex/contrib/koma-script/doc/common-footnotes-en.tex +2023/04/24 | 2132 | macros/latex/contrib/koma-script/doc/common-footnotes-experts-de.tex +2023/04/24 | 2021 | macros/latex/contrib/koma-script/doc/common-footnotes-experts-en.tex +2023/04/24 | 7590 | macros/latex/contrib/koma-script/doc/common-headfootheight-de.tex +2023/04/24 | 6640 | macros/latex/contrib/koma-script/doc/common-headfootheight-en.tex +2023/04/24 | 15650 | macros/latex/contrib/koma-script/doc/common-interleafpage-de.tex +2023/04/24 | 14241 | macros/latex/contrib/koma-script/doc/common-interleafpage-en.tex +2023/04/24 | 36723 | macros/latex/contrib/koma-script/doc/common-lists-de.tex +2023/04/24 | 33995 | macros/latex/contrib/koma-script/doc/common-lists-en.tex +2023/04/24 | 4913 | macros/latex/contrib/koma-script/doc/common-marginpar-de.tex +2023/04/24 | 4549 | macros/latex/contrib/koma-script/doc/common-marginpar-en.tex +2023/04/24 | 5376 | macros/latex/contrib/koma-script/doc/common-oddorevenpage-de.tex +2023/04/24 | 4720 | macros/latex/contrib/koma-script/doc/common-oddorevenpage-en.tex +2023/04/24 | 10677 | macros/latex/contrib/koma-script/doc/common-options-de.tex +2023/04/24 | 9226 | macros/latex/contrib/koma-script/doc/common-options-en.tex +2023/04/24 | 53667 | macros/latex/contrib/koma-script/doc/common-pagestylemanipulation-de.tex +2023/04/24 | 46863 | macros/latex/contrib/koma-script/doc/common-pagestylemanipulation-en.tex +2023/04/24 | 12139 | macros/latex/contrib/koma-script/doc/common-parmarkup-de.tex +2023/04/24 | 11848 | macros/latex/contrib/koma-script/doc/common-parmarkup-en.tex +2023/04/24 | 48745 | macros/latex/contrib/koma-script/doc/common-textmarkup-de.tex +2023/04/24 | 44154 | macros/latex/contrib/koma-script/doc/common-textmarkup-en.tex +2023/04/24 | 31871 | macros/latex/contrib/koma-script/doc/common-titles-de.tex +2023/04/24 | 28736 | macros/latex/contrib/koma-script/doc/common-titles-en.tex +2023/04/24 | 3026 | macros/latex/contrib/koma-script/doc/common-typearea-de.tex +2023/04/24 | 2911 | macros/latex/contrib/koma-script/doc/common-typearea-en.tex +2023/04/24 | 2145 | macros/latex/contrib/koma-script/doc/expertpart-de.tex +2023/04/24 | 2109 | macros/latex/contrib/koma-script/doc/expertpart-en.tex +2023/04/24 | 20494 | macros/latex/contrib/koma-script/doc/introduction-de.tex +2023/04/24 | 16794 | macros/latex/contrib/koma-script/doc/introduction-en.tex +2023/04/24 | 25450 | macros/latex/contrib/koma-script/doc/japanlco-en.tex +2023/04/24 | 15081 | macros/latex/contrib/koma-script/doc/letter-example-00-de.pdf +2023/04/24 | 16127 | macros/latex/contrib/koma-script/doc/letter-example-00-en.pdf +2023/04/24 | 17489 | macros/latex/contrib/koma-script/doc/letter-example-01-de.pdf +2023/04/24 | 18886 | macros/latex/contrib/koma-script/doc/letter-example-01-en.pdf +2023/04/24 | 17733 | macros/latex/contrib/koma-script/doc/letter-example-02-de.pdf +2023/04/24 | 19190 | macros/latex/contrib/koma-script/doc/letter-example-02-en.pdf +2023/04/24 | 17769 | macros/latex/contrib/koma-script/doc/letter-example-03-de.pdf +2023/04/24 | 19224 | macros/latex/contrib/koma-script/doc/letter-example-03-en.pdf +2023/04/24 | 17823 | macros/latex/contrib/koma-script/doc/letter-example-04-de.pdf +2023/04/24 | 19266 | macros/latex/contrib/koma-script/doc/letter-example-04-en.pdf +2023/04/24 | 17914 | macros/latex/contrib/koma-script/doc/letter-example-05-de.pdf +2023/04/24 | 19283 | macros/latex/contrib/koma-script/doc/letter-example-05-en.pdf +2023/04/24 | 17919 | macros/latex/contrib/koma-script/doc/letter-example-06-de.pdf +2023/04/24 | 19282 | macros/latex/contrib/koma-script/doc/letter-example-06-en.pdf +2023/04/24 | 17798 | macros/latex/contrib/koma-script/doc/letter-example-07-de.pdf +2023/04/24 | 19242 | macros/latex/contrib/koma-script/doc/letter-example-07-en.pdf +2023/04/24 | 29121 | macros/latex/contrib/koma-script/doc/letter-example-08-de.pdf +2023/04/24 | 30752 | macros/latex/contrib/koma-script/doc/letter-example-08-en.pdf +2023/04/24 | 29103 | macros/latex/contrib/koma-script/doc/letter-example-09-de.pdf +2023/04/24 | 30731 | macros/latex/contrib/koma-script/doc/letter-example-09-en.pdf +2023/04/24 | 29121 | macros/latex/contrib/koma-script/doc/letter-example-10-de.pdf +2023/04/24 | 30752 | macros/latex/contrib/koma-script/doc/letter-example-10-en.pdf +2023/04/24 | 29125 | macros/latex/contrib/koma-script/doc/letter-example-11-de.pdf +2023/04/24 | 30752 | macros/latex/contrib/koma-script/doc/letter-example-11-en.pdf +2023/04/24 | 29121 | macros/latex/contrib/koma-script/doc/letter-example-12-de.pdf +2023/04/24 | 30752 | macros/latex/contrib/koma-script/doc/letter-example-12-en.pdf +2023/04/24 | 30006 | macros/latex/contrib/koma-script/doc/letter-example-13-de.pdf +2023/04/24 | 31986 | macros/latex/contrib/koma-script/doc/letter-example-13-en.pdf +2023/04/24 | 29980 | macros/latex/contrib/koma-script/doc/letter-example-14-de.pdf +2023/04/24 | 31954 | macros/latex/contrib/koma-script/doc/letter-example-14-en.pdf +2023/04/24 | 30004 | macros/latex/contrib/koma-script/doc/letter-example-15-de.pdf +2023/04/24 | 31986 | macros/latex/contrib/koma-script/doc/letter-example-15-en.pdf +2023/04/24 | 31001 | macros/latex/contrib/koma-script/doc/letter-example-16-de.pdf +2023/04/24 | 32974 | macros/latex/contrib/koma-script/doc/letter-example-16-en.pdf +2023/04/24 | 31028 | macros/latex/contrib/koma-script/doc/letter-example-17-de.pdf +2023/04/24 | 33007 | macros/latex/contrib/koma-script/doc/letter-example-17-en.pdf +2023/04/24 | 31025 | macros/latex/contrib/koma-script/doc/letter-example-18-de.pdf +2023/04/24 | 33000 | macros/latex/contrib/koma-script/doc/letter-example-18-en.pdf +2023/04/24 | 31519 | macros/latex/contrib/koma-script/doc/letter-example-19-de.pdf +2023/04/24 | 33277 | macros/latex/contrib/koma-script/doc/letter-example-19-en.pdf +2023/04/24 | 31498 | macros/latex/contrib/koma-script/doc/letter-example-20-de.pdf +2023/04/24 | 33284 | macros/latex/contrib/koma-script/doc/letter-example-20-en.pdf +2023/04/24 | 42786 | macros/latex/contrib/koma-script/doc/letter-example-21-de.pdf +2023/04/24 | 44408 | macros/latex/contrib/koma-script/doc/letter-example-21-en.pdf +2023/04/24 | 43094 | macros/latex/contrib/koma-script/doc/letter-example-22-de.pdf +2023/04/24 | 44706 | macros/latex/contrib/koma-script/doc/letter-example-22-en.pdf +2023/04/24 | 43094 | macros/latex/contrib/koma-script/doc/letter-example-23-de.pdf +2023/04/24 | 44706 | macros/latex/contrib/koma-script/doc/letter-example-23-en.pdf +2023/04/24 | 3980 | macros/latex/contrib/koma-script/doc/linkalias.tex +2023/04/24 | 15234 | macros/latex/contrib/koma-script/doc/plength-tikz.tex +2023/04/24 | 5532 | macros/latex/contrib/koma-script/doc/preface-de.tex +2023/04/24 | 4980 | macros/latex/contrib/koma-script/doc/preface-en.tex +2023/04/24 | 10531 | macros/latex/contrib/koma-script/doc/scraddr-de.tex +2023/04/24 | 9346 | macros/latex/contrib/koma-script/doc/scraddr-en.tex +2023/04/24 | 2425 | macros/latex/contrib/koma-script/doc/scraddr.html +2023/04/24 | 2564 | macros/latex/contrib/koma-script/doc/scrartcl.html +2023/04/24 | 2570 | macros/latex/contrib/koma-script/doc/scrarticle.html +2023/04/24 | 95730 | macros/latex/contrib/koma-script/doc/scrbase-de.tex +2023/04/24 | 83762 | macros/latex/contrib/koma-script/doc/scrbase-en.tex +2023/04/24 | 2439 | macros/latex/contrib/koma-script/doc/scrbase.html +2023/04/24 | 2561 | macros/latex/contrib/koma-script/doc/scrbook.html +2023/04/24 | 249034 | macros/latex/contrib/koma-script/doc/scrbookreportarticle-de.tex +2023/04/24 | 222288 | macros/latex/contrib/koma-script/doc/scrbookreportarticle-en.tex +2023/04/24 | 101157 | macros/latex/contrib/koma-script/doc/scrbookreportarticle-experts-de.tex +2023/04/24 | 88170 | macros/latex/contrib/koma-script/doc/scrbookreportarticle-experts-en.tex +2023/04/24 | 13094 | macros/latex/contrib/koma-script/doc/scrdate-de.tex +2023/04/24 | 13210 | macros/latex/contrib/koma-script/doc/scrdate-en.tex +2023/04/24 | 2383 | macros/latex/contrib/koma-script/doc/scrdate.html +2023/04/24 | 9631 | macros/latex/contrib/koma-script/doc/scrextend-de.tex +2023/04/24 | 8177 | macros/latex/contrib/koma-script/doc/scrextend-en.tex +2023/04/24 | 2793 | macros/latex/contrib/koma-script/doc/scrextend.html +2023/04/24 | 23434 | macros/latex/contrib/koma-script/doc/scrguide.bib +2023/04/24 | 2992 | macros/latex/contrib/koma-script/doc/scrguide-body.tex +2023/04/24 | 99290 | macros/latex/contrib/koma-script/doc/scrguide.cls +2023/04/24 | 3255624 | macros/latex/contrib/koma-script/doc/scrguide-de.pdf +2023/04/24 | 1371 | macros/latex/contrib/koma-script/doc/scrguide-de.tex +2023/04/24 | 3163249 | macros/latex/contrib/koma-script/doc/scrguide-en.pdf +2023/04/24 | 1371 | macros/latex/contrib/koma-script/doc/scrguide-en.tex +2023/04/24 | 2210 | macros/latex/contrib/koma-script/doc/scrguide.gst +2023/04/24 | 1787 | macros/latex/contrib/koma-script/doc/scrguide.ist +2023/04/24 | 16159 | macros/latex/contrib/koma-script/doc/scrhack-de.tex +2023/04/24 | 14318 | macros/latex/contrib/koma-script/doc/scrhack-en.tex +2023/04/24 | 2447 | macros/latex/contrib/koma-script/doc/scrhack.html +2023/04/24 | 58093 | macros/latex/contrib/koma-script/doc/scrjura-de.tex +2023/04/24 | 49833 | macros/latex/contrib/koma-script/doc/scrjura-en.tex +2023/04/24 | 56780 | macros/latex/contrib/koma-script/doc/scrjura-example-de.pdf +2023/04/24 | 3731 | macros/latex/contrib/koma-script/doc/scrjura-example-de.tex +2023/04/24 | 57967 | macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf +2023/04/24 | 3416 | macros/latex/contrib/koma-script/doc/scrjura-example-en.tex +2023/04/24 | 2465 | macros/latex/contrib/koma-script/doc/scrjura.html +2023/04/24 | 2713 | macros/latex/contrib/koma-script/doc/scrkbase.html +2023/04/24 | 93786 | macros/latex/contrib/koma-script/doc/scrlayer-de.tex +2023/04/24 | 78876 | macros/latex/contrib/koma-script/doc/scrlayer-en.tex +2023/04/24 | 2492 | macros/latex/contrib/koma-script/doc/scrlayer.html +2023/04/24 | 38864 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-de.tex +2023/04/24 | 32799 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-en.tex +2023/04/24 | 137423 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.pdf +2023/04/24 | 3787 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.tex +2023/04/24 | 135451 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.pdf +2023/04/24 | 3542 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.tex +2023/04/24 | 2463 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn.html +2023/04/24 | 59521 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage-de.tex +2023/04/24 | 53457 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage-en.tex +2023/04/24 | 20683 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage-experts-de.tex +2023/04/24 | 17513 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage-experts-en.tex +2023/04/24 | 2478 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage.html +2023/04/24 | 2565 | macros/latex/contrib/koma-script/doc/scrletter.html +2023/04/24 | 35969 | macros/latex/contrib/koma-script/doc/scrlfile-de.tex +2023/04/24 | 32098 | macros/latex/contrib/koma-script/doc/scrlfile-en.tex +2023/04/24 | 2647 | macros/latex/contrib/koma-script/doc/scrlfile-hook-3.34.html +2023/04/24 | 2602 | macros/latex/contrib/koma-script/doc/scrlfile-hook.html +2023/04/24 | 2484 | macros/latex/contrib/koma-script/doc/scrlfile.html +2023/04/24 | 2683 | macros/latex/contrib/koma-script/doc/scrlfile-patcholdlatex.html +2023/04/24 | 2632 | macros/latex/contrib/koma-script/doc/scrlogo-de.tex +2023/04/24 | 2494 | macros/latex/contrib/koma-script/doc/scrlogo-en.tex +2023/04/24 | 2459 | macros/latex/contrib/koma-script/doc/scrlogo.html +2023/04/24 | 236738 | macros/latex/contrib/koma-script/doc/scrlttr2-de.tex +2023/04/24 | 206611 | macros/latex/contrib/koma-script/doc/scrlttr2-en.tex +2023/04/24 | 13324 | macros/latex/contrib/koma-script/doc/scrlttr2-examples.dtx +2023/04/24 | 40627 | macros/latex/contrib/koma-script/doc/scrlttr2-experts-de.tex +2023/04/24 | 34196 | macros/latex/contrib/koma-script/doc/scrlttr2-experts-en.tex +2023/04/24 | 2562 | macros/latex/contrib/koma-script/doc/scrlttr2.html +2023/04/24 | 2567 | macros/latex/contrib/koma-script/doc/scrreport.html +2023/04/24 | 2564 | macros/latex/contrib/koma-script/doc/scrreprt.html +2023/04/24 | 5516 | macros/latex/contrib/koma-script/doc/scrtime-de.tex +2023/04/24 | 5045 | macros/latex/contrib/koma-script/doc/scrtime-en.tex +2023/04/24 | 2379 | macros/latex/contrib/koma-script/doc/scrtime.html +2023/04/24 | 2424 | macros/latex/contrib/koma-script/doc/scrwfile-de.tex +2023/04/24 | 2350 | macros/latex/contrib/koma-script/doc/scrwfile-en.tex +2023/04/24 | 20368 | macros/latex/contrib/koma-script/doc/terms-de.tex +2023/04/24 | 19100 | macros/latex/contrib/koma-script/doc/terms-en.tex +2023/04/24 | 146085 | macros/latex/contrib/koma-script/doc/tocbasic-de.tex +2023/04/24 | 129391 | macros/latex/contrib/koma-script/doc/tocbasic-en.tex +2023/04/24 | 2446 | macros/latex/contrib/koma-script/doc/tocbasic.html +2023/04/24 | 101021 | macros/latex/contrib/koma-script/doc/typearea-de.tex +2023/04/24 | 88016 | macros/latex/contrib/koma-script/doc/typearea-en.tex +2023/04/24 | 14138 | macros/latex/contrib/koma-script/doc/typearea-experts-de.tex +2023/04/24 | 12016 | macros/latex/contrib/koma-script/doc/typearea-experts-en.tex +2023/04/24 | 2448 | macros/latex/contrib/koma-script/doc/typearea.html +2023/04/24 | 8277 | macros/latex/contrib/koma-script/doc/variables-tikz.tex +2023/04/24 | 15175 | macros/latex/contrib/koma-script/japanlco.dtx +2023/04/24 | 27490 | macros/latex/contrib/koma-script/koma-script-source-doc.dtx +2023/04/24 | 25055 | macros/latex/contrib/koma-script/lppl-de.txt +2023/04/24 | 19110 | macros/latex/contrib/koma-script/lppl.txt +2023/04/24 | 9559 | macros/latex/contrib/koma-script/MANIFEST.md +2023/04/24 | 28340 | macros/latex/contrib/koma-script/README.md +2023/04/24 | 10699 | macros/latex/contrib/koma-script/scraddr.dtx +2023/04/24 | 13221 | macros/latex/contrib/koma-script/scrdoc.cls +2023/04/24 | 5658 | macros/latex/contrib/koma-script/scrdocstrip.tex +2023/04/24 | 9404 | macros/latex/contrib/koma-script/scrextend.dtx +2023/04/24 | 73361 | macros/latex/contrib/koma-script/scrhack.dtx +2023/04/24 | 70381 | macros/latex/contrib/koma-script/scrjura.dtx +2023/04/24 | 6369 | macros/latex/contrib/koma-script/scrkernel-addressfiles.dtx +2023/04/24 | 199193 | macros/latex/contrib/koma-script/scrkernel-basics.dtx +2023/04/24 | 27924 | macros/latex/contrib/koma-script/scrkernel-bibliography.dtx +2023/04/24 | 26718 | macros/latex/contrib/koma-script/scrkernel-compatibility.dtx +2023/04/24 | 73349 | macros/latex/contrib/koma-script/scrkernel-floats.dtx +2023/04/24 | 85020 | macros/latex/contrib/koma-script/scrkernel-fonts.dtx +2023/04/24 | 22784 | macros/latex/contrib/koma-script/scrkernel-footnotes.dtx +2023/04/24 | 14425 | macros/latex/contrib/koma-script/scrkernel-index.dtx +2023/04/24 | 75630 | macros/latex/contrib/koma-script/scrkernel-language.dtx +2023/04/24 | 59561 | macros/latex/contrib/koma-script/scrkernel-letterclassoptions.dtx +2023/04/24 | 17343 | macros/latex/contrib/koma-script/scrkernel-listsandtabulars.dtx +2023/04/24 | 48351 | macros/latex/contrib/koma-script/scrkernel-listsof.dtx +2023/04/24 | 40118 | macros/latex/contrib/koma-script/scrkernel-miscellaneous.dtx +2023/04/24 | 180525 | macros/latex/contrib/koma-script/scrkernel-notepaper.dtx +2023/04/24 | 30066 | macros/latex/contrib/koma-script/scrkernel-pagestyles.dtx +2023/04/24 | 27309 | macros/latex/contrib/koma-script/scrkernel-paragraphs.dtx +2023/04/24 | 12475 | macros/latex/contrib/koma-script/scrkernel-pseudolengths.dtx +2023/04/24 | 265850 | macros/latex/contrib/koma-script/scrkernel-sections.dtx +2023/04/24 | 34192 | macros/latex/contrib/koma-script/scrkernel-title.dtx +2023/04/24 | 107718 | macros/latex/contrib/koma-script/scrkernel-tocstyle.dtx +2023/04/24 | 126881 | macros/latex/contrib/koma-script/scrkernel-typearea.dtx +2023/04/24 | 16922 | macros/latex/contrib/koma-script/scrkernel-variables.dtx +2023/04/24 | 9803 | macros/latex/contrib/koma-script/scrkernel-version.dtx +2023/04/24 | 167599 | macros/latex/contrib/koma-script/scrlayer.dtx +2023/04/24 | 59999 | macros/latex/contrib/koma-script/scrlayer-notecolumn.dtx +2023/04/24 | 95676 | macros/latex/contrib/koma-script/scrlayer-scrpage.dtx +2023/04/24 | 9222 | macros/latex/contrib/koma-script/scrlfile.dtx +2023/04/24 | 25281 | macros/latex/contrib/koma-script/scrlfile-hook.dtx +2023/04/24 | 47300 | macros/latex/contrib/koma-script/scrlfile-patcholdlatex.dtx +2023/04/24 | 4514 | macros/latex/contrib/koma-script/scrlogo.dtx +2023/04/24 | 20746 | macros/latex/contrib/koma-script/scrmain.ins +2023/04/24 | 3464 | macros/latex/contrib/koma-script/scrstrip.inc +2023/04/24 | 1975 | macros/latex/contrib/koma-script/scrstrop.inc +2023/04/24 | 25802 | macros/latex/contrib/koma-script/scrtime.dtx 2005/05/31 | 242 | macros/latex/contrib/koma-script-SFS/README 2005/05/31 | 39097 | macros/latex/contrib/koma-script-SFS/SFSesim.pdf 2005/05/31 | 2390 | macros/latex/contrib/koma-script-SFS/SFSesim.tex 2005/05/31 | 7229 | macros/latex/contrib/koma-script-SFS/SFS.lco 2005/05/31 | 41293 | macros/latex/contrib/koma-script-SFS.zip -2023/04/17 | 73777 | macros/latex/contrib/koma-script/tocbasic.dtx -2023/04/17 | 9506053 | macros/latex/contrib/koma-script.zip +2023/04/24 | 73844 | macros/latex/contrib/koma-script/tocbasic.dtx +2023/04/24 | 9312330 | macros/latex/contrib/koma-script.zip 2023/03/26 | 35149 | macros/latex/contrib/korigamik/COPYING 2023/03/26 | 7778 | macros/latex/contrib/korigamik/korigamik.cls 2023/03/26 | 111035 | macros/latex/contrib/korigamik/korigamik-example.pdf @@ -232702,17 +232704,17 @@ 2017/04/21 | 1634 | macros/latex/contrib/phonrule/phonrule.sty 2017/04/21 | 492 | macros/latex/contrib/phonrule/README.md 2017/04/21 | 44782 | macros/latex/contrib/phonrule.zip -2023/04/19 | 462 | macros/latex/contrib/photobook/DEPENDS.txt -2023/04/19 | 1527 | macros/latex/contrib/photobook/LICENSE -2023/04/19 | 10191 | macros/latex/contrib/photobook/Makefile -2023/04/19 | 166879 | macros/latex/contrib/photobook/photobook.cls -2023/04/19 | 143331 | macros/latex/contrib/photobook/photobook.pdf -2023/04/19 | 1705 | macros/latex/contrib/photobook/README.md -2023/04/19 | 4172 | macros/latex/contrib/photobook/scripts/cls2tex.sh -2023/04/19 | 890 | macros/latex/contrib/photobook/scripts/make-spreads.cfg.example -2023/04/19 | 16935 | macros/latex/contrib/photobook/scripts/make-spreads.sh -2023/04/19 | 14221 | macros/latex/contrib/photobook/scripts/README.md -2023/04/19 | 192417 | macros/latex/contrib/photobook.zip +2023/04/24 | 462 | macros/latex/contrib/photobook/DEPENDS.txt +2023/04/24 | 1527 | macros/latex/contrib/photobook/LICENSE +2023/04/24 | 10191 | macros/latex/contrib/photobook/Makefile +2023/04/24 | 167955 | macros/latex/contrib/photobook/photobook.cls +2023/04/24 | 143821 | macros/latex/contrib/photobook/photobook.pdf +2023/04/24 | 1705 | macros/latex/contrib/photobook/README.md +2023/04/24 | 4172 | macros/latex/contrib/photobook/scripts/cls2tex.sh +2023/04/24 | 890 | macros/latex/contrib/photobook/scripts/make-spreads.cfg.example +2023/04/24 | 16935 | macros/latex/contrib/photobook/scripts/make-spreads.sh +2023/04/24 | 14221 | macros/latex/contrib/photobook/scripts/README.md +2023/04/24 | 193264 | macros/latex/contrib/photobook.zip 2004/07/15 | 1773 | macros/latex/contrib/photo/Makefile 2004/07/15 | 26571 | macros/latex/contrib/photo/photo.dtx 1999/07/25 | 595 | macros/latex/contrib/photo/photo.ins @@ -254138,12 +254140,12 @@ 2021/02/09 | 106690 | macros/unicodetex/latex/texnegar/xepersian-XB.pdf 2021/02/09 | 3113 | macros/unicodetex/latex/texnegar/xepersian-XB.tex 2021/02/09 | 4898310 | macros/unicodetex/latex/texnegar.zip -2022/09/10 | 558 | macros/unicodetex/latex/textcsc/README -2022/11/04 | 48462 | macros/unicodetex/latex/textcsc/textcsc-documentation.pdf -2022/09/10 | 5815 | macros/unicodetex/latex/textcsc/textcsc-documentation.tex +2023/04/24 | 596 | macros/unicodetex/latex/textcsc/README +2023/04/24 | 49161 | macros/unicodetex/latex/textcsc/textcsc-documentation.pdf +2023/04/24 | 5948 | macros/unicodetex/latex/textcsc/textcsc-documentation.tex 2022/09/10 | 2827 | macros/unicodetex/latex/textcsc/textcsc.pdf -2022/11/04 | 1719 | macros/unicodetex/latex/textcsc/textcsc.sty -2022/11/04 | 52964 | macros/unicodetex/latex/textcsc.zip +2023/04/24 | 1723 | macros/unicodetex/latex/textcsc/textcsc.sty +2023/04/24 | 53655 | macros/unicodetex/latex/textcsc.zip 2023/02/13 | 458 | macros/unicodetex/latex/tipauni/README.txt 2023/02/13 | 20890 | macros/unicodetex/latex/tipauni/tipauni-commands.pdf 2023/02/13 | 4509 | macros/unicodetex/latex/tipauni/tipauni-commands.tex @@ -289247,8 +289249,8 @@ 2020/12/08 | 344 | systems/texlive/tlnet/archive/albatross.x86_64-linuxmusl.r57089.tar.xz 2020/12/08 | 344 | systems/texlive/tlnet/archive/albatross.x86_64-linux.r57089.tar.xz 2020/12/08 | 340 | systems/texlive/tlnet/archive/albatross.x86_64-solaris.r57089.tar.xz -2023/03/11 | 144280 | systems/texlive/tlnet/archive/alchemist.doc.r66548.tar.xz -2023/03/11 | 3152 | systems/texlive/tlnet/archive/alchemist.r66548.tar.xz +2023/04/24 | 144288 | systems/texlive/tlnet/archive/alchemist.doc.r66924.tar.xz +2023/04/24 | 3172 | systems/texlive/tlnet/archive/alchemist.r66924.tar.xz 2022/09/15 | 1107116 | systems/texlive/tlnet/archive/alegreya.doc.r64384.tar.xz 2022/09/15 | 23710500 | systems/texlive/tlnet/archive/alegreya.r64384.tar.xz 2023/02/28 | 244480 | systems/texlive/tlnet/archive/aleph.aarch64-linux.r66237.tar.xz @@ -289286,8 +289288,8 @@ 2019/02/28 | 293444 | systems/texlive/tlnet/archive/algorithms.doc.r42428.tar.xz 2019/02/28 | 3472 | systems/texlive/tlnet/archive/algorithms.r42428.tar.xz 2019/02/28 | 11940 | systems/texlive/tlnet/archive/algorithms.source.r42428.tar.xz -2023/04/19 | 352600 | systems/texlive/tlnet/archive/algpseudocodex.doc.r66886.tar.xz -2023/04/19 | 9268 | systems/texlive/tlnet/archive/algpseudocodex.r66886.tar.xz +2023/04/24 | 352600 | systems/texlive/tlnet/archive/algpseudocodex.doc.r66924.tar.xz +2023/04/24 | 9268 | systems/texlive/tlnet/archive/algpseudocodex.r66924.tar.xz 2019/02/28 | 2568 | systems/texlive/tlnet/archive/alg.r15878.tar.xz 2019/02/28 | 5768 | systems/texlive/tlnet/archive/alg.source.r15878.tar.xz 2020/08/01 | 173088 | systems/texlive/tlnet/archive/algxpar.doc.r56006.tar.xz @@ -290461,9 +290463,9 @@ 2019/02/28 | 362388 | systems/texlive/tlnet/archive/bitelist.doc.r25779.tar.xz 2019/02/28 | 5352 | systems/texlive/tlnet/archive/bitelist.r25779.tar.xz 2019/02/28 | 6228 | systems/texlive/tlnet/archive/bitelist.source.r25779.tar.xz -2023/04/15 | 1105612 | systems/texlive/tlnet/archive/bithesis.doc.r66849.tar.xz -2023/04/15 | 24496 | systems/texlive/tlnet/archive/bithesis.r66849.tar.xz -2023/04/15 | 45424 | systems/texlive/tlnet/archive/bithesis.source.r66849.tar.xz +2023/04/24 | 1156556 | systems/texlive/tlnet/archive/bithesis.doc.r66924.tar.xz +2023/04/24 | 25160 | systems/texlive/tlnet/archive/bithesis.r66924.tar.xz +2023/04/24 | 47100 | systems/texlive/tlnet/archive/bithesis.source.r66924.tar.xz 2019/02/28 | 175700 | systems/texlive/tlnet/archive/bitpattern.doc.r39073.tar.xz 2019/02/28 | 2156 | systems/texlive/tlnet/archive/bitpattern.r39073.tar.xz 2019/02/28 | 6764 | systems/texlive/tlnet/archive/bitpattern.source.r39073.tar.xz @@ -291520,7 +291522,7 @@ 2019/02/28 | 7688 | systems/texlive/tlnet/archive/context-simplefonts.r47085.tar.xz 2023/04/16 | 856504 | systems/texlive/tlnet/archive/context-simpleslides.doc.r66855.tar.xz 2023/04/16 | 29160 | systems/texlive/tlnet/archive/context-simpleslides.r66855.tar.xz -2023/04/23 | 992 | systems/texlive/tlnet/archive/context-texlive.r66914.tar.xz +2023/04/24 | 1052 | systems/texlive/tlnet/archive/context-texlive.r66924.tar.xz 2019/02/28 | 23088 | systems/texlive/tlnet/archive/context-title.doc.r47085.tar.xz 2019/02/28 | 2208 | systems/texlive/tlnet/archive/context-title.r47085.tar.xz 2021/11/24 | 192808 | systems/texlive/tlnet/archive/context-transliterator.doc.r61127.tar.xz @@ -292816,8 +292818,8 @@ 2019/09/05 | 50968 | systems/texlive/tlnet/archive/e-french.r52027.tar.xz 2019/02/28 | 137460 | systems/texlive/tlnet/archive/egameps.doc.r15878.tar.xz 2019/02/28 | 6516 | systems/texlive/tlnet/archive/egameps.r15878.tar.xz -2023/03/22 | 5000796 | systems/texlive/tlnet/archive/egpeirce.doc.r66636.tar.xz -2023/03/22 | 20564 | systems/texlive/tlnet/archive/egpeirce.r66636.tar.xz +2023/04/24 | 5000796 | systems/texlive/tlnet/archive/egpeirce.doc.r66924.tar.xz +2023/04/24 | 20580 | systems/texlive/tlnet/archive/egpeirce.r66924.tar.xz 2019/02/28 | 484812 | systems/texlive/tlnet/archive/egplot.doc.r20617.tar.xz 2019/02/28 | 3560 | systems/texlive/tlnet/archive/egplot.r20617.tar.xz 2019/02/28 | 10972 | systems/texlive/tlnet/archive/egplot.source.r20617.tar.xz @@ -294486,12 +294488,12 @@ 2023/02/18 | 326880 | systems/texlive/tlnet/archive/hitex.amd64-freebsd.r65877.tar.xz 2023/02/20 | 284832 | systems/texlive/tlnet/archive/hitex.amd64-netbsd.r65957.tar.xz 2023/02/18 | 235884 | systems/texlive/tlnet/archive/hitex.armhf-linux.r65877.tar.xz -2023/04/19 | 2670660 | systems/texlive/tlnet/archive/hitex.doc.r66878.tar.xz +2023/04/24 | 2670660 | systems/texlive/tlnet/archive/hitex.doc.r66924.tar.xz 2023/02/18 | 265908 | systems/texlive/tlnet/archive/hitex.i386-freebsd.r65877.tar.xz 2023/02/18 | 263624 | systems/texlive/tlnet/archive/hitex.i386-linux.r65877.tar.xz 2023/02/20 | 227568 | systems/texlive/tlnet/archive/hitex.i386-netbsd.r65957.tar.xz 2023/02/26 | 248460 | systems/texlive/tlnet/archive/hitex.i386-solaris.r66145.tar.xz -2023/04/19 | 5548 | systems/texlive/tlnet/archive/hitex.r66878.tar.xz +2023/04/24 | 5572 | systems/texlive/tlnet/archive/hitex.r66924.tar.xz 2023/02/20 | 618380 | systems/texlive/tlnet/archive/hitex.universal-darwin.r65895.tar.xz 2023/02/20 | 279996 | systems/texlive/tlnet/archive/hitex.windows.r65891.tar.xz 2023/03/11 | 278608 | systems/texlive/tlnet/archive/hitex.x86_64-cygwin.r66544.tar.xz @@ -298237,8 +298239,8 @@ 2020/10/10 | 1928 | systems/texlive/tlnet/archive/pgfopts.r56615.tar.xz 2020/10/10 | 6008 | systems/texlive/tlnet/archive/pgfopts.source.r56615.tar.xz 2020/05/29 | 2427600 | systems/texlive/tlnet/archive/pgfornament.doc.r55326.tar.xz -2020/03/09 | 739152 | systems/texlive/tlnet/archive/pgfornament-han.doc.r54191.tar.xz -2020/03/09 | 86108 | systems/texlive/tlnet/archive/pgfornament-han.r54191.tar.xz +2023/04/24 | 1213552 | systems/texlive/tlnet/archive/pgfornament-han.doc.r66920.tar.xz +2023/04/24 | 87404 | systems/texlive/tlnet/archive/pgfornament-han.r66920.tar.xz 2020/05/29 | 616692 | systems/texlive/tlnet/archive/pgfornament.r55326.tar.xz 2023/04/03 | 5348696 | systems/texlive/tlnet/archive/pgf-periodictable.doc.r66745.tar.xz 2023/04/03 | 510172 | systems/texlive/tlnet/archive/pgf-periodictable.r66745.tar.xz @@ -298584,9 +298586,9 @@ 2019/02/28 | 2464 | systems/texlive/tlnet/archive/prettyref.source.r15878.tar.xz 2023/04/19 | 493056 | systems/texlive/tlnet/archive/prettytok.doc.r66884.tar.xz 2023/04/19 | 6032 | systems/texlive/tlnet/archive/prettytok.r66884.tar.xz -2022/02/22 | 326124 | systems/texlive/tlnet/archive/preview.doc.r62130.tar.xz -2022/02/22 | 6984 | systems/texlive/tlnet/archive/preview.r62130.tar.xz -2022/02/22 | 22852 | systems/texlive/tlnet/archive/preview.source.r62130.tar.xz +2023/04/24 | 337164 | systems/texlive/tlnet/archive/preview.doc.r66924.tar.xz +2023/04/24 | 6856 | systems/texlive/tlnet/archive/preview.r66924.tar.xz +2023/04/24 | 22688 | systems/texlive/tlnet/archive/preview.source.r66924.tar.xz 2020/03/04 | 363452 | systems/texlive/tlnet/archive/prftree.doc.r54080.tar.xz 2020/03/04 | 11776 | systems/texlive/tlnet/archive/prftree.r54080.tar.xz 2023/03/22 | 440356 | systems/texlive/tlnet/archive/principia.doc.r66625.tar.xz @@ -298781,8 +298783,8 @@ 2019/02/28 | 78588 | systems/texlive/tlnet/archive/pst-eps.doc.r15878.tar.xz 2019/02/28 | 2968 | systems/texlive/tlnet/archive/pst-eps.r15878.tar.xz 2019/02/28 | 816 | systems/texlive/tlnet/archive/pst-eps.source.r15878.tar.xz -2023/04/18 | 1622988 | systems/texlive/tlnet/archive/pst-eucl.doc.r66868.tar.xz -2023/04/18 | 53388 | systems/texlive/tlnet/archive/pst-eucl.r66868.tar.xz +2023/04/24 | 1622988 | systems/texlive/tlnet/archive/pst-eucl.doc.r66924.tar.xz +2023/04/24 | 53388 | systems/texlive/tlnet/archive/pst-eucl.r66924.tar.xz 2019/02/28 | 362324 | systems/texlive/tlnet/archive/pst-eucl-translation-bg.doc.r19296.tar.xz 2019/02/28 | 448 | systems/texlive/tlnet/archive/pst-eucl-translation-bg.r19296.tar.xz 2019/02/28 | 63352 | systems/texlive/tlnet/archive/pst-exa.doc.r45289.tar.xz @@ -299253,9 +299255,9 @@ 2022/11/08 | 175812 | systems/texlive/tlnet/archive/realboxes.doc.r64967.tar.xz 2022/11/08 | 3016 | systems/texlive/tlnet/archive/realboxes.r64967.tar.xz 2022/11/08 | 7416 | systems/texlive/tlnet/archive/realboxes.source.r64967.tar.xz -2023/04/07 | 1888308 | systems/texlive/tlnet/archive/realhats.doc.r66785.tar.xz -2023/04/07 | 1782000 | systems/texlive/tlnet/archive/realhats.r66785.tar.xz -2023/04/07 | 3124 | systems/texlive/tlnet/archive/realhats.source.r66785.tar.xz +2023/04/24 | 1888312 | systems/texlive/tlnet/archive/realhats.doc.r66924.tar.xz +2023/04/24 | 1782004 | systems/texlive/tlnet/archive/realhats.r66924.tar.xz +2023/04/24 | 3128 | systems/texlive/tlnet/archive/realhats.source.r66924.tar.xz 2020/10/08 | 104544 | systems/texlive/tlnet/archive/realscripts.doc.r56594.tar.xz 2020/10/08 | 1880 | systems/texlive/tlnet/archive/realscripts.r56594.tar.xz 2020/10/08 | 4468 | systems/texlive/tlnet/archive/realscripts.source.r56594.tar.xz @@ -300754,7 +300756,7 @@ 2022/09/13 | 600 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r64356.tar.xz -2023/04/23 | 426152 | systems/texlive/tlnet/archive/texlive-scripts.doc.r66913.tar.xz +2023/04/24 | 426152 | systems/texlive/tlnet/archive/texlive-scripts.doc.r66919.tar.xz 2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.aarch64-linux.r53577.tar.xz 2020/01/27 | 924 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-freebsd.r53577.tar.xz 2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-netbsd.r53577.tar.xz @@ -300776,7 +300778,7 @@ 2022/09/13 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r64356.tar.xz -2023/04/23 | 114060 | systems/texlive/tlnet/archive/texlive-scripts.r66913.tar.xz +2023/04/24 | 114036 | systems/texlive/tlnet/archive/texlive-scripts.r66919.tar.xz 2022/09/13 | 580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz 2023/03/08 | 60300 | systems/texlive/tlnet/archive/texlive-scripts.windows.r66427.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz @@ -302632,16 +302634,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 2023/03/12 | 125532 | systems/texlive/tlnet/install-tl -2023/04/23 | 5735807 | systems/texlive/tlnet/install-tl-unx.tar.gz -2023/04/23 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2023/04/23 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2023/04/24 | 5735858 | systems/texlive/tlnet/install-tl-unx.tar.gz +2023/04/24 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2023/04/24 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2023/02/19 | 5098 | systems/texlive/tlnet/install-tl-windows.bat -2023/04/23 | 21038201 | systems/texlive/tlnet/install-tl-windows.exe -2023/04/23 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2023/04/23 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2023/04/23 | 26025714 | systems/texlive/tlnet/install-tl.zip -2023/04/23 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2023/04/23 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2023/04/24 | 21038998 | systems/texlive/tlnet/install-tl-windows.exe +2023/04/24 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2023/04/24 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2023/04/24 | 26025693 | systems/texlive/tlnet/install-tl.zip +2023/04/24 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2023/04/24 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc 2023/03/19 | 1229 | systems/texlive/tlnet/README.md 2023/03/19 | 0 | systems/texlive/tlnet/TEXLIVE_2023 2023/01/17 | 8401 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg @@ -302651,7 +302653,7 @@ 2023/01/17 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg 2023/01/17 | 49938 | systems/texlive/tlnet/tlpkg/installer/config.guess 2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt -2023/04/22 | 7393 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +2023/04/23 | 7279 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2023/01/11 | 216583 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt 2020/04/15 | 2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe 2017/04/16 | 2629 | systems/texlive/tlnet/tlpkg/installer/installer-options.txt @@ -302693,12 +302695,12 @@ 2023/02/21 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm 2021/12/21 | 5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm 2023/04/08 | 28167 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm -2023/04/23 | 18082702 | systems/texlive/tlnet/tlpkg/texlive.tlpdb -2023/04/23 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2023/04/24 | 18083152 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2023/04/24 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 2023/02/20 | 86803 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm -2023/04/23 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2023/04/23 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2023/04/23 | 2444044 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2023/04/24 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2023/04/24 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2023/04/24 | 2444632 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2023/02/20 | 58928 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm 2023/02/26 | 42350 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm 2023/02/21 | 16138 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm @@ -313124,7 +313126,7 @@ 2014/07/05 | 611 | systems/win32/yandy/README 2014/07/05 | 1004628 | systems/win32/yandy/yandy-src.tar.xz 2014/07/05 | 1012416 | systems/win32/yandy.zip -2023/04/24 | 186 | timestamp +2023/04/25 | 186 | timestamp 2002/08/26 | 61898 | usergrps/dante/antrag.pdf 2002/08/26 | 118217 | usergrps/dante/antrag.ps 2021/11/11 | 917 | usergrps/dante/dtk/doc/beispiel.bib diff --git a/FILES.byname.gz b/FILES.byname.gz Binary files differindex 551e2c0b3f..612416e6f7 100644 --- a/FILES.byname.gz +++ b/FILES.byname.gz diff --git a/FILES.last07days b/FILES.last07days index 3814651e10..505aa160ef 100644 --- a/FILES.last07days +++ b/FILES.last07days @@ -1,4 +1,307 @@ -2023/04/23 | 992 | systems/texlive/tlnet/archive/context-texlive.r66914.tar.xz +2023/04/24 | 99290 | macros/latex/contrib/koma-script/doc/scrguide.cls +2023/04/24 | 9803 | macros/latex/contrib/koma-script/scrkernel-version.dtx +2023/04/24 | 9753485 | install/macros/latex/contrib/koma-script.tds.zip +2023/04/24 | 9631 | macros/latex/contrib/koma-script/doc/scrextend-de.tex +2023/04/24 | 95730 | macros/latex/contrib/koma-script/doc/scrbase-de.tex +2023/04/24 | 95676 | macros/latex/contrib/koma-script/scrlayer-scrpage.dtx +2023/04/24 | 9559 | macros/latex/contrib/koma-script/MANIFEST.md +2023/04/24 | 9404 | macros/latex/contrib/koma-script/scrextend.dtx +2023/04/24 | 9387 | macros/latex/contrib/koma-script/doc/common-fontsize-de.tex +2023/04/24 | 93786 | macros/latex/contrib/koma-script/doc/scrlayer-de.tex +2023/04/24 | 9346 | macros/latex/contrib/koma-script/doc/scraddr-en.tex +2023/04/24 | 9312330 | macros/latex/contrib/koma-script.zip +2023/04/24 | 9268 | systems/texlive/tlnet/archive/algpseudocodex.r66924.tar.xz +2023/04/24 | 9226 | macros/latex/contrib/koma-script/doc/common-options-en.tex +2023/04/24 | 9222 | macros/latex/contrib/koma-script/scrlfile.dtx +2023/04/24 | 890 | macros/latex/contrib/photobook/scripts/make-spreads.cfg.example +2023/04/24 | 88170 | macros/latex/contrib/koma-script/doc/scrbookreportarticle-experts-en.tex +2023/04/24 | 88016 | macros/latex/contrib/koma-script/doc/typearea-en.tex +2023/04/24 | 87404 | systems/texlive/tlnet/archive/pgfornament-han.r66920.tar.xz +2023/04/24 | 85020 | macros/latex/contrib/koma-script/scrkernel-fonts.dtx +2023/04/24 | 83762 | macros/latex/contrib/koma-script/doc/scrbase-en.tex +2023/04/24 | 8277 | macros/latex/contrib/koma-script/doc/variables-tikz.tex +2023/04/24 | 8177 | macros/latex/contrib/koma-script/doc/scrextend-en.tex +2023/04/24 | 8059 | macros/latex/contrib/koma-script/doc/common-compatibility-de.tex +2023/04/24 | 78876 | macros/latex/contrib/koma-script/doc/scrlayer-en.tex +2023/04/24 | 7876 | macros/latex/contrib/koma-script/doc/common-fontsize-en.tex +2023/04/24 | 7590 | macros/latex/contrib/koma-script/doc/common-headfootheight-de.tex +2023/04/24 | 75685 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md +2023/04/24 | 75630 | macros/latex/contrib/koma-script/scrkernel-language.dtx +2023/04/24 | 7532 | macros/latex/contrib/koma-script/doc/common-compatibility-en.tex +2023/04/24 | 73844 | macros/latex/contrib/koma-script/tocbasic.dtx +2023/04/24 | 73361 | macros/latex/contrib/koma-script/scrhack.dtx +2023/04/24 | 73349 | macros/latex/contrib/koma-script/scrkernel-floats.dtx +2023/04/24 | 70381 | macros/latex/contrib/koma-script/scrjura.dtx +2023/04/24 | 6856 | systems/texlive/tlnet/archive/preview.r66924.tar.xz +2023/04/24 | 6640 | macros/latex/contrib/koma-script/doc/common-headfootheight-en.tex +2023/04/24 | 659151 | fonts/libertinus-otf/doc/libertinus-otf-doc.pdf +2023/04/24 | 6465 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.cbx +2023/04/24 | 6369 | macros/latex/contrib/koma-script/scrkernel-addressfiles.dtx +2023/04/24 | 632835 | fonts/libertinus-otf.zip +2023/04/24 | 61114 | fonts/libertinus-otf/doc/libertinus-otf-doc.tex +2023/04/24 | 59999 | macros/latex/contrib/koma-script/scrlayer-notecolumn.dtx +2023/04/24 | 596 | macros/unicodetex/latex/textcsc/README +2023/04/24 | 59561 | macros/latex/contrib/koma-script/scrkernel-letterclassoptions.dtx +2023/04/24 | 59521 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage-de.tex +2023/04/24 | 5948 | macros/unicodetex/latex/textcsc/textcsc-documentation.tex +2023/04/24 | 5888 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.cbx +2023/04/24 | 58093 | macros/latex/contrib/koma-script/doc/scrjura-de.tex +2023/04/24 | 57967 | macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf +2023/04/24 | 5735858 | systems/texlive/tlnet/install-tl-unx.tar.gz +2023/04/24 | 56780 | macros/latex/contrib/koma-script/doc/scrjura-example-de.pdf +2023/04/24 | 5658 | macros/latex/contrib/koma-script/scrdocstrip.tex +2023/04/24 | 5572 | systems/texlive/tlnet/archive/hitex.r66924.tar.xz +2023/04/24 | 5532 | macros/latex/contrib/koma-script/doc/preface-de.tex +2023/04/24 | 5516 | macros/latex/contrib/koma-script/doc/scrtime-de.tex +2023/04/24 | 5376 | macros/latex/contrib/koma-script/doc/common-oddorevenpage-de.tex +2023/04/24 | 53667 | macros/latex/contrib/koma-script/doc/common-pagestylemanipulation-de.tex +2023/04/24 | 53655 | macros/unicodetex/latex/textcsc.zip +2023/04/24 | 53457 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage-en.tex +2023/04/24 | 53388 | systems/texlive/tlnet/archive/pst-eucl.r66924.tar.xz +2023/04/24 | 5121 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.cbx +2023/04/24 | 5045 | macros/latex/contrib/koma-script/doc/scrtime-en.tex +2023/04/24 | 5000796 | systems/texlive/tlnet/archive/egpeirce.doc.r66924.tar.xz +2023/04/24 | 49833 | macros/latex/contrib/koma-script/doc/scrjura-en.tex +2023/04/24 | 4980 | macros/latex/contrib/koma-script/doc/preface-en.tex +2023/04/24 | 49161 | macros/unicodetex/latex/textcsc/textcsc-documentation.pdf +2023/04/24 | 4913 | macros/latex/contrib/koma-script/doc/common-marginpar-de.tex +2023/04/24 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2023/04/24 | 48745 | macros/latex/contrib/koma-script/doc/common-textmarkup-de.tex +2023/04/24 | 48351 | macros/latex/contrib/koma-script/scrkernel-listsof.dtx +2023/04/24 | 47614 | graphics/pgf/contrib/tikz-nfold/tikzlibrarynfold.code.tex +2023/04/24 | 47300 | macros/latex/contrib/koma-script/scrlfile-patcholdlatex.dtx +2023/04/24 | 4720 | macros/latex/contrib/koma-script/doc/common-oddorevenpage-en.tex +2023/04/24 | 47100 | systems/texlive/tlnet/archive/bithesis.source.r66924.tar.xz +2023/04/24 | 46863 | macros/latex/contrib/koma-script/doc/common-pagestylemanipulation-en.tex +2023/04/24 | 462 | macros/latex/contrib/photobook/DEPENDS.txt +2023/04/24 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2023/04/24 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2023/04/24 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2023/04/24 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2023/04/24 | 4549 | macros/latex/contrib/koma-script/doc/common-marginpar-en.tex +2023/04/24 | 4514 | macros/latex/contrib/koma-script/scrlogo.dtx +2023/04/24 | 4478 | macros/latex/contrib/koma-script/doc/common-draftmode-de.tex +2023/04/24 | 44706 | macros/latex/contrib/koma-script/doc/letter-example-23-en.pdf +2023/04/24 | 44706 | macros/latex/contrib/koma-script/doc/letter-example-22-en.pdf +2023/04/24 | 44408 | macros/latex/contrib/koma-script/doc/letter-example-21-en.pdf +2023/04/24 | 44154 | macros/latex/contrib/koma-script/doc/common-textmarkup-en.tex +2023/04/24 | 4320 | macros/latex/contrib/koma-script/doc/common-draftmode-en.tex +2023/04/24 | 43094 | macros/latex/contrib/koma-script/doc/letter-example-23-de.pdf +2023/04/24 | 43094 | macros/latex/contrib/koma-script/doc/letter-example-22-de.pdf +2023/04/24 | 42786 | macros/latex/contrib/koma-script/doc/letter-example-21-de.pdf +2023/04/24 | 426152 | systems/texlive/tlnet/archive/texlive-scripts.doc.r66919.tar.xz +2023/04/24 | 4172 | macros/latex/contrib/photobook/scripts/cls2tex.sh +2023/04/24 | 40627 | macros/latex/contrib/koma-script/doc/scrlttr2-experts-de.tex +2023/04/24 | 40118 | macros/latex/contrib/koma-script/scrkernel-miscellaneous.dtx +2023/04/24 | 3980 | macros/latex/contrib/koma-script/doc/linkalias.tex +2023/04/24 | 38864 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-de.tex +2023/04/24 | 3787 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.tex +2023/04/24 | 3731 | macros/latex/contrib/koma-script/doc/scrjura-example-de.tex +2023/04/24 | 36723 | macros/latex/contrib/koma-script/doc/common-lists-de.tex +2023/04/24 | 35969 | macros/latex/contrib/koma-script/doc/scrlfile-de.tex +2023/04/24 | 3542 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.tex +2023/04/24 | 352600 | systems/texlive/tlnet/archive/algpseudocodex.doc.r66924.tar.xz +2023/04/24 | 3464 | macros/latex/contrib/koma-script/scrstrip.inc +2023/04/24 | 34196 | macros/latex/contrib/koma-script/doc/scrlttr2-experts-en.tex +2023/04/24 | 34192 | macros/latex/contrib/koma-script/scrkernel-title.dtx +2023/04/24 | 3416 | macros/latex/contrib/koma-script/doc/scrjura-example-en.tex +2023/04/24 | 33995 | macros/latex/contrib/koma-script/doc/common-lists-en.tex +2023/04/24 | 337164 | systems/texlive/tlnet/archive/preview.doc.r66924.tar.xz +2023/04/24 | 33284 | macros/latex/contrib/koma-script/doc/letter-example-20-en.pdf +2023/04/24 | 33277 | macros/latex/contrib/koma-script/doc/letter-example-19-en.pdf +2023/04/24 | 33007 | macros/latex/contrib/koma-script/doc/letter-example-17-en.pdf +2023/04/24 | 33000 | macros/latex/contrib/koma-script/doc/letter-example-18-en.pdf +2023/04/24 | 32974 | macros/latex/contrib/koma-script/doc/letter-example-16-en.pdf +2023/04/24 | 32799 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-en.tex +2023/04/24 | 3255624 | macros/latex/contrib/koma-script/doc/scrguide-de.pdf +2023/04/24 | 32098 | macros/latex/contrib/koma-script/doc/scrlfile-en.tex +2023/04/24 | 31986 | macros/latex/contrib/koma-script/doc/letter-example-15-en.pdf +2023/04/24 | 31986 | macros/latex/contrib/koma-script/doc/letter-example-13-en.pdf +2023/04/24 | 31954 | macros/latex/contrib/koma-script/doc/letter-example-14-en.pdf +2023/04/24 | 31871 | macros/latex/contrib/koma-script/doc/common-titles-de.tex +2023/04/24 | 3172 | systems/texlive/tlnet/archive/alchemist.r66924.tar.xz +2023/04/24 | 3163249 | macros/latex/contrib/koma-script/doc/scrguide-en.pdf +2023/04/24 | 31623 | macros/latex/contrib/koma-script/doc/common-footnotes-de.tex +2023/04/24 | 31568 | graphics/pgf/contrib/tikz-nfold/tikz-nfold-doc.tex +2023/04/24 | 31519 | macros/latex/contrib/koma-script/doc/letter-example-19-de.pdf +2023/04/24 | 31498 | macros/latex/contrib/koma-script/doc/letter-example-20-de.pdf +2023/04/24 | 3128 | systems/texlive/tlnet/archive/realhats.source.r66924.tar.xz +2023/04/24 | 31028 | macros/latex/contrib/koma-script/doc/letter-example-17-de.pdf +2023/04/24 | 31025 | macros/latex/contrib/koma-script/doc/letter-example-18-de.pdf +2023/04/24 | 31001 | macros/latex/contrib/koma-script/doc/letter-example-16-de.pdf +2023/04/24 | 30752 | macros/latex/contrib/koma-script/doc/letter-example-12-en.pdf +2023/04/24 | 30752 | macros/latex/contrib/koma-script/doc/letter-example-11-en.pdf +2023/04/24 | 30752 | macros/latex/contrib/koma-script/doc/letter-example-10-en.pdf +2023/04/24 | 30752 | macros/latex/contrib/koma-script/doc/letter-example-08-en.pdf +2023/04/24 | 30731 | macros/latex/contrib/koma-script/doc/letter-example-09-en.pdf +2023/04/24 | 3026 | macros/latex/contrib/koma-script/doc/common-typearea-de.tex +2023/04/24 | 302366 | graphics/pgf/contrib/tikz-nfold/tikz-nfold-doc.pdf +2023/04/24 | 30066 | macros/latex/contrib/koma-script/scrkernel-pagestyles.dtx +2023/04/24 | 30006 | macros/latex/contrib/koma-script/doc/letter-example-13-de.pdf +2023/04/24 | 30004 | macros/latex/contrib/koma-script/doc/letter-example-15-de.pdf +2023/04/24 | 29980 | macros/latex/contrib/koma-script/doc/letter-example-14-de.pdf +2023/04/24 | 2992 | macros/latex/contrib/koma-script/doc/scrguide-body.tex +2023/04/24 | 292443 | graphics/pgf/contrib/tikz-nfold.zip +2023/04/24 | 29125 | macros/latex/contrib/koma-script/doc/letter-example-11-de.pdf +2023/04/24 | 29121 | macros/latex/contrib/koma-script/doc/letter-example-12-de.pdf +2023/04/24 | 29121 | macros/latex/contrib/koma-script/doc/letter-example-10-de.pdf +2023/04/24 | 29121 | macros/latex/contrib/koma-script/doc/letter-example-08-de.pdf +2023/04/24 | 2911 | macros/latex/contrib/koma-script/doc/common-typearea-en.tex +2023/04/24 | 29103 | macros/latex/contrib/koma-script/doc/letter-example-09-de.pdf +2023/04/24 | 28736 | macros/latex/contrib/koma-script/doc/common-titles-en.tex +2023/04/24 | 28340 | macros/latex/contrib/koma-script/README.md +2023/04/24 | 2793 | macros/latex/contrib/koma-script/doc/scrextend.html +2023/04/24 | 27924 | macros/latex/contrib/koma-script/scrkernel-bibliography.dtx +2023/04/24 | 27490 | macros/latex/contrib/koma-script/koma-script-source-doc.dtx +2023/04/24 | 27309 | macros/latex/contrib/koma-script/scrkernel-paragraphs.dtx +2023/04/24 | 2713 | macros/latex/contrib/koma-script/doc/scrkbase.html +2023/04/24 | 2687 | macros/latex/contrib/koma-script/doc/authorpart-de.tex +2023/04/24 | 2683 | macros/latex/contrib/koma-script/doc/scrlfile-patcholdlatex.html +2023/04/24 | 26718 | macros/latex/contrib/koma-script/scrkernel-compatibility.dtx +2023/04/24 | 2670660 | systems/texlive/tlnet/archive/hitex.doc.r66924.tar.xz +2023/04/24 | 265850 | macros/latex/contrib/koma-script/scrkernel-sections.dtx +2023/04/24 | 2647 | macros/latex/contrib/koma-script/doc/scrlfile-hook-3.34.html +2023/04/24 | 2632 | macros/latex/contrib/koma-script/doc/scrlogo-de.tex +2023/04/24 | 26283 | macros/latex/contrib/koma-script/doc/common-footnotes-en.tex +2023/04/24 | 26158 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.bbx +2023/04/24 | 2602 | macros/latex/contrib/koma-script/doc/scrlfile-hook.html +2023/04/24 | 26025693 | systems/texlive/tlnet/install-tl.zip +2023/04/24 | 25947 | fonts/libertinus-otf/latex/libertinus-otf.sty +2023/04/24 | 25802 | macros/latex/contrib/koma-script/scrtime.dtx +2023/04/24 | 2570 | macros/latex/contrib/koma-script/doc/scrarticle.html +2023/04/24 | 2567 | macros/latex/contrib/koma-script/doc/scrreport.html +2023/04/24 | 2565 | macros/latex/contrib/koma-script/doc/scrletter.html +2023/04/24 | 2564 | macros/latex/contrib/koma-script/doc/scrreprt.html +2023/04/24 | 2564 | macros/latex/contrib/koma-script/doc/scrartcl.html +2023/04/24 | 2562 | macros/latex/contrib/koma-script/doc/scrlttr2.html +2023/04/24 | 2561 | macros/latex/contrib/koma-script/doc/scrbook.html +2023/04/24 | 25450 | macros/latex/contrib/koma-script/doc/japanlco-en.tex +2023/04/24 | 25281 | macros/latex/contrib/koma-script/scrlfile-hook.dtx +2023/04/24 | 2519 | macros/latex/contrib/koma-script/doc/authorpart-en.tex +2023/04/24 | 25160 | systems/texlive/tlnet/archive/bithesis.r66924.tar.xz +2023/04/24 | 25055 | macros/latex/contrib/koma-script/lppl-de.txt +2023/04/24 | 2494 | macros/latex/contrib/koma-script/doc/scrlogo-en.tex +2023/04/24 | 2492 | macros/latex/contrib/koma-script/doc/scrlayer.html +2023/04/24 | 249034 | macros/latex/contrib/koma-script/doc/scrbookreportarticle-de.tex +2023/04/24 | 2484 | macros/latex/contrib/koma-script/doc/scrlfile.html +2023/04/24 | 2478 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage.html +2023/04/24 | 2465 | macros/latex/contrib/koma-script/doc/scrjura.html +2023/04/24 | 2463 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn.html +2023/04/24 | 2459 | macros/latex/contrib/koma-script/doc/scrlogo.html +2023/04/24 | 2448 | macros/latex/contrib/koma-script/doc/typearea.html +2023/04/24 | 2447 | macros/latex/contrib/koma-script/doc/scrhack.html +2023/04/24 | 2446 | macros/latex/contrib/koma-script/doc/tocbasic.html +2023/04/24 | 2444632 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2023/04/24 | 2439 | macros/latex/contrib/koma-script/doc/scrbase.html +2023/04/24 | 2425 | macros/latex/contrib/koma-script/doc/scraddr.html +2023/04/24 | 2424 | macros/latex/contrib/koma-script/doc/scrwfile-de.tex +2023/04/24 | 2383 | macros/latex/contrib/koma-script/doc/scrdate.html +2023/04/24 | 2379 | macros/latex/contrib/koma-script/doc/scrtime.html +2023/04/24 | 236738 | macros/latex/contrib/koma-script/doc/scrlttr2-de.tex +2023/04/24 | 2350 | macros/latex/contrib/koma-script/doc/scrwfile-en.tex +2023/04/24 | 23434 | macros/latex/contrib/koma-script/doc/scrguide.bib +2023/04/24 | 22784 | macros/latex/contrib/koma-script/scrkernel-footnotes.dtx +2023/04/24 | 22688 | systems/texlive/tlnet/archive/preview.source.r66924.tar.xz +2023/04/24 | 222288 | macros/latex/contrib/koma-script/doc/scrbookreportarticle-en.tex +2023/04/24 | 2210 | macros/latex/contrib/koma-script/doc/scrguide.gst +2023/04/24 | 2145 | macros/latex/contrib/koma-script/doc/expertpart-de.tex +2023/04/24 | 2132 | macros/latex/contrib/koma-script/doc/common-footnotes-experts-de.tex +2023/04/24 | 213084 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.tex +2023/04/24 | 2109 | macros/latex/contrib/koma-script/doc/expertpart-en.tex +2023/04/24 | 21038998 | systems/texlive/tlnet/install-tl-windows.exe +2023/04/24 | 2091 | fonts/libertinus-otf/Changes +2023/04/24 | 20746 | macros/latex/contrib/koma-script/scrmain.ins +2023/04/24 | 20683 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage-experts-de.tex +2023/04/24 | 206611 | macros/latex/contrib/koma-script/doc/scrlttr2-en.tex +2023/04/24 | 20580 | systems/texlive/tlnet/archive/egpeirce.r66924.tar.xz +2023/04/24 | 20494 | macros/latex/contrib/koma-script/doc/introduction-de.tex +2023/04/24 | 20368 | macros/latex/contrib/koma-script/doc/terms-de.tex +2023/04/24 | 2021 | macros/latex/contrib/koma-script/doc/common-footnotes-experts-en.tex +2023/04/24 | 199193 | macros/latex/contrib/koma-script/scrkernel-basics.dtx +2023/04/24 | 1975 | macros/latex/contrib/koma-script/scrstrop.inc +2023/04/24 | 193264 | macros/latex/contrib/photobook.zip +2023/04/24 | 19283 | macros/latex/contrib/koma-script/doc/letter-example-05-en.pdf +2023/04/24 | 19282 | macros/latex/contrib/koma-script/doc/letter-example-06-en.pdf +2023/04/24 | 19266 | macros/latex/contrib/koma-script/doc/letter-example-04-en.pdf +2023/04/24 | 19242 | macros/latex/contrib/koma-script/doc/letter-example-07-en.pdf +2023/04/24 | 19224 | macros/latex/contrib/koma-script/doc/letter-example-03-en.pdf +2023/04/24 | 19190 | macros/latex/contrib/koma-script/doc/letter-example-02-en.pdf +2023/04/24 | 19110 | macros/latex/contrib/koma-script/lppl.txt +2023/04/24 | 19100 | macros/latex/contrib/koma-script/doc/terms-en.tex +2023/04/24 | 18886 | macros/latex/contrib/koma-script/doc/letter-example-01-en.pdf +2023/04/24 | 1888312 | systems/texlive/tlnet/archive/realhats.doc.r66924.tar.xz +2023/04/24 | 18085 | CTAN.sites +2023/04/24 | 18083152 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2023/04/24 | 180525 | macros/latex/contrib/koma-script/scrkernel-notepaper.dtx +2023/04/24 | 17919 | macros/latex/contrib/koma-script/doc/letter-example-06-de.pdf +2023/04/24 | 17914 | macros/latex/contrib/koma-script/doc/letter-example-05-de.pdf +2023/04/24 | 1787 | macros/latex/contrib/koma-script/doc/scrguide.ist +2023/04/24 | 17823 | macros/latex/contrib/koma-script/doc/letter-example-04-de.pdf +2023/04/24 | 1782004 | systems/texlive/tlnet/archive/realhats.r66924.tar.xz +2023/04/24 | 17798 | macros/latex/contrib/koma-script/doc/letter-example-07-de.pdf +2023/04/24 | 17769 | macros/latex/contrib/koma-script/doc/letter-example-03-de.pdf +2023/04/24 | 17733 | macros/latex/contrib/koma-script/doc/letter-example-02-de.pdf +2023/04/24 | 175876 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx +2023/04/24 | 1754813 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015.zip +2023/04/24 | 17513 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage-experts-en.tex +2023/04/24 | 17489 | macros/latex/contrib/koma-script/doc/letter-example-01-de.pdf +2023/04/24 | 174325 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx +2023/04/24 | 17343 | macros/latex/contrib/koma-script/scrkernel-listsandtabulars.dtx +2023/04/24 | 1723 | macros/unicodetex/latex/textcsc/textcsc.sty +2023/04/24 | 1711489 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf +2023/04/24 | 1705 | macros/latex/contrib/photobook/README.md +2023/04/24 | 16935 | macros/latex/contrib/photobook/scripts/make-spreads.sh +2023/04/24 | 16922 | macros/latex/contrib/koma-script/scrkernel-variables.dtx +2023/04/24 | 167955 | macros/latex/contrib/photobook/photobook.cls +2023/04/24 | 16794 | macros/latex/contrib/koma-script/doc/introduction-en.tex +2023/04/24 | 167599 | macros/latex/contrib/koma-script/scrlayer.dtx +2023/04/24 | 1622988 | systems/texlive/tlnet/archive/pst-eucl.doc.r66924.tar.xz +2023/04/24 | 16159 | macros/latex/contrib/koma-script/doc/scrhack-de.tex +2023/04/24 | 16127 | macros/latex/contrib/koma-script/doc/letter-example-00-en.pdf +2023/04/24 | 15650 | macros/latex/contrib/koma-script/doc/common-interleafpage-de.tex +2023/04/24 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2023/04/24 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2023/04/24 | 1527 | macros/latex/contrib/photobook/LICENSE +2023/04/24 | 15234 | macros/latex/contrib/koma-script/doc/plength-tikz.tex +2023/04/24 | 15175 | macros/latex/contrib/koma-script/japanlco.dtx +2023/04/24 | 15081 | macros/latex/contrib/koma-script/doc/letter-example-00-de.pdf +2023/04/24 | 146085 | macros/latex/contrib/koma-script/doc/tocbasic-de.tex +2023/04/24 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2023/04/24 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2023/04/24 | 144288 | systems/texlive/tlnet/archive/alchemist.doc.r66924.tar.xz +2023/04/24 | 14425 | macros/latex/contrib/koma-script/scrkernel-index.dtx +2023/04/24 | 143821 | macros/latex/contrib/photobook/photobook.pdf +2023/04/24 | 14318 | macros/latex/contrib/koma-script/doc/scrhack-en.tex +2023/04/24 | 14241 | macros/latex/contrib/koma-script/doc/common-interleafpage-en.tex +2023/04/24 | 14221 | macros/latex/contrib/photobook/scripts/README.md +2023/04/24 | 14138 | macros/latex/contrib/koma-script/doc/typearea-experts-de.tex +2023/04/24 | 137423 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.pdf +2023/04/24 | 1371 | macros/latex/contrib/koma-script/doc/scrguide-en.tex +2023/04/24 | 1371 | macros/latex/contrib/koma-script/doc/scrguide-de.tex +2023/04/24 | 135451 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.pdf +2023/04/24 | 13324 | macros/latex/contrib/koma-script/doc/scrlttr2-examples.dtx +2023/04/24 | 13221 | macros/latex/contrib/koma-script/scrdoc.cls +2023/04/24 | 13210 | macros/latex/contrib/koma-script/doc/scrdate-en.tex +2023/04/24 | 13094 | macros/latex/contrib/koma-script/doc/scrdate-de.tex +2023/04/24 | 129391 | macros/latex/contrib/koma-script/doc/tocbasic-en.tex +2023/04/24 | 126881 | macros/latex/contrib/koma-script/scrkernel-typearea.dtx +2023/04/24 | 12475 | macros/latex/contrib/koma-script/scrkernel-pseudolengths.dtx +2023/04/24 | 12139 | macros/latex/contrib/koma-script/doc/common-parmarkup-de.tex +2023/04/24 | 1213552 | systems/texlive/tlnet/archive/pgfornament-han.doc.r66920.tar.xz +2023/04/24 | 12016 | macros/latex/contrib/koma-script/doc/typearea-experts-en.tex +2023/04/24 | 11863 | macros/latex/contrib/koma-script/doc/common-dictum-de.tex +2023/04/24 | 11848 | macros/latex/contrib/koma-script/doc/common-parmarkup-en.tex +2023/04/24 | 1156556 | systems/texlive/tlnet/archive/bithesis.doc.r66924.tar.xz +2023/04/24 | 114036 | systems/texlive/tlnet/archive/texlive-scripts.r66919.tar.xz +2023/04/24 | 107718 | macros/latex/contrib/koma-script/scrkernel-tocstyle.dtx +2023/04/24 | 10699 | macros/latex/contrib/koma-script/scraddr.dtx +2023/04/24 | 10677 | macros/latex/contrib/koma-script/doc/common-options-de.tex +2023/04/24 | 10531 | macros/latex/contrib/koma-script/doc/scraddr-de.tex +2023/04/24 | 1052 | systems/texlive/tlnet/archive/context-texlive.r66924.tar.xz +2023/04/24 | 10191 | macros/latex/contrib/photobook/Makefile +2023/04/24 | 101157 | macros/latex/contrib/koma-script/doc/scrbookreportarticle-experts-de.tex +2023/04/24 | 101021 | macros/latex/contrib/koma-script/doc/typearea-de.tex +2023/04/24 | 10089 | macros/latex/contrib/koma-script/doc/common-dictum-en.tex 2023/04/23 | 9625 | graphics/pgf/contrib/pgfornament-han/han/han65.pgf 2023/04/23 | 9382 | graphics/pgf/contrib/pgfornament-han/han/han75.pgf 2023/04/23 | 927 | graphics/pgf/contrib/pgfornament-han/han/han25.pgf @@ -15,8 +318,10 @@ 2023/04/23 | 7603 | graphics/pgf/contrib/pgfornament-han/han/han73.pgf 2023/04/23 | 749 | graphics/pgf/contrib/pgfornament-han/han/han46.pgf 2023/04/23 | 7454 | graphics/pgf/contrib/pgfornament-han/han/han51.pgf +2023/04/23 | 7279 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2023/04/23 | 726236 | systems/texlive/tlnet/archive/polyglossia.doc.r66917.tar.xz 2023/04/23 | 722 | graphics/pgf/contrib/pgfornament-han/han/han27.pgf +2023/04/23 | 706 | graphics/pgf/contrib/tikz-nfold/README.md 2023/04/23 | 6778 | graphics/pgf/contrib/pgfornament-han/han/han63.pgf 2023/04/23 | 674 | graphics/pgf/contrib/pgfornament-han/han/han38.pgf 2023/04/23 | 663 | graphics/pgf/contrib/pgfornament-han/han/han44.pgf @@ -28,25 +333,18 @@ 2023/04/23 | 604 | graphics/pgf/contrib/pgfornament-han/han/han1.pgf 2023/04/23 | 6027 | graphics/pgf/contrib/pgfornament-han/han/han71.pgf 2023/04/23 | 588 | graphics/pgf/contrib/pgfornament-han/han/han9.pgf -2023/04/23 | 5735807 | systems/texlive/tlnet/install-tl-unx.tar.gz 2023/04/23 | 567 | graphics/pgf/contrib/pgfornament-han/han/han42.pgf 2023/04/23 | 566 | graphics/pgf/contrib/pgfornament-han/han/han36.pgf 2023/04/23 | 551 | graphics/pgf/contrib/pgfornament-han/han/han5.pgf 2023/04/23 | 5519 | graphics/pgf/contrib/pgfornament-han/beamerthemeXiaoshan.sty 2023/04/23 | 509 | graphics/pgf/contrib/pgfornament-han/han/han76.pgf 2023/04/23 | 509 | graphics/pgf/contrib/pgfornament-han/han/han39.pgf -2023/04/23 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 2023/04/23 | 474 | graphics/pgf/contrib/pgfornament-han/han/han34.pgf 2023/04/23 | 471 | graphics/pgf/contrib/pgfornament-han/han/han23.pgf 2023/04/23 | 458 | graphics/pgf/contrib/pgfornament-han/han/han18.pgf -2023/04/23 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2023/04/23 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc -2023/04/23 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2023/04/23 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2023/04/23 | 454 | graphics/pgf/contrib/pgfornament-han/han/han47.pgf 2023/04/23 | 4503 | graphics/pgf/contrib/pgfornament-han/pgflibraryhan.code.tex 2023/04/23 | 435 | graphics/pgf/contrib/pgfornament-han/han/han45.pgf -2023/04/23 | 426152 | systems/texlive/tlnet/archive/texlive-scripts.doc.r66913.tar.xz 2023/04/23 | 414980 | systems/texlive/tlnet/archive/hyperref.source.r66916.tar.xz 2023/04/23 | 4063938 | biblio/ctan-bibdata.zip 2023/04/23 | 39913 | graphics/pgf/contrib/pgfornament-han/xiaoshan-sample.pdf @@ -70,12 +368,10 @@ 2023/04/23 | 2691 | graphics/pgf/contrib/pgfornament-han/heavenlyclouds-sample.tex 2023/04/23 | 268 | graphics/pgf/contrib/pgfornament-han/han/han33.pgf 2023/04/23 | 2649 | macros/unicodetex/latex/bithesis/contributing-zh.md -2023/04/23 | 26025714 | systems/texlive/tlnet/install-tl.zip 2023/04/23 | 2576 | macros/latex/contrib/preview/README 2023/04/23 | 25766 | graphics/pgf/contrib/pgfornament-han/han/han50.pgf 2023/04/23 | 2563 | graphics/pgf/contrib/pgfornament-han/han/han57.pgf 2023/04/23 | 2553 | graphics/pgf/contrib/pgfornament-han/han/han77.pgf -2023/04/23 | 2444044 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2023/04/23 | 23843 | graphics/pgf/contrib/pgfornament-han/han/han61.pgf 2023/04/23 | 234 | graphics/pgf/contrib/pgfornament-han/han/han17.pgf 2023/04/23 | 2348 | macros/unicodetex/latex/bithesis/contributing.md @@ -84,7 +380,6 @@ 2023/04/23 | 226468 | macros/unicodetex/latex/bithesis/bithesis.dtx 2023/04/23 | 2217 | graphics/pgf/contrib/pgfornament-han/pgfornament-han.sty 2023/04/23 | 2154 | graphics/pgf/contrib/pgfornament-han/han/han66.pgf -2023/04/23 | 21038201 | systems/texlive/tlnet/install-tl-windows.exe 2023/04/23 | 207541 | graphics/pgf/contrib/pgfornament-han/heavenlyclouds-sample.pdf 2023/04/23 | 1979436 | systems/texlive/tlnet/archive/texlive-en.doc.r66914.tar.xz 2023/04/23 | 1949 | graphics/pgf/contrib/pgfornament-han/han/han58.pgf @@ -92,7 +387,6 @@ 2023/04/23 | 19106 | graphics/pgf/contrib/pgfornament-han/lppl-1-3c.txt 2023/04/23 | 187 | graphics/pgf/contrib/pgfornament-han/han/han31.pgf 2023/04/23 | 18797 | graphics/pgf/contrib/pgfornament-han/han/han52.pgf -2023/04/23 | 18082702 | systems/texlive/tlnet/tlpkg/texlive.tlpdb 2023/04/23 | 1764 | graphics/pgf/contrib/pgfornament-han/han/han4.pgf 2023/04/23 | 1736 | graphics/pgf/contrib/pgfornament-han/han/han74.pgf 2023/04/23 | 1717 | graphics/pgf/contrib/pgfornament-han/han/han64.pgf @@ -101,14 +395,11 @@ 2023/04/23 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx 2023/04/23 | 165476 | systems/texlive/tlnet/archive/polyglossia.source.r66917.tar.xz 2023/04/23 | 163 | graphics/pgf/contrib/pgfornament-han/han/han15.pgf +2023/04/23 | 16016 | graphics/pgf/contrib/tikz-nfold/pgflibrarybezieroffset.code.tex 2023/04/23 | 1594 | macros/latex/contrib/preview/preview.ins 2023/04/23 | 1587 | graphics/pgf/contrib/pgfornament-han/xiaoshan-sample.tex 2023/04/23 | 1545 | graphics/pgf/contrib/pgfornament-han/han/han56.pgf -2023/04/23 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2023/04/23 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 2023/04/23 | 1520378 | graphics/pgf/contrib/pgfornament-han.zip -2023/04/23 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2023/04/23 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 2023/04/23 | 1449 | graphics/pgf/contrib/pgfornament-han/han/han26.pgf 2023/04/23 | 1437 | graphics/pgf/contrib/pgfornament-han/han/han22.pgf 2023/04/23 | 141 | graphics/pgf/contrib/pgfornament-han/han/han29.pgf @@ -127,7 +418,6 @@ 2023/04/23 | 1175792 | macros/unicodetex/latex/bithesis/bithesis.pdf 2023/04/23 | 115750 | graphics/pgf/contrib/pgfornament-han/tianqing-sample.pdf 2023/04/23 | 1145 | graphics/pgf/contrib/pgfornament-han/han/han72.pgf -2023/04/23 | 114060 | systems/texlive/tlnet/archive/texlive-scripts.r66913.tar.xz 2023/04/23 | 11176 | graphics/pgf/contrib/pgfornament-han/han/han67.pgf 2023/04/23 | 1050 | graphics/pgf/contrib/pgfornament-han/han/han19.pgf 2023/04/23 | 10496 | systems/texlive/tlnet/archive/cleveref-usedon.source.r66915.tar.xz @@ -146,7 +436,6 @@ 2023/04/22 | 795 | macros/latex/contrib/hyperref/doc/hyperref-doc3.html 2023/04/22 | 793 | macros/latex/contrib/hyperref/doc/hyperref-doc6.html 2023/04/22 | 7536 | macros/latex/contrib/hyperref/hyperref-patches.dtx -2023/04/22 | 7393 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2023/04/22 | 625120 | support/TeX4ht/source/tex4ht-html4.tex 2023/04/22 | 578865 | macros/unicodetex/latex/polyglossia.zip 2023/04/22 | 5736 | macros/latex/contrib/hyperref/xr-hyper.sty @@ -175,7 +464,6 @@ 2023/04/22 | 19445 | macros/latex/contrib/hyperref/hyperref-linktarget.dtx 2023/04/22 | 1942 | macros/unicodetex/latex/polyglossia/README.md 2023/04/22 | 1929 | macros/latex/contrib/hyperref/manifest.txt -2023/04/22 | 18221 | CTAN.sites 2023/04/22 | 180085 | macros/latex/contrib/hyperref/doc/nameref.pdf 2023/04/22 | 168031 | macros/latex/contrib/hyperref/doc/hyperref-doc.tex 2023/04/22 | 15606 | macros/latex/contrib/hyperref/doc/hyperref-doc.css @@ -401,11 +689,9 @@ 2023/04/19 | 945801 | graphics/pgf/contrib/pixelarttikz.zip 2023/04/19 | 934192 | macros/latex/contrib/l3backend.zip 2023/04/19 | 934066 | macros/latex/contrib/l3backend/l3backend-code.pdf -2023/04/19 | 9268 | systems/texlive/tlnet/archive/algpseudocodex.r66886.tar.xz 2023/04/19 | 9132 | systems/texlive/tlnet/archive/se2thesis.r66883.tar.xz 2023/04/19 | 9091 | graphics/pgf/contrib/pixelarttikz/tex/PixelArtTikz.sty 2023/04/19 | 898788 | systems/texlive/tlnet/archive/babel.doc.r66882.tar.xz -2023/04/19 | 890 | macros/latex/contrib/photobook/scripts/make-spreads.cfg.example 2023/04/19 | 834568 | systems/texlive/tlnet/archive/lyluatex.doc.r66880.tar.xz 2023/04/19 | 8145 | macros/latex/contrib/l3experimental/CHANGELOG.md 2023/04/19 | 792775 | macros/latex/contrib/nicematrix/nicematrix.dtx @@ -417,7 +703,6 @@ 2023/04/19 | 6032 | systems/texlive/tlnet/archive/prettytok.r66884.tar.xz 2023/04/19 | 58083 | macros/latex/contrib/l3experimental/xgalley.dtx 2023/04/19 | 5653 | macros/latex/contrib/l3experimental/l3draw-layers.dtx -2023/04/19 | 5548 | systems/texlive/tlnet/archive/hitex.r66878.tar.xz 2023/04/19 | 553017 | macros/latex/contrib/nicematrix/nicematrix-french.pdf 2023/04/19 | 549 | macros/latex/contrib/l3backend/README.md 2023/04/19 | 5260 | systems/texlive/tlnet/archive/lettrine.r66888.tar.xz @@ -429,14 +714,12 @@ 2023/04/19 | 4922 | macros/latex/contrib/l3backend/l3backend.ins 2023/04/19 | 468164 | graphics/pgf/contrib/pixelarttikz/doc/PixelArtTikz-doc-en.pdf 2023/04/19 | 464720 | systems/texlive/tlnet/archive/pagecolor.doc.r66885.tar.xz -2023/04/19 | 462 | macros/latex/contrib/photobook/DEPENDS.txt 2023/04/19 | 4460822 | install/macros/latex/contrib/l3experimental.tds.zip 2023/04/19 | 4448 | macros/latex/contrib/l3experimental/l3draw-state.dtx 2023/04/19 | 4422710 | macros/latex/contrib/l3experimental.zip 2023/04/19 | 4323 | macros/latex/contrib/l3experimental/l3draw-boxes.dtx 2023/04/19 | 4284 | macros/latex/contrib/l3experimental/README.md 2023/04/19 | 42560 | macros/latex/contrib/l3experimental/l3draw.dtx -2023/04/19 | 4172 | macros/latex/contrib/photobook/scripts/cls2tex.sh 2023/04/19 | 41332 | macros/latex/contrib/l3backend/l3backend-color.dtx 2023/04/19 | 409299 | macros/latex/contrib/l3experimental/l3galley.pdf 2023/04/19 | 406792 | systems/texlive/tlnet/archive/lettrine.doc.r66888.tar.xz @@ -448,7 +731,6 @@ 2023/04/19 | 36 | graphics/pgf/contrib/pixelarttikz/doc/base.csv 2023/04/19 | 368426 | macros/latex/contrib/l3experimental/l3str-format.pdf 2023/04/19 | 36026 | macros/latex/contrib/l3experimental/l3draw-points.dtx -2023/04/19 | 352600 | systems/texlive/tlnet/archive/algpseudocodex.doc.r66886.tar.xz 2023/04/19 | 35092 | macros/latex/contrib/l3experimental/xcoffins.dtx 2023/04/19 | 348450 | macros/latex/contrib/l3experimental/l3sys-shell.pdf 2023/04/19 | 3472890 | macros/unicodetex/latex/nwafuthesis.zip @@ -461,7 +743,6 @@ 2023/04/19 | 300021 | macros/latex/contrib/l3experimental/xgalley.pdf 2023/04/19 | 29575 | macros/latex/contrib/l3backend/l3backend-graphics.dtx 2023/04/19 | 280971 | macros/unicodetex/latex/nwafuthesis/nwafuthesis.dtx -2023/04/19 | 2670660 | systems/texlive/tlnet/archive/hitex.doc.r66878.tar.xz 2023/04/19 | 25940 | macros/latex/contrib/l3experimental/l3graphics.dtx 2023/04/19 | 240708 | macros/context/contrib/context-pocketdiary.zip 2023/04/19 | 23860 | systems/texlive/tlnet/archive/se2thesis.source.r66883.tar.xz @@ -473,13 +754,9 @@ 2023/04/19 | 207536 | systems/texlive/tlnet/archive/babel.r66882.tar.xz 2023/04/19 | 20451 | macros/latex/contrib/l3experimental/l3draw-softpath.dtx 2023/04/19 | 20004 | graphics/pgf/contrib/pixelarttikz/doc/PixelArtTikz-doc-fr.tex -2023/04/19 | 192417 | macros/latex/contrib/photobook.zip 2023/04/19 | 1906 | macros/latex/contrib/l3experimental/l3draw.ins 2023/04/19 | 18694 | macros/latex/contrib/l3experimental/l3bitset.dtx -2023/04/19 | 1705 | macros/latex/contrib/photobook/README.md -2023/04/19 | 16935 | macros/latex/contrib/photobook/scripts/make-spreads.sh 2023/04/19 | 16771 | graphics/pgf/contrib/pixelarttikz/doc/PixelArtTikz-doc-en.tex -2023/04/19 | 166879 | macros/latex/contrib/photobook/photobook.cls 2023/04/19 | 16508 | macros/latex/contrib/l3experimental/l3benchmark.dtx 2023/04/19 | 1624 | macros/latex/contrib/l3experimental/xgalley.ins 2023/04/19 | 16092 | macros/latex/contrib/l3backend/l3backend-basics.dtx @@ -491,13 +768,10 @@ 2023/04/19 | 1553 | macros/latex/contrib/l3experimental/l3graphics.ins 2023/04/19 | 1547 | macros/latex/contrib/l3experimental/l3opacity.ins 2023/04/19 | 1536 | macros/unicodetex/latex/nwafuthesis/README.md -2023/04/19 | 1527 | macros/latex/contrib/photobook/LICENSE 2023/04/19 | 14988 | systems/texlive/tlnet/archive/lyluatex.r66880.tar.xz 2023/04/19 | 14669 | macros/latex/contrib/l3backend/l3backend-header.dtx 2023/04/19 | 1464132 | systems/texlive/tlnet/archive/se2thesis.doc.r66883.tar.xz 2023/04/19 | 14431 | macros/latex/contrib/l3backend/l3backend-box.dtx -2023/04/19 | 143331 | macros/latex/contrib/photobook/photobook.pdf -2023/04/19 | 14221 | macros/latex/contrib/photobook/scripts/README.md 2023/04/19 | 1380299 | macros/latex/contrib/nicematrix/nicematrix.pdf 2023/04/19 | 13744 | systems/texlive/tlnet/archive/lettrine.source.r66888.tar.xz 2023/04/19 | 1360 | macros/latex/contrib/l3experimental/l3draw-code.tex @@ -509,7 +783,6 @@ 2023/04/19 | 115404 | systems/texlive/tlnet/archive/arara.source.r66881.tar.xz 2023/04/19 | 10668848 | systems/texlive/tlnet/archive/pstricks-add.doc.r66887.tar.xz 2023/04/19 | 102702 | macros/context/contrib/context-interval-calendar.zip -2023/04/19 | 10191 | macros/latex/contrib/photobook/Makefile 2023/04/19 | 10138 | macros/latex/contrib/l3experimental/l3draw-transforms.dtx 2023/04/19 | 10018 | macros/latex/contrib/l3experimental/l3draw-scopes.dtx 2023/04/18 | 9948 | fonts/ibarra/tfm/IbarraRealNova-SemiBold-osf-ot1.tfm @@ -591,7 +864,6 @@ 2023/04/18 | 5358 | fonts/ibarra/latex/OT1IbarraRealNova-OsF.fd 2023/04/18 | 5358 | fonts/ibarra/latex/LY1IbarraRealNova-OsF.fd 2023/04/18 | 534686 | macros/latex/contrib/pagecolor.zip -2023/04/18 | 53388 | systems/texlive/tlnet/archive/pst-eucl.r66868.tar.xz 2023/04/18 | 53260 | fonts/ibarra/tfm/IbarraRealNova-Regular-lf-t1.tfm 2023/04/18 | 53128 | fonts/ibarra/tfm/IbarraRealNova-Regular-osf-t1.tfm 2023/04/18 | 5301 | fonts/ibarra/latex/T1IbarraRealNova-OsF.fd @@ -848,7 +1120,6 @@ 2023/04/18 | 1640 | fonts/ibarra/tfm/IbarraRealNova-Regular-lf-sc-t1--base.tfm 2023/04/18 | 1629 | macros/latex/contrib/oststud/oststud.ins 2023/04/18 | 16269 | fonts/ibarra/map/ibarra.map -2023/04/18 | 1622988 | systems/texlive/tlnet/archive/pst-eucl.doc.r66868.tar.xz 2023/04/18 | 158 | support/lyluatex/ly/eight-systems.ly 2023/04/18 | 1556 | fonts/ibarra/tfm/IbarraRealNova-BoldItalic-lf-sc-ot1--base.tfm 2023/04/18 | 1552 | macros/latex/contrib/lettrine/README.md @@ -927,480 +1198,3 @@ 2023/04/18 | 101137 | macros/latex/contrib/pagecolor/pagecolor-crop-example.pdf 2023/04/18 | 101119 | fonts/ibarra/doc/ibarra-samples.pdf 2023/04/18 | 10016 | fonts/ibarra/tfm/IbarraRealNova-SemiBold-lf-ot1.tfm -2023/04/17 | 9986 | macros/latex/contrib/profcollege/latex/PfCDessinGradue.tex -2023/04/17 | 9985 | graphics/pstricks/contrib/pstricks-add/doc/data/data.data -2023/04/17 | 9951 | macros/latex/contrib/profcollege/latex/PfCTriominos.tex -2023/04/17 | 9949201 | install/macros/latex/contrib/koma-script.tds.zip -2023/04/17 | 99290 | macros/latex/contrib/koma-script/doc/scrguide.cls -2023/04/17 | 984 | support/arara/scripts/rules/arara-rule-make.yaml -2023/04/17 | 9815 | macros/latex/contrib/profcollege/latex/PfCVueCubes.tex -2023/04/17 | 9738 | macros/latex/contrib/koma-script/scrkernel-version.dtx -2023/04/17 | 9699 | macros/latex/contrib/profcollege/latex/PfCCartographie.tex -2023/04/17 | 9631 | macros/latex/contrib/koma-script/doc/scrextend-de.tex -2023/04/17 | 9589 | macros/latex/contrib/koma-script/doc/common-dictum-en.tex -2023/04/17 | 95730 | macros/latex/contrib/koma-script/doc/scrbase-de.tex -2023/04/17 | 95609 | macros/latex/contrib/koma-script/scrlayer-scrpage.dtx -2023/04/17 | 9525 | macros/latex/contrib/koma-script/MANIFEST.md -2023/04/17 | 950 | support/arara/scripts/rules/arara-rule-gnuplot.yaml -2023/04/17 | 9506053 | macros/latex/contrib/koma-script.zip -2023/04/17 | 9453 | macros/latex/contrib/profcollege/latex/PfCPyramideCalculs.tex -2023/04/17 | 9427 | macros/latex/contrib/profcollege/latex/PfCLabyrintheJeu.tex -2023/04/17 | 9413 | macros/latex/contrib/profcollege/latex/PfCEcrireunQCM.tex -2023/04/17 | 9387 | macros/latex/contrib/koma-script/doc/common-fontsize-de.tex -2023/04/17 | 93786 | macros/latex/contrib/koma-script/doc/scrlayer-de.tex -2023/04/17 | 9367 | macros/latex/contrib/profcollege/latex/PfCDefiTables.tex -2023/04/17 | 9346 | macros/latex/contrib/koma-script/doc/scraddr-en.tex -2023/04/17 | 9337 | macros/latex/contrib/koma-script/scrextend.dtx -2023/04/17 | 9226 | macros/latex/contrib/koma-script/doc/common-options-en.tex -2023/04/17 | 91623 | graphics/pstricks/contrib/pstricks-add/tex/pstricks-add.tex -2023/04/17 | 915 | support/arara/scripts/rules/arara-rule-move.yaml -2023/04/17 | 9158838 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf -2023/04/17 | 910 | support/arara/scripts/rules/arara-rule-xindex.yaml -2023/04/17 | 88170 | macros/latex/contrib/koma-script/doc/scrbookreportarticle-experts-en.tex -2023/04/17 | 88016 | macros/latex/contrib/koma-script/doc/typearea-en.tex -2023/04/17 | 878 | support/arara/scripts/rules/arara-rule-ghostscript.yaml -2023/04/17 | 8711 | macros/latex/contrib/profcollege/latex/PfCShikaku.tex -2023/04/17 | 8676 | macros/latex/contrib/profcollege/latex/PfCYohaku.tex -2023/04/17 | 84871 | macros/latex/contrib/koma-script/scrkernel-fonts.dtx -2023/04/17 | 841 | support/arara/scripts/rules/arara-rule-tikzmake.yaml -2023/04/17 | 838 | support/arara/scripts/rules/arara-rule-biber.yaml -2023/04/17 | 83762 | macros/latex/contrib/koma-script/doc/scrbase-en.tex -2023/04/17 | 830 | support/arara/scripts/rules/arara-rule-nomencl.yaml -2023/04/17 | 8277 | macros/latex/contrib/koma-script/doc/variables-tikz.tex -2023/04/17 | 8271 | macros/latex/contrib/profcollege/latex/PfCBillard.tex -2023/04/17 | 8221 | macros/latex/contrib/profcollege/latex/PfCTortueBase.tex -2023/04/17 | 8180 | macros/latex/contrib/profcollege/latex/PfCDecDeci.tex -2023/04/17 | 8177 | macros/latex/contrib/koma-script/doc/scrextend-en.tex -2023/04/17 | 812 | support/arara/scripts/rules/arara-rule-songidx.yaml -2023/04/17 | 8113 | macros/latex/contrib/profcollege/latex/PfCPourcentage.tex -2023/04/17 | 810 | support/arara/scripts/rules/arara-rule-dvipdfmx.yaml -2023/04/17 | 807 | support/arara/scripts/rules/arara-rule-ps2pdf.yaml -2023/04/17 | 806 | support/arara/scripts/rules/arara-rule-dvipdfm.yaml -2023/04/17 | 8059 | macros/latex/contrib/koma-script/doc/common-compatibility-de.tex -2023/04/17 | 804974 | graphics/pstricks/contrib/pstricks-add/doc/data/dotmatrix.data -2023/04/17 | 797 | support/arara/scripts/rules/arara-rule-dvips.yaml -2023/04/17 | 788 | support/arara/scripts/rules/arara-rule-copy.yaml -2023/04/17 | 78876 | macros/latex/contrib/koma-script/doc/scrlayer-en.tex -2023/04/17 | 7876 | macros/latex/contrib/koma-script/doc/common-fontsize-en.tex -2023/04/17 | 7808 | macros/latex/contrib/profcollege/latex/PfCSimplifierFraction.tex -2023/04/17 | 7797 | macros/latex/contrib/profcollege/latex/PfCReseauxSociaux.tex -2023/04/17 | 7695 | macros/latex/contrib/profcollege/latex/PfCProbabilites.tex -2023/04/17 | 76753 | macros/latex/contrib/profcollege/latex/PfCTableauxUnites.tex -2023/04/17 | 7603 | support/arara/doc/htmlmanualtopdf.sh -2023/04/17 | 7590 | macros/latex/contrib/koma-script/doc/common-headfootheight-de.tex -2023/04/17 | 75565 | macros/latex/contrib/koma-script/scrkernel-language.dtx -2023/04/17 | 7532 | macros/latex/contrib/koma-script/doc/common-compatibility-en.tex -2023/04/17 | 73777 | macros/latex/contrib/koma-script/tocbasic.dtx -2023/04/17 | 73295 | macros/latex/contrib/koma-script/scrhack.dtx -2023/04/17 | 73006 | macros/latex/contrib/koma-script/scrkernel-floats.dtx -2023/04/17 | 728 | graphics/pstricks/contrib/pstricks-add/doc/data/matrix2.data -2023/04/17 | 7244 | macros/latex/contrib/profcollege/latex/PfCFrise.tex -2023/04/17 | 71255 | macros/latex/contrib/profcollege/latex/PfCReperage.tex -2023/04/17 | 7102 | macros/latex/contrib/profcollege/latex/PfCPuzzleSommePyramide.tex -2023/04/17 | 7088 | macros/latex/contrib/profcollege/latex/PfCColorilude.tex -2023/04/17 | 7072 | macros/latex/contrib/profcollege/latex/PfCPuissanceQuatre.tex -2023/04/17 | 70314 | macros/latex/contrib/koma-script/scrjura.dtx -2023/04/17 | 680 | support/arara/scripts/rules/arara-rule-sketch.yaml -2023/04/17 | 6640 | macros/latex/contrib/koma-script/doc/common-headfootheight-en.tex -2023/04/17 | 6604 | systems/texlive/tlnet/archive/pas-tableur.doc.r66860.tar.xz -2023/04/17 | 6541 | support/arara/doc/resources/manual.css -2023/04/17 | 650 | support/arara/scripts/rules/arara-rule-spix.yaml -2023/04/17 | 647 | support/arara/scripts/rules/arara-rule-convert.yaml -2023/04/17 | 646 | support/arara/scripts/rules/arara-rule-makeglossarieslite.yaml -2023/04/17 | 6428 | macros/latex/contrib/profcollege/latex/PfCNombreAstral.tex -2023/04/17 | 639 | graphics/pstricks/contrib/pstricks-add/latex/pstricks-add.sty -2023/04/17 | 6304 | macros/latex/contrib/koma-script/scrkernel-addressfiles.dtx -2023/04/17 | 62633 | macros/latex/contrib/profcollege/latex/PfCStatistiques.tex -2023/04/17 | 6260 | macros/latex/contrib/profcollege/latex/PfCProgrammeCalcul.tex -2023/04/17 | 625 | support/arara/scripts/rules/arara-rule-upbibtex.yaml -2023/04/17 | 62562 | macros/latex/contrib/koma-script/doc/scrjura-example-de.pdf -2023/04/17 | 620 | support/arara/scripts/rules/arara-rule-bibtexu.yaml -2023/04/17 | 620 | support/arara/scripts/rules/arara-rule-bibtex8.yaml -2023/04/17 | 617666 | macros/latex/contrib/scrwfile/scrwfile.pdf -2023/04/17 | 6148 | macros/latex/contrib/profcollege/latex/PfCCalculsFractions.tex -2023/04/17 | 612910 | macros/latex/contrib/scrwfile.zip -2023/04/17 | 61102 | macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf -2023/04/17 | 6030 | macros/latex/contrib/profcollege/latex/PfCTectonic.tex -2023/04/17 | 5 | support/arara/doc/resources/version.txt -2023/04/17 | 59932 | macros/latex/contrib/koma-script/scrlayer-notecolumn.dtx -2023/04/17 | 595 | support/arara/scripts/rules/arara-rule-pbibtex.yaml -2023/04/17 | 59521 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage-de.tex -2023/04/17 | 59496 | macros/latex/contrib/koma-script/scrkernel-letterclassoptions.dtx -2023/04/17 | 591 | support/arara/scripts/rules/arara-rule-bibtex.yaml -2023/04/17 | 587 | support/arara/scripts/rules/arara-rule-pdftk.yaml -2023/04/17 | 58462 | macros/latex/contrib/profcollege/latex/PfCDistributivite.tex -2023/04/17 | 58093 | macros/latex/contrib/koma-script/doc/scrjura-de.tex -2023/04/17 | 5787 | support/arara/scripts/rules/arara-rule-bib2gls.yaml -2023/04/17 | 576 | support/arara/scripts/arara.sh -2023/04/17 | 56986 | macros/latex/contrib/profcollege/latex/PfCThales.tex -2023/04/17 | 5658 | macros/latex/contrib/koma-script/scrdocstrip.tex -2023/04/17 | 5561 | macros/latex/contrib/profcollege/latex/PfCRepresenterEntier.tex -2023/04/17 | 5532 | macros/latex/contrib/koma-script/doc/preface-de.tex -2023/04/17 | 5516 | macros/latex/contrib/koma-script/doc/scrtime-de.tex -2023/04/17 | 546 | support/arara/scripts/rules/arara-rule-qpdf.yaml -2023/04/17 | 5376 | macros/latex/contrib/koma-script/doc/common-oddorevenpage-de.tex -2023/04/17 | 53667 | macros/latex/contrib/koma-script/doc/common-pagestylemanipulation-de.tex -2023/04/17 | 5365 | macros/latex/contrib/profcollege/latex/PfCMidpoint.tex -2023/04/17 | 53457 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage-en.tex -2023/04/17 | 5248 | macros/latex/contrib/profcollege/latex/PfCRepresenterTableur.tex -2023/04/17 | 524840 | support/arara/doc/resources/firasans-italic.otf -2023/04/17 | 52445 | support/arara/doc/resources/arara-logo-with-text-bottom.svg -2023/04/17 | 522236 | support/arara/doc/resources/firasans-lightitalic.otf -2023/04/17 | 521796 | support/arara/doc/resources/firasans-bold.otf -2023/04/17 | 507828 | support/arara/doc/resources/firasans-regular.otf -2023/04/17 | 5069 | graphics/pstricks/contrib/pstricks-add/dvips/pstricks-add.pro -2023/04/17 | 505308 | support/arara/doc/resources/firasans-light.otf -2023/04/17 | 5045 | macros/latex/contrib/koma-script/doc/scrtime-en.tex -2023/04/17 | 49833 | macros/latex/contrib/koma-script/doc/scrjura-en.tex -2023/04/17 | 4980 | support/arara/README.md -2023/04/17 | 4980 | macros/latex/contrib/koma-script/doc/preface-en.tex -2023/04/17 | 492 | graphics/pgf/contrib/quickreaction/README.txt -2023/04/17 | 4913 | macros/latex/contrib/koma-script/doc/common-marginpar-de.tex -2023/04/17 | 48503 | macros/latex/contrib/koma-script/doc/common-textmarkup-de.tex -2023/04/17 | 48286 | macros/latex/contrib/koma-script/scrkernel-listsof.dtx -2023/04/17 | 4736 | macros/latex/contrib/profcollege/latex/PfCRLE.tex -2023/04/17 | 4730 | macros/latex/contrib/profcollege/latex/PfCOperationsTrou.tex -2023/04/17 | 47300 | macros/latex/contrib/koma-script/scrlfile-patcholdlatex.dtx -2023/04/17 | 4720 | macros/latex/contrib/koma-script/doc/common-oddorevenpage-en.tex -2023/04/17 | 4692 | macros/latex/contrib/profcollege/latex/PfCFutoshiki.tex -2023/04/17 | 46863 | macros/latex/contrib/koma-script/doc/common-pagestylemanipulation-en.tex -2023/04/17 | 4664 | macros/latex/contrib/profcollege/latex/PfCDiagrammeRadar.tex -2023/04/17 | 46388 | macros/latex/contrib/koma-script/doc/letter-example-23-en.pdf -2023/04/17 | 46388 | macros/latex/contrib/koma-script/doc/letter-example-22-en.pdf -2023/04/17 | 46083 | macros/latex/contrib/koma-script/doc/letter-example-21-en.pdf -2023/04/17 | 45789 | macros/latex/contrib/scrwfile/scrwfile.dtx -2023/04/17 | 4568 | systems/texlive/tlnet/archive/pdfcrop.doc.r66862.tar.xz -2023/04/17 | 4561 | graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.bib -2023/04/17 | 4549 | macros/latex/contrib/koma-script/doc/common-marginpar-en.tex -2023/04/17 | 4548 | macros/latex/contrib/profcollege/latex/PfCMosaique.tex -2023/04/17 | 4478 | macros/latex/contrib/koma-script/doc/common-draftmode-de.tex -2023/04/17 | 44537 | macros/latex/contrib/koma-script/doc/letter-example-23-de.pdf -2023/04/17 | 44537 | macros/latex/contrib/koma-script/doc/letter-example-22-de.pdf -2023/04/17 | 4447 | macros/latex/contrib/koma-script/scrlogo.dtx -2023/04/17 | 44230 | macros/latex/contrib/koma-script/doc/letter-example-21-de.pdf -2023/04/17 | 43924 | macros/latex/contrib/koma-script/doc/common-textmarkup-en.tex -2023/04/17 | 4320 | macros/latex/contrib/koma-script/doc/common-draftmode-en.tex -2023/04/17 | 429 | graphics/pstricks/contrib/pstricks-add/doc/data/dataMul.data -2023/04/17 | 4253 | support/arara/scripts/rules/arara-rule-context.yaml -2023/04/17 | 420 | graphics/pstricks/contrib/pstricks-add/doc/data/demo0.data -2023/04/17 | 41509 | macros/latex/contrib/algpseudocodex/algpseudocodex.sty -2023/04/17 | 4138 | macros/latex/contrib/profcollege/latex/PfCPixelArt.tex -2023/04/17 | 4117 | macros/latex/contrib/profcollege/latex/PfCDomino.tex -2023/04/17 | 4074 | support/arara/scripts/rules/arara-rule-datatooltk.yaml -2023/04/17 | 40627 | macros/latex/contrib/koma-script/doc/scrlttr2-experts-de.tex -2023/04/17 | 4034 | macros/latex/contrib/profcollege/latex/PfCCalculatrice.tex -2023/04/17 | 40053 | macros/latex/contrib/koma-script/scrkernel-miscellaneous.dtx -2023/04/17 | 3980 | macros/latex/contrib/koma-script/doc/linkalias.tex -2023/04/17 | 38864 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-de.tex -2023/04/17 | 3843 | support/arara/doc/resources/gitlab-icon.svg -2023/04/17 | 3835 | macros/latex/contrib/profcollege/latex/PfCKenKen.tex -2023/04/17 | 3787 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.tex -2023/04/17 | 3765 | macros/latex/contrib/profcollege/latex/PfCEnquete.tex -2023/04/17 | 3751 | macros/latex/contrib/profcollege/latex/PfCJeuRangement.tex -2023/04/17 | 3731 | macros/latex/contrib/koma-script/doc/scrjura-example-de.tex -2023/04/17 | 36339 | macros/latex/contrib/koma-script/doc/common-lists-de.tex -2023/04/17 | 3618 | macros/latex/contrib/profcollege/latex/PfCDecompFracDeci.tex -2023/04/17 | 361368 | macros/latex/contrib/algpseudocodex.zip -2023/04/17 | 35969 | macros/latex/contrib/koma-script/doc/scrlfile-de.tex -2023/04/17 | 3580 | systems/texlive/tlnet/archive/pas-tableur.r66860.tar.xz -2023/04/17 | 356863 | macros/latex/contrib/algpseudocodex/algpseudocodex.pdf -2023/04/17 | 3542 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.tex -2023/04/17 | 34966 | macros/latex/contrib/koma-script/doc/letter-example-20-en.pdf -2023/04/17 | 34954 | macros/latex/contrib/koma-script/doc/letter-example-19-en.pdf -2023/04/17 | 34683 | macros/latex/contrib/koma-script/doc/letter-example-17-en.pdf -2023/04/17 | 34675 | macros/latex/contrib/koma-script/doc/letter-example-18-en.pdf -2023/04/17 | 34650 | macros/latex/contrib/koma-script/doc/letter-example-16-en.pdf -2023/04/17 | 3464 | macros/latex/contrib/koma-script/scrstrip.inc -2023/04/17 | 3431 | macros/latex/contrib/profcollege/latex/PfCBarresCalculs.tex -2023/04/17 | 34196 | macros/latex/contrib/koma-script/doc/scrlttr2-experts-en.tex -2023/04/17 | 3416 | macros/latex/contrib/koma-script/doc/scrjura-example-en.tex -2023/04/17 | 34127 | macros/latex/contrib/koma-script/scrkernel-title.dtx -2023/04/17 | 33659 | macros/latex/contrib/koma-script/doc/letter-example-13-en.pdf -2023/04/17 | 33658 | macros/latex/contrib/koma-script/doc/letter-example-15-en.pdf -2023/04/17 | 33630 | macros/latex/contrib/koma-script/doc/letter-example-14-en.pdf -2023/04/17 | 33613 | macros/latex/contrib/koma-script/doc/common-lists-en.tex -2023/04/17 | 3303507 | macros/latex/contrib/koma-script/doc/scrguide-de.pdf -2023/04/17 | 33020 | systems/texlive/tlnet/archive/proflycee.r66864.tar.xz -2023/04/17 | 32958 | macros/latex/contrib/koma-script/doc/letter-example-19-de.pdf -2023/04/17 | 32937 | macros/latex/contrib/koma-script/doc/letter-example-20-de.pdf -2023/04/17 | 3280 | macros/latex/contrib/profcollege/latex/PfCFicheMemo.tex -2023/04/17 | 32799 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-en.tex -2023/04/17 | 326 | graphics/pstricks/contrib/pstricks-add/doc/data/olympic.tex -2023/04/17 | 3251 | support/arara/scripts/rules/arara-rule-pdfcrop.yaml -2023/04/17 | 32464 | macros/latex/contrib/koma-script/doc/letter-example-17-de.pdf -2023/04/17 | 32462 | macros/latex/contrib/koma-script/doc/letter-example-18-de.pdf -2023/04/17 | 32439 | macros/latex/contrib/koma-script/doc/letter-example-16-de.pdf -2023/04/17 | 32391 | macros/latex/contrib/koma-script/doc/letter-example-11-en.pdf -2023/04/17 | 32389 | macros/latex/contrib/koma-script/doc/letter-example-12-en.pdf -2023/04/17 | 32389 | macros/latex/contrib/koma-script/doc/letter-example-10-en.pdf -2023/04/17 | 32389 | macros/latex/contrib/koma-script/doc/letter-example-08-en.pdf -2023/04/17 | 32367 | macros/latex/contrib/koma-script/doc/letter-example-09-en.pdf -2023/04/17 | 3217575 | macros/latex/contrib/koma-script/doc/scrguide-en.pdf -2023/04/17 | 320 | support/arara/scripts/rules/arara-rule-halt.yaml -2023/04/17 | 32098 | macros/latex/contrib/koma-script/doc/scrlfile-en.tex -2023/04/17 | 31871 | macros/latex/contrib/koma-script/doc/common-titles-de.tex -2023/04/17 | 31623 | macros/latex/contrib/koma-script/doc/common-footnotes-de.tex -2023/04/17 | 31442 | macros/latex/contrib/koma-script/doc/letter-example-15-de.pdf -2023/04/17 | 31442 | macros/latex/contrib/koma-script/doc/letter-example-13-de.pdf -2023/04/17 | 31416 | macros/latex/contrib/koma-script/doc/letter-example-14-de.pdf -2023/04/17 | 311 | graphics/pstricks/contrib/pstricks-add/doc/data/matrix.data -2023/04/17 | 30699 | macros/latex/contrib/koma-script/doc/letter-example-11-de.pdf -2023/04/17 | 30698 | macros/latex/contrib/koma-script/doc/letter-example-12-de.pdf -2023/04/17 | 30698 | macros/latex/contrib/koma-script/doc/letter-example-10-de.pdf -2023/04/17 | 30698 | macros/latex/contrib/koma-script/doc/letter-example-08-de.pdf -2023/04/17 | 30680 | macros/latex/contrib/koma-script/doc/letter-example-09-de.pdf -2023/04/17 | 3043 | macros/latex/contrib/profcollege/latex/PfCEngrenagesBase.tex -2023/04/17 | 302 | graphics/pstricks/contrib/pstricks-add/doc/data/demo1.data -2023/04/17 | 3026 | macros/latex/contrib/koma-script/doc/common-typearea-de.tex -2023/04/17 | 30001 | macros/latex/contrib/koma-script/scrkernel-pagestyles.dtx -2023/04/17 | 2992 | macros/latex/contrib/koma-script/doc/scrguide-body.tex -2023/04/17 | 2990 | support/arara/scripts/rules/arara-rule-indent.yaml -2023/04/17 | 2980 | macros/latex/contrib/profcollege/latex/PfCRangementNombres.tex -2023/04/17 | 2975 | macros/latex/contrib/profcollege/latex/PfCTablesOperations.tex -2023/04/17 | 2939 | macros/latex/contrib/profcollege/latex/PfCBarreNiveaux.tex -2023/04/17 | 2917275 | graphics/pstricks/contrib/pstricks-add/doc/data/pstricks-add-doc.data -2023/04/17 | 2911 | macros/latex/contrib/koma-script/doc/common-typearea-en.tex -2023/04/17 | 28776 | macros/latex/contrib/profcollege/latex/PfCPythagoreold.tex -2023/04/17 | 2876 | graphics/pstricks/contrib/pstricks-add/doc/data/data3.data -2023/04/17 | 28736 | macros/latex/contrib/koma-script/doc/common-titles-en.tex -2023/04/17 | 285336 | support/arara/doc/resources/CascadiaMono-Regular.otf -2023/04/17 | 28434 | macros/latex/contrib/profcollege/latex/PfCRappelsFormules.tex -2023/04/17 | 2837 | macros/latex/contrib/profcollege/latex/PfCMentalo.tex -2023/04/17 | 28303 | macros/latex/contrib/profcollege/latex/PfCSolides.tex -2023/04/17 | 282548 | support/arara/doc/resources/CascadiaMono-Light.otf -2023/04/17 | 281 | graphics/pstricks/contrib/pstricks-add/doc/data/matrix1.data -2023/04/17 | 2815 | macros/latex/contrib/profcollege/latex/PfCMotsCodes.tex -2023/04/17 | 2793 | macros/latex/contrib/koma-script/doc/scrextend.html -2023/04/17 | 27888 | macros/latex/contrib/koma-script/README.md -2023/04/17 | 27859 | macros/latex/contrib/koma-script/scrkernel-bibliography.dtx -2023/04/17 | 27597 | macros/latex/contrib/profcollege/latex/PfCRepresenterFraction.tex -2023/04/17 | 2755865 | support/arara/doc/arara-7.0.5-docsrc.zip -2023/04/17 | 27484 | macros/latex/contrib/koma-script/koma-script-source-doc.dtx -2023/04/17 | 273200 | support/arara/doc/resources/CascadiaMono-ExtraLight.otf -2023/04/17 | 27244 | macros/latex/contrib/koma-script/scrkernel-paragraphs.dtx -2023/04/17 | 2713 | macros/latex/contrib/koma-script/doc/scrkbase.html -2023/04/17 | 2687 | macros/latex/contrib/koma-script/doc/authorpart-de.tex -2023/04/17 | 2683 | macros/latex/contrib/koma-script/doc/scrlfile-patcholdlatex.html -2023/04/17 | 265785 | macros/latex/contrib/koma-script/scrkernel-sections.dtx -2023/04/17 | 26547 | macros/latex/contrib/koma-script/scrkernel-compatibility.dtx -2023/04/17 | 2647 | macros/latex/contrib/koma-script/doc/scrlfile-hook-3.34.html -2023/04/17 | 2634 | macros/latex/contrib/profcollege/latex/PfCSquaro.tex -2023/04/17 | 2632 | macros/latex/contrib/koma-script/doc/scrlogo-de.tex -2023/04/17 | 26283 | macros/latex/contrib/koma-script/doc/common-footnotes-en.tex -2023/04/17 | 2617 | macros/latex/contrib/profcollege/latex/PfCQuiSuisJe.tex -2023/04/17 | 2605 | macros/latex/contrib/profcollege/latex/PfCKakurasu.tex -2023/04/17 | 2602 | macros/latex/contrib/koma-script/doc/scrlfile-hook.html -2023/04/17 | 25737 | macros/latex/contrib/koma-script/scrtime.dtx -2023/04/17 | 2570 | macros/latex/contrib/koma-script/doc/scrarticle.html -2023/04/17 | 2567 | macros/latex/contrib/koma-script/doc/scrreport.html -2023/04/17 | 2565 | macros/latex/contrib/koma-script/doc/scrletter.html -2023/04/17 | 2564 | macros/latex/contrib/koma-script/doc/scrreprt.html -2023/04/17 | 2564 | macros/latex/contrib/koma-script/doc/scrartcl.html -2023/04/17 | 2562 | macros/latex/contrib/koma-script/doc/scrlttr2.html -2023/04/17 | 2561 | macros/latex/contrib/koma-script/doc/scrbook.html -2023/04/17 | 254876 | graphics/pstricks/contrib/pstricks-add/doc/data/olympic.eps -2023/04/17 | 25450 | macros/latex/contrib/koma-script/doc/japanlco-en.tex -2023/04/17 | 2543 | support/arara/scripts/rules/arara-rule-ltx2any.yaml -2023/04/17 | 2533 | graphics/pgf/contrib/quickreaction/quickreaction.sty -2023/04/17 | 25302 | macros/latex/contrib/profcollege/latex/PfCQuestionsFlash.tex -2023/04/17 | 25281 | macros/latex/contrib/koma-script/scrlfile-hook.dtx -2023/04/17 | 252054 | graphics/pgf/contrib/quickreaction.zip -2023/04/17 | 2519 | macros/latex/contrib/koma-script/doc/authorpart-en.tex -2023/04/17 | 25143 | macros/latex/contrib/profcollege/latex/PfCPythagore.tex -2023/04/17 | 25055 | macros/latex/contrib/koma-script/lppl-de.txt -2023/04/17 | 2494 | macros/latex/contrib/koma-script/doc/scrlogo-en.tex -2023/04/17 | 2492 | macros/latex/contrib/koma-script/doc/scrlayer.html -2023/04/17 | 249125 | graphics/pgf/contrib/quickreaction/quickreaction.pdf -2023/04/17 | 248858 | macros/latex/contrib/koma-script/doc/scrbookreportarticle-de.tex -2023/04/17 | 2484 | macros/latex/contrib/koma-script/doc/scrlfile.html -2023/04/17 | 2478 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage.html -2023/04/17 | 2473 | macros/latex/contrib/profcollege/latex/PfCEcritureLettres.tex -2023/04/17 | 24665 | macros/latex/contrib/profcollege/latex/PfCTrigonometrie.tex -2023/04/17 | 2465 | macros/latex/contrib/koma-script/doc/scrjura.html -2023/04/17 | 2463 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn.html -2023/04/17 | 2459 | macros/latex/contrib/koma-script/doc/scrlogo.html -2023/04/17 | 2448 | macros/latex/contrib/koma-script/doc/typearea.html -2023/04/17 | 2447 | macros/latex/contrib/koma-script/doc/scrhack.html -2023/04/17 | 2446 | macros/latex/contrib/koma-script/doc/tocbasic.html -2023/04/17 | 2439 | macros/latex/contrib/koma-script/doc/scrbase.html -2023/04/17 | 2434 | support/arara/scripts/rules/arara-rule-makeglossaries.yaml -2023/04/17 | 2428 | support/arara/doc/htmlquickstarttopdf.sh -2023/04/17 | 2425 | macros/latex/contrib/koma-script/doc/scraddr.html -2023/04/17 | 2424 | macros/latex/contrib/koma-script/doc/scrwfile-de.tex -2023/04/17 | 2383 | macros/latex/contrib/koma-script/doc/scrdate.html -2023/04/17 | 2379 | macros/latex/contrib/koma-script/doc/scrtime.html -2023/04/17 | 236358 | macros/latex/contrib/koma-script/doc/scrlttr2-de.tex -2023/04/17 | 2356 | macros/latex/contrib/scrwfile/README.md -2023/04/17 | 2350 | macros/latex/contrib/koma-script/doc/scrwfile-en.tex -2023/04/17 | 23434 | macros/latex/contrib/koma-script/doc/scrguide.bib -2023/04/17 | 2321615 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip -2023/04/17 | 23088 | macros/latex/contrib/profcollege/latex/PfCLabyrintheNombre.tex -2023/04/17 | 2305 | macros/latex/contrib/profcollege/latex/PfCQuestionsRelier.tex -2023/04/17 | 22985 | macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex -2023/04/17 | 2285 | macros/latex/contrib/profcollege/latex/PfCGrades.tex -2023/04/17 | 2276 | macros/latex/contrib/profcollege/latex/PfCKakuro.tex -2023/04/17 | 22719 | macros/latex/contrib/koma-script/scrkernel-footnotes.dtx -2023/04/17 | 2222 | macros/latex/contrib/profcollege/latex/PfCMotsCroises.tex -2023/04/17 | 222145 | macros/latex/contrib/koma-script/doc/scrbookreportarticle-en.tex -2023/04/17 | 2211 | macros/latex/contrib/profcollege/latex/PfCHiddenMessage.tex -2023/04/17 | 2210 | macros/latex/contrib/koma-script/doc/scrguide.gst -2023/04/17 | 2155 | macros/latex/contrib/profcollege/latex/PfCGaram.tex -2023/04/17 | 2145 | macros/latex/contrib/koma-script/doc/expertpart-de.tex -2023/04/17 | 2132 | macros/latex/contrib/koma-script/doc/common-footnotes-experts-de.tex -2023/04/17 | 2109 | macros/latex/contrib/koma-script/doc/expertpart-en.tex -2023/04/17 | 2099 | support/arara/scripts/rules/arara-rule-perltex.yaml -2023/04/17 | 2097416 | graphics/pstricks/contrib/pstricks-add/doc/data/contourN.data -2023/04/17 | 20746 | macros/latex/contrib/koma-script/scrmain.ins -2023/04/17 | 2072 | macros/latex/contrib/profcollege/latex/PfCBonSortie.tex -2023/04/17 | 20683 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage-experts-de.tex -2023/04/17 | 206209 | macros/latex/contrib/koma-script/doc/scrlttr2-en.tex -2023/04/17 | 20494 | macros/latex/contrib/koma-script/doc/introduction-de.tex -2023/04/17 | 20394 | macros/latex/contrib/algpseudocodex/algpseudocodex.tex -2023/04/17 | 20368 | macros/latex/contrib/koma-script/doc/terms-de.tex -2023/04/17 | 2021 | macros/latex/contrib/koma-script/doc/common-footnotes-experts-en.tex -2023/04/17 | 20192 | macros/latex/contrib/profcollege/latex/PfCCartesJeux.tex -2023/04/17 | 199121 | macros/latex/contrib/koma-script/scrkernel-basics.dtx -2023/04/17 | 19900 | macros/latex/contrib/profcollege/latex/PfCTrio.tex -2023/04/17 | 1985 | support/arara/scripts/rules/arara-rule-frontespizio.yaml -2023/04/17 | 1975 | macros/latex/contrib/koma-script/scrstrop.inc -2023/04/17 | 1974 | support/arara/scripts/rules/arara-rule-xindy.yaml -2023/04/17 | 1973 | support/arara/scripts/rules/arara-rule-texindy.yaml -2023/04/17 | 196134 | graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.tex -2023/04/17 | 19248 | macros/latex/contrib/koma-script/doc/letter-example-05-en.pdf -2023/04/17 | 19246 | macros/latex/contrib/koma-script/doc/letter-example-06-en.pdf -2023/04/17 | 19229 | macros/latex/contrib/koma-script/doc/letter-example-04-en.pdf -2023/04/17 | 19204 | macros/latex/contrib/koma-script/doc/letter-example-07-en.pdf -2023/04/17 | 19188 | macros/latex/contrib/koma-script/doc/letter-example-03-en.pdf -2023/04/17 | 19155 | macros/latex/contrib/koma-script/doc/letter-example-02-en.pdf -2023/04/17 | 191524 | support/arara/doc/arara-quickstart.pdf -2023/04/17 | 19110 | macros/latex/contrib/koma-script/lppl.txt -2023/04/17 | 19100 | macros/latex/contrib/koma-script/doc/terms-en.tex -2023/04/17 | 18856 | macros/latex/contrib/koma-script/doc/letter-example-01-en.pdf -2023/04/17 | 1883 | support/arara/scripts/rules/arara-rule-latexmk.yaml -2023/04/17 | 1862 | macros/latex/contrib/profcollege/latex/PfCMotsEmpiles.tex -2023/04/17 | 1836 | support/arara/scripts/rules/arara-rule-detex.yaml -2023/04/17 | 18241431 | install/support/arara.tds.zip -2023/04/17 | 18119084 | systems/texlive/tlnet/archive/biber.x86_64-linuxmusl.r66863.tar.xz -2023/04/17 | 18065 | macros/latex/contrib/profcollege/latex/ProfCollege.sty -2023/04/17 | 18059 | macros/latex/contrib/koma-script/doc/letter-example-06-de.pdf -2023/04/17 | 18053 | macros/latex/contrib/koma-script/doc/letter-example-05-de.pdf -2023/04/17 | 180460 | macros/latex/contrib/koma-script/scrkernel-notepaper.dtx -2023/04/17 | 17958 | macros/latex/contrib/koma-script/doc/letter-example-04-de.pdf -2023/04/17 | 17934 | macros/latex/contrib/koma-script/doc/letter-example-07-de.pdf -2023/04/17 | 17904 | macros/latex/contrib/koma-script/doc/letter-example-03-de.pdf -2023/04/17 | 1787 | macros/latex/contrib/koma-script/doc/scrguide.ist -2023/04/17 | 17869 | macros/latex/contrib/koma-script/doc/letter-example-02-de.pdf -2023/04/17 | 1777 | macros/latex/contrib/profcollege/latex/PfCRapido.tex -2023/04/17 | 17614 | macros/latex/contrib/koma-script/doc/letter-example-01-de.pdf -2023/04/17 | 17513 | macros/latex/contrib/koma-script/doc/scrlayer-scrpage-experts-en.tex -2023/04/17 | 1741780 | systems/texlive/tlnet/archive/proflycee.doc.r66864.tar.xz -2023/04/17 | 17278 | macros/latex/contrib/koma-script/scrkernel-listsandtabulars.dtx -2023/04/17 | 1724 | support/arara/doc/arara.1 -2023/04/17 | 1721 | support/arara/scripts/rules/arara-rule-pythontex.yaml -2023/04/17 | 1708 | support/arara/scripts/rules/arara-rule-texcount.yaml -2023/04/17 | 16857 | macros/latex/contrib/koma-script/scrkernel-variables.dtx -2023/04/17 | 16845 | graphics/pgf/contrib/quickreaction/quickreaction.tex -2023/04/17 | 168372 | support/arara/doc/resources/CascadiaMono-Italic.otf -2023/04/17 | 16794 | macros/latex/contrib/koma-script/doc/introduction-en.tex -2023/04/17 | 167532 | macros/latex/contrib/koma-script/scrlayer.dtx -2023/04/17 | 1671 | support/arara/scripts/rules/arara-rule-fig2dev.yaml -2023/04/17 | 167028 | support/arara/doc/resources/CascadiaMono-LightItalic.otf -2023/04/17 | 16349 | macros/latex/contrib/profcollege/latex/PfCRondeInfernale.tex -2023/04/17 | 1624 | support/arara/scripts/rules/arara-rule-pdflatex.yaml -2023/04/17 | 1624 | support/arara/scripts/rules/arara-rule-lualatex.yaml -2023/04/17 | 161997 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.pdf -2023/04/17 | 161924 | support/arara/doc/resources/CascadiaMono-ExtraLightItalic.otf -2023/04/17 | 16190 | macros/latex/contrib/profcollege/latex/PfCResoudreEquation.tex -2023/04/17 | 16159 | macros/latex/contrib/koma-script/doc/scrhack-de.tex -2023/04/17 | 1609 | support/arara/scripts/rules/arara-rule-latex.yaml -2023/04/17 | 16099 | macros/latex/contrib/koma-script/doc/letter-example-00-en.pdf -2023/04/17 | 160121 | support/arara/source/arara-7.0.5-src.zip -2023/04/17 | 1596 | macros/latex/contrib/profcollege/latex/PfCGeometrie.tex -2023/04/17 | 159442 | macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.pdf -2023/04/17 | 1570 | support/arara/scripts/rules/arara-rule-xelatex.yaml -2023/04/17 | 15650 | macros/latex/contrib/koma-script/doc/common-interleafpage-de.tex -2023/04/17 | 15575 | macros/latex/contrib/profcollege/latex/PfCFonctionAffine.tex -2023/04/17 | 15573 | macros/latex/contrib/profcollege/latex/PfCNotionFonction.tex -2023/04/17 | 154 | graphics/pstricks/contrib/pstricks-add/doc/data/demo2.data -2023/04/17 | 1528 | macros/latex/contrib/profcollege/latex/PfCCartesMentales.tex -2023/04/17 | 15260 | macros/latex/contrib/profcollege/latex/PfCPropor.tex -2023/04/17 | 15234 | macros/latex/contrib/koma-script/doc/plength-tikz.tex -2023/04/17 | 1521 | support/arara/scripts/rules/arara-rule-uplatex.yaml -2023/04/17 | 15210 | macros/latex/contrib/koma-script/doc/letter-example-00-de.pdf -2023/04/17 | 151 | graphics/pstricks/contrib/pstricks-add/doc/data/demo3.data -2023/04/17 | 1516 | support/arara/scripts/rules/arara-rule-platex.yaml -2023/04/17 | 15169 | macros/latex/contrib/profcollege/latex/PfCPapiers.tex -2023/04/17 | 1511 | support/arara/scripts/rules/arara-rule-xetex.yaml -2023/04/17 | 15116 | macros/latex/contrib/koma-script/japanlco.dtx -2023/04/17 | 15072 | macros/latex/contrib/profcollege/latex/PfCFactorisation.tex -2023/04/17 | 1502 | support/arara/scripts/rules/arara-rule-makeindex.yaml -2023/04/17 | 14930 | macros/latex/contrib/profcollege/latex/PfCRepresentationGraphique.tex -2023/04/17 | 14927 | macros/latex/contrib/profcollege/latex/PfCCalculsCroises.tex -2023/04/17 | 1488 | macros/latex/contrib/profcollege/latex/PfCScratch.tex -2023/04/17 | 1477 | support/arara/scripts/rules/arara-rule-asymptote.yaml -2023/04/17 | 1469 | support/arara/scripts/rules/arara-rule-knitr.yaml -2023/04/17 | 146085 | macros/latex/contrib/koma-script/doc/tocbasic-de.tex -2023/04/17 | 1447 | support/arara/scripts/rules/arara-rule-dvisvgm.yaml -2023/04/17 | 14360 | macros/latex/contrib/koma-script/scrkernel-index.dtx -2023/04/17 | 14318 | macros/latex/contrib/koma-script/doc/scrhack-en.tex -2023/04/17 | 1428 | graphics/pstricks/contrib/pstricks-add/README -2023/04/17 | 14241 | macros/latex/contrib/koma-script/doc/common-interleafpage-en.tex -2023/04/17 | 14157 | macros/latex/contrib/profcollege/latex/PfCCAN.tex -2023/04/17 | 14138 | macros/latex/contrib/koma-script/doc/typearea-experts-de.tex -2023/04/17 | 14131 | macros/latex/contrib/profcollege/latex/PfCDessinerRatio.tex -2023/04/17 | 14011 | macros/latex/contrib/profcollege/latex/PfCNonogramme.tex -2023/04/17 | 13786852 | macros/latex/contrib/profcollege.zip -2023/04/17 | 1371 | macros/latex/contrib/koma-script/doc/scrguide-en.tex -2023/04/17 | 1371 | macros/latex/contrib/koma-script/doc/scrguide-de.tex -2023/04/17 | 13558310 | support/arara/scripts/arara.jar -2023/04/17 | 1341 | support/arara/scripts/rules/arara-rule-clean.yaml -2023/04/17 | 13393 | macros/latex/contrib/koma-script/doc/scrlttr2-examples.dtx -2023/04/17 | 1323 | support/arara/scripts/rules/arara-rule-sage.yaml -2023/04/17 | 13221 | macros/latex/contrib/koma-script/scrdoc.cls -2023/04/17 | 13210 | macros/latex/contrib/koma-script/doc/scrdate-en.tex -2023/04/17 | 13094 | macros/latex/contrib/koma-script/doc/scrdate-de.tex -2023/04/17 | 129391 | macros/latex/contrib/koma-script/doc/tocbasic-en.tex -2023/04/17 | 12846316 | graphics/pstricks/contrib/pstricks-add.zip -2023/04/17 | 1283 | support/arara/scripts/rules/arara-rule-pdfcsplain.yaml -2023/04/17 | 1280 | support/arara/scripts/rules/arara-rule-llmk.yaml -2023/04/17 | 1275 | support/arara/scripts/rules/arara-rule-luahbtex.yaml -2023/04/17 | 1274 | support/arara/scripts/rules/arara-rule-dvipspdf.yaml -2023/04/17 | 1273 | support/arara/scripts/rules/arara-rule-metapost.yaml -2023/04/17 | 1271 | support/arara/scripts/rules/arara-rule-csplain.yaml -2023/04/17 | 126816 | macros/latex/contrib/koma-script/scrkernel-typearea.dtx -2023/04/17 | 1267 | support/arara/scripts/rules/arara-rule-pdftex.yaml -2023/04/17 | 1267 | support/arara/scripts/rules/arara-rule-luatex.yaml -2023/04/17 | 1263 | graphics/pstricks/contrib/pstricks-add/Changes -2023/04/17 | 12459825 | graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.pdf -2023/04/17 | 12410 | macros/latex/contrib/koma-script/scrkernel-pseudolengths.dtx -2023/04/17 | 12340 | graphics/pstricks/contrib/pstricks-add/doc/data/olympic.pdf -2023/04/17 | 12139 | macros/latex/contrib/koma-script/doc/common-parmarkup-de.tex -2023/04/17 | 12016 | macros/latex/contrib/koma-script/doc/typearea-experts-en.tex -2023/04/17 | 11943 | macros/latex/contrib/profcollege/latex/PfCModeleBarre.tex -2023/04/17 | 11848 | macros/latex/contrib/koma-script/doc/common-parmarkup-en.tex -2023/04/17 | 11740 | macros/latex/contrib/profcollege/latex/PfCSommeAngles.tex -2023/04/17 | 1165 | support/arara/scripts/rules/arara-rule-uptex.yaml -2023/04/17 | 1161 | support/arara/scripts/rules/arara-rule-ptex.yaml -2023/04/17 | 1154903 | support/arara/doc/arara-manual.pdf -2023/04/17 | 11466 | macros/latex/contrib/profcollege/latex/PfCEcritureUnites.tex -2023/04/17 | 11368 | macros/latex/contrib/koma-script/doc/common-dictum-de.tex -2023/04/17 | 11250 | macros/latex/contrib/profcollege/latex/PfCCompteBon.tex -2023/04/17 | 1109 | support/arara/scripts/rules/arara-rule-xdvipdfmx.yaml -2023/04/17 | 11064 | systems/texlive/tlnet/archive/pdfcrop.r66862.tar.xz -2023/04/17 | 1105 | support/arara/scripts/rules/arara-rule-animate.yaml -2023/04/17 | 1104 | support/arara/scripts/rules/arara-rule-authorindex.yaml -2023/04/17 | 11026 | macros/latex/contrib/profcollege/latex/PfCProprietesDroites.tex -2023/04/17 | 10951 | macros/latex/contrib/profcollege/latex/PfCAutonomie.tex -2023/04/17 | 107653 | macros/latex/contrib/koma-script/scrkernel-tocstyle.dtx -2023/04/17 | 10677 | macros/latex/contrib/koma-script/doc/common-options-de.tex -2023/04/17 | 10633 | macros/latex/contrib/profcollege/latex/PfCEnigmeAire.tex -2023/04/17 | 10632 | macros/latex/contrib/koma-script/scraddr.dtx -2023/04/17 | 1061 | support/arara/scripts/rules/arara-rule-etex.yaml -2023/04/17 | 1056 | macros/latex/contrib/scrwfile/LICENSE.md -2023/04/17 | 10531 | macros/latex/contrib/koma-script/doc/scraddr-de.tex -2023/04/17 | 10530 | macros/latex/contrib/profcollege/latex/PfCCalisson.tex -2023/04/17 | 1049 | support/arara/scripts/rules/arara-rule-tex.yaml -2023/04/17 | 101157 | macros/latex/contrib/koma-script/doc/scrbookreportarticle-experts-de.tex -2023/04/17 | 101021 | macros/latex/contrib/koma-script/doc/typearea-de.tex -2023/04/17 | 10074 | macros/latex/contrib/profcollege/latex/PfCRose.tex -2023/04/17 | 10005 | macros/latex/contrib/koma-script/scrlfile.dtx diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib index d0f61a23b6..0a318a9fdf 100644 --- a/biblio/ctan-bibdata/ctan.bib +++ b/biblio/ctan-bibdata/ctan.bib @@ -1,7 +1,7 @@ %% bib file of all CTAN packages %% (C) Herbert Voß %% -%% created at 23-04-2023, 02:01:07 +%% created at 25-04-2023, 02:00:16 %% %% This file is provided under the terms of the LPPL v1.3 or @@ -3809,8 +3809,8 @@ title = {The \texttt{auctex} package}, subtitle = {Emacs support files for \TeX{}}, author = {{The AUCTeX Team} and Kresten Krab Thorup and Per Abrahamsen}, - date = {2022-02-20}, - version = {13.1}, + date = {2023-04-23}, + version = {13.2}, license = {gpl}, mirror = {https://mirror.ctan.org/support/auctex}, url = {https://ctan.org/pkg/auctex}, @@ -7323,8 +7323,8 @@ title = {The \texttt{biblatex-gb7714-2015} package}, subtitle = {A Bib\LaTeX{} implementation of the GBT7714-2015 bibliography style for Chinese users}, author = {Hu Zhenzhen}, - date = {2023-04-03}, - version = {1.1l}, + date = {2023-04-24}, + version = {1.1m}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015}, url = {https://ctan.org/pkg/biblatex-gb7714-2015}, @@ -8674,8 +8674,8 @@ title = {The \texttt{bithesis} package}, subtitle = {Templates for the Beijing Institute of Technology}, author = {Feng Kaiyu}, - date = {2023-04-14}, - version = {3.5.2}, + date = {2023-04-23}, + version = {3.5.3}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/unicodetex/latex/bithesis}, url = {https://ctan.org/pkg/bithesis}, @@ -36006,8 +36006,8 @@ title = {The \texttt{koma-script} package}, subtitle = {A bundle of versatile classes and packages}, author = {Markus Kohm}, - date = {2023-04-17}, - version = {3.39}, + date = {2023-04-24}, + version = {3.40}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/koma-script}, url = {https://ctan.org/pkg/koma-script}, @@ -38831,8 +38831,8 @@ title = {The \texttt{libertinus-otf} package}, subtitle = {Support for Libertinus OpenType}, author = {Herbert Voß}, - date = {2021-07-23}, - version = {0.29}, + date = {2023-04-24}, + version = {0.30}, license = {lppl1.3}, mirror = {https://mirror.ctan.org/fonts/libertinus-otf}, url = {https://ctan.org/pkg/libertinus-otf}, @@ -52082,7 +52082,7 @@ title = {The \texttt{pgfornament-han} package}, subtitle = {pgfornament library for Chinese traditional motifs and patterns}, author = {LianTze Lim}, - date = {2019-08-11}, + date = {2023-04-23}, version = {}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/graphics/pgf/contrib/pgfornament-han}, @@ -52382,8 +52382,8 @@ title = {The \texttt{photobook} package}, subtitle = {A document class for typesetting photo books}, author = {Alex A. Naanou}, - date = {2023-04-19}, - version = {0.1.19}, + date = {2023-04-24}, + version = {0.1.20}, license = {bsd3}, mirror = {https://mirror.ctan.org/macros/latex/contrib/photobook}, url = {https://ctan.org/pkg/photobook}, @@ -54095,16 +54095,18 @@ title = {The \texttt{preview} package}, subtitle = {Extract bits of a \LaTeX{} source for output}, author = {David Kastrup and {The AUCTeX Team}}, - date = {2022-02-20}, - version = {13.1}, + date = {2023-04-23}, + version = {13.2}, license = {gpl3}, mirror = {https://mirror.ctan.org/macros/latex/contrib/preview}, url = {https://ctan.org/pkg/preview}, annotation = {The package is a free-standing part of the - bundle. The - package provides the support needs, - when it chooses the matter it will preview. The output may reasonably be expected - to have other uses, as in html translators, etc.}, + bundle. + The package provides the support + needs, + when it chooses the matter it will preview. + The output may reasonably be expected to have other uses, + as in html translators, etc.}, } @manual{ctan-prftree, @@ -60160,8 +60162,8 @@ title = {The \texttt{scrartcl} package}, subtitle = {Koma-Script ‘article’ class}, author = {Markus Kohm}, - date = {2023-04-17}, - version = {3.39}, + date = {2023-04-24}, + version = {3.40}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/koma-script}, url = {https://ctan.org/pkg/scrartcl}, @@ -60204,8 +60206,8 @@ title = {The \texttt{scrbase} package}, subtitle = {Provide basic features for KOMA-Script}, author = {Markus Kohm}, - date = {2023-04-17}, - version = {3.39}, + date = {2023-04-24}, + version = {3.40}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/koma-script}, url = {https://ctan.org/pkg/scrbase}, @@ -60215,8 +60217,8 @@ title = {The \texttt{scrbook} package}, subtitle = {Koma-Script ‘book’ class}, author = {Markus Kohm}, - date = {2023-04-17}, - version = {3.39}, + date = {2023-04-24}, + version = {3.40}, license = {lppl1.3}, mirror = {https://mirror.ctan.org/macros/latex/contrib/koma-script}, url = {https://ctan.org/pkg/scrbook}, @@ -60226,8 +60228,8 @@ title = {The \texttt{scrdate} package}, subtitle = {Calendar date operations}, author = {Markus Kohm}, - date = {2023-04-17}, - version = {3.39}, + date = {2023-04-24}, + version = {3.40}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/koma-script}, url = {https://ctan.org/pkg/scrdate}, @@ -60273,8 +60275,8 @@ title = {The \texttt{scrextend} package}, subtitle = {Use of components of KOMA-Script by other packages}, author = {Markus Kohm}, - date = {2023-04-17}, - version = {3.39}, + date = {2023-04-24}, + version = {3.40}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/koma-script}, url = {https://ctan.org/pkg/scrextend}, @@ -60366,8 +60368,8 @@ title = {The \texttt{scrjura} package}, subtitle = {Koma-Script support for lawyers, etc}, author = {Markus Kohm}, - date = {2023-04-17}, - version = {3.39}, + date = {2023-04-24}, + version = {3.40}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/koma-script}, url = {https://ctan.org/pkg/scrjura}, @@ -60399,8 +60401,8 @@ title = {The \texttt{scrlayer-scrpage} package}, subtitle = {Define and manage page styles}, author = {Markus Kohm}, - date = {2023-04-17}, - version = {3.39}, + date = {2023-04-24}, + version = {3.40}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/koma-script}, url = {https://ctan.org/pkg/scrlayer-scrpage}, @@ -60420,8 +60422,8 @@ title = {The \texttt{scrlayer} package}, subtitle = {Manage text ‘layers’ within Koma-Script}, author = {Markus Kohm}, - date = {2023-04-17}, - version = {3.39}, + date = {2023-04-24}, + version = {3.40}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/koma-script}, url = {https://ctan.org/pkg/scrlayer}, @@ -60435,8 +60437,8 @@ title = {The \texttt{scrletter} package}, subtitle = {Letter extention to KOMA-Script classes}, author = {Markus Kohm}, - date = {2023-04-17}, - version = {3.39}, + date = {2023-04-24}, + version = {3.40}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/koma-script}, url = {https://ctan.org/pkg/scrletter}, @@ -60446,8 +60448,8 @@ title = {The \texttt{scrlfile} package}, subtitle = {Installation control for koma-script packages}, author = {Markus Kohm}, - date = {2023-04-17}, - version = {3.39}, + date = {2023-04-24}, + version = {3.40}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/koma-script}, url = {https://ctan.org/pkg/scrlfile}, @@ -60457,8 +60459,8 @@ title = {The \texttt{scrlttr2} package}, subtitle = {Koma-Script ‘letter’ class}, author = {Markus Kohm}, - date = {2023-04-17}, - version = {3.39}, + date = {2023-04-24}, + version = {3.40}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/koma-script}, url = {https://ctan.org/pkg/scrlttr2}, @@ -60490,8 +60492,8 @@ title = {The \texttt{scrreprt} package}, subtitle = {Koma-Script ‘report’ class}, author = {Markus Kohm}, - date = {2023-04-17}, - version = {3.39}, + date = {2023-04-24}, + version = {3.40}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/koma-script}, url = {https://ctan.org/pkg/scrreprt}, @@ -60501,8 +60503,8 @@ title = {The \texttt{scrtime} package}, subtitle = {Show the time of a \LaTeX{} run}, author = {Markus Kohm}, - date = {2023-04-17}, - version = {3.39}, + date = {2023-04-24}, + version = {3.40}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/koma-script}, url = {https://ctan.org/pkg/scrtime}, @@ -67924,8 +67926,8 @@ title = {The \texttt{textcsc} package}, subtitle = {Simple commands for caps-to-small-caps text}, author = {Elijah Z Granet}, - date = {2022-11-04}, - version = {1.0.1}, + date = {2023-04-24}, + version = {1.1.0}, license = {lppl1.3,cc-by-sa-3}, mirror = {https://mirror.ctan.org/macros/unicodetex/latex/textcsc}, url = {https://ctan.org/pkg/textcsc}, @@ -69042,8 +69044,8 @@ title = {The \texttt{tikz-nfold} package}, subtitle = {Triple, quadruple, and n-fold paths with TikZ}, author = {Jonathan Schulz}, - date = {2023-04-08}, - version = {0.0.1}, + date = {2023-04-24}, + version = {0.1.0}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/graphics/pgf/contrib/tikz-nfold}, url = {https://ctan.org/pkg/tikz-nfold}, @@ -69051,7 +69053,8 @@ and also fixes some graphical issues with TikZ’ paths, used e.g. in arrows with an tip. It is also compatible with , - adding support for triple and higher arrows.}, + adding support for triple and higher arrows. + Macros to offset arbitrary paths are included as well.}, } @manual{ctan-tikz-opm, @@ -70193,8 +70196,8 @@ title = {The \texttt{tocbasic} package}, subtitle = {Management of tables/lists of contents (and the like)}, author = {Markus Kohm}, - date = {2023-04-17}, - version = {3.39}, + date = {2023-04-24}, + version = {3.40}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/koma-script}, url = {https://ctan.org/pkg/tocbasic}, @@ -71709,8 +71712,8 @@ title = {The \texttt{typearea} package}, subtitle = {Set page margins}, author = {Markus Kohm and Frank Neukam}, - date = {2023-04-17}, - version = {3.39}, + date = {2023-04-24}, + version = {3.40}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/koma-script}, url = {https://ctan.org/pkg/typearea}, diff --git a/biblio/ctan-bibdata/ctan.pdf b/biblio/ctan-bibdata/ctan.pdf Binary files differindex 26ed58ab70..54d76c5d15 100644 --- a/biblio/ctan-bibdata/ctan.pdf +++ b/biblio/ctan-bibdata/ctan.pdf diff --git a/fonts/libertinus-otf/Changes b/fonts/libertinus-otf/Changes index cb9ca0a3f0..39bda5911c 100644 --- a/fonts/libertinus-otf/Changes +++ b/fonts/libertinus-otf/Changes @@ -1,3 +1,5 @@ +0.30 2023-04-24 - change name of internal kerning definition to prevent + mismatch with mykern, defined by a user 0.29 2021-07-23 - apply defaultfeatures only to \rmfamily and \sffamily 0.28 2021-01-11 - added support for StylisticSet 08 (slanted integrals) 0.27 2020-10-13 - fix bug for missing + sign in RawFeature=+ssxx diff --git a/fonts/libertinus-otf/doc/libertinus-otf-doc.pdf b/fonts/libertinus-otf/doc/libertinus-otf-doc.pdf Binary files differindex c701ec0f20..bc8ce6d089 100644 --- a/fonts/libertinus-otf/doc/libertinus-otf-doc.pdf +++ b/fonts/libertinus-otf/doc/libertinus-otf-doc.pdf diff --git a/fonts/libertinus-otf/doc/libertinus-otf-doc.tex b/fonts/libertinus-otf/doc/libertinus-otf-doc.tex index c1147a4bbb..81b54c4259 100644 --- a/fonts/libertinus-otf/doc/libertinus-otf-doc.tex +++ b/fonts/libertinus-otf/doc/libertinus-otf-doc.tex @@ -1,4 +1,4 @@ -%% $Id: libertinus-otf-doc.tex 1166 2020-04-25 17:58:36Z herbert $ +%% $Id: libertinus-otf-doc.tex 710 2023-04-24 12:05:58Z herbert $ \listfiles \documentclass[ngerman,spanish,polish,english,a4paper]{article} \usepackage{libertinus-otf} @@ -17,8 +17,9 @@ \newcommand\Macro[1]{\texttt{\textbackslash#1}} \newcommand\textstyleVariable[1]{\texttt{#1}} \newcommand\textgerman[1]{\foreignlanguage{ngerman}{\texttt{#1}}} -\usepackage{dtk-extern} -\setkeys{dtk}{lstOptions={basicstyle=\Mono\small,columns=fixed}} +\usepackage{hvextern} +\setkeys{hv}{lstOptions={basicstyle=\Mono\small,columns=fixed}} +\setkeys{hv}{moveToExampleDir,ExampleDir=Examples,showFilename=false,verbose} \usepackage[imakeidx]{xindex} \makeindex[title=Index] @@ -326,7 +327,7 @@ for example \texttt{+ss08} for different integral signs: % grfOptions={width=0.5\linewidth}, frame,compiler=lualatex, crop, - force=true, + force=false, runs=2,code,docType=latex, frame, % showFilename, @@ -352,7 +353,7 @@ The default: $\int_1^\infty\frac1{x^2}\symup d x = 1$ % grfOptions={width=0.5\linewidth}, frame,compiler=lualatex, crop, - force=true, + force=false, runs=2,code,docType=latex, frame, % showFilename, @@ -770,7 +771,7 @@ defaultfeatures & valid only for \rmfamily and \sffamily\\ frame, compiler=lualatex, crop, - force=true, + force=false, runs=2, code, docType=latex, @@ -794,7 +795,7 @@ defaultfeatures & valid only for \rmfamily and \sffamily\\ % grfOptions={width=0.5\linewidth}, compiler=lualatex, crop, - force=true, + force=false, runs=1, code, docType=latex, @@ -820,7 +821,7 @@ lstOptions={columns=flexible} frame, compiler=lualatex, crop, - force=true, + force=false, runs=1, code, docType=latex, @@ -850,7 +851,7 @@ lstOptions={columns=flexible} % grfOptions={width=0.5\linewidth}, frame,compiler=lualatex, crop, - force=true, + force=false, runs=2,code,docType=latex, frame, % showFilename, @@ -879,7 +880,7 @@ a global change of capitals to small caps. % grfOptions={width=0.5\linewidth}, frame,compiler=lualatex, crop, - force=true, + force=false, runs=2,code,docType=latex, frame, % showFilename, @@ -913,7 +914,7 @@ a global change of capitals to small caps. % grfOptions={width=0.5\linewidth}, frame,compiler=lualatex, crop, - force=true, + force=false, runs=2,code,docType=latex, frame, % showFilename, @@ -947,7 +948,7 @@ a global change of capitals to small caps relative to the current group. % grfOptions={width=0.5\linewidth}, frame,compiler=lualatex, crop, - force=true, + force=false, runs=2,code,docType=latex, frame, % showFilename, @@ -994,7 +995,7 @@ a global change of case sensitive forms. % grfOptions={width=0.5\linewidth}, frame,compiler=lualatex, crop, - force=true, + force=false, runs=2,code,docType=latex, frame, % showFilename, @@ -1030,7 +1031,7 @@ a global change of case sensitive forms. % grfOptions={width=0.5\linewidth}, frame,compiler=lualatex, crop, - force=true, + force=false, runs=2,code,docType=latex, frame, % showFilename, @@ -1069,7 +1070,7 @@ the alternate characters. % grfOptions={width=0.5\linewidth}, frame,compiler=lualatex, crop, - force=true, + force=false, runs=2,code,docType=latex, frame, % showFilename, @@ -1101,7 +1102,7 @@ and \textit{text} the local argument: % grfOptions={width=0.5\linewidth}, frame,compiler=lualatex, crop, - force=true, + force=false, runs=2,code,docType=latex, frame, % showFilename, @@ -1132,7 +1133,7 @@ is again the number of the set. % grfOptions={width=0.5\linewidth}, frame,compiler=lualatex, crop, - force=true, + force=false, runs=2,code,docType=latex, frame, % showFilename, @@ -1153,7 +1154,7 @@ is again the number of the set. \begin{externalDocument}[ frame,compiler=lualatex, crop, - force=true, + force=false, runs=2,code,docType=latex, frame, lstOptions={columns=flexible}]{Libertinus} @@ -1172,7 +1173,7 @@ JKR \LSS02 JKR % grfOptions={width=0.5\linewidth}, frame,compiler=lualatex, crop, - force=true, + force=false, runs=2,code,docType=latex, frame, % showFilename, @@ -1195,7 +1196,7 @@ JKR \LSS02 JKR % grfOptions={width=0.5\linewidth}, frame,compiler=lualatex, crop, - force=true, + force=false, runs=2,code,docType=latex, frame, % showFilename, @@ -1218,7 +1219,7 @@ W {\LSS05 W} \qquad \WikipediaW \qquad \Wikipedia % grfOptions={width=0.5\linewidth}, frame,compiler=lualatex, crop, - force=true, + force=false, runs=2,code,docType=latex, frame, % showFilename, @@ -1246,7 +1247,7 @@ setting relative to the current group. % grfOptions={width=0.5\linewidth}, frame,compiler=lualatex, crop, - force=true, + force=false, runs=2,code,docType=latex, frame, % showFilename, @@ -1277,7 +1278,7 @@ setting relative to the current group. % grfOptions={width=0.5\linewidth}, frame,compiler=lualatex, crop, - force=true, + force=false, runs=2,code,docType=latex, frame, % showFilename, @@ -1368,8 +1369,9 @@ e f g h i j k l m n o p q r s t u v w x y z \{ | \} \textasciitilde \LibKey\LKeyEnde; \LibKey\LKeyWin; \LibKey\LKeyMenu; -%\LibKey\LKeyTUX; +\LibKey\LKeyTux; \LibKey\LKeyCtrl; +\LibKey\LKeyCommand; \LibKey\LKeyOptionKey; \LibKey\LKeyBack; \LibKey\LKeyUp; @@ -1532,7 +1534,7 @@ a Libertinus font, one can use a predefinded command: \begin{externalDocument}[ frame,compiler=lualatex, crop, - force=true, + force=false, runs=2,code,docType=latex, frame, lstOptions={columns=flexible}]{Libertinus} @@ -2226,7 +2228,7 @@ AÌaÌŽÌŽ … \rmfamily \begin{multicols}{5} \begin{luacode*} - local f = fontloader.open('/usr/local/texlive/texmf-dist/fonts/opentype/public/libertinus-fonts/LibertinusSerif-Regular.otf') + local f = fontloader.open('/usr/local/texlive/current/texmf-dist/fonts/opentype/public/libertinus-fonts/LibertinusSerif-Regular.otf') print("Max glyphs: "..f.glyphmax) local glyphs = {} for i = 0, f.glyphmax - 1 do @@ -2237,13 +2239,13 @@ AÌaÌŽÌŽ … end table.sort(glyphs, function (a,b) return (a.unicode < b.unicode) end) for i = 1, #glyphs do - tex.sprint(glyphs[i].unicode .. ': ') - if (glyphs[i].unicode > 0) then - tex.sprint('{\\char' .. glyphs[i].unicode .. '}'); - end - tex.sprint(' {\\scriptsize (') - tex.sprint(-2, glyphs[i].name) - tex.sprint(')}\\\\') + tex.sprint(glyphs[i].unicode .. ': ') + if (glyphs[i].unicode > 0) then + tex.sprint('{\\char' .. glyphs[i].unicode .. '}'); + end + tex.sprint(' {\\scriptsize (') + tex.sprint(-2, glyphs[i].name) + tex.sprint(')}\\\\') end fontloader.close(f) \end{luacode*} @@ -2252,7 +2254,4 @@ AÌaÌŽÌŽ … \printindex - - - \end{document} diff --git a/fonts/libertinus-otf/latex/libertinus-otf.sty b/fonts/libertinus-otf/latex/libertinus-otf.sty index 5e9d673ff0..e259070f14 100644 --- a/fonts/libertinus-otf/latex/libertinus-otf.sty +++ b/fonts/libertinus-otf/latex/libertinus-otf.sty @@ -1,4 +1,4 @@ -%% $Id: libertinus-otf.sty 1166 2020-04-25 17:58:36Z herbert $ +%% $Id: libertinus-otf.sty 710 2023-04-24 12:05:58Z herbert $ %% %% This file is distributed under the terms of the LaTeX Project Public %% License from CTAN archives in directory macros/latex/base/lppl.txt. @@ -8,11 +8,23 @@ % Copyright 2020 Herbert Voss hvoss@tug.org % \ProvidesPackage{libertinus-otf}[% - 2021/07/23 v. 0.29 (Herbert Voss) Supports libertinus fonts for lualatex and xelatex.] + 2023/04/24 v. 0.30 (Herbert Voss) Supports libertinus fonts for lualatex and xelatex.] \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp} %\RequirePackage[no-math]{fontspec} +\ifluatex + \directlua { + fonts.handlers.otf.addfeature { + name = "hv-kern", + type = "kern", + data = { + ["T"] = { ["i"] = -80 }, + }, + } + } +\fi + \newif\iflibertinus@mono \libertinus@monotrue \newif\iflibertinus@nomath \libertinus@nomathfalse \newif\iflibertinus@lining \libertinus@liningtrue @@ -52,8 +64,9 @@ \DeclareOptionX{ScaleTT}{\renewcommand*{\libertinusTT@scale}{#1}} \DeclareOptionX{StretchTT}{\renewcommand*{\libertinusTT@stretch}{#1}} -\def\libertinus@defaultfeatures{} -\DeclareOptionX{defaultfeatures}{\def\libertinus@defaultfeatures{#1}} +\def\libertinus@defaultfeatures{RawFeature={+hv-kern}} +\DeclareOptionX{defaultfeatures}{\edef\libertinus@defaultfeatures{\libertinus@defaultfeatures,#1}} +\DeclareOptionX*{\PassOptionsToPackage{\CurrentOption}{fontspec}} \ProcessOptionsX\relax @@ -431,9 +444,11 @@ \ifluatex \newfontface\LibertinusKeyboard{LibertinusKeyboard-Regular.otf}[RawFeature=+liga] + \newfontface\BiolinumKeyboard{LinBiolinum_K.otf}[RawFeature=+liga] % \hyphenchar\LibertinusKeyboard=-1 \else \font\LibertinusKeyboard="[LibertinusKeyboard-Regular.otf]" + \font\BiolinumKeyboard="[LinBiolinum_K.otf]" \fi \newfontfamily\LibertinusDisplay{LibertinusSerifDisplay-Regular.otf} \newfontfamily\Libertinusinitials{LibertinusSerifInitials-Regular.otf} @@ -463,10 +478,11 @@ \let\LKeySpace\LKeyLeer \DeclareRobustCommand*\LKeyEsc{\BiolinumKeyGlyph{Esc}} \DeclareRobustCommand*\LKeyEnde{\BiolinumKeyGlyph{Ende}} -%\DeclareRobustCommand*\LKeyTux{\BiolinumKeyGlyph{Tux}} +\DeclareRobustCommand*\LKeyTux{\biolinumKeyGlyph{"E00E}} \DeclareRobustCommand*\LKeyWin{\BiolinumKeyGlyph{Windows}} \DeclareRobustCommand*\LKeyMenu{\biolinumKeyGlyph{"E104}} \DeclareRobustCommand*\LKeyCtrl{\BiolinumKeyGlyph{Ctrl}} +\DeclareRobustCommand*\LKeyCommand{\biolinumKeyGlyph{"2318}} \DeclareRobustCommand*\LKeyOptionKey{\BiolinumKeyGlyph{Fn}} \DeclareRobustCommand*\LKeyBack{\BiolinumKeyGlyph{Back}} \DeclareRobustCommand*\LKeyUp{\biolinumKeyGlyph{"2191}} diff --git a/graphics/pgf/contrib/tikz-nfold/README.md b/graphics/pgf/contrib/tikz-nfold/README.md index 305b8edecb..97d6549f60 100644 --- a/graphics/pgf/contrib/tikz-nfold/README.md +++ b/graphics/pgf/contrib/tikz-nfold/README.md @@ -1,5 +1,5 @@ # tikz-nfold -## Version 0.0.1 +## Version 0.1.0 This library adds higher-order paths to [TikZ](https://ctan.org/pkg/pgf) and also fixes some graphical issues with TikZ' `double` paths, used e.g. in wide arrows. It is also compatible with [tikz-cd](https://ctan.org/pkg/tikz-cd), adding support for triple and higher arrows. See the [documentation](tikz-nfold-doc.pdf) for full details. diff --git a/graphics/pgf/contrib/tikz-nfold/pgflibrarybezieroffset.code.tex b/graphics/pgf/contrib/tikz-nfold/pgflibrarybezieroffset.code.tex index e3391ed92c..7d9a86312f 100644 --- a/graphics/pgf/contrib/tikz-nfold/pgflibrarybezieroffset.code.tex +++ b/graphics/pgf/contrib/tikz-nfold/pgflibrarybezieroffset.code.tex @@ -16,12 +16,6 @@ % This work consists of the files pgflibrarybezieroffset.code.tex, % tikzlibrarynfold.code.tex, tikz-nfold-doc.tex, and tikz-nfold-doc.pdf. - -% stores the current \pgf@x and \pgf@y in #1 -\def\pgfstorepoint#1{\edef#1{\noexpand\pgfpoint{\the\pgf@x}{\the\pgf@y}}} -% global version in case we need it: -\def\pgfglobalstorepoint#1{\xdef#1{\noexpand\pgfpoint{\the\pgf@x}{\the\pgf@y}}} - % Split a Bezier curve (de Casteljau's algorithm) % #1 = time (between 0 and 1) % #2-#5: control points @@ -32,19 +26,16 @@ % this is partially implemented in some pgf file, possibly decorations or basic paths. % But maybe I will need the general case in the future, maybe with some advanced fully simple detection. % Leave it in for now -\newcommand{\pgf@splitbezier}[5]{ +\def\pgf@splitbezier#1#2#3#4#5{% % based on pgfcorepoints.code.tex, \pgfpointcurveattime - \pgfmathparse{#1}% - \let\pgf@time@s=\pgfmathresult% - \global\pgf@x=\pgfmathresult pt% - \global\pgf@x=-\pgf@x% + \pgfmathsetmacro\pgf@time@s{#1}% + \pgf@x=-\pgf@time@s pt% \advance\pgf@x by 1pt% \edef\pgf@time@t{\pgf@sys@tonumber{\pgf@x}}% % P^0_3 - \pgf@process{#5}% + \pgfextract@process\pgf@splitbezier@ii@iv{#5}% \pgf@xc=\pgf@x% \pgf@yc=\pgf@y% - \pgfstorepoint{\pgf@splitbezier@ii@iv} % P^0_2 \pgf@process{#4}% \pgf@xb=\pgf@x% @@ -54,90 +45,123 @@ \pgf@xa=\pgf@x% \pgf@ya=\pgf@y% % P^0_0 - \pgf@process{#2}% - \pgfstorepoint{\pgf@splitbezier@i@i} + \pgfextract@process\pgf@splitbezier@i@i{#2}% % First iteration: % P^1_0 - \global\pgf@x=\pgf@time@t\pgf@x\global\advance\pgf@x by\pgf@time@s\pgf@xa% - \global\pgf@y=\pgf@time@t\pgf@y\global\advance\pgf@y by\pgf@time@s\pgf@ya% - \pgfstorepoint{\pgf@splitbezier@i@ii} + \pgf@x=\pgf@time@t\pgf@x\advance\pgf@x by\pgf@time@s\pgf@xa% + \pgf@y=\pgf@time@t\pgf@y\advance\pgf@y by\pgf@time@s\pgf@ya% + \pgfextract@process\pgf@splitbezier@i@ii{}% % P^1_1 \pgf@xa=\pgf@time@t\pgf@xa\advance\pgf@xa by\pgf@time@s\pgf@xb% \pgf@ya=\pgf@time@t\pgf@ya\advance\pgf@ya by\pgf@time@s\pgf@yb% % P^1_2 \pgf@xb=\pgf@time@t\pgf@xb\advance\pgf@xb by\pgf@time@s\pgf@xc% \pgf@yb=\pgf@time@t\pgf@yb\advance\pgf@yb by\pgf@time@s\pgf@yc% - \edef\pgf@splitbezier@ii@iii{\noexpand\pgfpoint{\the\pgf@xb}{\the\pgf@yb}} + \edef\pgf@splitbezier@ii@iii{\noexpand\pgfqpoint{\the\pgf@xb}{\the\pgf@yb}}% % P^2_0 - \global\pgf@x=\pgf@time@t\pgf@x\global\advance\pgf@x by\pgf@time@s\pgf@xa% - \global\pgf@y=\pgf@time@t\pgf@y\global\advance\pgf@y by\pgf@time@s\pgf@ya% - \pgfstorepoint{\pgf@splitbezier@i@iii} + \pgf@x=\pgf@time@t\pgf@x\advance\pgf@x by\pgf@time@s\pgf@xa% + \pgf@y=\pgf@time@t\pgf@y\advance\pgf@y by\pgf@time@s\pgf@ya% + \pgfextract@process\pgf@splitbezier@i@iii{}% % P^2_1 \pgf@xa=\pgf@time@t\pgf@xa\advance\pgf@xa by\pgf@time@s\pgf@xb% \pgf@ya=\pgf@time@t\pgf@ya\advance\pgf@ya by\pgf@time@s\pgf@yb% - \edef\pgf@splitbezier@ii@ii{\noexpand\pgfpoint{\the\pgf@xa}{\the\pgf@ya}} + \edef\pgf@splitbezier@ii@ii{\noexpand\pgfqpoint{\the\pgf@xa}{\the\pgf@ya}}% % P^3_0 - \global\pgf@x=\pgf@time@t\pgf@x\global\advance\pgf@x by\pgf@time@s\pgf@xa% - \global\pgf@y=\pgf@time@t\pgf@y\global\advance\pgf@y by\pgf@time@s\pgf@ya% - \pgfstorepoint{\pgf@splitbezier@i@iv} - \pgfstorepoint{\pgf@splitbezier@ii@i} + \pgf@x=\pgf@time@t\pgf@x\advance\pgf@x by\pgf@time@s\pgf@xa% + \pgf@y=\pgf@time@t\pgf@y\advance\pgf@y by\pgf@time@s\pgf@ya% + \pgfextract@process\pgf@splitbezier@i@iv{}% + \let\pgf@splitbezier@ii@i\pgf@splitbezier@i@iv } % computes the cross product and puts it into \pgfmathresult -\newcommand{\pgfcrossproduct}[2]{ - \pgf@process{#1}% - \pgf@xa=\pgf@x% - \pgf@ya=\pgf@y% - \pgf@process{#2}% - \pgfmathparse{\pgf@xa*\pgf@y-\pgf@ya*\pgf@x}% +\def\pgfmathcrossproduct#1#2{% + \begingroup + \pgf@process{#1}% + \pgf@xa=\pgf@x% + \pgf@ya=\pgf@y% + \pgf@process{#2}% + \pgf@y=\pgf@sys@tonumber\pgf@xa\pgf@y + \advance\pgf@y by -\pgf@sys@tonumber\pgf@ya\pgf@x + \pgfmath@returnone\pgf@y + \endgroup } -\newcommand{\pgfdotproduct}[2]{ - \pgf@process{#1}% - \pgf@xa=\pgf@x% - \pgf@ya=\pgf@y% - \pgf@process{#2}% - \pgfmathparse{\pgf@xa*\pgf@x+\pgf@ya*\pgf@y}% +\def\pgfmathdotproduct#1#2{% + \begingroup + \pgf@process{#1}% + \pgf@xa=\pgf@x% + \pgf@ya=\pgf@y% + \pgf@process{#2}% + \pgf@x=\pgf@sys@tonumber\pgf@xa\pgf@x + \advance\pgf@x by \pgf@sys@tonumber\pgf@ya\pgf@y + \pgfmath@returnone\pgf@x + \endgroup } -\newcommand{\pgfcrossdot}[2]{ - \pgf@process{#1}% - \pgf@xa=\pgf@x% - \pgf@ya=\pgf@y% - \pgf@process{#2}% - \pgfmathsetlengthmacro{\pgf@tmp@dot}{\pgf@xa*\pgf@x+\pgf@ya*\pgf@y}% - \pgfmathsetlengthmacro{\pgf@tmp@cross}{\pgf@xa*\pgf@y-\pgf@ya*\pgf@x}% +\def\pgfmathcrossdot#1#2{% + \begingroup + \pgf@process{#1}% + \pgf@xa=\pgf@x% + \pgf@ya=\pgf@y% + \pgf@process{#2}% + \pgf@xb=\pgf@sys@tonumber\pgf@xa\pgf@x + \pgf@yb=\pgf@sys@tonumber\pgf@xa\pgf@y + \advance\pgf@xb by \pgf@sys@tonumber\pgf@ya\pgf@y + \advance\pgf@yb by -\pgf@sys@tonumber\pgf@ya\pgf@x + \edef\pgf@temp{% + \edef\noexpand\pgf@tmp@dot{\pgf@sys@tonumber\pgf@xb}% + \edef\noexpand\pgf@tmp@cross{\pgf@sys@tonumber\pgf@yb}% + }% + \expandafter + \endgroup\pgf@temp } - +% Calculates abs(\pgf@x) + abs(\pgf@y) in #1 +\def\pgfpointtaxicabnorm#1{% + \ifdim\pgf@x<0pt + #1=-\pgf@x + \else + #1=\pgf@x + \fi + \ifdim\pgf@y<0pt + \advance#1 by -\pgf@y + \else + \advance#1 by \pgf@y + \fi +} % Computes the normalised tangents of a given Bezier curve and stores them in \pgf@tmp@tang@i and \pgf@tmp@tang@ii. +% Also computes the angles and stores them in \pgf@tmp@angle@i and \pgf@tmp@angle@ii. % All degenerate cases are covered. For a triple degenerate curve (all points equal), the vector (1,0) is returned. -\newcommand{\pgf@offset@compute@tangents}[4]{ - \pgfpointdiff{#1}{#2} % unintuitively, this is PTii - PTi - \pgfmathparse{abs(\pgf@x) + abs(\pgf@y)} - \ifdim\pgfmathresult pt<0.1pt\relax +\def\pgf@offset@compute@tangents#1#2#3#4{% + \pgf@process{\pgfpointdiff{#1}{#2}}% unintuitively, this is PTii - PTi + \pgfpointtaxicabnorm\pgf@xa + \ifdim\pgf@xa<0.1pt\relax % edge case: first point and first control point are equal - \pgfpointdiff{#1}{#3} - \pgfmathparse{abs(\pgf@x) + abs(\pgf@y)} - \ifdim\pgfmathresult pt<0.1pt\relax + \pgf@process{\pgfpointdiff{#1}{#3}}% + \pgfpointtaxicabnorm\pgf@xa + \ifdim\pgf@xa<0.1pt\relax % edge case: first three points are equal - \pgfpointdiff{#1}{#4} + \pgf@process{\pgfpointdiff{#1}{#4}}% \fi \fi - \pgfpointnormalised{} - \pgfstorepoint\pgf@tmp@tang@i - \pgfpointdiff{#3}{#4} - \pgfmathparse{abs(\pgf@x) + abs(\pgf@y)} - \ifdim\pgfmathresult pt<0.1pt\relax - \pgfpointdiff{#2}{#4} - \pgfmathparse{abs(\pgf@x) + abs(\pgf@y)} - \ifdim\pgfmathresult pt<0.1pt\relax - \pgfpointdiff{#1}{#4} + \pgfextract@process\pgf@tmp@tang@i{% + \pgfpointnormalised{}% + % \pgfpointnormalised stores the angle of the vector in \pgf@tmp + \global\let\pgf@nfold@tmp\pgf@tmp% + }% + \let\pgf@tmp@angle@i\pgf@nfold@tmp% + \pgf@process{\pgfpointdiff{#3}{#4}}% + \pgfpointtaxicabnorm\pgf@xa + \ifdim\pgf@xa<0.1pt\relax + \pgf@process{\pgfpointdiff{#2}{#4}}% + \pgfpointtaxicabnorm\pgf@xa + \ifdim\pgf@xa<0.1pt\relax + \pgf@process{\pgfpointdiff{#1}{#4}}% \fi \fi - \pgfpointnormalised{} - \pgfstorepoint\pgf@tmp@tang@ii + \pgfextract@process\pgf@tmp@tang@ii{\pgfpointnormalised{}\global\let\pgf@nfold@tmp\pgf@tmp}% + \let\pgf@tmp@angle@ii\pgf@nfold@tmp% } @@ -145,73 +169,89 @@ % Offsetting a simple section % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newcommand{\pgf@offset@bezier@segment}[5]{% - % TODO would it make sense to use \pgf@process here? +\def\pgf@offset@bezier@segment#1#2#3#4#5{% % normalise tangents and normals; this avoids overflow issues later, and we need % the normal vector to be of length 1 anyway - \pgf@offset@compute@tangents{#1}{#2}{#3}{#4} + \pgf@offset@compute@tangents{#1}{#2}{#3}{#4}% % offset A1 % compute the normal \pgf@tmp@tang@i - \pgf@xa=\pgf@x - \pgf@x=-\pgf@y - \pgf@y=\pgf@xa - \pgfstorepoint\pgf@tmp@normal@i - % Leaving this parameter empty amounts to working directly on the register - \pgfpointadd{\pgfpointscale{#5}{}}{#1} - \pgfstorepoint{\pgf@bezier@offset@i} + \edef\pgf@tmp@normal@i{\noexpand\pgfqpoint{-\the\pgf@y}{\the\pgf@x}}% + \pgfextract@process\pgf@bezier@offset@i + {\pgfpointadd{\pgfpointscale{#5}{\pgf@tmp@normal@i}}{#1}}% % offset A4 \pgf@tmp@tang@ii - \pgf@xa=\pgf@x - \pgf@x=-\pgf@y - \pgf@y=\pgf@xa - \pgfstorepoint\pgf@tmp@normal@ii - \pgfpointadd{\pgfpointscale{#5}{}}{#4} - \pgfstorepoint\pgf@bezier@offset@iv + \edef\pgf@tmp@normal@ii{\noexpand\pgfqpoint{-\the\pgf@y}{\the\pgf@x}}% + \pgfextract@process\pgf@bezier@offset@iv + {\pgfpointadd{\pgfpointscale{#5}{\pgf@tmp@normal@ii}}{#4}}% % now compute A'_2 and A'_3 - \pgfpointdiff{#1}{#4} - \pgfmathsetmacro{\pgf@tmp@secantlen}{veclen(\pgf@x,\pgf@y)} + \pgf@process{\pgfpointdiff{#1}{#4}}% + \pgfmathveclen@{\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y}% + \let\pgf@tmp@secantlen\pgfmathresult \ifdim\pgf@tmp@secantlen pt<0.1pt\relax % Edge case: Either the curve is degenerate to a point or it is not simple. % Either way we offset A1 and A4, and preserve the vectors A1A2 and A3A4. - \pgfwarning{pgf-offset: first and last point are too close, expect glitches} - \pgfpointadd{\pgf@bezier@offset@i}{\pgfpointdiff{#1}{#2}} - \pgfstorepoint\pgf@bezier@offset@ii - \pgfpointadd{\pgf@bezier@offset@iv}{\pgfpointdiff{#4}{#3}} - \pgfstorepoint\pgf@bezier@offset@iii + \pgfutil@packagewarning{tikz-nfold}{first and last point are too close, expect glitches}% + \pgfextract@process\pgf@bezier@offset@ii + {\pgfpointadd{\pgf@bezier@offset@i}{\pgfpointdiff{#1}{#2}}}% + \pgfextract@process\pgf@bezier@offset@iii + {\pgfpointadd{\pgf@bezier@offset@iv}{\pgfpointdiff{#4}{#3}}}% \else - \pgfpointnormalised{} - \pgfstorepoint\pgf@tmp@secant - \pgfcrossdot{}{\pgf@tmp@tang@ii} - \ifdim\pgf@tmp@dot<.5pt\relax% + \pgfextract@process\pgf@tmp@secant{\pgfpointnormalised{}}% + \pgfmathcrossdot{}{\pgf@tmp@tang@ii}% + \ifdim\pgf@tmp@dot pt<.5pt\relax% % this can only happen in non-simple curves - \pgfwarning{pgf-offset: cosine of \pgf@tmp@dot\space clamped to 0.5 in non-simple segment}% - \def\pgf@tmp@dot{.5pt}% + \pgfutil@packagewarning{tikz-nfold}{cosine of \pgf@tmp@dot\space clamped to 0.5 in non-simple segment}% + \def\pgf@tmp@dot{.5}% \fi% - \pgfmathsetmacro{\pgf@tmp@tanbeta}{\pgf@tmp@cross/\pgf@tmp@dot}% - \pgfcrossdot{\pgf@tmp@secant}{\pgfpointnormalised{\pgfpointdiff{#1}{#2}}} + \pgfmathdivide@{\pgf@tmp@cross}{\pgf@tmp@dot}% + \let\pgf@tmp@tanbeta\pgfmathresult + \pgfmathcrossdot{\pgf@tmp@secant}{\pgfpointnormalised{\pgfpointdiff{#1}{#2}}} % There are cases where we want #5/secantlen to be quite large, so we should not clamp the value here - \pgfmathparse{1 + #5/\pgf@tmp@secantlen*(\pgf@tmp@cross - \pgf@tmp@dot*\pgf@tmp@tanbeta)} - \pgfpointadd% - {\pgf@bezier@offset@i}% - {\pgfpointscale{\pgfmathresult pt}{\pgfpointdiff{#1}{#2}}}% - \pgfstorepoint\pgf@bezier@offset@ii + % \pgfmathparse{1 + #5/\pgf@tmp@secantlen*(\pgf@tmp@cross - \pgf@tmp@dot*\pgf@tmp@tanbeta)}% + \pgfmath@offset@calculate@scale{\pgf@tmp@secantlen}{\pgf@tmp@cross}{\pgf@tmp@dot}{\pgf@tmp@tanbeta}{#5}% + \pgfextract@process\pgf@bezier@offset@ii{% + \pgfpointadd + {\pgf@bezier@offset@i} + {\pgfqpointscale{\pgfmathresult}{\pgfpointdiff{#1}{#2}}}% + }% % third control point - \pgfcrossdot{\pgf@tmp@secant}{\pgf@tmp@tang@i} - \ifdim\pgf@tmp@dot<.5pt\relax% - \pgfwarning{pgf-offset: cosine of \pgf@tmp@dot\space clamped to 0.5 in non-simple segment}% - \def\pgf@tmp@dot{.5pt}% - \fi% - \pgfmathsetmacro{\pgf@tmp@tanbeta}{\pgf@tmp@cross/\pgf@tmp@dot}% - \pgfcrossdot{\pgf@tmp@secant}{\pgfpointnormalised{\pgfpointdiff{#4}{#3}}}% - \pgfmathparse{1 + #5/\pgf@tmp@secantlen*(\pgf@tmp@cross - \pgf@tmp@dot*\pgf@tmp@tanbeta)}% - \pgfpointadd% - {\pgf@bezier@offset@iv}% - {\pgfpointscale{\pgfmathresult pt}{\pgfpointdiff{#4}{#3}}}% - \pgfstorepoint\pgf@bezier@offset@iii% + \pgfmathcrossdot{\pgf@tmp@secant}{\pgf@tmp@tang@i}% + \ifdim\pgf@tmp@dot pt<.5pt\relax + \pgfutil@packagewarning{tikz-nfold}{cosine of \pgf@tmp@dot\space clamped to 0.5 in non-simple segment}% + \def\pgf@tmp@dot{.5}% + \fi + \pgfmathdivide@{\pgf@tmp@cross}{\pgf@tmp@dot}% + \let\pgf@tmp@tanbeta\pgfmathresult + \pgfmathcrossdot{\pgf@tmp@secant}{\pgfpointnormalised{\pgfpointdiff{#4}{#3}}}% + % \pgfmathparse{1 + #5/\pgf@tmp@secantlen*(\pgf@tmp@cross - \pgf@tmp@dot*\pgf@tmp@tanbeta)}% + \pgfmath@offset@calculate@scale{\pgf@tmp@secantlen}{\pgf@tmp@cross}{\pgf@tmp@dot}{\pgf@tmp@tanbeta}{#5}% + \pgfextract@process\pgf@bezier@offset@iii{% + \pgfpointadd + {\pgf@bezier@offset@iv} + {\pgfqpointscale{\pgfmathresult}{\pgfpointdiff{#4}{#3}}}% + }% \fi } +% calculates 1+#5/#1*(#2-#3*#4) +% #1 = secantlen +% #2 = cross +% #3 = dot +% #4 = tanbeta +% #5 = #5 (offset) +\def\pgfmath@offset@calculate@scale#1#2#3#4#5{% + \begingroup + \pgfmathmultiply@{#3}{#4}% + \pgfmathsubtract@{#2}{\pgfmathresult}% + \let\pgfmath@temp\pgfmathresult + \pgfmathreciprocal@{#1}% + \pgfmathmultiply@{\pgfmathresult}{\pgfmath@temp}% + \pgfmathmultiply{\pgfmathresult}{#5}% + \pgfmathadd@{\pgfmathresult}{1}% + \pgfmath@smuggleone\pgfmathresult + \endgroup +} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Subdividing and offsetting % @@ -225,35 +265,42 @@ % % Subdivides a Bezier curve into "simple" segments (according to the definition below), % offsets the segments, and draws them. Because offsetting also involves relocating -% the starting points, these macros come in two variants: with and without a \pgfmoveto{} +% the starting points, these macros come in two variants: with and without a \pgfpathmoveto{} % to the new starting point. % % Interface: % #1-#4: control points of the whole Bezier curve % #5: offset -\newcommand{\pgfoffsetcurve}[5]{% - \pgf@subdivideandoffsetcurve{#1}{#2}{#3}{#4}{#5}{\pgf@offset@max@recursion}{0}{\pgf@nfold@callback@move}% +% \def\pgfoffsetcurve#1#2#3#4#5{% +% \pgf@subdivideandoffsetcurve{#1}{#2}{#3}{#4}{#5}{\pgf@offset@max@recursion}{0}{\pgf@nfold@callback@move}% +% } +% \def\pgfoffsetcurvenomove#1#2#3#4#5{% +% \pgf@subdivideandoffsetcurve{#1}{#2}{#3}{#4}{#5}{\pgf@offset@max@recursion}{0}{\pgf@nfold@callback@nomove}% +% } + +\def\pgfoffsetcurve#1#2#3#4#5{% + \pgfoffsetcurvecallback{#1}{#2}{#3}{#4}{#5}{\pgf@nfold@callback@move}% } -\newcommand{\pgfoffsetcurvenomove}[5]{% - \pgf@subdivideandoffsetcurve{#1}{#2}{#3}{#4}{#5}{\pgf@offset@max@recursion}{0}{\pgf@nfold@callback@nomove}% +\def\pgfoffsetcurvenomove#1#2#3#4#5{% + \pgfoffsetcurvecallback{#1}{#2}{#3}{#4}{#5}{\pgf@nfold@callback@nomove}% } % Arguments: % #1-#4: control points of the segment % #5: =0 if this is the first segment of the curve, =1 otherwise % (checking for #5=0 allows us to draw the curve without interruptions) -\newcommand{\pgf@nfold@callback@move}[5]{% +\def\pgf@nfold@callback@move#1#2#3#4#5{% \ifnum#5=0\relax\pgfpathmoveto{#1}\fi% \pgfpathcurveto{#2}{#3}{#4}% } % this version never does a moveto at the start. Useful for drawing a path consisting of % multiple Bezier curves. -\newcommand{\pgf@nfold@callback@nomove}[5]{\pgfpathcurveto{#2}{#3}{#4}} +\def\pgf@nfold@callback@nomove#1#2#3#4#5{\pgfpathcurveto{#2}{#3}{#4}} % Like the previous macro, but with a custom callback macro for each segment instead of % executing \drawsegment as defined above. See \drawsegment for the arguments. -\newcommand{\pgfoffsetcurvecallback}[6]{% +\def\pgfoffsetcurvecallback#1#2#3#4#5#6{% \pgf@subdivideandoffsetcurve{#1}{#2}{#3}{#4}{#5}{\pgf@offset@max@recursion}{0}{#6}% } @@ -265,66 +312,73 @@ % #7: =0 if this is the start of the curve, =1 otherwise; % #8: callback for output (see above) \newif\ifpgf@offset@subdivide -\newcommand{\pgf@subdivideandoffsetcurve}[8]{% +\def\pgf@subdivideandoffsetcurve#1#2#3#4#5#6#7#8{% % we need a group to avoid overwriting variables in recursive calls \begingroup% - \pgf@offset@subdividefalse% - \c@pgf@counta=#6% - \advance\c@pgf@counta by-1% - \pgf@process{#1}\pgfstorepoint{\pgf@ctrl@i}% - \pgf@process{#2}\pgfstorepoint{\pgf@ctrl@ii}% - \pgf@process{#3}\pgfstorepoint{\pgf@ctrl@iii}% - \pgf@process{#4}\pgfstorepoint{\pgf@ctrl@iv}% - % Use the non-degenerate tangents for the simplicity check - \pgf@offset@compute@tangents{\pgf@ctrl@i}{\pgf@ctrl@ii}{\pgf@ctrl@iii}{\pgf@ctrl@iv}% - \pgfpointdiff{\pgf@ctrl@i}{\pgf@ctrl@iv}\pgfstorepoint{\pgf@itoiv}% - \pgfcrossproduct{\pgf@itoiv}{\pgf@tmp@tang@i}% - \edef\firstcross{\pgfmathresult}% - \pgfcrossproduct{\pgf@itoiv}{\pgf@tmp@tang@ii}% - % First simplicity check: Are A2 and A3 on the same side of the A1-A4 line? - % -> compute the sign of the cross products, use the sign function to avoid overflows - \pgfmathparse{sign(\firstcross)*sign(\pgfmathresult)}% - \ifdim\pgfmathresult pt>0pt\relax% - \pgf@offset@subdividetrue% - \else% - % Second simplicity check: How large is the angle between the tangents in A1 and A4? - \pgfdotproduct{\pgf@tmp@tang@i}{\pgf@tmp@tang@ii}% - \ifdim\pgfmathresult pt<.5pt\relax% + \pgf@offset@subdividefalse% + \c@pgf@counta=#6\relax + \advance\c@pgf@counta by -1 + \pgfextract@process\pgf@ctrl@i{#1}% + \pgfextract@process\pgf@ctrl@ii{#2}% + \pgfextract@process\pgf@ctrl@iii{#3}% + \pgfextract@process\pgf@ctrl@iv{#4}% + % Use the non-degenerate tangents for the simplicity check + \pgf@offset@compute@tangents{\pgf@ctrl@i}{\pgf@ctrl@ii}{\pgf@ctrl@iii}{\pgf@ctrl@iv}% + \pgfextract@process\pgf@itoiv{\pgfpointdiff{\pgf@ctrl@i}{\pgf@ctrl@iv}}% + \pgfmathcrossproduct{\pgf@itoiv}{\pgf@tmp@tang@i}% + \let\firstcross\pgfmathresult + \pgfmathcrossproduct{\pgf@itoiv}{\pgf@tmp@tang@ii}% + % First simplicity check: Are A2 and A3 on the same side of the A1-A4 line? + % -> compute the sign of the cross products, use the sign function to avoid overflows + % just give it a pass if one of them is zero, hence 2 and 3 at the end + \ifnum + \ifdim \firstcross pt<0pt -1\else\ifdim \firstcross pt>0pt 1\else 2\fi\fi + =\ifdim\pgfmathresult pt<0pt -1\else\ifdim\pgfmathresult pt>0pt 1\else 3\fi\fi + \relax % the \relax is important! \pgf@offset@subdividetrue% - \else - % Third simplicity check: Put a limit on the lengths of the i-ii and iii-iv vectors combined - \pgf@itoiv - \pgfmathsetmacro{\pgf@tmp@len@i@iv}{veclen(\pgf@x,\pgf@y)} - \pgfpointdiff{\pgf@ctrl@i}{\pgf@ctrl@ii} - \pgf@xb=\pgf@x\pgf@yb=\pgf@y - \pgfpointdiff{\pgf@ctrl@iii}{\pgf@ctrl@iv} - \pgfmathparse{\pgf@tmp@len@i@iv < veclen(\pgf@xb,\pgf@yb) + veclen(\pgf@x,\pgf@y)} - \ifnum\pgfmathresult=1\relax + \else% + % Second simplicity check: How large is the angle between the tangents in A1 and A4? + \pgfmathdotproduct{\pgf@tmp@tang@i}{\pgf@tmp@tang@ii}% + \ifdim\pgfmathresult pt<.5pt\relax% \pgf@offset@subdividetrue% - \fi + \else + % Third simplicity check: Put a limit on the lengths of the i-ii and iii-iv vectors combined + \pgf@itoiv + \pgfmathveclen@{\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y}% + \pgf@xa=\pgfmathresult pt + \pgf@process{\pgfpointdiff{\pgf@ctrl@i}{\pgf@ctrl@ii}}% + \pgfmathveclen@{\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y}% + \pgf@xb=\pgfmathresult pt + \pgf@process{\pgfpointdiff{\pgf@ctrl@iii}{\pgf@ctrl@iv}}% + \pgfmathveclen@{\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y}% + \advance\pgf@xb by \pgfmathresult pt + % \veclen(itoiv) < veclen(ii-i) + veclen(iv-iii) + \ifdim\pgf@xa<\pgf@xb + \pgf@offset@subdividetrue + \fi + \fi% \fi% - \fi% - \ifpgf@offset@subdivide% - \ifnum\c@pgf@counta<0% - % We hit the recursion limit but the segment is not simple - \pgfwarning{pgf-offset: Recursion limit reached, glitches may occur. % - Consider increasing \string\pgf@offset@max@recursion}% - % Try to offset the curve anyway. The result will not be precise, - % but the code is sufficiently robust to not crash + \ifpgf@offset@subdivide% + \ifnum\c@pgf@counta<0% + % We hit the recursion limit but the segment is not simple + \pgfutil@packagewarning{tikz-nfold}{Recursion limit reached, glitches may occur. % + Consider increasing \string\pgf@offset@max@recursion}% + % Try to offset the curve anyway. The result will not be precise, + % but the code is sufficiently robust to not crash + \pgf@offset@bezier@segment{\pgf@ctrl@i}{\pgf@ctrl@ii}{\pgf@ctrl@iii}{\pgf@ctrl@iv}{#5}% + #8{\pgf@bezier@offset@i}{\pgf@bezier@offset@ii}{\pgf@bezier@offset@iii}{\pgf@bezier@offset@iv}{#7}% + \else + % split the non-simple segment and execute recursive calls + \pgf@splitbezier{.5}{\pgf@ctrl@i}{\pgf@ctrl@ii}{\pgf@ctrl@iii}{\pgf@ctrl@iv}% + % pass on the "start of the curve flag" only to the first term + \pgf@subdivideandoffsetcurve{\pgf@splitbezier@i@i}{\pgf@splitbezier@i@ii}{\pgf@splitbezier@i@iii}{\pgf@splitbezier@i@iv}{#5}{\c@pgf@counta}{#7}{#8}% + \pgf@subdivideandoffsetcurve{\pgf@splitbezier@ii@i}{\pgf@splitbezier@ii@ii}{\pgf@splitbezier@ii@iii}{\pgf@splitbezier@ii@iv}{#5}{\c@pgf@counta}{1}{#8}% + \fi% + \else% + % curve is simple \pgf@offset@bezier@segment{\pgf@ctrl@i}{\pgf@ctrl@ii}{\pgf@ctrl@iii}{\pgf@ctrl@iv}{#5}% #8{\pgf@bezier@offset@i}{\pgf@bezier@offset@ii}{\pgf@bezier@offset@iii}{\pgf@bezier@offset@iv}{#7}% - \else - % split the non-simple segment and execute recursive calls - \pgf@splitbezier{.5}{\pgf@ctrl@i}{\pgf@ctrl@ii}{\pgf@ctrl@iii}{\pgf@ctrl@iv}% - % pass on the "start of the curve flag" only to the first term - \pgf@subdivideandoffsetcurve{\pgf@splitbezier@i@i}{\pgf@splitbezier@i@ii}{\pgf@splitbezier@i@iii}{\pgf@splitbezier@i@iv}{#5}{\c@pgf@counta}{#7}{#8}% - \pgf@subdivideandoffsetcurve{\pgf@splitbezier@ii@i}{\pgf@splitbezier@ii@ii}{\pgf@splitbezier@ii@iii}{\pgf@splitbezier@ii@iv}{#5}{\c@pgf@counta}{1}{#8}% \fi% - \else% - % curve is simple - \pgf@offset@bezier@segment{\pgf@ctrl@i}{\pgf@ctrl@ii}{\pgf@ctrl@iii}{\pgf@ctrl@iv}{#5}% - #8{\pgf@bezier@offset@i}{\pgf@bezier@offset@ii}{\pgf@bezier@offset@iii}{\pgf@bezier@offset@iv}{#7}% - \fi% \endgroup% } @@ -336,16 +390,16 @@ % For convenience we also provide macros that offset straight lines. These also come in two variants % similar to the macros for curves. % -\newcommand{\pgfoffsetline}[3]{ - \pgfpointscale{#3}{\pgfpointnormalised{\pgfpointdiff{#1}{#2}}} +\def\pgfoffsetline#1#2#3{% + \pgfpointscale{#3}{\pgfpointnormalised{\pgfpointdiff{#1}{#2}}}% \pgf@xc=-\pgf@y \pgf@yc=\pgf@x - \pgfpathmoveto{\pgfpointadd{#1}{\pgfqpoint{\pgf@xc}{\pgf@yc}}} - \pgfpathlineto{\pgfpointadd{#2}{\pgfqpoint{\pgf@xc}{\pgf@yc}}} + \pgfpathmoveto{\pgfpointadd{#1}{\pgfqpoint{\pgf@xc}{\pgf@yc}}}% + \pgfpathlineto{\pgfpointadd{#2}{\pgfqpoint{\pgf@xc}{\pgf@yc}}}% } -\newcommand{\pgfoffsetlinenomove}[3]{ - \pgfpointscale{#3}{\pgfpointnormalised{\pgfpointdiff{#1}{#2}}} +\def\pgfoffsetlinenomove#1#2#3{% + \pgfpointscale{#3}{\pgfpointnormalised{\pgfpointdiff{#1}{#2}}}% \pgf@xc=-\pgf@y \pgf@yc=\pgf@x - \pgfpathlineto{\pgfpointadd{#2}{\pgfqpoint{\pgf@xc}{\pgf@yc}}} + \pgfpathlineto{\pgfpointadd{#2}{\pgfqpoint{\pgf@xc}{\pgf@yc}}}% } diff --git a/graphics/pgf/contrib/tikz-nfold/tikz-nfold-doc.pdf b/graphics/pgf/contrib/tikz-nfold/tikz-nfold-doc.pdf Binary files differindex e57496affc..706890046b 100644 --- a/graphics/pgf/contrib/tikz-nfold/tikz-nfold-doc.pdf +++ b/graphics/pgf/contrib/tikz-nfold/tikz-nfold-doc.pdf diff --git a/graphics/pgf/contrib/tikz-nfold/tikz-nfold-doc.tex b/graphics/pgf/contrib/tikz-nfold/tikz-nfold-doc.tex index 18bd047e7b..45cdf906c7 100644 --- a/graphics/pgf/contrib/tikz-nfold/tikz-nfold-doc.tex +++ b/graphics/pgf/contrib/tikz-nfold/tikz-nfold-doc.tex @@ -32,6 +32,8 @@ \usepackage{amsmath} \usepackage{amsthm} \usepackage[capitalize]{cleveref} +\usepackage{datetime} +\usepackage{enumitem} \theoremstyle{definition} \newtheorem{definition}{Definition}[section] @@ -41,26 +43,34 @@ \newcommand{\nfold}{\texttt{nfold}} \newcommand{\tikznfold}{\texttt{/tikz/nfold}} -\pgfkeys{/tkzexample/every tkzexample/.style={code=violet!15, graphic=orange!20, very small}} +\pgfkeys{/tkzexample/every tkzexample/.style={ + code=violet!15, graphic=orange!20, very small,above skip={\vskip1em},below skip={\vskip1em} + } +} \newcommand{\tv}{\vec{t}} \newcommand{\uv}{\vec{u}} \newcommand{\vv}{\vec{v}} +% to be used in pre=... to stop the proparation of warnings outside of tkzexample environments +\makeatletter +\def\disablewarnings{\def\pgfutil@packagewarning##1##2{}} +\makeatother + \begin{document} \title{The \textsf{tikz-nfold} package} \author{Jonathan Schulz} -\date{March 2023} +\date{\monthname{} \the\year} \maketitle \begin{abstract} - This package provides an alternative to TikZ' \verb|/tikz/double| option, avoiding some shortcomings of the original approach. It also provides an option to draw triple, quadruple, and n-fold paths. + This package provides an alternative to TikZ' \verb|/tikz/double| option, avoiding some shortcomings of the original approach. Further features include options to draw triple, quadruple, and n-fold paths as well as macros to offset arbitrary paths. \end{abstract} \section*{Compatibility} -This package has been tested with \texttt{pdflatex}, \texttt{lualatex} and \texttt{xelatex}. Support for plain \TeX{} could, in principle, be implemented in the future as well. +This package has been tested with \texttt{pdflatex}, \texttt{lualatex}, \texttt{xelatex}, and plain \texttt{pdftex}. \section{Quick start} @@ -68,8 +78,7 @@ Add \begin{verbatim} \usetikzlibrary{nfold} \end{verbatim} -to your preamble. Now you can add the style \tikznfold{} to any path that uses \tikzdouble: - +to your preamble. Now you can add \tikznfold{} to any path that uses \tikzdouble. Be sure to specify \verb|/tikz/double distance| before \tikznfold, as otherwise the latter will not be applied. \begin{tkzexample}[latex=4cm] \begin{tikzpicture} \draw[double distance=3pt] @@ -80,8 +89,7 @@ to your preamble. Now you can add the style \tikznfold{} to any path that uses \ \node[right] at (0,1) {nfold:}; \end{tikzpicture} \end{tkzexample} -While it appears that adding \nfold{} does not do much here, it avoids some rendering issues of \tikzdouble, hence I recommend using it in most cases (see \cref{subsec:doubleIssues} for details). - +While it appears that adding \nfold{} does not do much here, it avoids some rendering issues of \tikzdouble, hence I recommend using it in most cases (see \cref{sec:doubleIssues} for details). Specify a number for n-fold lines: \begin{tkzexample}[latex=4cm] \begin{tikzpicture} @@ -89,17 +97,27 @@ Specify a number for n-fold lines: (0,0) to[out=0, in=180] (3,1) -- (3,0); \end{tikzpicture} \end{tkzexample} - -The arrow tips \texttt{Implies} and \texttt{Bar} are supported (the latter can also be aliased by \texttt{|}): -\begin{tkzexample}[, latex=4cm] +All arrow tips are supported, and there is special treatment for the \texttt{Implies} tip: +\begin{tkzexample}[latex=4cm] \begin{tikzpicture} - \draw[double distance=7pt, nfold=5, arrows=Bar-Implies] + \draw[double distance=7pt, nfold=5, + arrows={Bar[width=18pt]-Implies[red]}] (0,1.5) to[bend left] (3,1.5); \draw[double distance=7pt, nfold=5, arrows=Implies-Implies] (0,0) to[bend left] (3,0); \end{tikzpicture} \end{tkzexample} - +Use \texttt{/tikz/scaling nfold} to preserve the distance between component lines instead of the overall width of the arrow: +\begin{tkzexample}[latex=4cm,pre={\usetikzlibrary{intersections}}] +\begin{tikzpicture} + \draw[double equal sign distance, nfold, + arrows=-Implies] (0,.75) -- (3,.75); + \draw[double equal sign distance, scaling nfold=4, + arrows=-Implies] (0,0) -- (3,0); + \draw[double equal sign distance, scaling nfold=6, + arrows=-Implies] (0,-1) -- (3,-1); +\end{tikzpicture} +\end{tkzexample} Different line joins are supported: \begin{tkzexample}[latex=2cm] \begin{tikzpicture}[line join=bevel] @@ -111,18 +129,19 @@ Different line joins are supported: (0,0) -- (1, 0) -- (1,.5); \end{tikzpicture} \end{tkzexample} - -There is also support for \texttt{tikz-cd}: +There is also support for \texttt{tikz-cd} with custom label positions for \texttt{scaling nfold}: \begin{tkzexample}[pre={\usetikzlibrary{cd}}, latex=3cm] \begin{tikzcd} - a \ar[r, Rightarrow, bend right, nfold=3] & - b \ar[d, Mapsto, nfold=3, "\alpha", "\beta"'] \\ - c \ar[r, Mapsfrom, double distance=4pt, nfold=4] & + a \ar[r, Mapsto, bend left, scaling nfold=3] & + b \ar[d, Rightarrow, nfold, "\alpha", "\beta"'] \\ + c \ar[r, Mapsfrom, scaling nfold=4, "\gamma" near end] & d \end{tikzcd} \end{tkzexample} + \section{Comparison to \tikzdouble} +\label{sec:doubleIssues} This package does \emph{not} aim to supersede \tikzdouble, as both the original and the \nfold{} approach have their own strengths and weaknesses. The main difference is that \tikzdouble{} achieves its goal by drawing the original path twice, once very thick with the foreground colour and then slightly less thick with the background colour. By contrast, \nfold{} offsets the path: \begin{equation} @@ -143,12 +162,8 @@ This package does \emph{not} aim to supersede \tikzdouble, as both the original \draw[double distance=5pt, nfold] (4,0) -- (5,0); \end{tikzpicture} \end{equation} - - -\subsection{Issues with \tikzdouble} -\label{subsec:doubleIssues} While the approach of \tikzdouble{} is very robust and efficient, it does have a few pitfalls: -\begin{itemize} +\begin{itemize}[beginpenalty=10000] \item Different types of visual glitches can occur in PDF renderers: \begin{itemize} \item One common issue is that the white foreground piece completely covers the black background piece at certain zoom levels, leading to the top or bottom part of the doubled path missing (depending on your PDF viewer and zoom level, this issue might be visible in \cref{eq:compareApproaches}). @@ -179,13 +194,23 @@ While the approach of \tikzdouble{} is very robust and efficient, it does have a \end{tkzexample} \item Triple and n-fold paths are not supported (although this could be implemented in principle). \end{itemize} +However, there are still situations where \tikznfold{} struggles and \tikzdouble{} is the only viable option, which will be discussed in the next section. -\subsection{Issues with \tikznfold} +\section{Known issues} + +This package is by no means perfect, and even if it were, there would still be some cases where the approach of \tikzdouble{} is better suited. The known issues are roughly sorted into those that can be fixed in principle and the fundamental limitations of this approach. If you find any bugs not listed here, please report them \href{https://github.com/jonschz/tikz-nfold/issues/}{here}. + +\subsection{Fixable / wish list} +\begin{itemize} + \item \nfold{} is significantly slower than \tikzdouble. Part of the reason is that the construction is far more complex, but the code is also far from fully optimised. + \item Closing paths (i.e.\ using \texttt{-- cycle}) is not yet fully supported: The output will not be correct if the angle between the first and last segment differs from zero. + \item Some rare cases of curves are not offset correctly. The reasons for that are discussed below in \cref{subsec:subdivisionUsed}. Usually, slightly changing the control points or values of the curve will fix the problem. If you find any, please open an issue. +\end{itemize} -This package is far from perfect, and even if it were, there would still be some cases where the approach of \tikzdouble{} is better suited. Here are some shortcomings of \nfold: +\subsection{Impossible or very hard to fix} \begin{itemize} \item \nfold{} struggles with high curvatures and wide paths: Let $\kappa(t)$ be the curvature of the path in a given point, and let $\texttt{double distance} = \alpha$. If $\kappa(t) > \frac{2}{\alpha}$ (i.e. the radius of the osculating circle is smaller than half the width of the path) for some $0 \leq t \leq 1$, the output of \nfold{} will not be correct: -\begin{tkzexample}[latex=3.5cm] +\begin{tkzexample}[latex=4.25cm] \begin{tikzpicture} \draw[double distance=5pt, line width=1pt] (0,2) .. controls (4,2) and (0,3) .. (3,2.5); @@ -195,30 +220,14 @@ This package is far from perfect, and even if it were, there would still be some \node[right] at (0,1) {nfold:}; \end{tikzpicture} \end{tkzexample} - Some, but not all of these cases raise warnings (this feature is on the wish list). - \item Some rare cases of curves are not offset correctly. The reasons for that are discussed below in \cref{subsec:subdivisionUsed}. Usually, slightly changing the control points or values of the curve will fix the problem. - \item Closing paths (i.e.\ using \texttt{-- cycle}) is not yet supported (this feature is on the wish list). - \item \nfold{} is significantly slower than \tikzdouble. Part of the reason is that the construction is far more complex, other reasons can be fixed in principle. Specifically, the use of the \texttt{decorations} library is rather inefficient for this purpose. - \item While I did my best trying to break \nfold{} with as many of TikZ' options as possible, there are most definitely some problematic options I have not tested. If you find any bugs, please report them \href{https://github.com/jonschz/tikz-nfold/issues/}{here}. -\end{itemize} - - -\section{Known issues} - -\subsection{Fixable / wish list} - -\begin{itemize} - \item Closing paths (e.g.\ \texttt{-- cycle}) is not yet properly supported. - \item The arrow detection is still quite rough and likely has some bugs. One known issue is that you cannot provide parameters to the arrow tips (e.g. \texttt{Implies[red]}). - \item Similarly, redefining arrows does not have the desired effect (usually, it has no effect at all). - \item It would not be very hard to check for too much curvature in the offsetting algorithm and throw warnings in these cases. - \item Migrating away from the \texttt{decorations} library and integrating this algorithm more tightly with the rendering pipeline would be possible. I expect that doing so will significantly improve the performance and also fix most arrow-related issues. This idea is on the back burner for now, as it likely requires changes to the TikZ rendering pipeline. If the TikZ team shows interest in integrating this library, I will reconsider this. - \item Discontinuous paths with an arrow tip at the start are rendered differently in \tikzdouble{} and \nfold. As I do not really see a use case for such paths (and a rendering pipeline integration would likely fix it anyway), this issue is not a priority for now. -\end{itemize} - -\subsection{Impossible or very hard to fix} -\begin{itemize} - \item Correctly rendering paths with too much curvature is borderline impossible with this approach. This is one of the cases where using \tikzdouble{} is the only viable option. + Some, but not all of these cases raise warnings (this feature is on the wish list). This is one of the cases where using \tikzdouble{} is the only viable option. + \item Dashed paths with significant curvature will desynchronise: +\begin{tkzexample}[latex=3cm] +\begin{tikzpicture} + \draw[arrows=-Implies, double equal sign distance, dashed, + scaling nfold=4] (0,0) to[out=30, in=150] (2,0); +\end{tikzpicture} +\end{tkzexample} \item Curves of \nfold{} slightly deviate from the curves of \tikzdouble{} near joins with a non-zero angle: \begin{tkzexample}[latex=3.5cm] \begin{tikzpicture}[line width=1pt] @@ -231,7 +240,18 @@ This package is far from perfect, and even if it were, there would still be some \end{tikzpicture} \end{tkzexample} This cannot be fixed without extensive use of the \texttt{intersections} library, hurting the performance, and the result might still not look great for orders $\geq 3$. - \item changing joins in \verb|\pgfsys@beginscope| without an accompanying \TeX{} group may cause inconsistent behaviour in the joins. For example, + \item Very short \emph{curves} with large angles at the ends result in a glitched output: +\begin{tkzexample}[latex=3.75cm,pre=\disablewarnings] +\begin{tikzpicture} + \draw[black] (1,0) -- (3,0) -- (1.5,1.2) -- (3.8,0.85); + \draw[red, line width=1pt, double distance=.6cm, nfold] + (1,0) -- (3,0) -- (1.5, 1.2) -- (3.8,0.85); + \draw[blue, double distance=.6cm, nfold] (1,0) -- (3,0) + to[relative, out=1, in=179] (1.5, 1.2) -- (3.8,0.85); +\end{tikzpicture} +\end{tkzexample} + This issue has been fixed for \emph{straight lines} in version \texttt{0.1.0} (note how the red line is offset correctly), but it is much harder to fix for curves. + \item Changing joins in \verb|\pgfsys@beginscope| without an accompanying \TeX{} group may cause inconsistent behaviour in the joins: \begin{tkzexample}[latex=2cm] \makeatletter \begin{tikzpicture}[line join=miter, line width=2pt] @@ -242,27 +262,89 @@ This package is far from perfect, and even if it were, there would still be some \end{tikzpicture} \makeatother \end{tkzexample} - has \texttt{round} joins on the large path, but \texttt{miter} joins on the constituent paths. This problem does not occur with \verb|\pgfscope|. + This example has \texttt{round} joins on the large path but \texttt{miter} joins on the constituent paths. This problem does not occur with \verb|\pgfscope|. \end{itemize} + \section{The basic layer \texttt{pgf} commands} -This package also provides some basic layer commands for offsetting curves and straight lines. Use +\subsection{Offsetting curves} +This package provides some basic layer commands for offsetting curves and straight lines. Use \begin{verbatim} \usepgflibrary{bezieroffset} \end{verbatim} to only import the base layer library. The following commands are provided: \begin{itemize} - \item \verb|\pgfoffsetcurve|: This macro draws the parallel of a Bézier curve. It takes five parameters, the first four being the four control points of the Bézier curve (e.g.\ in the form of \verb|\pgfpoint{}{}|), the fifth parameter is the distance by which the curve should be offset. A negative value offsets the curve in the opposite direction. This macro begins with a \verb|\pgfpointmoveto| to the offset first control point. - \item \verb|\pgfoffsetcurvenomove|: The only difference to the previous macro is that this version does not move to the offset first control point. This is useful if one wants to offset an uninterrupted path consisting of several curves. The output will only be correct if the previous path segment ends on the offset first control point. - \item \verb|\pgfoffsetline|: This macro offsets a straight line. It takes two points and the distance as parameters. - \item \verb|\pgfoffsetlinenomove|: This macro is analogous to \verb|\pgfoffsetcurvenomove|. + \item \verb|\pgfoffsetcurve{pt1}{pt2}{pt3}{pt4}{distance}|\\% + This macro draws the parallel of a Bézier curve. The first four parameters are the control points of the Bézier curve (e.g.\ in the form of \verb|\pgfpoint{}{}|), the fifth parameter is the distance by which the curve should be offset. A negative value offsets the curve in the opposite direction. This macro begins with a \verb|\pgfpointmoveto| to the offset of \texttt{pt1}. + \item \verb|\pgfoffsetcurvenomove{pt1}{pt2}{pt3}{pt4}{distance}|\\% + The only difference to the previous macro is that this version does not move to the offset of \texttt{pt1}. This is useful if one wants to offset an uninterrupted path consisting of several curves. The output will only be correct if the previous \verb|\pgfpath...| call ends on the offset of \texttt{pt1}. + \item \verb|\pgfoffsetline{pt1}{pt2}{distance}|\\% + This macro offsets a straight line. It takes two points and the distance as parameters, and starts by moving to the offset of the first point. + \item \verb|\pgfoffsetlinenomove{pt1}{pt2}{distance}|\\% + This macro is analogous to \verb|\pgfoffsetcurvenomove|. +\end{itemize} + +\subsection{Offsetting paths} +The following macros are part of the TikZ library \nfold{} and offset an entire soft path. +\begin{itemize} + \item \verb|\pgfoffsetpath{softpath}{distance}|\\% + This macro offsets \texttt{softpath} by \texttt{distance}. The latter may be negative. + \item \verb|\pgfoffsetpathfraction{softpath}{hwidth}{fraction}|\\% + This macro offsets \texttt{softpath} by \texttt{fraction*hwidth}. Note that this is \emph{not} equivalent to the previous macro with \texttt{length=fraction*hwidth} because the joins are treated differently, as can be seen in the examples below. Further note that \texttt{hwidth} must not be negative, and that \texttt{fraction=0} does \emph{not} reproduce the input path. + \item \verb|\pgfoffsetpathqfraction{softpath}{hwidth}{fraction}|\\% + This macro is a quicker version of the previous macro does not parse the input values using the \texttt{pgfmath}-engine. + \item \verb|\pgfoffsetpathindex{softpath}{width}{i}{n}|\\% + In this convenience method, \texttt{i} and \texttt{n} are integers with $1 \leq i \leq n$. It calls the previous macro with \texttt{fraction=-1.0} for \texttt{i=1} and with \texttt{fraction=1.0} for \texttt{i=n} and is thus capable of reproducing the output of \texttt{/tikz/nfold=n} (albeit in a less efficient way). \end{itemize} +In the following example we see how \verb|\pgfoffsetpath{..}{0pt}| reproduces the input path (rendered in black) and how \verb|\pgfoffsetpathfraction{..}{8pt}{0}| differs. +\begin{tkzexample}[latex=4cm] +\begin{tikzpicture}[line join=bevel] + \path[save path=\savedpath] (0,0) -- (1,0) + to[out=0, in=-80] (1,3) -- (3,2); + \draw[color=lightgray,line width=16pt,use path=\savedpath]; + \pgfoffsetpathfraction{\savedpath}{8pt}{0} + \pgfsetlinewidth{1pt} \color{red} \pgfusepathqstroke + \pgfoffsetpath{\savedpath}{8pt} + \color{blue} \pgfusepathqstroke + \pgfoffsetpath{\savedpath}{-8pt} + \color{green} \pgfusepathqstroke + \pgfoffsetpath{\savedpath}{0pt} + \pgfsetlinewidth{.4pt} \color{black} \pgfusepathqstroke +\end{tikzpicture} +\end{tkzexample} +Here we see how the commands can be used to customise $n$-fold paths: +\begin{tkzexample}[latex=4cm] +\begin{tikzpicture} + \path[save path=\mypath] (0,0) -- (2,0) arc(-90:90:1) + to[out=180, in=0] (0,1) -- (0,2); + \foreach \mycolor [count=\i] in {red,green,blue,violet} + \pgfoffsetpathindex{\mypath}{6pt}{\i}{4} + \color{\mycolor} \pgfusepathqstroke; +\end{tikzpicture} +\end{tkzexample} +\newpage +\section{Version history} + +\begin{itemize} + \item \textbf{v0.1.0}: Major overhaul + \begin{itemize} + \item Support for arbitrary arrow tips + \item Support for directly offsetting soft paths + \item New key \texttt{/tikz/scaling nfold} + \item The \texttt{decorations} library was dropped + \item Various performance improvements in \texttt{bezieroffset} (thanks to \hbox{Qrrbrbirlbel}) + \item Very short lines with large angles were fixed (e.g.\ in \texttt{tikzcd} with \texttt{squiggly}) + \item Numerous bugs fixed + \end{itemize} + \item \textbf{v0.0.1}: First public version +\end{itemize} + \appendix \newpage -\section{The offsetting algorithm} +\section{The Bézier offsetting algorithm} This algorithm is based on an algorithm by \href{https://github.com/Pomax/}{Pomax}. See \href{https://pomax.github.io/bezierinfo/#offsetting}{A Primer on Bézier curves}, the source code can be found \href{https://github.com/Pomax/bezierinfo/blob/bcfce2149fa5e5540a2a2605986adab3b2a9a3bf/js/graphics-element/lib/bezierjs/bezier.js}{here}. @@ -288,7 +370,7 @@ In order to offset an arbitrary Bézier curve we split it into fully simple segm \subsection{Subdivision} -It is well known that at every point $0 < t < 1$, a Bézier curve $A = (A_1, A_2, A_3, A_4)$ can be subdivided into two Bézier curves $B$ and $C$ using de Casteljau's algorithm (which naturally fulfil $A_1 = B_1$ and $A_4 = C_4$). A more or less heuristic fact is that $B$ and $C$ are ``more likely'' to be simple than $A$ (if you can prove any of the statements here, please contact me). Hence, if one wants to offset a non-simple curve $A$, one could try to subdivide $A$ until all of its segments are simple, then offset each segment. +It is well known that at every point $0 < t < 1$, de Casteljau's algorithm can subdivide a Bézier curve $A = (A_1, A_2, A_3, A_4)$ into two Bézier curves $B$ and $C$ (which naturally fulfil $A_1 = B_1$ and $A_4 = C_4$). A more or less heuristic fact is that $B$ and $C$ are ``more likely'' to be simple than $A$ (if you can prove any of the statements here, please contact me). Hence, if one wants to offset a non-simple curve $A$, one could try to subdivide $A$ until all of its segments are simple, then offset each segment. \subsection{Pomax' approach} The original approach by Pomax consists of two passes. The first pass subdivides $A$ on all extrema in $x$ or $y$. In a second pass, each segment $A^{(i)}$ is made simple in steps of $t \mapsto t + 0.01$, roughly using the following pseudocode: @@ -298,20 +380,20 @@ The original approach by Pomax consists of two passes. The first pass subdivides while t_2 < 1.0: S = segment(A from t_1 to t_2+0.01) if not isSimple(S): - segments += [S] + segments += [segment(A from t_1 to t_2)] t_1 = t_2 t_2 += 0.01 \end{verbatim} \end{samepage} -Essentially, this verifies with great certainty that the segment is fully simple in the sense of +Essentially, this ensures with great certainty that the segment is fully simple in the sense of \cref{def:fullySimpleCurve}. -The main reason this approach is not used in this library is performance, as the library is slow enough already. Other minor reasons include that the original approach is not invariant under reversals or rotations: Reversing and/or rotating a curve yields a different subdivision and hence potentially a slightly different-looking curve. +The main reason this approach is not used in this library is performance, since the loop is quite expensive computationally. Other minor reasons include that the original approach is not invariant under reversals or rotations: Reversing and/or rotating a curve yields a different subdivision and hence potentially a slightly different-looking curve. \subsection{The approach used here} \label{subsec:subdivisionUsed} -In this library, we instead take a recursive approach: +In this library we instead take a recursive approach: \begin{verbatim} - def split(A, level): + def makeSimple(A, level): if isSimple(A): segments += [A] else: @@ -320,8 +402,8 @@ In this library, we instead take a recursive approach: segments += [A] else: first, second = split(A, t=0.5) - split(first, level-1) - split(second, level-1) + makeSimple(first, level-1) + makeSimple(second, level-1) \end{verbatim} The default maximum depth is 5, so the curve is split into at most $2^5 = 32$ segments. This has the downside that some simple but not fully simple curves may remain undetected and be offset slightly incorrectly. If you encounter examples of such curves with bad outputs or if you have any ideas for additional constraints to add to \cref{def:simpleCurve} that can be checked with reasonable computational effort, please be in touch. @@ -330,7 +412,7 @@ The default maximum depth is 5, so the curve is split into at most $2^5 = 32$ se Disregarding edge cases (which will be discussed later), offsetting the curve works as follows: \begin{enumerate} - \item Construct lines orthogonal to the tangent in $A_1$ and $A_4$ and find their intersection. This point is called the \emph{origin} of the curve. + \item Construct lines orthogonal to the tangent in $A_1$ and $A_4$ and find their intersection. This point is called the \emph{origin} of the curve, denoted by $O$. \item The new control points $A'_1$ and $A'_4$ are given by $A_1$ and $A_4$ offset orthogonally to the tangent. \item Construct a ray from $A'_1$ parallel to the tangent in $A_1$, and construct another ray from the origin through $A_2$. Now $A'_2$ is given by the intersection of those rays. \item $A'_3$ can be constructed similarly. @@ -401,7 +483,7 @@ which is regular as $O$ approaches infinity. Now we to determine the inverse of \begin{equation} \frac{\sin(\tfrac{\pi}{2} - \alpha)}{\overline{OA_4}} = \frac{\sin(\alpha + \beta)}{\overline{A_1A_4}} = \frac{\sin(\tfrac{\pi}{2} - \beta)}{\overline{OA_1}} \implies \frac{1}{\overline{OA_1}} = \frac{1}{\overline{A_1A_4}}\cdot\frac{\sin(\alpha + \beta)}{\cos(\beta)} \ . \end{equation} -Note that $-\tfrac{\pi}{2} < \beta < \tfrac{\pi}{2}$ (and hence $\cos(\beta) > 0$) is guaranteed if the curve is simple --- in fact, simplicity guarantees $\alpha \cdot \beta > 0$ and $|\alpha| + |\beta| \leq \tfrac{\pi}{3}$. Using the sine addition theorem we can further rewrite the fraction to +Note that $-\tfrac{\pi}{3} \leq \beta \leq \tfrac{\pi}{3}$ (and hence $\cos(\beta) \geq \tfrac{1}{2}$) is guaranteed if the curve is simple --- in fact, simplicity guarantees $\alpha \cdot \beta > 0$ and $|\alpha| + |\beta| \leq \tfrac{\pi}{3}$. Using the sine addition theorem we can further rewrite the fraction to \begin{equation} \frac{\sin(\alpha + \beta)}{\cos(\beta)} = \sin(\alpha) + \cos(\alpha) \frac{\sin(\beta)}{\cos(\beta)} \ , \end{equation} @@ -423,7 +505,7 @@ Let furthermore $\uv_{ij} := \vv_{ij}/|\vv_{ij}|$ be the normalised vectors. The \subsection{Edge cases} -\subsubsection{Overlaps: $A_i = A_{i+1}$} +\subsubsection{Overlaps: \texorpdfstring{$A_i = A_{i+1}$}{A\_i = A\_(i+1)}} If there is one overlap $A_1=A_2$, $A_2=A_3$ or $A_3=A_4$, the cubic Bézier curve reduces to a quadratic one. For two overlaps, we get a linear Bézier curve (i.e.\ a straight line), and for three overlaps we get a point. The main problem to watch out for is that the tangents $\tv_0$ and $\tv_1$ need to be computed differently: \begin{itemize} @@ -434,7 +516,7 @@ If there is one overlap $A_1=A_2$, $A_2=A_3$ or $A_3=A_4$, the cubic Bézier cur \end{itemize} The analogous statement hold for $\tv_1$. In practice we test for approximate, not exact equality. -\subsubsection{Overlaps $A_1 = A_4$} +\subsubsection{Overlaps \texorpdfstring{$A_1 = A_4$}{A\_1 = A\_4}} \Cref{eq:finalPrimeDistance} has one remaining singularity, namely for $A_1 \approx A_4$. This singularity is fundamental and not an artefact: As $A_1$ approaches $A_4$ while $\overline{A_1A_2}$ and $\overline{A_3A_4}$ stay constant, $O$ also approaches $A_4$, hence the angle between $\overrightarrow{A_1A_2}$ and $\overrightarrow{OA_2}$ approaches zero, sending the intersection point $A'_2$ to infinity. diff --git a/graphics/pgf/contrib/tikz-nfold/tikzlibrarynfold.code.tex b/graphics/pgf/contrib/tikz-nfold/tikzlibrarynfold.code.tex index 8013d423f6..75c3cdc0d3 100644 --- a/graphics/pgf/contrib/tikz-nfold/tikzlibrarynfold.code.tex +++ b/graphics/pgf/contrib/tikz-nfold/tikzlibrarynfold.code.tex @@ -16,12 +16,10 @@ % This work consists of the files pgflibrarybezieroffset.code.tex, % tikzlibrarynfold.code.tex, tikz-nfold-doc.tex, and tikz-nfold-doc.pdf. -\usetikzlibrary{decorations} \usetikzlibrary{arrows.meta} -%\usepgflibrary{bezieroffset} \usepgflibrary{bezieroffset} -% + % % Intercepting join settings % -------------------------- @@ -63,63 +61,66 @@ % Various helper commands % ----------------------- -% check if a decoration segment is visible, i.e. not moveto or last +% check if a segment is visible, i.e. not moveto or last \newif\ifpgf@nfold@segm@visible -\def\ifpgfsegmentvisible#1{% +\def\checkpgfsegmentvisible#1{% \pgf@nfold@segm@visiblefalse% - \ifx#1\pgfdecorationinputsegmentlineto% - \pgf@nfold@segm@visibletrue\fi% - \ifx#1\pgfdecorationinputsegmentcurveto% - \pgf@nfold@segm@visibletrue\fi% - \ifx#1\pgfdecorationinputsegmentclosepath% - \pgf@nfold@segm@visibletrue\fi% - \ifpgf@nfold@segm@visible% + \ifx#1\pgf@nfold@inputsegmentlineto% + \pgf@nfold@segm@visibletrue% + \else\ifx#1\pgf@nfold@inputsegmentcurveto% + \pgf@nfold@segm@visibletrue + \else\ifx#1\pgf@nfold@inputsegmentclosepath% + \pgf@nfold@segm@visibletrue + \fi\fi\fi } +% % Joining offset lines % -------------------- % % One of the more difficult aspects is joining the segments of an offset path. Without this step, % the path would be interrupted or self-intersect whenever there is a non-zero angle between -% two segments. This code reproduces the existing line joins "bevel", "miter" and "round" as well -% as possible. +% two segments. This code reproduces the existing line joins "bevel", "miter" and "round". % \def\pgf@nfold@miterjoin{ - % - Although it isn't obvious, this code is invariant under - % \pgf@nfold@deltaphi -> \pgf@nfold@deltaphi + 2pi - % - The tip of the miter join is computed starting from the unshifted point and then moving + % The tip of the miter join is computed starting from the original (unshifted) centre of the join; + % we then move orthorgonal to the average of the old and new angle \pgfpointadd% - {\pgf@decorate@inputsegment@first}% + {\pgf@nfold@inputsegment@first}% {\pgfpointpolar% - {\pgf@nfold@cached@endangle+.5*\pgf@nfold@deltaphi+90}% - {\pgf@shiftdec@amount/cos(.5*\pgf@nfold@deltaphi)}% + {\pgf@nfold@previous@endangle+.5*\pgf@nfold@deltaphi@start+90}% do not change + {\pgf@nfold@shiftamount/cos(.5*\pgf@nfold@deltaphi@start)}% }% \pgfpathlineto{}% } \def\pgf@nfold@beveljoin{ - % The subsequent formula needs deltaphi to be between -180 and 180 - \pgfmathsetmacro{\pgf@nfold@deltaphi}{Mod(\pgf@nfold@deltaphi + 180, 360) - 180} - % For a good-looking result, inside lines should have a constant distance from each other all the way - % through the bevel join, which is a non-trivial condition. To achieve this result, the outer lines get - % a bevel-like join and the inner lines get a miter-like join; the threshold depends on the angle. + % The bevel join for one component line consists of three parts: + % 1) an extension of the ingoing line, + % 2) a middle line, angled at the average of the incoming and outgoing line, + % 3) an extension of the outgoing line. + % Different components of the ingoing and outgoing lines have a constant distance from each other. + % For a good-looking output, the mittle parts of the component lines thus should also have a constant distance, + % which is a non-trivial condition. To generate such an output the outer lines get a bevel-like join + % and the inner lines get a miter-like join; the threshold depends on deltaphi. % We first compute by how much the outermost line must be continued from the beginning of the join. % The protrusion amount must be lowered by a little bit for a rather complicated reason: The offset would be % dead on if the outermost offset line were centered on the _edge_ of the wide line, but we want to draw % the outside line _fully inside_ the wide line. The factor of tan(deltaphi/4) can be derived, but is not obvious. - \pgfmathsetmacro{\bevelouterprotrusion}{\pgf@nfold@shortenforjoin - .5*\pgflinewidth*abs(tan(.25*\pgf@nfold@deltaphi))} + \pgfmathsetlengthmacro{\bevelouterprotrusion}% + {\pgf@nfold@shortenstartjoin - .5*\pgflinewidth*abs(tan(.25*\pgf@nfold@deltaphi@start))} % The following applies to middle lines only: We compute by how much they need to be shortened so the distance % between the lines in the join is correct. - \pgfmathsetmacro{\bevelshorten}{2*\insidepercentage*abs(tan(.25*\pgf@nfold@deltaphi))} - % This theshold decides if the inside line is a bevel or a miter - \pgfmathparse{\bevelshorten < abs(sin(.5*\pgf@nfold@deltaphi))} + \pgfmathsetmacro{\bevelshorten}{2*\insidepercentage*abs(tan(.25*\pgf@nfold@deltaphi@start))} + % This threshold decides if the inside line has a bevel or a miter join + \pgfmathparse{\bevelshorten < abs(sin(.5*\pgf@nfold@deltaphi@start))} \ifnum\pgfmathresult=1\relax - \pgfmathsetmacro{\bevelextension}{\bevelouterprotrusion-\bevelshorten*\pgf@decoration@nfold@hwidth} - \pgfpointadd{\pgf@nfold@offset@start}{\pgfpointpolar{\pgf@nfold@cached@endangle}{\bevelextension}} + \pgfmathsetlengthmacro{\bevelextension}{\bevelouterprotrusion-\bevelshorten*\pgf@nfold@hwidth} + \pgfpointadd{\pgf@nfold@join@start}{\pgfpointpolar{\pgf@nfold@previous@endangle}{\bevelextension}} \pgfpathlineto{} - \pgfpointadd{\pgf@nfold@offset@end}{\pgfpointpolar{\pgfdecoratedinputsegmentstartangle}{-\bevelextension}} + \pgfpointadd{\pgf@nfold@join@end}{\pgfpointpolar{\pgf@nfold@cur@startangle}{-\bevelextension}} \pgfpathlineto{} \else \pgf@nfold@miterjoin @@ -129,49 +130,63 @@ \def\pgf@nfold@roundjoin{ % The outer half of the lines get arcs, the others get miters \ifdim\insidepercentage pt<.5pt\relax - \pgfpointadd{\pgf@nfold@offset@start}{\pgfpointpolar{\pgf@nfold@cached@endangle}{\pgf@nfold@shortenforjoin}} + \pgfpointadd{\pgf@nfold@join@start}{\pgfpointpolar{\pgf@nfold@previous@endangle}{\pgf@nfold@shortenstartjoin}} \pgfpathlineto{} % Check if the angles are in the correct range; under some conditions we must add or subtract 360 - \pgfmathparse{\turnindicator*(\pgfdecoratedinputsegmentstartangle-\pgf@nfold@cached@endangle)} + \pgfmathparse{\turnindicator*(\pgf@nfold@cur@startangle-\pgf@nfold@previous@endangle)} \ifdim\pgfmathresult pt>0pt\relax - \pgfmathsetmacro{\targetang}{\pgfdecoratedinputsegmentstartangle-\turnindicator*360} + \pgfmathsetmacro{\targetang}{\pgf@nfold@cur@startangle-\turnindicator*360} \else - \let\targetang\pgfdecoratedinputsegmentstartangle + \let\targetang\pgf@nfold@cur@startangle \fi \pgfpatharc% - {\pgf@nfold@cached@endangle+90*\turnindicator}% + {\pgf@nfold@previous@endangle+90*\turnindicator}% {\targetang+90*\turnindicator}% - {abs(\pgf@shiftdec@fraction)*\pgf@decoration@nfold@hwidth}% + {abs(\pgf@nfold@shift@fraction)*\pgf@nfold@hwidth}% \else \pgf@nfold@miterjoin \fi } \def\pgf@nfold@make@join{ - % The code must be invariant under deltaphi -> deltaphi + 360, which can be verified experimentally - \pgfmathsetmacro{\pgf@nfold@deltaphi}{\pgfdecoratedinputsegmentstartangle-\pgf@nfold@cached@endangle} - % Offset the start and end of this segment - \pgfpointadd{\pgf@nfold@cached@endpoint}{\pgfpointpolar{\pgf@nfold@cached@endangle+90}{\pgf@shiftdec@amount}} - \pgfstorepoint\pgf@nfold@offset@start - \pgfpointadd{\pgf@nfold@segment@start}{\pgfpointpolar{\pgfdecoratedinputsegmentstartangle+90}{\pgf@shiftdec@amount}} - \pgfstorepoint\pgf@nfold@offset@end - \pgfpointdiff{\pgf@nfold@offset@start}{\pgf@nfold@offset@end} - % Check if the start of this segment is too close to the end of the previous segment. - % In that case we don't insert a join segment, as it would look rather glitchy. - % We use the Manhattan length for performance and to avoid 'dimension too large' errors. - \pgfmathparse{abs(\pgf@x) + abs(\pgf@y)} - \ifdim\pgfmathresult pt>0.1pt\relax - % First step: Check if left or right turn (-1 = left, 1=right) - \pgfmathsetmacro{\turnindicator}{sign(sin(\pgf@nfold@cached@endangle-\pgfdecoratedinputsegmentstartangle)} - % between 0 and 1; 0=no distance to cover in the join, 1=maximum distance to cover - \pgfmathsetmacro{\insidepercentage}{-.5*\turnindicator*\pgf@shiftdec@fraction+.5} - \if m\pgf@cached@linejoin % because both are only one character, \ifx is not needed + % Offset the start and end of this join + \pgfextract@process\pgf@nfold@join@start{% + \pgfpointadd{\pgf@nfold@previous@joinend} + {\pgfpointpolar{\pgf@nfold@previous@endangle+90}{\pgf@nfold@shiftamount}}}% + \pgfextract@process\pgf@nfold@join@end{% + \pgfpointadd{\pgf@nfold@segment@start} + {\pgfpointpolar{\pgf@nfold@cur@startangle+90}{\pgf@nfold@shiftamount}}}% + \pgf@process{\pgfpointdiff{\pgf@nfold@join@start}{\pgf@nfold@join@end}} + % Check if the start of this segment is very close to the end of the previous segment. + % In that case we don't need a join at all + \pgfpointtaxicabnorm\pgf@xa + \ifdim\pgf@xa>0.1pt\relax + % First step: Check if left or right turn (-1=left, 1=right) + \ifdim\pgf@nfold@deltaphi@start pt<0pt + \def\turnindicator{1} + \else + \def\turnindicator{-1} + \fi + % \insidepercentage: between 0.0 and 1.0; + % 0=no distance to cover in the join, 1=maximum distance to cover + \pgf@xa=\pgf@nfold@shift@fraction pt\relax + \pgf@xa=\turnindicator\pgf@xa + \advance\pgf@xa by-1pt\relax + \pgf@xa=-.5\pgf@xa + % \insidepercentage = .5 * (1 - \turnindicator*\pgf@nfold@shift@fraction) + \edef\insidepercentage{\pgf@sys@tonumber\pgf@xa} + \if m\pgf@cached@linejoin% \ifx is not needed because both are only one character % miter join % First we implement the miter limit: If the angle is too sharp, the miter join is replaced % by a bevel join. This is controlled by /tikz/miter limit=..., initially 10. - \pgfmathsetmacro{\mitercosine}{abs(cos(.5*\pgf@nfold@deltaphi))} - \pgfmathparse{\mitercosine*\pgf@nfold@cached@miterlimit} - \ifdim\pgfmathresult pt>1pt\relax + \pgf@xa=\pgf@nfold@deltaphi@start pt\relax + \pgf@xa=.5\pgf@xa + \pgfmathcos@{\pgf@sys@tonumber\pgf@xa} + \pgf@xa=\pgfmathresult pt\relax + \pgf@xa=\pgf@nfold@cached@miterlimit\pgf@xa + % Check if miterlimit*cos(.5*deltaphi) > 1; + % cos(.5*deltaphi) >= 0 because -180 <= deltaphi <= 180 + \ifdim\pgf@xa>1pt\relax \pgf@nfold@miterjoin \else \pgf@nfold@beveljoin @@ -186,600 +201,933 @@ \fi \fi \fi - % Common for all non-trivial joins: Connect to the starting point of the current segment. - % Note that this code is skipped by the global \ifdim if the start and end of the join coincide, - % so we never get a zero length segment here. - \pgfpathlineto{\pgf@nfold@offset@end} + % All non-trivial joins connect to the end of the join, which is the starting point of the current segment. + % Note that this entire macro is skipped by if the start and end of the join coincide, so we never create a zero length segment here. + % + % There is one edge case here: If two subsequent joins are so close that \pgf@nfold@segment@end + % and \pgf@nfold@segment@start exchange places *and* we are on the outside of the join + % (implying that we are on the inside of the next join), \pgf@nfold@join@end will be located behind the next join. + % In this case we instead connect to the offset of \pgf@nfold@segment@end (which comes *before* \pgf@nfold@segment@start). + \pgf@nfold@join@end% default point to connect to + \ifpgf@nfold@closejoinsedgecase% + \ifdim\insidepercentage pt<.5pt\relax% + \pgf@process{\pgfpointadd% + {\pgf@nfold@segment@end}% + {\pgfpointpolar{\pgf@nfold@cur@startangle+90}{\pgf@nfold@shiftamount}}} + \fi% + \fi + \pgfpathlineto{} \fi } % -% Internal offset decoration -% -------------------------- -% -% This internal tikz decoration offsets a given path (but doesn't draw it multiple times). +% Main rendering pipeline +% ----------------------- % -% pgfkeys interface, used in the decorations below -\newcount\pgf@nfold@dec@order -\pgf@nfold@dec@order=2 -\pgfkeys{ - % - use a counter so we get an error if something other than a number is provided - % - if needed, throw an error that the intersection library needs to be loaded - /pgf/decoration/nfold order/.code={ - \pgf@nfold@dec@order=#1 - \ifnum\pgf@nfold@dec@order>\tikz@arrow@intersec@numcached - \ifdefined\pgfintersectionofpaths\else - \pgferror{For 'nfold' larger than \tikz@arrow@intersec@numcached\space you need to say \string\usetikzlibrary{intersections}} - \fi - \fi - }, - /pgf/decoration/nfold width/.code={\pgfmathsetlengthmacro{\pgf@decoration@nfold@hwidth}{.5*#1}}, - % integer between 1 and \pgf@nfold@dec@order - /pgf/decoration/nfold index/.store in=\pgf@nfold@index -} - -% In here we cache the end angle of the previous decorated segment, which is otherwise inaccessible -\newdimen\pgf@nfold@cached@endangle % This stores whether the current segment should begin with a moveto to its offset \newif\ifpgf@nfold@continuesegment +% This stores whether we are in some edge case of very close joins, see below for details +\newif\ifpgf@nfold@closejoinsedgecase +% This stores whether we are in an error case where we need to avoid dividing by zero +\newif\ifpgf@nfold@angletoosharp +% This stores whether we need the intersections library for an arrow tip but it is not loaded +\newif\ifpgf@nfold@intersectionsnotloaded + -% some required computations for the current segment -\def\pgf@nfold@shift@prepare@segment{% - \pgftransformreset % important! otherwise we work in the local coordinate system - % compute the relative deviation from the original path (between -1.0 and 1.0) - \pgfmathsetmacro{\pgf@shiftdec@fraction}% - {-1+2*(\pgf@nfold@index-1)/(\pgf@nfold@dec@order-1)} - \pgfmathsetlengthmacro{\pgf@shiftdec@amount}{\pgf@decoration@nfold@hwidth*\pgf@shiftdec@fraction} +\def\pgf@nfold@handlesegment{% + %%% Step 0: Preparation % Set some default values; they might get overwritten later - \let\pgf@nfold@segment@start\pgf@decorate@inputsegment@first - \let\pgf@nfold@segment@end\pgf@decorate@inputsegment@last + \let\pgf@nfold@segment@start\pgf@nfold@inputsegment@first + \let\pgf@nfold@segment@end\pgf@nfold@inputsegment@last % Set a default value for \ifpgf@nfold@continuesegment. % It may be overwritten by \pgf@nfold@extendtotip - \ifx\pgfdecorationpreviousinputsegment\pgfdecorationinputsegmentmoveto + \ifx\pgf@nfold@previousinputsegment\pgf@nfold@inputsegmentmoveto \pgf@nfold@continuesegmentfalse \else \pgf@nfold@continuesegmenttrue \fi -} - -% draw the current segment including a join at the start (if present) -\def\pgf@nfold@shift@handle@segment{% + %%% Step 1: Make space for joins if necessary % In order to make space for the join, it may be necessary to shorten the current segment % at the start and/or the end. In here we store by how much the segment needs to be shortened. - \def\pgf@nfold@shortenforjoin{0pt} + \def\pgf@nfold@shortenstartjoin{0pt} + \def\pgf@nfold@shortenendjoin{0pt} + \pgf@nfold@closejoinsedgecasefalse + \pgf@nfold@angletoosharpfalse % Make a join only if two adjacent segments are both visible - \ifpgfsegmentvisible\pgfdecorationcurrentinputsegment - % Step 1: Make space for the join at the start if needed - \ifx\pgfdecorationpreviousinputsegment\pgfdecorationinputsegmentmoveto\else - \ifdefined\pgfdecorationpreviousinputsegment - % As far as I am aware, the previous input segment is either moveto or undefined - \pgfwarning{'nfold': Unexpected previous input segment in decoration 'nfold' (\meaning\pgfdecorationpreviousinputsegment)} + \checkpgfsegmentvisible\pgf@nfold@currentinputsegment + \ifpgf@nfold@segm@visible% + % Step 1.1: Make space for the join at the start if needed + \ifx\pgf@nfold@previousinputsegment\pgf@nfold@inputsegmentmoveto\else + \pgf@xb=\pgf@nfold@deltaphi@start pt\relax + \ifdim\pgf@xb<0pt\relax + \pgf@xb=-\pgf@xb \fi - \pgf@xa=\pgfdecoratedinputsegmentstartangle pt\relax - \advance\pgf@xa by-\pgf@nfold@cached@endangle\relax - \pgfmathparse{abs(cos(0.5*\pgf@xa))} - \ifdim\pgfmathresult pt<0.02pt\relax - % we go full backwards, don't relocate the start - \pgfwarning{Angle too sharp in decoration 'nfold', expect visual errors} + \ifdim\pgf@xb>178pt\relax + % we go full backwards, don't relocate the start and disable the join to avoid division by zero + \pgfutil@packagewarning{tikz-nfold}{Angle too sharp, expect visual errors} + \pgf@nfold@angletoosharptrue \else - \pgfmathsetlengthmacro{\pgf@nfold@shortenforjoin}{\pgf@decoration@nfold@hwidth*abs(tan(0.5*\pgf@xa))} - \pgfpointadd{\pgf@decorate@inputsegment@first}{\pgfpointpolar{\pgfdecoratedinputsegmentstartangle}{\pgf@nfold@shortenforjoin}} - \pgfstorepoint\pgf@nfold@segment@start + \ifdim\pgf@xb>0.5pt\relax + % make space for the start join if the angle is nonzero + \pgf@yb=.5\pgf@xb + \pgfmathtan@{\pgf@sys@tonumber\pgf@yb} + \pgf@yb=\pgf@nfold@hwidth\relax + \pgf@yb=\pgfmathresult\pgf@yb + % shortenstartjoin = hwidth*tan(.5*abs(deltaphi@start)) + \edef\pgf@nfold@shortenstartjoin{\the\pgf@yb} + \pgfextract@process\pgf@nfold@segment@start{% + \pgfpointadd{\pgf@nfold@inputsegment@first}% + {\pgfqpointpolar{\pgf@nfold@cur@startangle}{\pgf@yb}}}% + \ifx\pgf@nfold@currentinputsegment\pgf@nfold@inputsegmentcurveto + % For a curve we need to relocate the @supporta point as well, as otherwise the @first point + % might overtake it + \pgf@process{\pgfpointdiff{\pgf@nfold@inputsegment@first}{\pgf@nfold@inputsegment@supporta}} + \pgfmathveclen@{\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y} + \ifdim\pgfmathresult pt>0.1pt\relax + % regular curves (supporta != first): + % Increase dist(first, supporta) to sqrt(a^2 + b^2) where a=dist(first, supporta) and b=shortenstart. This way, the order of first and supporta is guaranteed to be preserved, and the change to supporta is as small as reasonably possible. + \pgfmathveclen@{\pgfmathresult}{\pgf@sys@tonumber\pgf@yb} + \pgfextract@process\pgf@nfold@inputsegment@supporta{\pgfpointadd% + {\pgf@nfold@inputsegment@first}% + {\pgfqpointpolar{\pgf@nfold@cur@startangle}{\pgfmathresult pt}}}% + \else + % special treatment for singular curves (supporta = first) to avoid rounding error glitches. + % In this special case, a slight corner at the end of the join is unavoidable + \let\pgf@nfold@inputsegment@supporta\pgf@nfold@segment@start + \fi + \fi + \fi \fi \fi - % Step 2: Make space for the join at the end if needed - \ifpgfsegmentvisible\pgfdecorationnextinputsegmentobject - % for reasons unknown to me, - % \pgfdecoratedangletonextinputsegment has a "pt" but the others do not - \pgf@xa=\pgfdecoratedangle pt\relax - \advance\pgf@xa by \pgfdecoratedangletonextinputsegment\relax - \advance\pgf@xa by -\pgfdecoratedinputsegmentendangle pt\relax - \pgfmathparse{abs(cos(0.5*\pgf@xa))} - \ifdim\pgfmathresult pt<0.02pt\relax - \pgfwarning{Angle too sharp in decoration 'nfold', expect visual errors} + % Step 1.2: Make space for the join at the end if needed + \checkpgfsegmentvisible\pgf@nfold@next@segmenttype + \ifpgf@nfold@segm@visible% + \pgf@xb=\pgf@nfold@deltaphi@end pt\relax + \ifdim\pgf@xb<0pt\relax + \pgf@xb=-\pgf@xb + \fi + \ifdim\pgf@xb>178pt\relax + \pgfutil@packagewarning{tikz-nfold}{Angle too sharp, expect visual errors} + \pgf@nfold@angletoosharptrue \else - \pgfmathparse{-\pgf@decoration@nfold@hwidth*abs(tan(0.5*\pgf@xa))} - \pgfpointadd{\pgf@decorate@inputsegment@last}{\pgfpointpolar{\pgfdecoratedinputsegmentendangle}{\pgfmathresult pt}} - \pgfstorepoint\pgf@nfold@segment@end + \ifdim\pgf@xb>0.5pt\relax + % make space for the start join if the angle is nonzero + \pgf@yb=.5\pgf@xb + \pgfmathtan@{\pgf@sys@tonumber\pgf@yb} + \pgf@yb=\pgf@nfold@hwidth\relax + \pgf@yb=\pgfmathresult\pgf@yb + % shortenendjoin = hwidth*tan(.5*abs(deltaphi@end)) + \edef\pgf@nfold@shortenendjoin{\the\pgf@yb} + \pgf@yb=-\pgf@yb + \pgfextract@process\pgf@nfold@segment@end{% + \pgfpointadd{\pgf@nfold@inputsegment@last}% + {\pgfqpointpolar{\pgf@nfold@cur@endangle}{\pgf@yb}}}% + \ifx\pgf@nfold@currentinputsegment\pgf@nfold@inputsegmentcurveto + % Same procedure as above: relocate supportb if we have a curve + \pgf@process{\pgfpointdiff{\pgf@nfold@inputsegment@supportb}{\pgf@nfold@inputsegment@last}} + \pgfmathveclen@{\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y} + \ifdim\pgfmathresult pt>0.1pt\relax + \pgfmathveclen@{\pgfmathresult}{\pgf@sys@tonumber\pgf@yb} + % can use qpoint and minus because \pgfmathresult is guaranteed to be positive + \pgfextract@process\pgf@nfold@inputsegment@supportb{\pgfpointadd% + {\pgf@nfold@inputsegment@last}% + {\pgfqpointpolar{\pgf@nfold@cur@endangle}{-\pgfmathresult pt}}}% + \else + \let\pgf@nfold@inputsegment@supportb\pgf@nfold@segment@end + \fi + \fi + \fi \fi - \fi + % Step 1.3: Detect an edge case + % This edge case appears whenever the current segment is such a short line that we would + % have to reduce its length to less than zero to make space for the joins. In such cases, + % the line is not drawn at all, and slight modifications must be made to the joins to ensure + % a correct output (i.e. one join is immediately followed by the next without a segment in between). + % + % This edge case can appear for curves as well, but they are much harder to deal with. + \ifx\pgf@nfold@currentinputsegment\pgf@nfold@inputsegmentlineto + % No need to check for \pgf@nfold@inputsegmentclosepath as it should not be followed by any further segments + % Now: Check if the total amount of shortening is larger than the length of the segment + \pgfpointdiff{\pgf@nfold@inputsegment@first}{\pgf@nfold@inputsegment@last} + \pgfmathveclen@{\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y} + \pgf@xa=\pgf@nfold@shortenstartjoin\relax + \advance\pgf@xa by\pgf@nfold@shortenendjoin\relax + \ifdim\pgf@xa>\pgfmathresult pt\relax + \pgf@nfold@closejoinsedgecasetrue + \fi + \fi + \fi% end if next segment visible % - % Step 3: Draw the join at the start if applicable + % Step 2.1: Draw the join at the start if applicable % - \ifx\pgfdecorationpreviousinputsegment\pgfdecorationinputsegmentmoveto\else - \pgf@nfold@make@join + \ifx\pgf@nfold@previousinputsegment\pgf@nfold@inputsegmentmoveto + \ifpgf@nfold@closejoinsedgecase + % If the previous segment is a moveto and the current segment is a "close joins" edge case, + % nothing needs to be drawn here (the relevant draw call will be made at the join of the subsequent + % segment). We must therefore make sure that we move to the correct end point of this segment. + % Counterintuitively, this is given by the offset of \pgf@nfold@segment@start since the start and end + % are reversed in the edge case. + \pgfpointadd% + {\pgf@nfold@segment@start}% + {\pgfpointpolar{\pgf@nfold@cur@startangle+90}{\pgf@nfold@shiftamount}} + \pgfpathmoveto{} + \fi + \else + % If we draw the join when the start angle is close to 180 degrees, we get a division by zero + \ifpgf@nfold@angletoosharp\else + \pgf@nfold@make@join + \fi \fi - \fi + \fi% end if current segment visible + % Step 2.2: Store where the current (non-offset) end point was relocated + % in order to make space for the end join. This may be used if the next + % segment begins with a join + \let\pgf@nfold@previous@joinend\pgf@nfold@segment@end % - % Step 4: Draw the new segment. + % Step 3: Draw the new segment. % % The value of \ifpgf@nfold@continuesegment decides whether we start with a moveto. - \ifx\pgfdecorationcurrentinputsegment\pgfdecorationinputsegmentlineto - \ifpgf@nfold@continuesegment - \pgfoffsetlinenomove{\pgf@nfold@segment@start}{\pgf@nfold@segment@end}{\pgf@shiftdec@amount} - \else - \pgfoffsetline{\pgf@nfold@segment@start}{\pgf@nfold@segment@end}{\pgf@shiftdec@amount} + \ifx\pgf@nfold@currentinputsegment\pgf@nfold@inputsegmentlineto + \ifpgf@nfold@closejoinsedgecase\else + \ifpgf@nfold@continuesegment + \pgfoffsetlinenomove{\pgf@nfold@segment@start}{\pgf@nfold@segment@end}{\pgf@nfold@shiftamount} + \else + \pgfoffsetline{\pgf@nfold@segment@start}{\pgf@nfold@segment@end}{\pgf@nfold@shiftamount} + \fi \fi \fi - \ifx\pgfdecorationcurrentinputsegment\pgfdecorationinputsegmentclosepath - \pgfwarning{'nfold': The option 'cycle' is not yet properly supported.} - \ifpgf@nfold@continuesegment - \pgfoffsetlinenomove{\pgf@nfold@segment@start}{\pgf@nfold@segment@end}{\pgf@shiftdec@amount} - \else - \pgfoffsetline{\pgf@nfold@segment@start}{\pgf@nfold@segment@end}{\pgf@shiftdec@amount} - \fi + \ifx\pgf@nfold@currentinputsegment\pgf@nfold@inputsegmentclosepath + % Incomplete: proper join is missing + % Idea: when parsing the path, add a detection if there is a closepath at the current segment, + % then cache the data of the last segment. + % We could then insert a "fake previous segment" into the path at the right place + \pgfutil@packagewarning{tikz-nfold}{The option `cycle' is not yet properly supported} + \pgfpathclose \fi - \ifx\pgfdecorationcurrentinputsegment\pgfdecorationinputsegmentcurveto + \ifx\pgf@nfold@currentinputsegment\pgf@nfold@inputsegmentcurveto \ifpgf@nfold@continuesegment - \pgfoffsetcurvenomove{\pgf@nfold@segment@start}{\pgf@decorate@inputsegment@supporta}{\pgf@decorate@inputsegment@supportb}{\pgf@nfold@segment@end}{\pgf@shiftdec@amount} + \pgfoffsetcurvenomove{\pgf@nfold@segment@start}{\pgf@nfold@inputsegment@supporta}{\pgf@nfold@inputsegment@supportb}{\pgf@nfold@segment@end}{\pgf@nfold@shiftamount} \else - \pgfoffsetcurve{\pgf@nfold@segment@start}{\pgf@decorate@inputsegment@supporta}{\pgf@decorate@inputsegment@supportb}{\pgf@nfold@segment@end}{\pgf@shiftdec@amount} + \pgfoffsetcurve{\pgf@nfold@segment@start}{\pgf@nfold@inputsegment@supporta}{\pgf@nfold@inputsegment@supportb}{\pgf@nfold@segment@end}{\pgf@nfold@shiftamount} \fi \fi - \ifx\pgfdecorationcurrentinputsegment\pgfdecorationinputsegmentlast - % Seems like this never happens - \pgfwarning{'nfold': Unexpected state (last part in segment state).} - \fi - % cache the end angle and end point because we need it on the next pass - \global\pgf@nfold@cached@endangle=\pgfdecoratedinputsegmentendangle pt\relax - \ifx\pgfdecorationnextinputsegmentobject\pgfdecorationinputsegmentmoveto\else - \global\let\pgf@nfold@cached@endpoint\pgf@nfold@segment@end + \ifx\pgf@nfold@currentinputsegment\pgf@nfold@inputsegmentmoveto + % Every moveto is executed in the offsetting of the subsequent draw command, + % therefore we do not need a \pgfpathmoveto call here + \ifx\pgf@nfold@previousinputsegment\pgf@nfold@inputsegmentfirst + % Draw the tip extension at the start (if present) + \ifnum\pgf@nfold@start@arrowcode=1 + \pgf@nfold@extendtotip{s}% + \fi% + \fi \fi - % Step 5: Extend into the arrow tip at the end (if present) - \ifx\pgfdecorationnextinputsegmentobject\pgfdecorationinputsegmentlast% - \pgf@nfold@check@tip@end% - \ifpgf@nfold@tip@implies% + % Step 4: Extend into the arrow tip at the end (if present) + \ifx\pgf@nfold@next@segmenttype\pgf@nfold@inputsegmentlast% + \ifnum\pgf@nfold@end@arrowcode=1 \pgf@nfold@extendtotip{e}% \fi% \fi% } -\pgfdeclaredecoration{pgf@nfold@shift}{start}{% - \state{start}[width=\pgfdecoratedinputsegmentremainingdistance, next state=segment]{% - \egroup\begingroup - \pgf@nfold@shift@prepare@segment - \pgf@nfold@check@tip@start% - \ifpgf@nfold@tip@implies% - \pgf@nfold@extendtotip{s}% - \fi - \pgf@nfold@shift@handle@segment - \endgroup\bgroup% - } - \state{segment}[width=\pgfdecoratedinputsegmentremainingdistance, next state=segment]{% - \egroup\begingroup - \pgf@nfold@shift@prepare@segment - \pgf@nfold@shift@handle@segment - \endgroup\bgroup% - }% -}% - +% Rendering arrow tips +% -------------------- -% Internal pre-pass decoration -% ---------------------------- -% -% This internal decoration is run as the first step in the decoration 'nfold'. -% It caches some data that won't be accessible later, and it also makes space for the arrow tips -% if needed. +% Precomputed intersections % +% For arrows of order n > 2 with an Implies tip, the constituent parts of the n-fold arrow +% end somewhere in the middle of the tip. The exact end point must be computed using +% the intersections library. To speed up compilation times, the intersection points are precomputed +% up to n = 5. If your document contains arrows of order 6 or larger, consider adding those +% as well; the values are output in the log file. +\expandafter\def\csname pgf@nfold@intersec@cache@2@3\endcsname{\pgfqpoint{2pt}{0pt}} +\expandafter\def\csname pgf@nfold@intersec@cache@2@4\endcsname{\pgfqpoint{0.94063pt}{-0.33333pt}} +\expandafter\def\csname pgf@nfold@intersec@cache@3@4\endcsname{\pgfqpoint{0.94063pt}{0.33333pt}} +\expandafter\def\csname pgf@nfold@intersec@cache@2@5\endcsname{\pgfqpoint{0.64167pt}{-0.5pt}} +\expandafter\def\csname pgf@nfold@intersec@cache@3@5\endcsname{\pgfqpoint{2pt}{0pt}} +\expandafter\def\csname pgf@nfold@intersec@cache@4@5\endcsname{\pgfqpoint{0.64167pt}{0.5pt}} +% intersections are precomputed up to this order +\def\pgf@nfold@intersec@numcached{5} -\def\pgf@nfold@storedata@handle@segment{% - \let\pgf@nfold@segment@end\pgf@decorate@inputsegment@last% - \ifx\pgfdecorationnextinputsegmentobject\pgfdecorationinputsegmentlast% - % Implementing shorten > and making space for the arrow tip (if present) - \pgf@nfold@check@tip@end% - \ifpgf@nfold@tip@implies% - \pgfmathparse{-\pgf@shorten@end@additional-2.06*\pgf@decoration@nfold@hwidth-0.5*\pgflinewidth} - \else - \pgfmathparse{-\pgf@shorten@end@additional} - \fi - % This is the point where the arrow body ends - \pgfpointadd% - {\pgf@decorate@inputsegment@last}% - {\pgfpointpolar{\pgfdecoratedinputsegmentendangle}{\pgfmathresult pt}}% - \pgfstorepoint\pgf@nfold@segment@end% - % This is the tip of the arrow, required for drawing the arrow head - \pgfpointadd% - {\pgf@decorate@inputsegment@last}% - {\pgfpointpolar% - {\pgfdecoratedinputsegmentendangle}% - {-\pgf@shorten@end@additional}}% - \pgfglobalstorepoint\pgf@nfold@original@last% - \fi% - \ifx\pgfdecorationcurrentinputsegment\pgfdecorationinputsegmentmoveto% - \pgfpathmoveto{\pgf@nfold@segment@end}% - \fi% - \ifx\pgfdecorationcurrentinputsegment\pgfdecorationinputsegmentlineto% - \pgfpathlineto{\pgf@nfold@segment@end}% - \fi% - \ifx\pgfdecorationcurrentinputsegment\pgfdecorationinputsegmentclosepath% - \pgfpathlineto{\pgf@nfold@segment@end}% - \fi% - \ifx\pgfdecorationcurrentinputsegment\pgfdecorationinputsegmentcurveto% - \pgfpathcurveto% - {\pgf@decorate@inputsegment@supporta}% - {\pgf@decorate@inputsegment@supportb}% - {\pgf@nfold@segment@end}% - \fi% -} - -\pgfdeclaredecoration{pgf@nfold@storedata}{start}{% - \state{start}[width=\pgfdecoratedinputsegmentremainingdistance, next state=segment]{% - \egroup\begingroup - \pgftransformreset - \iftikz@mode@double\else - \pgferror{Must enable /tikz/double to use 'nfold' (e.g. using [double distance=5pt]).} - \fi - % Cache arrow settings - \pgf@nfold@storearrows - % Cache inner and outer line width from the '/tikz/double' settings. These are stored in - % the macro \tikz@double@setup. Internally, the value of \pgfinnerlinewidth determines whether - % double stroke is enabled or not. Calling \tikz@double@setup changes line widths globally, so - % encapsulating the calls in a group would still have side effects. What we do instead is call - % \tikz@double@setup and then restore \pgflinewidth. - \tikz@double@setup - \pgfmathsetlengthmacro{\pgf@nfold@temp@fullwidth}{.25*(\pgflinewidth+\pgfinnerlinewidth)} - \global\edef\pgf@decoration@nfold@hwidth{\pgf@nfold@temp@fullwidth} - % We can either store \pgflinewidth before calling \tikz@double@setup, or we can reconstruct - % its old value from the new values. We do the latter here. - \pgfmathparse{.5*(\pgflinewidth-\pgfinnerlinewidth)} - \pgfsetlinewidth{\pgfmathresult pt} - % shorten < and shorten > do not work well with this decoration for various reasons. - % We "bake" them into the path in the pre-pass and then disable them for the rendering passes. - \pgfpointadd% - {\pgf@decorate@inputsegment@first}% - {\pgfpointpolar{\pgfdecoratedinputsegmentstartangle}{\pgf@shorten@start@additional}} - % store the tip of the arrow - \pgfglobalstorepoint\pgf@nfold@original@first% - % make space if applicable - \pgf@nfold@check@tip@start% - \ifpgf@nfold@tip@implies% - \pgfmathparse{\pgf@shorten@start@additional+2.06*\pgf@decoration@nfold@hwidth+0.5*\pgflinewidth} +% This macro extends the arrow body to the tips +% parameter: s=start, e=end +\def\pgf@nfold@extendtotip#1{ + \ifpgf@nfold@intersectionsnotloaded + \pgfutil@packageerror{tikz-nfold}{% + If `nfold' is larger than \pgf@nfold@intersec@numcached\space and you use + an `Implies' arrow tip you need to say \string\usetikzlibrary{intersections}}{} + \else + % Do not extend the arrow for index=1 and index=order, it already ends in the right place + \ifnum\pgf@nfold@index>1\relax\ifnum\pgf@nfold@index<\pgf@nfold@order\relax% + % Step 1: Find the intersection of the arrow's path with the head + \ifcsname pgf@nfold@intersec@cache@\the\pgf@nfold@index @\the\pgf@nfold@order\endcsname + \pgfextract@process\pgf@nfold@arrowintersect + {\csname pgf@nfold@intersec@cache@\the\pgf@nfold@index @\the\pgf@nfold@order\endcsname}% + \else + % the intersection has not been precomputed, thus compute on the fly here + \pgfintersectionofpaths{ + % specify the tip + \pgfpathmoveto{\pgfqpoint{-1.4pt}{2.65pt}} + \pgfpathcurveto{\pgfqpoint{-0.75pt}{1.25pt}}{\pgfqpoint{1pt}{0.05pt}}{\pgfqpoint{2pt}{0pt}} + \pgfpathcurveto{\pgfqpoint{1pt}{-0.05pt}}{\pgfqpoint{-0.75pt}{-1.25pt}}{\pgfqpoint{-1.4pt}{-2.65pt}} + }{ + % extend the body to intersect the tip + \pgfpathmoveto{\pgfqpoint{-3pt}{\pgf@nfold@shift@fraction pt}} + \pgfpathlineto{\pgfqpoint{3pt}{\pgf@nfold@shift@fraction pt}} + } + \ifnum\pgfintersectionsolutions>0 + \pgfextract@process\pgf@nfold@arrowintersect{\pgfpointintersectionsolution{1}}% + \immediate\write17{tikz-nfold: computed intersection cache@\the\pgf@nfold@index @\the\pgf@nfold@order: \string\pgfqpoint{\the\pgf@x}{\the\pgf@y}^^J} + % add the new intersection to the cache + \expandafter\xdef\csname pgf@nfold@intersec@cache@\the\pgf@nfold@index @\the\pgf@nfold@order\endcsname{\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}} + \else + % this is a failsafe and should never be reached + \pgfutil@packagewarning{tikz-nfold}{did not find intersection} + \pgfextract@process\pgf@nfold@arrowintersect{\pgfqpoint{0pt}{\pgf@nfold@shift@fraction pt}}% + \fi + \fi% if precomputed + % Step 2: Extend the arrow body to the intersection point. + % If the tip is at the beginning of the path, we have to move to the intersection + % and then draw a line to the "regular" starting point. The subsequent segment then + % should omit its moveto. + % If the tip is at the end, we are already in the right position and only need to extend + % the current path to the intersection point. + \begingroup + \pgftransformreset + \if#1s + \pgftransformshift{\pgf@nfold@segment@start} + \pgftransformrotate{\pgf@nfold@next@startangle} + \pgftransformxscale{-1} + \else + \pgftransformshift{\pgf@nfold@segment@end} + \pgftransformrotate{\pgf@nfold@cur@endangle} + \fi + % we don't want to undo the shift by .42\pgflinewidth after the scaling + \pgfutil@tempdima=\pgf@nfold@hwidth + \pgfutil@tempdima=\pgf@nfold@shift@fraction\pgfutil@tempdima + \pgfextract@process\pgf@nfold@startofextension + {\pgfpointtransformed{\pgfqpoint{0pt}{\pgfutil@tempdima}}} + % 0.5 - 0.06 = 0.42 + \pgftransformshift{\pgfqpoint{.42\pgflinewidth}{0pt}} + \pgftransformscale{\pgf@nfold@hwidth} + \pgfextract@process\pgf@nfold@arrowintersect{\pgfpointtransformed{\pgf@nfold@arrowintersect}} + \global\let\pgf@nfold@startofextension\pgf@nfold@startofextension + \global\let\pgf@nfold@arrowintersect\pgf@nfold@arrowintersect + \endgroup + \if#1s + \pgfpathmoveto{\pgf@nfold@arrowintersect} + % This is precisely the start of the body, shifted vertically + \pgfpathlineto{\pgf@nfold@startofextension} + % hack: We make the next segment believe that this segment was a lineto + % so the path does not get interrupted + \let\pgf@nfold@currentinputsegment\pgf@nfold@inputsegmentlineto + \let\pgf@nfold@cur@endangle\pgf@nfold@next@startangle + \else\if#1e + \pgfpathlineto{\pgf@nfold@arrowintersect} \else - \pgfmathparse{\pgf@shorten@start@additional} - \fi - \pgfpointadd% - {\pgf@decorate@inputsegment@first}% - {\pgfpointpolar{\pgfdecoratedinputsegmentstartangle}{\pgfmathresult pt}} - % - \pgfpathmoveto{} - \pgf@nfold@storedata@handle@segment - \endgroup\bgroup - } - \state{segment}[width=\pgfdecoratedinputsegmentremainingdistance, next state=segment]{% - \egroup\begingroup + \pgfutil@packageerror{tikz-nfold}{Invalid argument to \string\pgf@nfold@extendtotip: \meaning#1}{} + \fi\fi \pgftransformreset - \pgf@nfold@storedata@handle@segment - \endgroup\bgroup - }% - \state{final}{} -}% + \fi\fi% if 1 < i < nArrows + \fi% if intersections is needed and not loaded +} +% Parsing the arrow tips +% ---------------------- +% +% We need to detect if the user has set Implies[] arrows at the start and/or end tip. +% To do so, we parse \pgf@start@tip@sequence. If the user specifies Implies[] manually, +% we find that +% pgf@start@tip@sequence=\pgf@arrow@handle{Implies}{...} +% However, in other cases (like tikz-cd) we may find +% \pgf@arrow@handle@shorthand@empty {\csname pgf@ar@means@tikzcd implies cap\endcsname } +% In such cases we must expand the first parameter once and then match as above. -% Detecting arrow tips -% -------------------- +% Set global defaults +\def\pgf@nfold@start@arrowcode{0} +\def\pgf@nfold@end@arrowcode{0} -% Old arrow matching -% -% This is the content of \pgf@arrow@tip@sequence for arrows | and Implies, respectively -% -%\edef\pgf@arrow@macro@verticalline{\noexpand\pgf@arrow@handle@shorthand@empty {\expandafter\noexpand\csname pgf@ar@means@|\endcsname }} -%\def\pgf@arrow@macro@Implies{\pgf@arrow@handle {Implies}{}} -% The next one is wrong; use \csname pgf@ar@means@tikzcd implies\endcsname -%\def\tikzcd@arrow@implies{\pgf@arrow@handle@shorthand@empty {\pgf@ar@means@tikzcd implies }} - -% Intercept the arrows at definition -\let\pgf@nfold@cachedarrows\pgfutil@empty % default value -\let\pgf@nfold@oldsetarrows\pgfsetarrows -\def\pgfsetarrows#1{% - \def\pgf@nfold@cachedarrows{#1}% - \pgf@nfold@oldsetarrows{#1}% -} - -\let\pgf@nfold@cached@arrow@start\pgfutil@empty -\let\pgf@nfold@cached@arrow@end\pgfutil@empty -\def\pgf@nfold@storearrows{% - \ifx\pgf@nfold@cachedarrows\pgfutil@empty - % reset the cached values in case we don't have an arrow; this is important - % because the cached values are set globally - \global\let\pgf@nfold@cached@arrow@start\pgfutil@empty - \global\let\pgf@nfold@cached@arrow@end\pgfutil@empty - \else% - \expandafter\pgf@nfold@parsearrows@\pgf@nfold@cachedarrows\pgf@stop% - \fi% +\def\pgf@nfold@parsearrows{ + \ifpgfutil@tempswa% this is set in \pgfusepath and stores whether we draw arrow tips at all + \expandafter\pgf@nfold@parsearrowmacro\pgf@start@tip@sequence\relax + \let\pgf@nfold@start@arrowcode\pgf@nfold@detectedarrow + \expandafter\pgf@nfold@parsearrowmacro\pgf@end@tip@sequence\relax + \let\pgf@nfold@end@arrowcode\pgf@nfold@detectedarrow + \else + \def\pgf@nfold@start@arrowcode{0} + \def\pgf@nfold@end@arrowcode{0} + \fi } -\def\pgf@nfold@parsearrows@#1-#2\pgf@stop{% - % These must be set globally because \pgf@nfold@storearrows is called from within a decoration; - % also, this cached value must survive subsequent calls of \pgfsetarrows{} which disable arrows - \gdef\pgf@nfold@cached@arrow@start{#1}% - \gdef\pgf@nfold@cached@arrow@end{#2}% -} - -% Here we match against the names of the arrows that were set in \pgfarrowsset{...}. -% This does not respect aliases, i.e. redefining /tikzcd implies cap will not have -% the desired effect. We may be able to fix this in the future, see below. -\def\pgf@nfold@nonetip@i{tikzcd implies cap} -\def\pgf@nfold@impliestip@i{Implies} -\def\pgf@nfold@impliestip@ii{tikzcd implies} -\def\pgf@nfold@mapstotip@i{|} -\def\pgf@nfold@mapstotip@ii{tikzcd implies bar} -\def\pgf@nfold@mapstotip@iii{Bar} -\newif\ifpgf@nfold@tip@implies -\newif\ifpgf@nfold@tip@mapsto - -\def\pgf@nfold@check@tip@start{% -\pgf@nfold@check@tip{\pgf@nfold@cached@arrow@start}% -} -\def\pgf@nfold@check@tip@end{% -\pgf@nfold@check@tip{\pgf@nfold@cached@arrow@end}% -} - -\def\pgf@nfold@check@tip#1{% - \pgf@nfold@tip@impliesfalse% - \pgf@nfold@tip@mapstofalse% - \ifx#1\pgfutil@empty% - % no tip + +\def\pgf@nfold@parsearrowmacro#1{% + \def\pgf@nfold@detectedarrow{0} + \ifx#1\relax + \let\pgf@next\relax \else - \ifx#1\pgf@nfold@nonetip@i% - % no tip + \ifx#1\pgf@arrow@handle + % found \pgf@arrow@handle{...}, now parse the first parameter + \let\pgf@next\pgf@nfold@parse@arrow@handle \else - \ifx#1\pgf@nfold@impliestip@i% - \pgf@nfold@tip@impliestrue% + \ifx#1\pgf@arrow@handle@shorthand@empty + \let\pgf@next\pgf@nfold@parse@shorthandempty \else - \ifx#1\pgf@nfold@impliestip@ii% - \pgf@nfold@tip@impliestrue% - \else - \ifx#1\pgf@nfold@mapstotip@i% - \pgf@nfold@tip@mapstotrue% - \else - \ifx#1\pgf@nfold@mapstotip@ii% - \pgf@nfold@tip@mapstotrue% - \else - \ifx#1\pgf@nfold@mapstotip@iii% - \pgf@nfold@tip@mapstotrue% - \else - \pgfwarning{'nfold': Unsupported arrow tip "#1"} - \fi - \fi - \fi - \fi + % found nothing + \let\pgf@next\pgfutil@gobble@until@relax \fi \fi \fi + \pgf@next } -% Future: In principle, we can dereference aliases (means=...) the following way: +\def\pgf@nfold@param@Implies{Implies} + +\def\pgf@nfold@parse@arrow@handle#1{% + \def\pgf@tmp{#1} + \ifx\pgf@tmp\pgf@nfold@param@Implies + \def\pgf@nfold@detectedarrow{1} + \fi + \pgfutil@gobble@until@relax +} + +\def\pgf@nfold@parse@shorthandempty#1{ + % Expand #1 once (\pgf@arrow@handle@shorthand@empty is just an identity operator) + \expandafter\def\expandafter\pgf@tmp\expandafter{#1} + \expandafter\pgf@nfold@parsearrowmacro\pgf@tmp\relax + % still need to gobble the rest of the orginal arrow definition + \pgfutil@gobble@until@relax +} + + % -% \ifcsname pgf@ar@means@tikzcd implies bar\endcsname -% \expandafter\let\expandafter\tempmacro\csname pgf@ar@means@tikzcd implies bar\endcsname -% \pgfwarning{\meaning\tempmacro} -% \fi +% Hooking into pgf's rendering pipeline +% ------------------------------------- % -% However, the alias is not a name, but a macro, which in turn could call dereference aliases. -% We could go down this rabbit hole in the future, but I won't do that for now. +% The new code has to be injected into \pgfusepath (pgfcorepathusage.code.tex). For rendering the new paths, +% \pgf@stroke@inner@line is a natural choice as this is where /tikz/double is rendered. However, we also +% need to disable rendering the ordinary path, which is not as easy. In the future I will make a pull request +% to TikZ to simplify such injections. +% +% The call to draw the path comes right before \pgf@stroke@inner@line. The macro before \pgf@stroke@inner@line +% is either \pgf@path@check@proper or \pgf@prepare@start@of@path (depending on the result of the proper check). +% We therefore must inject code into both of them to see if nfold is enabled. If it is, we call the old macro, +% cache and delete the current softpath (so the call to \pgfsyssoftpath@invokecurrentpath has no effect), then we +% restore and offset the cached softpath in \pgf@stroke@inner@line. +% +% The macros \pgf@path@check@proper and \pgf@prepare@start@of@path are also used in \pgf@up@draw@arrows@only, +% so we must make sure that the latter is unaffected by the modifications. Luckily, this turns out not to be +% a problem - the only macros that are called after the modified ones are \pgf@add@arrow@at@start and +% \pgf@add@arrow@at@end, which do not change their behaviour even if we modify the paths. % -% For now this means that redefining /tikz/commutative diagrams/tikzcd implies cap will not -% have the desired effect. +\newcount\pgf@nfold@order +\pgf@nfold@order=1 + +\def\pgf@nfold@preparenfoldpath{% + \ifnum\pgf@nfold@order>1\relax + \ifdim\pgfinnerlinewidth>0pt\relax + % Hack the rendering pipeline: There is a \pgfsyssoftpath@invokecurrentpath call following + % which we do not want if nfold is active. We therefore clear the current path here + % and then perform the nfold drawing in our modification of \pgf@stroke@inner@line + \pgfsyssoftpath@getcurrentpath\cachedpath% + \pgfsyssoftpath@setcurrentpath\pgfutil@empty% + \else + \pgfutil@packageerror{tikz-nfold}{Must set \string\pgfinnerlinewidth\space to use nfold, e.g. by setting /tikz/double distance}{} + \fi + \fi +} + +\let\pgf@nfold@old@path@check@proper\pgf@path@check@proper +\def\pgf@path@check@proper{% + \pgf@nfold@old@path@check@proper% + \ifpgfutil@tempswa\else% + % if \pgfutil@tempswa is false, this is the last macro we can overwrite before the draw call. + % Otherwise, we inject into \pgf@prepare@start@of@path% + \pgf@nfold@preparenfoldpath% + \fi% +} + +\let\pgf@nfold@old@prepare@start@of@path\pgf@prepare@start@of@path +\def\pgf@prepare@start@of@path{% + \pgf@nfold@old@prepare@start@of@path% + \pgf@nfold@preparenfoldpath% +} + +\let\pgf@nfold@old@stroke@inner@line\pgf@stroke@inner@line +\def\pgf@stroke@inner@line{% + \ifnum\pgf@nfold@order>1\relax% + \pgf@nfold@render@cached@softpath% + \else% + % Old behaviour + \pgf@nfold@old@stroke@inner@line% + \fi% +} -% Rendering arrow tips -% -------------------- -% Precomputed intersections % -% For arrows of order n > 2 with an Implies tip, the constituent parts of the n-fold arrow -% end somewhere in the middle of the tip. The exact end point must be computed using -% the intersections library. To speed up compilation times, the intersection points are precomputed -% up to n = 5. If your document contains arrows of order 6 or larger, consider adding those -% as well; the values are output in the log file. -\expandafter\def\csname tikz@arrow@intersec@cache@2@3\endcsname{\pgfqpoint{2pt}{0pt}} -\expandafter\def\csname tikz@arrow@intersec@cache@2@4\endcsname{\pgfqpoint{0.94063pt}{-0.33333pt}} -\expandafter\def\csname tikz@arrow@intersec@cache@3@4\endcsname{\pgfqpoint{0.94063pt}{0.33333pt}} -\expandafter\def\csname tikz@arrow@intersec@cache@2@5\endcsname{\pgfqpoint{0.64167pt}{-0.5pt}} -\expandafter\def\csname tikz@arrow@intersec@cache@3@5\endcsname{\pgfqpoint{2pt}{0pt}} -\expandafter\def\csname tikz@arrow@intersec@cache@4@5\endcsname{\pgfqpoint{0.64167pt}{0.5pt}} -% intersections are precomputed up to this order -\def\tikz@arrow@intersec@numcached{5} - -% Decoration for the start tip -\pgfdeclaredecoration{pgf@nfold@tip@start}{start}{% - \state{start}[width=\pgfdecoratedinputsegmentremainingdistance, next state=segment]{% - \egroup\begingroup% - \pgf@nfold@check@tip@start% - \pgf@nfold@setup@start@tip% - \ifpgf@nfold@tip@implies% - \pgf@nfold@setupimplies% - \pgf@nfold@drawimplies% - \fi% - \ifpgf@nfold@tip@mapsto% - \pgf@nfold@setupmapsto% - \pgf@nfold@drawmapsto% +% Parsing the soft path +% --------------------- +% +% A significant part of the code below is based on pgfmoduledecorations.code.tex (c) 2019 Mark Wibrow and Till Tantau. +% Quite similar to decorations we parse the current soft path and put it into a form that makes it easier +% to iterate over. +% +% + +\def\pgf@nfold@parsesoftpath#1#2{% + \def\pgf@nfold@inputsegmentobjectsmacro{#2}% + \let\pgf@nfold@inputsegmentobjects\pgfutil@empty% + \pgfutil@tempdima0pt\relax% + \edef\pgfpoint@nfold@lastparsed{\pgf@x\the\pgf@path@lastx\pgf@y\the\pgf@path@lasty}% + \let\pgfpoint@nfold@lastnonmovetoparsed\pgfpoint@origin% + \let\pgf@nfold@queueinputsegmentobject\pgfutil@empty% + \let\pgfpoint@nfoldd@firstparsed\pgfutil@empty% + \expandafter\pgf@nfold@@parsesoftpath#1\pgf@stop% +}% + +\def\pgf@nfold@@parsesoftpath#1{% + \ifx#1\pgf@stop% + \let\pgf@nfold@queueinputsegmentobject\pgfutil@empty% <- removes final moveto (may not be desirable). + \pgf@nfold@addtoinputsegmentobjects{\pgf@nfold@inputsegmentobject@endofinputsegments}% + % probably so that the last segment also has a well-defined next segment + \pgf@nfold@addtoinputsegmentobjects{\pgf@nfold@inputsegmentobject@endofinputsegments}% + \expandafter\let\pgf@nfold@inputsegmentobjectsmacro\pgf@nfold@inputsegmentobjects% + \let\pgf@next\relax% + \else% + \ifx#1\pgfsyssoftpath@movetotoken% + \let\pgf@next\pgf@nfold@parsemoveto% + \else% + \ifx#1\pgfsyssoftpath@linetotoken% + \let\pgf@next\pgf@nfold@parselineto% + \else% + \ifx#1\pgfsyssoftpath@curvetosupportatoken% + \let\pgf@next\pgf@nfold@parsecurveto% + \else% + \ifx#1\pgfsyssoftpath@closepathtoken% + \let\pgf@next\pgf@nfold@parseclosepath% + \else% + \ifx#1\pgfsyssoftpath@rectcornertoken% + \let\pgf@next\pgf@nfold@parserect% + \else% + \pgfutil@packageerror{tikz-nfold}{Unrecognised soft path token `#1'}{}% + \fi% + \fi% + \fi% + \fi% \fi% - \endgroup\bgroup% + \fi% + \pgf@next}% + +\def\pgf@nfold@parsemoveto#1#2{% + \def\pgf@nfold@queueinputsegmentobject{\pgf@nfold@inputsegmentobject@moveto{\pgf@x#1\pgf@y#2}}% + \def\pgfpoint@nfold@lastparsed{\pgf@x#1\pgf@y#2}% + \pgf@nfold@@parsesoftpath% +}% + +% Convert \pgfsyssoftpath@linetotoken{<X>}{<Y>} into the following +% representation: +% +% \pgf@nfold@inputsegmentobject@lineto{<length>}{\pgf@x <Last X> \pgf@y <Last Y>}{\pgf@x <X> \pgf@y <Y>} +% +\def\pgf@nfold@parselineto#1#2{% + % remove degenerate line segments (reduces glitches) + \pgf@process{\pgfpointdiff{\pgfpoint@nfold@lastparsed}{\pgf@x#1\pgf@y#2}} + \pgfpointtaxicabnorm\pgf@xa + \ifdim\pgf@xa>.1pt\relax + \edef\pgf@nfold@temp{% + \noexpand\pgf@nfold@inputsegmentobject@lineto{\pgfpoint@nfold@lastparsed}{\pgf@x#1\pgf@y#2}% + }% + \edef\pgfpoint@nfold@lastparsed{\pgf@x#1\pgf@y#2}% + \let\pgfpoint@nfold@lastnonmovetoparsed\pgfpoint@nfold@lastparsed% + \expandafter\pgf@nfold@addtoinputsegmentobjects\expandafter{\pgf@nfold@temp}% + \fi + \pgf@nfold@@parsesoftpath% +}% + +\def\pgf@nfold@parsecurveto#1#2\pgfsyssoftpath@curvetosupportbtoken#3#4\pgfsyssoftpath@curvetotoken#5#6{% + \edef\pgf@nfold@temp{% + \noexpand\pgf@nfold@inputsegmentobject@curveto{\pgfpoint@nfold@lastparsed}% + {\pgf@x#1\pgf@y#2}{\pgf@x#3\pgf@y#4}{\pgf@x#5\pgf@y#6}% }% - \state{segment}[width=\pgfdecoratedinputsegmentremainingdistance, next state=segment]{}% + \expandafter\pgf@nfold@addtoinputsegmentobjects\expandafter{\pgf@nfold@temp}% + \edef\pgfpoint@nfold@lastparsed{\pgf@x#5\pgf@y#6}% + \let\pgfpoint@nfold@lastnonmovetoparsed\pgfpoint@nfold@lastparsed% + \pgf@nfold@@parsesoftpath% }% -% Decoration for the end tip -\pgfdeclaredecoration{pgf@nfold@tip@end}{segment}{% - \state{segment}[width=\pgfdecoratedinputsegmentremainingdistance, next state=segment]{} - \state{final}{% - \egroup\begingroup% - \pgf@nfold@check@tip@end% this step already checks for unsupported arrows - \pgf@nfold@setup@end@tip - \ifpgf@nfold@tip@implies% - \pgf@nfold@setupimplies% - \pgf@nfold@drawimplies% - \fi% - \ifpgf@nfold@tip@mapsto - \pgf@nfold@setupmapsto - \pgf@nfold@drawmapsto - \fi - \endgroup\bgroup% - } +\def\pgf@nfold@parseclosepath#1#2{% + \edef\pgf@nfold@temp{% + \noexpand\pgf@nfold@inputsegmentobject@closepath{\pgfpoint@nfold@lastparsed}{\pgf@x#1\pgf@y#2}% + }% + \let\pgfpoint@nfold@lastnonmovetoparsed\pgfpoint@nfold@lastparsed% + \expandafter\pgf@nfold@addtoinputsegmentobjects\expandafter{\pgf@nfold@temp}% + \pgf@nfold@@parsesoftpath% }% +% Mostly for the sake of completeness; using TikZ' "\path (0,0) rectangle (1,1);" does not call this code +\def\pgf@nfold@parserect#1#2\pgfsyssoftpath@rectsizetoken#3#4{% + \let\pgf@nfold@orig@@parsesoftpath\pgf@nfold@@parsesoftpath% + \let\pgf@nfold@@parsesoftpath\relax% + \pgf@nfold@parsemoveto{#1}{#2}% + \pgf@xb=#1\relax + \pgf@yb=#2\relax + \pgf@xc=#3\relax + \pgf@yc=#4\relax + \advance\pgf@yb\pgf@yc% + \edef\pgf@temp{{\the\pgf@xb}{\the\pgf@yb}}% + \expandafter\pgf@nfold@parselineto\pgf@temp% + \advance\pgf@xb\pgf@xc% + \edef\pgf@temp{{\the\pgf@xb}{\the\pgf@yb}}% + \expandafter\pgf@nfold@parselineto\pgf@temp% + \advance\pgf@yb-\pgf@yc% + \edef\pgf@temp{{\the\pgf@xb}{\the\pgf@yb}}% + \expandafter\pgf@nfold@parselineto\pgf@temp% + \advance\pgf@xb-\pgf@xc% + \edef\pgf@temp{{\the\pgf@xb}{\the\pgf@yb}}% + \expandafter\pgf@nfold@parselineto\pgf@temp% + \let\pgf@nfold@@parsesoftpath\pgf@nfold@orig@@parsesoftpath% + \edef\pgf@marshal{\noexpand\pgf@nfold@parsemoveto{\the\pgf@xb}{\the\pgf@yb}}% + \pgf@marshal% +} + +\def\pgf@nfold@addtoinputsegmentobjects#1{% + % + % If there is an input segment object waiting (i.e. a moveto), insert it here. + % + \ifx\pgf@nfold@queueinputsegmentobject\pgfutil@empty% + \else% + \let\pgf@nfold@temp\pgf@nfold@queueinputsegmentobject% + \let\pgf@nfold@queueinputsegmentobject\pgfutil@empty% + \expandafter\pgf@nfold@addtoinputsegmentobjects\expandafter{\pgf@nfold@temp}% + \fi% + \ifx\pgfpoint@nfold@firstparsed\pgfutil@empty% + #1% + \let\pgfpoint@nfold@firstparsed\pgf@nfold@inputsegment@first% + \fi% + \expandafter\def\expandafter\pgf@nfold@inputsegmentobjects\expandafter% + {\pgf@nfold@inputsegmentobjects{#1}}% +}% + + +\def\pgf@nfold@inputsegmentfirst{first}% +\def\pgf@nfold@inputsegmentmoveto{moveto}% +\def\pgf@nfold@inputsegmentlineto{lineto}% +\def\pgf@nfold@inputsegmentcurveto{curveto}% +\def\pgf@nfold@inputsegmentclosepath{closepath}% +\def\pgf@nfold@inputsegmentlast{last}% + + +\def\pgf@nfold@inputsegmentobject@moveto#1{% + \def\pgf@nfold@inputsegment@first{#1}% + \def\pgf@nfold@inputsegment@supporta{#1}% + \def\pgf@nfold@inputsegment@supportb{#1}% + \def\pgf@nfold@inputsegment@last{#1}% + \edef\pgf@nfold@lastmoveto{#1}% + \let\pgf@nfold@currentinputsegment\pgf@nfold@inputsegmentmoveto% +}% + +\def\pgf@nfold@inputsegmentobject@lineto#1#2{% + \def\pgf@nfold@inputsegment@first{#1}% + \def\pgf@nfold@inputsegment@last{#2}% + \let\pgf@nfold@currentinputsegment\pgf@nfold@inputsegmentlineto% +}% -\def\pgf@nfold@setup@start@tip{ +\def\pgf@nfold@inputsegmentobject@curveto#1#2#3#4{% + \def\pgf@nfold@inputsegment@first{#1}% + \def\pgf@nfold@inputsegment@supporta{#2}% + \def\pgf@nfold@inputsegment@supportb{#3}% + \def\pgf@nfold@inputsegment@last{#4}% + \let\pgf@nfold@currentinputsegment\pgf@nfold@inputsegmentcurveto% +}% + +\def\pgf@nfold@inputsegmentobject@closepath#1#2{% + \def\pgf@nfold@inputsegment@first{#1}% + \def\pgf@nfold@inputsegment@last{#2}% + \let\pgf@nfold@currentinputsegment\pgf@nfold@inputsegmentclosepath% +}% + +\def\pgf@nfold@inputsegmentobject@endofinputsegments{% + \let\pgf@nfold@currentinputsegment\pgf@nfold@inputsegmentlast% +}% + + +\def\pgf@nfold@traversepath{% + % Transformations are already baked into the path; without this call, they would be applied twice \pgftransformreset - \pgftransformshift{\pgf@nfold@original@first} - \pgftransformrotate{\pgfdecoratedinputsegmentstartangle} - \pgftransformshift{\pgfpoint{.5*\pgflinewidth}{0pt}} - \pgftransformscale{\pgf@decoration@nfold@hwidth} - \pgftransformxscale{-1.} + % could likely also use \let\pgf@nfold@currentinputsegmentobjects\parsedsoftpath here + \let\pgf@nfold@currentinputsegmentobjects\pgf@nfold@inputsegmentobjects% +% \let\pgf@nfold@transformtoinputsegment\pgfutil@empty% we may need this one for closepath + \pgf@nfold@getnextinputsegmentobject\pgf@nfold@nextinputsegmentobject% + \let\pgf@nfold@currentinputsegment\pgf@nfold@inputsegmentfirst% + \def\pgf@nfold@cur@endangle{0.0}% put in some default value so \pgf@nfold@previous@endangle is not undefined + \pgf@nfold@traversepath@ } -\def\pgf@nfold@setup@end@tip{ - \pgftransformreset - \pgftransformshift{\pgf@nfold@original@last} - \pgftransformrotate{\pgf@nfold@cached@endangle} - \pgftransformshift{\pgfpoint{-.5*\pgflinewidth}{0pt}} - \pgftransformscale{\pgf@decoration@nfold@hwidth} + + +\def\pgf@nfold@traversepath@{ + \pgf@nfold@processnextinputsegmentobject% + \ifx\pgf@nfold@currentinputsegment\pgf@nfold@inputsegmentlast\else + \pgf@nfold@handlesegment% + \fi% + \ifx\pgf@nfold@currentinputsegmentobjects\pgfutil@empty% + \let\pgf@next\relax% + \else% + \let\pgf@next\pgf@nfold@traversepath@% + \fi% + \pgf@next% } -\def\pgf@nfold@setupimplies{% - \pgfsetroundjoin% - \pgfsetroundcap% + +\def\pgf@nfold@computeangles{ + \ifx\pgf@nfold@currentinputsegment\pgf@nfold@inputsegmentcurveto% + \pgf@offset@compute@tangents{\pgf@nfold@inputsegment@first}{\pgf@nfold@inputsegment@supporta}{\pgf@nfold@inputsegment@supportb}{\pgf@nfold@inputsegment@last} + \let\pgf@nfold@cur@startangle\pgf@tmp@angle@i + \let\pgf@nfold@cur@endangle\pgf@tmp@angle@ii + \else% + \pgfmathanglebetweenpoints{\pgf@nfold@inputsegment@first}{\pgf@nfold@inputsegment@last}% + \edef\pgf@nfold@cur@startangle{\pgfmathresult} + \edef\pgf@nfold@cur@endangle{\pgfmathresult} + \fi% } -\def\pgf@nfold@drawimplies{ - \pgftransformshift{\pgfqpoint{-2pt}{0pt}} - \pgfpathmoveto{\pgfqpoint{-1.4pt}{2.65pt}} - \pgfpathcurveto{\pgfqpoint{-0.75pt}{1.25pt}}{\pgfqpoint{1pt}{0.05pt}}{\pgfqpoint{2pt}{0pt}} - \pgfpathcurveto{\pgfqpoint{1pt}{-0.05pt}}{\pgfqpoint{-0.75pt}{-1.25pt}}{\pgfqpoint{-1.4pt}{-2.65pt}} + +\def\pgf@nfold@clampangle{ + % The computed angles are values between 0 and 360, so their difference is between 360 and -360; + % we want the difference to be between -180 and 180 + \ifdim\pgfmathresult pt<-180pt\relax + \pgfutil@tempdima=\pgfmathresult pt + \advance\pgfutil@tempdima by 360pt + \edef\pgfmathresult{\pgf@sys@tonumber\pgfutil@tempdima} + \else\ifdim\pgfmathresult pt>180pt\relax + \pgfutil@tempdima=\pgfmathresult pt + \advance\pgfutil@tempdima by -360pt + \edef\pgfmathresult{\pgf@sys@tonumber\pgfutil@tempdima} + \fi\fi } -\def\pgf@nfold@setupmapsto{% - \pgfsetbuttcap% + +\def\pgf@nfold@getnextinputsegmentobject#1{% + \ifx\pgf@nfold@currentinputsegmentobjects\pgfutil@empty% + \let\pgf@next\relax% + \else% + \def\pgf@nfold@temp{#1}% + \let\pgf@next\pgf@nfold@@getnextinputsegmentobject% + \fi% + \pgf@next% +}% +\def\pgf@nfold@@getnextinputsegmentobject{% + \expandafter\pgf@nfold@@@getnextinputsegmentobject\pgf@nfold@currentinputsegmentobjects\pgf@stop}% +\def\pgf@nfold@@@getnextinputsegmentobject#1#2\pgf@stop{% + \expandafter\def\pgf@nfold@temp{#1}% + \def\pgf@nfold@currentinputsegmentobjects{#2}}% + +\def\pgf@nfold@processnextinputsegmentobject{% + \let\pgf@nfold@previousinputsegment\pgf@nfold@currentinputsegment% + \let\pgf@nfold@previous@endangle\pgf@nfold@cur@endangle% + \let\pgf@nfold@currentinputsegmentobject\pgf@nfold@nextinputsegmentobject% + \pgf@nfold@getnextinputsegmentobject\pgf@nfold@nextinputsegmentobject% + \pgf@nfold@nextinputsegmentobject% parse the *next* input segment so we can compute its angles + \pgf@nfold@computeangles% + \let\pgf@nfold@next@first\pgf@nfold@inputsegment@first% + \let\pgf@nfold@next@supporta\pgf@nfold@inputsegment@supporta% + \let\pgf@nfold@next@supportb\pgf@nfold@inputsegment@supportb% + \let\pgf@nfold@next@last\pgf@nfold@inputsegment@last% + \let\pgf@nfold@next@segmenttype\pgf@nfold@currentinputsegment% + \let\pgf@nfold@next@startangle\pgf@nfold@cur@startangle% + \pgf@nfold@currentinputsegmentobject% get the current segment into \pgf@nfold@inputsegment@first etc. + \pgf@nfold@computeangles% + % Compute the angle differences at the start and end (between -180 and +180 degrees) + % using \pgfmathsubtract@ is more readable and no less efficient than computing this manually + \pgfmathsubtract@{\pgf@nfold@cur@startangle}{\pgf@nfold@previous@endangle} + \pgf@nfold@clampangle + \edef\pgf@nfold@deltaphi@start{\pgfmathresult} + \pgfmathsubtract@{\pgf@nfold@next@startangle}{\pgf@nfold@cur@endangle} + \pgf@nfold@clampangle + \edef\pgf@nfold@deltaphi@end{\pgfmathresult} } -\def\pgf@nfold@drawmapsto{ - % Try: use the same width as the arrow head, minus the caps - \pgfpathmoveto{\pgfqpoint{0pt}{2.65pt}} - \pgfpathlineto{\pgfqpoint{0pt}{-2.65pt}} + + +% +% Iterating over the parsed soft path +% ----------------------------------- +% + +\newcount\pgf@nfold@index +\def\pgf@nfold@run@loop{% + \pgf@nfold@index=\pgf@nfold@order% + \pgf@nfold@run@loop@% } -% This macro extends the arrow body to the tips -% parameter: s=start, e=end -\def\pgf@nfold@extendtotip#1{ - % Do not extend the arrow for index=1 and index=order, it already ends in the right place - \ifnum\pgf@nfold@index>1\ifnum\pgf@nfold@index<\pgf@nfold@dec@order\relax% - % Step 1: Find the intersection of the arrow's path with the head. This is is computationally - % expensive, so we first look if the value has been precomputed. - \ifcsname tikz@arrow@intersec@cache@\pgf@nfold@index @\the\pgf@nfold@dec@order\endcsname - \csname tikz@arrow@intersec@cache@\pgf@nfold@index @\the\pgf@nfold@dec@order\endcsname - \pgfstorepoint\pgf@nfold@arrowintersect - \else - % the intersection has not been precomputed, thus compute on the fly here - \pgfintersectionofpaths{ - % specify the tip - \pgf@nfold@drawimplies - }{ - % extend the body to intersect the tip - \pgfpathmoveto{\pgfqpoint{-3pt}{\pgf@shiftdec@fraction pt}} - \pgfpathlineto{\pgfqpoint{3pt}{\pgf@shiftdec@fraction pt}} - } - \ifnum\pgfintersectionsolutions>0 - \pgfpointintersectionsolution{1} - \pgfstorepoint\pgf@nfold@arrowintersect - \makeatother - \typeout{tikz-nfold: computed intersection cache@\pgf@nfold@index @\the\pgf@nfold@dec@order: \string\pgfqpoint{\the\pgf@x}{\the\pgf@y}^^J} - \makeatletter - \else - % this is a failsafe and should never be reached - \pgfwarning{'nfold': did not find intersection} - \pgfqpoint{0pt}{\pgf@shiftdec@fraction pt} - \pgfstorepoint\pgf@nfold@arrowintersect - \fi - \fi% if precomputed - % Step 2: Extend the arrow body to the intersection point. - % If the tip is at the beginning of the path, we have to move to the intersection - % and then draw a line to the "regular" starting point. The subsequent segment then - % should omit its moveto. - % If the tip is at the end, we are already in the right position and only need to extend - % the current path to the intersection point. - \pgftransformreset - \if#1s - \pgftransformshift{\pgf@nfold@original@first} - \pgftransformrotate{\pgfdecoratedinputsegmentstartangle} - \pgftransformxscale{-1} - \else - \pgftransformshift{\pgf@nfold@original@last} - \pgftransformrotate{\pgfdecoratedinputsegmentendangle} - \fi - \pgftransformshift{\pgfpoint{-2*\pgf@decoration@nfold@hwidth-.5*\pgflinewidth}{0pt}} - \pgftransformscale{\pgf@decoration@nfold@hwidth} - \if#1s - \pgfpathmoveto{\pgf@nfold@arrowintersect} - % This is precisely the start of the body, shifted vertically - \pgfpathlineto{\pgfqpoint{-0.06pt}{\pgf@shiftdec@fraction pt}} - \pgf@nfold@continuesegmenttrue - \else\if#1e - \pgfpathlineto{\pgf@nfold@arrowintersect} - \else - \pgferror{Invalid argument to \string\pgf@nfold@extendtotip: \meaning#1} - \fi\fi - \pgftransformreset -\fi\fi% if 1 < i < nArrows +\def\pgf@nfold@run@loop@{% + \pgf@nfold@loop@inner% + \advance\pgf@nfold@index by -1\relax + \ifnum\pgf@nfold@index>0\relax% + \pgf@nfold@run@loop@% + \fi% +} + +\def\pgf@nfold@loop@inner{% + \pgfmathsetmacro{\pgf@nfold@shift@fraction}% + {-1+2*(\pgf@nfold@index-1)/(\pgf@nfold@order-1)} + \pgfmathsetlengthmacro{\pgf@nfold@shiftamount}{\pgf@nfold@hwidth*\pgf@nfold@shift@fraction} + \pgf@nfold@traversepath% + \pgfsyssoftpath@flushcurrentpath% + \pgf@up@action% +} + +% Computes both the width of the component lines into \pgf@x and the distance +% from the center to the outermost line centers into \pgf@y +% from the current values of \pgflinewidth and \pgfinnerlinewidth. +\def\pgf@nfold@compute@widths@from@double{ + \pgf@x=\pgflinewidth\relax% + \pgf@y=\pgf@x\relax% + \advance\pgf@x-\pgfinnerlinewidth\relax% + \advance\pgf@y+\pgfinnerlinewidth\relax% + \pgf@x=.5\pgf@x\relax% + \pgf@y=.25\pgf@y\relax% +} + +\def\pgf@nfold@render@cached@softpath{% + \pgfscope% must use a scope, otherwise we break the arrow tips + \pgfprocessround{\cachedpath}{\cachedpath}% remove tokens from the soft path + \pgf@nfold@parsesoftpath{\cachedpath}{\parsedsoftpath} + \pgf@nfold@parsearrows + % Compute the full and constituent part line widths + \pgf@nfold@compute@widths@from@double% + \pgfsetlinewidth\pgf@x% + \edef\pgf@nfold@hwidth{\the\pgf@y} + \pgf@nfold@run@loop + \endpgfscope } % -% n-fold decoration -% ----------------- +% user interface and pgf/TikZ keys +% -------------------------------- % -% This decoration is intended to be used by the end user. It replaces a given path by n parallel versions of the path. - -\newcount\tikz@nfold@loop@index -\def\tikz@nfold@run@loop#1{% - \edef\tikz@nfold@postaction{% - \tikz@nfold@postaction% this already includes a comma - postaction={% - draw,arrows=-,shorten <=0pt,shorten >=0pt,% disable shorten, is implemented in the pre-pass - decorate,decoration={% - pgf@nfold@shift, nfold order=#1, nfold index=\the\tikz@nfold@loop@index% - }% - },% - } - \advance\tikz@nfold@loop@index by -1\relax - \ifnum\tikz@nfold@loop@index>0% - \tikz@nfold@run@loop{#1}% - \fi% + +% Outputs a provided soft path in #1 offset by a distance provided in #2. +\def\pgfoffsetpath#1#2{% + \begingroup + \pgfmathsetlengthmacro\pgf@nfold@hwidth{#2} + % \pgf@nfold@hwidth must always be positive + \pgf@x=\pgf@nfold@hwidth\relax + \ifdim\pgf@x<0pt\relax + \pgf@x=-\pgf@x + \def\pgf@nfold@shift@fraction{-1} + \else + \def\pgf@nfold@shift@fraction{1} + \fi + \edef\pgf@nfold@hwidth{\the\pgf@x} + \pgfoffsetpathqfraction{#1}{\pgf@nfold@hwidth}{\pgf@nfold@shift@fraction} + \endgroup +} + +% Outputs a provided soft path in #1 offset by #3*#2 where #2 is a length (>= 0 pt) +% and #3 is a number between -1.0 and 1.0. This differs from \pgfoffsetpath{#1}{#2*#3} +% in how the joins between segments are rendered. In particular, \pgfoffsetpathfraction{#1}{10pt}{0} +% does *not* yield the original path, but a new path in the centre of #1 drawn at line width 20pt. +% +\def\pgfoffsetpathfraction#1#2#3{% + \begingroup + \pgfmathsetlengthmacro\pgf@nfold@hwidth{#2} + \pgfmathsetmacro\pgf@nfold@shift@fraction{#3} + \pgfoffsetpathqfraction{#1}{\pgf@nfold@hwidth}{\pgf@nfold@shift@fraction} + \endgroup +} + +% This has the same output as the #3-th segment of nfold=#4. +\def\pgfoffsetpathindex#1#2#3#4{% + \begingroup + \pgfmathsetmacro\pgf@nfold@shift@fraction{-1+2*(#3-1)/(#4-1)} + \pgfoffsetpathqfraction{#1}{#2}{\pgf@nfold@shift@fraction} + \endgroup +} + +% A quick version that skips processing the input values +\def\pgfoffsetpathqfraction#1#2#3{% + \begingroup + \pgfprocessround{#1}{\cachedpath}% remove tokens from the soft path + \pgf@nfold@parsesoftpath{\cachedpath}{\parsedsoftpath} + \pgf@x=#2\relax + \edef\pgf@nfold@hwidth{\the\pgf@x} + \edef\pgf@nfold@shift@fraction{#3} + \pgf@x=\pgf@nfold@shift@fraction\pgf@x\relax + \edef\pgf@nfold@shiftamount{\the\pgf@x} + \pgf@nfold@traversepath% + \endgroup +} + + +\pgfkeys{ + /pgf/nfold/.code={% + \pgf@nfold@order=#1\relax% + \ifnum\pgf@nfold@order<1\relax% + \pgfutil@packageerror{tikz-nfold}{The key /pgf/nfold must take a value of at least 1, got \the\pgf@nfold@order}{}% + \fi% + % If nfold > numcached AND intersections is not loaded AND we draw an Implies tip, we get an error. + % We check the first two conditions now and set the respective flag + \ifnum\pgf@nfold@order>\pgf@nfold@intersec@numcached\relax + \ifdefined\pgfintersectionofpaths\else + \pgf@nfold@intersectionsnotloadedtrue + \fi + \fi + }, + /pgf/nfold/.default=2 } + + +% use \tikzset for scoping reasons, does not appear to be equivalent to \pgfset{/tikz/...=...} \tikzset{ nfold/.code={ - \tikzset{draw=none} - \pgf@nfold@dec@order=#1\relax - \ifnum\pgf@nfold@dec@order<2 - \pgferror{'nfold' must take a value of at least 2, got \the\pgf@nfold@dec@order} - \fi - \tikz@nfold@loop@index=\pgf@nfold@dec@order - % The final style has the following form: - % [draw=none, - % postaction={ - % draw=none,decorate,decoration=pgf@nfold@storedata, - % postaction={draw,arrows=-,decorate,decoration={pgf@nfold@shift,nfold order=#1,nfold index=1}}, - % [...], - % postaction={draw,arrows=-,decorate,decoration={pgf@nfold@shift,nfold order=#1,nfold index=#1}} - % } - % ] - % We build the postactions piece by piece in the macro \tikz@nfold@postaction. Then we apply it - % using \tikzset and .expand once, so potential future changes to \tikz@nfold@postaction do not - % affect the settings in tikz. - % - \def\tikz@nfold@postaction{} - \tikz@nfold@run@loop{#1} - \edef\tikz@nfold@postaction{% - draw=none,decorate,decoration=pgf@nfold@storedata,% - \tikz@nfold@postaction% - postaction={ - draw,arrows=-,shorten <=0pt,shorten >=0pt, - decorate,decoration=pgf@nfold@tip@start},% - postaction={ - draw,arrows=-,shorten <=0pt,shorten >=0pt, - decorate,decoration=pgf@nfold@tip@end},% + \edef\pgf@tmp{\noexpand\pgfkeys{/pgf/nfold=#1}} + % patch \tikz@double@setup to set /pgf/nfold=#1 as well + \expandafter\expandafter\expandafter\def% + \expandafter\expandafter\expandafter\tikz@double@setup% + \expandafter\expandafter\expandafter{\expandafter\tikz@double@setup\pgf@tmp} + }, + nfold/.default=2, + scaling nfold/.code={% + \pgfscope% scope to contain \tikz@double@setup + \tikz@double@setup + % extract double distance between line centers into \pgf@x + \pgf@nfold@compute@widths@from@double + \pgf@y=2\pgf@y + % store (order-1)*\pgf@x in \pgf@xa + \c@pgf@counta=#1 + \advance\c@pgf@counta by -1\relax + \global\pgf@y=\c@pgf@counta\pgf@y + \endpgfscope + \tikzset{ + double distance between line centers=\pgf@y, + nfold=#1 + } + }, + scaling nfold/.default=2, + % This simply defines the key if tikzcd is not loaded, so we don't run into any errors + commutative diagrams/scaling nfold/.code={ + \pgfscope% scope to contain \tikz@double@setup + \tikz@double@setup + % extract double distance between line centers into \pgf@x + \pgf@nfold@compute@widths@from@double + % store (order-1)*\pgf@y in \pgf@ya + \c@pgf@counta=#1 + \advance\c@pgf@counta by -1\relax + \pgf@ya=\c@pgf@counta\pgf@y + % compute the label offset, which is (order-2)*\pgf@y + .5*\pgf@x + \advance\c@pgf@counta by -1\relax + \pgf@xa=\c@pgf@counta\pgf@y + \advance\pgf@xa by .5\pgf@x + % save the results in \pgf@x and \pgf@y + \global\pgf@x=\pgf@xa + \global\pgf@y=2\pgf@ya + \endpgfscope + \tikzset{ + commutative diagrams/every label/.append style/.expanded={outer sep=\the\pgf@x}, + double distance between line centers=\pgf@y, + nfold=#1 } - \tikzset{postaction/.expand once=\tikz@nfold@postaction} }, - nfold/.default=2 + commutative diagrams/scaling nfold/.default=2 } \endinput 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 a2335e41c9..91f89dbfdf 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: 2023-03-31 to version v1.1l</b> +<b>Date of last change: 2023-04-24 to version v1.1m</b> # biblatex-gb7714-2015: a biblatex style package @@ -1313,6 +1313,8 @@ biblatexä¸å¤„ç†é¡ºåºæ•°å—ç¼–ç 压缩的代ç 默认从3个连ç»ç¼–ç å¼€å§ -  测试gb7714-2015ã€ayæ ·å¼ï¼Œå¯¹äºŽGBKç¼–ç 文档的兼容性 -  测试chinese-erjæ ·å¼ -  测试chinese-cssæ ·å¼ + -  测试chinese-cssæ ·å¼ + -  测试chinese-jmwæ ·å¼ -  测试gb7714-2015msæ ·å¼ä¸€ç¯‡æ–‡æ¡£ä¸ä¸è‹±æ–‡ä¸¤ç§æ ¼å¼è®¾ç½®ï¼Œå¤šè¯è¨€å¯¹ç…§ï¼Œå¤šè¯è¨€æ··åˆæ–‡çŒ®è¡¨ -  测试全é¢çš„类型ã€æ ¼å¼ -  测试示例 @@ -1597,6 +1599,7 @@ please see the file 'biblatex-gb7714-2015.pdf' for further information! * 2022/08/29 v1.1j,ctan,github * 2022/11/07 v1.1k,ctan,github * 2023/03/31 v1.1l,ctan,github +* 2023/04/24 v1.1m,ctan,github --------------------------------------------------------- ## Update history: 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 Binary files differindex 96d3e9a725..462c1f0409 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 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 45cea13bd6..f2aabef29f 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 @@ -6,6 +6,9 @@ \documentclass[11pt]{article} %用draft选项找到badboxçš„ä½ç½® twoside, \input{biblatex-gb7714-2015-preamble} %å®åŒ…å’Œä¸€äº›æ ¼å¼è®¾ç½® \usepackage{microtype} +\usepackage{datetime} +\renewcommand{\dateseparator}{-} +\yyyymmdddate %\usepackage[russian,french,english]{babel} %\DefineHyphenationExceptions{english}{conf-erence} \begin{document} @@ -22,18 +25,19 @@ \pagenumbering{Roman} \titleformanual{符åˆGB/T 7714-2015æ ‡å‡†çš„biblatexå‚è€ƒæ–‡çŒ®æ ·å¼ -\footnote{This Manual was created with biblatex v\versionofbiblatex, last revised at \today;\\% +\footnote{This Manual was first created at 2016-07-01 and revised at \today ~with biblatex v\versionofbiblatex;\\% Style Files (gb7714-2015*.*) have version number: \versionofgbtstyle.} \footnote{repository address: \url{https://github.com/hushidong/biblatex-gb7714-2015}}} \authorformanual{胡振震\setcounter{footnote}{0}\footnote{Email: hzzmail@163.com}} -\dateformanual{2016-07-01} +\dateformanual{\today} \titleandauthor \begin{quotation} -biblatex-gb7714-2015 å®åŒ…是为满足《GB/T 7714-2015~~ä¿¡æ¯ä¸Žæ–‡çŒ®~~å‚考文献著录规则》è¦æ±‚而开å‘çš„ biblatex æ ·å¼åŒ…。å®åŒ…æ供两ç§ç¼–åˆ¶æ ·å¼: 一ã€é¡ºåºç¼–ç 制（gb7714-2015）；二ã€è‘—者-出版年制（gb7714-2015ayï¼‰ï¼Œèƒ½å¤Ÿç²¾ç¡®åœ°å®žçŽ°å›½æ ‡æå‡ºçš„è‘—å½•å’Œæ ‡æ³¨æ ¼å¼ï¼Œä¸”具备易用ã€å…¼å®¹ã€çµæ´»ç‰ç‰¹ç‚¹ï¼Œèƒ½ä¸ºå›½å†…\LaTeX{}用户æ供一个å¯é çš„å‚考文献生æˆå·¥å…·ã€‚ +biblatex-gb7714-2015 å®åŒ…是为满足《GB/T 7714-2015~~ä¿¡æ¯ä¸Žæ–‡çŒ®~~å‚考文献著录规则》è¦æ±‚而开å‘çš„ biblatex æ ·å¼åŒ…。å®åŒ…主è¦æ供两ç§ç¼–åˆ¶æ ·å¼: 一ã€é¡ºåºç¼–ç 制（gb7714-2015）；二ã€è‘—者-出版年制（gb7714-2015ayï¼‰ï¼Œèƒ½å¤Ÿç²¾ç¡®åœ°å®žçŽ°å›½æ ‡æå‡ºçš„è‘—å½•å’Œæ ‡æ³¨æ ¼å¼ã€‚å¦å¤–æä¾›gb7714-2005å’Œgb7714-1987两个è€ç‰ˆæœ¬çš„å›½æ ‡æ ·å¼ï¼Œå’Œç»æµŽå¦ç ”究(chinese-erj)ã€ç¤¾ä¼šç§‘å¦(chinese-css)ã€ç®¡ç†ä¸–ç•Œ(chinese-jmw)ç‰æœŸåˆŠçš„æ–‡çŒ®æ ·å¼ï¼Œä»¥åŠè¥¿åŒ—农林(gb7714-NWAFU)ã€åŽä¸å¸ˆèŒƒ(gb7714-CCNU)ã€ä¸œå—大å¦(gb7714-SEU)ç‰å‡ ä¸ªæ˜Žæ˜¾æœ‰åˆ«äºŽå›½æ ‡çš„ç‰¹æ®Šå¦ä½è®ºæ–‡æ–‡çŒ®æ ·å¼ã€‚ +具备çµæ´»ã€æ˜“用ã€å…¼å®¹æ€§å¥½ç‰ç‰¹ç‚¹ï¼Œèƒ½ä¸ºå›½å†…\LaTeX{}用户æ供一个å¯é çš„å‚考文献生æˆå·¥å…·ã€‚ %old： %biblatex-gb7714-2015 æ ·å¼å®åŒ…æ供了符åˆã€ŠGB/T 7714-2015 ä¿¡æ¯ä¸Žæ–‡çŒ® å‚考文献 %著录规则》è¦æ±‚çš„ biblatex å‚è€ƒæ–‡çŒ®æ ·å¼ã€‚分为两ç§ç¼–制方å¼: 一ã€é¡ºåºç¼–ç 制；二ã€è‘— @@ -152,7 +156,7 @@ GB/T 7714æ ‡å‡†çš„ç†è§£å’Œè§£é‡Šï¼ˆ\ref{sec:gbt:std}节）〠\zd{gb7714-2015ms.bbx/cbx}是混åˆæ ·å¼ï¼Œæ”¯æŒåŒºåˆ†ä¸è‹±æ–‡è¯è¨€åˆ†è®¾ä¸åŒæ ‡å‡†çš„è‘—å½•æ ¼å¼ã€‚ \zd{gb7714-2015mx.bbx/cbx}是混åˆæ ·å¼ï¼Œæ”¯æŒåœ¨ä¸åŒçš„å‚考文献分节ä¸ä½¿ç”¨ä¸åŒçš„ç¼–åˆ¶æ ·å¼ï¼Œæ¯”如有的节使用顺åºç¼–ç 制，有的节使用著者年份制。 \zd{gb7715-2015-gbk.def}为GBKç¼–ç 文档编译所需的支撑文件。 -\zd{chinese-erj.bbx/cbx} 是ç»æµŽå¦ç ”ç©¶æœŸåˆŠçš„æ–‡çŒ®æ ·å¼ã€‚åŽä¸‰è€…仅支æŒè¾ƒæ–°çš„biblatex版本。 +\zd{chinese-erj.bbx/cbx}ã€\zd{chinese-css.bbx/cbx}ã€\zd{chinese-jmw.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}为转æ¢æµ‹è¯•æ–‡çŒ®è¡¨ã€‚ @@ -174,13 +178,13 @@ GB/T 7714æ ‡å‡†çš„ç†è§£å’Œè§£é‡Šï¼ˆ\ref{sec:gbt:std}节）〠\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/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-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=erjcbbx,fill=gbgrey!20,yshift=8mm,text width=2cm] (csscbbx) {\tiny \textcolor{black}{chinese-css.c/bbx}}; +\node[below of=style,fill=gbgrey!20,yshift=0.5cm,xshift=2mm,text width=2.5cm] (numcbbx) {\tiny \textcolor{black}{gb7715-2015/ay.c/bbx}}; +\node[below of=numcbbx,fill=gbgrey!20,yshift=8mm,text width=2.5cm] (aycbbx) {\tiny \textcolor{black}{gb7715-1987/ay.c/bbx}}; +\node[below of=aycbbx,fill=gbgrey!20,yshift=8mm,text width=2.5cm] (mscbbx) {\tiny \textcolor{black}{gb7715-2015ms.c/bbx}}; +\node[below of=mscbbx,fill=gbgrey!20,yshift=8mm,text width=2.5cm] (mxcbbx) {\tiny \textcolor{black}{gb7715-2015mx.c/bbx}}; +\node[below of=mxcbbx,fill=gbgrey!20,yshift=8mm,text width=2.5cm] (gbkdef) {\tiny \textcolor{black}{gb7715-2005/ay.c/bbx}}; +\node[below of=gbkdef,fill=gbgrey!20,yshift=8mm,text width=2.5cm] (erjcbbx) {\tiny \textcolor{black}{chinese-erj.c/bbx}}; +\node[below of=erjcbbx,fill=gbgrey!20,yshift=8mm,text width=2.5cm] (csscbbx) {\tiny \textcolor{black}{chinese-css.c/bbxç‰}}; %\node[below of=msbbx,fill=gbgrey!20,yshift=8mm,text width=2cm] (mscbx) {\tiny \textcolor{black}{gb7715-2015ms.cbx}}; \draw[color=blue,semithick] (numcbbx.west) -- ($(numcbbx.west)+(-3mm,0mm)$) ; @@ -192,7 +196,7 @@ GB/T 7714æ ‡å‡†çš„ç†è§£å’Œè§£é‡Šï¼ˆ\ref{sec:gbt:std}节）〠\draw[color=blue,semithick] (csscbbx.west) -- ($(csscbbx.west)+(-3mm,0mm)$) ; %\draw[color=blue,semithick] (mscbx.west) -- ($(mscbx.west)+(-3mm,0mm)$) ; -\draw[color=blue,semithick] ($(csscbbx.west)+(-3mm,0mm)$) -- ($(style.center)+(-12mm,-2.5mm)$); +\draw[color=blue,semithick] ($(csscbbx.west)+(-3mm,0mm)$) -- ($(style.center)+(-14.5mm,-2.5mm)$); \node[below of=manual,fill=gbsteelblue!15,yshift=0.5cm,xshift=2mm,text width=2.8cm] (mtex) {\tiny \textcolor{black}{biblatex-gb7714-2015.tex}}; \node[below of=mtex,fill=gbsteelblue!15,yshift=8mm,text width=2.8cm] (mpdf) {\tiny \textcolor{black}{biblatex-gb7714-2015.pdf}}; @@ -227,16 +231,7 @@ GB/T 7714æ ‡å‡†çš„ç†è§£å’Œè§£é‡Šï¼ˆ\ref{sec:gbt:std}节）〠\subsection{最å°ç¤ºä¾‹} 基于biblatexå®åŒ…çš„å‚考文献生æˆæ–¹æ³•éžå¸¸ç®€å•ï¼Œä¾‹ \ref{code:doc:structrue} 是一个最å°å·¥ä½œç¤ºä¾‹ã€‚示例代ç ä¸ç»™å‡ºäº†è¯¦ç»†æ³¨é‡Šï¼Œä»‹ç»äº†ä½¿ç”¨biblatex çš„texæºæ–‡æ¡£åŸºæœ¬ç»“构，其ä¸gb7714-2015 æ ·å¼éšbiblatexå®åŒ…åŠ è½½ï¼Œ -å‚考文献数æ®æ–‡ä»¶example.bib（bib文件需å¦å¤–准备，详è§\ref{sec:bib:bibtex}节）利用 \verb|\addbibresource|åŠ è½½ï¼Œæ–‡çŒ®è¡¨åˆ©ç”¨ \verb|\printbibliography| 命令输出(å¯åœ¨æ£æ–‡ä»»æ„ä½ç½®)。所有基于 biblatex 生æˆå‚è€ƒæ–‡çŒ®çš„æ–‡æ¡£æ— è®ºå¤§å°ä¸‡å˜ä¸ç¦»å…¶å®—。 -若需更全é¢äº†è§£biblatexåŠå‚考文献生æˆé«˜çº§åŠŸèƒ½å¦å¯å‚考: -\href{https://github.com/plk/biblatex}{biblatexå®åŒ…手册} -\footnote{地å€:\url{https://github.com/plk/biblatex}}〠-\href{https://github.com/hushidong/biblatex-zh-cn}{ä¸æ–‡ç‰ˆ} -\footnote{地å€:\url{https://github.com/hushidong/biblatex-zh-cn}} -或者 -\href{https://github.com/hushidong/biblatex-solution-to-latex-bibliography}{LaTeX 文档ä¸æ–‡å‚考文献的biblatex解决方案} -\footnote{地å€:% -\url{https://github.com/hushidong/biblatex-solution-to-latex-bibliography}}。 +å‚考文献数æ®æ–‡ä»¶example.bib利用 \verb|\addbibresource|åŠ è½½ （注æ„：bib文件需å¦å¤–准备，详è§\ref{sec:bib:bibtex}节），文献表利用 \verb|\printbibliography| 命令输出(å¯åœ¨æ£æ–‡ä»»æ„ä½ç½®)。 \begin{example}{biblatexå‚考文献生æˆçš„最å°å·¥ä½œç¤ºä¾‹}{code:doc:structrue} \begin{texlist} @@ -260,29 +255,8 @@ GB/T 7714æ ‡å‡†çš„ç†è§£å’Œè§£é‡Šï¼ˆ\ref{sec:gbt:std}节）〠\end{texlist} \end{example} - - -\subsection{编译方å¼} - -与基于bibtexä¼ ç»Ÿæ–¹æ³•çš„å››æ¥ç¼–译ä¸åŒï¼ŒåŸºäºŽbiblatex生æˆå‚考文献一般åªéœ€ä¸‰æ¥ç¼–译，第一éxelatex，第二ébiber，第三éxelatex。如若需è¦åŽå‘超链接，则除设置backref 选项外，还需第四é xelatex 编译。例\ref{eg:compile:cmd} 给出编译命令，其ä¸\verb|--synctex=-1| 选项也å¯ä»¥æ˜¯-synctex=1。å¦å¤–å››æ¥å‘½ä»¤å¯ä»¥ç”¨ä¸€æ¡ latexmk 命令代替。 -关于éžutf-8ç¼–ç 文档和使用pdflatex命令编译的细节å¦è§ç¬¬\ref{sec:pkg:hints}节。 - -\begin{example}{文档编译命令}{eg:compile:cmd} -\begin{texlist} -%å››æ¥ç¼–译命令 -xelatex --synctex=-1 jobname.tex -biber jobname -xelatex --synctex=-1 jobname.tex -xelatex --synctex=-1 jobname.tex -%或采用latexmk，则仅需一æ¡å‘½ä»¤ -latexmk -xelatex jobname.tex -\end{texlist} -\end{example} - -å‰è¿°çš„最å°å·¥ä½œç¤ºä¾‹çš„编译结果如图\ref{fig:eg:ref}所示。 - -\begin{refsection} -\begin{figure}[!htb] +%\begin{refsection} +\begin{figure}[!h] \centering %\begin{tcolorbox}[left skip=0pt,right skip=0pt,% %width=\linewidth,colframe=gblabelcolor,colback=white,arc=0pt,% @@ -305,7 +279,36 @@ latexmk -xelatex jobname.tex %\end{tcolorbox} \caption{最å°å·¥ä½œç¤ºä¾‹ç¼–译生æˆçš„PDF文档}\label{fig:eg:ref} \end{figure} -\end{refsection} +%\end{refsection} + +上述最å°å·¥ä½œç¤ºä¾‹çš„编译结果如图\ref{fig:eg:ref}所示。所有基于 biblatex 生æˆå‚è€ƒæ–‡çŒ®çš„æ–‡æ¡£æ— è®ºå¤§å°ä¸‡å˜ä¸ç¦»å…¶å®—， +若需更全é¢äº†è§£biblatexåŠå‚考文献生æˆé«˜çº§åŠŸèƒ½å¦å¯å‚考: +\href{https://github.com/plk/biblatex}{biblatexå®åŒ…手册} +\footnote{地å€:\url{https://github.com/plk/biblatex}}〠+\href{https://github.com/hushidong/biblatex-zh-cn}{ä¸æ–‡ç‰ˆ} +\footnote{地å€:\url{https://github.com/hushidong/biblatex-zh-cn}} +或者 +\href{https://github.com/hushidong/biblatex-solution-to-latex-bibliography}{LaTeX 文档ä¸æ–‡å‚考文献的biblatex解决方案} +\footnote{地å€:% +\url{https://github.com/hushidong/biblatex-solution-to-latex-bibliography}}。 + + +\subsection{编译方å¼} + +与基于bibtexä¼ ç»Ÿæ–¹æ³•çš„å››æ¥ç¼–译ä¸åŒï¼ŒåŸºäºŽbiblatex生æˆå‚考文献一般åªéœ€ä¸‰æ¥ç¼–译，第一éxelatex，第二ébiber，第三éxelatex。如若需è¦åŽå‘超链接，则除设置backref 选项外，还需第四é xelatex 编译。例\ref{eg:compile:cmd} 给出编译命令，其ä¸\verb|--synctex=-1| 选项也å¯ä»¥æ˜¯-synctex=1。å¦å¤–å››æ¥å‘½ä»¤å¯ä»¥ç”¨ä¸€æ¡ latexmk 命令代替。 +关于éžutf-8ç¼–ç 文档和使用pdflatex命令编译的细节å¦è§ç¬¬\ref{sec:pkg:hints}节。 + +\begin{example}{文档编译命令}{eg:compile:cmd} +\begin{texlist} +%å››æ¥ç¼–译命令 +xelatex --synctex=-1 jobname.tex +biber jobname +xelatex --synctex=-1 jobname.tex +xelatex --synctex=-1 jobname.tex +%或采用latexmk，则仅需一æ¡å‘½ä»¤ +latexmk -xelatex jobname.tex +\end{texlist} +\end{example} \section{使用说明} @@ -370,9 +373,38 @@ perl gb7714texttobib.pl in=textfilename out=bibfilename \end{texlist} \end{example} -å…¶ä¸ï¼Œv1.0mç‰ˆæœ¬å¢žåŠ çš„gb7714-2015msæ ·å¼æ–‡ä»¶ï¼Œä¸»è¦æ˜¯ä¸ºäº†åœ¨ä¸€ä¸ªæ–‡çŒ®è¡¨ä¸é’ˆå¯¹ä¸åŒè¯è¨€ä½¿ç”¨ä¸åŒå¤šç§æ ·å¼ï¼Œæ¯”如ä¸æ–‡æ–‡çŒ®ä½¿ç”¨GB/T 7714-2015è§„å®šçš„è‘—å½•æ ¼å¼ï¼Œè€Œå…¶å®ƒè¯è¨€æ–‡çŒ®ä½¿ç”¨biblatexæä¾›çš„æ ‡å‡†æ ·å¼ã€‚v1.0rç‰ˆæœ¬å¢žåŠ äº†gb7714-2015mxæ ·å¼ï¼Œä¸»è¦æ˜¯ä¸ºäº†åœ¨ä¸€ä¸ªæ–‡æ¡£ä¸é’ˆå¯¹ä¸åŒå‚考文献分节使用ä¸åŒçš„å‚è€ƒæ–‡çŒ®æ ·å¼ï¼Œæ¯”如æŸäº›èŠ‚使用著者年份制，æŸäº›èŠ‚使用顺åºç¼–ç 制。尽管这些方å¼ä¸å¸¸ç”¨ï¼Œä½†å¶å°”也有需求，所以都åšäº†å®žçŽ°ã€‚ +å…¶ä¸ï¼Œ +v1.0mç‰ˆæœ¬å¢žåŠ çš„gb7714-2015msæ ·å¼æ–‡ä»¶ï¼Œä¸»è¦æ˜¯ä¸ºäº†åœ¨ä¸€ä¸ªæ–‡çŒ®è¡¨ä¸é’ˆå¯¹ä¸åŒè¯è¨€ä½¿ç”¨ä¸åŒçš„æ ·å¼ï¼Œæ¯”如ä¸æ–‡æ–‡çŒ®ä½¿ç”¨GB/T 7714-2015è§„å®šçš„è‘—å½•æ ¼å¼ï¼Œè€Œå…¶å®ƒè¯è¨€æ–‡çŒ®ä½¿ç”¨biblatexæä¾›çš„æ ‡å‡†æ ·å¼ã€‚ +v1.0rç‰ˆæœ¬å¢žåŠ äº†gb7714-2015mxæ ·å¼ï¼Œä¸»è¦æ˜¯ä¸ºäº†åœ¨ä¸€ä¸ªæ–‡æ¡£ä¸é’ˆå¯¹ä¸åŒå‚考文献分节使用ä¸åŒçš„å‚è€ƒæ–‡çŒ®æ ·å¼ï¼Œæ¯”如æŸäº›èŠ‚使用著者年份制，æŸäº›èŠ‚使用顺åºç¼–ç 制。 +%尽管这些方å¼ä¸å¸¸ç”¨ï¼Œä½†å¶å°”也有需求，所以都åšäº†å®žçŽ°ã€‚ + +å°½ç®¡å›½æ ‡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} + + +å¦å¤–ï¼Œæ ¹æ®å›½å†…大å¦çš„å¦ä½è®ºæ–‡çš„文献生æˆéœ€æ±‚ï¼Œå¢žåŠ äº†å‡ ä¸ªä¸Žå›½æ ‡æœ‰æ˜Žæ˜¾åŒºåˆ«çš„æ ·å¼ï¼ŒåŒ…括：西北农林(gb7714-NWAFU)ã€åŽä¸å¸ˆèŒƒ(gb7714-CCNU)ã€ä¸œå—大å¦(gb7714-SEU)ç‰ã€‚其他大å¦çš„æ–‡çŒ®æ ·å¼ä¸Žå›½æ ‡åŸºæœ¬ä¸€è‡´ï¼Œæ¯”如上海交大ã€æµ™å¤§ã€å¤æ—¦ç‰ï¼Œç›´æŽ¥ä½¿ç”¨å³å¯ã€‚å¦å¤–一些大å¦ä¸Žå›½æ ‡ç•¥æœ‰å·®åˆ«ï¼Œå¯ä»¥é€šè¿‡ç®€å•çš„设置满足è¦æ±‚，比如清åŽã€ç§‘å¦é™¢å¤§å¦ã€ä¸ç§‘大ã€å›½é˜²ç§‘大ç‰ï¼Œé€šå¸¸åœ¨å¦ä½è®ºæ–‡æ¨¡æ¿ä¸å®žçŽ°ï¼Œåœ¨egthesis文件夹内，针对一些大å¦çš„å¦ä½è®ºæ–‡å‚考文献åšäº†æµ‹è¯•ã€‚ -å¦å¤–æ ¹æ®éœ€æ±‚，v1.0rç‰ˆæœ¬å¢žåŠ äº†chinese-erjæ ·å¼ç”¨äºŽç”Ÿæˆç»æµŽç ”究期刊的文献，v1.1lç‰ˆæœ¬å¢žåŠ äº†chinese-cssæ ·å¼ç”¨äºŽç”Ÿæˆç¤¾ä¼šç§‘å¦æœŸåˆŠçš„脚注注释。且在egthesis文件夹内，针对国内一些大å¦çš„å¦ä½è®ºæ–‡æ–‡çŒ®è¦æ±‚ï¼ŒåŸºäºŽå›½æ ‡æ ·å¼åšäº†ä¸€äº›å®šåˆ¶å’Œæµ‹è¯•ã€‚ +æ¤å¤–ï¼Œæ ¹æ®æœŸåˆŠæ–‡çŒ®ç”Ÿæˆéœ€æ±‚ï¼Œä¸ºæ–‡ç§‘ç±»æœŸåˆŠå¢žåŠ äº†å¦‚ä¸‹æ ·å¼ï¼š +v1.0rç‰ˆæœ¬å¢žåŠ äº†chinese-erjæ ·å¼ç”¨äºŽç”Ÿæˆç»æµŽç ”究期刊的文献; +v1.1lç‰ˆæœ¬å¢žåŠ äº†chinese-cssæ ·å¼ç”¨äºŽç”Ÿæˆç¤¾ä¼šç§‘å¦æœŸåˆŠçš„脚注注释; +v1.1mç‰ˆæœ¬å¢žåŠ äº†chinese-jmwæ ·å¼ç”¨äºŽç”Ÿæˆç®¡ç†ä¸–界期刊的文献。 +而ç†å·¥ç±»æœŸåˆŠæ–‡çŒ®é€šå¸¸ä¸Žå›½æ ‡å·®åˆ«ä¸å¤§ï¼Œéƒ¨åˆ†æœŸåˆŠä¸Žå›½æ ‡çš„最大的差异主è¦æ˜¯åœ¨åŒè¯å¯¹ç…§æ–‡çŒ®ä¸ï¼Œæ¯”如计算机å¦æŠ¥ç‰ï¼Œå¯ä»¥é€šè¿‡ç®€å•çš„设置æ¥æ»¡è¶³è¦æ±‚，具体å¯ä»¥å‚考github上的问题。 \pdfbookmark[4]{chinese-erj}{chinese-erj} \begin{example}{ç»æµŽç ”ç©¶æœŸåˆŠæ–‡çŒ®æ ·å¼(chinese-erj)}{eg:gbchineseerj} @@ -390,26 +422,17 @@ 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} +\pdfbookmark[4]{chinese-jmw}{chinese-jmw} +\begin{example}{管ç†ä¸–ç•ŒæœŸåˆŠæ–‡çŒ®æ ·å¼(chinese-jmw)}{eg:gbchinesejmw} \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} +%使用社会科å¦æœŸåˆŠæ–‡çŒ®æ ·å¼ +\usepackage[backend=biber,style=chinese-jmw]{biblatex} \end{texlist} \end{example} + \subsubsection{新增选项}\label{sec:added:opt} æ ·å¼åŒ…新增了一些选项和命令，新增选项更常用一些，所以在本节集ä¸ä»‹ç»ï¼Œè€Œæ–°å¢žå‘½ä»¤å¾€å¾€æ¶‰åŠæ›´ç»†èŠ‚的修改，所以在åŽé¢ä»‹ç»å„ç±»æ ¼å¼è°ƒæ•´çš„内容ä¸ä»‹ç»ã€‚ æ–°å¢žé€‰é¡¹ç”¨äºŽæ ‡ç¾å¯¹é½æ–¹å¼ã€å‡ºç‰ˆé¡¹ç¼ºçœå¤„ç†ã€è´£ä»»è€…(作者)缺çœå¤„ç†ç‰åŠŸèƒ½çš„控制，其使用方å¼ä¸Žbiblatexå®åŒ…选项完全相åŒ: @@ -980,9 +1003,9 @@ leftrule=0pt,rightrule=0pt,toprule=0.4pt,bottomrule=0.4pt] \pdfbookmark[4]{gbfootbibfmt}{gbfootbibfmt} \item[gbfootbibfmt]=true，\textbf{false}. \hfill default is false - 如果è¦å®žçŽ°è„šæ³¨æ–‡çŒ®è¡¨ï¼Œä½†ä¸æƒ³è¦å›½æ ‡è¦æ±‚的脚注符å·å’Œç¼©è¿›ï¼Œä½†è¦æ±‚相åŒæ–‡çŒ®ç”¨æ ‡ç¾æ›¿ä»£ï¼Œåˆ™å¯ä½¿ç”¨gbfootbibfmt代替上é¢çš„gbfootbib选项。 + 如果ä¸æƒ³è¦é»˜è®¤çš„脚注符å·å’Œç¼©è¿›ï¼Œä½†è¦å®žçŽ°è„šæ³¨æ–‡çŒ®è¡¨ä¸”脚注ä¸ç›¸åŒæ–‡çŒ®ç”¨æ ‡ç¾æ›¿ä»£ç‰å›½æ ‡è¦æ±‚，则å¯ä½¿ç”¨gbfootbibfmt代替上é¢çš„gbfootbib选项。 \begin{itemize} - \item gbfootbibfmt=true，处ç†ä½¿è„šæ³¨æ–‡çŒ®è¡¨ä¸çš„相åŒçš„æ–‡çŒ®ç”¨æ ‡ç¾ä»£æ›¿ã€‚ + \item gbfootbibfmt=true，实现脚注文献表åŠç›¸åŒæ–‡çŒ®ç”¨æ ‡ç¾ä»£æ›¿ç‰å›½æ ‡è¦æ±‚，但ä¸è®¾ç½®è„šæ³¨ç¬¦å·å’Œç¼©è¿›ï¼Œç”¨æˆ·å¯è‡ªè¡Œé€šè¿‡å…¶å®ƒæ–¹å¼æˆ–å®åŒ…设置需è¦çš„符å·å’Œç¼©è¿›å½¢å¼ã€‚ \item gbfootbibfmt=false，ä¸åšä»»ä½•é™„åŠ å¤„ç†ã€‚ \end{itemize} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.bbx index 8d160a44fe..88d963c2bc 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.bbx @@ -38,6 +38,7 @@ doi=false, url=false, gbfieldtype=true, + dateabbrev=false, %datezeros=false, } @@ -73,13 +74,14 @@ %ä¸ºæ ‡æ³¨å’Œæ–‡çŒ®è¡¨ä¸æ ‡ç‚¹æ ¼å¼ï¼Œé‡è®¾and本地化å—符串 %================================================== \DefineBibliographyStrings{english}{ -% and = { and},%andåŽé¢çš„ç©ºæ ¼åœ¨finalnamedelimå·²ç»åŠ 过了，所以这里去掉20191009 + and = {\ifcitation{ and}{\addcomma\addspace}},%andåŽé¢çš„ç©ºæ ¼åœ¨finalnamedelimå·²ç»åŠ 过了，所以这里去掉20191009 % andcn = {\gbpunctmark\unspace},%\gbpunctmark % andincitecn = {å’Œ},%å°†æ ‡æ³¨ä¸çš„分开，便于与文献表ä¸çš„区分 -% andincite = {\&}, + %andincite = { and }, %andotherscn={ç‰}, mathesiscn={硕士å¦ä½è®ºæ–‡}, phdthesiscn={åšå£«å¦ä½è®ºæ–‡}, + bytranslator= {\ifcitation{trans\adddot\space}{trans\adddot\ \lbx@sfromlang\ by}}, } @@ -92,11 +94,15 @@ %\DeclareFieldFormat*{booktitle}{\gbpunctttl#1\gbpunctttr} \DeclareFieldFormat*{title}{% \ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\textit{#1}\isdot}}{#1\isdot}} -\DeclareFieldFormat[article]{title}{% +\DeclareFieldFormat[archive]{title}{% +\ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{#1\isdot}}{#1\isdot}} +\DeclareFieldFormat[article,incollection,inbook,inproceedings]{title}{% \ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\mkbibquote{#1}\isdot}}% {#1\adddot\addthinspace}} \DeclareFieldFormat*{journaltitle}{% \ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\textit{#1}}}{#1\isdot}}% +\DeclareFieldFormat{booktitle}{% +\ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\textit{#1}}}{#1}} \renewcommand*{\revsdnamepunct}{% \ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctcomma}{\gbpunctcommalanen}}{}} \DeclareDelimFormat{multinamedelim}{% @@ -196,37 +202,160 @@ \DeclareDelimFormat{finalpunct}{\iffieldequalstr{userd}{chinese}{\gbpunctdot}{\adddot}} \DeclareDelimFormat[fullinnercite]{finalpunct}{} -\DeclareFieldFormat{booktitle}{% -\ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{#1}}{#1}} - %出版项ä¸ï¼šå‡ºç‰ˆç¤¾åœ°å€åŽé¢çš„æ ‡ç‚¹ \renewcommand{\publocpunct}{% \ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctcolon}{\addcolon\addspace}}{\addcolon\addspace}% } %è°ƒæ•´å‡ºç‰ˆç¤¾ä¸Žå¹´ä»½ä¹‹é—´çš„æ ‡ç‚¹ \renewcommand{\pubdatadelim}{% -\ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctcomma}{\setunit*{\addcomma\space}}}% +\ifcitation{\iffieldequalstr{userd}{chinese}{\iffieldundef{year}{}{\setunit*{\gbpunctcomma}}}{\setunit*{\addcomma\space}}}% {\setunit*{\addcomma\space}}% } +\renewcommand{\locnopubdelim}{% +\ifcitation{\iffieldequalstr{userd}{chinese}{\iffieldundef{year}{}{\setunit*{\gbpunctcomma}}}{\setunit*{\addcomma\space}}}% +{\setunit*{\addcomma\space}}% +} + +%ç¼–è€…ä¸Žç¼–è€…ç±»åž‹ä¹‹é—´çš„æ ‡ç‚¹ +\DeclareDelimFormat{editortypedelim}{\iffieldequalstr{userd}{chinese}{}{\addcomma\space}} + +%åæ ‡é¢˜å‰çš„æ ‡ç‚¹ +\renewcommand*{\subtitlepunct}{% +\ifcitation{\iffieldequalstr{userd}{chinese}{}{\addcolon\addspace}}{\addcolon\addspace}} %================================================== %è°ƒæ•´éƒ¨åˆ†åŸŸçš„è¾“å‡ºæ ¼å¼ %================================================== +%é‡æ–°è°ƒæ•´è¾“出编者的类型 +\renewbibmacro*{editor+others}{% + \ifcitation{\ifboolexpr{ + test \ifuseeditor + and + not test {\ifnameundef{editor}} + } + {\printnames{editor}% + \setunit{\printdelim{editortypedelim}}% + \usebibmacro{editor+othersstrg}% + \clearname{editor}}% + {}}% + {\ifboolexpr{% + test \ifuseeditor + and + not test {\ifnameundef{editor}} + }% + {\printnames{editor}% + \clearname{editor}} + {}}% + } + +\renewbibmacro*{editor+othersstrg}{% + \iffieldundef{editortype} + {\ifboolexpr{ + test {\ifnumgreater{\value{editor}}{1}} + or + test {\ifandothers{editor}} + } + {\def\abx@tempa{editors}} + {\def\abx@tempa{editor}}} + {\ifboolexpr{ + test {\ifnumgreater{\value{editor}}{1}} + or + test {\ifandothers{editor}} + } + {\edef\abx@tempa{\thefield{editortype}s}} + {\edef\abx@tempa{\thefield{editortype}}}}% + \let\abx@tempb=\empty + \ifnamesequal{editor}{translator} + {\appto\abx@tempa{tr}% + \appto\abx@tempb{\clearname{translator}}} + {}% + \ifnamesequal{editor}{commentator} + {\appto\abx@tempa{co}% + \appto\abx@tempb{\clearname{commentator}}} + {\ifnamesequal{editor}{annotator} + {\appto\abx@tempa{an}% + \appto\abx@tempb{\clearname{annotator}}} + {}}% + \ifnamesequal{editor}{introduction} + {\appto\abx@tempa{in}% + \appto\abx@tempb{\clearname{introduction}}} + {\ifnamesequal{editor}{foreword} + {\appto\abx@tempa{fo}% + \appto\abx@tempb{\clearname{foreword}}} + {\ifnamesequal{editor}{afterword} + {\appto\abx@tempa{af}% + \appto\abx@tempb{\clearname{afterword}}} + {}}}% + \ifbibxstring{\abx@tempa} + {\printtext[editortype]{% + \iffieldequalstr{userd}{chinese}{\bibstring{\abx@tempa cn}}{\bibstring{\abx@tempa}}% + }\abx@tempb} + {\usebibmacro{editorstrg}}} + +%去掉译å‰çš„æ ‡ç‚¹ +\renewbibmacro*{name:andothers}{\bibauthorfont% +\ifcitation{\ifboolexpr{test {\ifnumequal{\value{listcount}}{\value{liststop}}} + and test \ifmorenames} + {\ifnumgreater{\value{liststop}}{1}%注æ„这里试图去区分姓å总数大于1的情况，当姓å总数大于1时，最åŽä¸€ä¸ªå§“ååŽé¢å…ˆåŠ 入一个\finalandcomma + {}{}%\finalandcomma，目å‰å›½æ ‡æ²¡æœ‰è¿™æ ·çš„区分è¦æ±‚，如果有需è¦ä¹Ÿæ˜¯å¯ä»¥è¿™ä¹ˆåŽ»åšçš„。 + \printdelim{andothersdelim}\printdelim{strandothersdelim}}% + {}}% +{\ifboolexpr{test {\ifnumequal{\value{listcount}}{\value{liststop}}} + and test \ifmorenames} + {\ifnumgreater{\value{liststop}}{1}%注æ„这里试图去区分姓å总数大于1的情况，当姓å总数大于1时，最åŽä¸€ä¸ªå§“ååŽé¢å…ˆåŠ 入一个\finalandcomma + {}%\finalandcomma，目å‰å›½æ ‡æ²¡æœ‰è¿™æ ·çš„区分è¦æ±‚，如果有需è¦ä¹Ÿæ˜¯å¯ä»¥è¿™ä¹ˆåŽ»åšçš„。 + {}% + \printdelim{andothersdelim}\printdelim{strandothersdelim}% + }% + {%当是译者的时候需è¦ç‰¹æ®Šå¤„ç†ï¼šä»Ž7.2节看ç‰ï¼Œè¯‘å‰é¢åŠ 逗å·ï¼Œä½†ä»Žç¤ºä¾‹çœ‹ç‰å’Œè¯‘åŒæ—¶å‡ºçŽ°æ—¶ï¼Œè¯‘å‰çš„逗å·æ²¡æœ‰ï¼Œæ¯”如： + %è¢è®æ¥, 陈哲, 肖书海, ç‰. + %胡泳, 范海燕, 译. + %æ½˜æƒ éœž, é婧, æ¨è‰³, ç‰è¯‘. + \ifnumequal{\value{listcount}}{\value{liststop}}% + {\ifcurrentname{translator}{\iffieldequalstr{usere}{chinese}{\aftertransdelim}{}}{}}{}%为了实现上述第二个示例情况åšçš„å¤„ç† + }}% +} + + + %å¢žåŠ å¹´å— \renewbibmacro*{date}{% -\ifcitation{\iffieldequalstr{userd}{chinese}{\printdate å¹´}{\printdate}}% +\ifcitation{% + \iffieldequalstr{userd}{chinese}{% + \ifboolexpr{test {\ifentrytype{article}} or test {\ifentrytype{inproceedings}} + or test {\ifentrytype{archive}} or test {\ifentrytype{online}}} + {\printtext{\blx@gbdatecn{}{}}}% + {\printdate\iffieldundef{year}{}{å¹´}}% + }{\ifentrytype{archive}{\printtext{\blx@gbdateen{}{}}}{\printdate}}% +}% {\printdate}% } - - \newrobustcmd*{\blx@gbdatecn}[3][]{% \dateeraprintpre{#2#3year}% - \blx@imc@forcezerosy{\thefield{#2#3year}å¹´}\ifblank{#1}{}{\printfield{#1}}% + \iffieldundef{#2#3year}{}{\blx@imc@forcezerosy{\thefield{#2#3year}å¹´}}\ifblank{#1}{}{\printfield{#1}}% \iffieldundef{#2#3month}{}{{\thefield{#2#3month}}月}% \iffieldundef{#2#3day}{}{{\thefield{#2#3day}}æ—¥}} +\newrobustcmd*{\blx@gbdateen}[3][]{% +\mkbibdateen{#2#3year}{#2#3month}{#2#3day}% +} + +\newrobustcmd*{\mkbibdateen}[3]{% + \iffieldundef{#2} + {} + {\mkbibmonth{\thefield{#2}}% + \iffieldundef{#1}{}{\space}}% + \iffieldundef{#3} + {} + {{\thefield{#3}}% + \iffieldundef{#2}{}{\addcomma\space}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}} + + \renewbibmacro*{newsdate}{%% \ifboolexpr{% test{\ifcitation} and test{\iffieldequalstr{userd}{chinese}}% @@ -257,6 +386,18 @@ test{\ifcitation} and test{\iffieldequalstr{userd}{chinese}}% }}% +\renewbibmacro*{url+urldate}{% +\ifcitation{\newunit\usebibmacro{url}\newunit% + \printtext{\blx@gbdatecn{}{url}}% + }% + {\iffieldundef{urlyear}% + {}{%\setunit*{\addspace}% + \usebibmacro{urldate}}% + \setunit{\addperiod\addspace}% + \usebibmacro{url}}% +} + + \DeclareFieldFormat{type}% {\ifcitation{\iffieldequalstr{userd}{chinese}% {\ifbibxstring{#1cn}{\bibxstring{#1cn}}{#1}}% @@ -280,30 +421,57 @@ test{\ifcitation} and test{\iffieldequalstr{userd}{chinese}}% \DeclareFieldFormat[newspaper,article,periodical]{number}% {\ifcitation{% \iffieldequalstr{userd}{chinese}{% - \iffieldequalstr{entrysubtype}{news}{\printtext{\gbpunctcomma\bibstring{serialcn} #1 版}} + \iffieldequalstr{entrysubtype}{news}{% + \iffieldint{number}% + {\printtext{\gbpunctcomma\bibstring{serialcn} #1 版}}% + {\printtext{\gbpunctcomma #1}}% + }% {\iffieldint{number}{\setcounter{numberwithoutzero}{#1}% - \printtext{\bibstring{serialcn}\addthinspace\arabic{numberwithoutzero}\addthinspace\bibstring{numbercn}}}% - {\printtext{\bibstring{serialcn}\addthinspace #1\addthinspace\bibstring{numbercn}}}% + \printtext{\bibstring{serialcn}\addthinspace\arabic{numberwithoutzero} 期}}% + {\printtext{\bibstring{serialcn}\addthinspace #1 期}}% }}% - {\setcounter{numberwithoutzero}{#1}\printtext{(}\arabic{numberwithoutzero}\printtext{)}}% + {\newunit\setcounter{numberwithoutzero}{#1}\printtext{\bibstring{number}}\arabic{numberwithoutzero}}% + }% + {\iffieldint{number}{\setcounter{numberwithoutzero}{#1}\arabic{numberwithoutzero}}{#1}}% +} + +\DeclareFieldFormat[book,inbook,incollection]{number}% +{\iffieldequalstr{userd}{chinese}{\iffieldint{number}% + {% + \bibstring{serialcn}#1\bibstring{numbercn}% + }{#1}% }% - {\setcounter{numberwithoutzero}{#1}\arabic{numberwithoutzero}}% + {\bibstring{number}~#1}% } -\DeclareFieldFormat[article,periodical]{volume}% +\DeclareFieldFormat[article,periodical,newspaper]{volume}% {\ifcitation{% -\iffieldequalstr{userd}{chinese}{\bibstring{serialcn}#1\bibstring{volumecn}}% - {\bibstring{volume}~#1}}% +\iffieldequalstr{userd}{chinese}{% + \iffieldint{volume}% + {\bibstring{serialcn}#1\bibstring{volumecn}}% + {#1}% + }% + {\bibstring{volume}~#1}}% {#1}% } -\DeclareFieldFormat[book]{volume}% +\DeclareFieldFormat[book,inbook,incollection]{volume}% {\iffieldequalstr{userd}{chinese}{\iffieldint{volume}% - {\bibstring{serialcn}#1\bibstring{volumecn}}{#1}% + {\iffieldequalstr{entrysubtype}{classic}{\bibstring{volumecn}#1}% + {\bibstring{serialcn}#1\bibstring{volumecn}}% + }{#1}% }% {\bibstring{volume}~#1}% } +\DeclareListFormat[article,newspaper]{location}{% +\iffieldequalstr{userd}{chinese}{\gbpunctprl#1\gbpunctprr}{#1}% +} + +\DeclareListFormat[article]{series}{% +\iffieldequalstr{userd}{chinese}{\gbpunctprl#1\gbpunctprr}{#1}% +} + % % 调整期刊åçš„æ ¼å¼ % @@ -312,15 +480,15 @@ test{\ifcitation} and test{\iffieldequalstr{userd}{chinese}}% \renewbibmacro*{journal+issuetitle}{% \ifcitation{\bibpubfont% \usebibmacro{journal}% + \iflistundef{location}{}{\printlist{location}}% \iffieldundef{series}% {}% - {\printfield{series}% - \setunit{\addspace}}% + {\printfield{series}}% \iffieldundef{volume}% {\ifciteseen{}{\usebibmacro{issue+date}% \usebibmacro{volume+number+eid}}}% {\ifciteseen{}{\usebibmacro{volume+number+eid}% - \newunit% + \iffieldundef{year}{}{\newunit}% \usebibmacro{issue+date}}}% }% {\bibpubfont%æºæ¥è‡ªstandard.bbx @@ -446,22 +614,18 @@ test{\ifcitation} and test{\iffieldequalstr{userd}{chinese}}% test{\iffieldundef{subtitle}}% }% {}% - {\setunit{\iffieldequalstr{userd}{chinese}{\gbpunctcolon}{\gbpunctcolonlanen}}% + {\setunit*{\iffieldequalstr{userd}{chinese}{\gbpunctcolon}{\gbpunctcommalanen}}% + \ifboolexpr{not test {\iffieldundef{origyear}} and test{\iffieldequalstr{entrysubtype}{classic}}}% + {\printorigdate}{}% \printtext[title]{\bibtitlefont%å¢žåŠ å—体控制命令%å¢žåŠ äº†æ ‡ç‚¹ï¼š \printfield[titlecase]{title}% \ifboolexpr{test {\iffieldundef{subtitle}}}%è¿™é‡Œå¢žåŠ äº†å¯¹åæ ‡é¢˜çš„åˆ¤æ–，解决ä¸åˆ¤æ–多一个点的问题 {}{\setunit{\subtitlepunct}% \printfield[titlecase]{subtitle}}% \iffieldundef{titleaddon}{}%判æ–一下titleaddon，å¦åˆ™ç›´æŽ¥åŠ å¯èƒ½å¤šä¸€ä¸ªç©ºæ ¼ - {\setunit{\subtitlepunct}\printfield{titleaddon}}% - \iftoggle{bbx:gbtype}{% - \iffieldundef{entrysubtype}{\printfield[gbtypeflag]{usera}}%åœ¨æ ‡é¢˜åŽç›´æŽ¥ç»™å‡ºæ–‡çŒ®æ ‡è¯†å—æ¯ï¼Œåˆ¤æ–一下，是å¦æ˜¯æŠ¥çº¸å’Œæ ‡å‡† - {\iffieldequalstr{entrysubtype}{standard}{\printfield[gbtypeflags]{usera}}%判æ–是å¦ä¸ºæ ‡å‡† - {\iffieldequalstr{entrysubtype}{news}{\printfield[gbtypeflagn]{usera}}% 判æ–是å¦ä¸ºæŠ¥çº¸ - {\printfield[gbtypeflag]{usera}}}% 其它 - }}{}% - }\ifboolexpr{test{\ifentrytype{book}} and (not test{\iffieldundef{volume}})}%判æ–一下book类有没有volume - {\ifcitation{}{\setunit{\subtitlepunct}}\printfield{volume}}{}%% + {\setunit{\subtitlepunct}\printfield{titleaddon}}}% + \ifboolexpr{test{\ifentrytype{book}} and (not test{\iffieldundef{volume}})}%判æ–一下book类有没有volume + {\printfield{volume}}{}%% }}{\ifboolexpr{% test{\iffieldundef{title}}% and @@ -600,6 +764,7 @@ test{\ifcitation} and test{\iffieldequalstr{userd}{chinese}}% }{\printdelim{authotitledelim}}% \iffieldundef{series}{}{\usebibmacro{series+number}\setunit{\addcolon\addspace}}%为处ç†ä¸€äº›å˜åœ¨seriesçš„æƒ…å†µè€Œå¢žåŠ \usebibmacro{maintitle+booktitle}% + \usebibmacro{inbook:volume+number}% } % @@ -626,6 +791,44 @@ test{\ifcitation} and test{\iffieldequalstr{userd}{chinese}}% \ifcitation{\iffieldequalstr{userd}{chinese}{\gbpunctcolon}{\addperiod\space}}{\addperiod\space}% } +\renewbibmacro*{maintitle+booktitle}{% +\ifcitation{% + \iffieldundef{maintitle} + {} + {\usebibmacro{maintitle}% + \newunit\newblock + \iffieldundef{volume} + {} + {\printfield{volume}% + \printfield{part}% + \setunit{\addcolon\space}}}% + \usebibmacro{booktitle}% + }% + {\iffieldundef{maintitle} + {} + {\usebibmacro{maintitle}% + \newunit\newblock + \iffieldundef{volume} + {} + {\printfield{volume}% + \printfield{part}% + \setunit{\addcolon\space}}}% + \usebibmacro{booktitle}% + \newunit}% +} + + +\newbibmacro*{inbook:volume+number}{% +\ifcitation{% + \iffieldundef{volume}{}{\printfield{volume}}% + \iffieldundef{number}{}{\printfield{number}}% + }% + {\iffieldundef{volume}{}{\setunit{\addcolon\addspace}\printfield{volume}}% + \iffieldundef{number}{}{\setunit{\addcolon\addspace}\printfield{number}}%å¢žåŠ å·å’Œå†Œä¿¡æ¯ + }% +} + + % % å¢žåŠ inbook:parent用于辅助crossrefä¼ ç»ŸåŠŸèƒ½çš„å®žçŽ° @@ -636,12 +839,122 @@ test{\ifcitation} and test{\iffieldequalstr{userd}{chinese}}% \ifnameundef{bookauthor}{% \ifnameundef{editor}{}{\printdelim{authotitledelim}}% }{\printdelim{authotitledelim}}% -\iffieldundef{series}{}{\usebibmacro{series+number}\setunit{\addcolon\addspace}}%为处ç†ä¸€äº›å˜åœ¨seriesçš„æƒ…å†µè€Œå¢žåŠ +\ifboolexpr{test {\ifcitation} and test{\iffieldequalstr{entrysubtype}{classic}}}{} +{\iffieldundef{series}{}{\usebibmacro{series+number}\setunit{\addcolon\addspace}}}%为处ç†ä¸€äº›å˜åœ¨seriesçš„æƒ…å†µè€Œå¢žåŠ \usebibmacro{maintitle+booktitle}% -\iffieldundef{volume}{}{\setunit{\addcolon\addspace}\printfield{volume}}% -\iffieldundef{number}{}{\setunit{\addcolon\addspace}\printfield{number}}%å¢žåŠ å·å’Œå†Œä¿¡æ¯ + \usebibmacro{inbook:volume+number}% +\ifboolexpr{test {\ifcitation} and test{\iffieldequalstr{entrysubtype}{classic}}}% +{\iffieldundef{series}{}{\newunit\usebibmacro{series+number}}}{}% \newunit\newblock% - \printfield{edition}% +\ifboolexpr{test {\ifcitation} and test{\iffieldequalstr{entrysubtype}{classic}}}{}{\printfield{edition}}% \newunit \newunit\newblock - \usebibmacro{publisher+location+date}} + \usebibmacro{publisher+location+date}% +\ifboolexpr{test {\ifcitation} and test{\iffieldequalstr{entrysubtype}{classic}}}{\printfield{edition}}{}% +} + + +\DeclareBibliographyDriver{book}{%æºæ¥è‡ªstandard.bbx文件 +\usebibmacro{bibindex}% +\usebibmacro{begentry}% +\usebibmacro{author/editor+others/translator+others}% +\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å˜åœ¨æ—¶å¤šå‡ºçš„æ ‡ç‚¹ +\usebibmacro{maintitle+title}% +\iftoggle{bbx:gbstrict}{}{% +\newunit +\printlist{language}% +\newunit\newblock% +\usebibmacro{byauthor}% +\newunit\newblock}% +\usebibmacro{byeditor+others}% +\newunit% +\ifboolexpr{test {\ifcitation} and test{\iffieldequalstr{entrysubtype}{classic}}}{}{\printfield{edition}}% +\newunit\newblock%% +\iftoggle{bbx:gbstrict}{}{% +\iffieldundef{maintitle}% +{\printfield{volume}% +\printfield{part}}% +{}% +\newunit% +\printfield{volumes}% +\newunit\newblock% +\usebibmacro{series+number}}% +\newunit\newblock% +%\printfield{note}% +%\newunit\newblock% +\usebibmacro{publisher+location+date}% +\ifboolexpr{test {\ifcitation} and test{\iffieldequalstr{entrysubtype}{classic}}}{\printfield{edition}}{}% +%\newunit\newblock %è¿™é‡Œæ ‡ç‚¹åŽ»æŽ‰ +\usebibmacro{chapter+pages}% + \iffieldundef{url}{}{%当没有网å€æ—¶ä¹Ÿä¸è¾“出 + \usebibmacro{modifydate}}%带括å·çš„修改或更新日期， +\usebibmacro{doi+eprint+url}%从下é¢ç§»åŠ¨åˆ°ä¸Šé¢æ¥ï¼Œå› 为gbt2015çš„url需直接放在页ç åŽé¢ã€‚ + \newunit\newblock% + \printfield{pagetotal}% + \newunit\newblock% + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% + \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{annotation}\usebibmacro{finentry}} + + + +\DeclareBibliographyDriver{manual}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor+others/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}{% + \printfield{type}% + \setunit*{\addspace}}{}% + \ifboolexpr{test {\ifcitation} and test{\ifentrytype{archive}}}% + {}{\printfield{number}}% + \newunit\newblock + \printfield{version}% + \newunit + \printfield{note}% + \newunit\newblock + \usebibmacro{institution+location+date}% + \ifboolexpr{test {\ifcitation} and test{\ifentrytype{archive}}}% + {\newunit\printfield{number}}{}% + %\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{addendum+pubstate}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{annotation}\usebibmacro{finentry}} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.cbx index a0fa1dc004..56bf057f01 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-css.cbx @@ -10,7 +10,7 @@ %%ç”¨æ³•ï¼šç±»ä¼¼äºŽæ ‡å‡†çš„æ ·å¼åœ¨biblatexåŠ è½½æ—¶è®¾ç½®æ ·å¼ %%文献表æ£å¸¸å¤„ç†ï¼Œæ ‡æ³¨å‘½ä»¤ä¸»è¦ç”¨citeå’Œtextcite -\ProvidesFile{chinese-css.cbx}[2023/03/31 v1.0a a biblatex citation style for CSS] +\ProvidesFile{chinese-css.cbx}[v1.0a a biblatex citation style for CSS] %================================================== %åŠ è½½gbæ ·å¼ @@ -21,10 +21,10 @@ %================================================== %选项设置 %================================================== -%\ExecuteBibliographyOptions{ -% maxcitenames=2, -% mincitenames=1, -%} +\ExecuteBibliographyOptions{ + maxcitenames=2, + mincitenames=1, +} %================================================== %引用命令设置，主è¦ç”¨citeå’Œtextcite @@ -35,6 +35,20 @@ \renewcommand{\bibfootnotewrapper}[1]{% \bibsentence#1}% +%é¿å…去除å‰é¢çš„空白 +\renewrobustcmd{\blx@mkbibfootnote}[2]{% + \iftoggle{blx@footnote} + {\blx@warning{Nested notes}% + \addspace\mkbibparens{#2}} + {%\unspace + \ifnum\blx@notetype=\tw@ + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi + {\csuse{blx@theendnote#1}{\protecting{\blxmkbibnote{end}{#2}}}} + {\csuse{footnote#1}{\protecting{\blxmkbibnote{foot}{#2}}}}}} + %修改脚注注释的实现 \def\execgbfootbib% {% @@ -44,8 +58,8 @@ % %é‡å®šä¹‰\footfullcite使完æˆcss的脚注文献è¦æ±‚ \DeclareCiteCommand{\footfullcite}[\mkbibfootnote]% - {\defcounter{maxnames}{\blx@maxbibnames}%局部定义maxnameså’Œminnames计数器 - \defcounter{minnames}{\blx@minbibnames}%使footfullcite内的作者输出与æ£æ–‡æ–‡çŒ®è¡¨ä¸çš„一致。 + {\defcounter{maxnames}{\blx@maxcitenames}%局部定义maxnameså’Œminnames计数器 + \defcounter{minnames}{\blx@mincitenames}%使footfullcite内的作者输出与æ£æ–‡æ–‡çŒ®è¡¨ä¸çš„一致。 \usebibmacro{prenote}% \renewbibmacro*{postnote}{% \iffieldundef{postnote}% @@ -59,8 +73,14 @@ {\multicitedelim}% {\usebibmacro{postnote}\usebibmacro{finentry}} + \DeclareCiteCommand{\fullcite} - {\usebibmacro{prenote}} + {\usebibmacro{prenote}% + \renewbibmacro*{postnote}{% + \iffieldundef{postnote}% + {}{\setunit{\iffieldequalstr{userd}{chinese}{\unspace\gbpunctcomma}{\addcolon\addspace}}% + \printfield{postnote}}}%与ayæ ·å¼ä¸åŒï¼Œç”±äºŽå·²ä¿®æ”¹postnoteåŸŸæ ¼å¼ï¼Œç›´æŽ¥ç”¨printfield + } {\ifciteseen% {\usedriver{\DeclareNameAlias{sortname}{default}}{citeseen:\thefield{entrytype}}}%\nopunct {\usedriver{\DeclareNameAlias{sortname}{default}}{\thefield{entrytype}}}% @@ -68,8 +88,14 @@ {\multicitedelim} {\usebibmacro{postnote}\usebibmacro{finentry}} + \DeclareCiteCommand{\fullinnercite} - {\usebibmacro{prenote}} + {\usebibmacro{prenote}% + \renewbibmacro*{postnote}{% + \iffieldundef{postnote}% + {}{\setunit{\iffieldequalstr{userd}{chinese}{\unspace\gbpunctcomma}{\addcolon\addspace}}% + \printfield{postnote}}}%与ayæ ·å¼ä¸åŒï¼Œç”±äºŽå·²ä¿®æ”¹postnoteåŸŸæ ¼å¼ï¼Œç›´æŽ¥ç”¨printfield + } {\ifciteseen% {\usedriver{\DeclareNameAlias{sortname}{default}}{citeseen:\thefield{entrytype}}}%\nopunct {\usedriver{\DeclareNameAlias{sortname}{default}}{\thefield{entrytype}}}% @@ -93,3 +119,30 @@ \printfield[citejz]{labeltitle}} {\multicitedelim} {\usebibmacro{postnote}} + + +\DeclareFieldFormat{citetitle}{% +\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}% +{\mkbibemph{#1}}% +} + +\DeclareFieldFormat + [article,inbook,incollection,inproceedings,patent,thesis,unpublished] + {citetitle}{% + \iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}% + {\mkbibquote{#1\isdot}}% + } + + +%ä¸ºæ–‡çŒ®è¾“å‡ºå‡ºç‰ˆä¿¡æ¯ +\DeclareCiteCommand{\citepub} + {\boolfalse{citetracker}% + \boolfalse{pagetracker}% + \usebibmacro{prenote}} + {\ifciteindex + {\indexfield{indextitle}} + {}% + \ifentrytype{online}{\usebibmacro{institution+location+date}}{\usebibmacro{publisher+location+date}}% + } + {\multicitedelim} + {\usebibmacro{postnote}} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.cbx index 4244717642..d0300a9b10 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-erj.cbx @@ -10,7 +10,7 @@ %%ç”¨æ³•ï¼šç±»ä¼¼äºŽæ ‡å‡†çš„æ ·å¼åœ¨biblatexåŠ è½½æ—¶è®¾ç½®æ ·å¼ %%文献表æ£å¸¸å¤„ç†ï¼Œæ ‡æ³¨å‘½ä»¤ä¸»è¦ç”¨citeå’Œtextcite -\ProvidesFile{chinese-erj.cbx}[2022/02/22 v1.0a a biblatex citation style for ERJ] +\ProvidesFile{chinese-erj.cbx}[v1.0a a biblatex citation style for ERJ] %================================================== %åŠ è½½gbæ ·å¼ @@ -22,17 +22,17 @@ % å¢žåŠ ä¸€ä¸ªæŽ§åˆ¶æ ‡æ³¨ä¸æ ‡ç‚¹æ˜¯è‹±æ–‡è¿˜æ˜¯ä¸æ–‡çš„选项 % 20220222,v1.0a,hzz \DeclareBibliographyOption{gbcitepunctcn}[true]{%biblatex低版本 - \ifstrequal{#1}{false}{\execerjpunctencite}{}} - -\def\erjpunctmarkcite{ã€}% -\def\erjpunctsemicoloncite{ï¼›}% -\def\erjpunctparenlcite{（}% -\def\erjpunctparenrcite{）} -\def\execerjpunctencite{% -\def\erjpunctmarkcite{\addcomma\addspace}% -\def\erjpunctsemicoloncite{\addsemicolon\addspace}% -\def\erjpunctparenlcite{(}% -\def\erjpunctparenrcite{)} + \ifstrequal{#1}{false}{\exegbpunctencite}{}} + +\def\gbpunctmarkcite{ã€}% +\def\gbpunctsemicoloncite{ï¼›}% +\def\gbpunctparenlcite{（}% +\def\gbpunctparenrcite{）} +\def\exegbpunctencite{% +\def\gbpunctmarkcite{\addcomma\addspace}% +\def\gbpunctsemicoloncite{\addsemicolon\addspace}% +\def\gbpunctparenlcite{(}% +\def\gbpunctparenrcite{)} } %================================================== @@ -47,13 +47,13 @@ %引用命令设置，主è¦ç”¨citeå’Œtextcite %åŒ…æ‹¬æ ‡ç‚¹è®¾ç½® %================================================== -\renewcommand*{\multicitedelim}{\erjpunctsemicoloncite}%\addsemicolon\addspaceï¼› +\renewcommand*{\multicitedelim}{\gbpunctsemicoloncite}%\addsemicolon\addspaceï¼› \renewcommand*{\textcitedelim}{% \iffinalcitedelim {\ifnumgreater{\value{textcitetotal}}{2} {}{}%\iftextcitepunct{\finalandsemicolon}{\finalandcomma} - \addspace\erjpunctmarkcite}%\addspace\bibstring{andincitecn} - {\iftextcitepunct{\addsemicolon\space}{\addspace\erjpunctmarkcite}}%\addcomma + \addspace\gbpunctmarkcite}%\addspace\bibstring{andincitecn} + {\iftextcitepunct{\addsemicolon\space}{\addspace\gbpunctmarkcite}}%\addcomma }%\space \DeclareDelimFormat[textcite]{nameyeardelim}{\addspace}%\addcomma\space @@ -67,7 +67,7 @@ } %æ ‡æ³¨åŽ‹ç¼©æ—¶ï¼Œç›´æŽ¥ç”¨date+extradate代替extradate实现2006a，2006b的效果 -%\DeclareDelimFormat*{compcitedelim}{\erjpunctmarkcite}%\addcomma\addspace +%\DeclareDelimFormat*{compcitedelim}{\gbpunctmarkcite}%\addcomma\addspace \newbibmacro*{cite:extradate}{% \iffieldundef{extradate} {} @@ -81,12 +81,12 @@ %æ·»åŠ å‰åŽç©ºæ ¼ \DeclareCiteCommand{\cite}%[\mkbibparens] {\usebibmacro{cite:init}% - \unspace\printtext{\erjpunctparenlcite}\usebibmacro{prenote}}%\addspace + \unspace\printtext{\gbpunctparenlcite}\usebibmacro{prenote}}%\addspace {\usebibmacro{citeindex}% \usebibmacro{cite}} {} {\usebibmacro{postnote}% - \erjpunctparenrcite}%\addspace + \gbpunctparenrcite}%\addspace %原版 %\DeclareCiteCommand{\cite}[\mkbibparens] @@ -124,7 +124,7 @@ {\usebibmacro{cite:label}% \setunit{% \global\booltrue{cbx:parens}% - \printdelim{nonameyeardelim}\unspace\erjpunctparenlcite}%\bibopenparen + \printdelim{nonameyeardelim}\unspace\gbpunctparenlcite}%\bibopenparen \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% @@ -133,7 +133,7 @@ {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \printdelim{nameyeardelim}\unspace\erjpunctparenlcite}%\bibopenparen + \printdelim{nameyeardelim}\unspace\gbpunctparenlcite}%\bibopenparen \ifnumequal{\value{citecount}}{1} {\usebibmacro{prenote}} {}% @@ -148,7 +148,7 @@ \savefield{namehash}{\cbx@lasthash}}% \setunit{% \ifbool{cbx:parens} - {\erjpunctparenrcite\global\boolfalse{cbx:parens}}%\bibcloseparen + {\gbpunctparenrcite\global\boolfalse{cbx:parens}}%\bibcloseparen {}% \textcitedelim}} @@ -158,11 +158,11 @@ {\setunit{}% \printtext{% \ifbool{cbx:parens} - {\erjpunctparenrcite\global\boolfalse{cbx:parens}}%\bibcloseparen + {\gbpunctparenrcite\global\boolfalse{cbx:parens}}%\bibcloseparen {}}} {\setunit{% \ifbool{cbx:parens} - {\erjpunctparenrcite\global\boolfalse{cbx:parens}}%\bibcloseparen + {\gbpunctparenrcite\global\boolfalse{cbx:parens}}%\bibcloseparen {}% \textcitedelim}}} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.bbx new file mode 100644 index 0000000000..cba4e06459 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.bbx @@ -0,0 +1,821 @@ +%% +%% --------------------------------------------------------------- +%% css.bbx --- A citation style of journal of management world in china +%% modified from gb7714-2015 +%% Maintained by huzhenzhen +%% E-mail: hzzmail@163.com +%% Released under the LaTeX Project Public License v1.3c or later +%% history +%% 2019/03/28 v1.0 +%% 2022/02/22 v1.0a +%% --------------------------------------------------------------- +%% +%%ç”¨æ³•ï¼šç±»ä¼¼äºŽæ ‡å‡†çš„æ ·å¼åœ¨biblatexåŠ è½½æ—¶è®¾ç½®æ ·å¼ +%%文献表æ£å¸¸å¤„ç†ï¼Œæ ‡æ³¨å‘½ä»¤ä¸»è¦ç”¨citeå’Œtextcite +\ProvidesFile{chinese-jmw.bbx}[2023/04/24 v1.0a a biblatex bibliography style for JMW] + + +%================================================== +%åŠ è½½gbæ ·å¼ +%================================================== +\RequireBibliographyStyle{gb7714-2015} + + +% +% å¢žåŠ ä¸€ä¸ªæŽ§åˆ¶æ ‡ç‚¹æ˜¯è‹±æ–‡è¿˜æ˜¯ä¸æ–‡çš„选项 +% 20220222,v1.0a,hzz +\DeclareBibliographyOption{gbpunctcn}[true]{%biblatex低版本 + \ifstrequal{#1}{false}{\execgbpuncten}{}} + +\newbibmacro*{bbx:ifmergeddate}{\@secondoftwo} + +\newbibmacro*{date+extradate}{} + +% merge date with date label +\def\bbx@opt@mergedate@true{% + \renewbibmacro*{date+extradate}{% + \iffieldundef{labelyear} + {} + {\printtext{% + \iflabeldateisdate + {\printdateextra} + {\printlabeldateextra}}}}% + \renewbibmacro*{bbx:ifmergeddate}{\iflabeldateisdate}% +% \renewbibmacro*{issue+date}{% +% \ifboolexpr{test {\usebibmacro{bbx:ifmergeddate}} +% and +% test {\iffieldundef{issue}}} +% {} +% {\printtext[parens]{% +% \printfield{issue}% +% \setunit*{\addspace}% +% \usebibmacro{bbx:ifmergeddate} +% {} +% {\printdate}}}% +% \newunit} +} + + +\renewbibmacro*{author}{% + \ifboolexpr{ + test \ifuseauthor + and + not test {\ifnameundef{author}} + } + {\printnames{author}% + \iffieldundef{authortype} + {\setunit{\printdelim{nameyeardelim}}} + {\setunit{\printdelim{authortypedelim}}}% + \iffieldundef{authortype} + {} + {\usebibmacro{authorstrg}% + \setunit{\printdelim{nameyeardelim}}}}% + {\global\undef\bbx@lasthash + \usebibmacro{labeltitle}% + \setunit*{\printdelim{nonameyeardelim}}}% +\iffieldequalstr{userd}{chinese}{}{\usebibmacro{date+extradate}\clearfield{year}}% +} + + +%================================================== +%选项设置 +%================================================== +\ExecuteBibliographyOptions{ + gbnamefmt=familyahead, + gbbiblabel=parens, + gbtype=false, + gbpub=false, + doi=false, + url=false, + gbfieldtype=true, + dateabbrev=false, + maxbibnames=99, + mergedate=true, + %datezeros=false, + } + +%================================================== +%å®šä¹‰ä¸€äº›æ ‡ç‚¹ä¸ºä¸æ–‡å…¨è§’æ ‡ç‚¹ +%================================================== +\def\gbpunctdot{。}% +\def\gbpunctmark{ã€}% +\def\gbpunctcomma{，}% +\def\gbpunctcommalanen{，}%\addcomma\addspace +\def\gbpunctcolon{：}% +\def\gbpunctcolonlanen{\addcolon\addspace}% +\def\gbpunctsemicolon{ï¼›}% +\def\gbpunctttl{《}% +\def\gbpunctttr{》} +\def\gbpunctprl{（}% +\def\gbpunctprr{）} + + +\def\execgbpuncten{% +\def\gbpunctdot{\adddot}% +\def\gbpunctmark{\addcomma\addspace}% +\def\gbpunctcomma{\addcomma\addspace}% +\def\gbpunctcommalanen{\addcomma\addspace}% +\def\gbpunctcolon{\addcolon\addspace}% +\def\gbpunctcolonlanen{\addcolon\addspace}% +\def\gbpunctsemicolon{\addsemicolon\addspace}% +\def\gbpunctttl{《}% +\def\gbpunctttr{》}% +} + +\DefineBibliographyExtras{english}{\renewcommand*{\bibrangedash}{$\sim$}}%将页ç 间隔符替æ¢ä¼šè‹±æ–‡çš„çŸæ¨ªçº¿ + +%================================================== +%ä¸ºæ ‡æ³¨å’Œæ–‡çŒ®è¡¨ä¸æ ‡ç‚¹æ ¼å¼ï¼Œé‡è®¾and本地化å—符串 +%================================================== +\DefineBibliographyStrings{english}{ + and = { and},%andåŽé¢çš„ç©ºæ ¼åœ¨finalnamedelimå·²ç»åŠ 过了，所以这里去掉20191009 + andcn = {\gbpunctmark\unspace},%\gbpunctmark + %andotherscn={ç‰}, + mathesiscn={硕士å¦ä½è®ºæ–‡}, + phdthesiscn={åšå£«å¦ä½è®ºæ–‡}, + bytranslator= {trans\adddot\ \lbx@sfromlang\ by}, +} + + + + +%================================================== +%è®¾ç½®ä¸€äº›æ ‡ç‚¹æ ¼å¼ä¸ºä¸æ–‡çš„æ ‡ç‚¹ +%================================================== +%\DeclareFieldFormat{titlecase}{\iffieldequalstr{userd}{chinese}{#1}{\capitalisewords{#1}}} +%\DeclareFieldFormat*{booktitle}{\gbpunctttl#1\gbpunctttr} +\DeclareFieldFormat*{title}{% +\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\textit{#1}\isdot}} +\DeclareFieldFormat[book]{title}{% +\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\textbf{\textit{#1}}\isdot}} +\DeclareFieldFormat[archive]{title}{% +\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{#1\isdot}} +\DeclareFieldFormat[article,incollection,inbook,inproceedings,misc]{title}{% +\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\mkbibquote{#1}\isdot}} +\DeclareFieldFormat*{journaltitle}{% +\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\textbf{\textit{#1}}}}% +\DeclareFieldFormat{booktitle}{% +\iffieldequalstr{userd}{chinese}{\gbpunctttl#1\gbpunctttr}{\textbf{\textit{#1}}}} +\renewcommand*{\revsdnamepunct}{% +\iffieldequalstr{userd}{chinese}{\gbpunctcomma}{\gbpunctcommalanen}} +\DeclareDelimFormat{multinamedelim}{% +\iffieldequalstr{userd}{chinese}{\gbpunctmark}{\gbpunctcommalanen}} +\DeclareDelimFormat{finalnamedelim}{% + %\ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}% + %\addspace% + \edef\userfieldabcde{userd}% + \ifcurrentname{translator}{\edef\userfieldabcde{usere}}{}% + \ifcurrentname{editor}{\edef\userfieldabcde{userc}}{}% + \ifcurrentname{author}{\edef\userfieldabcde{userf}}{}% + \ifcurrentname{bookauthor}{\edef\userfieldabcde{userb}}{}% + \ifcase\value{gbcitelocalcase}% + \iffieldequalstr{\userfieldabcde}{chinese}{\bibstring{andincitecn}}{}% + \iffieldequalstr{\userfieldabcde}{korean}{\bibstring{andkr}}{}% + \iffieldequalstr{\userfieldabcde}{japanese}{\bibstring{andjp}}{}% + \iffieldequalstr{\userfieldabcde}{english}{\space\bibstring{andincite}\space}{}% + \iffieldequalstr{\userfieldabcde}{french}{\bibstring{and}}{}% + \iffieldequalstr{\userfieldabcde}{russian}{\bibstring{and}}{}% +%\space% + \or% + \bibstring{andincitecn}\space% + \or% + \bibstring{andincite}\space% + \fi} +\DeclareDelimFormat[bib,biblist]{finalnamedelim}{% +% \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}% + \edef\userfieldabcde{userd}% + \ifcurrentname{translator}{\edef\userfieldabcde{usere}}{}% + \ifcurrentname{editor}{\edef\userfieldabcde{userc}}{}% + \ifcurrentname{author}{\edef\userfieldabcde{userf}}{}% + \ifcurrentname{bookauthor}{\edef\userfieldabcde{userb}}{}% + \ifcase\value{gbbiblocalcase}% + \iffieldequalstr{\userfieldabcde}{chinese}{\bibstring{andcn}}{}% + \iffieldequalstr{\userfieldabcde}{korean}{\bibstring{andkr}}{}% + \iffieldequalstr{\userfieldabcde}{japanese}{\bibstring{andjp}}{}% + \iffieldequalstr{\userfieldabcde}{english}{\bibstring{and}}{}% + \iffieldequalstr{\userfieldabcde}{french}{\bibstring{and}}{}% + \iffieldequalstr{\userfieldabcde}{russian}{\bibstring{and}}{}% +\space% + \or% +\bibstring{andcn}\space% + \or% + \bibstring{and}\space% + \fi} +\DeclareDelimFormat{nameyeardelim}{% +\iffieldequalstr{userd}{chinese}{\gbpunctcomma}{\gbpunctcommalanen}} +\DeclareDelimFormat[bib,biblist]{nameyeardelim}{% +\iffieldequalstr{userd}{chinese}{\gbpunctcomma}{\gbpunctcommalanen}} +\DeclareDelimFormat{bibpagespunct}{% +\iffieldequalstr{userd}{chinese}{\unspace\gbpunctcomma}{\unspace\gbpunctcommalanen}} +\DeclareFieldFormat{pages}{%%å‰é¢å¼•å¯¼é¡µç çš„pp.ç‰å—符 +\iffieldequalstr{userd}{chinese}{% +\printtext{\bibstring{serialcn} #1\addthinspace 页}}% +{\mkpageprefix[bookpagination]{#1}}} + +% +% 调整页ç å‰çš„æ ‡ç‚¹å’ŒåŽ»æŽ‰æœŸåˆŠæ–‡ç« ç‰é¡µç åŽé¢çš„æ ‡ç‚¹ +% +\renewbibmacro*{note+pages}{%æºæ¥è‡ªstandard.bbx +% \iffieldundef{postnote}{\iffieldundef{pages}{}{% +% \setunit{\bibpagespunct}% +% \printfield{pages}}}{}% +} + + +% +% 调整页ç çš„æ ¼å¼ï¼Œå³chapter+pagesæ ¼å¼ +% +\renewbibmacro*{chapter+pages}{% +\iffieldundef{postnote}{\iffieldundef{pages}{}{% + \setunit{\bibpagespunct}% + \printfield{pages}}}{}% +} + + +\renewcommand*{\newunitpunct}{% +\iffieldequalstr{userd}{chinese}{\gbpunctcomma}{\gbpunctcommalanen}% +} +\renewcommand*{\finentrypunct}{% +\printdelim{finalpunct}} +%è°ƒæ•´æ ‡æ³¨çš„æ³¨é‡Šä¸çš„æ¡ç›®ç»“å°¾æ ‡ç‚¹ +\DeclareDelimFormat{finalpunct}{\iffieldequalstr{userd}{chinese}{\gbpunctdot}{\adddot}} +\DeclareDelimFormat[fullinnercite]{finalpunct}{} + +%出版项ä¸ï¼šå‡ºç‰ˆç¤¾åœ°å€åŽé¢çš„æ ‡ç‚¹ +\renewcommand{\publocpunct}{% +\iffieldequalstr{userd}{chinese}{\gbpunctcolon}{\addcolon\addspace}% +} +%è°ƒæ•´å‡ºç‰ˆç¤¾ä¸Žå¹´ä»½ä¹‹é—´çš„æ ‡ç‚¹ +\renewcommand{\pubdatadelim}{% +\iffieldequalstr{userd}{chinese}% + {\iffieldundef{year}{}{\setunit*{\gbpunctcomma}}}{\setunit*{\addcomma\space}}} +\renewcommand{\locnopubdelim}{% +\iffieldequalstr{userd}{chinese} + {\iffieldundef{year}{}{\setunit*{\gbpunctcomma}}}{\setunit*{\addcomma\space}}} + +%ç¼–è€…ä¸Žç¼–è€…ç±»åž‹ä¹‹é—´çš„æ ‡ç‚¹ +\DeclareDelimFormat{editortypedelim}{\iffieldequalstr{userd}{chinese}{}{\addcomma\space}} + +%åæ ‡é¢˜å‰çš„æ ‡ç‚¹ +\renewcommand*{\subtitlepunct}{% +\iffieldequalstr{userd}{chinese}{}{\addcolon\addspace}} + +%================================================== +%è°ƒæ•´éƒ¨åˆ†åŸŸçš„è¾“å‡ºæ ¼å¼ +%================================================== + +%é‡æ–°è°ƒæ•´è¾“出编者的类型 +\renewbibmacro*{editor+others}{% + \ifboolexpr{ + test \ifuseeditor + and + not test {\ifnameundef{editor}} + } + {\printnames{editor}% + \setunit{\printdelim{editortypedelim}}% + \usebibmacro{editor+othersstrg}% + \clearname{editor}}% + {}% + } + +\renewbibmacro*{editor+othersstrg}{% + \iffieldundef{editortype} + {\ifboolexpr{ + test {\ifnumgreater{\value{editor}}{1}} + or + test {\ifandothers{editor}} + } + {\def\abx@tempa{editors}} + {\def\abx@tempa{editor}}} + {\ifboolexpr{ + test {\ifnumgreater{\value{editor}}{1}} + or + test {\ifandothers{editor}} + } + {\edef\abx@tempa{\thefield{editortype}s}} + {\edef\abx@tempa{\thefield{editortype}}}}% + \let\abx@tempb=\empty + \ifnamesequal{editor}{translator} + {\appto\abx@tempa{tr}% + \appto\abx@tempb{\clearname{translator}}} + {}% + \ifnamesequal{editor}{commentator} + {\appto\abx@tempa{co}% + \appto\abx@tempb{\clearname{commentator}}} + {\ifnamesequal{editor}{annotator} + {\appto\abx@tempa{an}% + \appto\abx@tempb{\clearname{annotator}}} + {}}% + \ifnamesequal{editor}{introduction} + {\appto\abx@tempa{in}% + \appto\abx@tempb{\clearname{introduction}}} + {\ifnamesequal{editor}{foreword} + {\appto\abx@tempa{fo}% + \appto\abx@tempb{\clearname{foreword}}} + {\ifnamesequal{editor}{afterword} + {\appto\abx@tempa{af}% + \appto\abx@tempb{\clearname{afterword}}} + {}}}% + \ifbibxstring{\abx@tempa} + {\printtext[editortype]{% + \iffieldequalstr{userd}{chinese}{\bibstring{\abx@tempa cn}}{\bibstring{\abx@tempa}}% + }\abx@tempb} + {\usebibmacro{editorstrg}}} + +%去掉译å‰çš„æ ‡ç‚¹ +\renewbibmacro*{name:andothers}{\bibauthorfont% + \ifboolexpr{test {\ifnumequal{\value{listcount}}{\value{liststop}}} + and test \ifmorenames} + {\ifnumgreater{\value{liststop}}{1}%注æ„这里试图去区分姓å总数大于1的情况，当姓å总数大于1时，最åŽä¸€ä¸ªå§“ååŽé¢å…ˆåŠ 入一个\finalandcomma + {}{}%\finalandcomma，目å‰å›½æ ‡æ²¡æœ‰è¿™æ ·çš„区分è¦æ±‚，如果有需è¦ä¹Ÿæ˜¯å¯ä»¥è¿™ä¹ˆåŽ»åšçš„。 + \printdelim{andothersdelim}\printdelim{strandothersdelim}}% + {}% +} + + + +%å¢žåŠ å¹´å— +\renewbibmacro*{date}{% + \iffieldequalstr{userd}{chinese}{% + \ifboolexpr{test {\ifentrytype{article}} or test {\ifentrytype{inproceedings}} + or test {\ifentrytype{archive}} or test {\ifentrytype{online}}} + {\printtext{\blx@gbdatecn{}{}}}% + {\printdate\iffieldundef{year}{}{å¹´}}% + }{\ifentrytype{archive}{\printtext{\blx@gbdateen{}{}}}{\printdate}}% +} + +\newrobustcmd*{\blx@gbdatecn}[3][]{% + \dateeraprintpre{#2#3year}% + \iffieldundef{#2#3year}{}{\blx@imc@forcezerosy{\thefield{#2#3year}å¹´}}\ifblank{#1}{}{\printfield{#1}}% + \iffieldundef{#2#3month}{}{{\thefield{#2#3month}}月}% + \iffieldundef{#2#3day}{}{{\thefield{#2#3day}}æ—¥}} + +\newrobustcmd*{\blx@gbdateen}[3][]{% +\mkbibdateen{#2#3year}{#2#3month}{#2#3day}% +} + +\newrobustcmd*{\mkbibdateen}[3]{% + \iffieldundef{#2} + {} + {\mkbibmonth{\thefield{#2}}% + \iffieldundef{#1}{}{\space}}% + \iffieldundef{#3} + {} + {{\thefield{#3}}% + \iffieldundef{#2}{}{\addcomma\space}}% + \iffieldbibstring{#1} + {\bibstring{\thefield{#1}}} + {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}} + + +\renewbibmacro*{newsdate}{%% +\iffieldequalstr{userd}{chinese} + {\printtext{\blx@gbdatecn{}{}}}% + {\printtext{\blx@gbdate{}{}}}%% +} + + +% +\renewbibmacro*{modifydate}{%æ–°å¢žåŠ ä¸€ä¸ªå¸¦æ‹¬å·çš„日期，用于表示电å资æºçš„æ›´æ–°å’Œä¿®æ”¹æ—¥æœŸï¼Œè€Œå…¬å‘Šæ—¥æœŸåˆ™æŒ‰æ—¥æœŸæ ¼å¼ +\iffieldequalstr{userd}{chinese} + {% + \printtext{\blx@gbdatecn{}{}}% + }% + {\ifboolexpr{% + test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{eventday}}% + }% + {}%更新或修改日期通常有dayä¿¡æ¯ + {\iffieldundef{year}{% + \iffieldundef{endyear}{\iffieldundef{eventyear}{}{\printtext{\gbleftparen}\printeventdate\printtext{\gbrightparen}}}% + {\printtext{\gbleftparen}\printenddate\printtext{\gbrightparen}}% + }{\iffieldequalstr{year}{}{%å› ä¸ºyearå˜åœ¨ï¼Œä½†ä¸ºç©º + }{\printtext{\gbleftparen}\blx@gbdate{}{}\printtext{\gbrightparen}}% + }}% +}}% + + +\renewbibmacro*{url+urldate}{% + \newunit\usebibmacro{url}\newunit% + \printtext{\blx@gbdatecn{}{url}}% +} + + +\DeclareFieldFormat{type}% +{\iffieldequalstr{userd}{chinese}% + {\ifbibxstring{#1cn}{\bibxstring{#1cn}}{#1}}% + {\ifbibstring{#1}{\bibstring{#1}}{#1}}% +} + + +\renewbibmacro*{in:}{% +\iftoggle{bbx:gbpunctin}{\gbpunctcomma}%\addthinspace + {\setunit{\adddot\addspace}% + \iffieldequalstr{userd}{chinese}% + {\gbpunctcomma}% + {\printtext{\bibstring{in}}}% + }}%\newunit\newblock\intitlepunct + + +% +% 修改numberå’Œvolumeçš„æ ¼å¼ +% +\newcounter{numberwithoutzero} +\DeclareFieldFormat[newspaper,article,periodical]{number}% +{\iffieldequalstr{userd}{chinese}{% + \iffieldequalstr{entrysubtype}{news}{% + \iffieldint{number}% + {\printtext{\gbpunctcomma\bibstring{serialcn} #1 版}}% + {\printtext{\gbpunctcomma #1}}% + }% + {\iffieldint{number}{\setcounter{numberwithoutzero}{#1}% + \printtext{\bibstring{serialcn}\addthinspace\arabic{numberwithoutzero} 期}}% + {\printtext{\bibstring{serialcn}\addthinspace #1 期}}% + }}% + {\newunit\setcounter{numberwithoutzero}{#1}\printtext{\bibstring{number}}\arabic{numberwithoutzero}}% +} + +\DeclareFieldFormat[book,inbook,incollection,misc]{number}% +{\iffieldequalstr{userd}{chinese}{\iffieldint{number}% + {% + \bibstring{serialcn}#1\bibstring{numbercn}% + }{#1}% + }% + {\bibstring{number}~#1}% +} + +\DeclareFieldFormat[article,periodical,newspaper]{volume}% +{\iffieldequalstr{userd}{chinese}{% + \iffieldint{volume}% + {\bibstring{serialcn}#1\bibstring{volumecn}}% + {#1}% + }% + {\bibstring{volume}~#1}% +} + +\DeclareFieldFormat[book,inbook,incollection]{volume}% +{\iffieldequalstr{userd}{chinese}{\iffieldint{volume}% + {\iffieldequalstr{entrysubtype}{classic}{\bibstring{volumecn}#1}% + {\bibstring{serialcn}#1\bibstring{volumecn}}% + }{#1}% + }% + {\bibstring{volume}~#1}% +} + +\DeclareListFormat[article,newspaper]{location}{% +\iffieldequalstr{userd}{chinese}{\gbpunctprl#1\gbpunctprr}{#1}% +} + +\DeclareListFormat[article]{series}{% +\iffieldequalstr{userd}{chinese}{\gbpunctprl#1\gbpunctprr}{#1}% +} + +% +% 调整期刊åçš„æ ¼å¼ +% +% v1.0k,20180425,å¢žåŠ äº†å—体控制命令，hzz +% v1.1j,20220527,ä¿®å¤æœŸåˆŠåä¸å˜åœ¨æ—¶å¤šä½™çš„æ ‡ç‚¹ +\renewbibmacro*{journal+issuetitle}{% + \bibpubfont% + \usebibmacro{journal}\newunit% + \iflistundef{location}{}{\printlist{location}}% + \iffieldundef{series}% + {}% + {\printfield{series}}% + \iffieldundef{volume}% + {\usebibmacro{issue+date}% + \usebibmacro{volume+number+eid}}% + {\usebibmacro{volume+number+eid}% + \iffieldundef{year}{}{\newunit}% + \usebibmacro{issue+date}}% +} + + +%去掉期刊ååŽçš„æ ‡ç‚¹ +\renewbibmacro*{journal}{% + \ifboolexpr{ + test {\iffieldundef{journaltitle}} + and + test {\iffieldundef{journalsubtitle}} + } + {} + {\printtext[journaltitle]{% + \printfield[titlecase]{journaltitle}% + \printfield[titlecase]{journalsubtitle}}% + }% + \iffieldundef{journaltitleaddon} + {} + {\printfield{journaltitleaddon}}} + + + + +% +% 调整期刊å·å’ŒæœŸçš„æ ¼å¼ +% +\renewbibmacro*{volume+number+eid}{%æºæ¥è‡ªstandard.bbx +\iffieldequalstr{userd}{chinese}% + {\iffieldundef{volume}{}{\printfield{volume}}% + \iffieldundef{number}{}{\printfield{number}}}%区别于顺åºç¼–ç 制 + {\newunit\printfield{volume}% + \printfield{number}% + \setunit{\addcomma\space}% + \printfield{eid}}% +} + + +% +% æœŸåˆŠçš„æ ‡é¢˜åšä¿®æ”¹ +% +\renewbibmacro*{title+issuetitle}{%æºæ¥è‡ªstandard.BBX + \usebibmacro{periodical}% + \iffieldequalstr{userd}{chinese}{\setunit*{\gbpunctcomma}}{\setunit*{\adddot\addspace}}% + \iffieldundef{series}% + {}% + {\newunit% + \printfield{series}% + \setunit{\addspace}}% + \usebibmacro{periodical+issue}%å°†issue调整到上é¢æ¥ï¼Œå¹¶ä¿®æ”¹ + \usebibmacro{issue+date}% + \usebibmacro{issue}% + \usebibmacro{volume+number+eid} +} + + + + +% +% é‡è®¾title的输出 +% +% 20180425，v1.0kï¼Œä¸ºæ ‡é¢˜å¢žåŠ å—体控制命令，Hu Zhenzhen +% 原ç†æ–¹æ³•:å°†æ–‡çŒ®ç±»åž‹æ ‡è¯†ç¬¦è¾“å‡ºå‡ºåŽ»ï¼ŒåŽŸè¾“å‡ºæ¥è‡ªbiblatex.def文件 +% 利用toggleåšæ ‡è¯†ç¬¦æ˜¯å¦è¾“å‡ºçš„åˆ¤æ– +\renewbibmacro*{title}{% + \ifboolexpr{% + test{\iffieldundef{title}}% + and + test{\iffieldundef{subtitle}}% + }% + {}% + {\setunit*{\iffieldequalstr{userd}{chinese}{\gbpunctcolon}{\gbpunctcommalanen}}% + \ifboolexpr{not test {\iffieldundef{origyear}} and test{\iffieldequalstr{entrysubtype}{classic}}}% + {\printorigdate}{}% + \printtext[title]{\bibtitlefont%å¢žåŠ å—体控制命令%å¢žåŠ äº†æ ‡ç‚¹ï¼š + \printfield[titlecase]{title}% + \ifboolexpr{test {\iffieldundef{subtitle}}}%è¿™é‡Œå¢žåŠ äº†å¯¹åæ ‡é¢˜çš„åˆ¤æ–，解决ä¸åˆ¤æ–多一个点的问题 + {}{\setunit{\subtitlepunct}% + \printfield[titlecase]{subtitle}}% + \iffieldundef{titleaddon}{}%判æ–一下titleaddon，å¦åˆ™ç›´æŽ¥åŠ å¯èƒ½å¤šä¸€ä¸ªç©ºæ ¼ + {\setunit{\subtitlepunct}\printfield{titleaddon}}}% + \ifboolexpr{test{\ifentrytype{book}} and (not test{\iffieldundef{volume}})}%判æ–一下book类有没有volume + {\printfield{volume}}{}%% + }% +} + + +%===================================================================== +%è®¾ç½®é©±åŠ¨æ ¼å¼ +%===================================================================== + +\DeclareDelimFormat{authotitledelim} +{% +\iffieldequalstr{userd}{chinese}{\gbpunctcolon}{\addperiod\space}% +} + +\renewbibmacro*{maintitle+booktitle}{% + \iffieldundef{maintitle} + {} + {\usebibmacro{maintitle}% + \newunit\newblock + \iffieldundef{volume} + {} + {\printfield{volume}% + \printfield{part}% + \setunit{\addcolon\space}}}% + \usebibmacro{booktitle}% +} + + +\newbibmacro*{inbook:volume+number}{% + \iffieldundef{volume}{}{\printfield{volume}}% + \iffieldundef{number}{}{\printfield{number}}% +} + + +\renewbibmacro*{thesis:institution+location+date}{\bibpubfont%当没有institutionæ—¶ä¸å¤„ç†ã€‚ +{\printlist{location}%%åŠ äº†ä¸€ä¸ªç¼–ç»„é¿å…\usebibmacro{date}把monthå’Œdayä¿¡æ¯åŽ»æŽ‰ + \iflistundef{institution} + {\setunit*{\addcomma\space}} + {\setunit*{\publocpunct}}% + \printlist{institution}% + \iftoggle{bbx:gbfieldtype}{% + \printfield{type}% + \setunit*{\addspace}}{}% + \pubdatadelim% + \usebibmacro{date}% + %\newunit + }} + + +% +% å¢žåŠ inbook:parent用于辅助crossrefä¼ ç»ŸåŠŸèƒ½çš„å®žçŽ° +% 用在{crosscite}å®ä¸ +% 20210216,v1.0w,hzz +\newbibmacro*{inbook:parent}{% +\usebibmacro{bybookauthor}% +\ifnameundef{bookauthor}{% + \ifnameundef{editor}{}{\printdelim{authotitledelim}}% + }{\printdelim{authotitledelim}}% +{\iffieldundef{series}{}{\usebibmacro{series+number}\setunit{\addcolon\addspace}}}%为处ç†ä¸€äº›å˜åœ¨seriesçš„æƒ…å†µè€Œå¢žåŠ + \usebibmacro{maintitle+booktitle}% + \usebibmacro{inbook:volume+number}% + \newunit\newblock% + {\printfield{edition}}% + \newunit + \newunit\newblock + \usebibmacro{publisher+location+date}% +} + + +\DeclareBibliographyDriver{book}{%æºæ¥è‡ªstandard.bbx文件 +\usebibmacro{bibindex}% +\usebibmacro{begentry}% +\usebibmacro{author/editor+others/translator+others}% +\ifnameundef{namea}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者ä¸å˜åœ¨æ—¶å¤šå‡ºçš„æ ‡ç‚¹ +\usebibmacro{maintitle+title}% +\iftoggle{bbx:gbstrict}{}{% +\newunit +\printlist{language}% +\newunit\newblock% +\usebibmacro{byauthor}% +\newunit\newblock}% +\usebibmacro{byeditor+others}% +\newunit% +{\printfield{edition}}% +\newunit\newblock%% +\iftoggle{bbx:gbstrict}{}{% +\iffieldundef{maintitle}% +{\printfield{volume}% +\printfield{part}}% +{}% +\newunit% +\printfield{volumes}% +\newunit\newblock% +\usebibmacro{series+number}}% +\newunit\newblock% +%\printfield{note}% +%\newunit\newblock% +\usebibmacro{publisher+location+date}% +%\newunit\newblock %è¿™é‡Œæ ‡ç‚¹åŽ»æŽ‰ +\usebibmacro{chapter+pages}% +% \iffieldundef{url}{}{%当没有网å€æ—¶ä¹Ÿä¸è¾“出 +% \usebibmacro{modifydate}}%带括å·çš„修改或更新日期， +\usebibmacro{doi+eprint+url}%从下é¢ç§»åŠ¨åˆ°ä¸Šé¢æ¥ï¼Œå› 为gbt2015çš„url需直接放在页ç åŽé¢ã€‚ + \newunit\newblock% + \printfield{pagetotal}% + \newunit\newblock% + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% + \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{annotation}\usebibmacro{finentry}} + + +\DeclareBibliographyDriver{thesis}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor+others/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 + {\printfield{number}}% + \newunit\newblock + \printfield{version}% + \newunit + \printfield{note}% + \newunit\newblock + \usebibmacro{thesis: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{addendum+pubstate}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{annotation}\usebibmacro{finentry}} + + +\DeclareBibliographyDriver{manual}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor+others/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}{% + \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{addendum+pubstate}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{annotation}\usebibmacro{finentry}} + + +\DeclareBibliographyDriver{misc}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/editor+others/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 + \printfield{howpublished}% + \newunit\newblock + \printfield{type}% + \newunit + \printfield{version}% + \newunit + \printfield{note}% + \newunit\newblock + \usebibmacro{institution+location+date}% + \newunit% + \printfield{number}% + %\usebibmacro{organization+location+date}% + %\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{annotation}\usebibmacro{finentry}} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.cbx new file mode 100644 index 0000000000..d8a89fb535 --- /dev/null +++ b/macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/chinese-jmw.cbx @@ -0,0 +1,183 @@ +%% +%% --------------------------------------------------------------- +%% css.cbx --- A citation style of journal of management world in china +%% modified from gb7714-2015 +%% Maintained by huzhenzhen +%% E-mail: hzzmail@163.com +%% Released under the LaTeX Project Public License v1.3c or later +%% --------------------------------------------------------------- +%% +%%ç”¨æ³•ï¼šç±»ä¼¼äºŽæ ‡å‡†çš„æ ·å¼åœ¨biblatexåŠ è½½æ—¶è®¾ç½®æ ·å¼ +%%文献表æ£å¸¸å¤„ç†ï¼Œæ ‡æ³¨å‘½ä»¤ä¸»è¦ç”¨citeå’Œtextcite + +\ProvidesFile{chinese-jmw.cbx}[v1.0a a biblatex citation style for jmw] + +%================================================== +%åŠ è½½gbæ ·å¼ +%================================================== +\RequireCitationStyle{gb7714-2015ay} % + + +% +% å¢žåŠ ä¸€ä¸ªæŽ§åˆ¶æ ‡æ³¨ä¸æ ‡ç‚¹æ˜¯è‹±æ–‡è¿˜æ˜¯ä¸æ–‡çš„选项 +% 20220222,v1.0a,hzz +\DeclareBibliographyOption{gbcitepunctcn}[true]{%biblatex低版本 + \ifstrequal{#1}{false}{\execgbpunctencite}{}} + +\def\gbpunctcommacite{，}% +\def\gbpunctmarkcite{ã€}% +\def\gbpunctsemicoloncite{ï¼›}% +\def\gbpunctparenlcite{（}% +\def\gbpunctparenrcite{）} +\def\execgbpunctencite{% +\def\gbpunctcommacite{\addcomma\addspace}% +\def\gbpunctmarkcite{\addcomma\addspace}% +\def\gbpunctsemicoloncite{\addsemicolon\addspace}% +\def\gbpunctparenlcite{(}% +\def\gbpunctparenrcite{)} +} + +%================================================== +%选项设置 +%================================================== +\ExecuteBibliographyOptions{ + maxcitenames=2, + mincitenames=1, +} + +\DeclareDelimFormat[textcite]{delimandincitecn}{å’Œ}%\addcomma\space +\DeclareDelimFormat[parencite]{delimandincitecn}{\gbpunctmarkcite}%\addcomma\space +\DeclareDelimFormat[textcite]{delimandincite}{å’Œ}%\addcomma\space +\DeclareDelimFormat[parencite]{delimandincite}{ and }%\addcomma\space +\DeclareDelimFormat[textcite]{delimandothersincite}{\str@andotherscn}%\addcomma\space +\DeclareDelimFormat[parencite]{delimandothersincite}{et al\adddot}%\addcomma\space + +\DefineBibliographyStrings{english}{ + andincitecn = {\printdelim{delimandincitecn}}, + andincite = {\printdelim{delimandincite}}, + %andothersincitecn={\str@andotherscn}, + andothersincite={\printdelim{delimandothersincite}}, +} + +%================================================== +%引用命令设置，主è¦ç”¨citeå’Œtextcite +%åŒ…æ‹¬æ ‡ç‚¹è®¾ç½® +%================================================== +\renewcommand*{\multicitedelim}{\gbpunctsemicoloncite}%\addsemicolon\addspaceï¼› +\renewcommand*{\textcitedelim}{% + \iffinalcitedelim + {\ifnumgreater{\value{textcitetotal}}{2} + {}{}%\iftextcitepunct{\finalandsemicolon}{\finalandcomma} + \addspace\gbpunctmarkcite}%\addspace\bibstring{andincitecn} + {\iftextcitepunct{\addsemicolon\space}{\addspace\gbpunctmarkcite}}%\addcomma +}%\space + +\DeclareDelimFormat[textcite]{nameyeardelim}{\addspace}%\addcomma\space +\DeclareDelimFormat[parencite]{nameyeardelim}{\gbpunctcommacite} +\DeclareDelimFormat[textcite]{andothersdelim}{\addspace}% +\DeclareDelimFormat[parencite]{andothersdelim}{\iffieldequalstr{userf}{chinese}{}{\addspace}}% + + +%æ ‡æ³¨åŽ‹ç¼©æ—¶ï¼Œç›´æŽ¥ç”¨date+extradate代替extradate实现2006a，2006b的效果 +%\DeclareDelimFormat*{compcitedelim}{\gbpunctmarkcite}%\addcomma\addspace +\newbibmacro*{cite:extradate}{% + \iffieldundef{extradate} + {} + {\printtext[bibhyperref]{\addspace\printlabeldateextra}}}%\printfield{extradate}\printlabeldateextra \printfield{labelyear}\printfield{extradate} + +%\AtEveryCite{% +%\let\parentext=\parentexttrack% +%\let\bibopenparen=（% +%\let\bibcloseparen=）} + +%æ·»åŠ å‰åŽç©ºæ ¼ +\DeclareCiteCommand{\parencite}%[\mkbibparens] + {\usebibmacro{cite:init}% + \unspace\printtext{\gbpunctparenlcite}\usebibmacro{prenote}}%\addspace + {\usebibmacro{citeindex}% + \usebibmacro{cite}} + {} + {\usebibmacro{postnote}% + \gbpunctparenrcite}%\addspace + +%原版 +%\DeclareCiteCommand{\cite}[\mkbibparens] +% {\usebibmacro{cite:init}% +% \usebibmacro{prenote}}%) +% {\usebibmacro{citeindex}% +% \usebibmacro{cite}} +% {} +% {\usebibmacro{postnote}} + +% +%æ·»åŠ åŽé¢ç©ºæ ¼ +%\DeclareCiteCommand{\cbx@textcite} +% {\usebibmacro{cite:init}} +% {\usebibmacro{citeindex}% +% \usebibmacro{textcite}} +% {} +% {\usebibmacro{textcite:postnote}\addspace} + +\newbibmacro*{textcite}{% + \iffieldequals{namehash}{\cbx@lasthash} + {\iffieldundef{shorthand} + {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND + \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)} + {\setunit{\addcomma}% + \usebibmacro{cite:extradate}} + {\setunit{\compcitedelim}% + \usebibmacro{cite:labeldate+extradate}% + \savefield{labelyear}{\cbx@lastyear}}} + {\setunit{\compcitedelim}% + \usebibmacro{cite:shorthand}% + \global\undef\cbx@lastyear}} + {\ifnameundef{labelname} + {\iffieldundef{shorthand} + {\usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nonameyeardelim}\unspace\gbpunctparenlcite}%\bibopenparen + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{cite:labeldate+extradate}} + {\usebibmacro{cite:shorthand}}} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:parens}% + \printdelim{nameyeardelim}\unspace\gbpunctparenlcite}%\bibopenparen + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \iffieldundef{shorthand} + {\iffieldundef{labelyear} + {\usebibmacro{cite:label}} + {\usebibmacro{cite:labeldate+extradate}}% + \savefield{labelyear}{\cbx@lastyear}} + {\usebibmacro{cite:shorthand}% + \global\undef\cbx@lastyear}}% + \stepcounter{textcitecount}% + \savefield{namehash}{\cbx@lasthash}}% + \setunit{% + \ifbool{cbx:parens} + {\gbpunctparenrcite\global\boolfalse{cbx:parens}}%\bibcloseparen + {}% + \textcitedelim}} + +\newbibmacro*{textcite:postnote}{% + \usebibmacro{postnote}% + \ifthenelse{\value{multicitecount}=\value{multicitetotal}} + {\setunit{}% + \printtext{% + \ifbool{cbx:parens} + {\gbpunctparenrcite\global\boolfalse{cbx:parens}}%\bibcloseparen + {}}} + {\setunit{% + \ifbool{cbx:parens} + {\gbpunctparenrcite\global\boolfalse{cbx:parens}}%\bibcloseparen + {}% + \textcitedelim}}} + +\let\citet=\textcite +\let\citep=\parencite +\let\cite=\parencite 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 aa44a3870f..b5233fc1f9 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{2023/03/31 v1.1l} +\def\versionofgbtstyle{2023/04/24 v1.1m} \def\versionofbiblatex{\abx@version} \ProvidesFile{gb7714-2015.bbx}[\versionofgbtstyle biblatex bibliography style] %\RequireBiber[3]%显å¼æŒ‡å®šç”¨biberåŽç«¯ï¼Œå½“用bibtex时会报错，但其实ä¸ä¼šå½±å“编译，åªæ˜¯é‡‡ç”¨bibtexåŽæ— 法达æˆæ ¼å¼éœ€æ±‚ @@ -543,6 +543,13 @@ \def\str@mathesiscn{硕士å¦ä½è®ºæ–‡} \def\str@phdthesiscn{åšå£«å¦ä½è®ºæ–‡} \def\str@editorcn{主编} + \def\str@editorscn{主编} + \def\str@compilerscn{æ•´ç†} + \def\str@compilercn{æ•´ç†} + \def\str@revisercn{ç¼–} + \def\str@reviserscn{ç¼–} + \def\str@foundercn{ç¼–è‘—} + \def\str@founderscn{ç¼–è‘—} \AtEndOfPackage{% \iftoggle{bbx:codegbk}{% @@ -919,6 +926,13 @@ \NewBibliographyString{editorcn} \NewBibliographyString{editorscn} \NewBibliographyString{bytranslatorcn} + \NewBibliographyString{compilercn} + \NewBibliographyString{compilerscn} + \NewBibliographyString{revisercn} + \NewBibliographyString{reviserscn} + \NewBibliographyString{foundercn} + \NewBibliographyString{founderscn} + @@ -956,6 +970,12 @@ phdthesiscn={\str@phdthesiscn}, editorscn={\str@editorcn}, editorcn={\str@editorcn}, + compilerscn={\str@compilerscn}, + compilercn={\str@compilercn}, + reviserscn={\str@reviserscn}, + revisercn={\str@revisercn}, + founderscn={\str@founderscn}, + foundercn={\str@foundercn}, } % @@ -2670,7 +2690,8 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 {\namepartgiven} {\namepartprefix} {\namepartsuffix}}% -\or +\or% +\renewrobustcmd*{\bibinithyphendelim}{.\mbox{-}}% \ifgiveninits {\usebibmacro{name:given-family} {\namepartfamily} @@ -2682,7 +2703,8 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 {\namepartgiven} {\namepartprefix} {\namepartsuffix}}% -\or +\or% +\renewrobustcmd*{\bibinithyphendelim}{.\mbox{-}}% \ifgiveninits {\usebibmacro{name:family-given} {\namepartfamily} @@ -2700,7 +2722,8 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 {\namepartgiven} {\namepartprefix} {\namepartsuffix}% -\or +\or% +\renewrobustcmd*{\bibinithyphendelim}{.\mbox{-}}% \ifnumequal{\value{listcount}}{1} {\ifgiveninits {\usebibmacro{name:family-given} @@ -3298,6 +3321,7 @@ test{\iftoggle{iftlnine}} %å®šä¹‰å‡ºç‰ˆç¤¾ä¸Žå¹´ä»½ä¹‹é—´çš„æ ‡ç‚¹ä¾¿äºŽåŽé¢é‡å®šä¹‰ \newcommand{\pubdatadelim}{\setunit*{\addcomma\space}} +\newcommand{\locnopubdelim}{\setunit*{\addcomma\space}} % æ–°å¢žä¸€ä¸ªæ ·å¼ç”¨äºŽè¾“出连ç»å‡ºç‰ˆç‰©çš„地å€ï¼Œå•ä½ï¼Œæ—¶é—´ï¼Œ % 用于periodicalè¿žç»å‡ºç‰ˆç‰©çš„出版社和地å€çš„å¤„ç† @@ -3327,7 +3351,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}% \newunit}% {\printlist{location}% \iflistundef{institution}% - {\setunit*{\addcomma\space}} + {\locnopubdelim} {\setunit*{\publocpunct}}% \printlist{institution}% \pubdatadelim% @@ -3362,7 +3386,7 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}% }% {\printlist{location}% \iflistundef{publisher} - {\setunit*{\addcomma\space}} + {\locnopubdelim} {\setunit*{\publocpunct}}% \printlist{publisher}% \pubdatadelim% @@ -3396,6 +3420,12 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}% {\bibstring{serialcn}#1\bibstring{volumecn}}% {\bibstring{volume}~#1}% }% volume of a book +\DeclareFieldFormat[book,inbook,incollection]{volume}% +{\iffieldequalstr{userd}{chinese}{\iffieldint{volume}% + {\bibstring{serialcn}#1\bibstring{volumecn}% + }{#1}}% + {\bibstring{volume}~#1}% +} \DeclareFieldFormat[article,periodical]{volume}{#1}% volume of a journal % 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 e6a1ae9e41..a1f7a23492 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{2023/03/31 v1.1l} +\def\versionofgbtstyle{2023/04/24 v1.1m} \def\versionofbiblatex{\abx@version} \ProvidesFile{gb7714-2015ay.bbx}[\versionofgbtstyle biblatex bibliography style] %\RequireBiber[3]%显å¼æŒ‡å®šç”¨biberåŽç«¯ï¼Œå½“用bibtex时会报错，但其实ä¸ä¼šå½±å“编译，åªæ˜¯é‡‡ç”¨bibtexåŽæ— 法达æˆæ ¼å¼éœ€æ±‚ @@ -492,6 +492,13 @@ \def\str@mathesiscn{硕士å¦ä½è®ºæ–‡} \def\str@phdthesiscn{åšå£«å¦ä½è®ºæ–‡} \def\str@editorcn{主编} + \def\str@editorscn{主编} + \def\str@compilerscn{æ•´ç†} + \def\str@compilercn{æ•´ç†} + \def\str@revisercn{ç¼–} + \def\str@reviserscn{ç¼–} + \def\str@foundercn{ç¼–è‘—} + \def\str@founderscn{ç¼–è‘—} \AtEndOfPackage{% \iftoggle{bbx:codegbk}{% @@ -876,6 +883,12 @@ \NewBibliographyString{editorcn} \NewBibliographyString{editorscn} \NewBibliographyString{bytranslatorcn} + \NewBibliographyString{compilercn} + \NewBibliographyString{compilerscn} + \NewBibliographyString{revisercn} + \NewBibliographyString{reviserscn} + \NewBibliographyString{foundercn} + \NewBibliographyString{founderscn} % % 修改一些当地化å—符串 @@ -910,6 +923,12 @@ phdthesiscn={\str@phdthesiscn}, editorscn={\str@editorcn}, editorcn={\str@editorcn}, + compilerscn={\str@compilerscn}, + compilercn={\str@compilercn}, + reviserscn={\str@reviserscn}, + revisercn={\str@revisercn}, + founderscn={\str@founderscn}, + foundercn={\str@foundercn}, } % @@ -2526,7 +2545,8 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 {\namepartgiven} {\namepartprefix} {\namepartsuffix}}% -\or +\or% +\renewrobustcmd*{\bibinithyphendelim}{.\mbox{-}}% \ifgiveninits {\usebibmacro{name:given-family} {\namepartfamily} @@ -2538,7 +2558,8 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 {\namepartgiven} {\namepartprefix} {\namepartsuffix}}% -\or +\or% +\renewrobustcmd*{\bibinithyphendelim}{.\mbox{-}}% \ifgiveninits {\usebibmacro{name:family-given} {\namepartfamily} @@ -2556,7 +2577,8 @@ test {\iftoggle{iftlseven}}%biblatex<=3.7 {\namepartgiven} {\namepartprefix} {\namepartsuffix}% -\or +\or% +\renewrobustcmd*{\bibinithyphendelim}{.\mbox{-}}% \ifnumequal{\value{listcount}}{1} {\ifgiveninits {\usebibmacro{name:family-given} @@ -3217,6 +3239,12 @@ test {\iflistundef{location}} and test {\iflistundef{institution}}% {\bibstring{serialcn}#1\bibstring{volumecn}}% {\bibstring{volume}~#1}% }% volume of a book +\DeclareFieldFormat[book,inbook,incollection]{volume}% +{\iffieldequalstr{userd}{chinese}{\iffieldint{volume}% + {\bibstring{serialcn}#1\bibstring{volumecn}% + }{#1}}% + {\bibstring{volume}~#1}% +} \DeclareFieldFormat[article,periodical]{volume}{#1}% volume of a journal % diff --git a/macros/latex/contrib/koma-script/MANIFEST.md b/macros/latex/contrib/koma-script/MANIFEST.md index 1b469356ff..7089f6be08 100644 --- a/macros/latex/contrib/koma-script/MANIFEST.md +++ b/macros/latex/contrib/koma-script/MANIFEST.md @@ -211,6 +211,7 @@ of the KOMA-Script bundle of LaTeX classes and packages. * `README.scrletter.cls` * `README.scrletter.sty` * `README.scrlfile-hook.sty` +* `README.scrlfile-hook-3.34.sty` * `README.scrlfile-patcholdlatex.sty` * `README.scrlfile.sty` * `README.scrlogo.sty` diff --git a/macros/latex/contrib/koma-script/README.md b/macros/latex/contrib/koma-script/README.md index 56045e3135..d4c05adc89 100644 --- a/macros/latex/contrib/koma-script/README.md +++ b/macros/latex/contrib/koma-script/README.md @@ -1,4 +1,4 @@ -# KOMA-Script 2023/04/17 v3.39 +# KOMA-Script 2023/04/24 v3.40 Copyright [Markus Kohm](mailto:komascript@gmx.info) 1994–2023 This material is subject to the LaTeX Project Public License Version 1.3c. See [`lppl.txt`](lppl.txt) (English) or [`lppl-de.txt`](lppl-de.txt) (German) for the details of that license. @@ -68,7 +68,7 @@ Requires: scrkbase - internal KOMA-Script package Recommended: scrlayer-scrpage - KOMA-Script package License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -85,7 +85,7 @@ Abstract: scrreport is a very simple wrapper class to scrartcl. It has Requires: scrartcl.cls - KOMA-Script class License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -126,7 +126,7 @@ Requires: keyval - key=value package from the graphics bundle manipulation License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -148,7 +148,7 @@ Requires: scrkbase - internal KOMA-Script package typearea - KOMA-Script package License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -169,7 +169,7 @@ Requires: scrkbase - KOMA-Script package for some basic features. manipulation License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -200,7 +200,7 @@ Requires: scrkbase - internal package with some basics of KOMA-Script etoolbox - tool-box for LaTeX programming using e-TeX License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -214,7 +214,7 @@ Abstract: scrfontsizes is a LaTeX package of the KOMA-Script bundle. Requires: scrextend - some KOMA-Script features for other classes License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -234,7 +234,7 @@ Requires: scrkbase - internal KOMA-Script package with basics xpatch - extending etoolbox patching commands License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -252,7 +252,7 @@ Requires: scrkbase - internal KOMA-Script package with basics tocbasic - features for helper files and float environments License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -269,7 +269,7 @@ Requires: scrbase - KOMA-Script package for some basic features. manipulation License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -292,7 +292,7 @@ Abstract: scrlayer-notecolumn is a LaTeX package of the KOMA-Script Requires: scrlayer.sty License: LPPL 1.3c or later State: Author maintained, proof of concept -Version: 2022/06/29 v0.3.3915 +Version: 2023/04/17 v0.3.4032 </pre> *** @@ -314,7 +314,7 @@ Abstract: scrlayer-scrpage is a LaTeX package of the KOMA-Script Requires: scrlayer.sty License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -341,7 +341,7 @@ Abstract: scrlayer is a LaTeX package of the KOMA-Script bundle. Requires: scrkbase.sty License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -356,7 +356,7 @@ Requires: scrartcl.cls – KOMA-Script class scrletter.sty – KOMA-Script package License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -373,7 +373,21 @@ Requires: scrkbase - internal KOMA-Script package Recommended: marvosym - package by Martin Vogel providing symbols License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 +</pre> +*** + +###scrlfile-hook-3.34 - internal subpackage of scrlfile +<pre> +Maintainer: Markus Kohm +E-Mail: komascript@gmx.info +Abstract: scrlfile-hook-3.34 is an internal subpackage of scrlfile to + be used with LaTeX from version 2020-10-01, but before + version 2021-11-15. +Requires: scrlogo.sty +License: LPPL 1.3c or later +State: Author maintained +Version: 2023/04/24 v3.40 </pre> *** @@ -382,11 +396,11 @@ Version: 2023/04/17 v3.39 Maintainer: Markus Kohm E-Mail: komascript@gmx.info Abstract: scrlfile-hook is an internal subpackage of scrlfile to be - be used with LaTeX from version 2010-10-01 on. + be used with LaTeX from version 2021-11-15 on. Requires: scrlogo.sty License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -399,7 +413,7 @@ Abstract: scrlfile-patcholdlatex is an internal subpackage of scrlfile Requires: scrlogo.sty License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -419,7 +433,7 @@ Abstract: scrlfile is a LaTeX package of the KOMA-Script bundle. It Requires: scrlfile-hook.sty, scrlfile-patcholdlatex.sty, scrlogo.sty License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -433,7 +447,7 @@ Abstract: scrlogo is a LaTeX package of the KOMA-Script bundle. It Requires: License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -468,7 +482,7 @@ Requires: scrkbase - internal KOMA-Script package Recommended: marvosym - package by Martin Vogel providing symbols License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -485,7 +499,7 @@ Abstract: scrreport is a very simple wrapper class to scrreprt. It has Requires: scrreprt.cls - KOMA-Script class License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -507,7 +521,7 @@ Requires: scrkbase - internal KOMA-Script package typearea - KOMA-Script package License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -521,7 +535,7 @@ Abstract: scrtime is a LaTeX package of the KOMA-Script bundle. It Requires: scrkbase - internal package with some basics of KOMA-Script License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -548,7 +562,7 @@ Abstract: tocbasic is a LaTeX package of the KOMA-Script bundle. The Requires: scrbase - KOMA-Script package for some basic features. License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** @@ -571,7 +585,7 @@ Abstract: Many LaTeX classes, including the standard classes, present Requires: scrkbase - internal basic features for KOMA-Script packages License: LPPL 1.3c or later State: Autor maintained -Version: 2023/04/17 v3.39 +Version: 2023/04/24 v3.40 </pre> *** diff --git a/macros/latex/contrib/koma-script/doc/common-dictum-de.tex b/macros/latex/contrib/koma-script/doc/common-dictum-de.tex index 488ffe9502..9951b25bbb 100644 --- a/macros/latex/contrib/koma-script/doc/common-dictum-de.tex +++ b/macros/latex/contrib/koma-script/doc/common-dictum-de.tex @@ -1,6 +1,6 @@ % ====================================================================== % common-dictum-de.tex -% Copyright (c) Markus Kohm, 2001-2022 +% Copyright (c) Markus Kohm, 2001-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -24,7 +24,7 @@ % ====================================================================== \KOMAProvidesFile{common-dictum-de.tex} - [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $ + [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $ KOMA-Script guide (common paragraphs)] \section{Schlauer Spruch} @@ -141,8 +141,22 @@ Voreinstellung entnehmen Sie bitte \toprule Element & Voreinstellung \\ \midrule - \DescRef{\ThisCommonLabelBase.fontelement.dictum} & - \Macro{normalfont}\Macro{normalcolor}\Macro{sffamily}\Macro{small}\\ + \IfThisCommonLabelBase{maincls}{% + \ChangedAt{v3.39}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + }{% + \IfThisCommonLabelBase{scrextend}{% + \ChangedAt{v3.39}{\Package{screxend}}% + }{% + \IfThisCommonLabelBase{scrlttr2}{% + \ChangedAt{v3.39}{\Class{scrlttr2}}% + }{}% + }% + }% + \DescRef{\ThisCommonLabelBase.fontelement.dictum} + & \Macro{normalfont}\Macro{normalcolor}% + \DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}% + \Macro{small}\\ \DescRef{\ThisCommonLabelBase.fontelement.dictumauthor} & \Macro{itshape}\\ \bottomrule diff --git a/macros/latex/contrib/koma-script/doc/common-dictum-en.tex b/macros/latex/contrib/koma-script/doc/common-dictum-en.tex index f8cee03811..940a7ca1a8 100644 --- a/macros/latex/contrib/koma-script/doc/common-dictum-en.tex +++ b/macros/latex/contrib/koma-script/doc/common-dictum-en.tex @@ -1,6 +1,6 @@ % ====================================================================== % common-dictum-en.tex -% Copyright (c) Markus Kohm, 2001-2022 +% Copyright (c) Markus Kohm, 2001-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -24,7 +24,7 @@ % ====================================================================== \KOMAProvidesFile{common-dictum-en.tex} - [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $ + [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $ KOMA-Script guide (common paragraphs)] \translator{Gernot Hassenpflug\and Markus Kohm\and Krickette Murabayashi\and Karl Hagen} @@ -76,10 +76,10 @@ \end{Declaration}% You can set such a saying with the help of the \Macro{dictum} command. % \IfThisCommonLabelBase{maincls}{% - This\textnote{Hint!} macro can be included in the mandatory argument of - either the \DescRef{maincls.cmd.setchapterpreamble} or the - \DescRef{maincls.cmd.setpartpreamble} command. However, this is not - obligatory.\par% + This\textnote{Hint!} macro can be included in the mandatory argument of + either the \DescRef{maincls.cmd.setchapterpreamble} or the + \DescRef{maincls.cmd.setpartpreamble} command. However, this is not + obligatory.\par% }{}% The dictum, along with an optional \PName{author}, is inserted in a \Macro{parbox}\IndexCmd{parbox} (see \cite{latex:usrguide}) of width @@ -118,8 +118,22 @@ listed in \autoref{tab:maincls.dictumfont}% \toprule Element & Default \\ \midrule - \DescRef{\LabelBase.fontelement.dictum} & - \Macro{normalfont}\Macro{normalcolor}\Macro{sffamily}\Macro{small}\\ + \IfThisCommonLabelBase{maincls}{% + \ChangedAt{v3.39}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + }{% + \IfThisCommonLabelBase{scrextend}{% + \ChangedAt{v3.39}{\Package{screxend}}% + }{% + \IfThisCommonLabelBase{scrlttr2}{% + \ChangedAt{v3.39}{\Class{scrlttr2}}% + }{}% + }% + }% + \DescRef{\LabelBase.fontelement.dictum} + & \Macro{normalfont}\Macro{normalcolor}% + \DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}% + \Macro{small}\\ \DescRef{\LabelBase.fontelement.dictumauthor} & \Macro{itshape}\\ \bottomrule diff --git a/macros/latex/contrib/koma-script/doc/common-lists-de.tex b/macros/latex/contrib/koma-script/doc/common-lists-de.tex index 0fbb070153..972c8fc0da 100644 --- a/macros/latex/contrib/koma-script/doc/common-lists-de.tex +++ b/macros/latex/contrib/koma-script/doc/common-lists-de.tex @@ -1,6 +1,6 @@ % ====================================================================== % common-lists-de.tex -% Copyright (c) Markus Kohm, 2001-2022 +% Copyright (c) Markus Kohm, 2001-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -24,7 +24,7 @@ % ====================================================================== \KOMAProvidesFile{common-lists-de.tex}% - [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $ + [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $ KOMA-Script guide (common paragraphs)] \section{Listen} @@ -326,7 +326,21 @@ \FontElement{descriptionlabel}\important{\FontElement{descriptionlabel}} (siehe \autoref{tab:\ThisCommonLabelBase.fontelements}, \autopageref{tab:\ThisCommonLabelBase.fontelements}) geändert werden. In der - Voreinstellung wird \Macro{sffamily}""\Macro{bfseries} verwendet.% + Voreinstellung wird + \IfThisCommonLabelBase{maincls}{% + \ChangedAt{v3.39}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + }{% + \IfThisCommonLabelBase{scrextend}{% + \ChangedAt{v3.39}{\Package{screxend}}% + }{% + \IfThisCommonLabelBase{scrlttr2}{% + \ChangedAt{v3.39}{\Class{scrlttr2}}% + }{}% + }% + }% + \DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}""% + \Macro{bfseries} verwendet.% \IfThisCommonFirstRun{\iftrue}{% \ In \autoref{sec:maincls.lists} auf \PageRefxmpl{maincls.env.description} finden Sie ein Beispiel für die Anwendung.% diff --git a/macros/latex/contrib/koma-script/doc/common-lists-en.tex b/macros/latex/contrib/koma-script/doc/common-lists-en.tex index 4a2c64b798..329ee2801c 100644 --- a/macros/latex/contrib/koma-script/doc/common-lists-en.tex +++ b/macros/latex/contrib/koma-script/doc/common-lists-en.tex @@ -1,6 +1,6 @@ % ====================================================================== % common-lists-en.tex -% Copyright (c) Markus Kohm, 2001-2022 +% Copyright (c) Markus Kohm, 2001-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -24,7 +24,7 @@ % ====================================================================== \KOMAProvidesFile{common-lists-en.tex} - [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $ + [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $ KOMA-Script guide (common paragraphs)] \translator{Gernot Hassenpflug\and Markus Kohm\and Krickette Murabayashi\and Karl Hagen} @@ -302,7 +302,20 @@ \FontElement{descriptionlabel}\important{\FontElement{descriptionlabel}} element (see \autoref{tab:\ThisCommonLabelBase.fontelements}, \autopageref{tab:\ThisCommonLabelBase.fontelements}). The default is - \Macro{sffamily}\linebreak[1]\Macro{bfseries}.% + \IfThisCommonLabelBase{maincls}{% + \ChangedAt{v3.39}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}}% + }{% + \IfThisCommonLabelBase{scrextend}{% + \ChangedAt{v3.39}{\Package{screxend}}% + }{% + \IfThisCommonLabelBase{scrlttr2}{% + \ChangedAt{v3.39}{\Class{scrlttr2}}% + }{}% + }% + }% + \DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}\linebreak[1]% + \Macro{bfseries}.% \IfThisCommonFirstRun{\iftrue}{\csname iffalse\endcsname} \begin{Example} \phantomsection\xmpllabel{env.description}% diff --git a/macros/latex/contrib/koma-script/doc/common-textmarkup-de.tex b/macros/latex/contrib/koma-script/doc/common-textmarkup-de.tex index 100cfeac87..7b638a1df5 100644 --- a/macros/latex/contrib/koma-script/doc/common-textmarkup-de.tex +++ b/macros/latex/contrib/koma-script/doc/common-textmarkup-de.tex @@ -1,6 +1,6 @@ % ====================================================================== % common-textmarkup-de.tex -% Copyright (c) Markus Kohm, 2001-2022 +% Copyright (c) Markus Kohm, 2001-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -24,7 +24,7 @@ % ====================================================================== \KOMAProvidesFile{common-textmarkup-de.tex} - [$Date: 2023-04-04 13:29:59 +0200 (Di, 04. Apr 2023) $ + [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $ KOMA-Script guide (common paragraphs)] \section{Textauszeichnungen} @@ -183,8 +183,9 @@ \PName{Ein-Aus-Wert} kann dabei einer der Standardwerte für einfache Schalter aus \autoref{tab:truefalseswitch} verwendet werden. Nur bei aktivierter Option führt \Macro{maybesffamily} zu \Macro{sffamily} und - \Macro{textmaybesf} zu \Macro{textsf}. \KOMAScript{} selbst verwendet - \Macro{maybesffamily} in der Voreinstellung der Elemente + \Macro{textmaybesf} zu \Macro{textsf}. Dies ist auch die Voreinstellung. + \KOMAScript{} selbst verwendet \Macro{maybesffamily} in der Voreinstellung + der Elemente \IfThisCommonLabelBase{scrextend}{}{% \DescRef{\LabelBase.fontelement.descriptionlabel}, % }% @@ -197,9 +198,11 @@ \DescRef{maincls.fontelement.disposition}% }{% \DescRef{\LabelBase.fontelement.disposition}% - } % + } % und \DescRef{\LabelBase.fontelement.dictum}% - }.% + }. \Macro{maybesffamily} darf also auch als Teil der \PName{Befehle} der + nachfolgend erklärten Anweisungen \DescRef{\LabelBase.cmd.setkomafont} und + \DescRef{\LabelBase.cmd.addtokomafont} verwendet werden.% \EndIndexGroup% \fi diff --git a/macros/latex/contrib/koma-script/doc/common-textmarkup-en.tex b/macros/latex/contrib/koma-script/doc/common-textmarkup-en.tex index 8b81bfbbb2..b2874ed8be 100644 --- a/macros/latex/contrib/koma-script/doc/common-textmarkup-en.tex +++ b/macros/latex/contrib/koma-script/doc/common-textmarkup-en.tex @@ -1,6 +1,6 @@ % ====================================================================== % common-textmarkup-en.tex -% Copyright (c) Markus Kohm, 2001-2022 +% Copyright (c) Markus Kohm, 2001-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -24,7 +24,7 @@ % ====================================================================== \KOMAProvidesFile{common-textmarkup-en.tex} - [$Date: 2023-04-04 13:29:59 +0200 (Di, 04. Apr 2023) $ + [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $ KOMA-Script guide (common paragraphs)] \translator{Gernot Hassenpflug\and Markus Kohm\and Krickette Murabayashi\and Karl Hagen} @@ -179,25 +179,27 @@ depending on the setting of option \Option{sfdefaults}. One of the default values for simple switches from \autoref{tab:truefalseswitch} can be used here. Only if this option is enabled will \Macro{maybesffamily} result in - \Macro{sffamily} and \Macro{textmaybesf} use \Macro{textsf}. KOMA-Script - itself uses \Macro{maybesffamily} in the default settings of elements - \IfThisCommonLabelBase{scrextend}{}{% + \Macro{sffamily} and \Macro{textmaybesf} use \Macro{textsf}. This is also + the default setting. KOMA-Script itself uses \Macro{maybesffamily} in the + default settings of elements \IfThisCommonLabelBase{scrextend}{}{% \DescRef{\LabelBase.fontelement.descriptionlabel}, % - }% + }% \IfThisCommonLabelBase{scrlttr2}{% \DescRef{\LabelBase.fontelement.backaddress}, % \DescRef{\LabelBase.fontelement.refname}, % and \DescRef{\LabelBase.fontelement.lettertitle}% }{% \IfThisCommonLabelBase{scrextend}{% - \DescRef{maincls.fontelement.disposition}% + \DescRef{maincls.fontelement.disposition} % }{% \DescRef{\LabelBase.fontelement.disposition}, % - }% + }% and \DescRef{\LabelBase.fontelement.dictum}% - }.% + }. \Macro{maybesffamily} may thus also be used as part of the + \PName{commands} of the \DescRef{\LabelBase.cmd.setkomafont} and + \DescRef{\LabelBase.cmd.addtokomafont} statements explained below.% \EndIndexGroup% -\fi + \fi \begin{Declaration} diff --git a/macros/latex/contrib/koma-script/doc/letter-example-00-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-00-de.pdf Binary files differindex bf2ad91537..88b1b56266 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-00-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-00-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-00-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-00-en.pdf Binary files differindex cceedc4657..c6e38544fe 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-00-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-00-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-01-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-01-de.pdf Binary files differindex 7b235fa7db..0d1331814c 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-01-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-01-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-01-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-01-en.pdf Binary files differindex df28d5d708..3b61a9bfe8 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-01-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-01-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-02-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-02-de.pdf Binary files differindex 72cb97f417..d6a18ca342 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-02-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-02-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-02-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-02-en.pdf Binary files differindex 8c32102d1b..94f25768c4 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-02-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-02-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-03-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-03-de.pdf Binary files differindex 68c17bb8db..fac8cf3af2 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-03-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-03-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-03-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-03-en.pdf Binary files differindex 7c0e47913c..f332391e62 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-03-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-03-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-04-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-04-de.pdf Binary files differindex 4f72d91356..08921f8a13 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-04-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-04-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-04-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-04-en.pdf Binary files differindex fea4f82e13..27325ac5dc 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-04-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-04-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-05-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-05-de.pdf Binary files differindex 04f77cb7d5..5345b63a61 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-05-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-05-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-05-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-05-en.pdf Binary files differindex 99ac87b961..37d4e98a57 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-05-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-05-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-06-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-06-de.pdf Binary files differindex b207def49a..881cf067f7 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-06-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-06-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-06-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-06-en.pdf Binary files differindex 2ea196f2b0..a3c0546088 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-06-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-06-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-07-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-07-de.pdf Binary files differindex c4806624d5..7415897736 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-07-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-07-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-07-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-07-en.pdf Binary files differindex 453d96f15c..6724f248b9 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-07-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-07-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-08-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-08-de.pdf Binary files differindex 35dd6e5095..47b926ea7c 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-08-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-08-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-08-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-08-en.pdf Binary files differindex 1543cf5eca..afb0b752aa 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-08-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-08-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-09-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-09-de.pdf Binary files differindex 4879a525b8..06a2758bb3 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-09-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-09-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-09-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-09-en.pdf Binary files differindex f15d3ed842..fdc0534cf7 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-09-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-09-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-10-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-10-de.pdf Binary files differindex e98de9d690..5643a04421 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-10-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-10-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-10-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-10-en.pdf Binary files differindex 1cb5b1f34d..ed972856a8 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-10-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-10-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-11-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-11-de.pdf Binary files differindex eea9f33be8..503f9e7005 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-11-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-11-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-11-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-11-en.pdf Binary files differindex d16b5b1ad2..1b0452406b 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-11-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-11-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-12-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-12-de.pdf Binary files differindex 4a7a1aee52..b6efd75f32 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-12-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-12-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-12-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-12-en.pdf Binary files differindex 995d7ada77..3e7854f27d 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-12-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-12-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-13-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-13-de.pdf Binary files differindex 0f10aad58b..dd3e44a94c 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-13-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-13-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-13-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-13-en.pdf Binary files differindex 0d75113def..bbcef17343 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-13-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-13-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-14-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-14-de.pdf Binary files differindex bc8c78a39d..faae3c8c59 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-14-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-14-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-14-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-14-en.pdf Binary files differindex 63c0ed97ed..215b0336f0 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-14-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-14-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-15-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-15-de.pdf Binary files differindex d7a7021cc0..66f7bb08f5 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-15-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-15-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-15-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-15-en.pdf Binary files differindex 94c8221b79..64413646ef 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-15-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-15-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-16-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-16-de.pdf Binary files differindex 07c725b509..76365f7445 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-16-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-16-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-16-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-16-en.pdf Binary files differindex 9a836451af..486b17b603 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-16-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-16-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-17-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-17-de.pdf Binary files differindex 39ebc382d7..0f571d2d46 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-17-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-17-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-17-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-17-en.pdf Binary files differindex 026232663f..fd8cb4f061 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-17-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-17-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-18-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-18-de.pdf Binary files differindex 282c02c3bd..0b8fbb2159 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-18-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-18-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-18-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-18-en.pdf Binary files differindex 1cbdc9dc9d..3c6d326fdf 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-18-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-18-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-19-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-19-de.pdf Binary files differindex beff2c403a..40a27e9eac 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-19-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-19-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-19-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-19-en.pdf Binary files differindex 78a55e595d..8effd9c436 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-19-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-19-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-20-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-20-de.pdf Binary files differindex dbd12bef9a..be00931b93 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-20-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-20-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-20-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-20-en.pdf Binary files differindex e39a1a32e4..110d513bfd 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-20-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-20-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-21-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-21-de.pdf Binary files differindex 4c4a9606e7..4a50318990 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-21-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-21-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-21-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-21-en.pdf Binary files differindex a892448d61..ea7b248e54 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-21-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-21-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-22-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-22-de.pdf Binary files differindex 072952e220..f47b606f33 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-22-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-22-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-22-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-22-en.pdf Binary files differindex 1926717703..30f4d55d5f 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-22-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-22-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-23-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-23-de.pdf Binary files differindex 9bda41d035..89c53da25c 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-23-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-23-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-23-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-23-en.pdf Binary files differindex 27a27eed8b..336ee89b06 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-23-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-23-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/scrbookreportarticle-de.tex b/macros/latex/contrib/koma-script/doc/scrbookreportarticle-de.tex index 7054166a7e..276d201a38 100644 --- a/macros/latex/contrib/koma-script/doc/scrbookreportarticle-de.tex +++ b/macros/latex/contrib/koma-script/doc/scrbookreportarticle-de.tex @@ -1,6 +1,6 @@ % ====================================================================== % scrbookreportarticle-de.tex -% Copyright (c) Markus Kohm, 2001-2022 +% Copyright (c) Markus Kohm, 2001-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -24,7 +24,7 @@ % ============================================================================ \KOMAProvidesFile{scrbookreportarticle-de.tex} - [$Date: 2022-07-17 12:37:12 +0200 (So, 17. Jul 2022) $ + [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $ KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl)] \chapter{Die Hauptklassen \Class{scrbook}, \Class{scrreprt}, \Class{scrartcl}} @@ -2148,7 +2148,10 @@ Teile-Ãœberschrift wird zusätzlich das Element \FontElement{partnumber} verwendet, für die optionale Präfixzeile der Kapitelüberschriften das Element \FontElement{chapterprefix}. Die Schriftart für das Element \FontElement{disposition} ist als -\Macro{normalcolor}""\Macro{sffamily}""\Macro{bfseries} vordefiniert. Die +\ChangedAt{v3.39}{\Class{scrbook}\and \Class{scrartcl}\and \Class{scrreprt}}% +\Macro{normalcolor}""% +\DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}""% +\Macro{bfseries} vordefiniert. Die Voreinstellungen für die spezifischen Elemente sind mit einer Schriftgröße vorbelegt und daher von den Einstellungen \PValue{big}, \PValue{normal} und \PValue{small} für die Option @@ -2229,7 +2232,7 @@ vorbelegt und daher von den Einstellungen \PValue{big}, \PValue{normal} und für Abhilfe sorgen:% \fi \begin{lstcode} - \setkomafont{disposition}{\normalcolor\sffamily} + \setkomafont{disposition}{\normalcolor\maybesffamily} \part{\appendixname} \addtokomafont{disposition}{\bfseries} \end{lstcode} @@ -2239,17 +2242,18 @@ vorbelegt und daher von den Einstellungen \PValue{big}, \PValue{normal} und \Macro{part}-Ãœberschriften eine entsprechende Änderung vorzunehmen. Das ist wahlweise mit: \begin{lstcode} - \addtokomafont{part}{\normalfont\sffamily} - \addtokomafont{partnumber}{\normalfont\sffamily} + \addtokomafont{part}{\normalfont\maybesffamily} + \addtokomafont{partnumber}{\normalfont\maybesffamily} \end{lstcode} oder einfach mit: \begin{lstcode} \addtokomafont{part}{\mdseries} \addtokomafont{partnumber}{\mdseries} \end{lstcode} - möglich. Die Verwendung von \DescRef{\LabelBase.cmd.setkomafont} wäre zwar grundsätzlich - möglich, müsste aber auch die Auswahl der Schriftgröße enthalten und würde - damit die Größenänderung über die Option \DescRef{\LabelBase.option.headings} verhindern. + möglich. Die Verwendung von \DescRef{\LabelBase.cmd.setkomafont} wäre zwar + grundsätzlich möglich, müsste aber auch die Auswahl der Schriftgröße + enthalten und würde damit die Größenänderung über die Option + \DescRef{\LabelBase.option.headings} verhindern. Die zweite Version mit \Macro{mdseries} ist vorzuziehen, da diese auch dann noch zum gewünschten Ergebnis führt, wenn Sie später das Element @@ -5150,3 +5154,4 @@ zuständig.% % LocalWords: Nummerierungsstil Eingangskommentar Nummerierungsstils % LocalWords: Standardanweisung Einstellmöglichkeiten Umbruchkorrekturtext % LocalWords: Inhaltsverzeichniseintrag Formatierungsänderungen Präfixzeile +% LocalWords: voreinzustellen diff --git a/macros/latex/contrib/koma-script/doc/scrbookreportarticle-en.tex b/macros/latex/contrib/koma-script/doc/scrbookreportarticle-en.tex index 9994aa9738..5bff239c30 100644 --- a/macros/latex/contrib/koma-script/doc/scrbookreportarticle-en.tex +++ b/macros/latex/contrib/koma-script/doc/scrbookreportarticle-en.tex @@ -24,7 +24,7 @@ % ============================================================================ \KOMAProvidesFile{scrbookreportarticle-en.tex} - [$Date: 2023-04-06 09:05:58 +0200 (Do, 06. Apr 2023) $ + [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $ KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl)] \translator{Jens-Uwe Morawski\and Gernot Hassenpflug\and Markus Kohm\and @@ -1975,7 +1975,10 @@ first, followed by the specific element\important{% \FontElement{partnumber}, for the number of the part heading, and \FontElement{chapterprefix}, for the optional prefix line of chapter headings. The initial definition for the \FontElement{disposition} element is -\Macro{normalcolor}\linebreak[2]\Macro{sffamily}\linebreak[2]\Macro{bfseries}. +\ChangedAt{v3.39}{\Class{scrbook}\and \Class{scrartcl}\and \Class{scrreprt}}% +\Macro{normalcolor}\linebreak[2]% +\DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybysffamily}\linebreak[2]% +\Macro{bfseries}. The default font sizes for the specific elements depends on the options \OptionValueRef{\LabelBase}{headings}{big}, \OptionValueRef{\LabelBase}{headings}{normal}, and @@ -2053,7 +2056,7 @@ The default font sizes for the specific elements depends on the options and notice that the very large headings of the document parts are too bold. You could change this as follows: \begin{lstcode} - \setkomafont{disposition}{\normalcolor\sffamily} + \setkomafont{disposition}{\normalcolor\maybesffamily} \part{Appendices} \addtokomafont{disposition}{\bfseries} \end{lstcode} @@ -2062,8 +2065,8 @@ Using the command above you only switch off the font attribute and elegant solution is to change all \Macro{part} headings at once. This is done either by: \begin{lstcode} - \addtokomafont{part}{\normalfont\sffamily} - \addtokomafont{partnumber}{\normalfont\sffamily} + \addtokomafont{part}{\normalfont\maybesffamily} + \addtokomafont{partnumber}{\normalfont\maybesffamily} \end{lstcode} or simply: \begin{lstcode} diff --git a/macros/latex/contrib/koma-script/doc/scrguide-de.pdf b/macros/latex/contrib/koma-script/doc/scrguide-de.pdf Binary files differindex db536b8340..7ecb7978c8 100644 --- a/macros/latex/contrib/koma-script/doc/scrguide-de.pdf +++ b/macros/latex/contrib/koma-script/doc/scrguide-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/scrguide-en.pdf b/macros/latex/contrib/koma-script/doc/scrguide-en.pdf Binary files differindex 78a67052de..3bcd49b7ab 100644 --- a/macros/latex/contrib/koma-script/doc/scrguide-en.pdf +++ b/macros/latex/contrib/koma-script/doc/scrguide-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/scrjura-example-de.pdf b/macros/latex/contrib/koma-script/doc/scrjura-example-de.pdf Binary files differindex 1fa785aa8f..37237fef5c 100644 --- a/macros/latex/contrib/koma-script/doc/scrjura-example-de.pdf +++ b/macros/latex/contrib/koma-script/doc/scrjura-example-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf b/macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf Binary files differindex 67ce42a47b..341f44e9d8 100644 --- a/macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf +++ b/macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.pdf b/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.pdf Binary files differindex 91280bf2b8..a800e99fda 100644 --- a/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.pdf +++ b/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.pdf b/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.pdf Binary files differindex 89fd3d7413..3039687b56 100644 --- a/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.pdf +++ b/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/scrlttr2-de.tex b/macros/latex/contrib/koma-script/doc/scrlttr2-de.tex index 0f701ada8c..5ab46d4813 100644 --- a/macros/latex/contrib/koma-script/doc/scrlttr2-de.tex +++ b/macros/latex/contrib/koma-script/doc/scrlttr2-de.tex @@ -1,6 +1,6 @@ % ====================================================================== % scrlttr2-de.tex -% Copyright (c) Markus Kohm, 2002-2022 +% Copyright (c) Markus Kohm, 2002-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -24,7 +24,7 @@ % ============================================================================ \KOMAProvidesFile{scrlttr2-de.tex}% - [$Date: 2022-10-12 08:12:27 +0200 (Mi, 12. Okt 2022) $ + [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $ KOMA-Script guide (chapter: scrlttr2)] \chapter{Briefe mit Klasse \Class{scrlttr2} oder Paket \Package{scrletter}} @@ -2487,7 +2487,9 @@ der Variablen \Variable{backaddress} wird von \KOMAScript{} nicht genutzt. \LabelFontElement{backaddress}% Die Schriftart der Rücksendeadresse ist über das Element \FontElement{backaddress}\important{\FontElement{backaddress}} -konfigurierbar. Voreingestellt ist hierbei \Macro{sffamily} (siehe +konfigurierbar. Voreingestellt ist hierbei +\ChangedAt{v3.39}{\Class{scrlttr2}}% +\DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily} (siehe \autoref{tab:\LabelBase.AddresseeElements}). Vor der Anwendung der konfigurierten Schriftumschaltung wird noch \Macro{scriptsize} ausgeführt.% \EndIndexGroup @@ -2519,8 +2521,9 @@ verfügbaren Platz gesetzt. \midrule \DescRef{\LabelBase.fontelement.addressee}\IndexFontElement{addressee} & \\ + \ChangedAt{v3.39}{\Class{scrlttr2}}% \DescRef{\LabelBase.fontelement.backaddress}\IndexFontElement{backaddress} & - \Macro{sffamily}% + \DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}% \\ \DescRef{\LabelBase.fontelement.PPdata}\IndexFontElement{PPdata} & \Macro{sffamily}% @@ -3213,7 +3216,10 @@ verwendet. Die Voreinstellungen der \iffree{beiden }{}Elemente sind \toprule Element & Voreinstellung \\ \midrule - \FontElement{refname} & \Macro{sffamily}\Macro{scriptsize} \\ + \ChangedAt{v3.39}{\Class{scrlttr2}}% + \FontElement{refname} + & \DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}% + \Macro{scriptsize} \\ \FontElement{refvalue} & \\ \bottomrule \end{tabular} @@ -3425,7 +3431,9 @@ Die Schriftart für das Element\ChangedAt{v3.17}{\Class{scrlttr2}\and Größenangaben erlaubt. Die Größe \Macro{LARGE} wird der Schriftauswahl innerhalb von \KOMAScript{} immer vorangestellt und ist daher auch nicht Teil\textnote{Voreinstellung} der Voreinstellung -\Macro{normalcolor}\Macro{sffamily}\Macro{bfseries}. Bei +\ChangedAt{v3.39}{\Class{scrlttr2}}\Macro{normalcolor}""% +\DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}""% +\Macro{bfseries}. Bei \Class{scrlttr2}\OnlyAt{\Class{scrlttr2}} kann als Alias für \FontElement{lettertitle} auch \FontElement{title}\important{\FontElement{title}} verwendet werden. Bei diff --git a/macros/latex/contrib/koma-script/doc/scrlttr2-en.tex b/macros/latex/contrib/koma-script/doc/scrlttr2-en.tex index 6aa27c2c59..8af84810a4 100644 --- a/macros/latex/contrib/koma-script/doc/scrlttr2-en.tex +++ b/macros/latex/contrib/koma-script/doc/scrlttr2-en.tex @@ -24,7 +24,7 @@ % ============================================================================ \KOMAProvidesFile{scrlttr2-en.tex}% - [$Date: 2023-03-20 09:42:36 +0100 (Mo, 20. Mär 2023) $ + [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $ KOMA-Script guide (chapter: scrlttr2)] \translator{Harald Bongartz\and Georg Grandke\and Raimund Kohl\and Jens-Uwe @@ -2198,9 +2198,10 @@ variable. The default separator is a comma followed by a non-breaking space. \LabelFontElement{backaddress}% You can configure the font style of the return address via the \FontElement{backaddress}\important{\FontElement{backaddress}} element. The -default is \Macro{sffamily} (see \autoref{tab:\LabelBase.AddresseeElements}). -Before applying the element's font style \KOMAScript{} switches to -\Macro{scriptsize}.% +default is \ChangedAt{v3.39}{\Class{scrlttr2}}% +\DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily} (see +\autoref{tab:\LabelBase.AddresseeElements}). Before applying the element's +font style \KOMAScript{} switches to \Macro{scriptsize}.% \EndIndexGroup The default \OptionValue{addrfield}{true}, centres the address vertically @@ -2225,8 +2226,9 @@ but place it flush with the top of the available space.% \midrule \DescRef{\LabelBase.fontelement.addressee}\IndexFontElement{addressee} & \\ + \ChangedAt{v3.39}{\Class{scrlttr2}}% \DescRef{\LabelBase.fontelement.backaddress}\IndexFontElement{backaddress} & - \Macro{sffamily}% + \DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}% \\ \DescRef{\LabelBase.fontelement.PPdata}\IndexFontElement{PPdata} & \Macro{sffamily}% @@ -2836,7 +2838,10 @@ listed in \autoref{tab:\LabelBase.refnamerefvalue}.% \toprule element & default configuration \\ \midrule - \DescRef{\LabelBase.fontelement.refname} & \Macro{sffamily}\Macro{scriptsize} \\ + \ChangedAt{v3.39}{\Class{scrlttr2}}% + \DescRef{\LabelBase.fontelement.refname} + & \DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}% + \Macro{scriptsize} \\ \DescRef{\LabelBase.fontelement.refvalue} & \\ \bottomrule \end{tabular} @@ -3001,7 +3006,9 @@ the \DescRef{\LabelBase.cmd.setkomafont} and \DescPageRef{\LabelBase.cmd.setkomafont}). Font size declarations are allowed. The \Macro{LARGE} font size always precedes the font selection in \KOMAScript{}, and is therefore not part of the default setting -\Macro{normalcolor}\Macro{sffamily}\Macro{bfseries}. With \Class{scrlttr2}, +\ChangedAt{v3.39}{\Class{scrlttr2}}\Macro{normalcolor}\linebreak[2]% +\DescRef{\LabelBase.cmd.maybesffamily}\IndexCmd{maybesffamily}\linebreak[2]% +\Macro{bfseries}. With \Class{scrlttr2}, you can also use \FontElement{title}\important{\FontElement{title}} as an alias for \FontElement{lettertitle}. This is not possible when using \Package{scrletter} with a \KOMAScript{} class because these classes already diff --git a/macros/latex/contrib/koma-script/doc/scrlttr2-examples.dtx b/macros/latex/contrib/koma-script/doc/scrlttr2-examples.dtx index c56aa1bcca..0fe87d8574 100644 --- a/macros/latex/contrib/koma-script/doc/scrlttr2-examples.dtx +++ b/macros/latex/contrib/koma-script/doc/scrlttr2-examples.dtx @@ -1,7 +1,7 @@ % \iffalse % ====================================================================== % scrlttr2-examples.dtx -% Copyright (c) Markus Kohm, 2008-2022 +% Copyright (c) Markus Kohm, 2008-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -227,7 +227,7 @@ }% } %</label> -%<0|1|2|3|4|5>\documentclass[version=last]{scrlttr2} +%<0|1|2|3|4|5|23|label>\documentclass[version=last]{scrlttr2} %<6>\documentclass[version=last,fontsize=14pt]{scrlttr2} %<!0&!1&!2&!3&!4&!5&!6&!23&!label&!nipponA&!nipponB>\documentclass[foldmarks=true,foldmarks=blmtP, %<nipponA|nipponB>\documentclass[foldmarks=true,locfield=wide, @@ -244,12 +244,12 @@ %<nipponA|nipponB> fromphone=false,fromemail=false, %<21|22> subject=titled, %<!0&!1&!2&!3&!4&!5&!6&!23&!label> version=last]{scrlttr2} -%<23&ngerman>\documentclass[version=last,ich]{scrlttr2} -%<23&english>\documentclass[version=last,me]{scrlttr2} +%<23&ngerman>\LoadLetterOption{ich} +%<23&english>\LoadLetterOption{me} %<nipponA>\LoadLetterOption{NipponLL} %<nipponB>\LoadLetterOption{NipponEL} -%<label&ngerman>\documentclass[version=last,ich,settleford600label]{scrlttr2} -%<label&english>\documentclass[version=last,me,settleford600label]{scrlttr2} +%<label&ngerman>\LoadLetterOptions{ich,settleford600label} +%<label&english>\LoadLetterOptions{me,settleford600label} %<ngerman>\usepackage[ngerman]{babel} %<english>\usepackage[british]{babel} %<16|17|18|19|20|21|22|23|label>\usepackage{graphics} diff --git a/macros/latex/contrib/koma-script/japanlco.dtx b/macros/latex/contrib/koma-script/japanlco.dtx index 03fd447e7a..8a79d4cdfc 100644 --- a/macros/latex/contrib/koma-script/japanlco.dtx +++ b/macros/latex/contrib/koma-script/japanlco.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % japanlco.dtx -% Copyright (c) Markus Kohm, 2008-2022 +% Copyright (c) Markus Kohm, 2008-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: japanlco.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: japanlco.dtx 4032 2023-04-17 09:45:11Z kohm $ %<Ni&EARLY&LOW&head>%%% (run: Ni,EARLY,LOW,head) %<Ni&EARLY&LOW&body>%%% (run: Ni,EARLY,LOW,body) %<Ni&EARLY&HIGH&head>%%% (run: Ni,EARLY,HIGH,head) @@ -35,9 +35,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-06-09 14:11:14 +0200 (Do, 09. Jun 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3889 $ + \filerevision$Revision: 4032 $ \endgroup \ProvidesFile{japanlco.dtx}[\filedate\space\filerevision\space KOMA-Script (letter class options)] @@ -101,6 +101,7 @@ % instead of \cs{@setplength} and \cs{@addtoplength}} % \changes{v3.36}{2022/02/02}{self-extracting} % \changes{v3.36}{2022/02/02}{extended documentation} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{japanlco.dtx} % \title{\href{https://komascript.de}{\KOMAScript} \partname\ @@ -152,7 +153,8 @@ % % \iftrue % The following pages show images of example envelopes. For more information -% see the English \file{scrguien.pdf} or the German \file{scrguide.pdf}. +% see the English \file{scrguide-en.pdf} or the German +% \file{scrguide-de.pdf}. % % \newcommand\japanenvelope[7]{% % \begingroup diff --git a/macros/latex/contrib/koma-script/koma-script-source-doc.dtx b/macros/latex/contrib/koma-script/koma-script-source-doc.dtx index 2cad321e5d..6fd9804d8c 100644 --- a/macros/latex/contrib/koma-script/koma-script-source-doc.dtx +++ b/macros/latex/contrib/koma-script/koma-script-source-doc.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ========================================================================== % komascript-source.doc.dtx -% Copyright (c) Markus Kohm, 2022 +% Copyright (c) Markus Kohm, 2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -224,9 +224,9 @@ % \cs{cls}|[https://koma-script.de]{koma-script-source-doc}| % \textrightarrow{} \cls[https://koma-script.de]{koma-script-source-doc}\\ % \cs{pkg}|[]{scrlayer}| \textrightarrow{} \pkg[]{scrlayer} \\ -% \cs{href}|{http://mirrors.ctan.org/macros/latex/contrib/koma-script/doc/scrguien.pdf#cha:typearea}{\pkg*{typearea}}| +% \cs{href}|{http://mirrors.ctan.org/macros/latex/contrib/koma-script/doc/scrguide-de.pdf#cha:typearea}{\pkg*{typearea}}| % \textrightarrow{} -% \href{http://mirrors.ctan.org/macros/latex/contrib/koma-script/doc/scrguien.pdf#chapter.2}{\pkg*{typearea}} +% \href{http://mirrors.ctan.org/macros/latex/contrib/koma-script/doc/scrguide-en.pdf#chapter.2}{\pkg*{typearea}} % \end{center} % % \MaybeStop{\PrintIndex} diff --git a/macros/latex/contrib/koma-script/scraddr.dtx b/macros/latex/contrib/koma-script/scraddr.dtx index 3a599a3e7e..78027dfaf3 100644 --- a/macros/latex/contrib/koma-script/scraddr.dtx +++ b/macros/latex/contrib/koma-script/scraddr.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scraddr.dtx -% Copyright (c) Markus Kohm, 2006-2022 +% Copyright (c) Markus Kohm, 2006-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scraddr.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scraddr.dtx 4032 2023-04-17 09:45:11Z kohm $ %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \ProvidesFile{scraddr.dtx} @@ -64,6 +64,7 @@ % \changes{v1.1d}{2022/01/24}{switched from \cls{scrdoc} to % \cls{koma-script-source-doc}} % \changes{v1.1d}{2022/01/24}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scraddr.dtx} % \title{Parsing Address Files \\ @@ -85,7 +86,8 @@ % \section{User Manual} % % You can find the user manual of \pkg*{scraddr} in the \KOMAScript{} manual, -% either the German \file{scrguide} or the English \file{scrguien}. +% either the German \file{scrguide-de.pdf} or the English +% \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrextend.dtx b/macros/latex/contrib/koma-script/scrextend.dtx index 0e4600090e..fa15f36a87 100644 --- a/macros/latex/contrib/koma-script/scrextend.dtx +++ b/macros/latex/contrib/koma-script/scrextend.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrextend.dtx -% Copyright (c) Markus Kohm, 2002-2022 +% Copyright (c) Markus Kohm, 2002-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrextend.dtx 3985 2022-11-11 11:24:31Z kohm $ +%%% From File: $Id: scrextend.dtx 4032 2023-04-17 09:45:11Z kohm $ %<preidentify>%%% (run: preidentify) %<prepare>%%% (run: prepare) %<option>%%% (run: option) @@ -26,9 +26,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-11-11 12:24:31 +0100 (Fr, 11. Nov 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3985 $ + \filerevision$Revision: 4032 $ \endgroup \ProvidesFile{scrextend.dtx}[\filedate\space\filerevision\space KOMA-Script package source @@ -46,6 +46,7 @@ % \changes{v3.36}{2022/01/31}{switched from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/01/31}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrextend.dtx} % \title{Extending Non-\href{https://komascript.de}{\KOMAScript} Classes by @@ -66,7 +67,8 @@ % \section{User Manual} % % You can find the user manual of \pkg{scrextend} in the \KOMAScript{} manual, -% either the German \file{scrguide} or the English \file{scrguien}. +% either the German \file{scrguide-de.pdf} or the English +% \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrhack.dtx b/macros/latex/contrib/koma-script/scrhack.dtx index 3d4f0358a2..a8cb84e062 100644 --- a/macros/latex/contrib/koma-script/scrhack.dtx +++ b/macros/latex/contrib/koma-script/scrhack.dtx @@ -21,7 +21,7 @@ % To create `scrhack.sty' run `tex scrhack.dtx'. Using LaTeX instead % of TeX would generate the implementation documentation. % ====================================================================== -%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $ +%%% From File: $Id: scrhack.dtx 4032 2023-04-17 09:45:11Z kohm $ %<package&identify>%%% using: package,identify %<package&option>%%% using: package,option %<package&body>%%% using: package,body @@ -30,9 +30,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2023-03-15 17:09:39 +0100 (Mi, 15. Mär 2023) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 4015 $ + \filerevision$Revision: 4032 $ \endgroup \ProvidesFile{scrhack.dtx}[\filedate\space\filerevision\space %</dtx> @@ -143,6 +143,7 @@ % \changes{v3.36}{2022/02/08}{require package \pkg*{scrlogo} instead of % defining \cs{KOMAScript}} % \changes{v3.36}{2022/02/08}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrhack.dtx} % \title{Patching Third-Party Packages using @@ -166,7 +167,8 @@ % \section{User Manual} % % You can find the user manuals of \pkg*{scrhack} in the \KOMAScript{} manual, -% either the German \file{scrguide} or the English \file{scrguien}. +% either the German \file{scrguide-de.pdf} or the English +% \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrjura.dtx b/macros/latex/contrib/koma-script/scrjura.dtx index b94ccbcf3b..a7c05c5427 100644 --- a/macros/latex/contrib/koma-script/scrjura.dtx +++ b/macros/latex/contrib/koma-script/scrjura.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrjura.dtx -% Copyright (c) Markus Kohm, 2007-2022 +% Copyright (c) Markus Kohm, 2007-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % % The KOMA-Script bundle consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrjura.dtx 3991 2022-11-16 07:13:45Z kohm $ +%%% From File: $Id: scrjura.dtx 4032 2023-04-17 09:45:11Z kohm $ %<identify>%%% (run: identify) %<init>%%% (run: init) %<options>%%% (run: options) @@ -28,9 +28,9 @@ %<*dtx> \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-11-16 08:13:45 +0100 (Mi, 16. Nov 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3991 $ + \filerevision$Revision: 4032 $ \endgroup \expandafter\ifx\csname ProvidesFile\endcsname\relax \def\ProvidesFile#1[#2]{} @@ -92,6 +92,7 @@ % % \changes{v3.36}{2022/01/25}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrjura.dtx} % \title{\KOMAScript{} in the Law Office\\ @@ -112,7 +113,8 @@ % \section{User Manual} % % You can find the user manual of \pkg*{scrjura} in the \KOMAScript{} manual, -% either the German \file{scrguide} or the English \file{scrguien}. +% either the German \file{scrguide-de.pdf} or the English +% \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrkernel-addressfiles.dtx b/macros/latex/contrib/koma-script/scrkernel-addressfiles.dtx index c04f5ba2fb..eb9a2f4fcf 100644 --- a/macros/latex/contrib/koma-script/scrkernel-addressfiles.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-addressfiles.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-addressfiles.dtx -% Copyright (c) Markus Kohm, 2006-2022 +% Copyright (c) Markus Kohm, 2006-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,16 +18,16 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-addressfiles.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-addressfiles.dtx 4032 2023-04-17 09:45:11Z kohm $ %<option>%%% (run: option) %<body>%%% (run: body) %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3874 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-addressfiles.dtx}% @@ -49,6 +49,7 @@ % \changes{v3.36}{2022/02/11}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/11}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-addressfiles.dtx} % \title{Circular Letters and Address Files as Part of @@ -67,8 +68,8 @@ % \section{User Manual} % % You can find the user documentation of the commands implemented here in the -% \KOMAScript{} manual, either the German \file{scrguide} or the English -% \file{scrguien}. +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the English +% \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrkernel-basics.dtx b/macros/latex/contrib/koma-script/scrkernel-basics.dtx index a498e28eee..3b205f7ff1 100644 --- a/macros/latex/contrib/koma-script/scrkernel-basics.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-basics.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-basics.dtx -% Copyright (c) Markus Kohm, 2002-2022 +% Copyright (c) Markus Kohm, 2002-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 4032 2023-04-17 09:45:11Z kohm $ %<prepare>%%% (run: prepare) %<option>%%% (run: option) %<body>%%% (run: body) @@ -28,9 +28,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\def\filedate{#2/#3/#4}} - \filedate$Date: 2022-11-16 11:43:42 +0100 (Mi, 16. Nov 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\def\filerevision{r#2}} - \filerevision$Revision: 4004 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-basics.dtx}% @@ -92,6 +92,7 @@ % \changes{v3.36}{2022/02/16}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/21}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-basics.dtx} % \title{Basic Funktionality Used by Almost all @@ -121,10 +122,11 @@ % % You can find the user documentation of package \pkg*{scrbase} and the % commands implemented in \file{scrkernel-basics.dtx} in the \KOMAScript{} -% manual, either the German \file{scrguide} or the English \file{scrguien}. +% manual, either the German \file{scrguide-de.pdf} or the English +% \file{scrguide-en.pdf}. % % -% \subsection{Functions not yet in the Manual} +% \subsection{Features not yet in the user manuals} % % Some user commands are not documented in the \KOMAScript{} manuals, e.g., % because they are not stable enough to be used by average users or more or diff --git a/macros/latex/contrib/koma-script/scrkernel-bibliography.dtx b/macros/latex/contrib/koma-script/scrkernel-bibliography.dtx index 4a63727af9..74cefca290 100644 --- a/macros/latex/contrib/koma-script/scrkernel-bibliography.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-bibliography.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-bibliography.dtx -% Copyright (c) Markus Kohm, 2002-2022 +% Copyright (c) Markus Kohm, 2002-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,16 +18,16 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-bibliography.dtx 3990 2022-11-16 07:11:05Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 4032 2023-04-17 09:45:11Z kohm $ %<option>%%% (run: option) %<body>%%% (run: body) %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-11-16 08:11:05 +0100 (Mi, 16. Nov 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3990 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-bibliography.dtx}% @@ -50,6 +50,7 @@ % \changes{v3.36}{2022/02/21}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/21}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-bibliography.dtx} % \title{Bibliography and References with @@ -69,7 +70,7 @@ % % You can find the user documentation of the commands implemented in % \file{scrkernel-bibliography.dtx} in the \KOMAScript{} manual, either the -% German \file{scrguide} or the English \file{scrguien}. +% German \file{scrguide-de.pdf} or the English \file{scrguide-en.pdf}. % % % \MaybeStop{\PrintIndex} diff --git a/macros/latex/contrib/koma-script/scrkernel-compatibility.dtx b/macros/latex/contrib/koma-script/scrkernel-compatibility.dtx index 877b41e17f..b3042ab133 100644 --- a/macros/latex/contrib/koma-script/scrkernel-compatibility.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-compatibility.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-compatibility.dtx -% Copyright (c) Markus Kohm, 2006-2022 +% Copyright (c) Markus Kohm, 2006-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $ %<identify>%%% (run: identify) %<init>%%% (run: init) %<option>%%% (run: option) @@ -27,9 +27,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\def\filedate{#2/#3/#4}} - \filedate$Date: 2022-11-11 12:24:31 +0100 (Fr, 11. Nov 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\def\filerevision{r#2}} - \filerevision$Revision: 3985 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-compatibility.dtx}% @@ -52,6 +52,7 @@ % \changes{v3.36}{2022/02/21}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/21}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-compatibility.dtx} % \title{Compatibility with prior Versions of @@ -81,7 +82,7 @@ % % You can find the user documentation of the commands implemented in % \file{scrkernel-compatibility.dtx} in the \KOMAScript{} manual, either the -% German \file{scrguide} or the English \file{scrguien}. +% German \file{scrguide-de.pdf} or the English \file{scrguide-en.pdf}. % % % \MaybeStop{\PrintIndex} @@ -455,6 +456,8 @@ % \changes{v3.38}{2022/07/06}{added} % \begin{macro}{\scr@v@3.39} % \changes{v3.39}{2022/10/13}{added} +% \begin{macro}{\scr@v@3.40} +% \changes{v3.40}{2023/04/17}{added} % \begin{macro}{\scr@v@last} % \changes{v2.9u}{2005/03/05}{added} % Nun die unterschiedlichen möglichen Werte (|\scr@v@last| ist jeweils die @@ -543,6 +546,7 @@ \@namedef{scr@v@3.37}{20} \@namedef{scr@v@3.38}{20} \@namedef{scr@v@3.39}{20} +\@namedef{scr@v@3.40}{20} \@namedef{scr@v@last}{20} % \end{macrocode} % \end{macro} @@ -630,6 +634,7 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % \end{option} % \begin{macrocode} %</init> diff --git a/macros/latex/contrib/koma-script/scrkernel-floats.dtx b/macros/latex/contrib/koma-script/scrkernel-floats.dtx index 3ffac19b8a..f7c1a126d6 100644 --- a/macros/latex/contrib/koma-script/scrkernel-floats.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-floats.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-floats.dtx -% Copyright (c) Markus Kohm, 2002-2022 +% Copyright (c) Markus Kohm, 2002-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,16 +18,16 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 4032 2023-04-17 09:45:11Z kohm $ %<option>%%% (run: option) %<body>%%% (run: body) %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-11-16 08:14:51 +0100 (Mi, 16. Nov 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3992 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-floats.dtx}% @@ -49,6 +49,7 @@ % \changes{v3.36}{2022/02/22}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/22}{implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-floats.dtx} % \title{Code for the Foats of the @@ -69,8 +70,15 @@ % \section{User Manual} % % You can find the user documentation the commands implemented here in the -% \KOMAScript{} manual, either the German \file{scrguide} or the English -% \file{scrguien}. +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the English +% \file{scrguide-en.pdf}. +% +% \subsection{Features not yet in the user manuals} +% +% \DescribeEnv{figure-,table-} +% These are non floating versions of \env{figure} and \env{table} defined +% using \cs{DeclareNewTOC}. See the description of this command in the +% \KOMAScript{} manuals for more information. % % % \MaybeStop{\PrintIndex} diff --git a/macros/latex/contrib/koma-script/scrkernel-fonts.dtx b/macros/latex/contrib/koma-script/scrkernel-fonts.dtx index ebbe889e2f..a990563f64 100644 --- a/macros/latex/contrib/koma-script/scrkernel-fonts.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-fonts.dtx @@ -18,7 +18,7 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4034 2023-04-20 08:03:46Z kohm $ %<identify>%%% (run: identify) %<option>%%% (run: option) %<body>%%% (run: body) @@ -29,9 +29,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2023-04-04 13:29:59 +0200 (Di, 04. Apr 2023) $ + \filedate$Date: 2023-04-20 10:03:46 +0200 (Do, 20. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 4021 $ + \filerevision$Revision: 4034 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-fonts.dtx}% @@ -63,6 +63,7 @@ % \changes{v3.36}{2022/02/22}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/22}{implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-fonts.dtx} % \title{Code for the Foats of the @@ -81,9 +82,9 @@ % \section{User Manual} % % You can find the user documentation the commands implemented here in the -% \KOMAScript{} manual, either the German \file{scrguide} or the English -% \file{scrguien}. The user documentation of alpha package \pkg*{scrfontsizes} -% is still missing. +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. The user documentation of alpha package +% \pkg*{scrfontsizes} is still missing. % % % \MaybeStop{\PrintIndex} @@ -1711,9 +1712,11 @@ % \changes{v3.39}{2023/04/04}{\cs{@gr@gsffamily} renamed to \cs{maybesffamily}} % \changes{v3.39}{2023/04/04}{\cs{if@egregdoesnotlikesansseriftitles} replaced % by \cs{if@sfdefaults}} +% \changes{v3.40}{2023/04/20}{default to true} % Used to switch on or off all the sans-serif defaults. % \begin{macrocode} %<*(class|extend)&option> +\newif\if@sfdefaults\@sfdefaultstrue \KOMA@ifkey{sfdefaults}{@sfdefaults} \newcommand*{\maybesffamily}{\if@sfdefaults \sffamily \fi} \newcommand*{\textmaybesf}{% diff --git a/macros/latex/contrib/koma-script/scrkernel-footnotes.dtx b/macros/latex/contrib/koma-script/scrkernel-footnotes.dtx index 41a36d2531..f38458b6d8 100644 --- a/macros/latex/contrib/koma-script/scrkernel-footnotes.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-footnotes.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-footnotes.dtx -% Copyright (c) Markus Kohm, 2002-2022 +% Copyright (c) Markus Kohm, 2002-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,16 +18,16 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 4032 2023-04-17 09:45:11Z kohm $ %<option>%%% (run: option) %<body>%%% (run: body) %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-11-11 12:24:31 +0100 (Fr, 11. Nov 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3985 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-footnotes.dtx}% @@ -49,6 +49,7 @@ % \changes{v3.36}{2022/02/16}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/16}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-footnotes.dtx} % \title{Index Code of the @@ -69,8 +70,8 @@ % \section{User Manual} % % You can find the user documentation the commands implemented here in the -% \KOMAScript{} manual, either the German \file{scrguide} or the English -% \file{scrguien}. +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrkernel-index.dtx b/macros/latex/contrib/koma-script/scrkernel-index.dtx index 7216042469..9e298cbb63 100644 --- a/macros/latex/contrib/koma-script/scrkernel-index.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-index.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-index.dtx -% Copyright (c) Markus Kohm, 2002-2022 +% Copyright (c) Markus Kohm, 2002-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,16 +18,16 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-index.dtx 3993 2022-11-16 07:17:09Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 4032 2023-04-17 09:45:11Z kohm $ %<option>%%% (run: option) %<body>%%% (run: body) %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-11-16 08:17:09 +0100 (Mi, 16. Nov 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3993 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-index.dtx}% @@ -49,6 +49,7 @@ % \changes{v3.36}{2022/02/15}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/15}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-index.dtx} % \title{Index Code of the @@ -66,8 +67,8 @@ % \section{User Manual} % % You can find the user documentation the commands implemented here in the -% \KOMAScript{} manual, either the German \file{scrguide} or the English -% \file{scrguien}. +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrkernel-language.dtx b/macros/latex/contrib/koma-script/scrkernel-language.dtx index 76ff58d7fb..75060afa91 100644 --- a/macros/latex/contrib/koma-script/scrkernel-language.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-language.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-language.dtx -% Copyright (c) Markus Kohm, 2002-2022 +% Copyright (c) Markus Kohm, 2002-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,16 +18,16 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 4032 2023-04-17 09:45:11Z kohm $ %<option>%%% (run: option) %<body>%%% (run: body) %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-11-16 08:18:05 +0100 (Mi, 16. Nov 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3994 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-language.dtx} @@ -48,6 +48,7 @@ % \changes{v3.36}{2022/02/25}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/25}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-language.dtx} % \title{Easy Changing of Language-Depending Terms with @@ -66,8 +67,8 @@ % \section{User Manual} % % You can find the user documentation the commands implemented here in the -% \KOMAScript{} manual, either the German \file{scrguide} or the English -% \file{scrguien}. +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrkernel-letterclassoptions.dtx b/macros/latex/contrib/koma-script/scrkernel-letterclassoptions.dtx index 7ad80a3a64..db6fe71cbe 100644 --- a/macros/latex/contrib/koma-script/scrkernel-letterclassoptions.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-letterclassoptions.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-letterclassoptions.dtx -% Copyright (c) Markus Kohm, 2006-2022 +% Copyright (c) Markus Kohm, 2006-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 4032 2023-04-17 09:45:11Z kohm $ %<option>%%% (run: option) %<head>%%% (run: head) %<body>%%% (run: body) @@ -26,9 +26,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-11-09 11:07:16 +0100 (Mi, 09. Nov 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3981 $ + \filerevision$Revision: 4032 $ \endgroup \ProvidesFile{scrkernel-letterclassoptions.dtx} [\filedate\space \filerevision\space @@ -49,6 +49,7 @@ % \changes{v3.36}{2022/02/26}{\cs{@addtoplength} replaced by \cs{addtoplength}} % \changes{v3.36}{2022/02/26}{\cs{@newplength} replaced by \cs{newplength}} % \changes{v3.36}{2022/02/26}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % % \GetFileInfo{scrkernel-letterclassoptions.dtx} @@ -70,8 +71,8 @@ % \section{User Manual} % % You can find the user documentation the commands and files implemented here -% in the \KOMAScript{} manual, either the German \file{scrguide} or the -% English \file{scrguien}. +% in the \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrkernel-listsandtabulars.dtx b/macros/latex/contrib/koma-script/scrkernel-listsandtabulars.dtx index dea9ef8e49..93427fcc7e 100644 --- a/macros/latex/contrib/koma-script/scrkernel-listsandtabulars.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-listsandtabulars.dtx @@ -18,16 +18,16 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 4032 2023-04-17 09:45:11Z kohm $ %<option>%%% (run: option) %<body>%%% (run: body) %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2023-04-04 13:29:59 +0200 (Di, 04. Apr 2023) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 4021 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-listsandtabulars.dtx}% @@ -50,6 +50,7 @@ % \changes{v3.36}{2022/02/15}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/15}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-listsandtabulars.dtx} % \title{Code of Lists, Tabulars and Similar Objects of the @@ -69,8 +70,8 @@ % \section{User Manual} % % You can find the user documentation the commands implemented here in the -% \KOMAScript{} manual, either the German \file{scrguide} or the English -% \file{scrguien}. +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrkernel-listsof.dtx b/macros/latex/contrib/koma-script/scrkernel-listsof.dtx index b6d7f2f432..9c8b7d2171 100644 --- a/macros/latex/contrib/koma-script/scrkernel-listsof.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-listsof.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-listsof.dtx -% Copyright (c) Markus Kohm, 2002-2022 +% Copyright (c) Markus Kohm, 2002-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 4032 2023-04-17 09:45:11Z kohm $ %<prepare>%%% (run: prepare) %<option>%%% (run: option) %<body>%%% (run: body) @@ -26,9 +26,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-11-16 08:20:20 +0100 (Mi, 16. Nov 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3995 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-listsof.dtx}% @@ -51,6 +51,7 @@ % \changes{v3.36}{2022/02/28}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/28}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-listsof.dtx} % \title{Table of Contents, List of Figures, and List of Tables Within @@ -71,8 +72,8 @@ % \section{User Manual} % % You can find the user documentation the commands implemented here in the -% \KOMAScript{} manual, either the German \file{scrguide} or the English -% \file{scrguien}. +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrkernel-miscellaneous.dtx b/macros/latex/contrib/koma-script/scrkernel-miscellaneous.dtx index 4cee33e13c..aa68d0175f 100644 --- a/macros/latex/contrib/koma-script/scrkernel-miscellaneous.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-miscellaneous.dtx @@ -18,7 +18,7 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 4032 2023-04-17 09:45:11Z kohm $ %<init>%%% (run: init) %<option>%%% (run: option) %<execoption>%%% (run: execoption) @@ -27,9 +27,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2023-04-04 13:29:59 +0200 (Di, 04. Apr 2023) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 4021 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-miscellaneous.dtx}% @@ -51,6 +51,7 @@ % \changes{v3.36}{2022/03/01}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/03/01}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-miscellaneous.dtx} % \title{All the Code of @@ -67,8 +68,8 @@ % \section{User Manual} % % You can find the user documentation the commands implemented here in the -% \KOMAScript{} manual, either the German \file{scrguide} or the English -% \file{scrguien}. +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrkernel-notepaper.dtx b/macros/latex/contrib/koma-script/scrkernel-notepaper.dtx index 76689b6e55..bb47ebe2a6 100644 --- a/macros/latex/contrib/koma-script/scrkernel-notepaper.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-notepaper.dtx @@ -18,16 +18,16 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-notepaper.dtx 4021 2023-04-04 11:29:59Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 4032 2023-04-17 09:45:11Z kohm $ %<option>%%% (run: option) %<body>%%% (run: body) %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2023-04-04 13:29:59 +0200 (Di, 04. Apr 2023) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 4021 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-notepaper.dtx} @@ -52,6 +52,7 @@ % \changes{v3.36}{2022/03/02}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/03/02}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-notepaper.dtx} % \title{Specific Code for Letters and Especially the Notepaper with @@ -69,8 +70,8 @@ % \section{User Manual} % % You can find the user documentation the commands implemented here in the -% \KOMAScript{} manual, either the German \file{scrguide} or the English -% \file{scrguien}. +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrkernel-pagestyles.dtx b/macros/latex/contrib/koma-script/scrkernel-pagestyles.dtx index 981f93fafb..4681df436b 100644 --- a/macros/latex/contrib/koma-script/scrkernel-pagestyles.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-pagestyles.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-pagestyles.dtx -% Copyright (c) Markus Kohm, 2002-2022 +% Copyright (c) Markus Kohm, 2002-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,16 +18,16 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 4032 2023-04-17 09:45:11Z kohm $ %<option>%%% (run: option) %<body>%%% (run: body) %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-11-16 08:24:11 +0100 (Mi, 16. Nov 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3997 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-pagestyles.dtx}% @@ -49,6 +49,7 @@ % \changes{v3.36}{2022/03/05}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/03/05}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-pagestyles.dtx} % \title{The Code of the Default Page Styles of the @@ -67,8 +68,8 @@ % \section{User Manual} % % You can find the user documentation the commands implemented here in the -% \KOMAScript{} manual, either the German \file{scrguide} or the English -% \file{scrguien}. +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrkernel-paragraphs.dtx b/macros/latex/contrib/koma-script/scrkernel-paragraphs.dtx index f2756ade06..28ef1b3364 100644 --- a/macros/latex/contrib/koma-script/scrkernel-paragraphs.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-paragraphs.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-paragraphs.dtx -% Copyright (c) Markus Kohm, 2002-2022 +% Copyright (c) Markus Kohm, 2002-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,16 +18,16 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 4032 2023-04-17 09:45:11Z kohm $ %<option>%%% (run: option) %<body>%%% (run: body) %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-11-16 08:25:23 +0100 (Mi, 16. Nov 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3998 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-paragraphs.dtx}% @@ -49,6 +49,7 @@ % \changes{v3.36}{2022/03/07}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/03/07}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-paragraphs.dtx} % \title{The Code Related to Paragraph Building and Page Building of @@ -66,8 +67,8 @@ % \section{User Manual} % % You can find the user documentation the commands implemented here in the -% \KOMAScript{} manual, either the German \file{scrguide} or the English -% \file{scrguien}. +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrkernel-pseudolengths.dtx b/macros/latex/contrib/koma-script/scrkernel-pseudolengths.dtx index d18e064d20..6a4fd7a3ca 100644 --- a/macros/latex/contrib/koma-script/scrkernel-pseudolengths.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-pseudolengths.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-pseudolengths.dtx -% Copyright (c) Markus Kohm, 2002-2022 +% Copyright (c) Markus Kohm, 2002-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,16 +18,16 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-pseudolengths.dtx 3981 2022-11-09 10:07:16Z kohm $ +%%% From File: $Id: scrkernel-pseudolengths.dtx 4032 2023-04-17 09:45:11Z kohm $ %<option>%%% (run: option) %<body>%%% (run: body) %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-11-09 11:07:16 +0100 (Mi, 09. Nov 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3981 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-pseudolengths.dtx}% @@ -50,6 +50,7 @@ % \changes{v3.36}{2022/02/14}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/14}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-pseudolengths.dtx} % \title{Handling of Lengths Stored in Macros for @@ -75,8 +76,8 @@ % \section{User Manual} % % You can find the user documentation the commands implemented here in the -% \KOMAScript{} manual, either the German \file{scrguide} or the English -% \file{scrguien}. +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrkernel-sections.dtx b/macros/latex/contrib/koma-script/scrkernel-sections.dtx index 3b803cbb56..af0bc89389 100644 --- a/macros/latex/contrib/koma-script/scrkernel-sections.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-sections.dtx @@ -18,7 +18,7 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 4032 2023-04-17 09:45:11Z kohm $ % The runs of run-time file generation: %<preidentify>%%% (run: preidentify) % - everything that is needed before selfidentification of resulting files @@ -40,9 +40,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2023-04-04 13:38:26 +0200 (Di, 04. Apr 2023) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 4022 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-sections.dtx}% @@ -65,6 +65,7 @@ % \changes{v3.36}{2022/03/08}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/03/21}{the whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-sections.dtx} % \title{The Code for Parts, Chapters, Sections etc.\@ of @@ -81,8 +82,8 @@ % \section{User Manual} % % You can find the user documentation the commands implemented here in the -% \KOMAScript{} manual, either the German \file{scrguide} or the English -% \file{scrguien}. +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrkernel-title.dtx b/macros/latex/contrib/koma-script/scrkernel-title.dtx index 7683fea726..ae566ac3c7 100644 --- a/macros/latex/contrib/koma-script/scrkernel-title.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-title.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-title.dtx -% Copyright (c) Markus Kohm, 2002-2022 +% Copyright (c) Markus Kohm, 2002-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,16 +18,16 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-title.dtx 4000 2022-11-16 07:32:52Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 4032 2023-04-17 09:45:11Z kohm $ %<option>%%% (run: option) %<body>%%% (run: body) %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-11-16 08:32:52 +0100 (Mi, 16. Nov 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 4000 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-title.dtx}% @@ -48,6 +48,7 @@ % \changes{v3.36}{2022/03/08}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/03/08}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-title.dtx} % \title{The Code to Implement the Extended Titles of @@ -64,8 +65,8 @@ % \section{User Manual} % % You can find the user documentation the commands implemented here in the -% \KOMAScript{} manual, either the German \file{scrguide} or the English -% \file{scrguien}. +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrkernel-tocstyle.dtx b/macros/latex/contrib/koma-script/scrkernel-tocstyle.dtx index d4944b1556..443d21593b 100644 --- a/macros/latex/contrib/koma-script/scrkernel-tocstyle.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-tocstyle.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-tocstyle.dtx -% Copyright (c) Markus Kohm, 2015-2022 +% Copyright (c) Markus Kohm, 2015-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $ % The runs of run-time file generation: %<preidentify>%%% (run: preidentify) % - everything that is needed before selfidentification of resulting files @@ -42,9 +42,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-10-24 10:08:05 +0200 (Mo, 24. Okt 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3972 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-tocstyle.dtx}% @@ -65,6 +65,7 @@ % \changes{v3.36}{2022/02/14}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/14}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-tocstyle.dtx} % \title{The Predifined Directory Styles of @@ -84,8 +85,8 @@ % \section{User Manual} % % You can find the user documentation the commands implemented here in the -% \KOMAScript{} manual, either the German \file{scrguide} or the English -% \file{scrguien}. +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrkernel-typearea.dtx b/macros/latex/contrib/koma-script/scrkernel-typearea.dtx index 5afbb67a54..42a1934b49 100644 --- a/macros/latex/contrib/koma-script/scrkernel-typearea.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-typearea.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-typearea.dtx -% Copyright (c) Markus Kohm, 2002-2022 +% Copyright (c) Markus Kohm, 2002-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 4032 2023-04-17 09:45:11Z kohm $ %<identify>%%% (run: identify) %<init>%%% (run: init) %<options>%%% (run: options) @@ -29,9 +29,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2023-02-10 11:25:25 +0100 (Fr, 10. Feb 2023) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 4014 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrkernel-typearea.dtx}[% @@ -89,6 +89,7 @@ % \changes{v3.36}{2022/02/11}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/11}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-typearea.dtx} % \title{Calculation of the Typeing Area with @@ -109,7 +110,7 @@ % % You can find the user documentation of package \pkg*{typearea} and the % commands implemented here in the \KOMAScript{} manual, either the German -% \file{scrguide} or the English \file{scrguien}. +% \file{scrguide-de.pdf} or the English \file{scrguide-en.pdf}. % % \subsection{Options not yet in the Manual} % Some options commands are not documented in the \KOMAScript{} manuals, e.g., diff --git a/macros/latex/contrib/koma-script/scrkernel-variables.dtx b/macros/latex/contrib/koma-script/scrkernel-variables.dtx index 0ca620349d..8896055ebc 100644 --- a/macros/latex/contrib/koma-script/scrkernel-variables.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-variables.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-variables.dtx -% Copyright (c) Markus Kohm, 2006-2022 +% Copyright (c) Markus Kohm, 2006-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,16 +18,16 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-variables.dtx 3981 2022-11-09 10:07:16Z kohm $ +%%% From File: $Id: scrkernel-variables.dtx 4032 2023-04-17 09:45:11Z kohm $ %<option>%%% (run: option) %<body>%%% (run: body) %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\def\filedate{#2/#3/#4}} - \filedate$Date: 2022-11-09 11:07:16 +0100 (Mi, 09. Nov 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\def\filerevision{r#2}} - \filerevision$Revision: 3981 $ + \filerevision$Revision: 4032 $ \xdef\fileinfo{\filedate\space\filerevision\space} \edef\reserved@a{% \noexpand\endgroup @@ -49,6 +49,7 @@ % \changes{v3.36}{2022/02/15}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/15}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-variables.dtx} % \title{Using Variables in @@ -69,8 +70,8 @@ % \section{User Manual} % % You can find the user documentation the commands implemented here in the -% \KOMAScript{} manual, either the German \file{scrguide} or the English -% \file{scrguien}. +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrkernel-version.dtx b/macros/latex/contrib/koma-script/scrkernel-version.dtx index 4fe0b81e5f..87b499e706 100644 --- a/macros/latex/contrib/koma-script/scrkernel-version.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-version.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % scrkernel-version.dtx -% Copyright (c) Markus Kohm, 2002-2022 +% Copyright (c) Markus Kohm, 2002-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $ % % ATTENTION: In this file parts of the code and documentation are before the % driver. This must be, because this part of the code is needed by the driver @@ -34,6 +34,7 @@ % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/11}{whole implementation documentation in English} % \changes{v3.99}{2022/10/25}{prepared to generate experimental \KOMAScript~4} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrkernel-version.dtx} % \title{The Version of the \href{https://komascript.de}{\KOMAScript} Kernel @@ -53,8 +54,8 @@ % \section{User Manual} % % You can find the user documentation of the commands implemented here in the -% \KOMAScript{} manual, either the German \file{scrguide} or the English -% \file{scrguien}. +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % @@ -140,9 +141,9 @@ % therefore the syntax or general structure of the line must not be changed! % \begin{macrocode} %<*!v4> - \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}% %</!v4> -%<v4> \@nameuse{@CheckKOMAScriptVersion}{2023/04/17 v3.39 KOMA-Script}% +%<v4> \@nameuse{@CheckKOMAScriptVersion}{2023/04/24 v3.40 KOMA-Script}% \endgroup % \end{macrocode} % \end{macro} diff --git a/macros/latex/contrib/koma-script/scrlayer-notecolumn.dtx b/macros/latex/contrib/koma-script/scrlayer-notecolumn.dtx index f523537238..e1a5fd4ae5 100644 --- a/macros/latex/contrib/koma-script/scrlayer-notecolumn.dtx +++ b/macros/latex/contrib/koma-script/scrlayer-notecolumn.dtx @@ -1,7 +1,7 @@ % \iffalse^^A meta-comment % ====================================================================== % scrlayer-notecolumn.dtx -% Copyright (c) Markus Kohm, 2013-2022 +% Copyright (c) Markus Kohm, 2013-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -19,7 +19,7 @@ % This work consists of all files listed in MANIFEST.md. % ---------------------------------------------------------------------- % ====================================================================== -%%% From File: $Id: scrlayer-notecolumn.dtx 3915 2022-06-29 07:09:48Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 4032 2023-04-17 09:45:11Z kohm $ %<identify>%%% (run: identify) %<init>%%% (run: init) %<options>%%% (run: options) @@ -29,9 +29,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-06-29 09:09:48 +0200 (Mi, 29. Jun 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{v0.3.#2}} - \filerevision$Revision: 3915 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrlayer-notecolumn.dtx}% @@ -100,6 +100,7 @@ % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/10}{require package \pkg*{scrlogo} instead of % defining \cs{KOMAScript}} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrlayer-notecolumn.dtx} % \title{Providing Note Columns Similar to \cs{marginpar} with @@ -120,8 +121,9 @@ % % \section{User Manual} % -% You can find the user manuals of \pkg*{scrlayer-notecolumn} in the \KOMAScript{} -% manual, either the German \file{scrguide} or the English \file{scrguien}. +% You can find the user manuals of \pkg*{scrlayer-notecolumn} in the +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrlayer-scrpage.dtx b/macros/latex/contrib/koma-script/scrlayer-scrpage.dtx index b181e142cc..33ae92d1d4 100644 --- a/macros/latex/contrib/koma-script/scrlayer-scrpage.dtx +++ b/macros/latex/contrib/koma-script/scrlayer-scrpage.dtx @@ -1,7 +1,7 @@ % \iffalse^^A meta-comment % ====================================================================== % scrlayer-scrpage.dtx -% Copyright (c) Markus Kohm, 2012-2022 +% Copyright (c) Markus Kohm, 2012-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrlayer-scrpage.dtx 4013 2023-02-02 11:11:34Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 4032 2023-04-17 09:45:11Z kohm $ %<identify>%%% (run: identify) %<init>%%% (run: init) %<options>%%% (run: options) @@ -27,9 +27,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2023-02-02 12:11:34 +0100 (Do, 02. Feb 2023) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 4013 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrlayer-scrpage.dtx}% @@ -91,6 +91,7 @@ % \changes{v3.36}{2022/02/09}{require package \pkg*{scrlogo} instead of % defining \cs{KOMAScript}} % \changes{v3.36}{2022/02/09}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrlayer-scrpage.dtx} % \title{The \texttt{scrlayer} Interface of @@ -108,8 +109,9 @@ % % \section{User Manual} % -% You can find the user manuals of \pkg*{scrlayer-scrpage} in the \KOMAScript{} -% manual, either the German \file{scrguide} or the English \file{scrguien}. +% You can find the user manuals of \pkg*{scrlayer-scrpage} in the +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrlayer.dtx b/macros/latex/contrib/koma-script/scrlayer.dtx index 6c581dca06..b790922380 100644 --- a/macros/latex/contrib/koma-script/scrlayer.dtx +++ b/macros/latex/contrib/koma-script/scrlayer.dtx @@ -1,7 +1,7 @@ % \iffalse^^A meta-comment % ====================================================================== % scrlayer.dtx -% Copyright (c) Markus Kohm, 2012-2022 +% Copyright (c) Markus Kohm, 2012-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $ +%%% From File: $Id: scrlayer.dtx 4032 2023-04-17 09:45:11Z kohm $ %<identify>%%% (run: identify) %<init>%%% (run: init) %<options>%%% (run: options) @@ -28,9 +28,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-11-11 12:24:31 +0100 (Fr, 11. Nov 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3985 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrlayer.dtx}% @@ -89,6 +89,7 @@ % \changes{v3.36}{2022/02/08}{require package \pkg*{scrlogo} instead of % defining \cs{KOMAScript}} % \changes{v3.36}{2022/02/08}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrlayer.dtx} % \title{Layers and Page Styles with \href{https://komascript.de}{\KOMAScript} @@ -105,8 +106,9 @@ % % \section{User Manual} % -% You can find the user manuals of \pkg*{scrlayer} in the \KOMAScript{} manual, -% either the German \file{scrguide} or the English \file{scrguien}. +% You can find the user manuals of \pkg*{scrlayer} in the \KOMAScript{} +% manual, either the German \file{scrguide-de.pdf} or the English +% \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrlfile.dtx b/macros/latex/contrib/koma-script/scrlfile.dtx index 027c998175..8e51c2e09b 100644 --- a/macros/latex/contrib/koma-script/scrlfile.dtx +++ b/macros/latex/contrib/koma-script/scrlfile.dtx @@ -1,7 +1,7 @@ % \iffalse^^A meta-comment % ====================================================================== % scrlfile.dtx -% Copyright (c) Markus Kohm, 2002-2022 +% Copyright (c) Markus Kohm, 2002-2023 % % This file is part of the work `scrlfile' which is part of the LaTeX2e % KOMA-Script bundle. @@ -19,14 +19,14 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrlfile.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrlfile.dtx 4032 2023-04-17 09:45:11Z kohm $ %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3874 $ + \filerevision$Revision: 4032 $ \edef\reserved@a{% \noexpand\endgroup \noexpand\ProvidesFile{scrlfile.dtx}% @@ -74,6 +74,7 @@ % \changes{v3.36}{2022/02/03}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/03}{using \file{scrlogo.dtx} to define the logo} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrlfile.dtx} % \title{File Loading Hooks with \href{https://komascript.de}{\KOMAScript} @@ -92,25 +93,9 @@ % \section{User Manual} % % You can find the user manual of \pkg*{scrlfile} in the \KOMAScript{} manual, -% either the German \file{scrguide} or the English \file{scrguien}. -% Here you can find interim documentation only (before it is added to the -% \KOMAScript{} manual). +% either the German \file{scrguide-de.pdf} or the English +% \file{scrguide-en.pdf}. % -% \DescribeOption{withdeprecated} -% Package option \opt{withdeprecated} enables the definition of deprecated -% commands \cs{AfterClass+}, \cs{AfterPackage+}, \cs{AfterClass!} and -% \cs{AfterPackage!}. All of them will be emulated by \cs{AfterAtEndOClass*} -% and \cs{AfterAtEndOfPackage*} so they are not completely compatible with the -% original deprecated commands. -% -% Users of classes or package, that use such deprecated commands can load -% \pkg*{scrlfile} already before the class using: -%\begin{verbatim} -% \RequirePackage[withdeprecated]{scrlfile} -%\end{verbatim}% -% or adding option \opt{withdeprecated} to the global options of -% \cs{documentclass}. Note, this is not a key-value option. It cannot be -% changed after loading \pkg*{scrlfile}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrlogo.dtx b/macros/latex/contrib/koma-script/scrlogo.dtx index c2c05f1705..ff6a01c024 100644 --- a/macros/latex/contrib/koma-script/scrlogo.dtx +++ b/macros/latex/contrib/koma-script/scrlogo.dtx @@ -1,7 +1,7 @@ % \iffalse^^A meta-comment % ====================================================================== % scrlogo.dtx -% Copyright (c) Markus Kohm, 2002-2022 +% Copyright (c) Markus Kohm, 2002-2023 % % This work may be distributed and/or modified under the conditions of % the LaTeX Project Public License, version 1.3c of the license. @@ -17,12 +17,12 @@ % This work consists of the file `scrlogo.dtx' at least. % ====================================================================== % -%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +%%% From File: $Id: scrlogo.dtx 4032 2023-04-17 09:45:11Z kohm $ %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-02-10 09:26:37 +0100 (Do, 10. Feb 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 2631 $ \edef\reserved@a{% @@ -71,6 +71,7 @@ % \changes{v3.36}{2022/02/02}{switch over from \cls*{scrdoc} to % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/02}{whole implementation documentation in English} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrlogo.dtx} % \title{\href{https://komascript.de}{\KOMAScript} \partname\ \file{\filename}} @@ -87,7 +88,8 @@ % \section{User Manual} % % You can find the user manual of \pkg*{scrlogo} in the \KOMAScript{} manual, -% either the German \file{scrguide} or the English \file{scrguien}. +% either the German \file{scrguide-de.pdf} or the English +% \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/scrtime.dtx b/macros/latex/contrib/koma-script/scrtime.dtx index cff5cd706a..f5fdcb4919 100644 --- a/macros/latex/contrib/koma-script/scrtime.dtx +++ b/macros/latex/contrib/koma-script/scrtime.dtx @@ -1,7 +1,7 @@ % \iffalse % ====================================================================== % scrtime.dtx -% Copyright (c) Markus Kohm, 1995-2022 +% Copyright (c) Markus Kohm, 1995-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,15 +18,15 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrtime.dtx 3986 2022-11-16 06:52:39Z kohm $ +%%% From File: $Id: scrtime.dtx 4032 2023-04-17 09:45:11Z kohm $ %<package&identify>\NeedsTeXFormat{LaTeX2e}[1995/06/01] %<*driver> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-11-16 07:52:39 +0100 (Mi, 16. Nov 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3986 $ + \filerevision$Revision: 4032 $ \endgroup \ProvidesFile{scrtime.dtx}[\filedate\space\filerevision\space %</driver> @@ -87,6 +87,7 @@ % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/07}{require package \pkg*{scrlogo} instead of % defining \cs{KOMAScript}} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{scrtime.dtx} % \title{The Current Time and Name of the Day with @@ -108,8 +109,8 @@ % \section{User Manual} % % You can find the user manuals of \pkg*{scrtime} and \pkg*{scrdate} in the -% \KOMAScript{} manual, either the German \file{scrguide} or the English -% \file{scrguien}. +% \KOMAScript{} manual, either the German \file{scrguide-de.pdf} or the +% English \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/koma-script/tocbasic.dtx b/macros/latex/contrib/koma-script/tocbasic.dtx index 98a021a2d2..1dc1d7770f 100644 --- a/macros/latex/contrib/koma-script/tocbasic.dtx +++ b/macros/latex/contrib/koma-script/tocbasic.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % ====================================================================== % tocbasic.dtx -% Copyright (c) Markus Kohm, 2008-2022 +% Copyright (c) Markus Kohm, 2008-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: tocbasic.dtx 3947 2022-07-22 05:59:41Z kohm $ +%%% From File: $Id: tocbasic.dtx 4032 2023-04-17 09:45:11Z kohm $ %<identify>%%% (run: identify) %<prepare>%%% (run: prepare) %<option>%%% (run: option) @@ -29,9 +29,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2022-07-22 07:59:41 +0200 (Fr, 22. Jul 2022) $ + \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 3947 $ + \filerevision$Revision: 4032 $ \endgroup \ProvidesFile{tocbasic.dtx}[\filedate\space\filerevision\space %</dtx> @@ -95,6 +95,7 @@ % \cls*{koma-script-source-doc}} % \changes{v3.36}{2022/02/10}{require package \pkg*{scrlogo} instead of % defining \cs{KOMAScript}} +% \changes{v3.40}{2023/04/17}{guide names changed} % % \GetFileInfo{tocbasic.dtx} % \title{Handling of Tables and Lists of Contents with @@ -121,7 +122,8 @@ % \section{User Manual} % % You can find the user manuals of \pkg*{tocbasic} in the \KOMAScript{} -% manual, either the German \file{scrguide} or the English \file{scrguien}. +% manual, either the German \file{scrguide-de.pdf} or the English +% \file{scrguide-en.pdf}. % % \MaybeStop{\PrintIndex} % diff --git a/macros/latex/contrib/photobook/photobook.cls b/macros/latex/contrib/photobook/photobook.cls index 14016662b4..09a8d9a8eb 100644 --- a/macros/latex/contrib/photobook/photobook.cls +++ b/macros/latex/contrib/photobook/photobook.cls @@ -38,10 +38,16 @@ % % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % +% XXX should cliptocell offsets be tweakable??? +% XXX ASAP should cover/jacket/endpaper/spread template cells account +% for bleeds as an option??? +% ...i.e. include cliptocell defaults??? % XXX ASAP should cover/jacket/endpaper/spread templates/cells account % for \bindingoffset (likely no) and/or \gutteroffset ??? % ...especially relevant to endpaper/spread... % XXX ASAP revise how bleeds are handled by cells... +% ...all cells should ignore bleeds unless explicitly stated +% otherwise -- needs testing... % % XXX captions behave in an odd way... % the internal (macro) minipage for some reason does not affect text @@ -79,8 +85,8 @@ %%% NOTE: \def\<module-name>@[A-Z]+ macros will be visible to both the %%% code and the generated docs... -\edef\photobook@FILEVERSION{v0.1.19} -\edef\photobook@FILEDATE{2023-04-11} +\edef\photobook@FILEVERSION{v0.1.20} +\edef\photobook@FILEDATE{2023-04-22} %% \documentclass{ltxdoc} @@ -1962,19 +1968,31 @@ \end{inlinecell*}% \end{turn}} + %% \DescribeEnv{cliptocell} % %% Clip content to parent cell. %% %% >> \begin{cliptocell} ... \end{cliptocell} %% -%% Clip content to cell adding bleeds +%% Clip content to cell plus offsets (bleeds) from each side %% %% >> \begin{cliptocell}[<size>] ... \end{cliptocell} %% >> \begin{cliptocell}[<horizontal> <vertical>] ... \end{cliptocell} %% >> \begin{cliptocell}[<left> <bottom> <right> <top>] ... \end{cliptocell} %% -%% Clipping to bleeds will not affect the cell content positioning. +%% Offset order, i.e. left-bottom-right-top is made consistent with +%% \href{https://ctan.org/pkg/graphicx}{graphicx} and +%% \href{https://ctan.org/pkg/trimclip}{trimclip} modules and represents +%% the bottom-left and top-right viewport point offsets from the parent +%% cell. +%% +%% |cliptocell| does not affect the cell content positioning in any way. +%% +%% This is designed to simplify filling template cells and adding bleeds +%% to certain sides and clipping flush to others, for example for cells +%% of a dust jacket or a foldout, but |cliptocell| is not limited to +%% this one use-case. %% \newlength\photobook@cliptocell@left \setlength\photobook@cliptocell@left{0mm}% @@ -1990,7 +2008,7 @@ \setsepchar{ }% \readlist*\photobook@cliptocell@bleeds{#1}% % - % bleed + % args: size \ifnum \photobook@cliptocell@bleedslen = 1% \setlength\photobook@cliptocell@left{% \photobook@cliptocell@bleeds[1]}% @@ -2000,7 +2018,7 @@ \photobook@cliptocell@bleeds[1]}% \setlength\photobook@cliptocell@top{% \photobook@cliptocell@bleeds[1]}\fi% - % horizontal vertical + % args: horizontal vertical \ifnum \photobook@cliptocell@bleedslen = 2% \setlength\photobook@cliptocell@left{% \photobook@cliptocell@bleeds[1]}% @@ -2010,7 +2028,7 @@ \photobook@cliptocell@bleeds[1]}% \setlength\photobook@cliptocell@top{% \photobook@cliptocell@bleeds[2]}\fi% - % left top right bottom + % args: left bottom right top \ifnum \photobook@cliptocell@bleedslen = 4% \setlength\photobook@cliptocell@left{% \photobook@cliptocell@bleeds[1]}% @@ -2021,7 +2039,7 @@ \setlength\photobook@cliptocell@top{% \photobook@cliptocell@bleeds[4]}\fi% % - % XXX the spaces at the end of each line here are significant... + % NOTE: the spaces at the end of each line here are significant!! \begin{trimbox}{{\photobook@cliptocell@left} % {\photobook@cliptocell@bottom} % {\photobook@cliptocell@right} % @@ -2030,6 +2048,11 @@ {\height - \cellheight - \photobook@cliptocell@bottom} % {\cellwidth + \photobook@cliptocell@right} % {\height + \photobook@cliptocell@top}}% + % set defaults for nested cells... + \setlength\photobook@cliptocell@left{0mm}% + \setlength\photobook@cliptocell@top{0mm}% + \setlength\photobook@cliptocell@right{0mm}% + \setlength\photobook@cliptocell@bottom{0mm}% \begin{minipage}[t][\cellheight][t]{\cellwidth}% \ignorespaces% }{% @@ -2039,8 +2062,6 @@ \endgroup} - - %% \DescribeMacro{\imagecell\{..\}} % %% Place image in cell. diff --git a/macros/latex/contrib/photobook/photobook.pdf b/macros/latex/contrib/photobook/photobook.pdf Binary files differindex 2dd314039c..f5969aa38f 100644 --- a/macros/latex/contrib/photobook/photobook.pdf +++ b/macros/latex/contrib/photobook/photobook.pdf diff --git a/macros/unicodetex/latex/textcsc/README b/macros/unicodetex/latex/textcsc/README index 8959a63402..5ff7cb77ec 100644 --- a/macros/unicodetex/latex/textcsc/README +++ b/macros/unicodetex/latex/textcsc/README @@ -1,6 +1,6 @@ textcsc - caps-to-small-caps command -version: 1.0.0 +version: 1.1.0 This package provides a simple command for caps-to-small-caps text, to allow for small caps acronyms to be presented as uppercase in text (useful for things like copying and pasting from a PDF). @@ -12,4 +12,5 @@ For suggestions, feature requests, and bug reports, please use the project's GitHub site: https://github.com/ezgranet/textcsc Version history: +24/04/2023 fixed letterspacing issue 10/09/2022 Package creation
\ No newline at end of file diff --git a/macros/unicodetex/latex/textcsc/textcsc-documentation.pdf b/macros/unicodetex/latex/textcsc/textcsc-documentation.pdf Binary files differindex d2a5498b57..e18bc2b423 100644 --- a/macros/unicodetex/latex/textcsc/textcsc-documentation.pdf +++ b/macros/unicodetex/latex/textcsc/textcsc-documentation.pdf diff --git a/macros/unicodetex/latex/textcsc/textcsc-documentation.tex b/macros/unicodetex/latex/textcsc/textcsc-documentation.tex index d0c7ec4040..12f1cdd871 100644 --- a/macros/unicodetex/latex/textcsc/textcsc-documentation.tex +++ b/macros/unicodetex/latex/textcsc/textcsc-documentation.tex @@ -102,16 +102,17 @@ breaklines, firstnumber=last ] {latex} -\def\textcscversionnumber{1.0.0} -\ProvidesPackage{textcsc} -[2022/09/10\textcscversionnumber\ + +\def\textcscversionnumber{1.1} +\ProvidesPackage{textcsc-dev} +[2023/04/24\textcscversionnumber\ Command for caps-to-small-caps-text] % This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 +% conditions of the LaTeX Project Public License, either version 1.3c % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3 or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later. % % This work has the LPPL maintenance status `maintained'. @@ -129,7 +130,7 @@ firstnumber=last %%%%%%%%%%%%%%%%%%%%%%%%%%% \RequirePackage{iftex} \ifPDFTeX { - \PackageError{swungdash} + \PackageError{textcsc} {You are using pdfTeX but this package only works \MessageBreak with XeTeX or LuaTeX}{} } @@ -146,7 +147,7 @@ firstnumber=last % the switch %%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%% -\newcommand{\cscshape}{\addfontfeature{RawFeature={+c2sc,+smcp}}} +\newcommand{\cscshape}{\scshape\addfontfeature{RawFeature={+c2sc}}} %%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%% % the macro @@ -164,6 +165,17 @@ firstnumber=last \end{minted} \section{Version History} + + + +\subsection{\texttt{1.1.0}} + +\ttfamily 24 April 2023: Update to fix issue with LetterSpace property not carrying over. + + + + + \subsection{\texttt{1.0.0}} \ttfamily 22 September 2022: Package creation diff --git a/macros/unicodetex/latex/textcsc/textcsc.sty b/macros/unicodetex/latex/textcsc/textcsc.sty index d4421e7729..63c9e27680 100644 --- a/macros/unicodetex/latex/textcsc/textcsc.sty +++ b/macros/unicodetex/latex/textcsc/textcsc.sty @@ -1,6 +1,6 @@ -\def\textcscversionnumber{1.0.1} -\ProvidesPackage{textcsc} -[2022/09/10\textcscversionnumber\ +\def\textcscversionnumber{1.1} +\ProvidesPackage{textcsc-dev} +[2023/04/24\textcscversionnumber\ Command for caps-to-small-caps-text] % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c @@ -42,7 +42,7 @@ % the switch %%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%% -\newcommand{\cscshape}{\addfontfeature{RawFeature={+c2sc,+smcp}}} +\newcommand{\cscshape}{\scshape\addfontfeature{RawFeature={+c2sc}}} %%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%% % the macro diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl index c145724ad7..d28b7a63a2 100644 --- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl @@ -127,6 +127,7 @@ $mirrors = { 'https://ftp.snt.utwente.nl/pub/software/tex/' => 1, 'https://mirror.koddos.net/CTAN/' => 1, 'https://mirror.lyrahosting.com/CTAN/' => 1, + 'https://mirrors.evoluso.com/CTAN/' => 1, }, 'Norway' => { 'https://ctan.uib.no/' => 1, @@ -208,5 +209,8 @@ $mirrors = { 'Brazil' => { 'https://linorg.usp.br/CTAN/' => 1, }, + 'Chile' => { + 'https://ctan.dcc.uchile.cl/' => 1, + }, }, }; diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb index 96ac9f78e3..3719dbd5a4 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/2023 -depend revision/66923 +depend revision/66931 name 00texlive.image category TLCore @@ -4730,7 +4730,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd name 00texlive.installer category TLCore -revision 66919 +revision 66926 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 @@ -38792,7 +38792,7 @@ catalogue-version 1.7 name biblatex-gb7714-2015 category Package -revision 66752 +revision 66929 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 @@ -38800,11 +38800,11 @@ 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 49736 -containerchecksum 3eab31ba856b26234f390089bb2e7be9122726b28c783bd613b74bbb42ef42beff5cd1a4b2675ee57e959af9c4cd603413ead5265ee94ab1141e07105dc945f6 -doccontainersize 1405756 -doccontainerchecksum 0874799a05db1167e2fcdd661e6f3cab95c6d2669762941d0b29508ca2ced9c96256fc2f4785149883242d4fc81b26fb2c7d8d8bb0be1ca497597f99258ae6a7 -docfiles size=543 +containersize 51792 +containerchecksum e2463dd58d062e77626b42ca5fe45759a661a82f133a5156f2cbf85a096fdc7ecaf7d381211c839c45790114e212ec805070206cb7c6daac1645a4c8986bc240 +doccontainersize 1405872 +doccontainerchecksum 37ce59f58710eac9bbbc48988ccbab510628b2e1e5081692dd386d24c9fab21596892a6ff7b4ff0281694d8ef5fed58b27d5daaa449bcd1d169dc53e0efc80e1 +docfiles size=544 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" @@ -38812,11 +38812,13 @@ docfiles size=543 RELOC/doc/latex/biblatex-gb7714-2015/example.bib RELOC/doc/latex/biblatex-gb7714-2015/gb7714texttobib.pl RELOC/doc/latex/biblatex-gb7714-2015/makeall.py -runfiles size=205 +runfiles size=218 RELOC/tex/latex/biblatex-gb7714-2015/chinese-css.bbx RELOC/tex/latex/biblatex-gb7714-2015/chinese-css.cbx RELOC/tex/latex/biblatex-gb7714-2015/chinese-erj.bbx RELOC/tex/latex/biblatex-gb7714-2015/chinese-erj.cbx + RELOC/tex/latex/biblatex-gb7714-2015/chinese-jmw.bbx + RELOC/tex/latex/biblatex-gb7714-2015/chinese-jmw.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 @@ -38844,7 +38846,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.1l +catalogue-version 1.1m name biblatex-german-legal category Package @@ -166577,7 +166579,7 @@ catalogue-version 0.5 name koma-script category TLCore -revision 66870 +revision 66930 shortdesc A bundle of versatile classes and packages relocated 1 longdesc The KOMA-Script bundle provides replacements for the article, @@ -166594,9 +166596,9 @@ longdesc version number, the version number quoted only refers to the longdesc version of scrbook, scrreprt, scrartcl, scrlttr2 and typearea longdesc (which are the main parts of the bundle). depend footmisc -containersize 7460696 -containerchecksum f359186d40bd4c16b59ac5b373636dab6f1ce06d30262534adb40ee6cf53082c3724cf1c756863802611366ccd7445477a4ea95bbb60a9b85ebd4147a8a9a834 -runfiles size=4137 +containersize 7354452 +containerchecksum 10414c6bbb5a6b3840f177a3f8f8e05541e2f0a5e896b206d04340eb5ed54be322995386aa6e75e4110584bfee4caf3b0ce0085922173624ca4bcb0a15f654e0 +runfiles size=4091 RELOC/doc/latex/koma-script/MANIFEST.md RELOC/doc/latex/koma-script/README.md RELOC/doc/latex/koma-script/examples/ich.lco @@ -166943,7 +166945,7 @@ catalogue-contact-repository https://sourceforge.net/p/koma-script/code catalogue-ctan /macros/latex/contrib/koma-script catalogue-license lppl1.3c catalogue-topics class letter book-pub page-hf geometry float toc-etc legal notes addr-list date-time keyval package-mgmt io-mgmt -catalogue-version 3.39 +catalogue-version 3.40 name koma-script-examples category Package @@ -184380,7 +184382,7 @@ catalogue-version 7.040 name libertinus-otf category Package -revision 60023 +revision 66927 shortdesc Support for Libertinus OpenType relocated 1 longdesc This package offers LuaLaTeX/XeLaTeX support for the Libertinus @@ -184388,11 +184390,11 @@ longdesc OpenType fonts maintained by Khaled Hosny. Missing fonts are longdesc defined via several font feature settings. The Libertinus fonts longdesc are similiar to Libertine and Biolinum, but come with math longdesc symbols. -containersize 3728 -containerchecksum 1aee669aaa55ff11c2de760f65597542736b64a4ae52b8d73aa967c92a178ae7013ce06e701d9a3bf3de0e5987abec4d29401480dd4bb845a64c0047ddf66c84 -doccontainersize 594072 -doccontainerchecksum 6c21d100b5ef1bbb8e892c0a0da0cabfe11404b7e1e4606ec04b25bd0a0d22547b1e80f1398573f62a34b4e951cda01466d0d8828cd10e78e8ed008aafecb416 -docfiles size=170 +containersize 3868 +containerchecksum 5823a0e7fd6153c8dbae1405b33f368f82d1eb1194bd3a283daff0b894726edb2579fa8f9c86c446c0602edb043de89fa331bbad595487308a8f031ec933fc04 +doccontainersize 628772 +doccontainerchecksum 4a811c4ae0b20b6b35bd76e34b8d0a042f9ef5dd0ec21a730afa3fceb33a65be597ed231e12f59b7132a74d2758b2e68a0dcfe8976e876000079f12d4582e96d +docfiles size=178 RELOC/doc/fonts/libertinus-otf/Changes RELOC/doc/fonts/libertinus-otf/README.md details="Readme" RELOC/doc/fonts/libertinus-otf/libertinus-otf-doc.pdf details="Package documentation" @@ -184403,7 +184405,7 @@ catalogue-also libertinus-fonts libertinus-type1 catalogue-ctan /fonts/libertinus-otf catalogue-license lppl1.3 catalogue-topics font-body font-otf font-supp font-serif font-sans font-proportional font-mono font-maths luatex xetex -catalogue-version 0.29 +catalogue-version 0.30 name libertinus-type1 category Package @@ -248615,7 +248617,7 @@ catalogue-topics float name photobook category Package -revision 66905 +revision 66931 shortdesc A document class for typesetting photo books relocated 1 longdesc The photobook LaTeX document class extends the book class @@ -248649,11 +248651,11 @@ depend xargs depend xcolor depend xint depend xkeyval -containersize 31860 -containerchecksum 8b9560939a4028dfc507017e6e7c6e67d25244a9dddb47f929a563cb69bcc5f553a7de78d5be97ef3f7bbc1ce67e2aa1369d285304488df21b011193598ed0eb -doccontainersize 153968 -doccontainerchecksum 71a6459415f39d7f863ae3f26189472fdc63c93d7ecdfce9e50edc830d34d3d4ff7221d51a429a9a4b823bca795cb50234429dd9aa3d09dab876efa5164a18ce -docfiles size=53 +containersize 32124 +containerchecksum 2fe5d28effdf87d0fda17e8bd94e9e50a64f2ffc722ba68ad03f753f2ecb4f657f3cc67cead886edbf79a275e87620d702082cef2e31124a18e4259f529bac01 +doccontainersize 154460 +doccontainerchecksum ace1d6bdc43af9b345071436f8ab84ce4dc8f6d6b765263f8e930cf328462c305c502ea2df7013deb38eabc2f8326a33710895e5212336809c1c593e34e4393c +docfiles size=54 RELOC/doc/latex/photobook/DEPENDS.txt RELOC/doc/latex/photobook/LICENSE RELOC/doc/latex/photobook/Makefile @@ -248663,14 +248665,14 @@ docfiles size=53 RELOC/doc/latex/photobook/scripts/cls2tex.sh RELOC/doc/latex/photobook/scripts/make-spreads.cfg.example RELOC/doc/latex/photobook/scripts/make-spreads.sh -runfiles size=41 +runfiles size=42 RELOC/tex/latex/photobook/photobook.cls catalogue-contact-home https://github.com/flynx/photobook catalogue-contact-repository https://github.com/flynx/photobook catalogue-ctan /macros/latex/contrib/photobook catalogue-license bsd3 catalogue-topics class -catalogue-version 0.1.19 +catalogue-version 0.1.20 name physconst category Package @@ -312312,7 +312314,7 @@ docfiles size=376 name texlive-scripts category TLCore -revision 66919 +revision 66926 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. @@ -312320,10 +312322,10 @@ depend texlive-scripts.ARCH depend texlive.infra execute addMap mathpple.map postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat -containersize 114036 -containerchecksum d21ae677c4de2909095533214387df08a9a3b69dc8a435f8fe70aa33f7749d16804b2c0b3606e54c961e0cd110b7d382197293f75832db4d39960555216bdfdf -doccontainersize 426152 -doccontainerchecksum 989200bfbc842208370914067a5d1387226efcb9e6430f88ea9ec02a7a7e2ef167185a926448a491dafaad5bd72ce5db8caa6b763c4e4a97fd4c1b143005dc9f +containersize 114056 +containerchecksum 2d6dadfeb55b9db09bb13a3ea14585d81a7e87f006caa307a2bd4902b93ce12265bc6bc947fb97f995fe3addb567c70935ca2e0f47fa76d36e5e5d2a54786afa +doccontainersize 426276 +doccontainerchecksum 0645694862bcf4fd6c87cffba578d427d04539196089ffd45cc41b3ed29b7e9eec896b4d1eb5ac734ab5771e5422bdde9ca00662c033556c2ae10091704f9c36 docfiles size=543 doc.html texmf-dist/doc/man/man1/fmtutil-sys.1 @@ -318568,22 +318570,23 @@ catalogue-version 1.1 name tikz-nfold category Package -revision 66684 +revision 66928 shortdesc Triple, quadruple, and n-fold paths with TikZ relocated 1 longdesc This library adds higher-order paths to TikZ and also fixes longdesc some graphical issues with TikZ' double paths, used e.g. in longdesc arrows with an Implies tip. It is also compatible with tikz-cd, -longdesc adding support for triple and higher arrows. -containersize 11112 -containerchecksum b416b7d417e564fc132dc50c08e42e2448922ef2ec5e7b8d363b29c21e14f164b8a6724a10b89ca5d75ea926a613637f9e773439b6215d55feb94c2faa309b3a -doccontainersize 260908 -doccontainerchecksum e32f98ba7665f774989b39ed01ee9f0c2af1cb05f235f99b7c8342e5ac319d7b54cfb568f77c04094ddb0d5bcc1099debe351a4b242cbbf8c9761f576d240a23 -docfiles size=79 +longdesc adding support for triple and higher arrows. Macros to offset +longdesc arbitrary paths are included as well. +containersize 14528 +containerchecksum 938e0001ddd8c344b736ac76846cfd2007115bf80b310603ec1d1b91f6608791b9be06b7c3089711f3d2797cc078ad255b6b807e958087945d9c6acbc8580470 +doccontainersize 272584 +doccontainerchecksum 3bbfa1d9da31274cc03fd6c477fa1103f2c2daaa699294a981a44800deb78900d6727945678edc16ba775227688200919eb3a73e5b61abb05173a7c17dd4401d +docfiles size=83 RELOC/doc/latex/tikz-nfold/README.md details="Readme" RELOC/doc/latex/tikz-nfold/tikz-nfold-doc.pdf details="Package documentation" RELOC/doc/latex/tikz-nfold/tikz-nfold-doc.tex -runfiles size=12 +runfiles size=16 RELOC/tex/latex/tikz-nfold/pgflibrarybezieroffset.code.tex RELOC/tex/latex/tikz-nfold/tikzlibrarynfold.code.tex catalogue-contact-bugs https://github.com/jonschz/tikz-nfold/issues @@ -318591,7 +318594,7 @@ catalogue-contact-repository https://github.com/jonschz/tikz-nfold catalogue-ctan /graphics/pgf/contrib/tikz-nfold catalogue-license lppl1.3c catalogue-topics graphics pgf-tikz -catalogue-version 0.0.1 +catalogue-version 0.1.0 name tikz-opm category Package diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 index cc23364a33..e92ed48dbe 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 @@ -1 +1 @@ -7e33e7791c37461e8dea361ec4ff3d64 texlive.tlpdb +c33889018f684b18b42554389d71d347 texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 index d01393ad96..0341aef98c 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 @@ -1 +1 @@ -325e02c2d638563222afeb4a37afbaf401c755691b3c43247b6c2a3fdd7eef0aaf87ae0d91dab608d101bf6695a685791460b1c0d58a0dd5d33eea4848578648 texlive.tlpdb +6f2b4978f2bd7dc98617076382a9101861c5d2b28bdaaabf6290767fa80c9baf25893547a209075f3f0cb5f7b251f0b458eb5f76e11f46e4c054067a839451a8 texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc index 184f504231..c062e5dc2f 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----- -iQEcBAEBCgAGBQJkRcU7AAoJEEzhh34ZQ4xwp7MH/1E8XWtGSbzKyHIhcXy3DMsq -Z4h8gDrOCHuRUFnZz5O7dbCt/YTbgyVKXkdbM6vfT6V1bY9dGjmD6YXw/7TPkvcF -C79UpO1kB6gPuba5PAGMbrPSvc+inRGDqxHWFQ3MkBRi50Yr79qqhn5WyECTcMGl -LHRgT7Tqh1Q8IP+m2xZXoRfD8oLDW9cn5Orqumq+/7c1aYQ2CFi2VZ25fx3us/yr -anwQ3osMaT+7sQZ/iPhUOor1Q5kumtVYLG0I/z1bs0zy0k+WbGfbIpSWpUSrDKWP -qualJeWgFtDmmtrwxfZDXLgaQkebg7D0OmhPQsEHyF3U/PcD7e947MAjVtLJ+4s= -=rTik +iQEcBAEBCgAGBQJkRxZ1AAoJEEzhh34ZQ4xwxlsH/RqZun3Pz36vEuxD1DKseypi +U+ksNs3UtaiLkSf24kHJhG4CpgxPTUM3mxOrqolODtCoGK4GgEpCkSJDnZNFFPR+ +kedqdnh+el2UGRVaSvVvJqpCgwQFr3lU/CR+0rXwpYawlRu4VgClBLwKJQIiTc7J +WDhKB02uQ4qSeE9MqTkT/mpwXtPA/VB8cPYxbhCuJQm533CqgOJeDKUBX5gBefUG +cobJcVf/4F94QFXpA2eA35PaJ4aBCihOsK2nY0+eAOqprcsPPFvh4gwGQGv+T2ER +OO2qRI+Zbi4He7ep0sar5LWKjsIJIDMgHRrwp0uFlM259OAPIeq04W/Vw4n4uac= +=Ef5p -----END PGP SIGNATURE----- diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz Binary files differindex 155daf6cac..3afca0b766 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz @@ -2,4 +2,4 @@ # The source CTAN of this site's material: dante.ctan.org # The year-month-day-hour-minute of this site's material: -2023-04-23-23-02 +2023-04-25-02-02 |