summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FILES.byname739
-rw-r--r--FILES.byname.gzbin2315878 -> 2315935 bytes
-rw-r--r--FILES.last07days688
-rw-r--r--graphics/mcf2graph/CHANGELOG12
-rw-r--r--graphics/mcf2graph/README2
-rw-r--r--graphics/mcf2graph/mcf2graph.mf75
-rw-r--r--graphics/mcf2graph/mcf_data_base.mcf1617
-rw-r--r--graphics/mcf2graph/mcf_exa_soc.mf24
-rw-r--r--graphics/mcf2graph/mcf_example.pdfbin320335 -> 320314 bytes
-rw-r--r--graphics/mcf2graph/mcf_example.tex2
-rw-r--r--graphics/mcf2graph/mcf_man_soc.mf11
-rw-r--r--graphics/mcf2graph/mcf_manual.pdfbin378071 -> 377862 bytes
-rw-r--r--graphics/mcf2graph/mcf_manual.tex34
-rw-r--r--graphics/mcf2graph/mcf_mplib_exa.pdfbin184190 -> 184054 bytes
-rw-r--r--graphics/mcf2graph/mcf_mplib_exa.tex11
-rw-r--r--language/japanese/pxbase/LICENSE2
-rw-r--r--language/japanese/pxbase/README-ja.md7
-rw-r--r--language/japanese/pxbase/README.md1
-rw-r--r--language/japanese/pxbase/pxbabel.pdfbin151727 -> 136058 bytes
-rw-r--r--language/japanese/pxbase/pxbabel.sty131
-rw-r--r--language/japanese/pxbase/pxbabel.tex295
-rw-r--r--language/japanese/pxbase/pxbase.sty4
-rw-r--r--language/japanese/pxbase/pxbasenc.def2
-rw-r--r--language/japanese/pxbase/pxjsfenc.def2
-rw-r--r--language/japanese/pxbase/upkcat.sty4
-rw-r--r--macros/latex/contrib/colorist/README.md23
-rw-r--r--macros/latex/contrib/colorist/colorart.cls83
-rw-r--r--macros/latex/contrib/colorist/colorbook.cls83
-rw-r--r--macros/latex/contrib/colorist/colorist-doc.pdfbin45924 -> 81144 bytes
-rw-r--r--macros/latex/contrib/colorist/colorist-doc.tex453
-rw-r--r--macros/latex/contrib/colorist/colorist.sty909
-rw-r--r--macros/latex/contrib/minimalist/README.md25
-rw-r--r--macros/latex/contrib/minimalist/minimalist-doc.pdfbin45936 -> 79955 bytes
-rw-r--r--macros/latex/contrib/minimalist/minimalist-doc.tex434
-rw-r--r--macros/latex/contrib/minimalist/minimalist.sty490
-rw-r--r--macros/latex/contrib/minimalist/minimart.cls89
-rw-r--r--macros/latex/contrib/minimalist/minimbook.cls89
-rw-r--r--macros/latex/contrib/ot-tableau/README11
-rw-r--r--macros/latex/contrib/ot-tableau/ot-tableau.pdfbin84456 -> 65650 bytes
-rw-r--r--macros/latex/contrib/ot-tableau/ot-tableau.sty61
-rw-r--r--macros/latex/contrib/ot-tableau/ot-tableau.tex13
-rw-r--r--macros/latex/contrib/tcolorbox/CHANGES31
-rw-r--r--macros/latex/contrib/tcolorbox/README4
-rw-r--r--macros/latex/contrib/tcolorbox/tcbbreakable.code.tex6
-rw-r--r--macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex6
-rw-r--r--macros/latex/contrib/tcolorbox/tcbexternal.code.tex7
-rw-r--r--macros/latex/contrib/tcolorbox/tcbfitting.code.tex6
-rw-r--r--macros/latex/contrib/tcolorbox/tcbhooks.code.tex6
-rw-r--r--macros/latex/contrib/tcolorbox/tcblistings.code.tex6
-rw-r--r--macros/latex/contrib/tcolorbox/tcblistingscore.code.tex6
-rw-r--r--macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex6
-rw-r--r--macros/latex/contrib/tcolorbox/tcbmagazine.code.tex6
-rw-r--r--macros/latex/contrib/tcolorbox/tcbminted.code.tex6
-rw-r--r--macros/latex/contrib/tcolorbox/tcbposter.code.tex6
-rw-r--r--macros/latex/contrib/tcolorbox/tcbprocessing.code.tex7
-rw-r--r--macros/latex/contrib/tcolorbox/tcbraster.code.tex22
-rw-r--r--macros/latex/contrib/tcolorbox/tcbskins.code.tex222
-rw-r--r--macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex27
-rw-r--r--macros/latex/contrib/tcolorbox/tcbtheorems.code.tex29
-rw-r--r--macros/latex/contrib/tcolorbox/tcbvignette.code.tex6
-rw-r--r--macros/latex/contrib/tcolorbox/tcbxparse.code.tex6
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdfbin273812 -> 273829 bytes
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox-example.pdfbin457359 -> 457403 bytes
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox-example.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdfbin442139 -> 442133 bytes
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex5
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.coremacros.tex8
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex10
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.fitting.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.hooks.tex2
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex36
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.listings.tex4
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.raster.tex5
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty4
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.skincatalog.tex1636
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex1985
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex37
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.vignette.tex35
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex2
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.pdfbin7174046 -> 7209084 bytes
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.sty72
-rw-r--r--macros/latex/contrib/tcolorbox/tcolorbox.tex11
-rw-r--r--macros/unicodetex/latex/beaulivre/README.md7
-rw-r--r--macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdfbin166042 -> 300321 bytes
-rw-r--r--macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex506
-rw-r--r--macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdfbin114887 -> 185959 bytes
-rw-r--r--macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex504
-rw-r--r--macros/unicodetex/latex/beaulivre/beaulivre.cls152
-rw-r--r--macros/unicodetex/latex/einfart/README.md7
-rw-r--r--macros/unicodetex/latex/einfart/einfart-doc-cn.pdfbin151770 -> 236172 bytes
-rw-r--r--macros/unicodetex/latex/einfart/einfart-doc-cn.tex450
-rw-r--r--macros/unicodetex/latex/einfart/einfart-doc-en.pdfbin105718 -> 145877 bytes
-rw-r--r--macros/unicodetex/latex/einfart/einfart-doc-en.tex438
-rw-r--r--macros/unicodetex/latex/einfart/einfart.cls156
-rw-r--r--macros/unicodetex/latex/lebhart/README.md7
-rw-r--r--macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdfbin161740 -> 280208 bytes
-rw-r--r--macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex485
-rw-r--r--macros/unicodetex/latex/lebhart/lebhart-doc-en.pdfbin114964 -> 168948 bytes
-rw-r--r--macros/unicodetex/latex/lebhart/lebhart-doc-en.tex475
-rw-r--r--macros/unicodetex/latex/lebhart/lebhart.cls152
-rw-r--r--macros/unicodetex/latex/simplivre/README.md7
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdfbin158697 -> 283518 bytes
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex482
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-en.pdfbin108946 -> 191358 bytes
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-en.tex478
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre.cls156
-rw-r--r--support/TeX4ht/source/tex4ht-4ht.tex18
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl4
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb237
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.md52
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha5122
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc14
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.xzbin2307588 -> 2307844 bytes
-rw-r--r--systems/win32/miktex/tm/packages/next/pr.ini8
-rw-r--r--systems/win32/miktex/tm/packages/pr.ini8
-rw-r--r--timestamp2
118 files changed, 10193 insertions, 5279 deletions
diff --git a/FILES.byname b/FILES.byname
index bc8a8d6119..c171275477 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -5087,7 +5087,7 @@
1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp
1990/10/02 | 812 | dviware/vutex/vaxvms.ins
1990/10/02 | 127576 | dviware/vutex/vutex.web
-2021/05/22 | 173386 | FILES.last07days
+2021/05/23 | 124543 | FILES.last07days
2020/08/14 | 104065 | fonts/academicons/academicons.pdf
2020/08/14 | 17247 | fonts/academicons/academicons.sty
2020/08/14 | 6546 | fonts/academicons/academicons.tex
@@ -139536,20 +139536,20 @@
2011/05/31 | 231925 | graphics/mathspic/perl/sourcecode113.html
2011/05/31 | 183530 | graphics/mathspic/perl/sourcecode113.nw
2011/05/31 | 2864043 | graphics/mathspic/perl/sourcecode113.pdf
-2021/05/04 | 13068 | graphics/mcf2graph/CHANGELOG
-2021/05/05 | 103789 | graphics/mcf2graph/mcf2graph.mf
-2021/04/25 | 35977 | graphics/mcf2graph/mcf_data_base.mcf
-2021/05/05 | 320335 | graphics/mcf2graph/mcf_example.pdf
-2021/05/04 | 2318 | graphics/mcf2graph/mcf_example.tex
-2021/05/05 | 2743 | graphics/mcf2graph/mcf_exa_soc.mf
-2021/05/05 | 44379 | graphics/mcf2graph/mcf_man_soc.mf
-2021/05/05 | 378071 | graphics/mcf2graph/mcf_manual.pdf
-2021/05/05 | 59133 | graphics/mcf2graph/mcf_manual.tex
-2021/05/05 | 184190 | graphics/mcf2graph/mcf_mplib_exa.pdf
-2021/05/05 | 16439 | graphics/mcf2graph/mcf_mplib_exa.tex
+2021/05/23 | 13399 | graphics/mcf2graph/CHANGELOG
+2021/05/23 | 105080 | graphics/mcf2graph/mcf2graph.mf
+2021/05/23 | 94877 | graphics/mcf2graph/mcf_data_base.mcf
+2021/05/23 | 320314 | graphics/mcf2graph/mcf_example.pdf
+2021/05/23 | 2318 | graphics/mcf2graph/mcf_example.tex
+2021/05/23 | 2695 | graphics/mcf2graph/mcf_exa_soc.mf
+2021/05/23 | 44332 | graphics/mcf2graph/mcf_man_soc.mf
+2021/05/23 | 377862 | graphics/mcf2graph/mcf_manual.pdf
+2021/05/23 | 59482 | graphics/mcf2graph/mcf_manual.tex
+2021/05/23 | 184054 | graphics/mcf2graph/mcf_mplib_exa.pdf
+2021/05/23 | 16484 | graphics/mcf2graph/mcf_mplib_exa.tex
2021/05/03 | 3843 | graphics/mcf2graph/mcf_setup.sty
-2021/04/25 | 4485 | graphics/mcf2graph/README
-2021/05/05 | 940055 | graphics/mcf2graph.zip
+2021/05/23 | 4485 | graphics/mcf2graph/README
+2021/05/23 | 948444 | graphics/mcf2graph.zip
2004/07/13 | 8567 | graphics/metaplot/axes.mp
2004/06/28 | 1122 | graphics/metaplot/examples/cap1.cc
2004/06/28 | 2178 | graphics/metaplot/examples/cap1.mp
@@ -149627,8 +149627,8 @@
2014/04/19 | 3223 | info/biblio/ijqc.sty
2019/10/15 | 10835 | info/biblio/komoedie.bib
2019/10/15 | 3050 | info/biblio/komoedie.ltx
-2021/02/05 | 388361 | info/biblio/litprog.bib
-2021/02/05 | 3210 | info/biblio/litprog.ltx
+2021/04/08 | 389098 | info/biblio/litprog.bib
+2021/04/08 | 3204 | info/biblio/litprog.ltx
2001/01/05 | 628 | info/biblio/microchip.sty
2021/03/09 | 651970 | info/biblio/printing-history.bib
2021/03/09 | 2876 | info/biblio/printing-history.ltx
@@ -173100,7 +173100,7 @@
2014/05/20 | 721827 | install/macros/latex/contrib/sympytexpackage.tds.zip
2014/01/26 | 526292 | install/macros/latex/contrib/tablefootnote.tds.zip
2013/01/22 | 615461 | install/macros/latex/contrib/tabvar.tds.zip
-2020/10/09 | 6135973 | install/macros/latex/contrib/tcolorbox.tds.zip
+2021/05/22 | 6187660 | install/macros/latex/contrib/tcolorbox.tds.zip
2009/06/22 | 771373 | install/macros/latex/contrib/tdsfrmath.tds.zip
2019/09/29 | 5325410 | install/macros/latex/contrib/testidx.tds.zip
2019/07/31 | 453685 | install/macros/latex/contrib/thalie.tds.zip
@@ -182334,20 +182334,20 @@
2020/09/28 | 1928 | language/japanese/ptex-base/ptex.tex
2020/09/30 | 796 | language/japanese/ptex-base/README.md
2020/09/30 | 13655 | language/japanese/ptex-base.zip
-2017/07/04 | 1086 | language/japanese/pxbase/LICENSE
-2017/07/04 | 151727 | language/japanese/pxbase/pxbabel.pdf
-2017/07/04 | 14934 | language/japanese/pxbase/pxbabel.sty
-2017/07/04 | 14908 | language/japanese/pxbase/pxbabel.tex
+2021/05/23 | 1091 | language/japanese/pxbase/LICENSE
+2021/05/23 | 136058 | language/japanese/pxbase/pxbabel.pdf
+2021/05/23 | 19729 | language/japanese/pxbase/pxbabel.sty
+2021/05/23 | 17955 | language/japanese/pxbase/pxbabel.tex
2017/07/04 | 163 | language/japanese/pxbase/pxbase.def
-2017/07/04 | 19113 | language/japanese/pxbase/pxbasenc.def
-2017/07/04 | 430 | language/japanese/pxbase/pxbase.sty
+2021/05/23 | 19112 | language/japanese/pxbase/pxbasenc.def
+2021/05/23 | 434 | language/japanese/pxbase/pxbase.sty
2017/07/04 | 138 | language/japanese/pxbase/pxbsjc1.def
2017/07/04 | 121 | language/japanese/pxbase/pxbsjc.def
-2017/07/04 | 7353 | language/japanese/pxbase/pxjsfenc.def
-2017/07/04 | 9566 | language/japanese/pxbase/README-ja.md
-2017/07/04 | 2329 | language/japanese/pxbase/README.md
-2017/07/04 | 3125 | language/japanese/pxbase/upkcat.sty
-2017/07/06 | 175464 | language/japanese/pxbase.zip
+2021/05/23 | 7352 | language/japanese/pxbase/pxjsfenc.def
+2021/05/23 | 10006 | language/japanese/pxbase/README-ja.md
+2021/05/23 | 2363 | language/japanese/pxbase/README.md
+2021/05/23 | 3129 | language/japanese/pxbase/upkcat.sty
+2021/05/23 | 161218 | language/japanese/pxbase.zip
2020/02/01 | 1091 | language/japanese/pxchfon/LICENSE
2010/05/12 | 97 | language/japanese/pxchfon/pxchfon0.def
2020/10/05 | 250723 | language/japanese/pxchfon/pxchfon.pdf
@@ -195415,14 +195415,14 @@
2016/05/11 | 3227 | macros/latex/contrib/coloring/coloring.sty
2016/05/11 | 452 | macros/latex/contrib/coloring/README
2016/05/11 | 27406 | macros/latex/contrib/coloring.zip
-2021/03/15 | 3565 | macros/latex/contrib/colorist/colorart.cls
-2021/03/15 | 3562 | macros/latex/contrib/colorist/colorbook.cls
-2021/03/15 | 45924 | macros/latex/contrib/colorist/colorist-doc.pdf
-2021/03/15 | 8234 | macros/latex/contrib/colorist/colorist-doc.tex
-2021/03/15 | 26008 | macros/latex/contrib/colorist/colorist.sty
+2021/05/23 | 2939 | macros/latex/contrib/colorist/colorart.cls
+2021/05/23 | 2936 | macros/latex/contrib/colorist/colorbook.cls
+2021/05/23 | 81144 | macros/latex/contrib/colorist/colorist-doc.pdf
+2021/05/23 | 20002 | macros/latex/contrib/colorist/colorist-doc.tex
+2021/05/23 | 55104 | macros/latex/contrib/colorist/colorist.sty
2021/03/10 | 19106 | macros/latex/contrib/colorist/LICENSE
-2021/03/15 | 1127 | macros/latex/contrib/colorist/README.md
-2021/03/16 | 64395 | macros/latex/contrib/colorist.zip
+2021/05/21 | 1159 | macros/latex/contrib/colorist/README.md
+2021/05/23 | 102849 | macros/latex/contrib/colorist.zip
2019/03/25 | 99243 | macros/latex/contrib/colorspace/colorspace.pdf
2016/10/04 | 15861 | macros/latex/contrib/colorspace/colorspaceshade.png
2019/03/25 | 21423 | macros/latex/contrib/colorspace/colorspace.sty
@@ -205702,13 +205702,13 @@
2017/04/11 | 698 | macros/latex/contrib/minidocument/README
2017/04/11 | 190869 | macros/latex/contrib/minidocument.zip
2021/03/10 | 19106 | macros/latex/contrib/minimalist/LICENSE
-2021/03/15 | 45936 | macros/latex/contrib/minimalist/minimalist-doc.pdf
-2021/03/15 | 8466 | macros/latex/contrib/minimalist/minimalist-doc.tex
-2021/03/15 | 21184 | macros/latex/contrib/minimalist/minimalist.sty
-2021/03/15 | 3688 | macros/latex/contrib/minimalist/minimart.cls
-2021/03/15 | 3685 | macros/latex/contrib/minimalist/minimbook.cls
-2021/03/15 | 1143 | macros/latex/contrib/minimalist/README.md
-2021/03/15 | 62915 | macros/latex/contrib/minimalist.zip
+2021/05/22 | 79955 | macros/latex/contrib/minimalist/minimalist-doc.pdf
+2021/05/22 | 21549 | macros/latex/contrib/minimalist/minimalist-doc.tex
+2021/05/22 | 23626 | macros/latex/contrib/minimalist/minimalist.sty
+2021/05/22 | 3184 | macros/latex/contrib/minimalist/minimart.cls
+2021/05/22 | 3181 | macros/latex/contrib/minimalist/minimbook.cls
+2021/05/21 | 1203 | macros/latex/contrib/minimalist/README.md
+2021/05/23 | 98872 | macros/latex/contrib/minimalist.zip
2008/04/07 | 14406 | macros/latex/contrib/minipage-marginpar/minipage-marginpar.dtx
2008/04/07 | 2167 | macros/latex/contrib/minipage-marginpar/minipage-marginpar.ins
2008/04/07 | 197917 | macros/latex/contrib/minipage-marginpar/minipage-marginpar.pdf
@@ -207553,11 +207553,11 @@
2000/09/03 | 29133 | macros/latex/contrib/othello/othello.tex
2000/09/03 | 7633 | macros/latex/contrib/othello/ot.mf
2005/04/28 | 24097 | macros/latex/contrib/othello.zip
-2017/07/23 | 84456 | macros/latex/contrib/ot-tableau/ot-tableau.pdf
-2017/07/25 | 4646 | macros/latex/contrib/ot-tableau/ot-tableau.sty
-2017/07/23 | 10899 | macros/latex/contrib/ot-tableau/ot-tableau.tex
-2017/07/25 | 252 | macros/latex/contrib/ot-tableau/README
-2017/07/25 | 82870 | macros/latex/contrib/ot-tableau.zip
+2021/05/19 | 65650 | macros/latex/contrib/ot-tableau/ot-tableau.pdf
+2021/05/23 | 5430 | macros/latex/contrib/ot-tableau/ot-tableau.sty
+2021/05/19 | 11735 | macros/latex/contrib/ot-tableau/ot-tableau.tex
+2021/05/23 | 613 | macros/latex/contrib/ot-tableau/README
+2021/05/23 | 67907 | macros/latex/contrib/ot-tableau.zip
2011/03/25 | 66372 | macros/latex/contrib/oubraces/oubraces.pdf
2011/03/25 | 3337 | macros/latex/contrib/oubraces/oubraces.sty
2011/03/25 | 7895 | macros/latex/contrib/oubraces/oubraces.tex
@@ -213520,74 +213520,75 @@
2003/07/20 | 8323 | macros/latex/contrib/tclldoc/tools/sourcedtx.dtx
2003/07/20 | 759 | macros/latex/contrib/tclldoc/tools/sourcedtx.ins
2005/07/26 | 525675 | macros/latex/contrib/tclldoc.zip
-2020/10/09 | 22407 | macros/latex/contrib/tcolorbox/Basilica_5.png
-2020/10/09 | 62882 | macros/latex/contrib/tcolorbox/blueshade.png
-2020/10/09 | 56026 | macros/latex/contrib/tcolorbox/CHANGES
-2020/10/09 | 21663 | macros/latex/contrib/tcolorbox/crinklepaper.png
-2020/10/09 | 76829 | macros/latex/contrib/tcolorbox/goldshade.png
-2020/10/09 | 35224 | macros/latex/contrib/tcolorbox/lichtspiel.jpg
-2020/10/09 | 15166 | macros/latex/contrib/tcolorbox/pink_marble.png
-2020/10/09 | 5277 | macros/latex/contrib/tcolorbox/README
-2020/10/09 | 34121 | macros/latex/contrib/tcolorbox/tcbbreakable.code.tex
-2020/10/09 | 27736 | macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex
-2020/10/09 | 9008 | macros/latex/contrib/tcolorbox/tcbexternal.code.tex
-2020/10/09 | 14533 | macros/latex/contrib/tcolorbox/tcbfitting.code.tex
-2020/10/09 | 8118 | macros/latex/contrib/tcolorbox/tcbhooks.code.tex
-2020/10/09 | 3412 | macros/latex/contrib/tcolorbox/tcblistings.code.tex
-2020/10/09 | 13911 | macros/latex/contrib/tcolorbox/tcblistingscore.code.tex
-2020/10/09 | 1412 | macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex
-2020/10/09 | 5630 | macros/latex/contrib/tcolorbox/tcbmagazine.code.tex
-2020/10/09 | 2670 | macros/latex/contrib/tcolorbox/tcbminted.code.tex
-2020/10/09 | 12451 | macros/latex/contrib/tcolorbox/tcbposter.code.tex
-2020/10/09 | 2564 | macros/latex/contrib/tcolorbox/tcbprocessing.code.tex
-2020/10/09 | 8926 | macros/latex/contrib/tcolorbox/tcbraster.code.tex
-2020/10/09 | 85235 | macros/latex/contrib/tcolorbox/tcbskins.code.tex
-2020/10/09 | 9020 | macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex
-2020/10/09 | 8515 | macros/latex/contrib/tcolorbox/tcbtheorems.code.tex
-2020/10/09 | 12745 | macros/latex/contrib/tcolorbox/tcbvignette.code.tex
-2020/10/09 | 10266 | macros/latex/contrib/tcolorbox/tcbxparse.code.tex
-2020/10/09 | 5404 | macros/latex/contrib/tcolorbox/tcolorbox.doc.abstract.tex
-2020/10/09 | 6424 | macros/latex/contrib/tcolorbox/tcolorbox.doc.beamer.tex
-2020/10/09 | 6102 | macros/latex/contrib/tcolorbox/tcolorbox.doc.bib
-2020/10/09 | 39375 | macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex
-2020/10/09 | 9899 | macros/latex/contrib/tcolorbox/tcolorbox.doc.coremacros.tex
-2020/10/09 | 169051 | macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex
-2020/10/09 | 56362 | macros/latex/contrib/tcolorbox/tcolorbox.doc.documentation.tex
-2020/10/09 | 25816 | macros/latex/contrib/tcolorbox/tcolorbox.doc.external.tex
-2020/10/09 | 20201 | macros/latex/contrib/tcolorbox/tcolorbox.doc.filling.tex
-2020/10/09 | 19952 | macros/latex/contrib/tcolorbox/tcolorbox.doc.fitting.tex
-2020/10/09 | 7928 | macros/latex/contrib/tcolorbox/tcolorbox.doc.graphics.tex
-2020/10/09 | 24549 | macros/latex/contrib/tcolorbox/tcolorbox.doc.hooks.tex
-2020/10/09 | 112 | macros/latex/contrib/tcolorbox/tcolorbox.doc.index.tex
-2020/10/09 | 14415 | macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex
-2020/10/09 | 8722 | macros/latex/contrib/tcolorbox/tcolorbox.doc.intro.tex
-2020/10/09 | 57160 | macros/latex/contrib/tcolorbox/tcolorbox.doc.listings.tex
-2020/10/09 | 20274 | macros/latex/contrib/tcolorbox/tcolorbox.doc.magazine.tex
-2020/10/09 | 1106 | macros/latex/contrib/tcolorbox/tcolorbox.doc.picturecredits.tex
-2020/10/09 | 25557 | macros/latex/contrib/tcolorbox/tcolorbox.doc.poster.tex
-2020/10/09 | 5577 | macros/latex/contrib/tcolorbox/tcolorbox.doc.quickref.tex
-2020/10/09 | 32893 | macros/latex/contrib/tcolorbox/tcolorbox.doc.raster.tex
-2020/10/09 | 6386 | macros/latex/contrib/tcolorbox/tcolorbox.doc.recording.tex
-2020/10/09 | 148 | macros/latex/contrib/tcolorbox/tcolorbox.doc.references.tex
-2020/10/09 | 13613 | macros/latex/contrib/tcolorbox/tcolorbox.doc.sidebyside.tex
-2020/10/09 | 175422 | macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex
-2020/10/09 | 11637 | macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty
-2020/10/09 | 6691 | macros/latex/contrib/tcolorbox/tcolorbox.doc.s_snippet.sty
-2020/10/09 | 29849 | macros/latex/contrib/tcolorbox/tcolorbox.doc.technical.tex
-2020/10/09 | 38690 | macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex
-2020/10/09 | 3448 | macros/latex/contrib/tcolorbox/tcolorbox.doc.verbatim.tex
-2020/10/09 | 27222 | macros/latex/contrib/tcolorbox/tcolorbox.doc.vignette.tex
-2020/10/09 | 27084 | macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex
-2020/10/09 | 457359 | macros/latex/contrib/tcolorbox/tcolorbox-example.pdf
-2020/10/09 | 273812 | macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf
-2020/10/09 | 5989 | macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex
-2020/10/09 | 8354 | macros/latex/contrib/tcolorbox/tcolorbox-example.tex
-2020/10/09 | 7174046 | macros/latex/contrib/tcolorbox/tcolorbox.pdf
-2020/10/09 | 87902 | macros/latex/contrib/tcolorbox/tcolorbox.sty
-2020/10/09 | 3234 | macros/latex/contrib/tcolorbox/tcolorbox.tex
-2020/10/09 | 442139 | macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf
-2020/10/09 | 44097 | macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex
-2020/10/09 | 6165739 | macros/latex/contrib/tcolorbox.zip
+2021/05/22 | 22407 | macros/latex/contrib/tcolorbox/Basilica_5.png
+2021/05/22 | 62882 | macros/latex/contrib/tcolorbox/blueshade.png
+2021/05/22 | 57421 | macros/latex/contrib/tcolorbox/CHANGES
+2021/05/22 | 21663 | macros/latex/contrib/tcolorbox/crinklepaper.png
+2021/05/22 | 76829 | macros/latex/contrib/tcolorbox/goldshade.png
+2021/05/22 | 35224 | macros/latex/contrib/tcolorbox/lichtspiel.jpg
+2021/05/22 | 15166 | macros/latex/contrib/tcolorbox/pink_marble.png
+2021/05/22 | 5277 | macros/latex/contrib/tcolorbox/README
+2021/05/22 | 34121 | macros/latex/contrib/tcolorbox/tcbbreakable.code.tex
+2021/05/22 | 27736 | macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex
+2021/05/22 | 9033 | macros/latex/contrib/tcolorbox/tcbexternal.code.tex
+2021/05/22 | 14533 | macros/latex/contrib/tcolorbox/tcbfitting.code.tex
+2021/05/22 | 8118 | macros/latex/contrib/tcolorbox/tcbhooks.code.tex
+2021/05/22 | 3412 | macros/latex/contrib/tcolorbox/tcblistings.code.tex
+2021/05/22 | 13911 | macros/latex/contrib/tcolorbox/tcblistingscore.code.tex
+2021/05/22 | 1412 | macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex
+2021/05/22 | 5630 | macros/latex/contrib/tcolorbox/tcbmagazine.code.tex
+2021/05/22 | 2670 | macros/latex/contrib/tcolorbox/tcbminted.code.tex
+2021/05/22 | 12451 | macros/latex/contrib/tcolorbox/tcbposter.code.tex
+2021/05/22 | 2589 | macros/latex/contrib/tcolorbox/tcbprocessing.code.tex
+2021/05/22 | 9063 | macros/latex/contrib/tcolorbox/tcbraster.code.tex
+2021/05/22 | 87118 | macros/latex/contrib/tcolorbox/tcbskins.code.tex
+2021/05/22 | 10038 | macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex
+2021/05/22 | 9057 | macros/latex/contrib/tcolorbox/tcbtheorems.code.tex
+2021/05/22 | 12745 | macros/latex/contrib/tcolorbox/tcbvignette.code.tex
+2021/05/22 | 10266 | macros/latex/contrib/tcolorbox/tcbxparse.code.tex
+2021/05/22 | 5404 | macros/latex/contrib/tcolorbox/tcolorbox.doc.abstract.tex
+2021/05/22 | 6424 | macros/latex/contrib/tcolorbox/tcolorbox.doc.beamer.tex
+2021/05/22 | 6102 | macros/latex/contrib/tcolorbox/tcolorbox.doc.bib
+2021/05/22 | 39859 | macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex
+2021/05/22 | 9907 | macros/latex/contrib/tcolorbox/tcolorbox.doc.coremacros.tex
+2021/05/22 | 169197 | macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex
+2021/05/22 | 56362 | macros/latex/contrib/tcolorbox/tcolorbox.doc.documentation.tex
+2021/05/22 | 25816 | macros/latex/contrib/tcolorbox/tcolorbox.doc.external.tex
+2021/05/22 | 20201 | macros/latex/contrib/tcolorbox/tcolorbox.doc.filling.tex
+2021/05/22 | 19956 | macros/latex/contrib/tcolorbox/tcolorbox.doc.fitting.tex
+2021/05/22 | 7928 | macros/latex/contrib/tcolorbox/tcolorbox.doc.graphics.tex
+2021/05/22 | 24548 | macros/latex/contrib/tcolorbox/tcolorbox.doc.hooks.tex
+2021/05/22 | 112 | macros/latex/contrib/tcolorbox/tcolorbox.doc.index.tex
+2021/05/22 | 15656 | macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex
+2021/05/22 | 8722 | macros/latex/contrib/tcolorbox/tcolorbox.doc.intro.tex
+2021/05/22 | 57164 | macros/latex/contrib/tcolorbox/tcolorbox.doc.listings.tex
+2021/05/22 | 20274 | macros/latex/contrib/tcolorbox/tcolorbox.doc.magazine.tex
+2021/05/22 | 1106 | macros/latex/contrib/tcolorbox/tcolorbox.doc.picturecredits.tex
+2021/05/22 | 25557 | macros/latex/contrib/tcolorbox/tcolorbox.doc.poster.tex
+2021/05/22 | 5577 | macros/latex/contrib/tcolorbox/tcolorbox.doc.quickref.tex
+2021/05/22 | 33131 | macros/latex/contrib/tcolorbox/tcolorbox.doc.raster.tex
+2021/05/22 | 6386 | macros/latex/contrib/tcolorbox/tcolorbox.doc.recording.tex
+2021/05/22 | 148 | macros/latex/contrib/tcolorbox/tcolorbox.doc.references.tex
+2021/05/22 | 13613 | macros/latex/contrib/tcolorbox/tcolorbox.doc.sidebyside.tex
+2021/05/22 | 56212 | macros/latex/contrib/tcolorbox/tcolorbox.doc.skincatalog.tex
+2021/05/22 | 110973 | macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex
+2021/05/22 | 11677 | macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty
+2021/05/22 | 6691 | macros/latex/contrib/tcolorbox/tcolorbox.doc.s_snippet.sty
+2021/05/22 | 29849 | macros/latex/contrib/tcolorbox/tcolorbox.doc.technical.tex
+2021/05/22 | 40056 | macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex
+2021/05/22 | 3448 | macros/latex/contrib/tcolorbox/tcolorbox.doc.verbatim.tex
+2021/05/22 | 28432 | macros/latex/contrib/tcolorbox/tcolorbox.doc.vignette.tex
+2021/05/22 | 27086 | macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex
+2021/05/22 | 457403 | macros/latex/contrib/tcolorbox/tcolorbox-example.pdf
+2021/05/22 | 273829 | macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf
+2021/05/22 | 5989 | macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex
+2021/05/22 | 8354 | macros/latex/contrib/tcolorbox/tcolorbox-example.tex
+2021/05/22 | 7209084 | macros/latex/contrib/tcolorbox/tcolorbox.pdf
+2021/05/22 | 88946 | macros/latex/contrib/tcolorbox/tcolorbox.sty
+2021/05/22 | 3266 | macros/latex/contrib/tcolorbox/tcolorbox.tex
+2021/05/22 | 442133 | macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf
+2021/05/22 | 44097 | macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex
+2021/05/23 | 6217425 | macros/latex/contrib/tcolorbox.zip
2014/02/24 | 399 | macros/latex/contrib/tdclock/Changelog
2014/02/24 | 421 | macros/latex/contrib/tdclock/README
2014/02/24 | 87447 | macros/latex/contrib/tdclock/tdclock-beamer-example.pdf
@@ -231127,14 +231128,14 @@
2021/05/20 | 35149 | macros/unicodetex/latex/aalok/COPYING
2021/05/21 | 1999 | macros/unicodetex/latex/aalok/README.txt
2021/05/21 | 185248 | macros/unicodetex/latex/aalok.zip
-2021/03/15 | 7598 | macros/unicodetex/latex/beaulivre/beaulivre.cls
-2021/03/16 | 166042 | macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf
-2021/03/16 | 8233 | macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex
-2021/03/15 | 114887 | macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf
-2021/03/15 | 8961 | macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex
+2021/05/23 | 7746 | macros/unicodetex/latex/beaulivre/beaulivre.cls
+2021/05/23 | 300321 | macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf
+2021/05/23 | 20521 | macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex
+2021/05/23 | 185959 | macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf
+2021/05/23 | 21729 | macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex
2021/03/10 | 19106 | macros/unicodetex/latex/beaulivre/LICENSE
-2021/03/15 | 439 | macros/unicodetex/latex/beaulivre/README.md
-2021/03/16 | 291870 | macros/unicodetex/latex/beaulivre.zip
+2021/05/21 | 497 | macros/unicodetex/latex/beaulivre/README.md
+2021/05/23 | 497917 | macros/unicodetex/latex/beaulivre.zip
2020/08/13 | 14064 | macros/unicodetex/latex/chhaya/chhaya.dtx
2020/08/13 | 2698 | macros/unicodetex/latex/chhaya/chhaya.ins
2020/08/13 | 46743 | macros/unicodetex/latex/chhaya/chhaya.pdf
@@ -231142,14 +231143,14 @@
2020/08/13 | 237 | macros/unicodetex/latex/chhaya/ref.bib
2020/08/13 | 2502 | macros/unicodetex/latex/chhaya/sankshep.tex
2020/08/13 | 52192 | macros/unicodetex/latex/chhaya.zip
-2021/03/15 | 7715 | macros/unicodetex/latex/einfart/einfart.cls
-2021/03/15 | 151770 | macros/unicodetex/latex/einfart/einfart-doc-cn.pdf
-2021/03/15 | 8319 | macros/unicodetex/latex/einfart/einfart-doc-cn.tex
-2021/03/15 | 105718 | macros/unicodetex/latex/einfart/einfart-doc-en.pdf
-2021/03/15 | 9058 | macros/unicodetex/latex/einfart/einfart-doc-en.tex
+2021/05/22 | 7983 | macros/unicodetex/latex/einfart/einfart.cls
+2021/05/20 | 236172 | macros/unicodetex/latex/einfart/einfart-doc-cn.pdf
+2021/05/20 | 19557 | macros/unicodetex/latex/einfart/einfart-doc-cn.tex
+2021/05/22 | 145877 | macros/unicodetex/latex/einfart/einfart-doc-en.pdf
+2021/05/22 | 20637 | macros/unicodetex/latex/einfart/einfart-doc-en.tex
2021/03/10 | 19106 | macros/unicodetex/latex/einfart/LICENSE
-2021/03/14 | 459 | macros/unicodetex/latex/einfart/README.md
-2021/03/15 | 269044 | macros/unicodetex/latex/einfart.zip
+2021/05/21 | 517 | macros/unicodetex/latex/einfart/README.md
+2021/05/23 | 397645 | macros/unicodetex/latex/einfart.zip
2021/05/03 | 445344 | macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf
2021/05/03 | 16264 | macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
2021/01/28 | 27714 | macros/unicodetex/latex/fontsetup/doc/fspsample-cmr.pdf
@@ -231240,14 +231241,14 @@
2020/02/21 | 19106 | macros/unicodetex/latex/fontspec/LICENSE
2020/02/21 | 2846 | macros/unicodetex/latex/fontspec/README.md
2020/02/21 | 1309620 | macros/unicodetex/latex/fontspec.zip
-2021/03/15 | 7594 | macros/unicodetex/latex/lebhart/lebhart.cls
-2021/03/15 | 161740 | macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf
-2021/03/15 | 8241 | macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex
-2021/03/15 | 114964 | macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf
-2021/03/15 | 8971 | macros/unicodetex/latex/lebhart/lebhart-doc-en.tex
+2021/05/23 | 7742 | macros/unicodetex/latex/lebhart/lebhart.cls
+2021/05/23 | 280208 | macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf
+2021/05/23 | 19265 | macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex
+2021/05/23 | 168948 | macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf
+2021/05/23 | 20196 | macros/unicodetex/latex/lebhart/lebhart-doc-en.tex
2021/03/10 | 19106 | macros/unicodetex/latex/lebhart/LICENSE
-2021/03/15 | 441 | macros/unicodetex/latex/lebhart/README.md
-2021/03/16 | 289157 | macros/unicodetex/latex/lebhart.zip
+2021/05/21 | 499 | macros/unicodetex/latex/lebhart/README.md
+2021/05/23 | 462117 | macros/unicodetex/latex/lebhart.zip
2020/09/29 | 6586 | macros/unicodetex/latex/lilyglyphs/CHANGES.md
2020/09/29 | 38525 | macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs-example-400.png
2020/09/29 | 78141 | macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs-example-600.png
@@ -231484,13 +231485,13 @@
2016/02/13 | 106569 | macros/unicodetex/latex/realscripts/realscripts.pdf
2016/02/13 | 108915 | macros/unicodetex/latex/realscripts.zip
2021/03/10 | 19106 | macros/unicodetex/latex/simplivre/LICENSE
-2021/03/14 | 456 | macros/unicodetex/latex/simplivre/README.md
-2021/03/15 | 7719 | macros/unicodetex/latex/simplivre/simplivre.cls
-2021/03/15 | 158697 | macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf
-2021/03/15 | 8318 | macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex
-2021/03/15 | 108946 | macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf
-2021/03/15 | 9042 | macros/unicodetex/latex/simplivre/simplivre-doc-en.tex
-2021/03/15 | 276305 | macros/unicodetex/latex/simplivre.zip
+2021/05/21 | 514 | macros/unicodetex/latex/simplivre/README.md
+2021/05/22 | 7987 | macros/unicodetex/latex/simplivre/simplivre.cls
+2021/05/22 | 283518 | macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf
+2021/05/22 | 20838 | macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex
+2021/05/22 | 191358 | macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf
+2021/05/22 | 22005 | macros/unicodetex/latex/simplivre/simplivre-doc-en.tex
+2021/05/23 | 484991 | macros/unicodetex/latex/simplivre.zip
2021/02/09 | 13142 | macros/unicodetex/latex/texnegar/doc-ligature-texnegar.pdf
2021/02/09 | 10117 | macros/unicodetex/latex/texnegar/doc-ligature-xep.pdf
2021/02/09 | 63437 | macros/unicodetex/latex/texnegar/doc-samples-glyph.pdf
@@ -266284,7 +266285,7 @@
2020/04/22 | 5992 | systems/texlive/tlnet/archive/bearwear.source.r54826.tar.xz
2021/03/19 | 275784 | systems/texlive/tlnet/archive/beaulivre.doc.r58503.tar.xz
2021/03/19 | 3024 | systems/texlive/tlnet/archive/beaulivre.r58503.tar.xz
-2021/05/15 | 878372 | systems/texlive/tlnet/archive/beebe.r59190.tar.xz
+2021/05/23 | 880688 | systems/texlive/tlnet/archive/beebe.r59302.tar.xz
2019/02/28 | 709916 | systems/texlive/tlnet/archive/begingreek.doc.r36294.tar.xz
2019/02/28 | 1664 | systems/texlive/tlnet/archive/begingreek.r36294.tar.xz
2019/02/28 | 7448 | systems/texlive/tlnet/archive/begingreek.source.r36294.tar.xz
@@ -266675,6 +266676,8 @@
2021/02/27 | 378432 | systems/texlive/tlnet/archive/blox.doc.r57949.tar.xz
2021/02/27 | 2328 | systems/texlive/tlnet/archive/blox.r57949.tar.xz
2021/02/27 | 13840 | systems/texlive/tlnet/archive/blox.source.r57949.tar.xz
+2021/05/23 | 227952 | systems/texlive/tlnet/archive/bmstu-iu8.doc.r59310.tar.xz
+2021/05/23 | 12584 | systems/texlive/tlnet/archive/bmstu-iu8.r59310.tar.xz
2021/05/18 | 133720 | systems/texlive/tlnet/archive/bnumexpr.doc.r59244.tar.xz
2021/05/18 | 4216 | systems/texlive/tlnet/archive/bnumexpr.r59244.tar.xz
2021/05/18 | 23164 | systems/texlive/tlnet/archive/bnumexpr.source.r59244.tar.xz
@@ -267478,7 +267481,7 @@
2021/05/08 | 1456 | systems/texlive/tlnet/archive/collection-pictures.r59115.tar.xz
2021/04/15 | 940 | systems/texlive/tlnet/archive/collection-plaingeneric.r58874.tar.xz
2020/03/22 | 808 | systems/texlive/tlnet/archive/collection-pstricks.r54455.tar.xz
-2021/04/28 | 1548 | systems/texlive/tlnet/archive/collection-publishers.r59002.tar.xz
+2021/05/23 | 1552 | systems/texlive/tlnet/archive/collection-publishers.r59310.tar.xz
2020/03/04 | 340 | systems/texlive/tlnet/archive/collection-texworks.r54074.tar.xz
2020/03/04 | 388 | systems/texlive/tlnet/archive/collection-wintools.r54074.tar.xz
2021/03/20 | 656 | systems/texlive/tlnet/archive/collection-xetex.r58543.tar.xz
@@ -268796,9 +268799,9 @@
2021/01/25 | 1828 | systems/texlive/tlnet/archive/ean13isbn.r57514.tar.xz
2019/02/28 | 948 | systems/texlive/tlnet/archive/ean.doc.r20851.tar.xz
2019/02/28 | 3148 | systems/texlive/tlnet/archive/ean.r20851.tar.xz
-2021/05/20 | 311580 | systems/texlive/tlnet/archive/easybook.doc.r59278.tar.xz
-2021/05/20 | 13712 | systems/texlive/tlnet/archive/easybook.r59278.tar.xz
-2021/05/20 | 30100 | systems/texlive/tlnet/archive/easybook.source.r59278.tar.xz
+2021/05/23 | 311684 | systems/texlive/tlnet/archive/easybook.doc.r59306.tar.xz
+2021/05/23 | 13756 | systems/texlive/tlnet/archive/easybook.r59306.tar.xz
+2021/05/23 | 30100 | systems/texlive/tlnet/archive/easybook.source.r59306.tar.xz
2019/02/28 | 4540 | systems/texlive/tlnet/archive/easy.doc.r19440.tar.xz
2020/09/08 | 175976 | systems/texlive/tlnet/archive/easyfig.doc.r56291.tar.xz
2020/09/08 | 1936 | systems/texlive/tlnet/archive/easyfig.r56291.tar.xz
@@ -271142,8 +271145,8 @@
2021/02/24 | 40260 | systems/texlive/tlnet/archive/kpathsea.x86_64-linux.r57878.tar.xz
2021/02/27 | 44648 | systems/texlive/tlnet/archive/kpathsea.x86_64-solaris.r57938.tar.xz
2020/06/24 | 1759292 | systems/texlive/tlnet/archive/kpfonts.doc.r55643.tar.xz
-2021/03/17 | 2057708 | systems/texlive/tlnet/archive/kpfonts-otf.doc.r58435.tar.xz
-2021/03/17 | 1084240 | systems/texlive/tlnet/archive/kpfonts-otf.r58435.tar.xz
+2021/05/23 | 2071840 | systems/texlive/tlnet/archive/kpfonts-otf.doc.r59304.tar.xz
+2021/05/23 | 1080356 | systems/texlive/tlnet/archive/kpfonts-otf.r59304.tar.xz
2020/06/24 | 2205528 | systems/texlive/tlnet/archive/kpfonts.r55643.tar.xz
2020/06/24 | 223556 | systems/texlive/tlnet/archive/kpfonts.source.r55643.tar.xz
2019/02/28 | 3968 | systems/texlive/tlnet/archive/ksfh_nat.r24825.tar.xz
@@ -271992,13 +271995,13 @@
2019/02/28 | 340 | systems/texlive/tlnet/archive/ltximg.amd64-freebsd.r32346.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/ltximg.amd64-netbsd.r32346.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/ltximg.armhf-linux.r32346.tar.xz
-2021/01/26 | 242252 | systems/texlive/tlnet/archive/ltximg.doc.r57521.tar.xz
+2021/05/23 | 245504 | systems/texlive/tlnet/archive/ltximg.doc.r59309.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/ltximg.i386-cygwin.r32346.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/ltximg.i386-freebsd.r32346.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/ltximg.i386-linux.r32346.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/ltximg.i386-netbsd.r32346.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/ltximg.i386-solaris.r32346.tar.xz
-2021/01/26 | 26344 | systems/texlive/tlnet/archive/ltximg.r57521.tar.xz
+2021/05/23 | 26344 | systems/texlive/tlnet/archive/ltximg.r59309.tar.xz
2021/02/25 | 340 | systems/texlive/tlnet/archive/ltximg.universal-darwin.r57908.tar.xz
2019/02/28 | 680 | systems/texlive/tlnet/archive/ltximg.win32.r32346.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/ltximg.x86_64-cygwin.r33557.tar.xz
@@ -272717,9 +272720,9 @@
2019/02/28 | 3124 | systems/texlive/tlnet/archive/milog.r41610.tar.xz
2020/03/17 | 1565768 | systems/texlive/tlnet/archive/milsymb.doc.r54361.tar.xz
2020/03/17 | 22172 | systems/texlive/tlnet/archive/milsymb.r54361.tar.xz
-2021/05/09 | 186516 | systems/texlive/tlnet/archive/mindflow.doc.r59137.tar.xz
-2021/05/09 | 1880 | systems/texlive/tlnet/archive/mindflow.r59137.tar.xz
-2021/05/09 | 3940 | systems/texlive/tlnet/archive/mindflow.source.r59137.tar.xz
+2021/05/23 | 193672 | systems/texlive/tlnet/archive/mindflow.doc.r59307.tar.xz
+2021/05/23 | 1872 | systems/texlive/tlnet/archive/mindflow.r59307.tar.xz
+2021/05/23 | 4484 | systems/texlive/tlnet/archive/mindflow.source.r59307.tar.xz
2019/02/28 | 281540 | systems/texlive/tlnet/archive/minibox.doc.r30914.tar.xz
2019/02/28 | 1052 | systems/texlive/tlnet/archive/minibox.r30914.tar.xz
2019/02/28 | 3056 | systems/texlive/tlnet/archive/minibox.source.r30914.tar.xz
@@ -273209,8 +273212,8 @@
2021/03/08 | 61332 | systems/texlive/tlnet/archive/newpax.doc.r58212.tar.xz
2021/03/08 | 8444 | systems/texlive/tlnet/archive/newpax.r58212.tar.xz
2021/03/08 | 8676 | systems/texlive/tlnet/archive/newpax.source.r58212.tar.xz
-2021/04/12 | 452920 | systems/texlive/tlnet/archive/newpx.doc.r58838.tar.xz
-2021/04/12 | 1637012 | systems/texlive/tlnet/archive/newpx.r58838.tar.xz
+2021/05/23 | 455048 | systems/texlive/tlnet/archive/newpx.doc.r59303.tar.xz
+2021/05/23 | 2068388 | systems/texlive/tlnet/archive/newpx.r59303.tar.xz
2019/02/28 | 137580 | systems/texlive/tlnet/archive/newsletr.doc.r15878.tar.xz
2019/02/28 | 16788 | systems/texlive/tlnet/archive/newsletr.r15878.tar.xz
2019/02/28 | 196212 | systems/texlive/tlnet/archive/newspaper.doc.r15878.tar.xz
@@ -275533,9 +275536,9 @@
2019/02/28 | 250180 | systems/texlive/tlnet/archive/SIunits.doc.r15878.tar.xz
2019/02/28 | 6064 | systems/texlive/tlnet/archive/SIunits.r15878.tar.xz
2019/02/28 | 34544 | systems/texlive/tlnet/archive/SIunits.source.r15878.tar.xz
-2021/05/22 | 1958700 | systems/texlive/tlnet/archive/siunitx.doc.r59292.tar.xz
-2021/05/22 | 60464 | systems/texlive/tlnet/archive/siunitx.r59292.tar.xz
-2021/05/22 | 102144 | systems/texlive/tlnet/archive/siunitx.source.r59292.tar.xz
+2021/05/23 | 1959620 | systems/texlive/tlnet/archive/siunitx.doc.r59308.tar.xz
+2021/05/23 | 60480 | systems/texlive/tlnet/archive/siunitx.r59308.tar.xz
+2021/05/23 | 102228 | systems/texlive/tlnet/archive/siunitx.source.r59308.tar.xz
2019/02/28 | 200108 | systems/texlive/tlnet/archive/skak.doc.r46259.tar.xz
2019/02/28 | 316212 | systems/texlive/tlnet/archive/skaknew.doc.r20031.tar.xz
2019/02/28 | 160064 | systems/texlive/tlnet/archive/skaknew.r20031.tar.xz
@@ -276394,7 +276397,7 @@
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r55172.tar.xz
-2021/05/22 | 397364 | systems/texlive/tlnet/archive/texlive-scripts.doc.r59290.tar.xz
+2021/05/23 | 397412 | systems/texlive/tlnet/archive/texlive-scripts.doc.r59302.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
@@ -276418,7 +276421,7 @@
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r55172.tar.xz
-2021/05/22 | 107996 | systems/texlive/tlnet/archive/texlive-scripts.r59290.tar.xz
+2021/05/23 | 107976 | systems/texlive/tlnet/archive/texlive-scripts.r59302.tar.xz
2021/02/25 | 572 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r57908.tar.xz
2021/04/12 | 36308 | systems/texlive/tlnet/archive/texlive-scripts.win32.r58829.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
@@ -276890,8 +276893,8 @@
2019/02/28 | 340 | systems/texlive/tlnet/archive/tlcockpit.x86_64-linux.r46798.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/tlcockpit.x86_64-solaris.r46798.tar.xz
2021/05/11 | 7999236 | systems/texlive/tlnet/archive/tlgs.win32.r59157.tar.xz
-2021/05/09 | 151392 | systems/texlive/tlnet/archive/tlmgrbasics.doc.r59134.tar.xz
-2021/05/09 | 424 | systems/texlive/tlnet/archive/tlmgrbasics.r59134.tar.xz
+2021/05/23 | 164280 | systems/texlive/tlnet/archive/tlmgrbasics.doc.r59305.tar.xz
+2021/05/23 | 424 | systems/texlive/tlnet/archive/tlmgrbasics.r59305.tar.xz
2021/05/07 | 444724 | systems/texlive/tlnet/archive/tlmgr-intro-zh-cn.doc.r59100.tar.xz
2021/05/07 | 492 | systems/texlive/tlnet/archive/tlmgr-intro-zh-cn.r59100.tar.xz
2021/03/04 | 7177228 | systems/texlive/tlnet/archive/tlperl.win32.r58075.tar.xz
@@ -278120,16 +278123,16 @@
2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
2021/05/02 | 105152 | systems/texlive/tlnet/install-tl
-2021/05/22 | 6812477 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/05/22 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/05/22 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/05/23 | 6812424 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/05/23 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/05/23 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat
-2021/05/22 | 20808632 | systems/texlive/tlnet/install-tl-windows.exe
-2021/05/22 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/05/22 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/05/22 | 25584700 | systems/texlive/tlnet/install-tl.zip
-2021/05/22 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/05/22 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/05/23 | 20808435 | systems/texlive/tlnet/install-tl-windows.exe
+2021/05/23 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/05/23 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/05/23 | 25584669 | systems/texlive/tlnet/install-tl.zip
+2021/05/23 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/05/23 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2021/04/01 | 1229 | systems/texlive/tlnet/README.md
2021/04/01 | 0 | systems/texlive/tlnet/TEXLIVE_2021
2021/03/15 | 6571 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -278139,7 +278142,7 @@
2021/03/15 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2021/05/07 | 49598 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2021/05/21 | 6901 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2021/05/22 | 6743 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2020/04/15 | 223687 | 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
@@ -278181,12 +278184,12 @@
2021/05/16 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/05/16 | 5402 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2021/05/16 | 27555 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2021/05/22 | 17243428 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2021/05/22 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/05/23 | 17249196 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/05/23 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2021/05/16 | 86511 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2021/05/22 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/05/22 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/05/22 | 2307008 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/05/23 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/05/23 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/05/23 | 2307588 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/05/16 | 58801 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2021/05/16 | 42084 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2021/05/16 | 16103 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -282875,7 +282878,7 @@
2020/10/03 | 318630 | systems/win32/miktex/tm/packages/filehook.tar.lzma
2012/12/04 | 924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
2011/09/21 | 281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2021/05/22 | 576615 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/05/23 | 576615 | systems/win32/miktex/tm/packages/files.csv.lzma
2001/05/14 | 5617 | systems/win32/miktex/tm/packages/finbib.tar.lzma
2015/10/20 | 44379 | systems/win32/miktex/tm/packages/findhyph.tar.lzma
2011/10/21 | 89323 | systems/win32/miktex/tm/packages/fink.tar.lzma
@@ -284076,9 +284079,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2021/03/15 | 39247 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2021/03/15 | 43386 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/05/22 | 209667 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/05/22 | 1272534 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/05/22 | 1188645 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/05/23 | 209601 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/05/23 | 1272221 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/05/23 | 1188048 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2021/03/15 | 13447 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2021/03/15 | 14320 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma
2016/07/15 | 35914 | systems/win32/miktex/tm/packages/mil3.tar.lzma
@@ -284239,190 +284242,190 @@
2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
2021/03/17 | 232249 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2021/05/22 | 576226 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/05/22 | 50847 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/05/22 | 56457 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/05/22 | 968700 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/05/22 | 1078878 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2021/05/22 | 29050 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/05/22 | 31343 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/05/22 | 29867 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/05/22 | 34635 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/05/22 | 49972 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/05/22 | 57598 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/05/22 | 84774 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/05/22 | 94738 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/05/22 | 67679 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/05/22 | 75419 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/05/22 | 27182 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2021/05/22 | 30886 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/05/22 | 330235 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/05/22 | 392596 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/05/22 | 32744 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/05/22 | 36679 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2021/05/22 | 51432 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/05/22 | 56717 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/05/22 | 4707 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
-2021/05/22 | 239479 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/05/22 | 261961 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/05/22 | 179379 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/05/22 | 195664 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/05/22 | 52476 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/05/22 | 59145 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2021/05/22 | 21132 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/05/22 | 23292 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/05/22 | 461400 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/05/22 | 45649 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/05/22 | 51160 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/05/22 | 282108 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/05/22 | 321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2021/05/22 | 41102 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2021/05/22 | 45278 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2021/05/22 | 116930 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/05/22 | 131490 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/05/22 | 1281106 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/05/22 | 1425981 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/05/22 | 87638 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2021/05/22 | 99605 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/05/22 | 43059 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/05/22 | 47879 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/05/22 | 25155 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/05/22 | 28009 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/05/22 | 55823 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/05/22 | 62801 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/05/22 | 135005 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/05/22 | 152762 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/05/22 | 73181 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/05/22 | 77859 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/05/22 | 71570 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/05/22 | 80661 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/05/22 | 258666 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2021/05/22 | 295554 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2021/05/22 | 22040 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2021/05/22 | 25001 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/05/22 | 97491 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/05/22 | 112253 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/05/22 | 63836 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/05/22 | 72861 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/05/22 | 96148 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2021/05/22 | 115470 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/05/22 | 38069 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/05/22 | 42627 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/05/22 | 484055 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/05/22 | 567627 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/05/22 | 147139 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/05/22 | 159969 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/05/22 | 94803 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/05/22 | 109273 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/05/22 | 16328 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2021/05/22 | 17958 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/05/22 | 28121 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/05/22 | 30038 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/05/22 | 625284 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/05/22 | 680049 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/05/22 | 532039 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/05/22 | 594869 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/05/22 | 475936 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/05/22 | 511634 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/05/22 | 94266 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2021/05/22 | 103323 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/05/22 | 1725546 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/05/22 | 2009493 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/05/22 | 67649 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/05/22 | 74164 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2021/05/22 | 27362 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/05/22 | 31594 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/05/22 | 7747 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/05/22 | 8774 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/05/22 | 195567 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/05/22 | 214105 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/05/22 | 250214 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/05/22 | 283978 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/05/22 | 97135 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/05/22 | 101764 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/05/22 | 60553 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/05/22 | 67931 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/05/22 | 124972 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2021/05/22 | 136429 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/05/22 | 147150 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/05/22 | 163656 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/05/22 | 199700 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/05/22 | 180048 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/05/22 | 67452 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/05/22 | 77487 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/05/22 | 31192 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/05/22 | 35064 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/05/22 | 38066 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/05/22 | 42574 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/05/22 | 42925 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/05/22 | 47009 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/05/22 | 45937 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/05/22 | 52454 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/05/22 | 193716 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2021/05/22 | 211056 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/05/22 | 35462 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2021/05/22 | 39689 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/05/22 | 748364 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/05/22 | 816072 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/05/22 | 198131 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/05/22 | 202558 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/05/22 | 208182 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/05/22 | 243479 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/05/22 | 78747 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/05/22 | 87704 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/05/22 | 1171731 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/05/22 | 1307725 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/05/22 | 20121 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/05/22 | 23881 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/05/22 | 31544 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/05/22 | 37242 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/05/22 | 64017 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/05/22 | 72151 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/05/22 | 43678 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/05/22 | 51980 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/05/22 | 1295415 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/05/22 | 1424814 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/05/22 | 42388 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2021/05/22 | 51797 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/05/22 | 56223 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/05/22 | 59832 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/05/22 | 25341 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/05/22 | 27275 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/05/22 | 16115 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/05/22 | 18097 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/05/22 | 63675 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/05/22 | 70110 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2021/05/22 | 153890 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/05/22 | 167907 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2021/05/22 | 56910 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/05/22 | 65322 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/05/22 | 98518 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/05/22 | 104624 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/05/22 | 2499401 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/05/22 | 2616929 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/05/22 | 55219 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/05/22 | 62226 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/05/22 | 33442 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/05/22 | 37293 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/05/22 | 27197 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/05/22 | 33153 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/05/22 | 65730 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2021/05/22 | 70326 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/05/22 | 311192 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/05/22 | 345367 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/05/22 | 55564 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/05/22 | 57066 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/05/22 | 583627 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2021/05/22 | 618766 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/05/22 | 39565 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/05/22 | 43392 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/05/22 | 209550 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/05/22 | 1271317 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/05/22 | 1187112 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/05/22 | 13469 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/05/22 | 14355 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/05/23 | 576226 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/05/23 | 50846 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/05/23 | 56456 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/05/23 | 968694 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/05/23 | 1078877 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/05/23 | 29055 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/05/23 | 31343 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/05/23 | 29871 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/05/23 | 34633 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/05/23 | 49971 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/05/23 | 57597 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/05/23 | 84774 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/05/23 | 94739 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/05/23 | 67681 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/05/23 | 75418 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/05/23 | 27182 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/05/23 | 30886 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/05/23 | 330233 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/05/23 | 392596 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/05/23 | 32744 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/05/23 | 36679 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/05/23 | 51432 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/05/23 | 56718 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/05/23 | 4707 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
+2021/05/23 | 239477 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/05/23 | 261963 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/05/23 | 179379 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/05/23 | 195663 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/05/23 | 52475 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/05/23 | 59145 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/05/23 | 21128 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/05/23 | 23291 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/05/23 | 461397 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/05/23 | 45648 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/05/23 | 51160 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/05/23 | 282106 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/05/23 | 321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/05/23 | 41104 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/05/23 | 45277 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/05/23 | 116932 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/05/23 | 131489 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/05/23 | 1281104 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/05/23 | 1425981 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/05/23 | 87637 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/05/23 | 99605 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/05/23 | 43057 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/05/23 | 47877 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/05/23 | 25154 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/05/23 | 28009 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/05/23 | 55821 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/05/23 | 62801 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/05/23 | 135005 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/05/23 | 152762 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/05/23 | 73181 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/05/23 | 77858 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/05/23 | 71567 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/05/23 | 80661 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/05/23 | 258665 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/05/23 | 295554 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/05/23 | 22040 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/05/23 | 25001 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/05/23 | 97491 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/05/23 | 112252 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/05/23 | 63836 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/05/23 | 72861 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/05/23 | 96145 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/05/23 | 115470 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/05/23 | 38070 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/05/23 | 42626 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/05/23 | 484058 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/05/23 | 567627 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/05/23 | 147140 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/05/23 | 159968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/05/23 | 94802 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/05/23 | 109274 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/05/23 | 16328 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/05/23 | 17957 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/05/23 | 28120 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/05/23 | 30037 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/05/23 | 625283 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/05/23 | 680052 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/05/23 | 532039 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/05/23 | 594871 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/05/23 | 475935 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/05/23 | 511633 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/05/23 | 94267 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/05/23 | 103322 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/05/23 | 1725548 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/05/23 | 2009492 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/05/23 | 67650 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/05/23 | 74164 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/05/23 | 27361 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/05/23 | 31593 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/05/23 | 7747 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/05/23 | 8773 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/05/23 | 195567 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/05/23 | 214105 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/05/23 | 250213 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/05/23 | 283978 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/05/23 | 97134 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/05/23 | 101762 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/05/23 | 60550 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/05/23 | 67928 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/05/23 | 124972 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/05/23 | 136428 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/05/23 | 147150 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/05/23 | 163655 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/05/23 | 199701 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/05/23 | 180046 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/05/23 | 67452 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/05/23 | 77487 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/05/23 | 31192 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/05/23 | 35064 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/05/23 | 38066 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/05/23 | 42573 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/05/23 | 42924 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/05/23 | 47008 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/05/23 | 45937 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/05/23 | 52454 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/05/23 | 193716 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/05/23 | 211053 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/05/23 | 35462 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/05/23 | 39690 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/05/23 | 748362 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/05/23 | 816072 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/05/23 | 198129 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/05/23 | 202555 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/05/23 | 208181 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/05/23 | 243480 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/05/23 | 78746 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/05/23 | 87704 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/05/23 | 1171731 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/05/23 | 1307725 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/05/23 | 20121 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/05/23 | 23883 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/05/23 | 31544 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/05/23 | 37244 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/05/23 | 64015 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/05/23 | 72150 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/05/23 | 43678 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/05/23 | 51979 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/05/23 | 1295411 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/05/23 | 1424811 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/05/23 | 42388 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/05/23 | 51797 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/05/23 | 56222 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/05/23 | 59831 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/05/23 | 25341 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/05/23 | 27274 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/05/23 | 16110 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/05/23 | 18096 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/05/23 | 63675 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/05/23 | 70110 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/05/23 | 153890 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/05/23 | 167906 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/05/23 | 56910 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/05/23 | 65321 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/05/23 | 98519 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/05/23 | 104625 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/05/23 | 2499404 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/05/23 | 2616931 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/05/23 | 55218 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/05/23 | 62227 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/05/23 | 33441 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/05/23 | 37293 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/05/23 | 27198 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/05/23 | 33151 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/05/23 | 65732 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/05/23 | 70325 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/05/23 | 311191 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/05/23 | 345367 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/05/23 | 55563 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/05/23 | 57066 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/05/23 | 583630 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/05/23 | 618766 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/05/23 | 39564 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/05/23 | 43392 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/05/23 | 209580 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/05/23 | 1272577 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/05/23 | 1188097 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/05/23 | 13470 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/05/23 | 14354 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2019/03/12 | 1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma
-2021/05/22 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/05/23 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
2018/07/06 | 145915 | systems/win32/miktex/tm/packages/nexus-otf.tar.lzma
2017/03/30 | 191149 | systems/win32/miktex/tm/packages/nfssext-cfr.tar.lzma
2012/12/20 | 612251 | systems/win32/miktex/tm/packages/nicefilelist.tar.lzma
@@ -284758,7 +284761,7 @@
2020/10/20 | 342254 | systems/win32/miktex/tm/packages/preview.tar.lzma
2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
2021/04/23 | 274028 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2021/05/22 | 839 | systems/win32/miktex/tm/packages/pr.ini
+2021/05/23 | 839 | systems/win32/miktex/tm/packages/pr.ini
2010/09/27 | 248469 | systems/win32/miktex/tm/packages/printlen.tar.lzma
2008/06/17 | 77313 | systems/win32/miktex/tm/packages/proba.tar.lzma
2017/07/12 | 988486 | systems/win32/miktex/tm/packages/probsoln.tar.lzma
@@ -286169,7 +286172,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2021/05/23 | 186 | timestamp
+2021/05/24 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2017/06/30 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index b5075baa2d..3e697a7a6c 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index 32d8eac420..175dbc86b8 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,83 +1,343 @@
-2021/05/22 | 99605 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/05/23 | 99605 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/05/23 | 98872 | macros/latex/contrib/minimalist.zip
+2021/05/23 | 98519 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/05/23 | 97491 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/05/23 | 97134 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/05/23 | 968694 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/05/23 | 96145 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/05/23 | 94877 | graphics/mcf2graph/mcf_data_base.mcf
+2021/05/23 | 948444 | graphics/mcf2graph.zip
+2021/05/23 | 94802 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/05/23 | 94739 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/05/23 | 94267 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/05/23 | 880688 | systems/texlive/tlnet/archive/beebe.r59302.tar.xz
+2021/05/23 | 8773 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/05/23 | 87704 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/05/23 | 87637 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/05/23 | 84774 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/05/23 | 839 | systems/win32/miktex/tm/packages/pr.ini
+2021/05/23 | 816072 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/05/23 | 81144 | macros/latex/contrib/colorist/colorist-doc.pdf
+2021/05/23 | 80661 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/05/23 | 78746 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/05/23 | 77858 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/05/23 | 77487 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/05/23 | 7747 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/05/23 | 7746 | macros/unicodetex/latex/beaulivre/beaulivre.cls
+2021/05/23 | 7742 | macros/unicodetex/latex/lebhart/lebhart.cls
+2021/05/23 | 75418 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/05/23 | 748362 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/05/23 | 74164 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/05/23 | 7352 | language/japanese/pxbase/pxjsfenc.def
+2021/05/23 | 73181 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/05/23 | 72861 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/05/23 | 72150 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/05/23 | 71567 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/05/23 | 70325 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/05/23 | 70110 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/05/23 | 6812424 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/05/23 | 680052 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/05/23 | 67928 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/05/23 | 67907 | macros/latex/contrib/ot-tableau.zip
+2021/05/23 | 67681 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/05/23 | 67650 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/05/23 | 67452 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/05/23 | 65732 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/05/23 | 65321 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/05/23 | 64015 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/05/23 | 63836 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/05/23 | 63675 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/05/23 | 62801 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/05/23 | 625283 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/05/23 | 62227 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/05/23 | 6217425 | macros/latex/contrib/tcolorbox.zip
+2021/05/23 | 618766 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/05/23 | 613 | macros/latex/contrib/ot-tableau/README
+2021/05/23 | 60550 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/05/23 | 60480 | systems/texlive/tlnet/archive/siunitx.r59308.tar.xz
+2021/05/23 | 59831 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/05/23 | 594871 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/05/23 | 59482 | graphics/mcf2graph/mcf_manual.tex
+2021/05/23 | 59145 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/05/23 | 583630 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/05/23 | 576615 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/05/23 | 576226 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/05/23 | 57597 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/05/23 | 57066 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/05/23 | 56910 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/05/23 | 567627 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/05/23 | 56718 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/05/23 | 56456 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/05/23 | 56222 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/05/23 | 55821 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/05/23 | 55563 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/05/23 | 55218 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/05/23 | 55104 | macros/latex/contrib/colorist/colorist.sty
+2021/05/23 | 5430 | macros/latex/contrib/ot-tableau/ot-tableau.sty
+2021/05/23 | 532039 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/05/23 | 52475 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/05/23 | 52454 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/05/23 | 51979 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/05/23 | 51797 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/05/23 | 51432 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/05/23 | 511633 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/05/23 | 51160 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/05/23 | 50846 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/05/23 | 49971 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/05/23 | 497917 | macros/unicodetex/latex/beaulivre.zip
+2021/05/23 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/05/23 | 484991 | macros/unicodetex/latex/simplivre.zip
+2021/05/23 | 484058 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/05/23 | 47877 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/05/23 | 475935 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/05/23 | 4707 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
+2021/05/23 | 47008 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/05/23 | 462117 | macros/unicodetex/latex/lebhart.zip
+2021/05/23 | 461397 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/05/23 | 45937 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/05/23 | 45648 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/05/23 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/05/23 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/05/23 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/05/23 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/05/23 | 455048 | systems/texlive/tlnet/archive/newpx.doc.r59303.tar.xz
+2021/05/23 | 45277 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/05/23 | 4485 | graphics/mcf2graph/README
+2021/05/23 | 4484 | systems/texlive/tlnet/archive/mindflow.source.r59307.tar.xz
+2021/05/23 | 44332 | graphics/mcf2graph/mcf_man_soc.mf
+2021/05/23 | 43678 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/05/23 | 434 | language/japanese/pxbase/pxbase.sty
+2021/05/23 | 43392 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/05/23 | 43057 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/05/23 | 42924 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/05/23 | 42626 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/05/23 | 42573 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/05/23 | 424 | systems/texlive/tlnet/archive/tlmgrbasics.r59305.tar.xz
+2021/05/23 | 42388 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/05/23 | 41104 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/05/23 | 397645 | macros/unicodetex/latex/einfart.zip
+2021/05/23 | 397412 | systems/texlive/tlnet/archive/texlive-scripts.doc.r59302.tar.xz
+2021/05/23 | 39690 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/05/23 | 39564 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/05/23 | 392596 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/05/23 | 38070 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/05/23 | 38066 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/05/23 | 377862 | graphics/mcf2graph/mcf_manual.pdf
+2021/05/23 | 37293 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/05/23 | 37244 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/05/23 | 36679 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/05/23 | 35462 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/05/23 | 35064 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/05/23 | 34633 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/05/23 | 345367 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/05/23 | 33441 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/05/23 | 33151 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/05/23 | 330233 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/05/23 | 32744 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/05/23 | 321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/05/23 | 320314 | graphics/mcf2graph/mcf_example.pdf
+2021/05/23 | 31593 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/05/23 | 31544 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/05/23 | 31343 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/05/23 | 3129 | language/japanese/pxbase/upkcat.sty
+2021/05/23 | 31192 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/05/23 | 311684 | systems/texlive/tlnet/archive/easybook.doc.r59306.tar.xz
+2021/05/23 | 311191 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/05/23 | 30886 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/05/23 | 30100 | systems/texlive/tlnet/archive/easybook.source.r59306.tar.xz
+2021/05/23 | 30037 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/05/23 | 300321 | macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf
+2021/05/23 | 29871 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/05/23 | 295554 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/05/23 | 2939 | macros/latex/contrib/colorist/colorart.cls
+2021/05/23 | 2936 | macros/latex/contrib/colorist/colorbook.cls
+2021/05/23 | 29055 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/05/23 | 283978 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/05/23 | 282106 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/05/23 | 28120 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/05/23 | 280208 | macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf
+2021/05/23 | 28009 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/05/23 | 27361 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/05/23 | 27274 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/05/23 | 27198 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/05/23 | 27182 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/05/23 | 2695 | graphics/mcf2graph/mcf_exa_soc.mf
+2021/05/23 | 26344 | systems/texlive/tlnet/archive/ltximg.r59309.tar.xz
+2021/05/23 | 261963 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/05/23 | 2616931 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/05/23 | 258665 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/05/23 | 25584669 | systems/texlive/tlnet/install-tl.zip
+2021/05/23 | 25341 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/05/23 | 25154 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/05/23 | 250213 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/05/23 | 25001 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/05/23 | 2499404 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/05/23 | 245504 | systems/texlive/tlnet/archive/ltximg.doc.r59309.tar.xz
+2021/05/23 | 243480 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/05/23 | 239477 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/05/23 | 23883 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/05/23 | 2363 | language/japanese/pxbase/README.md
+2021/05/23 | 23291 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/05/23 | 2318 | graphics/mcf2graph/mcf_example.tex
+2021/05/23 | 2307588 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/05/23 | 227952 | systems/texlive/tlnet/archive/bmstu-iu8.doc.r59310.tar.xz
+2021/05/23 | 22040 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/05/23 | 21729 | macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex
+2021/05/23 | 214105 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/05/23 | 21128 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/05/23 | 211053 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/05/23 | 209601 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/05/23 | 209580 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/05/23 | 208181 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/05/23 | 20808435 | systems/texlive/tlnet/install-tl-windows.exe
+2021/05/23 | 2071840 | systems/texlive/tlnet/archive/kpfonts-otf.doc.r59304.tar.xz
+2021/05/23 | 2068388 | systems/texlive/tlnet/archive/newpx.r59303.tar.xz
+2021/05/23 | 20521 | macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex
+2021/05/23 | 202555 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/05/23 | 20196 | macros/unicodetex/latex/lebhart/lebhart-doc-en.tex
+2021/05/23 | 20121 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/05/23 | 2009492 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/05/23 | 20002 | macros/latex/contrib/colorist/colorist-doc.tex
+2021/05/23 | 199701 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/05/23 | 198129 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/05/23 | 19729 | language/japanese/pxbase/pxbabel.sty
+2021/05/23 | 1959620 | systems/texlive/tlnet/archive/siunitx.doc.r59308.tar.xz
+2021/05/23 | 195663 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/05/23 | 195567 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/05/23 | 193716 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/05/23 | 193672 | systems/texlive/tlnet/archive/mindflow.doc.r59307.tar.xz
+2021/05/23 | 19265 | macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex
+2021/05/23 | 19112 | language/japanese/pxbase/pxbasenc.def
+2021/05/23 | 1872 | systems/texlive/tlnet/archive/mindflow.r59307.tar.xz
+2021/05/23 | 185959 | macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf
+2021/05/23 | 184054 | graphics/mcf2graph/mcf_mplib_exa.pdf
+2021/05/23 | 18096 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/05/23 | 180046 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/05/23 | 17957 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/05/23 | 17955 | language/japanese/pxbase/pxbabel.tex
+2021/05/23 | 179379 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/05/23 | 1725548 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/05/23 | 17249196 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/05/23 | 168948 | macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf
+2021/05/23 | 167906 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/05/23 | 16484 | graphics/mcf2graph/mcf_mplib_exa.tex
+2021/05/23 | 164280 | systems/texlive/tlnet/archive/tlmgrbasics.doc.r59305.tar.xz
+2021/05/23 | 163655 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/05/23 | 16328 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/05/23 | 161218 | language/japanese/pxbase.zip
+2021/05/23 | 16110 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/05/23 | 159968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/05/23 | 1552 | systems/texlive/tlnet/archive/collection-publishers.r59310.tar.xz
+2021/05/23 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/05/23 | 153890 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/05/23 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/05/23 | 152762 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/05/23 | 147150 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/05/23 | 147140 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/05/23 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/05/23 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/05/23 | 14354 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/05/23 | 1425981 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/05/23 | 1424811 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/05/23 | 13756 | systems/texlive/tlnet/archive/easybook.r59306.tar.xz
+2021/05/23 | 136428 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/05/23 | 136058 | language/japanese/pxbase/pxbabel.pdf
+2021/05/23 | 135005 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/05/23 | 13470 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/05/23 | 13399 | graphics/mcf2graph/CHANGELOG
+2021/05/23 | 131489 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/05/23 | 1307725 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/05/23 | 1295411 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/05/23 | 1281104 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/05/23 | 1272577 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/05/23 | 1272221 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/05/23 | 12584 | systems/texlive/tlnet/archive/bmstu-iu8.r59310.tar.xz
+2021/05/23 | 124972 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/05/23 | 1188097 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/05/23 | 1188048 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/05/23 | 1171731 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/05/23 | 116932 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/05/23 | 115470 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/05/23 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/05/23 | 112252 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/05/23 | 109274 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/05/23 | 1091 | language/japanese/pxbase/LICENSE
+2021/05/23 | 1080356 | systems/texlive/tlnet/archive/kpfonts-otf.r59304.tar.xz
+2021/05/23 | 107976 | systems/texlive/tlnet/archive/texlive-scripts.r59302.tar.xz
+2021/05/23 | 1078877 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/05/23 | 105080 | graphics/mcf2graph/mcf2graph.mf
+2021/05/23 | 104625 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/05/23 | 103322 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/05/23 | 102849 | macros/latex/contrib/colorist.zip
+2021/05/23 | 102228 | systems/texlive/tlnet/archive/siunitx.source.r59308.tar.xz
+2021/05/23 | 101762 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/05/23 | 10006 | language/japanese/pxbase/README-ja.md
+2021/05/22 | 9907 | macros/latex/contrib/tcolorbox/tcolorbox.doc.coremacros.tex
2021/05/22 | 989 | support/texlab/src/syntax/bibtex/snapshots/texlab__syntax__bibtex__parser__tests__entry_complete_parens.snap
-2021/05/22 | 98518 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/05/22 | 97491 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/05/22 | 97135 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/05/22 | 968700 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/05/22 | 96148 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
2021/05/22 | 9484 | systems/texlive/tlnet/archive/projlib.source.r59296.tar.xz
-2021/05/22 | 94803 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/05/22 | 94738 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/05/22 | 94266 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
2021/05/22 | 9420 | support/texlab/tests/integration/snapshots/integration__completion__latex__begin_command.snap
2021/05/22 | 9399 | support/texlab/src/features.rs
2021/05/22 | 9384 | systems/texlive/tlnet/archive/projlib.r59296.tar.xz
2021/05/22 | 928 | support/texlab/tests/integration/snapshots/integration__completion__latex__user_environment.snap
2021/05/22 | 923 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__glossary_entry_definition_simple.snap
2021/05/22 | 923 | support/texlab/src/language.rs
+2021/05/22 | 9063 | macros/latex/contrib/tcolorbox/tcbraster.code.tex
+2021/05/22 | 9057 | macros/latex/contrib/tcolorbox/tcbtheorems.code.tex
+2021/05/22 | 9033 | macros/latex/contrib/tcolorbox/tcbexternal.code.tex
2021/05/22 | 901 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__lexer__tests__delimiters.snap
2021/05/22 | 88 | support/texlab/tests/integration/snapshots/integration__hover__empty_labtex_document.snap
2021/05/22 | 88 | support/texlab/tests/integration/snapshots/integration__hover__empty_bibtex_document.snap
+2021/05/22 | 88946 | macros/latex/contrib/tcolorbox/tcolorbox.sty
2021/05/22 | 883 | support/texlab/src/context.rs
2021/05/22 | 87876 | systems/texlive/tlnet/archive/lualibs.doc.r59298.tar.xz
-2021/05/22 | 8774 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/05/22 | 87704 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/05/22 | 87638 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/05/22 | 8722 | macros/latex/contrib/tcolorbox/tcolorbox.doc.intro.tex
+2021/05/22 | 87118 | macros/latex/contrib/tcolorbox/tcbskins.code.tex
2021/05/22 | 869 | support/texlab/src/workspace.rs
2021/05/22 | 8660 | support/texlab/src/label.rs
2021/05/22 | 85 | support/texlab/src/syntax/bibtex/snapshots/texlab__syntax__bibtex__parser__tests__empty.snap
2021/05/22 | 8560 | systems/texlive/tlnet/archive/lualibs.source.r59298.tar.xz
2021/05/22 | 854 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__glossary_entry_reference_options.snap
2021/05/22 | 84894 | support/texlab/texlab.pdf
-2021/05/22 | 84774 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
2021/05/22 | 846 | support/texlab/src/syntax/bibtex/kind.rs
2021/05/22 | 841 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__color_set_definition_simple.snap
2021/05/22 | 8414 | support/texlab/src/citation/name.rs
2021/05/22 | 8409 | macros/latex/contrib/bmstu-iu8/styles/10-IU8-titlepage.sty
-2021/05/22 | 839 | systems/win32/miktex/tm/packages/pr.ini
2021/05/22 | 8397576 | fonts/newtx.zip
+2021/05/22 | 8354 | macros/latex/contrib/tcolorbox/tcolorbox-example.tex
2021/05/22 | 833 | support/texlab/src/syntax/latex.rs
2021/05/22 | 83292 | systems/texlive/tlnet/archive/luatexja.source.r59299.tar.xz
2021/05/22 | 822 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__biblatex_include_options.snap
2021/05/22 | 821 | support/texlab/src/features/reference.rs
-2021/05/22 | 816072 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/05/22 | 8118 | macros/latex/contrib/tcolorbox/tcbhooks.code.tex
2021/05/22 | 808489 | fonts/newpx/doc/newpxdoc.pdf
-2021/05/22 | 80661 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
2021/05/22 | 802 | support/texlab/src/syntax/bibtex.rs
+2021/05/22 | 79955 | macros/latex/contrib/minimalist/minimalist-doc.pdf
+2021/05/22 | 7987 | macros/unicodetex/latex/simplivre/simplivre.cls
+2021/05/22 | 7983 | macros/unicodetex/latex/einfart/einfart.cls
2021/05/22 | 797 | macros/latex/contrib/bmstu-iu8/styles/17-IU8-appendices.sty
2021/05/22 | 795 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__equation_missing_end.snap
-2021/05/22 | 78747 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/05/22 | 7928 | macros/latex/contrib/tcolorbox/tcolorbox.doc.graphics.tex
2021/05/22 | 781 | macros/latex/contrib/bmstu-iu8/styles/18-IU8-extra.sty
-2021/05/22 | 77859 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/05/22 | 77487 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/05/22 | 7747 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
2021/05/22 | 76 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__lexer__tests__empty.snap
2021/05/22 | 769 | support/texlab/src/syntax/bibtex/snapshots/texlab__syntax__bibtex__parser__tests__entry_two_fields_incomplete.snap
2021/05/22 | 7691144 | support/texlab.zip
+2021/05/22 | 76829 | macros/latex/contrib/tcolorbox/goldshade.png
2021/05/22 | 765 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__acroynm_reference_options.snap
2021/05/22 | 764 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__equation_missing_begin.snap
2021/05/22 | 763 | support/texlab/tests/integration/snapshots/integration__completion__latex__citation_open_brace.snap
-2021/05/22 | 75419 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
2021/05/22 | 750 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__color_set_definition_error1.snap
-2021/05/22 | 748364 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
2021/05/22 | 745 | support/texlab/src/features/formatting.rs
2021/05/22 | 745 | support/texlab/docs/tectonic.md
2021/05/22 | 741 | support/texlab/tests/integration/snapshots/integration__workspace_symbol__filter_type_math.snap
-2021/05/22 | 74164 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
2021/05/22 | 740 | macros/latex/contrib/bmstu-iu8/styles/15-IU8-list-of-abbreviations.sty
-2021/05/22 | 73181 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
2021/05/22 | 7296 | systems/texlive/tlnet/archive/luaotfload.source.r59293.tar.xz
-2021/05/22 | 72861 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
2021/05/22 | 727 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__caption_figure.snap
2021/05/22 | 7230 | support/texlab/src/features/cursor.rs
2021/05/22 | 721 | support/texlab/tests/integration/snapshots/integration__workspace_symbol__filter_bibtex.snap
2021/05/22 | 721 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__acroynm_definition_simple.snap
-2021/05/22 | 72151 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/05/22 | 7209084 | macros/latex/contrib/tcolorbox/tcolorbox.pdf
2021/05/22 | 7200 | support/texlab/src/features/completion/citation.rs
-2021/05/22 | 71570 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
2021/05/22 | 7067 | support/texlab/src/features/folding.rs
-2021/05/22 | 70326 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/05/22 | 70110 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
2021/05/22 | 6 | support/texlab/rust-toolchain
2021/05/22 | 6955 | support/texlab/src/features/completion/entry_type.rs
2021/05/22 | 6927 | support/texlab/src/syntax/latex/lexer.rs
@@ -86,82 +346,63 @@
2021/05/22 | 6850 | support/texlab/src/features/completion/label.rs
2021/05/22 | 6832 | support/texlab/src/features/reference/entry.rs
2021/05/22 | 682 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__environment_simple.snap
-2021/05/22 | 6812477 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/05/22 | 680049 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/05/22 | 67931 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
2021/05/22 | 677 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__structure_siblings.snap
-2021/05/22 | 67679 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/05/22 | 67649 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
2021/05/22 | 675 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__graphics_include_options.snap
-2021/05/22 | 67452 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/05/22 | 6743 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2021/05/22 | 671 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__theorem_definition_full.snap
+2021/05/22 | 6691 | macros/latex/contrib/tcolorbox/tcolorbox.doc.s_snippet.sty
2021/05/22 | 668 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__color_definition_simple.snap
2021/05/22 | 668 | macros/latex/contrib/bmstu-iu8/styles/19-IU8-counters.sty
2021/05/22 | 66300 | fonts/kpfonts-otf/fonts/KpMono-Italic.otf
2021/05/22 | 6618 | support/texlab/src/features/reference/string.rs
-2021/05/22 | 65730 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
2021/05/22 | 65697 | support/texlab/Cargo.lock
2021/05/22 | 655 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__svg_include_options.snap
2021/05/22 | 654 | support/texlab/src/syntax/bibtex/snapshots/texlab__syntax__bibtex__parser__tests__entry_one_field_trailing_comma.snap
-2021/05/22 | 65322 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
2021/05/22 | 64992 | fonts/kpfonts-otf/fonts/KpMono-BoldItalic.otf
2021/05/22 | 6484 | support/texlab/src/line_index.rs
2021/05/22 | 647 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__inkscape_include_options.snap
2021/05/22 | 643 | support/texlab/texlab.1
+2021/05/22 | 6424 | macros/latex/contrib/tcolorbox/tcolorbox.doc.beamer.tex
2021/05/22 | 640 | support/texlab/src/syntax/bibtex/snapshots/texlab__syntax__bibtex__parser__tests__entry_one_field_number_key.snap
-2021/05/22 | 64017 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/05/22 | 63836 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/05/22 | 6386 | macros/latex/contrib/tcolorbox/tcolorbox.doc.recording.tex
2021/05/22 | 637 | support/texlab/src/syntax/latex/analysis/label_number.rs
-2021/05/22 | 63675 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
2021/05/22 | 632 | support/texlab/src/syntax/bibtex/snapshots/texlab__syntax__bibtex__parser__tests__entry_one_field.snap
2021/05/22 | 630 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__inline_double_dollar.snap
2021/05/22 | 6288 | systems/texlive/tlnet/archive/aalok.r59300.tar.xz
-2021/05/22 | 62801 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/05/22 | 625284 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/05/22 | 62882 | macros/latex/contrib/tcolorbox/blueshade.png
2021/05/22 | 624 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__inline.snap
2021/05/22 | 624416 | systems/texlive/tlnet/archive/luaotfload.doc.r59293.tar.xz
2021/05/22 | 623 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__caption.snap
2021/05/22 | 6222 | macros/latex/contrib/bmstu-iu8/styles/06-IU8-tables.sty
-2021/05/22 | 62226 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
2021/05/22 | 621 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__caption_error.snap
2021/05/22 | 6188 | support/texlab/src/features/reference/label.rs
-2021/05/22 | 618766 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/05/22 | 6187660 | install/macros/latex/contrib/tcolorbox.tds.zip
2021/05/22 | 614 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__lexer__tests__formula.snap
+2021/05/22 | 6102 | macros/latex/contrib/tcolorbox/tcolorbox.doc.bib
2021/05/22 | 6092 | support/texlab/docs/previewing.md
-2021/05/22 | 60553 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/05/22 | 60464 | systems/texlive/tlnet/archive/siunitx.r59292.tar.xz
-2021/05/22 | 59832 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/05/22 | 5989 | macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex
2021/05/22 | 597604 | systems/texlive/tlnet/archive/luaotfload.r59293.tar.xz
2021/05/22 | 595 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__command_definition_simple.snap
-2021/05/22 | 594869 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
2021/05/22 | 5917 | support/texlab/src/features/completion/import.rs
-2021/05/22 | 59145 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
2021/05/22 | 5895 | support/texlab/src/features/completion/field.rs
2021/05/22 | 58904 | fonts/kpfonts-otf/fonts/KpMono-Regular.otf
2021/05/22 | 586 | support/texlab/src/syntax/latex/analysis/theorem.rs
2021/05/22 | 5847 | support/texlab/src/syntax/bibtex/cst.rs
-2021/05/22 | 583627 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
2021/05/22 | 57768 | fonts/kpfonts-otf/fonts/KpMono-Bold.otf
-2021/05/22 | 576615 | systems/win32/miktex/tm/packages/files.csv.lzma
-2021/05/22 | 576226 | systems/win32/miktex/tm/packages/next/files.csv.lzma
2021/05/22 | 575 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__lexer__tests__command_with_parameter.snap
-2021/05/22 | 57598 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/05/22 | 57066 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/05/22 | 57421 | macros/latex/contrib/tcolorbox/CHANGES
+2021/05/22 | 57164 | macros/latex/contrib/tcolorbox/tcolorbox.doc.listings.tex
2021/05/22 | 57018 | support/texlab/data/lang_data.json
-2021/05/22 | 56910 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/05/22 | 567627 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/05/22 | 56717 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
2021/05/22 | 565 | support/texlab/src/features/formatting/snapshots/texlab__features__formatting__bibtex_internal__tests__multiple_entries.snap
2021/05/22 | 5650 | support/texlab/src/features/completion/argument.rs
-2021/05/22 | 56457 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
2021/05/22 | 5640 | support/texlab/src/features/completion/color_model.rs
+2021/05/22 | 56362 | macros/latex/contrib/tcolorbox/tcolorbox.doc.documentation.tex
+2021/05/22 | 5630 | macros/latex/contrib/tcolorbox/tcbmagazine.code.tex
2021/05/22 | 56296 | support/texlab/src/citation/apa.csl
-2021/05/22 | 56223 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/05/22 | 56212 | macros/latex/contrib/tcolorbox/tcolorbox.doc.skincatalog.tex
2021/05/22 | 559 | support/texlab/src/features/semantic.rs
-2021/05/22 | 55823 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/05/22 | 5577 | macros/latex/contrib/tcolorbox/tcolorbox.doc.quickref.tex
2021/05/22 | 556 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__theorem_definition_name_with_description_and_counter.snap
-2021/05/22 | 55564 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/05/22 | 55219 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
2021/05/22 | 549 | support/texlab/tests/integration/snapshots/integration__completion__latex__kernel_command.snap
2021/05/22 | 5485 | support/texlab/src/features/completion/include.rs
2021/05/22 | 546 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__color_set_definition_error2.snap
@@ -169,88 +410,62 @@
2021/05/22 | 54416 | systems/texlive/tlnet/archive/acmart.source.r59294.tar.xz
2021/05/22 | 540 | support/texlab/tests/integration/snapshots/integration__completion__latex__kernel_command_environment.snap
2021/05/22 | 540 | support/texlab/tests/integration/snapshots/integration__completion__latex__class_environment.snap
+2021/05/22 | 5404 | macros/latex/contrib/tcolorbox/tcolorbox.doc.abstract.tex
2021/05/22 | 538 | support/texlab/tests/integration/snapshots/integration__completion__latex__user_command.snap
2021/05/22 | 537 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__label_number.snap
2021/05/22 | 537 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__citation_prenote_postnote.snap
2021/05/22 | 5361 | support/texlab/src/features/completion/component_command.rs
2021/05/22 | 53203 | macros/latex/contrib/bmstu-iu8/inc/bmstu.png
-2021/05/22 | 532039 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
2021/05/22 | 5296 | support/texlab/src/features/definition/string.rs
2021/05/22 | 5289 | fonts/kpfonts-otf/README.md
-2021/05/22 | 52476 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/05/22 | 52454 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/05/22 | 5277 | macros/latex/contrib/tcolorbox/README
2021/05/22 | 521 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__structure_invalid_nesting.snap
2021/05/22 | 5204 | support/texlab/src/features/completion/acronym_ref.rs
2021/05/22 | 519 | support/texlab/src/syntax/bibtex/snapshots/texlab__syntax__bibtex__parser__tests__string_complete.snap
2021/05/22 | 519 | support/texlab/src/syntax/bibtex/snapshots/texlab__syntax__bibtex__parser__tests__string_casing.snap
-2021/05/22 | 51980 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
2021/05/22 | 5190 | support/texlab/src/features/completion/component_environment.rs
2021/05/22 | 517 | support/texlab/src/syntax/bibtex/snapshots/texlab__syntax__bibtex__parser__tests__string_missing_quote.snap
2021/05/22 | 517 | support/texlab/src/syntax/bibtex/snapshots/texlab__syntax__bibtex__parser__tests__string_incomplete.snap
-2021/05/22 | 51797 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/05/22 | 51432 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
2021/05/22 | 51420 | support/texlab/src/syntax/build_log.rs
2021/05/22 | 5131 | support/texlab/src/features/highlight/label.rs
-2021/05/22 | 511634 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/05/22 | 51160 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/05/22 | 50847 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
2021/05/22 | 5051 | support/texlab/src/features/completion/tikz_library.rs
-2021/05/22 | 49972 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
2021/05/22 | 4994 | support/texlab/src/capabilities.rs
2021/05/22 | 4980 | systems/texlive/tlnet/archive/fontsize.r59295.tar.xz
2021/05/22 | 4948 | support/texlab/tests/integration/snapshots/integration__completion__latex__class_import.snap
2021/05/22 | 491 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__caption_minimal.snap
2021/05/22 | 4912 | support/texlab/src/features/rename/label.rs
-2021/05/22 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2021/05/22 | 489 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__caption_minimal_error.snap
2021/05/22 | 488 | support/texlab/src/range.rs
-2021/05/22 | 484055 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
2021/05/22 | 480 | support/texlab/src/syntax/bibtex/snapshots/texlab__syntax__bibtex__parser__tests__preamble_complete.snap
2021/05/22 | 480 | support/texlab/src/syntax/bibtex/snapshots/texlab__syntax__bibtex__parser__tests__preamble_casing.snap
-2021/05/22 | 47879 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/05/22 | 475936 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
2021/05/22 | 472 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__math_operator_simple.snap
2021/05/22 | 4729 | support/texlab/src/citation/bibutils.rs
-2021/05/22 | 4707 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
-2021/05/22 | 47009 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
2021/05/22 | 464 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__command_definition_no_argc.snap
-2021/05/22 | 461400 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/05/22 | 45937 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
2021/05/22 | 4587 | support/texlab/src/citation.rs
2021/05/22 | 45753 | support/texlab/src/syntax/latex/parser.rs
-2021/05/22 | 45649 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/05/22 | 457403 | macros/latex/contrib/tcolorbox/tcolorbox-example.pdf
2021/05/22 | 4561 | support/texlab/src/diagnostics/bibtex.rs
2021/05/22 | 456084 | fonts/kpfonts-otf/fonts/KpMath-Light.otf
-2021/05/22 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/05/22 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2021/05/22 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/05/22 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/05/22 | 455 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__color_set_definition_error3.snap
2021/05/22 | 4533 | support/texlab/README.md
-2021/05/22 | 45278 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
2021/05/22 | 4496 | support/texlab/src/features/completion/glossary_ref.rs
2021/05/22 | 448 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__theorem_definition_name_with_counter.snap
2021/05/22 | 4482 | support/texlab/src/features/completion/theorem.rs
2021/05/22 | 447 | info/tlmgrbasics/README
2021/05/22 | 446 | support/texlab/src/syntax/bibtex/snapshots/texlab__syntax__bibtex__parser__tests__preamble_missing_end.snap
+2021/05/22 | 442133 | macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf
2021/05/22 | 441 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__theorem_definition_name_with_description.snap
+2021/05/22 | 44097 | macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex
2021/05/22 | 4380 | support/texlab/src/syntax/latex/kind.rs
-2021/05/22 | 43678 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
2021/05/22 | 434 | fonts/kpfonts-otf/tex/KpLight.fontspec
-2021/05/22 | 43392 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/05/22 | 43059 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
2021/05/22 | 429640 | fonts/kpfonts-otf/fonts/KpMath-Regular.otf
2021/05/22 | 4294 | support/texlab/src/citation/name/parser.lalrpop
-2021/05/22 | 42925 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
2021/05/22 | 428 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__label_reference_range_simple.snap
2021/05/22 | 426 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__label_reference_range_error.snap
2021/05/22 | 4267938 | fonts/kpfonts-otf.zip
-2021/05/22 | 42627 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
2021/05/22 | 425 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__generic_command_args.snap
2021/05/22 | 425 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__lexer__tests__comment.snap
-2021/05/22 | 42574 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
2021/05/22 | 423 | fonts/kpfonts-otf/tex/KpRoman.fontspec
-2021/05/22 | 42388 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
2021/05/22 | 422 | macros/latex/contrib/bmstu-iu8/styles/21-IU8-math.sty
2021/05/22 | 4218 | support/texlab/src/component_db.rs
2021/05/22 | 4195 | support/texlab/src/diagnostics/latex.rs
@@ -259,20 +474,17 @@
2021/05/22 | 4190 | support/texlab/tests/integration/snapshots/integration__completion__bibtex__field_complete_entry.snap
2021/05/22 | 416 | support/texlab/tests/integration/snapshots/integration__workspace_symbol__filter_type_figure.snap
2021/05/22 | 4165 | support/texlab/tests/integration/snapshots/integration__completion__bibtex__entry_type_empty_name.snap
-2021/05/22 | 41102 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
2021/05/22 | 408 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__package_include_multiple.snap
2021/05/22 | 4073 | macros/latex/contrib/bmstu-iu8/styles/05-IU8-figures.sty
2021/05/22 | 4060 | support/texlab/src/features/hover/string_ref.rs
2021/05/22 | 405 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__citation_prenote.snap
2021/05/22 | 4053 | support/texlab/tests/integration/snapshots/integration__completion__latex__package_import.snap
2021/05/22 | 4010 | support/texlab/src/features/hover/citation.rs
+2021/05/22 | 40056 | macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex
2021/05/22 | 3994 | support/texlab/src/workspace/storage.rs
2021/05/22 | 3993 | support/texlab/src/features/lsp_kinds.rs
+2021/05/22 | 39859 | macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex
2021/05/22 | 3982 | support/texlab/src/features/definition/command.rs
-2021/05/22 | 397364 | systems/texlive/tlnet/archive/texlive-scripts.doc.r59290.tar.xz
-2021/05/22 | 39689 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/05/22 | 39565 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/05/22 | 392596 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
2021/05/22 | 3922729 | fonts/newpx.zip
2021/05/22 | 387 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__import_simple.snap
2021/05/22 | 3856 | support/texlab/src/features/definition/entry.rs
@@ -280,17 +492,12 @@
2021/05/22 | 38560 | fonts/newtx/README
2021/05/22 | 3854 | macros/latex/contrib/bmstu-iu8/styles/02-IU8-construction.sty
2021/05/22 | 381 | support/texlab/src/features/highlight.rs
-2021/05/22 | 38069 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/05/22 | 38066 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
2021/05/22 | 380190 | support/texlab/docs/demo.gif
-2021/05/22 | 37293 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/05/22 | 37242 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
2021/05/22 | 372128 | systems/texlive/tlnet/archive/fontsize.doc.r59295.tar.xz
2021/05/22 | 371 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__label_reference_multiple.snap
2021/05/22 | 3707 | support/texlab/src/features/symbol/types.rs
2021/05/22 | 3693 | support/texlab/src/features/hover/field.rs
2021/05/22 | 3670 | support/texlab/src/features/hover/entry_type.rs
-2021/05/22 | 36679 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
2021/05/22 | 364 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__math_operator_no_impl.snap
2021/05/22 | 362 | support/texlab/src/syntax/latex/analysis/environment.rs
2021/05/22 | 3627 | support/texlab/src/features/build.rs
@@ -304,16 +511,16 @@
2021/05/22 | 3553 | support/texlab/src/features/symbol.rs
2021/05/22 | 354 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__escaped_brackets.snap
2021/05/22 | 354 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__command_definition_no_impl_error.snap
-2021/05/22 | 35462 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
2021/05/22 | 3535496 | systems/texlive/tlnet/archive/acmart.doc.r59294.tar.xz
+2021/05/22 | 35224 | macros/latex/contrib/tcolorbox/lichtspiel.jpg
2021/05/22 | 35149 | support/texlab/LICENSE
-2021/05/22 | 35064 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
2021/05/22 | 3471 | support/texlab/src/features/completion/types.rs
-2021/05/22 | 34635 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
2021/05/22 | 345608 | systems/texlive/tlnet/archive/projlib.doc.r59296.tar.xz
-2021/05/22 | 345367 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/05/22 | 3448 | macros/latex/contrib/tcolorbox/tcolorbox.doc.verbatim.tex
2021/05/22 | 342 | support/texlab/src/syntax.rs
2021/05/22 | 341 | support/texlab/src/syntax/latex/analysis/command.rs
+2021/05/22 | 3412 | macros/latex/contrib/tcolorbox/tcblistings.code.tex
+2021/05/22 | 34121 | macros/latex/contrib/tcolorbox/tcbbreakable.code.tex
2021/05/22 | 3409 | support/texlab/src/features/link.rs
2021/05/22 | 3400 | support/texlab/tests/integration/snapshots/integration__completion__latex__kernel_command_glyph.snap
2021/05/22 | 33948 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.ltx
@@ -322,49 +529,40 @@
2021/05/22 | 3370 | support/texlab/src/features/symbol/bibtex.rs
2021/05/22 | 336 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__graphics_include_simple.snap
2021/05/22 | 334 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__biblatex_include_simple.snap
-2021/05/22 | 33442 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
2021/05/22 | 333 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__theorem_definition_only_name.snap
2021/05/22 | 332 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__verbatim_include_simple.snap
2021/05/22 | 3317 | support/texlab/src/features/forward_search.rs
-2021/05/22 | 33153 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/05/22 | 33131 | macros/latex/contrib/tcolorbox/tcolorbox.doc.raster.tex
2021/05/22 | 3308 | support/texlab/src/features/completion/user_environment.rs
-2021/05/22 | 330235 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
2021/05/22 | 327 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__citation_redundant_comma.snap
-2021/05/22 | 32744 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/05/22 | 3266 | macros/latex/contrib/tcolorbox/tcolorbox.tex
2021/05/22 | 324 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__tikz_library_import_simple.snap
2021/05/22 | 3243 | support/texlab/src/workspace/document.rs
2021/05/22 | 322 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__pgf_library_import_simple.snap
-2021/05/22 | 321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
2021/05/22 | 3206200 | systems/texlive/tlnet/archive/luatexja.doc.r59299.tar.xz
2021/05/22 | 318 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__class_include_simple.snap
2021/05/22 | 318 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__bibtex_include_simple.snap
+2021/05/22 | 3184 | macros/latex/contrib/minimalist/minimart.cls
2021/05/22 | 3181 | support/texlab/tests/integration/workspace_symbol.rs
+2021/05/22 | 3181 | macros/latex/contrib/minimalist/minimbook.cls
2021/05/22 | 316 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__svg_include_simple.snap
2021/05/22 | 316 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__package_include_simple.snap
2021/05/22 | 3167 | support/texlab/src/diagnostics/chktex.rs
-2021/05/22 | 31594 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/05/22 | 31544 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
2021/05/22 | 31465 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.ltx
-2021/05/22 | 31343 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/05/22 | 31192 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/05/22 | 311192 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
2021/05/22 | 310 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__acroynm_reference_simple.snap
2021/05/22 | 308 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__inkscape_include_simple.snap
-2021/05/22 | 30886 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
2021/05/22 | 3072 | support/texlab/src/features/rename/command.rs
2021/05/22 | 305 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__latex_input_simple.snap
2021/05/22 | 3043 | support/texlab/src/features/hover/component.rs
2021/05/22 | 302 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__color_set_definition_error4.snap
2021/05/22 | 301 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__latex_include_simple.snap
-2021/05/22 | 30038 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
2021/05/22 | 299 | support/texlab/src/features/formatting/snapshots/texlab__features__formatting__bibtex_internal__tests__wrap_long_lines.snap
2021/05/22 | 2988 | support/texlab/docs/options.md
-2021/05/22 | 29867 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
2021/05/22 | 2985 | macros/latex/contrib/bmstu-iu8/styles/07-IU8-footnotes.sty
2021/05/22 | 2984 | support/texlab/src/workspace/watch.rs
+2021/05/22 | 29849 | macros/latex/contrib/tcolorbox/tcolorbox.doc.technical.tex
2021/05/22 | 297 | support/texlab/tests/integration/snapshots/integration__hover__label_theorem_child_file_mumber.snap
2021/05/22 | 295 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__glossary_entry_reference_simple.snap
-2021/05/22 | 295554 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
2021/05/22 | 294 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__import_incomplete.snap
2021/05/22 | 29437 | support/texlab/src/server.rs
2021/05/22 | 293 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__equation_label_reference_simple.snap
@@ -372,7 +570,6 @@
2021/05/22 | 290 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__label_definition_simple.snap
2021/05/22 | 2906 | support/texlab/tests/integration/snapshots/integration__completion__bibtex__command_incomplete_entry.snap
2021/05/22 | 2906 | support/texlab/tests/integration/snapshots/integration__completion__bibtex__command_complete_entry.snap
-2021/05/22 | 29050 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
2021/05/22 | 2903 | support/texlab/tests/integration/snapshots/integration__completion__latex__label.snap
2021/05/22 | 289 | support/texlab/tests/integration/snapshots/integration__hover__label_theorem_child_file.snap
2021/05/22 | 2897 | support/texlab/tests/integration/snapshots/integration__completion__latex__class_command.snap
@@ -380,117 +577,99 @@
2021/05/22 | 2873 | support/texlab/tests/integration/snapshots/integration__completion__latex__package_environment.snap
2021/05/22 | 2863 | support/texlab/tests/integration/snapshots/integration__completion__latex__preselect_environment.snap
2021/05/22 | 285 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__unmatched_brackets_with_group.snap
+2021/05/22 | 28432 | macros/latex/contrib/tcolorbox/tcolorbox.doc.vignette.tex
2021/05/22 | 283 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__brace_group_simple.snap
-2021/05/22 | 283978 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/05/22 | 283518 | macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf
2021/05/22 | 283291 | support/ltximg.zip
2021/05/22 | 282 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__label_reference_simple.snap
2021/05/22 | 2825 | support/texlab/tests/integration/snapshots/integration__completion__latex__pgf_library.snap
-2021/05/22 | 282108 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
2021/05/22 | 281 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__class_include_empty.snap
2021/05/22 | 281 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__brace_group_missing_end.snap
-2021/05/22 | 28121 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
2021/05/22 | 2801 | support/texlab/src/config.rs
-2021/05/22 | 28009 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
2021/05/22 | 279 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__package_include_empty.snap
2021/05/22 | 277 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__lexer__tests__command_with_star.snap
2021/05/22 | 2773 | support/texlab/tests/integration/snapshots/integration__completion__latex__package_command.snap
+2021/05/22 | 27736 | macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex
2021/05/22 | 276440 | fonts/kpfonts-otf/fonts/KpMath-Sans.otf
2021/05/22 | 275 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__citation_star.snap
2021/05/22 | 275 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__citation_simple.snap
-2021/05/22 | 27362 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/05/22 | 27275 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/05/22 | 27197 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/05/22 | 27182 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/05/22 | 273829 | macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf
+2021/05/22 | 27086 | macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex
2021/05/22 | 268 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__citation_missing_brace.snap
2021/05/22 | 2688 | support/texlab/src/features/definition/label.rs
+2021/05/22 | 2670 | macros/latex/contrib/tcolorbox/tcbminted.code.tex
2021/05/22 | 2658 | support/texlab/tests/integration/snapshots/integration__completion__latex__color_name.snap
2021/05/22 | 2657 | support/texlab/tests/integration/snapshots/integration__document_symbol__enumerate_nested.snap
2021/05/22 | 2620 | support/texlab/src/distro/miktex.rs
-2021/05/22 | 261961 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/05/22 | 2616929 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/05/22 | 258666 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/05/22 | 2589 | macros/latex/contrib/tcolorbox/tcbprocessing.code.tex
+2021/05/22 | 25816 | macros/latex/contrib/tcolorbox/tcolorbox.doc.external.tex
2021/05/22 | 2564 | support/texlab/src/workspace/children_expand.rs
-2021/05/22 | 25584700 | systems/texlive/tlnet/install-tl.zip
+2021/05/22 | 25557 | macros/latex/contrib/tcolorbox/tcolorbox.doc.poster.tex
2021/05/22 | 2551 | macros/latex/contrib/bmstu-iu8/styles/01-IU8-base.sty
-2021/05/22 | 25341 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
2021/05/22 | 252401 | macros/latex/contrib/bmstu-iu8.zip
-2021/05/22 | 25155 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/05/22 | 250214 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/05/22 | 25001 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/05/22 | 2499401 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
2021/05/22 | 2478 | support/texlab/tests/integration/snapshots/integration__completion__latex__theorem_environment.snap
+2021/05/22 | 24548 | macros/latex/contrib/tcolorbox/tcolorbox.doc.hooks.tex
2021/05/22 | 243 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__citation_empty.snap
2021/05/22 | 243 | macros/latex/contrib/bmstu-iu8/styles/11-IU8-performers.sty
-2021/05/22 | 243479 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
2021/05/22 | 24234835 | support/texlab/data/components.json
2021/05/22 | 241 | fonts/kpfonts-otf/tex/KpSans.fontspec
-2021/05/22 | 239479 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/05/22 | 23881 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/05/22 | 23626 | macros/latex/contrib/minimalist/minimalist.sty
2021/05/22 | 2361 | support/texlab/src/features/semantic/legend.rs
2021/05/22 | 234 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__lexer__tests__escape_sequence.snap
2021/05/22 | 2337 | support/texlab/src/features/completion/begin_command.rs
2021/05/22 | 2335 | support/texlab/src/syntax/latex/analysis/explicit_link.rs
-2021/05/22 | 23292 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
2021/05/22 | 23209 | support/texlab/src/features/completion.rs
2021/05/22 | 231 | support/texlab/src/syntax/bibtex/snapshots/texlab__syntax__bibtex__parser__tests__entry_no_fields.snap
-2021/05/22 | 2307008 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/05/22 | 2257 | fonts/newtx/tex/ot1ntxtosf.fd
2021/05/22 | 2257 | fonts/newtx/tex/ly1ntxtosf.fd
2021/05/22 | 2250 | support/texlab/docs/lsp_kinds.md
2021/05/22 | 2246 | support/texlab/src/features/hover/label.rs
2021/05/22 | 2240 | support/texlab/src/diagnostics/debouncer.rs
+2021/05/22 | 22407 | macros/latex/contrib/tcolorbox/Basilica_5.png
2021/05/22 | 2223 | fonts/newtx/tex/t1ntxtosf.fd
2021/05/22 | 2221 | support/texlab/tests/integration/snapshots/integration__completion__bibtex__entry_type_incomplete.snap
2021/05/22 | 2218 | support/texlab/tests/integration/hover.rs
2021/05/22 | 2217 | support/texlab/Cargo.toml
2021/05/22 | 2209 | support/texlab/src/workspace/api.rs
-2021/05/22 | 22040 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/05/22 | 22005 | macros/unicodetex/latex/simplivre/simplivre-doc-en.tex
2021/05/22 | 21810 | support/texlab/tests/integration/completion.rs
2021/05/22 | 2171 | support/texlab/src/syntax/latex/analysis/distro_file.rs
+2021/05/22 | 21663 | macros/latex/contrib/tcolorbox/crinklepaper.png
+2021/05/22 | 21549 | macros/latex/contrib/minimalist/minimalist-doc.tex
2021/05/22 | 2145 | macros/latex/contrib/bmstu-iu8/BMSTU-IU8.cls
-2021/05/22 | 214105 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
2021/05/22 | 213 | macros/latex/contrib/bmstu-iu8/styles/08-IU8-formulas.sty
-2021/05/22 | 21132 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/05/22 | 211056 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
2021/05/22 | 2108 | support/texlab/src/distro.rs
2021/05/22 | 209 | support/texlab/src/syntax/bibtex/snapshots/texlab__syntax__bibtex__parser__tests__entry_no_fields_missing_comma.snap
-2021/05/22 | 209667 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/05/22 | 209550 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
2021/05/22 | 2084 | support/texlab/src/dispatch.rs
2021/05/22 | 2084 | fonts/newtx/tex/ot1ntxosf.fd
-2021/05/22 | 208182 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/05/22 | 20808632 | systems/texlive/tlnet/install-tl-windows.exe
+2021/05/22 | 20838 | macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex
2021/05/22 | 2079 | fonts/newtx/tex/ly1ntxtlf.fd
2021/05/22 | 2078 | fonts/newtx/tex/ot1ntxtlf.fd
2021/05/22 | 2070 | support/texlab/src/diagnostics/build_log.rs
2021/05/22 | 206 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__unmatched_brackets.snap
2021/05/22 | 206 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__unmatched_braces.snap
+2021/05/22 | 20637 | macros/unicodetex/latex/einfart/einfart-doc-en.tex
2021/05/22 | 205 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__hello_world.snap
2021/05/22 | 2050 | fonts/newtx/tex/t1ntxosf.fd
2021/05/22 | 2048 | fonts/newtx/tex/t1ntxtlf.fd
2021/05/22 | 2045 | support/texlab/src/options.rs
2021/05/22 | 2040 | fonts/newtx/tex/ot1ntxlf.fd
2021/05/22 | 2040 | fonts/newtx/tex/ly1ntxlf.fd
-2021/05/22 | 202558 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/05/22 | 20274 | macros/latex/contrib/tcolorbox/tcolorbox.doc.magazine.tex
2021/05/22 | 2021 | support/texlab/docs/custom_messages.md
+2021/05/22 | 20201 | macros/latex/contrib/tcolorbox/tcolorbox.doc.filling.tex
2021/05/22 | 2019 | support/texlab/src/distro/kpsewhich.rs
-2021/05/22 | 20121 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/05/22 | 2009493 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
2021/05/22 | 2007 | fonts/newtx/tex/t1ntxlf.fd
2021/05/22 | 1998 | support/texlab/src/lang_data.rs
-2021/05/22 | 199700 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/05/22 | 19956 | macros/latex/contrib/tcolorbox/tcolorbox.doc.fitting.tex
2021/05/22 | 198620 | fonts/kpfonts-otf/fonts/KpMath-Semibold.otf
-2021/05/22 | 198131 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
2021/05/22 | 197754 | macros/latex/contrib/mindflow.zip
2021/05/22 | 196892 | fonts/kpfonts-otf/fonts/KpMath-Bold.otf
-2021/05/22 | 1958700 | systems/texlive/tlnet/archive/siunitx.doc.r59292.tar.xz
-2021/05/22 | 195664 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/05/22 | 195567 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/05/22 | 193716 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
2021/05/22 | 192899 | macros/latex/contrib/bmstu-iu8/example.pdf
2021/05/22 | 191924 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.pdf
2021/05/22 | 1917 | support/texlab/tests/integration/snapshots/integration__completion__latex__color_model_define_color.snap
2021/05/22 | 1914 | support/texlab/src/main.rs
+2021/05/22 | 191358 | macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf
2021/05/22 | 1910 | support/texlab/src/syntax/latex/analysis/label_name.rs
2021/05/22 | 190056 | systems/texlive/tlnet/archive/luatexja.r59299.tar.xz
2021/05/22 | 189920 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.pdf
@@ -504,11 +683,7 @@
2021/05/22 | 183 | support/texlab/CONTRIBUTING.md
2021/05/22 | 18233 | fonts/newpx/README
2021/05/22 | 181 | support/texlab/src/syntax/bibtex/snapshots/texlab__syntax__bibtex__parser__tests__junk.snap
-2021/05/22 | 18097 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/05/22 | 180048 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
2021/05/22 | 1797 | fonts/newtx/tex/ly1ntxosf.fd
-2021/05/22 | 17958 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/05/22 | 179379 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
2021/05/22 | 1791 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__structure_nested.snap
2021/05/22 | 1789 | support/texlab/src/features/completion/util.rs
2021/05/22 | 1787182 | fonts/kpfonts-otf/doc/unimath-kpfonts.pdf
@@ -516,86 +691,69 @@
2021/05/22 | 1780 | support/texlab/src/diagnostics.rs
2021/05/22 | 1772 | fonts/newpx/tfm/zplexx.tfm
2021/05/22 | 175 | macros/latex/contrib/bmstu-iu8/README.md
-2021/05/22 | 1725546 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/05/22 | 17243428 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
2021/05/22 | 1720 | macros/latex/contrib/bmstu-iu8/styles/12-IU8-abstract.sty
2021/05/22 | 170 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__generic_command_empty.snap
2021/05/22 | 1694 | macros/latex/contrib/bmstu-iu8/styles/13-IU8-contents.sty
+2021/05/22 | 169197 | macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex
2021/05/22 | 1687 | support/texlab/tests/integration/snapshots/integration__document_symbol__enumerate_flat.snap
-2021/05/22 | 167907 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
2021/05/22 | 16759 | support/texlab/src/syntax/latex/cst.rs
2021/05/22 | 16745 | fonts/kpfonts-otf/doc/unimath-kpfonts.ltx
2021/05/22 | 166 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__generic_command_escape.snap
2021/05/22 | 1662 | support/texlab/src/syntax/bibtex/lexer.rs
2021/05/22 | 163720 | systems/texlive/tlnet/archive/aalok.doc.r59300.tar.xz
2021/05/22 | 163689 | info/tlmgrbasics.zip
-2021/05/22 | 163656 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/05/22 | 16328 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
2021/05/22 | 16188 | support/texlab/src/citation/ris.rs
2021/05/22 | 1614 | macros/latex/contrib/bmstu-iu8/styles/09-IU8-cites.sty
-2021/05/22 | 16115 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
2021/05/22 | 159 | support/texlab/build.rs
-2021/05/22 | 159969 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
2021/05/22 | 1593 | support/texlab/src/client.rs
2021/05/22 | 1578 | support/texlab/src/syntax/latex/analysis/implicit_link.rs
-2021/05/22 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/05/22 | 153890 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/05/22 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/05/22 | 15656 | macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex
2021/05/22 | 152 | support/texlab/tests/integration/snapshots/integration__completion__latex__citation_after.snap
-2021/05/22 | 152762 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
2021/05/22 | 1520 | macros/latex/contrib/bmstu-iu8/example.tex
+2021/05/22 | 15166 | macros/latex/contrib/tcolorbox/pink_marble.png
2021/05/22 | 15108 | systems/texlive/tlnet/archive/fontsize.source.r59295.tar.xz
2021/05/22 | 1494 | support/texlab/tests/integration/snapshots/integration__document_symbol__section_nested.snap
2021/05/22 | 148 | support/texlab/tests/integration/snapshots/integration__completion__latex__empty_document.snap
2021/05/22 | 148 | support/texlab/tests/integration/snapshots/integration__completion__bibtex__junk.snap
2021/05/22 | 148 | support/texlab/tests/integration/snapshots/integration__completion__bibtex__entry_type_empty_name_before.snap
2021/05/22 | 148 | support/texlab/tests/integration/snapshots/integration__completion__bibtex__empty_document.snap
-2021/05/22 | 147150 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/05/22 | 147139 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/05/22 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/05/22 | 148 | macros/latex/contrib/tcolorbox/tcolorbox.doc.references.tex
+2021/05/22 | 145877 | macros/unicodetex/latex/einfart/einfart-doc-en.pdf
2021/05/22 | 1457 | support/texlab/src/features/formatting/latexindent.rs
2021/05/22 | 1454 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__acronym_declaration.snap
-2021/05/22 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/05/22 | 14533 | macros/latex/contrib/tcolorbox/tcbfitting.code.tex
2021/05/22 | 1437 | macros/latex/contrib/bmstu-iu8/styles/22-IU8-algorithms.sty
-2021/05/22 | 14355 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2021/05/22 | 142704 | fonts/kpfonts-otf/fonts/KpRoman-BoldItalic.otf
-2021/05/22 | 1425981 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/05/22 | 1424814 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
2021/05/22 | 14204 | support/texlab/src/features/symbol/latex.rs
2021/05/22 | 1413 | support/texlab/tests/integration/snapshots/integration__document_symbol__float_nested.snap
+2021/05/22 | 1412 | macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex
2021/05/22 | 1405 | support/texlab/tests/integration/snapshots/integration__document_symbol__equation_nested.snap
2021/05/22 | 140488 | fonts/kpfonts-otf/fonts/KpRoman-SemiboldItalic.otf
2021/05/22 | 1398 | support/texlab/tests/integration/snapshots/integration__document_symbol__theorem_flat.snap
+2021/05/22 | 13911 | macros/latex/contrib/tcolorbox/tcblistingscore.code.tex
2021/05/22 | 13757 | support/texlab/CHANGELOG.md
2021/05/22 | 1365 | support/texlab/tests/integration/snapshots/integration__workspace_symbol__filter_type_section.snap
-2021/05/22 | 136429 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/05/22 | 13613 | macros/latex/contrib/tcolorbox/tcolorbox.doc.sidebyside.tex
2021/05/22 | 1353 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__acroynm_definition_options.snap
2021/05/22 | 135176 | fonts/kpfonts-otf/fonts/KpRoman-LightItalic.otf
-2021/05/22 | 135005 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/05/22 | 13469 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
2021/05/22 | 13446 | macros/latex/contrib/mindflow/mindflow.dtx
2021/05/22 | 134260 | fonts/kpfonts-otf/fonts/KpRoman-Italic.otf
2021/05/22 | 132080 | fonts/kpfonts-otf/fonts/KpRoman-Bold.otf
2021/05/22 | 1315 | macros/latex/contrib/bmstu-iu8/styles/03-IU8-numbering.sty
-2021/05/22 | 131490 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
2021/05/22 | 130976 | fonts/kpfonts-otf/fonts/KpRoman-Regular.otf
2021/05/22 | 1308 | fonts/newpx/vf/zplexx.vf
-2021/05/22 | 1307725 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
2021/05/22 | 130328 | fonts/kpfonts-otf/fonts/KpRoman-Light.otf
-2021/05/22 | 1295415 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
2021/05/22 | 129324 | fonts/kpfonts-otf/fonts/KpRoman-Semibold.otf
-2021/05/22 | 1281106 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
2021/05/22 | 1280 | fonts/newpx/vf/zplbexx.vf
-2021/05/22 | 1272534 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/05/22 | 1271317 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/05/22 | 12745 | macros/latex/contrib/tcolorbox/tcbvignette.code.tex
2021/05/22 | 1270 | support/texlab/src/line_index_ext.rs
2021/05/22 | 126 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__parameter.snap
2021/05/22 | 1265 | support/texlab/src/features/hover.rs
2021/05/22 | 125 | support/texlab/tests/integration/main.rs
2021/05/22 | 124 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__parameter_error.snap
2021/05/22 | 124 | support/texlab/src/features/formatting/snapshots/texlab__features__formatting__bibtex_internal__tests__concatenation.snap
-2021/05/22 | 124972 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
2021/05/22 | 12483 | support/texlab/src/features/formatting/bibtex_internal.rs
+2021/05/22 | 12451 | macros/latex/contrib/tcolorbox/tcbposter.code.tex
2021/05/22 | 1243 | support/texlab/tests/integration/issues.rs
2021/05/22 | 123 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__lexer__tests__invalid_parameter.snap
2021/05/22 | 1237 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__structure_enum_item.snap
@@ -605,13 +763,8 @@
2021/05/22 | 1210 | support/texlab/tests/integration/snapshots/integration__completion__latex__citation.snap
2021/05/22 | 1209 | support/texlab/tests/integration/snapshots/integration__completion__latex__color_model_define_color_set.snap
2021/05/22 | 1191 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__environment_nested_missing_braces.snap
-2021/05/22 | 1188645 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2021/05/22 | 1187112 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
2021/05/22 | 117 | support/texlab/src/features/formatting/snapshots/texlab__features__formatting__bibtex_internal__tests__command.snap
-2021/05/22 | 1171731 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/05/22 | 116930 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/05/22 | 115470 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/05/22 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/05/22 | 11677 | macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty
2021/05/22 | 11519 | support/texlab/tests/integration/document_symbol.rs
2021/05/22 | 114 | support/texlab/src/features/formatting/snapshots/texlab__features__formatting__bibtex_internal__tests__trailing_comma.snap
2021/05/22 | 114 | support/texlab/src/features/formatting/snapshots/texlab__features__formatting__bibtex_internal__tests__insert_braces.snap
@@ -620,40 +773,37 @@
2021/05/22 | 1141 | support/texlab/src/syntax/latex/analysis.rs
2021/05/22 | 1139 | macros/latex/contrib/bmstu-iu8/styles/16-IU8-references.sty
2021/05/22 | 1138 | support/texlab/src/features/rename.rs
-2021/05/22 | 112253 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/05/22 | 112 | macros/latex/contrib/tcolorbox/tcolorbox.doc.index.tex
2021/05/22 | 111 | support/texlab/src/features/formatting/snapshots/texlab__features__formatting__bibtex_internal__tests__preamble.snap
+2021/05/22 | 110973 | macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex
2021/05/22 | 110936 | fonts/kpfonts-otf/fonts/KpSans-Italic.otf
2021/05/22 | 110904 | fonts/kpfonts-otf/fonts/KpSans-BoldItalic.otf
+2021/05/22 | 1106 | macros/latex/contrib/tcolorbox/tcolorbox.doc.picturecredits.tex
2021/05/22 | 1106 | macros/latex/contrib/bmstu-iu8/LICENSE
2021/05/22 | 1101 | macros/latex/contrib/bmstu-iu8/styles/14-IU8-terms-and-definitions.sty
-2021/05/22 | 109273 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
2021/05/22 | 1084 | support/texlab/src/features/definition.rs
2021/05/22 | 1080 | support/texlab/tests/integration/snapshots/integration__completion__bibtex__entry_type_complete.snap
2021/05/22 | 107 | support/texlab/src/features/formatting/snapshots/texlab__features__formatting__bibtex_internal__tests__string.snap
-2021/05/22 | 107996 | systems/texlive/tlnet/archive/texlive-scripts.r59290.tar.xz
2021/05/22 | 1078 | support/texlab/tests/integration/snapshots/integration__document_symbol__float_flat.snap
-2021/05/22 | 1078878 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
2021/05/22 | 1074 | support/texlab/tests/integration/snapshots/integration__document_symbol__equation_flat.snap
2021/05/22 | 1074 | support/texlab/src/distro/texlive.rs
2021/05/22 | 1073 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__environment_definition.snap
2021/05/22 | 1072 | systems/texlive/tlnet/archive/tiscreen.r59297.tar.xz
2021/05/22 | 1061 | support/texlab/src/syntax/bibtex/snapshots/texlab__syntax__bibtex__parser__tests__entry_two_fields.snap
2021/05/22 | 1051 | support/texlab/tests/integration/snapshots/integration__document_symbol__section_flat.snap
-2021/05/22 | 104624 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
2021/05/22 | 10438 | support/texlab/src/features/semantic/bibtex.rs
2021/05/22 | 1041 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__environment_nested.snap
2021/05/22 | 1038 | support/texlab/src/syntax/bibtex/snapshots/texlab__syntax__bibtex__parser__tests__string_concatenation.snap
2021/05/22 | 10375 | support/texlab/src/syntax/bibtex/parser.rs
2021/05/22 | 1035 | support/texlab/tests/integration/snapshots/integration__workspace_symbol__filter_type_item.snap
-2021/05/22 | 103323 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
2021/05/22 | 102 | support/texlab/src/features/formatting/snapshots/texlab__features__formatting__bibtex_internal__tests__parens.snap
2021/05/22 | 1029 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__class_include_options.snap
2021/05/22 | 102972 | fonts/kpfonts-otf/fonts/KpSans-Bold.otf
2021/05/22 | 1027 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__package_include_options.snap
+2021/05/22 | 10266 | macros/latex/contrib/tcolorbox/tcbxparse.code.tex
2021/05/22 | 102384 | fonts/kpfonts-otf/fonts/KpSans-Regular.otf
-2021/05/22 | 102144 | systems/texlive/tlnet/archive/siunitx.source.r59292.tar.xz
-2021/05/22 | 101764 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
2021/05/22 | 100 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__empty.snap
+2021/05/22 | 10038 | macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex
2021/05/21 | 99215 | macros/luatex/generic/luaotfload/luaotfload-main.tex
2021/05/21 | 9901036 | macros/latex/contrib/acmart.zip
2021/05/21 | 9881 | macros/luatex/generic/luaotfload/fontloader-fonts-gbn.lua
@@ -697,7 +847,6 @@
2021/05/21 | 699 | macros/luatex/generic/luaotfload/scripts-demo.tex
2021/05/21 | 69366 | macros/luatex/generic/luatexja/doc/ltjltxdoc.pdf
2021/05/21 | 693535 | macros/luatex/generic/luatexja/doc/luatexja-en.pdf
-2021/05/21 | 6901 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2021/05/21 | 6891 | macros/luatex/generic/luatexja/src/addons/luatexja-otf.sty
2021/05/21 | 6866 | macros/luatex/generic/luaotfload/fontloader-font-afk.lua
2021/05/21 | 6809 | macros/luatex/generic/luaotfload/luaotfload-case.lua
@@ -733,6 +882,10 @@
2021/05/21 | 5297 | macros/unicodetex/latex/aalok/aalok.ins
2021/05/21 | 5222 | macros/luatex/generic/luatexja/src/ltj-debug.lua
2021/05/21 | 52002 | macros/luatex/generic/luatexja/doc/luatexja-ruby.tex
+2021/05/21 | 517 | macros/unicodetex/latex/einfart/README.md
+2021/05/21 | 514 | macros/unicodetex/latex/simplivre/README.md
+2021/05/21 | 499 | macros/unicodetex/latex/lebhart/README.md
+2021/05/21 | 497 | macros/unicodetex/latex/beaulivre/README.md
2021/05/21 | 4956 | macros/luatex/generic/luaotfload/luaotfload-dvi.lua
2021/05/21 | 49501 | macros/luatex/generic/luatexja/src/patches/lltjfont.sty
2021/05/21 | 494977 | macros/luatex/generic/luaotfload/luaotfload-latex.pdf
@@ -943,8 +1096,10 @@
2021/05/21 | 12224 | macros/luatex/generic/luaotfload/luaotfload-notdef.lua
2021/05/21 | 121968 | macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf
2021/05/21 | 12151 | macros/luatex/generic/luatexja/src/ltj-base.lua
+2021/05/21 | 1203 | macros/latex/contrib/minimalist/README.md
2021/05/21 | 119385 | macros/luatex/generic/luaotfload/fontloader-font-oup.lua
2021/05/21 | 11829 | macros/luatex/generic/luaotfload/fontloader-l-io.lua
+2021/05/21 | 1159 | macros/latex/contrib/colorist/README.md
2021/05/21 | 11552 | macros/luatex/generic/luaotfload/fontloader-util-fil.lua
2021/05/21 | 11506 | macros/luatex/generic/luatexja/src/jfm-ujisv.lua
2021/05/21 | 113800 | macros/latex/contrib/siunitx/siunitx-number.dtx
@@ -1067,8 +1222,6 @@
2021/05/20 | 3176 | fonts/newpx/tfm/zplth-Italic-osf-ot1.tfm
2021/05/20 | 3136 | fonts/newpx/tfm/zplth-Italic-tlf-ot1.tfm
2021/05/20 | 31368 | macros/latex/contrib/acmart/samples/samples.dtx
-2021/05/20 | 311580 | systems/texlive/tlnet/archive/easybook.doc.r59278.tar.xz
-2021/05/20 | 30100 | systems/texlive/tlnet/archive/easybook.source.r59278.tar.xz
2021/05/20 | 2812 | systems/texlive/tlnet/archive/pm-isomath.r59269.tar.xz
2021/05/20 | 26932 | systems/texlive/tlnet/archive/texdoc.r59283.tar.xz
2021/05/20 | 264490 | systems/win32/miktex/tm/packages/pgfmath-xfp.tar.lzma
@@ -1080,6 +1233,7 @@
2021/05/20 | 249884 | macros/latex/contrib/acmart/acmart.dtx
2021/05/20 | 2448 | systems/texlive/tlnet/archive/suppose.r59281.tar.xz
2021/05/20 | 24459 | support/texdoc/script/texdoclib-search.tlu
+2021/05/20 | 236172 | macros/unicodetex/latex/einfart/einfart-doc-cn.pdf
2021/05/20 | 232596 | macros/latex/contrib/suftesi/suftesi.dtx
2021/05/20 | 23241 | fonts/newpx/map/newpx.map
2021/05/20 | 2255476 | macros/latex/contrib/acrotex/doc/aeb_man.pdf
@@ -1093,6 +1247,7 @@
2021/05/20 | 199588 | macros/latex/contrib/suppose.zip
2021/05/20 | 197272 | macros/latex/contrib/acrotex/doc/eformman.tex
2021/05/20 | 197208 | systems/texlive/tlnet/archive/suppose.doc.r59281.tar.xz
+2021/05/20 | 19557 | macros/unicodetex/latex/einfart/einfart-doc-cn.tex
2021/05/20 | 19479 | macros/latex/contrib/projlib/ProjLib-doc-cn.tex
2021/05/20 | 1920 | systems/texlive/tlnet/archive/pgfmath-xfp.r59268.tar.xz
2021/05/20 | 18592 | systems/texlive/tlnet/archive/pm-isomath.source.r59269.tar.xz
@@ -1119,7 +1274,6 @@
2021/05/20 | 144842692 | systems/win32/w32tex/context.tar.xz
2021/05/20 | 143188 | macros/latex/contrib/projlib/ProjLib-doc-en.pdf
2021/05/20 | 1382 | support/texdoc/script/texdoc.tlu
-2021/05/20 | 13712 | systems/texlive/tlnet/archive/easybook.r59278.tar.xz
2021/05/20 | 135656 | systems/texlive/tlnet/archive/texdoc.doc.r59283.tar.xz
2021/05/20 | 13344 | fonts/newpx/tfm/zpl-Slanted-lf-sc-t1.tfm
2021/05/20 | 13340 | fonts/newpx/tfm/zpl-Slanted-osf-sc-t1.tfm
@@ -1162,6 +1316,7 @@
2021/05/19 | 82880 | systems/texlive/tlnet/archive/bxjscls.source.r59253.tar.xz
2021/05/19 | 731740 | systems/texlive/tlnet/archive/apa7.doc.r59254.tar.xz
2021/05/19 | 669845 | macros/latex/contrib/pm-isomath.zip
+2021/05/19 | 65650 | macros/latex/contrib/ot-tableau/ot-tableau.pdf
2021/05/19 | 57656 | macros/latex/contrib/covington/covington.tex
2021/05/19 | 546181 | macros/latex/contrib/powerdot/doc/powerdot.pdf
2021/05/19 | 510313 | macros/latex/contrib/covington.zip
@@ -1196,6 +1351,7 @@
2021/05/19 | 14040 | systems/texlive/tlnet/archive/apa7.r59254.tar.xz
2021/05/19 | 1296 | systems/texlive/tlnet/archive/hvqrurl.r59256.tar.xz
2021/05/19 | 1187176 | macros/latex/contrib/alterqcm.zip
+2021/05/19 | 11735 | macros/latex/contrib/ot-tableau/ot-tableau.tex
2021/05/19 | 1153 | macros/latex/contrib/pgfmath-xfp/README.md
2021/05/19 | 1116316 | systems/texlive/tlnet/archive/tuda-ci.doc.r59257.tar.xz
2021/05/19 | 1083292 | systems/win32/w32tex/win64/makeindex-w64.tar.xz
@@ -1383,7 +1539,6 @@
2021/05/17 | 3182 | macros/latex/contrib/bnumexpr/README.md
2021/05/17 | 2733232 | systems/texlive/tlnet/archive/dviout.win32.r59222.tar.xz
2021/05/17 | 26220 | macros/latex/contrib/alterqcm/doc/latex/doc-aq-globales.tex
-2021/05/17 | 2441089 | install/macros/musixtex.tds.zip
2021/05/17 | 2424239 | macros/musixtex.zip
2021/05/17 | 211589 | support/latexmk/latexmk.txt
2021/05/17 | 193225 | support/latexmk/latexmk.pdf
@@ -1404,112 +1559,3 @@
2021/05/17 | 10905440 | systems/texlive/tlnet/archive/l3kernel.doc.r59231.tar.xz
2021/05/17 | 105908 | systems/texlive/tlnet/archive/newtxsf.r59227.tar.xz
2021/05/17 | 10280 | macros/latex/contrib/acrotex/examples/jquiztst.tex
-2021/05/16 | 9997 | usergrps/usergrps/ca.html
-2021/05/16 | 9993 | usergrps/usergrps/ie.html
-2021/05/16 | 9987 | usergrps/usergrps/za.html
-2021/05/16 | 9977 | usergrps/usergrps/uy.html
-2021/05/16 | 9968 | usergrps/usergrps/is.html
-2021/05/16 | 9937 | usergrps/usergrps/kh.html
-2021/05/16 | 9927 | usergrps/usergrps/mx.html
-2021/05/16 | 9877 | usergrps/usergrps/lt.html
-2021/05/16 | 9847 | usergrps/usergrps/ee.html
-2021/05/16 | 885 | macros/latex/contrib/paresse/paresse.ins
-2021/05/16 | 87349 | fonts/newtxsf/tex/newtxsf.sty
-2021/05/16 | 86511 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2021/05/16 | 8622732 | systems/win32/w32tex/uptex-w32.tar.xz
-2021/05/16 | 85416 | systems/texlive/tlnet/archive/profcollege.r59217.tar.xz
-2021/05/16 | 844087 | macros/latex/required/babel/base/babel.pdf
-2021/05/16 | 8188 | systems/texlive/tlnet/archive/platex-tools.r59211.tar.xz
-2021/05/16 | 80103 | fonts/newtx/doc/newtxdoc.tex
-2021/05/16 | 787872 | systems/texlive/tlnet/archive/optex.r59209.tar.xz
-2021/05/16 | 785229 | macros/latex/required/babel/base/locale.zip
-2021/05/16 | 7392 | macros/latex/required/babel/base/babel.ins
-2021/05/16 | 717748 | systems/texlive/tlnet/archive/pgf.r59210.tar.xz
-2021/05/16 | 709063 | macros/latex/required/babel/base/babel.dtx
-2021/05/16 | 70837 | fonts/libertinust1math/tex/libertinust1math.sty
-2021/05/16 | 6936 | systems/texlive/tlnet/archive/plautopatch.r59212.tar.xz
-2021/05/16 | 68456 | macros/musixtex/doc/musixdoc/extensions.tex
-2021/05/16 | 6776668 | systems/win32/w32tex/ptex-ng-w32.tar.xz
-2021/05/16 | 6431 | usergrps/usergrps/index.html
-2021/05/16 | 633492 | systems/texlive/tlnet/archive/tagpdf.doc.r59214.tar.xz
-2021/05/16 | 620828 | macros/latex/contrib/paresse/paresse-fra.pdf
-2021/05/16 | 615104 | macros/latex/contrib/euclideangeometry/euclideangeometry-man.pdf
-2021/05/16 | 6140 | macros/musixtex/tex/musixvbm.tex
-2021/05/16 | 58801 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
-2021/05/16 | 5861208 | fonts/libertinust1math.zip
-2021/05/16 | 585851 | macros/latex/contrib/paresse/paresse-eng.pdf
-2021/05/16 | 574088 | systems/texlive/tlnet/archive/platex-tools.doc.r59211.tar.xz
-2021/05/16 | 5532928 | systems/win32/w32tex/aleph-w32.tar.xz
-2021/05/16 | 5451 | macros/musixtex/doc/musixdoc/frontmatter.tex
-2021/05/16 | 5402 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
-2021/05/16 | 52856740 | systems/win32/w32tex/latex-dev.tar.xz
-2021/05/16 | 49842 | usergrps/usergrps/lugs.pdf
-2021/05/16 | 49478912 | systems/win32/w32tex/xetex-w32.tar.xz
-2021/05/16 | 48074 | macros/latex/contrib/paresse/paresse.dtx
-2021/05/16 | 454258 | fonts/newtxsf.zip
-2021/05/16 | 422395 | macros/latex/contrib/paresse/paresse.pdf
-2021/05/16 | 42084 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
-2021/05/16 | 4206 | fonts/libertinust1math/README
-2021/05/16 | 3917560 | systems/texlive/tlnet/archive/profcollege.doc.r59217.tar.xz
-2021/05/16 | 37954 | systems/texlive/tlnet/tlpkg/TeXLive/TLWinGoo.pm
-2021/05/16 | 37601 | usergrps/usergrps/lugs.html
-2021/05/16 | 3628 | systems/texlive/tlnet/archive/dviinfox.r59216.tar.xz
-2021/05/16 | 3526 | macros/latex/required/babel/base/bbidxglo.dtx
-2021/05/16 | 33484 | systems/texlive/tlnet/archive/pgf.source.r59210.tar.xz
-2021/05/16 | 3068 | macros/musixtex/README
-2021/05/16 | 2942974 | graphics/pgf/contrib/pgf-spectra.zip
-2021/05/16 | 2813493 | install/macros/latex/required/babel-base.tds.zip
-2021/05/16 | 27555 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2021/05/16 | 27232 | systems/texlive/tlnet/archive/tagpdf.source.r59214.tar.xz
-2021/05/16 | 26800 | support/TeX4ht/source/Makefile
-2021/05/16 | 2462 | fonts/newtxsf/README
-2021/05/16 | 24020 | systems/texlive/tlnet/archive/tagpdf.r59214.tar.xz
-2021/05/16 | 2390104 | graphics/pgf/contrib/pgf-spectra/pgf-spectraManual.pdf
-2021/05/16 | 2339 | macros/latex/contrib/paresse/MANIFEST.md
-2021/05/16 | 22939 | macros/musixtex/doc/musixdoc/beams.tex
-2021/05/16 | 21890 | macros/latex/required/babel/base/bbcompat.dtx
-2021/05/16 | 2164 | systems/texlive/tlnet/archive/dviinfox.doc.r59216.tar.xz
-2021/05/16 | 2143 | macros/latex/required/babel/base/README.md
-2021/05/16 | 21370 | systems/texlive/tlnet/tlpkg/TeXLive/TLConfFile.pm
-2021/05/16 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
-2021/05/16 | 18944520 | systems/win32/w32tex/luatex-exp-w32.tar.xz
-2021/05/16 | 18926672 | systems/win32/w32tex/luatex-w32.tar.xz
-2021/05/16 | 18907992 | systems/win32/w32tex/luatex-dev-w32.tar.xz
-2021/05/16 | 1861416 | systems/win32/w32tex/jtex-w32.tar.xz
-2021/05/16 | 1814891 | macros/latex/required/babel/base.zip
-2021/05/16 | 1637967 | macros/latex/contrib/paresse.zip
-2021/05/16 | 16103 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
-2021/05/16 | 1539 | support/TeX4ht/source/tex4ht-bibtex2.tex
-2021/05/16 | 1438692 | systems/texlive/tlnet/archive/optex.doc.r59209.tar.xz
-2021/05/16 | 1395131 | macros/musixtex/doc/musixdoc.pdf
-2021/05/16 | 135936 | systems/texlive/tlnet/archive/plautopatch.doc.r59212.tar.xz
-2021/05/16 | 1233271 | fonts/newtx/doc/newtxdoc.pdf
-2021/05/16 | 1216 | macros/latex/contrib/paresse/LISEZMOI.md
-2021/05/16 | 11516 | systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm
-2021/05/16 | 11502 | systems/texlive/tlnet/tlpkg/TeXLive/TeXCatalogue.pm
-2021/05/16 | 1143 | macros/latex/contrib/paresse/README.md
-2021/05/16 | 1091266 | support/TeX4ht/source/tex4ht-4ht.tex
-2021/05/16 | 10700492 | systems/win32/w32tex/ptex-w32.tar.xz
-2021/05/16 | 10547 | usergrps/usergrps/de.html
-2021/05/16 | 10497 | usergrps/usergrps/hu.html
-2021/05/16 | 10494 | usergrps/usergrps/pl.html
-2021/05/16 | 10430 | usergrps/usergrps/cz.html
-2021/05/16 | 10357 | usergrps/usergrps/fr.html
-2021/05/16 | 10346184 | systems/texlive/tlnet/archive/pgf.doc.r59210.tar.xz
-2021/05/16 | 10337 | usergrps/usergrps/kr.html
-2021/05/16 | 10314 | usergrps/usergrps/bg.html
-2021/05/16 | 10313 | usergrps/usergrps/nl.html
-2021/05/16 | 10276 | usergrps/usergrps/cn.html
-2021/05/16 | 10220 | usergrps/usergrps/it.html
-2021/05/16 | 10217 | usergrps/usergrps/es.html
-2021/05/16 | 10200 | usergrps/usergrps/gb.html
-2021/05/16 | 10108 | usergrps/usergrps/us.html
-2021/05/16 | 10093 | usergrps/usergrps/gr.html
-2021/05/16 | 10072 | usergrps/usergrps/esc.html
-2021/05/16 | 10068 | usergrps/usergrps/dk.html
-2021/05/16 | 10066 | usergrps/usergrps/pt.html
-2021/05/16 | 10048 | usergrps/usergrps/vn.html
-2021/05/16 | 100414 | macros/latex/contrib/euclideangeometry/euclideangeometry-man.tex
-2021/05/16 | 10038 | usergrps/usergrps/no.html
-2021/05/16 | 10011 | usergrps/usergrps/br.html
-2021/05/16 | 10000 | usergrps/usergrps/labels.pdf
diff --git a/graphics/mcf2graph/CHANGELOG b/graphics/mcf2graph/CHANGELOG
index 3283706b9c..73646738ae 100644
--- a/graphics/mcf2graph/CHANGELOG
+++ b/graphics/mcf2graph/CHANGELOG
@@ -1,6 +1,16 @@
*******************************************************************************
- Changelog of mcf2graph software package by Akira Yamaji 2021-05-05
+ Changelog of mcf2graph software package by Akira Yamaji 2021-05-23
*******************************************************************************
+[ver. 4.65 / 2021-05-23]
+ -add parameter for sw_output
+ None_Info_t : output font,'temp-info.aux'
+ None_Mcode_t : output font,'temp-mc.aux'
+ None_Report_t : output font,'temp-report.aux'
+ None_Info_Mcode_t :
+ output font,'temp-info.aux','temp-mc.aux'
+ -update mcf_data_base.mcf
+ -update MCF manual,example
+
[ver. 4.64 / 2021-05-05]
-add parameter for sw_output
Mcode : output MCF aux files
diff --git a/graphics/mcf2graph/README b/graphics/mcf2graph/README
index 230ffee1ba..36b7057f9f 100644
--- a/graphics/mcf2graph/README
+++ b/graphics/mcf2graph/README
@@ -1,7 +1,7 @@
********************************************************************************
mcf2graph : Convert Molecular Coding Format to graphics with METAFONT/METAPOST
Author : Akira Yamaji
- version : 4.64 2021-05-05
+ version : 4.65 2021-05-23
E-mail : mcf2graph@gmail.com
Located at : http://www.ctan.org/pkg/mcf2graph
********************************************************************************
diff --git a/graphics/mcf2graph/mcf2graph.mf b/graphics/mcf2graph/mcf2graph.mf
index 38086f87eb..9cf47d31f8 100644
--- a/graphics/mcf2graph/mcf2graph.mf
+++ b/graphics/mcf2graph/mcf2graph.mf
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 4.64 Copyright (c) 2013-2021 Akira Yamaji
+% mcf2graph ver 4.65 Copyright (c) 2013-2021 Akira Yamaji
%
% Permission is hereby granted, free of charge, to any person obtaining a copy of this software
% and associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -37,7 +37,7 @@
% Set to use plain.mp (label,arrow,atom) : mpost -s labeloffset=2 FILENAME
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
tracingstats:=1;
-message "* This is mcf2graph ver 4.64 2021.05.05";
+message "* This is mcf2graph ver 4.65 2021.05.23";
%-------------------------------------------------------------------------------------------------
newinternal cntA,cntB,cntM,minX,minY,maxX,maxY,sftX,sftY,com,par,envT,envB,lenT,lineT,angT,rotT,
crR,nA,nB,nC,nD,nE,nF,nS,nL,nR,nU,nP,xpos,ypos,markA,markB,saveA,saveB,bondL;
@@ -60,7 +60,8 @@ numberA_start:=numberB_start:=1; numberA_end:=numberB_end:=4095;
%-------------------------------------------------------------------------------------------------
aux_max:=max_inf_num:=20; aux_delimiter:=";"; blank_str:= " "; dum:=(-4091,0);
for i=1 upto aux_max: tag[i]:=""; endfor
-None:=11; Info1:=21; Info2:=22; Info_t:=23; Report:=31; MOL2k:=41; MOL3k:=42;
+None:=11; None_Info_t:=12; None_Mcode_t:=13; None_Info_Mcode_t:=14; None_Report_t:=15;
+Info1:=21; Info2:=22; Info_t:=23; Report:=31; Report_t:=32; MOL2k:=41; MOL3k:=42;
Mfont:=51; Mcode:=61; Mcode_t:=62; Info_Mcode_t:=63;
%-------------------------------------------------------------------------------------------------
a_prn_s:=ASCII("("); a_prn_e:=ASCII(")"); a_brc_s:=ASCII("{"); a_brc_e:=ASCII("}");
@@ -94,6 +95,7 @@ def warning(expr s)= message "% "&decimal(char_num)&fdr(3)(incr warning_cnt)&")"
if (known green)and(known ahlength):
f_MP:=1;
color color_list[];
+ for i=1 upto 100: colorA[i]:=colorB[i]:=0; endfor
prologues:=3;
mpfont:="uhvr8r";
atomfont:=defaultfont:="";
@@ -116,7 +118,7 @@ if (known green)and(known ahlength):
elseif ahlength=8: sw_output:=Mcode; % output aux mc
fi
%-- default bboxmargin=2------------------------------------------------------------------
- if bboxmargin=1: proc_end:=1; fi % output first font only
+ if bboxmargin=1: proc_end:=1; fi % output first font only
%--default labeloffset=3------------------------------------------------------------------
if labeloffset=1: defaultfont:=mpfont; % mpost label
elseif labeloffset=2: defaultfont:=atomfont:=mpfont; % mpost label,atom
@@ -299,7 +301,10 @@ def beginfont(text s)=
enddef;
%==================================================================================================
def endfont=
- if ((sw_output=0)or(sw_output=None))and(f_EOF=0):
+ %--------------------------------------------------------------------------------------------
+ if f_EOF=0:
+ %--------------------------------------------------------------------------------------------
+ if sw_output<=None_Report_t:
if cntM>=1:
if sw_ext_all=1: ext_to_font(EXT_ALL); fi
if sw_trimming>=1:
@@ -343,20 +348,29 @@ def endfont=
%-----------------------------------------------------------------------------------------
endchar;
clearit;
+ %-----------------------------------------------------------------------------------------
+ if sw_output=None_Info_t: proc_info_out(3);
+ ef sw_output=None_Mcode_t: proc_mc_out(2);
+ ef sw_output=None_Info_Mcode_t: proc_info_out(3); proc_mc_out(2);
+ ef sw_output=None_Report_t: proc_report_out(2);
+ fi
+ %-----------------------------------------------------------------------------------------
+ ef sw_output=Info1: proc_info_out(1);
+ ef sw_output=Info2: proc_info_out(2);
+ ef sw_output=Info_t: proc_info_out(3);
+ ef sw_output=Mcode: proc_mc_out(1);
+ ef sw_output=Mcode_t: proc_mc_out(2);
+ ef sw_output=Mfont: proc_mf_out(0);
+ ef sw_output=Report: proc_report_out(1);
+ ef sw_output=Report_t: proc_report_out(2);
+ ef sw_output=MOL2k: proc_mol_out(1);
+ ef sw_output=MOL3k: proc_mol_out(2);
+ ef sw_output=Info_Mcode_t: proc_info_out(3); proc_mc_out(2);
+ fi
%-----------------------------------------------------------------------------------------------
%% message "* parts_cnt (0)="& decimal(parts_cnt) &" "& decimal(parts_usr-parts_usr_start);
%% message "* parts_int (0)="& decimal(parts_int) &" "& decimal(parts_int-parts_int_start);
%-----------------------------------------------------------------------------------------------
- ef sw_output=Info1: proc_info_out(1);
- ef sw_output=Info2: proc_info_out(2);
- ef sw_output=Info_t: proc_info_out(3);
- ef sw_output=Mcode: proc_mc_out(1);
- ef sw_output=Mcode_t: proc_mc_out(2);
- ef sw_output=Mfont: proc_mf_out(0);
- ef sw_output=Report: proc_report_out(0);
- ef sw_output=MOL2k: proc_mol_out(1);
- ef sw_output=MOL3k: proc_mol_out(2);
- ef sw_output=Info_Mcode_t: proc_info_out(3); proc_mc_out(2);
fi
%-----------------------------------------------------------------------------------------------
restore_par(parameter_list);
@@ -370,7 +384,9 @@ def pickup_data_unit(expr t,v)=
f_end:=data_unit_cnt:=semicol_cnt:=cond:=at_semicol[0]:=inf_num:=0;
if t="n": n_var:=scantokens(v); fi
forever:
- temps:=readfrom file_name_input; if temps=EOF: f_EOF:=1; fi exitif temps=EOF;
+ temps:=readfrom file_name_input;
+ if temps=EOF: f_EOF:=1; fi
+ exitif temps=EOF;
if subc(1,temps)="%":
ef subc(1,temps)="+":
data_unit_cnt:=data_unit_cnt+1;
@@ -380,7 +396,10 @@ def pickup_data_unit(expr t,v)=
fi
if cond=1:
forever:
- temps:=readfrom file_name_input; exitif temps=EOF; exitif subc(1,temps)="+";
+ temps:=readfrom file_name_input;
+ if temps=EOF: f_EOF:=1; fi
+ exitif temps=EOF;
+ exitif subc(1,temps)="+";
mc_row:=mc_row+1;
n_fw:=scan_char(" ",temps,1,1);
mc_indent[mc_row]:=n_fw-1;
@@ -390,7 +409,10 @@ def pickup_data_unit(expr t,v)=
f_end:=1;
else:
forever:
- temps:=readfrom file_name_input; exitif temps=EOF; exitif subc(1,temps)="+";
+ temps:=readfrom file_name_input;
+ if temps=EOF: f_EOF:=1; fi
+ exitif temps=EOF;
+ exitif subc(1,temps)="+";
endfor
fi
else:
@@ -853,7 +875,7 @@ def MC(text TXT)=
if (sw_expand=1)or(sw_output=MOL2k)or(sw_output=MOL3k):
expand_set; crR:=1; else: crR:=-ratio_chain_ring;
fi
- cntA:=cntB:=cnt_group:=cntC:=0; strD[0]:="C"; str_cnt:=2000;
+ cntA:=cntB:=cntC:=cnt_group:=0; strD[0]:="C"; str_cnt:=2000;
%-----------------------------------------------------------------------------------------------
font_wd:=xpart(fsize);
font_ht:=ypart(fsize);
@@ -952,6 +974,12 @@ def MC(text TXT)=
clearit;
endgroup;
if sw_output>0: proc_calc(0); fi
+ if cntC>0:
+ for i=1 upto cntA:
+ if colorA[i]<>0: colorA[i]:=0; fi
+ if colorB[i]<>0: colorB[i]:=0; fi
+ endfor
+ fi
enddef;
%-------------------------------------------------------------------------------------------------
def add_group=
@@ -1105,7 +1133,6 @@ def add_atom(expr n)=
if f_bra=0: cntA:=cntA+1; sB[cntB]:=cntA; numS[cntA]:=strAT;
addA[cntA]:=addAT; addAT:=strAT:=add_rot[cntA]:=0;
if rotT<>0: add_rot[cntA]:=rotT; rotT:=0; fi
- if f_MP=1: colorA[cntA]:=colorB[cntA]:=0; fi
else: f_bra:=0; fi
if n=0: eB[cntB]:=cntA+1; f_term:=0; else: eB[cntB]:=n; f_term:=1; fi
enddef;
@@ -1187,7 +1214,6 @@ def termA=
if f_bra=0:
cntA:=cntA+1; numS[cntA]:=strAT; addA[cntA]:=addAT; add_rot[cntA]:=rotT;
addAT:=strAT:=rotT:=0;
- if f_MP=1: colorA[cntA]:=0; fi
else: f_bra:=0;
fi
f_term:=1;
@@ -1653,7 +1679,9 @@ enddef;
%=================================================================================================
def proc_report_out(expr n)=
message "["&decimal(char_num)&"]:"&inf_EN;
- file_name_output:=jobname&"-report.txt";
+ if n=2: file_name_output:="temp-report.aux";
+ else: file_name_output:=jobname&"-report.txt";
+ fi
printf "===========================================================================";
printf " No."&fdr(4)(char_num)&" / Name = "& inf_EN&" / file = "& file_name_input;
if mc_row>=1:
@@ -1711,6 +1739,7 @@ def proc_report_out(expr n)=
printf " Fomula Calc: "&cal_FM&" / Input: "
if inf_FM<>"-": &inf_FM&" / "& iif(inf_FM=cal_FM,"MACTCH","NOT MACTCH") fi;
printf "===========================================================================";
+ if n=2: printf EOF; fi
enddef;
%-------------------------------------------------------------------------------------------------
vardef round_auto(expr n)=
@@ -2002,7 +2031,9 @@ vardef check(expr s)=
for i=1 upto err_cnt:
message "*"&fdr(3)(i)&" "&err_type[err_code[i]]&fdr(4)(err_adr[i])&" '"&err_str[i]&"'";
endfor
+ %---------------------------------------------------------------------------------------------
%%%%%%% if (f_MP=1)and(err_cnt>0): readstring; fi
+ %---------------------------------------------------------------------------------------------
err_cnt
enddef;
%-------------------------------------------------------------------------------------------------
diff --git a/graphics/mcf2graph/mcf_data_base.mcf b/graphics/mcf2graph/mcf_data_base.mcf
index 726ac90578..0f34dabeea 100644
--- a/graphics/mcf2graph/mcf_data_base.mcf
+++ b/graphics/mcf2graph/mcf_data_base.mcf
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% molecular data base file mcf_data_base.mcf by Akira Yamaji 2021.05.05
+% molecular data base file mcf_data_base.mcf by Akira Yamaji 2021.05.23
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% tag1:var1;tag2:var2;tag3:var3 .....
% first character of line '%' comment out
@@ -9,499 +9,581 @@
%==============================================================================
% molecular data for mcf_example.tex No.1-155
%==============================================================================
-Cat:biological;EN:Adenine;MW:135.13
+Cat:biological;EN:Adenine;MW:135.13;EXA:1
+
<30,?6,3=?5,{1,3,5,9}=dl,{2,6,9}:N,5:/NH2,7:NH
+------------------------------------------------------------------------------
-Cat:biological;EN:Guanine;MW:151.13
+Cat:biological;EN:Guanine;MW:151.13;EXA:1
+
<30,?6,3=?5,{1,3,9}=dl,{2,9}:N,{6,7}:NH,5://O,1:/NH2
+------------------------------------------------------------------------------
-Cat:biological;EN:Cytosine;MW:111.10
+Cat:biological;EN:Cytosine;MW:111.10;EXA:1
+
<30,?6,{4,6}=dl,4:N,3://O,2:NH,5:/NH2
+------------------------------------------------------------------------------
-Cat:biological;EN:Thymine;MW:126.11
+Cat:biological;EN:Thymine;MW:126.11;EXA:1
+
<30,?6,3=dl,{2,6}:NH,{1,5}://O,4:/_
+------------------------------------------------------------------------------
-Cat:biological;EN:Uracil;MW:112.09
+Cat:biological;EN:Uracil;MW:112.09;EXA:1
+
<30,?6,6=dl,{3,5}://O,{2,4}:NH
+------------------------------------------------------------------------------
-Cat:biological;EN:Geraniol;MW:154.25
+%== Amino acid ================================================================
+Cat:biological;EN:Glycine;MW:75.07;EXA:-
++
+<30,NH2,!2,COOH
++------------------------------------------------------------------------------
+Cat:biological;EN:L-Alanine;MW:89.10;EXA:-
++
+<30,NH2,!~wb,/_,!,COOH
++------------------------------------------------------------------------------
+Cat:biological;EN:L-Valine;MW:117.15;EXA:-
++
+<30,NH2,!~wb,/?!,!,COOH
++------------------------------------------------------------------------------
+Cat:biological;EN:L-Leucine;MW:131.16;EXA:-
++
+<30,NH2,!~wb,/'(!,?!),!,COOH
++------------------------------------------------------------------------------
+Cat:biological;EN:L-Isoleucine;MW:131.16;EXA:-
++
+<30,NH2,!~wb,/'(/*_,!2),!,COOH
++------------------------------------------------------------------------------
+Cat:biological;EN:L-Serine;MW:105.09;EXA:-
++
+<30,NH2,!~wb,/!OH,!,COOH
++------------------------------------------------------------------------------
+Cat:biological;EN:L-Threonine;MW:119.12;EXA:-
++
+<30,NH2,!~wb,/'(/_,!~wf,OH),!,COOH
++------------------------------------------------------------------------------
+Cat:biological;EN:L-Cysteine;MW:121.16;EXA:-
++
+<30,NH2,!~wb,/!SH,!,COOH
++------------------------------------------------------------------------------
+Cat:biological;EN:L-Methionine;MW:149.21;EXA:-
++
+<30,NH2,!~wb,/'(!2,S,!),!,COOH
++------------------------------------------------------------------------------
+Cat:biological;EN:L-Phenylalanine;MW:165.19;EXA:-
++
+<30,NH2,!~wb,/!Ph,!,COOH
++------------------------------------------------------------------------------
+Cat:biological;EN:L-Tyrosine;MW:181.19;EXA:-
++
+<30,NH2,!~wb,/'(!Ph,-3:/OH),!,COOH
++------------------------------------------------------------------------------
+Cat:biological;EN:L-Triptophan;MW:204.21;EXA:-
++
+<30,NH2,!~wb,!,COOH,@2,\,!,<24,|,?5,-4=Ph,2=dr,5=dl,4:NH
++------------------------------------------------------------------------------
+Cat:biological;EN:L-Proline;MW:115.13;EXA:-
++
+<18,?5,3:NH,4:*/COOH
++------------------------------------------------------------------------------
+Cat:biological;EN:L-Glutamine;MW:146.15;EXA:-
++
+<30,NH2,!~wb,!,COOH,@2,\`1,!`1,!,//O,!,NH2
++------------------------------------------------------------------------------
+Cat:biological;EN:L-Asparagine;MW:132.12;EXA:-
++
+<30,NH2,!~wb,/'(!,//O,!,NH2),!,COOH
++------------------------------------------------------------------------------
+Cat:biological;EN:L-Aspartic acid;MW:133.10;EXA:-
++
+<30,NH2,!~wb,/!COOH,!,COOH
++------------------------------------------------------------------------------
+Cat:biological;EN:L-Glutamic acid;MW:147.13;EXA:-
++
+<30,NH2,!~wb,/'(!2,COOH),!,COOH
++------------------------------------------------------------------------------
+Cat:biological;EN:L-Lysine;MW:146.19;EXA:-
++
+<30,NH2,!~wb,/'(!4,NH2),!,COOH
++------------------------------------------------------------------------------
+Cat:biological;EN:L-Arginine;MW:174.21;EXA:-
++
+<30,NH2,!~wb,!,COOH,@2,\`1,!`1,!2,NH,!,//NH,!,NH2
++------------------------------------------------------------------------------
+Cat:biological;EN:L-Hystidine;MW:155.16;EXA:-
++
+<30,NH2,!~wb,!,COOH,@2,\,!,|,?5,{1,3}=dl,3:N,5:NH
++------------------------------------------------------------------------------
+%==============================================================================
+Cat:biological;EN:Geraniol;MW:154.25;EXA:1
+
<30,!8,OH,{2,6}=dr,{2,6}:/_
+------------------------------------------------------------------------------
-Cat:biological;EN:Limonene;MW:136.24
+Cat:biological;EN:Limonene;MW:136.24;EXA:1
+
<30,?6,2=dl,2:/_,@5,*\,/_,!!
+------------------------------------------------------------------------------
-Cat:biological;EN:l-Menthol;MW:156.27
+Cat:biological;EN:l-Menthol;MW:156.27;EXA:1
+
<30,?6,2:/*?!,5:*/_,3:*/OH
+------------------------------------------------------------------------------
-Cat:biological;EN:Vanillin;MW:152.15
+Cat:biological;EN:Vanillin;MW:152.15;EXA:1
+
<30,Ph,2:/OH,3:/O!,5:/CHO
+------------------------------------------------------------------------------
-Cat:biological;EN:Allicin;MW:162.28
+Cat:biological;EN:Allicin;MW:162.28;EXA:1
+
<-30,!!,!2,SO,!,S,!2,!!
+------------------------------------------------------------------------------
-Cat:biological;EN:Stearic acid;MW:284.48
+Cat:biological;EN:Stearic acid;MW:284.48;EXA:1
+
<30,!17,COOH
+------------------------------------------------------------------------------
-Cat:biological;EN:Linoleic acid;MW:280.45
+Cat:biological;EN:Linoleic acid;MW:280.45;EXA:1
+
<30,!5,-30,-30,!,-30,-30,!7,COOH,{6,9}=dr
+------------------------------------------------------------------------------
-Cat:biological;EN:Sphingosine;MW:299.50
+Cat:biological;EN:Sphingosine;MW:299.50;EXA:1
+
<30,!18,OH,14=dr,-3:*/OH,-2:/*NH2
+------------------------------------------------------------------------------
-Cat:biological;EN:Tocopherol;MW:430.717
+Cat:biological;EN:Tocopherol;MW:430.717;EXA:1
+
<30,Ph,3=?6,7:O,{1,2,5}:/_,8:/*_^60,6:/OH,@8,\,|,!12,{4,8}:/*_,12:/_
+------------------------------------------------------------------------------
-Cat:biological;EN:Carotene;MW:536.8726
+Cat:biological;EN:Carotene;MW:536.8726;EXA:1
+
<30,?6,4=dl,3:??,5:/_,
@4,\,|,!18,{1,3,5,7,9,11,13,15,17}=dr,{3,7,12,16}:/_,?6,-6=dl,-5:/_,-1:??
+------------------------------------------------------------------------------
-Cat:biological;EN:Adrenalin;MW:183.21
+Cat:biological;EN:Adrenalin;MW:183.21;EXA:1
+
<30,Ph,{1,6}:/OH,@4,\,*/OH,!2,NH,!
+------------------------------------------------------------------------------
-Cat:biological;EN:Caffeine;MW:194.194
+Cat:biological;EN:Caffeine;MW:194.194;EXA:1
+
<30,?6,3=dl,{1,5}://O,-4=?5,-3=dl,7:N,{2,6,9}:N!
+------------------------------------------------------------------------------
-Cat:biological;EN:Nicotine;MW:162.23
+Cat:biological;EN:Nicotine;MW:162.23;EXA:1
+
<30,Ph,2:N,@4,\,?5,8:N!
+------------------------------------------------------------------------------
-Cat:biological;EN:Capsaicin;MW:305.418
+Cat:biological;EN:Capsaicin;MW:305.418;EXA:1
+
<30,Ph,1:/OH,6:/O!,@4,\,!,NH,!,//O,!7,?!,-3=dl
+------------------------------------------------------------------------------
-Cat:biological;EN:Thiamine;MW:300.81
+Cat:biological;EN:Thiamine;MW:300.81;EXA:1
+
<30,Ph,4:/NH2,@3,\`1,!,<-12,?5,{-1,-4}=dl,{1,5,8}:N,11:S,{6,9}:/_,
@-3,\,!2,OH,8:p_^72,@(6.7,1.5),Cl,n_^15
+------------------------------------------------------------------------------
-Cat:biological;EN:Gibberellin A3;MW:346.379
+Cat:biological;EN:Gibberellin A3;MW:346.379;EXA:1
+
<18,?5,3=?7,5=?6[12],@8,160`1.3,&3,13=dl,6=wf,8=wb,
@5,40~zf`1,O,50,//O^180,&14~zb,
2:/COOH,7://_,13:*/OH,8:/*OH,14:*/_,{1,4}:*/H^60
+------------------------------------------------------------------------------
-Cat:biological;EN:Cholesterol;MW:386.664
+Cat:biological;EN:Cholesterol;MW:386.664;EXA:1
+
<30,?6,{-4,-2}=?6,-4=?5,7=dl,
1:*/OH,{4,12}:*/_^60,10:/*H^180,{11,-1}:/*H^-60,9:*/H^60,@-1,17,/*_,!4,?!
+------------------------------------------------------------------------------
-Cat:biological;EN:Riboflavin;MW:376.37
+Cat:biological;EN:Riboflavin;MW:376.37;EXA:1
+
<30,Ph,3=?6,9=?6,{8,16}=dl,{7,10,14}:N,12:NH,{11,13}://O,{1,6}:/_,
@10,\`1.2,!,*/OH,!,/*OH,!,*/OH,!2,OH
+------------------------------------------------------------------------------
-Cat:biological;EN:Resveratrol;MW:228.24
+Cat:biological;EN:Resveratrol;MW:228.24;EXA:1
+
<30,Ph,@4,\,!!,!,Ph,{2,6,-3}:/OH
+------------------------------------------------------------------------------
-Cat:biological;EN:Glutathione;MW:307.33
+Cat:biological;EN:Glutathione;MW:307.33;EXA:1
+
<-30,COOH,!,/*NH2,!3,//O,!,NH,!,*/!SH,!,//O,!,NH,!2,COOH
+------------------------------------------------------------------------------
-Cat:synthetic;EN:Hexaphenylbenzene;MW:534.6876
+Cat:synthetic;EN:Hexaphenylbenzene;MW:534.6876;EXA:1
+
<30,Ph,{1,2,3,4,5,6}:/Ph
+------------------------------------------------------------------------------
-Cat:synthetic;EN:Kekulene;MW:600.7
+Cat:synthetic;EN:Kekulene;MW:600.7;EXA:1
+
<30,Ph,{3,-2,-3,-2,-3,-2,-3,-2,-3,-2}=?6,(-3,6)=?6[3],@-4,&6,
{8,12,14,16,18,22,24,26,28,32,34,36,38,42,44,46,48,52,54,56,58}=dl
+------------------------------------------------------------------------------
-Cat:synthetic;EN:18-Crown-6;MW:264.32
+Cat:synthetic;EN:18-Crown-6;MW:264.32;EXA:1
+
<-180,O,60,60,60,O,-60,60,60,O,-60,60,60,O,-60,60,60,O,-60,60,60,O,-60,60,&1
+------------------------------------------------------------------------------
-Cat:synthetic;EN:Porphyrin;MW:310.4
+Cat:synthetic;EN:Porphyrin;MW:310.4;EXA:1
+
<9,#1,?5,@3,\,54,?5,@-2,\,54,?5,@-2,\,54,?5,@-2,\,&5,##,
{1,4,6,8,10,14,16,18,21,23,27}=dl,{4,17}:N,{11,23}:NH
+------------------------------------------------------------------------------
-Cat:synthetic;EN:Sulflower;MW:448.69
+Cat:synthetic;EN:Sulflower;MW:448.69;EXA:1
+
<67.5,?8,{1,3,5,7}=?5,@11,30`1.15,&12,@14,30`1.15,&15,
@17,30`1.15,&18,@20,30`1.15,&9,{9,12,13,16,17,20,21,24}=dl,
{10,13,16,19,21,22,23,24}:S
+------------------------------------------------------------------------------
-Cat:synthetic;EN:Arsphenamine x5;MW:915.2
+Cat:synthetic;EN:Arsphenamine x5;MW:915.2;EXA:1
+
<18,?5,{1,2,3,4,5}:As,{1,2,3,4,5}:/'(Ph,3:/NH2,4:/OH)
+------------------------------------------------------------------------------
-Cat:synthetic;EN:Melamine;MW:126.12
+Cat:synthetic;EN:Melamine;MW:126.12;EXA:1
+
<30,Ph,{2,4,6}:N,{1,3,5}:/NH2
+------------------------------------------------------------------------------
-Cat:synthetic;EN:Sudan red 1;MW:248.28
+Cat:synthetic;EN:Sudan red 1;MW:248.28;EXA:1
+
<30,Ph,1=Ph,4:/OH,@3,\,N,!!,N,!,Ph
+------------------------------------------------------------------------------
-Cat:synthetic;EN:Basic blue 1;MW:319.86
+Cat:synthetic;EN:Basic blue 1;MW:319.86;EXA:1
+
<30,Ph,3=Ph,6=Ph,2:S,5:N,{8,13}:/N?!,2:p_,@(4.2,1.5),Cl,n_^15
+------------------------------------------------------------------------------
-Cat:synthetic;EN:Disperse violet 1;MW:238.25
+Cat:synthetic;EN:Disperse violet 1;MW:238.25;EXA:1
+
<30,Ph,3=?6,-3=dr,9=Ph,{7,10}://O,{-1,-4}:/NH2
+------------------------------------------------------------------------------
-Cat:synthetic;EN:Vat blue 1;MW:262.27
+Cat:synthetic;EN:Vat blue 1;MW:262.27;EXA:1
+
<30,Ph,3=?5,@8,\\,?5,-3=dr,-3=Ph,{7,14}:NH,{9,11}://O
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Atrazine;MW:215.7
+Cat:pesticide;EN:Atrazine;MW:215.7;EXA:1
+
<30,Ph,{2,4,6}:N,5:/Cl,1:/NH!2,3:/NH!?!
+------------------------------------------------------------------------------
-Cat:pesticide;EN:BHC;MW:290.83
+Cat:pesticide;EN:BHC;MW:290.83;EXA:1
+
<30,?6`1.2,{1,3,4,6}:*/Cl,{2,5}:/*Cl
+------------------------------------------------------------------------------
-Cat:pesticide;EN:pp-DDT;MW:354.49
+Cat:pesticide;EN:pp-DDT;MW:354.49;EXA:1
+
<30,Ph,6:/Cl,@3,\,/CCl3,!,Ph,-3:/Cl
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Endrin;MW:380.91
+Cat:pesticide;EN:Endrin;MW:380.91;EXA:1
+
<30,?6`1.3,3=?6,6=dl,9=?3,-1:O,
@2,210~wf`1.5,&5~wb,@7,210~zf`1.5,&10~zb,{1,2,5,6,12^-210,12^-150}:/Cl
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Acrinathrin;MW:541.45
+Cat:pesticide;EN:Acrinathrin;MW:541.45;EXA:1
+
<-30,?3,2^-35:*/_,2^35:/*_,
@1,\,!~dl,!,//O,!,O,!,/CF3,!,CF3,@3,\,//O,!,O,!,/CN,!,Ph,@-4,\,O,-60,Ph
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Cafenstrole;MW:350.4
+Cat:pesticide;EN:Cafenstrole;MW:350.4;EXA:1
+
<30,Ph,{2,4,6}:/_,@3,\,SOO,!,|,?5,{2,5}=dl,{2,4,5}:N,@-2,\,//O,!,N,/!,!2
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Carfentrazone-ethyl;MW:412.19
+Cat:pesticide;EN:Carfentrazone-ethyl;MW:412.19;EXA:1
+
<30,Ph,4:/F,6:/Cl,@1,\,!,/Cl,!,//O,!,O,!2,
@3,\,|,?5,4=dl,{1,3,5}:N,-4://O,-3:/CF2,-2:/_
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Carboxin;MW:235.301
+Cat:pesticide;EN:Carboxin;MW:235.301;EXA:1
+
<30,?6,3=dl,2:S,5:O,4:/_,@3,\,//O,!,NH,!,Ph
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Clomazone;MW:239.7
+Cat:pesticide;EN:Clomazone;MW:239.7;EXA:1
+
-<30,Ph,2:/Cl,@3,\,!,|,?5,1:N,2:O,-2^-35:/_,-2^35:/_,-1://O
+<30,Ph,2:/Cl,@3,\,!,|,?5,1:N,2:O,-2:??,-1://O
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Halfenprox;MW:477.4
+Cat:pesticide;EN:Halfenprox;MW:477.4;EXA:1
+
<30,Ph,@6,\,O,!,/F^35,/F^-35,!,Br,@3,\,!,??,!,O,!,!,Ph,@-2,\,O,60,Ph
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Paraquat;MW:257.16
+Cat:pesticide;EN:Paraquat;MW:257.16;EXA:1
+
Ph,@4,\,Ph,{1,10}:N!,1:p_^-90,10:p_^90,@(5,1),Cl,n_^15,@(-0.5,1),Cl,n_^15
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Picolinafen;MW:376.331
+Cat:pesticide;EN:Picolinafen;MW:376.331;EXA:1
+
<30,Ph,5:/CF3,@3,\,O,!,|,Ph,2:N,@3,\,//O,!,NH,!,|,Ph,4:/F
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Quinoxyfen;MW:308.13
+Cat:pesticide;EN:Quinoxyfen;MW:308.13;EXA:1
+
<30,Ph,4=Ph,10:N,{2,6}:/Cl,@7,\,O,!,|,Ph,4:/F
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Quitozene;MW:295.3
+Cat:pesticide;EN:Quitozene;MW:295.3;EXA:1
+
<30,Ph,{1,2,3,4,6}:/Cl,5:/NO2
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Bitertanol;MW:337.4
+Cat:pesticide;EN:Bitertanol;MW:337.4;EXA:1
+
<30,Ph,@3,\,Ph,@-3,\,O,!2,/OH,!,??!,@14,\,|,?5,{2,4}=dl,{1,2,4}:N
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Bifenox;MW:342.14
+Cat:pesticide;EN:Bifenox;MW:342.14;EXA:1
+
<30,Ph,{4,6}:/Cl,@3,\,O,!,Ph,-4:/COO!,-3:/NO2
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Simeconazole;MW:293.417
+Cat:pesticide;EN:Simeconazole;MW:293.417;EXA:1
+
<36,?5,{1,3,5}:N,{1,4}=dl,@3,30,!,/OH^30,!2,Si,/_,/_^60,!,@7,-30,Ph,-3:/F
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Fenamidone;MW:311.403
+Cat:pesticide;EN:Fenamidone;MW:311.403;EXA:1
+
<18,?5,4=dl,{3,5}:N,2://O,@3,\,NH,!,Ph,4:/S!,1^52:*/_,1^-48~zf:/Ph
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Fenpyroximate;MW:421.49
+Cat:pesticide;EN:Fenpyroximate;MW:421.49;EXA:1
+
<-6,?5,{3,5}=db,{1,2}:N,{2,5}:/Me,@3,\^-15,O,!,Ph,
@4,\,!~dr,N,!,O,!2,|,Ph,@4,\,//O,-60,O,!4
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Chlorsulron;MW:380.648
+Cat:pesticide;EN:Chlorsulron;MW:380.648;EXA:1
+
<30,Ph,6:/NH2,@1,\,SOO,!,NH2,@3,\,SOO,!,NH2,@4,\,/Cl,60~dl,/Cl,!,Cl
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Enrofloxacin;MW:359.401
+Cat:pesticide;EN:Enrofloxacin;MW:359.401;EXA:1
+
<30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,@1,\,|,?6,1:N,4:N,4:/!
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Fenitrothion;MW:277.23
+Cat:pesticide;EN:Fenitrothion;MW:277.23;EXA:1
+
<-30,!,O,!,P,//S,/O!^160,!,O,!,|,Ph,3:/_,2:/NO2
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Fipronil;MW:437.2
+Cat:pesticide;EN:Fipronil;MW:437.2;EXA:1
+
<30,Ph,{2,4}:/Cl,6:/CF3,@3,\,|,?5,{2,4}=dl,{1,2}:N,3:/CN,5:/NH2,
@-2,\,S,//O,!,CF3
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Flumequine;MW:261.225
+Cat:pesticide;EN:Flumequine;MW:261.225;EXA:1
+
<30,Ph,3=?6,(2,7)=?6[4],9=dl,7:N,6:/F,9:/COOH,10://O,13:/_
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Imazalil;MW:297.2
+Cat:pesticide;EN:Imazalil;MW:297.2;EXA:1
+
<-30,!2,O,!2,!~dr,@1,60,|,?5,{2,4}=dl,{1,3}:N,@$2,\,|,Ph,{4,6}:/Cl
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Imidacloprid;MW:255.662
+Cat:pesticide;EN:Imidacloprid;MW:255.662;EXA:1
+
<30,Ph,1:N,6:/Cl,@3,\,!,|,?5,2=dl,1:N,3:N,2:/'(NH,!,NO2)
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Kresoxim-Methyl;MW:313.348
+Cat:pesticide;EN:Kresoxim-Methyl;MW:313.348;EXA:1
+
<30,Ph,@3,\,/COO!,!~dr,N,!,O,!,@4,\,!,O,!,Ph,-1:/_
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Nalidixic acid;MW:232.239
+Cat:antibacterial;EN:Nalidixic acid;MW:232.239;EXA:1
+
<30,Ph,3=?6,9=dl,5:N,6:/_,7://O,8:/COOH,10:N!2
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Oryzalin;MW:346.4
+Cat:antibacterial;EN:Oryzalin;MW:346.4;EXA:1
+
<30,Ph,{1,3}:/NO2,@5,\,SOO,!,NH2,@2,\,/!2,N,!3
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Oxadiazon;MW:345.2
+Cat:antibacterial;EN:Oxadiazon;MW:345.2;EXA:1
+
<30,Ph,{4,6}:/Cl,1:/O!?!,@3,\,|,?5,2=dl,{1,2}:N,4:O,5://O,3:/??!
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Oxadixyl;MW:278.3
+Cat:antibacterial;EN:Oxadixyl;MW:278.3;EXA:1
+
<30,Ph,{2,4}:/_,@3,\,N,!1,//O,!2,O,!,@7,\,|,?5,1:N,2:O,5://O
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Oxyfluorfen;MW:361.701
+Cat:antibacterial;EN:Oxyfluorfen;MW:361.701;EXA:1
+
<30,Ph,6:/CF3,4:/Cl,@3,\,O,!,Ph,-3:/NO2,@-4,\,O,!2
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Sulfadimidine;MW:278.33
+Cat:antibacterial;EN:Sulfadimidine;MW:278.33;EXA:1
+
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,4}:N,{3,5}:/_
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Sulfamerazine;MW:264.303
+Cat:antibacterial;EN:Sulfamerazine;MW:264.303;EXA:1
+
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,6}:N,3:/_
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Sulfadoxine;MW:310.328
+Cat:antibacterial;EN:Sulfadoxine;MW:310.328;EXA:1
+
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{4,6}:N,{2,3}:/O!
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Sulfamethoxazole;MW:253.276
+Cat:antibacterial;EN:Sulfamethoxazole;MW:253.276;EXA:1
+
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,?5,{2,5}=dl,4:O,5:N,3:/_
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Thiamethoxam;MW:291.71
+Cat:antibacterial;EN:Thiamethoxam;MW:291.71;EXA:1
+
<30,?6,4:N,2:O,6:N!,5://'(N,!,NO2),@4,\,!,|,?5,{1,3}=dl,3:N,5:S,4:/Cl
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Thiamphenicol;MW:355
+Cat:antibacterial;EN:Thiamphenicol;MW:355;EXA:1
+
<30,Ph,@1,\,SOO,!,@4,\,/OH,!,/!OH,!`1.1,NH,!`1.1,//O,!,/Cl,!,Cl
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Pyridaphenthion;MW:340.334
+Cat:pesticide;EN:Pyridaphenthion;MW:340.334;EXA:1
+
<30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,|,?6,{1,5}=dl,{2,3}:N,4://O,3:/Ph
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Permethrin;MW:391.288
+Cat:pesticide;EN:Permethrin;MW:391.288;EXA:1
+
<-30,?3,2^-35:*/_,2^35:/*_,1:/'(!!,/Cl,!,Cl),@3,\,//O,!,O,!2,|,Ph,@3,\,O,-60,Ph
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Isoprothiolane;MW:290.392
+Cat:pesticide;EN:Isoprothiolane;MW:290.392;EXA:1
+
<-30,!,?!,O,!,//O,!,//'(?5,2:S,5:S),!,//O,!,O,!,?!
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Oxine-Copper;MW:351.852
+Cat:pesticide;EN:Oxine-Copper;MW:351.852;EXA:1
+
Ph,4:N,5=Ph,@-4,\,O,-60,<90,Cu,-90,O,60,|,Ph,5=Ph,10:N,||,@4,&12~vf,@23,&12~vf
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Tetraconazole;MW:372.145
+Cat:pesticide;EN:Tetraconazole;MW:372.145;EXA:1
+
<-6,?5,{2,5}=dl,{1,2,4}:N,@4,\,!3,O,!,/F^35,/F^-35,!,CF2,@7,\,|,Ph,{4,6}:/Cl
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Endosulfan;MW:406.904
+Cat:pesticide;EN:Endosulfan;MW:406.904;EXA:1
+
<26,?7,7=?6[13],@11,208~wf`1.45,&8~wb,10=dl,{3,5}:O,4:S,4://O,
{8,9,10,11,12^-210,12^-150}:/Cl
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Uniconazole-P;MW:291.779
+Cat:pesticide;EN:Uniconazole-P;MW:291.779;EXA:1
+
<30,Ph,6:/Cl,@3,\,!~dl,!,/OH,!,??!,@8,\,|,?5,{2,4}=dl,{1,2,4}:N
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Oxadiargyl;MW:341.19
+Cat:antibacterial;EN:Oxadiargyl;MW:341.19;EXA:1
+
<30,Ph,{1,3}:/Cl,6:/'(O,!2,!!!),@4,\,|,?5,2=dl,{1,2}:N,4:O,5://O,3:/??!
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Oxaziclomefone;MW:376.277
+Cat:antibacterial;EN:Oxaziclomefone;MW:376.277;EXA:1
+
<30,?6,6=dl,4:N,2:O,1:/_,5://O,6:/Ph,@4,\,??,!,|,Ph,{3,5}:/Cl
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Trimetoprim;MW:290.323
+Cat:antibacterial;EN:Trimetoprim;MW:290.323;EXA:1
+
<30,Ph,{1,5}:N,{2,6}:/NH2,@3,\,!,|,Ph,{3,4,5}:/O!
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Ciprofloxacin;MW:331.347
+Cat:antibacterial;EN:Ciprofloxacin;MW:331.347;EXA:1
+
<30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,@1,\,|,?6,1:N,4:NH
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Danofloxacin;MW:357.385
+Cat:antibacterial;EN:Danofloxacin;MW:357.385;EXA:1
+
<30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,
@1,\,|,?6,@2,-200`1.1,&5,{1,4}:N,4:*/_
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Marbofloxacin;MW:362.361
+Cat:pesticide;EN:Marbofloxacin;MW:362.361;EXA:1
+
<30,Ph,3=?6,9=dl,(2,7)=?6[4],6:/F,7:N,11:O,9:/COOH,10://O,13:N!,
@1,\,|,?6,1:N,4:N!
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Ofloxacin;MW:361.373
+Cat:antibacterial;EN:Ofloxacin;MW:361.373;EXA:1
+
<30,Ph,3=?6,(2,7)=?6[4],9=dl,7:N,11:O,6:/F,9:/COOH,10://O,13:/_,
@1,\,|,?6,{1,4}:N,4:/_
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Ormetoprim;MW:274.324
+Cat:antibacterial;EN:Ormetoprim;MW:274.324;EXA:1
+
<30,Ph,{1,5}:N,{2,6}:/NH2,@3,\,!,|,Ph,2:/_,{4,5}:/O!
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Amoxicillin;MW:365.4042
+Cat:antibiotics;EN:Amoxicillin;MW:365.4042;EXA:1
+
<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
@4,*\^15,NH,!,//O,!,*/NH2,!,Ph,-3:/OH
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Ampicillin;MW:349.405
+Cat:antibiotics;EN:Ampicillin;MW:349.405;EXA:1
+
<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
@4,*\^15,NH,!,//O,!,/*NH2,!,Ph
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Benzyl-Penicillin;MW:334.4
+Cat:antibiotics;EN:Benzyl-Penicillin;MW:334.4;EXA:1
+
<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
@4,*\^15,NH,!,//O,!,!,Ph
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Mecillinam;MW:325.4264
+Cat:antibiotics;EN:Mecillinam;MW:325.4264;EXA:1
+
<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
@4,*\^15,N,!!,!,?7,-7:N
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Nafcillin;MW:414.4748
+Cat:antibiotics;EN:Nafcillin;MW:414.4748;EXA:1
+
<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
@4,*\^15,NH,!,//O,!,Ph,-2=Ph,-9:/O!2
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Oxacillin;MW:401.4363
+Cat:antibiotics;EN:Oxacillin;MW:401.4363;EXA:1
+
<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
@4,*\^15,NH,!,//O,!,<-24,?5,{-2,-5}=dl,-2:N,-3:O,-4:/_,@-1,\^-24,Ph
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Cloxacillin;MW:435.8813
+Cat:antibiotics;EN:Cloxacillin;MW:435.8813;EXA:1
+
<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
@4,*\^15,NH,!,//O,!,<-24,?5,{-2,-5}=dl,-2:N,-3:O,-4:/_,@-1,\^-24,Ph,-5:/Cl
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Dicloxacillin;MW:470.3264
+Cat:antibiotics;EN:Dicloxacillin;MW:470.3264;EXA:1
+
<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
@4,*\^15,NH,!,//O,!,<-24,?5,{-2,-5}=dl,-2:N,-3:O,-4:/_,
@-1,\^-24,Ph,{-1,-5}:/Cl
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Cefalexin;MW:347.3889
+Cat:antibiotics;EN:Cefalexin;MW:347.3889;EXA:1
+
<45,?4,-3=?6,-4=dl,2:N,8:S,3^45:/*H,1://O^15,5:/*COOH,6:/_,
@4,*\^15,NH,!,//O,!,*/NH2,!,Ph
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Cefalonium;MW:458.5107
+Cat:antibiotics;EN:Cefalonium;MW:458.5107;EXA:1
+
<45,?4,-3=?6,-4=dl,2:N,8:S,3^45:/*H,1://O^15,@5,\*,//O,!,O,n_^40,
@4,*\^15,NH,!,//O,!2,?5,{-1,-3}=dl,-4:S,
@6,\,!,|,Ph,1:N,1:p_^180,@4,\,//O,!,NH2
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Cefazorin;MW:454.51
+Cat:antibiotics;EN:Cefazorin;MW:454.51;EXA:1
+
<45,?4,-3=?6,-4=dl,2:N,8:S,3^45:/*H,1://O^15,5:/*COOH,
@4,*\^15,NH,!,//O,!2,?5,{-2,-4}=dl,{-1,-2,-3,-5}:N,
@6,\,!,S,!,?5,{-3,-5}=dl,-1:S,-2:/_,{-3,-4}:N
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Cefquinome;MW:528.6
+Cat:antibiotics;EN:Cefquinome;MW:528.6;EXA:1
+
<45,?4,-3=?6,-4=dl,2:N,8:S,3^45:/*H,1://O^15,@5,\*,//O,!,O,n_^40,
@4,*\^15,NH,!,//O,!,//'(N,!,O,!),!,?5,{-2,-5}=dl,-3:S,-1:N,-2:/NH2,
@6,\,!,Ph,-2=?6,-10:N,-10:p_^180
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Ceftiofur;MW:523.5626
+Cat:antibiotics;EN:Ceftiofur;MW:523.5626;EXA:1
+
<45,?4,-3=?6,-4=dl,2:N,8:S,3^45:/*H,1://O^15,5:/*COOH,
@4,*\^15,NH,!,//O,!,//'(N,!,O,!),!,?5,{-2,-5}=dl,-3:S,-1:N,-2:/NH2,
@6,\,!,S,!,//O,!,?5,{-1,-3}=dl,-4:O
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Cefuroxime;MW:424.3852
+Cat:antibiotics;EN:Cefuroxime;MW:424.3852;EXA:1
+
<45,?4,-3=?6,-4=dl,2:N,8:S,3^45:/*H,1://O^15,5:/*COOH,
@4,*\^15,NH,!,//O,!,//'(N,!,O,!),!,?5,{-1,-3}=dl,-4:O,@6,\,!,O,!,//O,!,NH2
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Apramycin;MW:539.58
+Cat:antibiotics;EN:Apramycin;MW:539.58;EXA:1
+
<30,?6,-4=?6,{2,10}:O,@1,\*,O,60~zb,?6,@9,\*,O,-60~zb,?6,-5:O,
{7,13,-2}:*/OH,{14,-1}:/*OH,{15,17}:*/NH2,{6,-3}:/*NH2,8:*/NH!>vt,
-4:*/!OH,3:/*H^-60`.75,4:*/H^60`.75
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Gentamycin;MW:477.596
+Cat:antibiotics;EN:Gentamycin;MW:477.596;EXA:1
+
<-30,?6,@1,\*,O,0~zb,?6,-5:O,@5,\*,O,0~zb,?6,-5:O,{2,4}:*/NH2,20:/*NH2,6:*/OH,
11:*/OH^-35,11:/*_^35,12:*/NH!,13:/*OH,17:/'(*/_,!NH!)
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Kanamycin;MW:484.499
+Cat:antibiotics;EN:Kanamycin;MW:484.499;EXA:1
+
<-30,?6,@1,\*,O,0~zb,?6,-5:O,@5,\,O,0,?6,-5:O,
{2,4,12}:*/NH2,{6,19}:*/OH,{11,13,18,20}:/*OH,10:*/!OH,17:*/!NH2
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:DihydroStreptmycin;MW:583.574
+Cat:antibiotics;EN:DihydroStreptmycin;MW:583.574;EXA:1
+
<54,?5,3:O,4:/*_,5:/!OH^-48,5:/*OH^35,@1,\*,O,-24~wb,?6,-5:O,@2,*\,O,24~zb,?6,
{10,15}:*/OH,{11,16,18}:/*OH,9:/*!OH,12:*/NH!,
@17,*\^-18,NH,!,//NH,!,NH2,@19,*\,NH,!,//NH,!,NH2
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Fradiomycin;MW:614.644
+Cat:antibiotics;EN:Fradiomycin;MW:614.644;EXA:1
+
<30,?6,3:O,2:/*!NH2,1:*/OH,6:/*OH,5:*/NH2,
@4,*\,O,!~wb,?6,{-3,-5^15}:/*NH2,-2:*/OH^-15,
@-1,\*,O,-72~wb,?5,-4:O,-1:/*OH>vt,-3:*/!OH>vt,
@-2,\*^-24,O,-60~zb,?6,-5:O,-1:/*NH2,-2:*/OH,-3:/*OH,-4:/*!NH2>60
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Streptmycin;MW:581.574
+Cat:antibiotics;EN:Streptmycin;MW:581.574;EXA:1
+
<54,?5,3:O,4:/*_,5:/OH^35,@1,\*,O,-24~wb,?6,-5:O,@2,*\,O,24~zb,?6,
@5,\^-48,!!,O,{10,15}:*/OH,{11,16,18}:/*OH,9:/*!OH,12:*/NH!,
@17,*\^-18,NH,!,//NH,!,NH2,@19,*\,NH,!,//NH,!,NH2
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Neospiramycin;MW:698.9
+Cat:antibiotics;EN:Neospiramycin;MW:698.9;EXA:1
+
<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
{12,14}=dl,2:O,1:/*_,5:/*OH,3://O,10:/*_,6:/*O!>vt,
@-6,\*,O,!~wb,?6`.7,-5:O,-3:/*N?!,-4:*/_,
@7,\*,O,0~wb,?6`.7,-5:O,-2:*/N?!,-1:/*OH,-4:*/_,-3:/*OH,@8,\*,!,!!,O
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Emamectine;MW:886.133
+Cat:antibiotics;EN:Emamectine;MW:886.133;EXA:1
+
<24,?6,6=?5,3=dl,9:O,2:*/OH,3:/_,6:/*OH^-60,
@5,#1.04,6,//O,-60,O,60~wb,60,-60,60~wf,60,-60,60,60,60,-60,60,##,&7,
@@ -510,7 +592,7 @@ Cat:antibiotics;EN:Emamectine;MW:886.133
17:/_,19:/*_,@18,\,O,!,?6`.8,-1:O,-2:*/_,-4:*/O!,
@-3,\,O,60,?6`.8,-5:O,-4:*/_,-3:/*NH!,-2:*/O!
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Spinosad;MW:731.968
+Cat:antibiotics;EN:Spinosad;MW:731.968;EXA:1
+
<30,#1,<-120,60,60,-60,60,60,60,-60,60,60,60,-60,&1,##,
5=?5,-1=dl,{-2^60,-3^-35}:/*H,-3=?6,-4=dl,
@@ -518,7 +600,7 @@ Cat:antibiotics;EN:Spinosad;MW:731.968
@-2,\~zf,O,66,?6`.8,-1:O,-2:/_,{-3,-4,-5}:/O!,8~wf:/Me,5^-65~wf:/H,
@9,\~zf,O,!,|,?6`.8,2:O,3:/_,-3:/N?!
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Spiramycin;MW:843.1
+Cat:antibiotics;EN:Spiramycin;MW:843.1;EXA:1
+
<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
{12,14}=dl,2:O,{1,10^-30}:/*_,5:/*OH,3://O,6:/*O!>vt,
@@ -527,7 +609,7 @@ Cat:antibiotics;EN:Spiramycin;MW:843.1
@-3,\*`1,O,60~wb`1.5,?6`.7,-5:O,{-2^35,-3}:*/OH,{-2^-35,-4}:/*_,
@8,\*,!,!!,O
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Natamycin;MW:665.733
+Cat:antibiotics;EN:Natamycin;MW:665.733;EXA:1
+
<-90,#1,60,60,-60,60,-60,60,-60,60,-60,60,60,60,O,-60,
60,60,-60,60,-60,60,-60,60,60,-60,&1,(12,13)=?6[4],##,
@@ -535,7 +617,7 @@ Cat:antibiotics;EN:Natamycin;MW:665.733
18=?3,-1=wb,-2=wf,-1:O,22://O,24:*/_,{14^60,16}:*/OH,
@10,*\,O,90,?6`.8,-3:*/OH,-5:/*OH,-4:/*NH2,-1:O,-2:/*_
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Tylocin;MW:916.10
+Cat:antibiotics;EN:Tylocin;MW:916.10;EXA:1
+
<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
{12,14}=dl,2:O,1:/*!,5:/*OH,3://O,10:/*_,6:/*_,-6://O,-3:/_,
@@ -544,7 +626,7 @@ Cat:antibiotics;EN:Tylocin;MW:916.10
@-3,\*`1,O,60~wb`1.5,?6`.7,-5:O,{-2^35,-3}:*/OH,{-2^-35,-4}:/*_,
@8,\*,!,!!,O
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Tilmicosin;MW:869.133
+Cat:antibiotics;EN:Tilmicosin;MW:869.133;EXA:1
+
<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
{12,14}=dl,2:O,1:/*!,5:/*OH,{3,11}://O,{6,10}:/*_,14:/_,
@@ -552,191 +634,191 @@ Cat:antibiotics;EN:Tilmicosin;MW:869.133
@7,\*,O,0,?6`.7,-5:O,-2:*/N?!,{-1,-3}:/*OH,-4:*/_,
@8,\*,!2,?6`.7,-6:N,{-2,-4}:*/_
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Chlortetracyclin;MW:478.88
+Cat:antibiotics;EN:Chlortetracyclin;MW:478.88;EXA:1
+
<30,Ph,{-4,-3,-3}=?6,{16,19}=dl,{10,18}://O,7:*/_^-35,2:/Cl,
{5,7~zf^35,13~wf^60,14,16}:/OH,15:*/N?!,17:/CONH2
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Oxytetracyclin;MW:460.434
+Cat:antibiotics;EN:Oxytetracyclin;MW:460.434;EXA:1
+
<30,Ph,{-4,-3,-3}=?6,{16,19}=dl,{10,18}://O,7:*/_^-35,11:*/OH,
{5,7~zf^35,13~wf^60,14,16}:/OH,15:*/N?!,17:/CONH2
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Tetracyclin;MW:444.435
+Cat:antibiotics;EN:Tetracyclin;MW:444.435;EXA:1
+
<30,Ph,{-4,-3,-3}=?6,{16,19}=dl,{10,18}://O,7:*/_^-35,
{5,7~zf^35,13~wf^60,14,16}:/OH,15:*/N?!,17:/CONH2
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Doxycyclin;MW:444.43
+Cat:antibiotics;EN:Doxycyclin;MW:444.43;EXA:1
+
<30,Ph,{-4,-3,-3}=?6,{16,19}=dl,{10,18}://O,7:*/_,
{5,13~wf^60,11~wf,14,16}:/OH,15:*/N?!,@17,\,//O,!,NH2
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Tiamulin;MW:493.74
+Cat:antibiotics;EN:Tiamulin;MW:493.74;EXA:1
+
<-45.5,?8,-3=?5,@8,#.8,-210~zf,/_^60,45,56,##,&6~zb,
{3^-45,5,8}:*/_,@3,\*^30,!~dl,4:/*OH,11://O,7:*/H^60,
@1,\^15,O,!,//O,!2,S,60,60,-60,N!2,60,-60
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:Rifampicin;MW:822.94
+Cat:antibiotics;EN:Rifampicin;MW:822.94;EXA:1
+
<30,Ph,6:/_^30,5:/OH,|,-6=?5,1:O,3://O,2:/*_^60,|,-8=?6,{2,4}=dl,{1,4}:/OH,
#1,@-2,\,NH,60,//O,-60,/_,60~dl,60,60~dl,-60,
*/_,60,/*OH,-60,/*_,60,/*OH,60,*/_^30,-60,
- 60,/*_^30,-53,66,-53~dl,66`1.2,O,##,&($8),
+ 60,/*_^30,-53,66,-53~dl,66`1.2,O,##,&$8,
-4:/*O!,@-6,-30,O,!,//O,!,@$11,\,!!,N,!,|,?6,1:N,4:N!
+------------------------------------------------------------------------------
-Cat:biological;EN:Trenbolone;MW:270.37
+Cat:biological;EN:Trenbolone;MW:270.37;EXA:1
+
<30,?6,{3,10}=?6,13=?5,{2,11,15}=dl,1://O,12:*/_^60,-1:/*OH,9:*/H^60,11:/*H^-60
+------------------------------------------------------------------------------
-Cat:biological;EN:Luciferin;MW:280.33
+Cat:biological;EN:Luciferin;MW:280.33;EXA:1
+
<30,Ph,3=?5,@8,\,?5,{9,16}=dl,{9,14}:N,{7,11}:S,1:/OH,-2:*/COOH
+------------------------------------------------------------------------------
-Cat:biological;EN:Chlorophyll a;MW:893.509
+Cat:biological;EN:Chlorophyll a;MW:893.509;EXA:1
+
<-36,#1,?5,@3,\,54,?5,@-2,\,54,?5,@-2,\,54,?5,@-2,\,&5,@6,22,70,&8,##,
{4,6,8,10,14,16,18,21,23,27}=dl,@4,\`1.48~vf,Mg,&17~vb,@11,&27,@27,&23,
{4,11,17,23}:N,{1~zf,9,15,21}:/_,14:/!,20:/!!,25:/*COO!,26://O,
@2,*\^-6,!2,//O,!,O,!2,!!,|,!13,{1,5,9,13}:/_
+------------------------------------------------------------------------------
-Cat:biological;EN:Quercetin;MW:302.24
+Cat:biological;EN:Quercetin;MW:302.24;EXA:1
+
<30,Ph,3=?6,@9,\,Ph,9=dl,10:O,7://O,{2,6,8,13,14}:/OH
+------------------------------------------------------------------------------
-Cat:biological;EN:Limonin;MW:470.518
+Cat:biological;EN:Limonin;MW:470.518;EXA:1
+
<30,?6,{-3,-4}=?6,-5=?3,-2=wf,-1=wb,6=?5,-4=?6,-5=wf,{13,15,17,20}:O,
{3,12,21}://O,{4~wf^60,8~zf^60}:/_,18:??,{1^60,5^180,16^60}:/*H,
@14,\*,|,?5,{1,4}=dl,3:O
+------------------------------------------------------------------------------
-Cat:biological;EN:Cromolyn;MW:468.37
+Cat:biological;EN:Cromolyn;MW:468.37;EXA:1
+
<30,Ph,|,-1=?6,3=dl,1:O,4://O,2:/COOH,
@$2,\,O,!2,/OH,!2,O,60,Ph,|,-5=?6,3=dl,4:O,1://O,3:/COOH
+------------------------------------------------------------------------------
-Cat:biological;EN:Emetine;MW:480.649
+Cat:biological;EN:Emetine;MW:480.649;EXA:1
+
<30,Ph,{-4,-4}=?6,8:N,{1,6}:/O!,-2:/*!,{7^-60,12^-60}:/*H,
@-3,\,!~zb,<-60,|,?6,5=dl,2:NH,-6^-60:*/H,|,-2=?6,{2,4}=dl,{-2,-3}:/O!
+------------------------------------------------------------------------------
-Cat:biological;EN:Acronycine;MW:321.376
+Cat:biological;EN:Acronycine;MW:321.376;EXA:1
+
<30,Ph,|,-4=?6,1:N!,4://O,-3=Ph2,-1:/O!,|,-4=?6,2=dl,4:O,3:??
+------------------------------------------------------------------------------
-Cat:biological;EN:Piperine;MW:285.343
+Cat:biological;EN:Piperine;MW:285.343;EXA:1
+
<30,Ph,|,-1=?5,{1,3}:O,@$4,\,!!,!,!!,!,//O,!,|,?6,1:N
+------------------------------------------------------------------------------
-Cat:biological;EN:Febrifugine;MW:301.346
+Cat:biological;EN:Febrifugine;MW:301.346;EXA:1
+
<30,Ph,|,-4=?6,2=dl,{1,3}:N,4://O,@$9,\,!,//O,!,!~zf,|,?6,2:NH,-1:*/OH
+------------------------------------------------------------------------------
-Cat:biological;EN:Mitomycine C;MW:334.332
+Cat:biological;EN:Mitomycine C;MW:334.332;EXA:1
+
<30,?6,{3,6}=dl,{2,5}://O,1:/_,-4=?5,-3:N,
6:/NH2,,-3=?5,-2=?3,-1=wb,-2=wf,-1:NH,8:/*O!^35,@$9,\,!,O,60,//O,!,NH2
+------------------------------------------------------------------------------
-Cat:biological;EN:Podophyllotoxin;MW:414.41
+Cat:biological;EN:Podophyllotoxin;MW:414.41;EXA:1
+
<0,?5,{2,5}:O,-3=Ph2,-3=?6,-3=?5,-2:O,-1=wb,-3://O,
@10,\*,Ph,{-2,-3,-4}:/O!,13:/*OH,{11~wf^-60,12~zf^60}:/H
+------------------------------------------------------------------------------
-Cat:biological;EN:Warfarin;MW:308.333
+Cat:biological;EN:Warfarin;MW:308.333;EXA:1
+
<30,Ph,3=?6,8=dl,10:O,7:/OH,9://O,@8,\,/Ph`1,60,!,//O,!
+------------------------------------------------------------------------------
-Cat:biological;EN:Genistein;MW:270.24
+Cat:biological;EN:Genistein;MW:270.24;EXA:1
+
<30,Ph,3=?6,9=dl,10:O,{2,6}:/OH,7://O,@8,\,Ph,-3:/OH
+------------------------------------------------------------------------------
-Cat:biological;EN:Baicalein;MW:270.24
+Cat:biological;EN:Baicalein;MW:270.24;EXA:1
+
<30,Ph,3=?6,9=dl,10:O,{1,2,6}:/OH,7://O,@8,\,Ph
+------------------------------------------------------------------------------
-Cat:biological;EN:Reserpine;MW:608.688
+Cat:biological;EN:Reserpine;MW:608.688;EXA:1
+
<54,Ph,-4=?5,-2=?6,-4=?6,-3=?6,9=dl,11:N,7:NH,10:*/H^-60,{15^-60,16^60}:/*H,
@20,*\,O,!,//O,!,Ph,{-2,-3,-4}:/O!,{1,19~zf>rl}:/O!,18:*/COO!>lr
+------------------------------------------------------------------------------
-Cat:biological;EN:Rotenone;MW:394.423
+Cat:biological;EN:Rotenone;MW:394.423;EXA:1
+
<-60,?5,{-3,-2,-3,-4}=?6,{7,9,-2,-4}=dl,{3,17}=dr,
{2,13,16}:O,10://O,{11^-60,12^60}:*/H,{-2,-3}:/O!,@1,*\,/_,!!
+------------------------------------------------------------------------------
-Cat:biological;EN:Pyrethrin I;MW:328.452
+Cat:biological;EN:Pyrethrin I;MW:328.452;EXA:1
+
<30,?3,{3^35~wf,3^-35~zf}:/_,@1,*\,!!,?!,
@2,\*,//O,!,O,-36~zb,|,?5,-2=dl,-1:/_,-3://O,@-2,\,!4,{-1,-3}=dl
+------------------------------------------------------------------------------
-Cat:biological;EN:Oseltamivir;MW:312.40
+Cat:biological;EN:Oseltamivir;MW:312.40;EXA:1
+
<30,?6,3=dl,6:*/NH2,@1,\*,NH,!,//O,!,@2,*\,O,!,/!,!2,@4,\,//O,!,O,!2
+------------------------------------------------------------------------------
-Cat:biological;EN:Paclitaxel;MW:853.918
+Cat:biological;EN:Paclitaxel;MW:853.918;EXA:1
+
?6,5=dl,@3,#1,36,45,45,45,45,##,&5,-4=?6,-4=?4,-1=wb,-3=wf,-1:O,
4:??,6:/_,{3^-60,15}:*/OH,8:/*H^-60,9:*/_^60,10://O,
@1,\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph,
@7,\*,O,-45,//O,60,Ph,11:*/OCO!>rl,12:/*OCO!^-15>lr
+------------------------------------------------------------------------------
-Cat:biological;EN:Mevastatin;MW:390.52
+Cat:biological;EN:Mevastatin;MW:390.52;EXA:1
+
<30,?6,2=dl,4:*/H^60,-4=?6,-4=dl,9:*/_,
@10,*\,!,60~wb,?6,6:O,-2://O,-4:/*OH,@5,\*,O,60,//O,!,*/_,!2
+------------------------------------------------------------------------------
-Cat:biological;EN:Sesamine;MW:354.35
+Cat:biological;EN:Sesamine;MW:354.35;EXA:1
+
<54,?5,1=?5,{4,7}:O,{1^-54,2^54}:*/H,{5,8}:*/'(Ph,4=?5,7:O,9:O)^-12
+------------------------------------------------------------------------------
-Cat:biological;EN:Morphine;MW:285.343
+Cat:biological;EN:Morphine;MW:285.343;EXA:1
+
<30,Ph,2=?6,-4=?6,(1,12)=?5[2],-1:O,-1=zb,
@7,60~wf`0.75,70~si_`1.3,45,N!,&9~wb,15=dl,6:/OH,8^180:*/H,12:/*OH
+------------------------------------------------------------------------------
-Cat:biological;EN:Quinine;MW:324.424
+Cat:biological;EN:Quinine;MW:324.424;EXA:1
+
<30,Ph,3=Ph,7:N,6:/O!,
@10,\,*/OH,/H~zf^-60,!,|,?6,2:N,1:*/H^60,@4,*\,!!,@2,165~zf,60,&5~zb
+------------------------------------------------------------------------------
-Cat:biological;EN:Atoropin;MW:289.375
+Cat:biological;EN:Atoropin;MW:289.375;EXA:1
+
<30,O,!,//O,!,!,Ph,@$1,\~zb^-60,|,?7`1.1,@6,*\^190`1.25,N!,&3~wb,$3:/!OH~wv
+------------------------------------------------------------------------------
-Cat:biological;EN:Colchicine;MW:399.443
+Cat:biological;EN:Colchicine;MW:399.443;EXA:1
+
<30,Ph,{1,2,6}:/O!,-4=?7,-5=?7,{-1,-4,-6}=dl,-2://O,-3:/O!,9:/NHCO!
+------------------------------------------------------------------------------
-Cat:biological;EN:Lycorine;MW:287.315
+Cat:biological;EN:Lycorine;MW:287.315;EXA:1
+
<30,Ph,-4=?6,-2=?6,6=?5,(9,12)=?5[3],13=dl,8:N,{15,17}:O,
9:/*H^180,10:*/H^60,13:*/OH,14:/*OH
+------------------------------------------------------------------------------
-Cat:biological;EN:Ibotenic acid;MW:158.113
+Cat:biological;EN:Ibotenic acid;MW:158.113;EXA:1
+
<18,?5,4=dl,3:O,2:NH,1://O,@4,-24,/NH2,!,COOH
+------------------------------------------------------------------------------
-Cat:biological;EN:illudin S;MW:264.3
+Cat:biological;EN:illudin S;MW:264.3;EXA:1
+
<30,?6,3=?5,6:**?3,{4,7}=dl,2://O,5:/_,
{1^35,8^35}:*/_,1:/*OH^-35,9:*/OH,8:/*!OH^-35
+------------------------------------------------------------------------------
-Cat:biological;EN:Muscarine;MW:174.26
+Cat:biological;EN:Muscarine;MW:174.26;EXA:1
+
<18,?5,2:O,1:*/_,5:/*OH,@3,*\,48,N,??,p_^180,!
+------------------------------------------------------------------------------
-Cat:biological;EN:Psilocybin;MW:284.248
+Cat:biological;EN:Psilocybin;MW:284.248;EXA:1
+
<30,Ph,3=?5,8=dl,9:NH,@2,\,O,-60,P,//O^-45,/OH^45,90,OH,@7,\,!,-60,N?!
+------------------------------------------------------------------------------
-Cat:biological;EN:Tetrodotoxine;MW:319.27
+Cat:biological;EN:Tetrodotoxine;MW:319.27;EXA:1
+
#1,<60,-90,60,-30`1.15,150,60,&1,@3,-135,60,-30`1.15,150,&4,
@10,\,O,60`1.33,60,&($3)~si_,@8,-15~si_,O,&12,##,
@9,45,-60,OH,1^120://NH,{5~zf^-15,7,9^-75,12,13~zf}:/OH,{2,6^180}:NH
+------------------------------------------------------------------------------
-Cat:biological;EN:Aflatoxin B1;MW:312.27
+Cat:biological;EN:Aflatoxin B1;MW:312.27;EXA:1
+
<30,Ph,6=?6,-2=?5,4=?5,-2=?5,{-2,10}=dl,{7,14,17}:O,
2:/O!,{8,11}://O,{15^-54,16^54}:*/H
@@ -744,7 +826,1220 @@ Cat:biological;EN:Aflatoxin B1;MW:312.27
%==============================================================================
% other molecular data
%==============================================================================
-Cat:antibiotics;EN:Vancomycin;MW:1449.25
+Cat:pesticide;EN:BHC;MW:290.83;EXA:-
++
+<30,?6`1.2,{1,3,4,6}:*/Cl,{2,5}:/*Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:pp-DDT;MW:354.49;EXA:-
++
+<30,Ph,6:/Cl,@3,\,/CCl3,!,Ph,-3:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:op-DDT;MW:354.49;EXA:-
++
+<30,Ph,4:/Cl,@3,\,/CCl3,!,Ph,-3:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:pp-DDD;MW:320;EXA:-
++
+<30,Ph,6:/Cl,@3,\,/CCl2,!,Ph,-3:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:pp-DDE;MW:318;EXA:-
++
+<30,Ph,6:/Cl,@3,\,/CCl2~dm,!,Ph,-3:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:EPN;MW:323.303;EXA:-
++
+<30,!2,O,!,P,//S,/Ph^170,!,O,!,|,Ph,4:/NO2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:XMC;MW:179.2;EXA:-
++
+<30,Ph,{1,5}:/_,@3,\,O,!,//O,!,NH,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Acrinathrin;MW:541.45;EXA:-
++
+<-30,?3,2^-35:*/_,2^35:/*_,
+ @1,\,!~dl,!,//O,!,O,!,/CF3,!,CF3,@3,\,//O,!,O,!,/CN,!,Ph,@-4,\,O,-60,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Azaconazole;MW:300.139;EXA:-
++
+<30,Ph,{4,6}:/Cl,@3,\,!2,?5,{-2,-4}=dl,{-2,-4,-5}:N,@7,?5,{-1,-4}:O
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Acetochlor;MW:269.769;EXA:-
++
+<30,Ph,2:/_,4:/!,@3,\,N,!2,O,!2,@7,\,//O,!2,Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Atrazine;MW:215.7;EXA:-
++
+<30,Ph,{2,4,6}:N,5:/Cl,1:/NH!2,@3,\,NH,!?!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Anilofos;MW:367.9;EXA:-
++
+<-30,!,O,!,P,//S,/O!^160,!,S,!2,//O,!,N,/?!,!,Ph,-3:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Alachrol;MW:269.8;EXA:-
++
+<-30,!,O,!2,N,!,//O,!2,Cl,@4,\,|,Ph,{2,6}:/!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Isazofos;MW:313.74;EXA:-
++
+<30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,|,?5,{2,5}=dl,{2,4,5}:N,4:/Cl,3:/?!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Isoprcarb;MW:193.246;EXA:-
++
+<30,Ph,2:/?!,@3,\,O,!,//O,!,NH,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Isoprothiolane;MW:290.4;EXA:-
++
+<30,!,/_,!,O,!,//O,!,!,//O,!,O,!,?!,@5,\\,|,?5,{2,5}:S
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Iprobenfos;MW:288.34;EXA:-
++
+<30,!,/_,!,O,!,P,//O,/O!?!^170,!,S,!2,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Uninnazole-P;MW:291.779;EXA:-
++
+<30,Ph,6:/Cl,@3,\,!~dl,!,/OH,!,??!,@8,\,|,?5,{2,4}=dl,{1,2,4}:N
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Esprocarb;MW:265.4;EXA:-
++
+<30,Ph,@3,\,!,S,!,//O,!,N,/!,!,/?!,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Ethalfluralin;MW:333.3;EXA:-
++
+<30,Ph,{1,3}:/NO2,5:/CF3,@2,\`1.1,/!,N,!2,/_,!~dr
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Ethion;MW:384.46;EXA:-
++
+<30,!2,O,!,P,//S,/O!2^160>rl,!,S,!2,S,!,P,//S,/O!2^200>lr,!,O,!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Edifenphos;MW:310.37;EXA:-
++
+<30,Ph,@3,\,O,!,P,//S,/O!2>rl^160,!,S,!,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Ethofenprox;MW:376.5;EXA:-
++
+<30,Ph,@5,\,O,!,Ph,@10,\,O,!3,??,!,Ph,-3:/O!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Ethoprophos;MW:242.33;EXA:-
++
+<-30,!3,S,!,P,//O,/S!3^160>rl,!,O,!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Ethrimfos;MW:292.29;EXA:-
++
+<-30,!,O,!,P,//S,/O!^160,!,O,!,|,Ph,{2,4}:N,5:/!,3:/O!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Endrin;MW:380.91;EXA:-
++
+<30,?6`1.3,3=?6,6=dl,9=?3,-1:O,
+ @2,210~wf`1.5,&5~wb,@7,210~zf`1.5,&10~zb,{1,2,5,6,12^-210,12^-150}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Oxadiazon;MW:345.2;EXA:-
++
+<30,Ph,{4,6}:/Cl,1:/O!?!,@3,\,|,?5,2=dl,{1,2}:N,4:O,5://O,3:/??!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Oxadixyl;MW:278.3;EXA:-
++
+<30,Ph,{2,4}:/_,@3,\,N,!1,//O,!2,O,!,@7,\,|,?5,1:N,2:O,5://O
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Oxyfluorfen;MW:361.701;EXA:-
++
+<30,Ph,6:/CF3,4:/Cl,@3,\,O,!,Ph,-3:/NO2,@-4,\,O,!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Cadusafos;MW:270.386;EXA:-
++
+<-30,!2,/_,!,S,!,P,//O,/O!2^160>rl,!,S,!,/_,!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Cafenstrole;MW:350.4;EXA:-
++
+<30,Ph,{2,4,6}:/_,@3,\,SOO,!,|,?5,{2,5}=dl,{2,4,5}:N,@-2,\,//O,!,N,/!,!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Carfentrazone-ethyl;MW:412.19;EXA:-
++
+<30,Ph,4:/F,6:/Cl,@1,\,!,/Cl,!,//O,!,O,!2,
+ @3,\,|,?5,4=dl,{1,3,5}:N,-4://O,-3:/CF2,-2:/_
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Carboxin;MW:235.301;EXA:-
++
+<30,?6,3=dl,2:S,5:O,4:/_,@3,\,//O,!,NH,!,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Quinalphos;MW:298.30;EXA:-
++
+<30,!,O,!2,P,//S,/O!2^160>rl,!,O,!,|,Ph,3=Ph,{2,5}:N
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Quinoxyfen;MW:308.13;EXA:-
++
+<30,Ph,4=Ph,10:N,{2,6}:/Cl,@7,\,O,!,|,Ph,4:/F
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Quitozene;MW:295.3;EXA:-
++
+<30,Ph,{1,2,3,4,6}:/Cl,5:/NO2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Kresoxim-Methyl;MW:313.348;EXA:-
++
+<30,Ph,@3,\,/COO!,!~dr,N,!,O,!,@4,\,!,O,!,Ph,-1:/_
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Clomazone;MW:239.7;EXA:-
++
+<30,Ph,2:/Cl,@3,\,!,|,?5,1:N,2:O,-2:??,-1://O
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Chlorpyrifos;MW:350.59;EXA:-
++
+<30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,|,Ph,6:N,{2,4,5}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Chlorpyrifos-methyl;MW:322.53;EXA:-
++
+<-30,!,O,!,P,//S,/O!^160>rl,!,O,!,|,Ph,6:N,{2,4,5}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Chlorfenapyr;MW:407.62;EXA:-
++
+<18,?5,3=dl,5=dl,2:N,4:/CN,5:/Br,1:/CF3,@2,\,!,O,!2,@3,\,Ph,-3:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Chlorfenson;MW:303.153;EXA:-
++
+<30,Ph,@3,\,O,!,SOO,!,Ph,{6,12}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Chlorfenvinphos;MW:359.58;EXA:-
++
+<30,!2,O,!,P,//O,/O!2^160>rl,!,O,!,!~dr,!,Cl,@6,\`1,|,Ph,{2,4}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Chlorpropham;MW:213.7;EXA:-
++
+<30,Ph,6:/Cl,@4,\,NH,!,//O,!,O,!,/_,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Chlorbenside;MW:269.183;EXA:-
++
+<30,Ph,@3,\,S,!2,Ph,{6,12}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Chlorobenzilate;MW:325.2;EXA:-
++
+<30,Ph,@3,\,/OH^-35,/COO!2^30>lr,!,Ph,{6,11}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Cyanazine;MW:240.7;EXA:-
++
+<30,Ph,{2,4,6}:N,5:/Cl,1:/NH!2,@3,\,NH,!,??,!,CN
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Cyanophos;MW:243.22;EXA:-
++
+<-30,!,O,!,P,//S,/O!^160,!,O,!,|,Ph,4:/CN
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Diethofencarb;MW:267.3;EXA:-
++
+<30,Ph,@4,\,NH,!,//O,!,O,!,/_,!,{1,6}:/O!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Dichlofenthion;MW:315.2;EXA:-
++
+<30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,|,Ph,{2,4}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Diclofop-methyl;MW:341.2;EXA:-
++
+<30,Ph,{4,6}:/Cl,@3,\,O,!,Ph,@-4,\,O,!,/_,!,COO!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Cyhalothrin;MW:449.86;EXA:-
++
+<-30,?3,2^-35:*/_,2^35:/*_,@1,\,!~dl,/CF3,!,Cl,
+ @3,\,//O,!,O,!,/CN,!,Ph,@-4,\,O,-60,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Cyhalofop-Buthyl;MW:357.381;EXA:-
++
+<30,Ph,1:/CN,4:/F,@3,\,O,!,|,Ph,@-3,\,O,!,/_,!,//O,!,O,!4
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Diphenamid;MW:239.3;EXA:-
++
+<30,Ph,@3,\,!,Ph,@-5,\,//O,!,N,/_,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Cyfluthrin;MW:434.3;EXA:-
++
+<-30,?3,{2^-35~wf,2^35~zf}:/_,
+ @1,\,!~dl,/Cl,!,Cl,@3,\,//O,!,O,!,/CN,!,Ph,-3:/F,@-4,\,O,-60,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Diflufenican;MW:394.29;EXA:-
++
+<30,Ph,{1,5}:/F,@4,\,NH,!,//O,!,Ph,6:N,@-5,\,O,!,Ph,-3:/CF3
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Cyproconazole;MW:291.8;EXA:-
++
+<30,?3,@2,\,/_,!,/OH^30,-90,!,|,<-18,?5,{2,4}=dl,{1,3,5}:N,@$5,-30,Ph,-3:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Cypermethrin;MW:416.3;EXA:-
++
+<-30,?3,{2^-35~wf,2^35~zf}:/_,
+ @1,\,!~dl,/Cl,!,Cl,@3,\,//O,!,O,!,/CN,!,Ph,@-4,\,O,-60,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Simazine;MW:201.7;EXA:-
++
+<30,Ph,{2,4,6}:N,5:/Cl,1:/NH!2,3:/NH!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Dimethametryn;MW:255.4;EXA:-
++
+<30,Ph,{2,4,6}:N,5:/S!,1:/NH!2,@3,\,NH,!,/_,!,/_,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Dimethylvinphos;MW:331.52;EXA:-
++
+<-30,!,O,!,P,//O,/O!^160,!,O,!,!~dl,!,Cl,@5,\`1,Ph,{-5,-3}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Dimethenamid;MW:275.8;EXA:-
++
+<-6,?5,{3,5}=dl,2:S,{3,5}:/_,@4,\,N,!,//O,!2,Cl,@6,\,/_,!2,O,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Dimethoate;MW:229.25;EXA:-
++
+<-30,!,O,!,P,//S,/O!^160,!,S,!2,//O,!,NH,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Simetryn;MW:213.3;EXA:-
++
+<30,Ph,{2,4,6}:N,5:/S!,{1,3}:/NH!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Dimepiperate;MW:263.4;EXA:-
++
+<30,Ph,@3,\,??,!,S,!,//O,!,|,?6,1:N
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Diazinon;MW:304.35;EXA:-
++
+<30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,|,Ph,{4,6}:N,5:/_,3:/?!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Thiobencarb;MW:257.776;EXA:-
++
+<30,Ph,1:/Cl,@4,\,!,S,!,//O,!,N,/!,!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Thiometon;MW:246.34;EXA:-
++
+<-30,!,O,!,P,//S,/O!^160,!,S,!3,S,!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Thifluzamide;MW:528.08;EXA:-
++
+<-12,?5,{3,5}=dl,2:S,5:N,3:/CF3,1:/_,
+ @4,\,//O,!,NH,!,<6,|,Ph,{2,6}:/Br,@-3,\,O,!,CF3
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Dieldrin;MW:380.895;EXA:-
++
+<30,?6`1.2,3=?6,6=dl,9=?3,-1:O,@2,148~wf`1.4,&5~wb,
+ @7,145~zf`1.3,&10~zb,{1,2,5,6,12^-210,12^-150}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Aldrin;MW:364.908;EXA:-
++
+<30,?6`1.3,3=?6,{6,9}=dl,
+ @2,210~wf`1.5,&5~wb,@7,210~zf`1.5,&10~zb,{1,2,5,6,11^-210,11^-150}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Tecnazene;MW:260.879;EXA:-
++
+<30,Ph,{1,3,4,6}:/Cl,5:/NO2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Tetrachlorvinfos;MW:365.97;EXA:-
++
+<-30,!,O,!,P,//O,/O!^160,!,O,!,!~dr,!,Cl,@5,\`1,|,Ph,{2,4,5}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Tetraconazole;MW:372.14;EXA:-
++
+<-6,?5,{2,5}=dl,{1,2,4}:N,@4,\,!3,O,!,/F^35,/F^-35,!,CF2,@7,\,|,Ph,{4,6}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Tetradifon;MW:356.038;EXA:-
++
+<30,Ph,@3,\,SOO,!,Ph,{6,10,11,13}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Thenylchlor;MW:323.835;EXA:-
++
+<6,?5,{2,5}=dl,4:S,2:/O!,@3,\,!,N,!,//O,!2,Cl,@7,-15,Ph,{-1,-5}:/_
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Tebuconazole;MW:307.8;EXA:-
++
+<36,?5,{1,4}=dl,{1,3,5}:N,@3,\^30,!4,Ph,-3:/Cl,7^-30:/??!,7^30:/OH
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Tebufenpyrad;MW:333.86;EXA:-
++
+<6,?5,{3,5}=dl,{1,2}:N,4:/Cl,5:/!,2:/_,@3,\,//O,!,NH,!2,Ph,-3:/??!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Tefluthrin;MW:418.736
++
+<-30,?3,{2^-35~wf,2^35~zf}:/_,@1,\,!~dl,/CF3,!,Cl,
+ @3,\,//O,!,O,!2,|,Ph,{2,3,5,6}:/F,4:/_
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Terbutryn;MW:241.4;EXA:-
++
+<30,Ph,{2,4,6}:N,5:/S!,1:/NH!2,@3,\,NH,!,??!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Terbufos;MW:288.42;EXA:-
++
+<30,!2,O,!,P,//S,/O!2^160>rl,!,S,!2,S,!,??!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Triadimefon;MW:293.8;EXA:-
++
+<30,Ph,6:/Cl,@3,\,O,!2,//O,!,??!,@8,\,|,?5,{2,4}=dl,{1,2,4}:N
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Triazophos;MW:313.31;EXA:-
++
+<30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,<-12,|,?5,{2,5}=dl,{2,4,5}:N,4:/Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Triallate;MW:304.7;EXA:-
++
+<-30,!,/_,!,N,/?!,!,//O,!,S,!2,/Cl,!~dr,/Cl,!,Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Tribufos;MW:314.50;EXA:-
++
+<30,!4,S,!,P,//O,/'(S,!4)^160>rl,!,S,!4
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Tolclofos-methyl;MW:301.13;EXA:-
++
+<-30,!,O,!,P,//S,/O!^160,!,O,!,|,Ph,{2,6}:/Cl,4:/_
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Trifluralin;MW:335.3;EXA:-
++
+<30,Ph,{1,3}:/NO2,5:/CF3,@2,\,N,/!2,!3
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Napropamide;MW:271.4;EXA:-
++
+<-30,Ph,4=Ph,@10,\,O,!,??,!,//O,!,N,/!,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Nitrothal-isopropyl;MW:295.3;EXA:-
++
+<30,Ph,5:/NO2,@1,\,//O,!,O,!?!,@3,\,//O,!,O,!?!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Norflurazon;MW:303.7;EXA:-
++
+<30,?6,{1,5}=dl,{4,5}:N,1:/NH!,3://O,2:/Cl,@4,\,Ph,-4:/CF3
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Paclobutrazole;MW:293.795;EXA:-
++
+<30,Ph,6:/Cl,@3,\,!2,/OH,!,??!,@8,\,|,?5,{2,4}=dl,{1,2,4}:N
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Halfenprox;MW:477.4;EXA:-
++
+<30,Ph,@6,\,O,!,/F^35,/F^-35,!,Br,@3,\,!,??,!,O,!,!,Ph,@-2,\,O,!,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Picolinafen;MW:376.331;EXA:-
++
+<30,Ph,5:/CF3,@3,\,O,!,|,|,Ph,2:N,@3,\,//O,!,NH,!,|,Ph,4:/F
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Bitertanol;MW:337.4;EXA:-
++
+<30,Ph,@3,\,Ph,@-3,\,O,!2,/OH,!,??!,@14,\,|,?5,{2,4}=dl,{1,2,4}:N
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Bifenox;MW:342.14;EXA:-
++
+<30,Ph,{4,6}:/Cl,@3,\,O,!,Ph,-4:/COO!,-3:/NO2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Bifenthrin;MW:422.88;EXA:-
++
+<-30,?3,2^-35:*/_,2^35:/*_,
+ @1,\,!~dl,/Cl,!,CF3,@3,\,//O,!,O,!,-60,Ph,-1:/_,-2:/Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Piperophos;MW:353.48;EXA:-
++
+<-30,!3,O,!,P,//S,/O!?!^160>rl,!,S,!2,//O,!,|,?6,1:N,6:/_
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Pyraclofos;MW:360.80;EXA:-
++
+<30,!2,O,!,P,//O,/S!3^160>rl,!,O,!,
+ <-12,|,?5,{1,4}=dl,{3,4}:N,@-3,-12,|,Ph,4:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Pyrazophos;MW:373.37;EXA:-
++
+<30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,
+ |,?5,3=?6,{2,5}=dl,{7,9}=dl,{4,5,6}:N,7:/_,-2:/COO!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Pyraflufen-ethyl;MW:413.174;EXA:-
++
+<30,Ph,6:/Cl,4:/F,@3,\,|,?5,{1,4}=dl,{2,3}:N,-3:/_,5:/Cl,
+ @-2,\,O,!,/F,!,F,@$1,\,O,!2,//O,!,O,!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Pyridaben;MW:364.9;EXA:-
++
+<30,?6,{2,4}=dl,{5,6}:N,6:/??!,1://O,2:/Cl,@-4,\,S,!,!,|,Ph,4:/??!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Pyridaphenthion;MW:340.34;EXA:-
++
+<30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,|,?6,{1,5}=dl,{2,3}:N,4://O,3:/Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Pyributicarb;MW:330.4;EXA:-
++
+<30,Ph,5:/??!,@3,\,//O,!,S,!,N,/_,!,|,Ph,2:N,3:/O!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Pyriproxyfen;MW:321.5;EXA:-
++
+<30,Ph,@5,\,O,!,Ph,@-3,\,O,!2,/_,!,O,-60,|,Ph,2:N
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Pyriminobac-Methyl;MW:361.354;EXA:-
++
+<30,Ph,2:/OCO!,@5,\,/_,!~dr,N,!,O,!,@3,\,O,!,|,Ph,{2,6}:N,{3,5}:/O!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Pirimiphos-methyl;MW:305.333;EXA:-
++
+<30,!,O,!,P,//S,/O!^160,!,O,!,|,Ph,{2,4}:N,5:/_,@-4,\,N,/!,!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Pyrimethanil;MW:199.257;EXA:-
++
+<30,Ph,@3,\,NH,!,|,Ph,{2,6}:N,{3,5}:/_
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Pyroquilon;MW:173.2;EXA:-
++
+<30,Ph,3=?6,10:N,9://O,(11,4)=?5[3]
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Vinclozolin;MW:286.108;EXA:-
++
+<36,?5,3:N,5:O,{2,4}://O,1:/_^54,@1,\^-30,!~dr,@3,\,|,Ph,{3,5}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fipronil;MW:437.2;EXA:-
++
+<30,Ph,{2,4}:/Cl,6:/CF3,@3,\,|,?5,{2,4}=dl,{1,2}:N,3:/CN,5:/NH2,
+ @-2,\,S,//O,!,CF3
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fenomiphos;MW:303.36;EXA:-
++
+<30,!2,O,!,P,//O,/NH!?!^160,!,O,!,|,Ph,3:/_,4:/S!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fenarimol;MW:331.2;EXA:-
++
+<30,Ph,@3,\,!,Ph,{4,11}:/Cl,7:/OH^30,@7,\^-30,|,Ph,{3,5}:N
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fenitrothion;MW:277.23;EXA:-
++
+<-30,!,O,!,P,//S,/O!^160,!,O,!,|,Ph,3:/_,2:/NO2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fenothiocarb;MW:253.4;EXA:-
++
+<30,Ph,@3,\,O,!5,S,!,//O,!,N,/_,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fensulfothion;MW:308.35;EXA:-
++
+<30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,|,Ph,@-3,\,S,//O,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fenthion;MW:278.33;EXA:-
++
+<-30,!,O,!,P,//S,/O!^160,!,O,!,|,Ph,3:/_,4:/S!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Phenthoate;MW:320.358;EXA:-
++
+<-30,!,O,!,P,//S,/O!^160,!,S,!,/Ph,!,//O,!,O,!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fenvalerate;MW:419.91;EXA:-
++
+<30,Ph,6:/Cl,@3,\,/?!,!,//O,!,O,!,/CN,!,Ph,@-4,\,O,-60,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fenpropathrin;MW:349.4;EXA:-
++
+<-30,?3,{1^35,2^-35}:*/_,{1^-35,2^35}:/*_,
+ @3,\,//O,!,O,!,/CN,!,Ph,@-4,\,O,-60,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fenpropimorph;MW:303.49;EXA:-
++
+<30,?6,3:N,6:O,{1,5}:*/_,@3,\,!,/_,!2,|,Ph,4:/??!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Phthalide;MW:271.9;EXA:-
++
+<30,Ph,3=?5,8:O,9://O,{1,2,5,6}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Butachlor;MW:311.85;EXA:-
++
+<30,!4,O,!2,N,!,//O,!2,Cl,@7,\,Ph,{-1,-5}:/!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Butamifos;MW:332.36;EXA:-
++
+<-30,!2,/_,!,NH,!,P,//S,/O!2^170>rl,!,O,!,|,Ph,2:/NO2,5:/_
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Bupirimate;MW:316.42;EXA:-
++
+<30,Ph,{4,6}:N,1:/_,@3,\,O,!,SOO,!,N,/_,!,2:/!3,@5,\,NH,!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Buprofezin;MW:305.4;EXA:-
++
+<-30,?6,{1,5}:N,1:/Ph,3:S,6://O,5:/?!,@4,\~dm,N,!,??!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Flamprop-methyl;MW:335.8;EXA:-
++
+<30,Ph,1:/Cl,6:/F,@3,\,N,!,/_,!,//O,!,O,!,@7,\,//O,-60,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fluacrypyrim;MW:426.392;EXA:-
++
+<30,Ph,{4,6}:N,1:/CF3,5:/O!?!,@3,\,O,!2,Ph,@-1,\,|,!~dr,!,O,!,1:/COO!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fluquinconazole;MW:376.2;EXA:-
++
+<30,Ph,3=?6,8=dl,{7,9}:N,6:/F,10://O,@8,\,
+ |,?5,{2,4}=dl,{1,3,5}:N,@$9,\,|,Ph,{4,6}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fludioxonil;MW:248.2;EXA:-
++
+<30,Ph,5=?5,{7,9}:O,{8^-40,8^40}:/F,@4,\,|,?5,{2,5}=dl,-2:NH,-4:/CN
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Flucythrinate;MW:451.5;EXA:-
++
+<30,Ph,@6,\,O,!,/F,!,F,@3,\,/?!,!,//O,!,O,!,/CN,!,Ph,@-4,\,O,-60,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Flutolanil;MW:323.3;EXA:-
++
+<30,Ph,2:/CF3,@3,\,//O,!,NH,!,Ph,-1:/O!?!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fluvalinate;MW:502.92;EXA:-
++
+<30,Ph,5:/Cl,1:/CF3,@4,\,NH,!,/?!,!,//O,!,O,!,/CN,!,Ph,@-4,\,O,-60,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Flumioxazin;MW:354.337;EXA:-
++
+<30,Ph,6:/F,3=?6,-1:O,-4:N,-3://O,@-4,\,!,!~tm,
+ @1,\,|,?5,3=?6,3=dr,1:N,{2,5}://O
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Pretilachlor;MW:311.85;EXA:-
++
+<30,Ph,{2,4}:/!,@3,\,N,!3,O,!3,@$7,\,//O,!2,Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Procymidone;MW:284.136;EXA:-
++
+?6,1:N,@3,&5,{2,6}://O,{3,5}:/_,@1,\,|,Ph,{3,5}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Prothyophos;MW:329.18;EXA:-
++
+<-30,!3,O,!,P,//S,/O!2^160>rl,!,O,!,|,Ph,{2,4}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Propachlor;MW:211.689;EXA:-
++
+<30,Ph,@3,\,N,/?!,!,//O,!2,Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Propazine;MW:229.7;EXA:-
++
+<30,Ph,{2,4,6}:N,5:/Cl,{1,3}:/NH!?!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Propanil;MW:218.077;EXA:-
++
+<30,Ph,{1,6}:/Cl,@3,\,NH,!,//O,!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Propaphos;MW:304.343;EXA:-
++
+<-30,!3,O,!,P,//O,/O!3^160>rl,!,O,!,|,Ph,4:/S!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Propyzamide;MW:256.1;EXA:-
++
+<30,Ph,{1,5}:/Cl,@3,\,//O,!,NH,!,??,!,!~tm
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Propiconazole;MW:342.22;EXA:-
++
+<30,Ph,{4,6}:/Cl,@3,\,!2,|,?5,{2,4}=dl,{1,2,4}:N,@$7,?5,{-1,-4}:O,-3:/!2^-15
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Prohydrojasmon;MW:254.37;EXA:-
++
+<18,?5,2://O,3:*\^-12,!4,@4,\*,!,//O,!,O,!3
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Profenofos;MW:373.6;EXA:-
++
+<30,!2,O,!,P,//S,/O!3^160>rl,!,O,!,|,Ph,2:/Cl,4:/Br
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Bromacil;MW:261.119;EXA:-
++
+<30,?6,6=dl,3:N,1:/Br,{2,4}://O,5:NH,6:/_,@3,\,/_,!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Prometryn;MW:241.4;EXA:-
++
+<30,Ph,{2,4,6}:N,5:/S!,{1,3}:/NH!?!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Bromobutide;MW:312.2;EXA:-
++
+<30,Ph,@3,\,??,!,NH,!,//O,!,/Br,!,??!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Bromophos;MW:365.99;EXA:-
++
+<-30,!,O,!, P,//S,/O!^160,!,O,!,|,Ph,{3,6}:/Cl,4:/Br
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Bromopropylate;MW:428.12;EXA:-
++
+<30,Ph,@3,\,!,Ph,{6,11}:/Br,7:/OH^-45,@7,30,//O,!,O,-60,?!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Hexaconazole;MW:314.2;EXA:-
++
+<36,?5,{1,4}=dl,{1,3,5}:N,@3,\^30,!5,-4^30:/OH,@-5,\^-30,|,Ph,{4,6}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Hexazinone;MW:252.31;EXA:-
++
+<30,?6,3=dl,{2,4,6}:N,2:/_,{1,5}://O,6:/?6,3:/N?!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Benalaxyl;MW:325.4;EXA:-
++
+<30,Ph,@3,\,!,//O,!,N,!,/_,!,//O,!,O,!,@-5,\,|,Ph,{2,6}:/_
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Benoxacor;MW:260.1;EXA:-
++
+<90,Ph,3=?6,7:N,10:O,8:/_,@7,\,//O,!,/Cl,!,Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Heptachlor;MW:373.35;EXA:-
++
+<30,?6`1.3,3=?5,{6,8}=dl,@2,210~wf`1.5,&5~wb,{1,2,5,6,9,10^-210,10^-150}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Permethrin;MW:391.30;EXA:-
++
+<-30,?3,{2^-35}:*/_,{2^35}:/*_,@1,\,!~dl,/Cl,!,Cl,
+ @3,\,//O,!,O,!2,Ph,@-4,\,O,-60,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Penconazole;MW:284.184;EXA:-
++
+<30,Ph,{4,6}:/Cl,@3,\,/!2,!2,|,<30,?5,{2,4}=dl,{1,2,4}:N
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Pendimethalin;MW:281.3;EXA:-
++
+<30,Ph,{3,5}:/NO2,{1,2}:/_,@4,\,NH,!,/!,!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Benfluralin;MW:335.3;EXA:-
++
+<30,Ph,{1,3}:/NO2,5:/CF3,@2,\,N,/!,!4
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Benfuresate;MW:256.3;EXA:-
++
+<30,Ph,3=?5,7:O,9:??,@6,\,O,!,SOO,!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Phosalone;MW:367.80;EXA:-
++
+<30,!2,O,!,P,//S,/O!2^160>rl,!,S,!2,|,?5,4=Ph,4=dr,1:N,2://O,3:O,8:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Phosmet;MW:317.32;EXA:-
++
+<-30,!,O,!,P,//S,/O!^160,!,S,!2,|,?5,3=Ph2,1:N,{2,5}://O
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Phorate;MW:260.4;EXA:-
++
+<30,!2,O,!,P,//S,!,S,!2,S,!2,4^160>rl:/O!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Malathion;MW:330.35;EXA:-
++
+<-30,!,O,!,P,//S,/O!^160,!,S,!2,//O,!,O,!2,@5,\`1,!,//O,!,O,!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Myclobutanil;MW:288.8;EXA:-
++
+<36,?5,{1,4}=dl,{1,3,5}:N,@3,\^30,!5,7:/CN^30,@7,\^-30,|,Ph,4:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Methidathion;MW:302.32;EXA:-
++
+<-30,!,O,!,P,//S,/O!^160,!,S,!2,|,?5,4=dl,{1,5}:N,3:S,2://O,4:/O!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Methoxychlor;MW:345.644;EXA:-
++
+<30,Ph,@3,\,!,Ph,{6,11}:/O!,7:/CCl3
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Metolachlor;MW:283.8;EXA:-
++
+<30,Ph,5:/!,3:/_,@4,\,N,!,//O,!2,Cl,@7,\,/_,!2,O,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Mevinphos;MW:224.15;EXA:-
++
+<-30,!,O,!,P,//O,/O!^160,!,O,!,/_,!~dr,!,//O,!,O,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Mefenacet;MW:298.4;EXA:-
++
+<12,Ph,3=?5,9=dl,9:N,7:S,@8,\,O,!2,//O,!,N,/_,!,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Mefenpyr-diethyl;MW:373.23;EXA:-
++
+<18,?5,5=dl,{4,5}:N,3^65:/_,{1^12,3^-12}:/COO!2,@4,\^-24,|,Ph,{4,6}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Mepronil;MW:269.3;EXA:-
++
+<30,Ph,2:/_,@3,\,//O,!,NH,!,|,Ph,5:/O!?!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Resmethrin;MW:338.4;EXA:-
++
+<-30,?3,{2^-35~wf,2^35~zf}:/_,@1,\,!!,/_,!,@3,\,//O,!,O,!2,
+ |,?5,{3,5}=dl,2:O,@3,\,!,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Lenacil;MW:234.3;EXA:-
++
+<30,?6,3=?5,3=dl,6:N,2:NH,{1,5}://O,6:/?6
++------------------------------------------------------------------------------
+%******************************************************************************
+Cat:pesticide;EN:Azinphos-methyl;MW:317.318;EXA:-
++
+<-30,!,O,!,P,//S,/O!^160,!,S,!2,|,?6,-3=?6,{2,4,8,10}=dl,{1,2,3}:N,6://O
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Azoxystorbin;MW:403.394;EXA:-
++
+<30,Ph,2:/CN,@3,\,O,!,Ph,{-1,-3}:N,@-4,\,O,!,Ph,@-5,\,//!O!,!,//O,!,O,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Aramite;MW:334.859;EXA:-
++
+<30,Ph,6:/??!,@3,\,O,!2,/_,!,O,!,S,//O,!,O,!3,Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Aldicarb;MW:190.3;EXA:-
++
+<-30,!,S,!,??,!,!~dr,N,!,O,!,//O,!,NH,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Aldoxycarb;MW:222.3;EXA:-
++
+<30,!,//O,!,NH,!,O,!,N,!~dr,!,??,!,SOO,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Isoxaflutole;MW:359.319;EXA:-
++
+<30,Ph,6:/CF3,@4,\,SOO,!,@3,\`1,//O,!`1,<-12,|,?5,{1,4}=dl,3:O,4:N,2:/?3
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Iprovalicarb;MW:320.4;EXA:-
++
+<30,Ph,6:/_,@3,\,!,/_,!,NH,!,//O,!,??,!,NH,!,//O,!,O,!?!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Imazalil;MW:297.2;EXA:-
++
+<-30,!2,O,!2,!~dr,@1,\^60,|,?5,{2,4}=dl,{1,3}:N,@$2,\,|,Ph,{4,6}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Imidacloprid;MW:255.662;EXA:-
++
+<30,Ph,1:N,6:/Cl,@3,\,!,|,?5,1:N,3:NH,@2,\\,N,!,NO2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Indanofan;MW:340.80;EXA:-
++
+<30,Ph,3=?5,{7,9}://O,{8^55>lr}:/!,@8,-30,!2,|,Ph,5:/Cl,||,@11,?3,-2:O
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Indoxacarb;MW:527.837;EXA:-
++
+<-6,Ph,3=?5,9=?6,15=dl,10:O,{12,13}:N,1:/Cl,8`1^-54:/COO!,
+ @12,\,//O,!,N,/COO!,!,Ph,@-3,\,O,!,CF3
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Oxaziclomefone;MW:376.277;EXA:-
++
+<30,?6,6=dl,2:O,4:N,1:/_,5://O,6:/Ph,@4,\,??,!,|,Ph,{3,5}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Oxamyl;MW:219.3;EXA:-
++
+<-30,!,N,/_,!,//O,!,/S!,!~dr,N,!,O,!,//O,!,NH,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Oryzalin;MW:346.4;EXA:-
++
+<30,Ph,{1,3}:/NO2,@5,\,SOO,!,NH2,@2,\,/!2,N,!3
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Carbaryl;MW:201.22;EXA:-
++
+<30,Ph,5=Ph,@4,\,//O,!,O,!,NH,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Carpropamid;MW:334.665;EXA:-
++
+<-30,?3,1:/_,2^-35:*/Cl,2^35:/*Cl,3^70:/!,@3,\,//O,!,NH,!,/_,!,Ph,-3:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Cumyluron;MW:302.802;EXA:-
++
+<30,Ph,@4,\,??,!,NH,!,//O,!,NH,!2,|,Ph,6:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Cloquintocet-methyl;MW:335.83;EXA:-
++
+<90,Ph,4=Ph,2:N,10:/Cl,@7,\,O,!2,//O,!,O,!,/_,!5
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Clotianidin;MW:249.673;EXA:-
++
+<6,?5,{3,5}=dl,2:S,5:N,1:/Cl,@3,\,!,NH,!,/NH!,!!,N,!,NO2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Chromafenozide;MW:394.515;EXA:-
++
+<30,?6,3=?6,5:O,{7,9,11}=dl,7:/_,@8,\,//O,!,NH,!,N,/??!,!,//O,!,|,Ph,{3,5}:/_
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Clomeprop;MW:324.2;EXA:-
++
+<30,Ph,{4,6}:/Cl,5:/_,@3,\,O,!,/_,!,//O,!,NH,!,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Chloridazon;MW:221.6;EXA:-
++
+<30,?6,{3,4}:N,{2,6}=dl,5://O,1:/NH2,6:/Cl,4:/Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Chloroxuron;MW:290.745;EXA:-
++
+<30,Ph,6:/Cl,@3,\,O,!,Ph,@-3,\,NH,!,//O,!,N,/_,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Cyazofamid;MW:324.783;EXA:-
++
+<18,?5,{2,5}=dl,{2,4}:N,1:/Cl,3:/CN,@4,\,SOO,!,N,/_,!,@5,\,Ph,-3:/_
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Diuron;MW:233.1;EXA:-
++
+<30,Ph,{1,6}:/Cl,@3,\,NH,!,//O,!,N,/_,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Cyflufenamid;MW:412.36;EXA:-
++
+<30,Ph,4^20:/CF3,{1,2}:/F,@3,\,!,NH,!,//O,!2,Ph,@-10,\~dm,N,!,<-12,O,!2,?3
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Diflubenzuron;MW:310.7;EXA:-
++
+<30,Ph,{2,4}:/F,@3,\,//O,!,NH,!,//O,!,NH,!,Ph,-3:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Cyprodinil;MW:225.295;EXA:-
++
+<30,Ph,{2,4}:N,5:/_,1:/?3,@3,\,NH,!,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Simeconazole;MW:293.417;EXA:-
++
+<36,?5,{1,3,5}:N,{1,4}=dl,@3,30,!,/OH^30,!2,Si,/_,/_^60,!,@7,-30,Ph,-3:/F
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Dimethirimol;MW:209.29;EXA:-
++
+<30,?6,{3,5}=dl,1://O,2:NH,3:/N?!,4:N,5:/_,6:/??!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Dimethomorph;MW:387.86;EXA:-
++
+<30,?6,1:O,4:N,@4,\,//O,!,!!`1,!,|,Ph,{4,5}:/O!,||,@9,\,Ph,-3:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Silafluofen;MW:408.588;EXA:-
++
+<30,Ph,@5,\,O,!,Ph,-1:/F,@10,\,!3,Si,??,!,Ph,-3:/O!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Spinosad;MW:731.968;EXA:-
++
+<30,#1,<-120,60,60,-60,60,60,60,-60,60,60,60,-60,&1,##,
+ 5=?5,-1=dl,{-2^60,-3^-35}:/*H,-3=?6,-4=dl,{-1^35}:*/H,{-2^-60}:/*H,-2=?5,
+ 2:O,{3^15,7^-28}://O, 1:/!,
+ @-2,\~zf,O,66,?6,-1:O,-2:/_,{-3,-4,-5}:/O!,8:*/_,5^-65:*/H,
+ @9,\*,O,!,|,?6,2:O,3:/_,-3:/N?!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Di-allate;MW:270.212;EXA:-
++
+<-30,!,/_,!,N,!,//O,!,S,!2,!!,!,Cl,3:/?!,7:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Daimuron;MW:268.4;EXA:-
++
+<30,Ph,@4,\,??,!,NH,!,//O,!,NH,!,Ph,-3:/_
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Thiacloprid;MW:252.72;EXA:-
++
+<30,Ph,1:N,6:/Cl,@3,\,!,<-12,|,?5,1:N,3:S,@-4,\\,N,!,CN
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Thiabendazole;MW:201.247;EXA:-
++
+<30,Ph,3=?5,8=dl,9:NH,7:N,@8,\,|,?5,{1,4}=dl,3:S,5:N
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Thiamethoxam;MW:291.71;EXA:-
++
+<30,?6,2:O,{4,6}:N,6:/_,@5,\\,N,!,NO2,@4,\,!,|,?5,{1,3}=dl,3:N,5:S,4:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Tebuthiuron;MW:228.3;EXA:-
++
+<18,?5,{3,5}=dl,{4,5}:N,2:S,1:/??!,@3,\,N,/_,!,//O,!,NH,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Tebufenozide;MW:352.5;EXA:-
++
+<30,Ph,6:/!,@3,\,//O,!,NH,!,N,/??!,!,//O,!,|,Ph,{3,5}:/_
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Teflubenzuron;MW:381.1;EXA:-
++
+<30,Ph,{2,4}:/F,@3,\,//O,!,NH,!,//O,!,NH,!,|,Ph,{3,5}:/Cl,{4,6}:/F
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Tridemorph;MW:297.5;EXA:-
++
+<30,?6,3:N,6:O,{1,5}:/_,3:/!12
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Triflumuron;MW:358.701;EXA:-
++
+<30,Ph,4:/Cl,@3,\,//O,!,NH,!,//O,!,NH,!,|,Ph,@5,\,O,!,CF3
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Naproanilide;MW:291.35;EXA:-
++
+<30,Ph,4=Ph,@8,\,O,!,/_,!,//O,!,NH,!,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Novaluron;MW:492.706;EXA:-
++
+<30,Ph,{2,4}:/F,@3,\,//O,!,NH,!,//O,!,NH,!,
+ Ph,-4:/Cl,@-3,\,O,!,/F^-35,/F^35,!,/F,!,O,!,CF3
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Pyraclostrobin;MW:387.817;EXA:-
++
+<30,Ph,@3,\,!,O,!,<12,|,?5,{2,5}=dl,{4,5}:N,
+@4,\^12,Ph,-3:/Cl,||,@2,\,N,/O!,!,COO!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Pirimicarb;MW:238.291;EXA:-
++
+<30,Ph,{1,5}:N,{2,3}:/_,6:/N?!,@4,\,O,!,//O,!,N,/_,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fenoxycarb;MW:301.35;EXA:-
++
+<30,Ph,@5,\,O,!,Ph,@-3,\,O,!3,NH,!,//O,!,O,!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fenobucarb;MW:207.3;EXA:-
++
+<30,Ph,@5,\,/_,!2,@4,\,O,!,//O,!,NH!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Ferimzone;MW:254.337;EXA:-
++
+<30,Ph,4:/_,@3,\,/_,!~dr,N,!,NH,!,|,Ph,{2,6}:N,{3,5}:/_
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fenamidone;MW:311.403;EXA:-
++
+<18,?5,4=dl,{3,5}:N,2://O,@3,\,NH,!,Ph,4:/S!,1^52:*/_,1^-48~zf:/Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fenpyroximate;MW:421.49;EXA:-
++
+<-6,?5,{3,5}=db,{1,2}:N,{2,5}:/_,@3,-15,O,!,Ph,
+ @4,\,!~dr,N,!,O,!2,|,Ph,@4,\,//O,-60,O,!4
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Phenmedipham;MW:300.32;EXA:-
++
+<30,Ph,5:/_,@3,\,NH,!,//O,!,O,!,Ph,@-4,\,NH,!,//O,!,O!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Butafenacil;MW:474.817;EXA:-
++
+<30,?6,6=dl,{3,5}:N,{2,4}://O,5:/_,6:/CF3,
+ @3,\,Ph,-3:/Cl,@-2,\,//O,!,O,!,??,!,//O,!,O,!2,!~dr
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Flufenacet;MW:363.331;EXA:-
++
+<6,?5,{2,5}=dl,{1,2}:N,4:S,5:/CF3,@3,\,O,!,-60,//O,!,N,/?!,!,|,Ph,4:/F
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Flufenoxuron;MW:488.77;EXA:-
++
+<30,Ph,{2,4}:/F,@3,\,//O,!,NH,!,//O,!,NH,!,Ph,-1:/F,@-3,\,O,!,|,Ph,4:/CF3,6:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fluridone;MW:329.3;EXA:-
++
+<30,?6,{3,6}=dl,2:N,2:/_,5://O,@4,\,Ph,-4:/CF3,6:/Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Propaquizafop;MW:443.884;EXA:-
++
+<90,Ph,3=?6,{8,10}=dl,{7,10}:N,1:/Cl,
+ @8,\,O,!,|,Ph,@4,\,O,|,!2,//O,!,O,!,-60,!,O,-60,N,-60~dr,!,{2,9}:/_
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Hexaflumuron;MW:461.14;EXA:-
++
+<30,Ph,{2,4}:/F,@3,\,//O,!,NH,!,//O,!,NH,!,
+ |,Ph,{3,5}:/Cl,@4,\,O,!,/F^-35,/F^35,!,/F,!,F
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Hexathiazox;MW:352.877;EXA:-
++
+<30,?6,@3,\,NH,!,//O,!,<-24,|,?5,1:N,3:S,2://O,5:/_,@4,\,Ph,-3:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Pencycuron;MW:328.84;EXA:-
++
+<30,Ph,6:/Cl,@3,\,!,N,/?5,!,//O,!,NH,!,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Bendiocarb;MW:223.228;EXA:-
++
+<30,Ph,5=?5,{7,9}:O,8:??,@4,\,O,!,//O,!,NH!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Pentoxazone;MW:353.774;EXA:-
++
+<66,?5,5://?!,1:O,3:N,{2,4}://O,@3,\,|,Ph,4:/Cl,6:/F,@3,\,O,!,?5
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Boscalid;MW:343.21;EXA:-
++
+<30,Ph,5:N,4:/Cl,@3,\,//O,!,NH,!,Ph,@-1,\,Ph,-3:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Methabenzthiazuron;MW:221.3;EXA:-
++
+Ph,3=?5,9=dl,7:S,9:N,@8,\,N,/_,!,//O,!,NH,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Methoxyfenozide;MW:368.48;EXA:-
++
+<30,Ph,2:/_,1:/O!,@3,\,//O,!,NH,!,N,/??!,!,//O,!,|,Ph,{3,5}:/_
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Monolinuron;MW:214.6;EXA:-
++
+<30,Ph,6:/Cl,@3,\,NH,!,//O,!,N,/_,!,O,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Lactofen;MW:461.78;EXA:-
++
+<30,Ph,4:/Cl,6:/CF3,@3,\,O,!,Ph,-3:/NO2,@-4,\,//O,!,O,!,/_,!,//O,!,O,!2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Linuron;MW:249.1;EXA:-
++
+<30,Ph,{1,6}:/Cl,@3,\,NH,!,//O,!,N,/_,!,O,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Lufenuron;MW:511.15;EXA:-
++
+<30,Ph,{2,4}:/F,
+ @3,\,//O,!,NH,!,//O,!,NH,!,Ph,{-1,-4}:/Cl,@-3,\,O,!,/F^35,/F^-35,!,/F,!,CF3
++------------------------------------------------------------------------------
+%******************************************************************************
+Cat:antibacterial;EN:Sulfacetamide;MW:214.239;EXA:-
++
+<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,//O,!
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Sulfatiazole;MW:255.31;EXA:-
++
+<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,?5,{1,3}=dl,2:N,5:S
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Chlopidol;MW:192.039;EXA:-
++
+<30,Ph,{1,3}:/_,2:N,{4,6}:/Cl,5:/OH
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Sulfadiadine;MW:250.276;EXA:-
++
+<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,6}:N
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Levamisole;MW:204.29;EXA:-
++
+?5,3=?5,6=dl,2:S,{4,6}:N,@7,\,Ph
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:5-(Propylsulphonyl)-1-H-Benzimidazole-2-Amine;MW:0;EXA:-
++
+<30,Ph,3=?6,8=dl,7:N,9:NH,6:/S!3,8:/NH2
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Sulfapyrizine;MW:249.288;EXA:-
++
+<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,6:N
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Marbofloxacin;MW:362.361;EXA:-
++
+<30,Ph,3=?6,-3=dl,(2,7)=?6[4],6:/F,{7,13}:N,11:O,9:/COOH,10://O,13:/_,
+ @1,\,|,?6,{1,4}:N,4:/_
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Sulfamerazine;MW:264.303;EXA:-
++
+<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,6}:N,3:/_
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Trimetoprim;MW:290.323;EXA:-
++
+<30,Ph,{1,5}:N,6:/NH2,@3,\,!,|,Ph,{3,4,5}:/O!
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Ofloxacin;MW:361.373;EXA:-
++
+<30,Ph,3=?6,(2,7)=?6[4],7:N,11:O,9:/COOH,10://O,13:/_,@1,\,|,?6,{1,4}:N,4:/!
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Ciprofloxacin;MW:331.347;EXA:-
++
+<30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,@1,\,|,?6,1:N,4:NH
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Enrofloxacin;MW:359.401;EXA:-
++
+<30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,@1,\,|,?6,{1,4}:N,4:/!
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Danofloxacin;MW:357.385;EXA:-
++
+<30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,
+ @1,\,|,?6,@2,-200`1.1,&5,{1,4}:N,4:*/_
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Ormetoprim;MW:274.324;EXA:-
++
+<30,Ph,{1,5}:N,{2,6}:/NH2,@3,\,!,|,Ph,2:/_,{4,5}:/O!
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Sulfadimidine;MW:278.33;EXA:-
++
+<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,4}:N,{3,5}:/_
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Orbifloxacin;MW:395.382;EXA:-
++
+<30,Ph,-4=?6,9=dl,7:N,{2,5,6}:/F,7:/?3,9:/COOH,10://O,
+ @1,\,|,?6,1:N,{3,5}:*/_,4:NH
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Sulfamethoxypyridazine;MW:280.302;EXA:-
++
+<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{5,6}:N,4:/O!
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Sarafloxacin;MW:385.371;EXA:-
++
+<30,Ph,3=?6,9=dl,7:N,6:/F,9:/COOH,10://O,@1,\,?6,-6:N,-3:NH,@7,\,|,Ph,-3:/F
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Difloxacin;MW:399.398;EXA:-
++
+<30,Ph,-4=?6,9=dl,7:N,6:/F,9:/COOH,10://O,@1,\,|,?6,{1,4}:N,4:/_,
+ ||,@7,\,Ph,-3:/F
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Sulfamonomethoxine;MW:280.302;EXA:-
++
+<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,4}:N,3:/O!
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Sulfachlorpyridazine;MW:284.723;EXA:-
++
+<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{5,6}:N,4:/Cl
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Sulfadoxine;MW:310.328;EXA:-
++
+<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{4,6}:N,{2,3}:/O!
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Sulfamethoxazole;MW:253.276;EXA:-
++
+<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,?5,{2,5}=dl,4:O,5:N,3:/_
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Pirimethamin;MW:248.714;EXA:-
++
+<30,?6,{1,4}=dl,{1,5}:N,4:/!,6://NH,@3,\,Ph,-3:/Cl
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Oxibendazole;MW:249.27;EXA:-
++
+<30,Ph,-4=?5,9=dl,7:NH,9:N,1:/O!3,@8,\,NH,!,COOH
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Oxolinic acid;MW:261.233;EXA:-
++
+<30,Ph,3=?6,6=?5,9=dl,7:N,{11,13}:O,10://O,7:/!,9:/COOH
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Sulfabenzamide;MW:276.31;EXA:-
++
+<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,//O,!,Ph
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Ethopabate;MW:237.255;EXA:-
++
+<30,Ph,1:/NHCO!,3:/O!2,4:/COO!
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Sulfadimethoxine;MW:310.33;EXA:-
++
+<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,4}:N,{3,5}:/O!
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Sulfaquinoxaline;MW:300.337;EXA:-
++
+<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,3=Ph,{2,5}:N
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Nalidixic acid;MW:232.239;EXA:-
++
+<30,Ph,3=?6,9=dl,{5,10}:N,6:/_,7://O,8:/COOH,10:/!
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Flubendazole;MW:313.288;EXA:-
++
+<30,Ph,-4=?5,9=dl,7:NH,9:N,@1,\,O,!,Ph,@8,\,NH,!,COO!
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Flumequine;MW:261.225;EXA:-
++
+<30,Ph,3=?6,(2,7)=?6[4],9=dl,7:N,6:/F,9:/COOH,10://O,13:/_
++------------------------------------------------------------------------------
+34;Cat:antibacterial;EN:Sulfanitran;MW:335.334;EXA:-
++
+<30,Ph,@1,\,NH,!,//O,!,@4,\,SOO,!,NH,!,|,Ph,4:/NO2
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Xylazine;MW:220.334;EXA:-
++
+<30,?6,3=dl,2:S,4:N,@3,\,NH,!,|,Ph,{2,6}:/_
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Tiamulin;MW:493.74;EXA:-
++
+<-45.5,?8,-3=?5,@8,#.8,-210~zf,/_^60,45,56,##,&6~zb,
+ {3^-45,5,8}:*/_,@3,\*^30,!~dl,4:/*OH,11://O,7:*/H^60,||,
+ @1,\^15,O,!,//O,!2,S,60,60,-60,N,/!,60,-60
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:alfa-Trenbolone;MW:312.403;EXA:-
++
+<30,?6,{3,10}=?6,13=?5,{2,11,15}=dl,1://O,12:*/_^60,-1:/*OH
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:beta-Trenbolone;MW:312.403;EXA:-
++
+<30,?6,{3,10}=?6,13=?5,{2,11,15}=dl,1://O,12:*/_^60,-1:*/OH
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Famphur;MW:325.3;EXA:-
++
+<-30,!,O,!,P,//S,/O!^160,!,O,!,Ph,@-3,\,SOO,!,N!,!
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Lincomycin;MW:406.54;EXA:-
++
+<6,?5,5:N,5:*/_,2:*/!2,
+ @3,\*,//O,!,NH,!,!~wb,?6,-1:O,-3:/*OH,{-4,-5}:*/OH,-2:/*S!,
+ @8,\^-30,/_,60,OH
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Emamectine;MW:886.133;EXA:-
++
+<24,?6,6=?5,3=dl,9:O,2:*/OH,3:/_,6:/*OH^-60,
+ @5,#1.04,6,//O,-60,O,60,60,-60,60,60,-60,60,60,60,-60,60,##,&7,
+ 3=wb,{-1,-3,-7}=dl,(-11,-10)=?6[4],@-2,?6,-1=wb,-6=zf,-2=dl,
+ {-5,-6}:O,-3:/*_,-4:/?!,
+ 17:/_,19:/*_,@18,\,O,!,?6`.8,-1:O,-2:*/_,-4:*/O!,
+ @-3,\,O,60,?6`.8,-1:O,-2:*/_,-3:/*OH,-4:*/O!,-5:/*O!
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Tilmicosin;MW:869.133;EXA:-
++
+<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
+ {12,14}=dl,2:O,1:/*!,5:/*OH,{3,11}://O,{6,10}:/*_,14:/_,
+ @7,\*,O,0,?6`.7,-5:O,-2:/NMe!,,{-1,-3}:/OH,-4:/_,
+ @8,\*,!2,?6`.7,-6:N,{-2,-4}:*/_,
+ @16,\,-60,O,0,?6`.7,-5:O,{-1,-2}:/O!,-3:/OH,-4:/_
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:2-acethylamino-5-nitrothiazole;MW:187.178;EXA:-
++
+<18,?5,{2,5}=dl,2:N,4:S,3:/NHCO!,5:/NO2
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Chlorsulron;MW:357.77;EXA:-
++
+<30,Ph,6:/NH2,@1,\,S,//O^35,//O^-35,!,NH2,@3,\,S,//O^35,//O^-35,!,NH2,
+ @4,\,/Cl,60~dl,/Cl,!,Cl
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Florfenicol;MW:358.21;EXA:-
++
+<30,Ph,@1,\,SOO,!,@4,\,/OH,!,/!F,!,NH,!,//O,!,/Cl,!,Cl
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Thiamphenicol;MW:355;EXA:-
++
+<30,Ph,@1,\,SOO,!,@4,\,/OH,!,/!OH,!`1.1,NH,!`1.1,//O,!,/Cl,!,Cl
++------------------------------------------------------------------------------
+%******************************************************************************
+Cat:antibiotics;EN:Vancomycin;MW:1449.25;EXA:2
+
<-30,#1,!12,{1,3,12}=zf,7=wf,/H^-60,60,*/OH,60,
Ph,-4:/Cl,@-3,\,O,!,Ph,@-4,\,O,!,Ph,-1^15:/Cl,@-3,\,/*OH,*/H^-60,&1,
@@ -755,7 +2050,7 @@ Cat:antibiotics;EN:Vancomycin;MW:1449.25
@23,\,O,!,|,?6`.7,2:O,3^10:/!OH,{4,5}:/OH,
@-1,\,O,!,|,?6`.7,6:O,{3^35,5}:/_,3^-35:/NH2,4:/OH
+------------------------------------------------------------------------------
-Cat:biological;EN:Maitotoxin;MW:3425.86
+Cat:biological;EN:Maitotoxin;MW:3425.86;EXA:2
+
<55.8,?6,-4=?7 ,{-4,-3,-3,-3}=?6,@-3,\,!3,?6,{-4,-3,-3,-3}=?6,@-3,\,?6,-3=?6,
@-3,\,!3,60,<-30,?6,-3=?6,@-3,30,<30,?6,{-3,-3}=?6,-3=?7,{-4,-3,-3}=?6,
@@ -774,7 +2069,7 @@ Cat:biological;EN:Maitotoxin;MW:3425.86
@$36,-45~zf,O,30,SOO,30,"O{Na}",
@$150,\,|,!7,{1,2}:/*OH,4:*/_,5:/*_,7=dl
+------------------------------------------------------------------------------
-Cat:biological;EN:Okadaic acid;MW:805.00
+Cat:biological;EN:Okadaic acid;MW:805.00;EXA:2
+
<30,?6,@4,?6,@-4,\,!3,<-12,?5,@-3,<-12,?6,-3=?6,@-3,*\,!3,
?6,@-4,?6,@6,\,!,/*Me^-40,*/OH^20,!,//O,!1,OH,
diff --git a/graphics/mcf2graph/mcf_exa_soc.mf b/graphics/mcf2graph/mcf_exa_soc.mf
index b6bc26a348..2356e3194e 100644
--- a/graphics/mcf2graph/mcf_exa_soc.mf
+++ b/graphics/mcf2graph/mcf_exa_soc.mf
@@ -1,8 +1,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2021.05.05
+% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2021.05.23
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %%% it must be version 4.64
-message "* mcf_exa_soc 2021.05.05";
+input mcf2graph.mf; %%% it must be version 4.65
+message "* mcf_exa_soc 2021.05.23";
message "";
%------------------------------------------------------------------------------
fsize:=(35mm,24mm);
@@ -28,20 +28,20 @@ beginfont("f:mcf_data_base","t:EN","v:Cytosine") % select EN=Cytosine
if check(mc)=0: MC(scantokens(mc)) fi
endfont
%******************************************************************************
-beginfont("f:mcf_data_base","t:EN","v:Thymine") % select EN=Thymine
+beginfont("f:mcf_data_base","t:EN","v:Thymine") % select EN=Thymine
if check(mc)=0: MC(scantokens(mc)) fi
endfont
%******************************************************************************
-beginfont("f+:mcf_data_base","t:n","v:5") % 'f+'=keep file open
- if check(mc)=0: MC(scantokens(mc)) fi % 'v:5' select No.5
+beginfont("f+:mcf_data_base","t:n","v:5") % 'f+'=keep file open
+ if check(mc)=0: MC(scantokens(mc)) fi % 'v:5' select No.5
endfont
%******************************************************************************
-%%%%forever: % All
-for i=6 upto 155: % No.6 - No.155
- beginfont("f+:mcf_data_base","v:*") % 'f+'=keep file open
- if check(mc)=0: MC(scantokens(mc)) fi % 'v:*' no selection
- endfont %
- exitif f_EOF=1; % exit if file end
+forever:
+%%%%%%%% beginfont("f+:mcf_data_base","v:*") % select all
+ beginfont("f+:mcf_data_base","t:EXA","v:1") % 'f+'=keep file open
+ if f_EOF=0: if check(mc)=0: MC(scantokens(mc)) fi fi % 'v:1' select EXA=1
+ endfont %
+ exitif f_EOF=1; % exit if file end
endfor
%******************************************************************************
fi
diff --git a/graphics/mcf2graph/mcf_example.pdf b/graphics/mcf2graph/mcf_example.pdf
index 3307bc7cd8..62767a6216 100644
--- a/graphics/mcf2graph/mcf_example.pdf
+++ b/graphics/mcf2graph/mcf_example.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_example.tex b/graphics/mcf2graph/mcf_example.tex
index c0874a757c..5515b890b0 100644
--- a/graphics/mcf2graph/mcf_example.tex
+++ b/graphics/mcf2graph/mcf_example.tex
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2021.05.05
+% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2021.05.23
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage{graphicx}
diff --git a/graphics/mcf2graph/mcf_man_soc.mf b/graphics/mcf2graph/mcf_man_soc.mf
index 3fff89f92e..afefa48dcf 100644
--- a/graphics/mcf2graph/mcf_man_soc.mf
+++ b/graphics/mcf2graph/mcf_man_soc.mf
@@ -1,14 +1,13 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2021.05.05
+% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2021.05.23
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %% it must be version 4.64
+input mcf2graph.mf; %% it must be version 4.65
% ** use data base file 'mcf_data_base.mcf'
-message "mcf_man_soc 2021.05.05"; message "";
+message "mcf_man_soc 2021.05.23"; message "";
%------------------------------------------------------------------------
sw_mframe:=0;
sw_expand:=0;
%%%%ext(defaultscale:=.5; label.bot(decimal(char_num)&":"&inf_EN,(.5w,0));)
-%%%%ext(defaultscale:=.5; label.bot(mc,(.5w,0));)
%***********************************************************************
fsize:=(40mm,25mm);
blength:=6mm;
@@ -21,11 +20,11 @@ beginfont("EN:L-Alanine",":<30,NH2,!~wb,/_,!,COOH")
if check(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Valine",":<30,NH2,!~wb,/!?!,!,COOH")
+beginfont("EN:L-Valine",":<30,NH2,!~wb,/?!,!,COOH")
if check(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Leucine",":<30,NH2,!~wb,/!?!,!,COOH")
+beginfont("EN:L-Leucine",":<30,NH2,!~wb,/'(!,?!),!,COOH")
if check(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
diff --git a/graphics/mcf2graph/mcf_manual.pdf b/graphics/mcf2graph/mcf_manual.pdf
index a952e91f00..abe6a2b494 100644
--- a/graphics/mcf2graph/mcf_manual.pdf
+++ b/graphics/mcf2graph/mcf_manual.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_manual.tex b/graphics/mcf2graph/mcf_manual.tex
index e5842f9eac..c1c525a118 100644
--- a/graphics/mcf2graph/mcf_manual.tex
+++ b/graphics/mcf2graph/mcf_manual.tex
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format manual by Akira Yamaji 2021.05.05
+% Molecular Coding Format manual by Akira Yamaji 2021.05.23
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage[pdftex]{graphicx}
@@ -1611,9 +1611,11 @@ Cat:biological;EN:Linoleic acid;MW:280.45
\index{Info2}%
\index{Info\_t}%
\begin{verbatim}
- sw_output:=Info1; % tag1:var1;tag2:var2
- sw_output:=Info2; % tag1;tag2 var1;var2
- sw_output:=Info_t; % tag1:var1;tag2:var2 / output 'temp-info.aux'
+ sw_output:=Info1; %% tag1:var1;tag2:var2
+ sw_output:=Info2; %% tag1;tag2 var1;var2
+ sw_output:=Info_t; %% tag1:var1;tag2:var2 / output 'temp-info.aux'
+ sw_output:=Info_Mcode_t; %% output 'temp-info.aux','temp-mc.aux'
+ sw_output:=None_Info_t; %% output font,'temp-mc.aux'
\end{verbatim}
\paragraph{(Command line)}
\begin{verbatim}
@@ -1737,34 +1739,42 @@ endfont
%------------------------------------------------------------------------
\noindent%
\newpage
-\subsection{MCF aux file output(1)}
+\subsection{MCF aux file output}
\paragraph{(Insert option parameter setting)}
\index{Mcode}%
\begin{verbatim}
sw_output:=Mcode;
+sw_output:=Mcode_t; %% output 'temp-mc.aux'
+sw_output:=Info_Mcode_t; %% output 'temp-info.aux','temp-mc.aux'
+sw_output:=None_Mcode_t; %% output font,'temp-mc.aux'
+sw_output:=None_Info_Mcode_t; %% output font,'temp-info.aux','temp-mc.aux'
\end{verbatim}
\paragraph{(Command line)}
\index{Mcode\_t}%
\begin{verbatim}
>mpost -s ahlength=8 FILENAME (sw_output=Mcode)
\end{verbatim}
-\paragraph{(Output)}
+\paragraph{(file name)}
\begin{verbatim}
+sw_output=Mcode
file name = 'mcf_exa_soc-001-Adenine-mc.aux'
+ 'jobname -nnn-EN -mc.auc'
+
+sw_output=Mcode_t
+file name = 'temp-mc.aux'
+(result)
<30,?6,3=?5,{1,3,5,9}=dl,{2,6,9}:N,5:/NH2,7:NH
\end{verbatim}
%------------------------------------------------------------------------
-\subsection{MCF aux file output(2)}
-\paragraph{(Insert option parameter setting)}
+\paragraph{(Lualatex example)}
+%-----------------------------------------------------------------------
\begin{verbatim}
beginfont("f:mcf_data_base","t:EN","v:Adenine")
sw_output:=Mcode_t;
endfont
\end{verbatim}
%-----------------------------------------------------------------------
-\paragraph{(Lualatex example)}
-%-----------------------------------------------------------------------
\begin{verbatim}
%-----------------------------------------------------------------------
\begin{mplibcode}
@@ -1777,9 +1787,9 @@ endfont
%-----------------------------------------------------------------------
\end{verbatim}
%-----------------------------------------------------------------------
-\paragraph{(Output)}
-%-----------------------------------------------------------------------
\begin{verbatim}
+(result)
+
file name = 'temp-mc.aux'
<-30,#1,!12,{1,3,12}=zf,7=wf,/H^-60,60,*/OH,60,
diff --git a/graphics/mcf2graph/mcf_mplib_exa.pdf b/graphics/mcf2graph/mcf_mplib_exa.pdf
index 92420313d8..686b14f6d7 100644
--- a/graphics/mcf2graph/mcf_mplib_exa.pdf
+++ b/graphics/mcf2graph/mcf_mplib_exa.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_mplib_exa.tex b/graphics/mcf2graph/mcf_mplib_exa.tex
index 93ac0e0f1f..17a66be144 100644
--- a/graphics/mcf2graph/mcf_mplib_exa.tex
+++ b/graphics/mcf2graph/mcf_mplib_exa.tex
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2021.05.05
+% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2021.05.23
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% ** mcf2graph.mf must be version 4.64
+% ** mcf2graph.mf must be version 4.65
% ** use mcf_data_base.mcf
\documentclass{article}
%------------------------------------------------------------------------------
@@ -13,6 +13,7 @@
\mplibnumbersystem{double}%
\everymplib{%
if unknown Ph1: input mcf2graph.mf; fi
+ outputformat:="eps";
tag1:="J"; tag2:="C"; tag3:="fm"; tag4:="mw"; tag5:="EN"; tag6:="MW";
sw_output:=None;
sw_fframe:=4;
@@ -47,7 +48,7 @@
\subsection{Chlorophyll a}
\noindent%
\begin{verbatim}
-beginfont("f:mcf_data_base","t:EN","v:Chlorophyll a",
+beginfont("f:mcf_data_base","t:EN","v:Chlorophyll a","NO:-",
":,||,{4,11,17,23}:red,27:green") %%%% change color of atoms %%%%
fsize:=(100mm,45mm);
if check(mc)=0: MC(scantokens(mc)) fi
@@ -59,7 +60,7 @@ endfont
\end{verbatim}
%------------------------------------------------------------------------------------
\begin{mplibcode}
-beginfont("f:mcf_data_base","t:EN","v:Chlorophyll a",
+beginfont("f:mcf_data_base","t:EN","v:Chlorophyll a","NO:-",
":,||,{4,11,17,23}:red,27:green") %%%% change color of atoms %%%%
fsize:=(100mm,45mm);
if check(mc)=0: MC(scantokens(mc)) fi
@@ -69,7 +70,7 @@ beginfont("f:mcf_data_base","t:EN","v:Chlorophyll a",
label.lrt("MW(D): "&inf_MW,(0,h-13mm));)
endfont
\end{mplibcode}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Dinophysistoxin-1}
\noindent%
\begin{verbatim}
diff --git a/language/japanese/pxbase/LICENSE b/language/japanese/pxbase/LICENSE
index 8ada757fbc..ead3a3702e 100644
--- a/language/japanese/pxbase/LICENSE
+++ b/language/japanese/pxbase/LICENSE
@@ -1,6 +1,6 @@
The MIT License
-Copyright (c) 2017 Takayuki YATO (aka. "ZR")
+Copyright (c) 2008-2021 Takayuki YATO (aka. "ZR")
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/language/japanese/pxbase/README-ja.md b/language/japanese/pxbase/README-ja.md
index fd3eaf9ad0..b15ea3336e 100644
--- a/language/japanese/pxbase/README-ja.md
+++ b/language/japanese/pxbase/README-ja.md
@@ -165,6 +165,13 @@ upLaTeX の場合:
更新履歴
--------
+ * Version 1.2 〈2021/05/22〉
+ - pxbabel: CJK 言語のフォント切替を japanese-otf で多ウェイト拡張
+ (`deluxe`)を指定した場合に対応させた。
+ - pxbabel: (試験的) `(no)forcedeluxemulti` オプションを追加。
+ `forcedeluxemulti` を指定すると、さらに多言語拡張(`multi`)を
+ 行った場合の日本語以外のフォントにも適用される。
+
* Version 1.1b 〈2017/07/03〉
- upLaTeX で japanese-otf と併用した場合に対応。
- バグ修正。
diff --git a/language/japanese/pxbase/README.md b/language/japanese/pxbase/README.md
index 6128d2223a..5dee4dac83 100644
--- a/language/japanese/pxbase/README.md
+++ b/language/japanese/pxbase/README.md
@@ -67,6 +67,7 @@ README-ja.md).
Revision History
----------------
+ * Version 1.2 〈2021/05/22〉
* Version 1.1b 〈2017/07/03〉
* Version 1.1a 〈2017/06/19〉
* Version 1.1 〈2017/05/29〉
diff --git a/language/japanese/pxbase/pxbabel.pdf b/language/japanese/pxbase/pxbabel.pdf
index 615e612777..7d9d7b272f 100644
--- a/language/japanese/pxbase/pxbabel.pdf
+++ b/language/japanese/pxbase/pxbabel.pdf
Binary files differ
diff --git a/language/japanese/pxbase/pxbabel.sty b/language/japanese/pxbase/pxbabel.sty
index 3f0ab85d30..345e2c9000 100644
--- a/language/japanese/pxbase/pxbabel.sty
+++ b/language/japanese/pxbase/pxbabel.sty
@@ -1,7 +1,7 @@
%%
%% This is file 'pxbabel.sty'.
%%
-%% Copyright (c) 2017 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2008-2021 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxbabel}[2017/07/03 v1.1b PX Babel interface for CJK]
+\ProvidesPackage{pxbabel}[2021/05/22 v1.2 PX Babel interface for CJK]
\def\pxbb@pkgname{pxbabel}
%--------------------------------------- general
@@ -97,6 +97,9 @@
\bxIfExpToEqualX{\mcdefault}{mc}{}{\pxbb@stdjaencodingtrue}% default
\DeclareOption{stdjaencoding}{\pxbb@stdjaencodingtrue}
\DeclareOption{nostdjaencoding}{\pxbb@stdjaencodingfalse}
+\newbool{pxbb@forcedeluxemulti}
+\DeclareOption{forcedeluxemulti}{\pxbb@forcedeluxemultitrue}
+\DeclareOption{noforcedeluxemulti}{\pxbb@forcedeluxemultifalse}
% (<lang_id>, +<lang_id>)
\bxPreamble\let\pxbb@last@lang\relax
\bxForEachIn\pxbb@cjk@langid@list\do{%
@@ -131,6 +134,10 @@
\@ifpackageloaded{mlutf}{\pxbb@otfmultitrue}{}
\@ifpackageloaded{pxotf}{\pxbb@otfmultitrue\pxbb@pxotftrue}{}
+%% \ifpxbb@otfdeluxe
+\newbool{pxbb@otfdeluxe}
+\@ifpackagewith{otf}{deluxe}{\pxbb@otfdeluxetrue}{}
+
%% \ifpxbb@babel
\newbool{pxbb@babel}
\@ifpackageloaded{babel}{\pxbb@babeltrue}{}
@@ -143,6 +150,22 @@
\pxbb@warn@nocjk
\fi\fi\fi
+% Check if 'forcedeluxemulti' is available.
+\ifpxbb@forcedeluxemulti
+ \ifupTeX\else
+ \PackageWarningNoLine\pxbb@pkgname
+ {Option 'forcedeluxemulti' is invalid, since\MessageBreak
+ the engine is not upTeX}
+ \pxbb@forcedeluxemultifalse
+ \fi
+ \ifpxbb@otfmulti\else
+ \PackageWarningNoLine\pxbb@pkgname
+ {Option 'forcedeluxemulti' is invalid, since\MessageBreak
+ package 'otf' is not loaded with 'multi'}
+ \pxbb@forcedeluxemultifalse
+ \fi
+\fi
+
%% resolve the expected main language
\ifundef\pxbb@main@lang{%then
% if 'main' is not specified
@@ -353,6 +376,110 @@
\endgroup
\fi
+%% declarations for upTeX + otf deluxe CJK fonts
+\ifpxbb@otfdeluxe
+
+% UniJIS
+\pxDeclareBasicCJKShape{J20}{hmc}{l}{!upnmlminl-h}
+\pxDeclareBasicCJKShape{J20}{hmc}{m}{!upnmlminr-h}
+\pxDeclareBasicCJKShape{J20}{hmc}{bx}{!upnmlminb-h}
+\pxDeclareBasicCJKShape{J20}{hgt}{m}{!upnmlgothr-h}
+\pxDeclareBasicCJKShape{J20}{hgt}{bx}{!upnmlgothb-h}
+\pxDeclareBasicCJKShape{J20}{hgt}{eb}{!upnmlgotheb-h}
+\pxDeclareKanjiFamily{J20}{mg}
+\pxDeclareBasicCJKShape{J20}{mg}{m}{!upnmlmgothr-h}
+
+\pxDeclareBasicCJKShape{J30}{hmc}{l}{!upnmlminl-v}
+\pxDeclareBasicCJKShape{J30}{hmc}{m}{!upnmlminr-v}
+\pxDeclareBasicCJKShape{J30}{hmc}{bx}{!upnmlminb-v}
+\pxDeclareBasicCJKShape{J30}{hgt}{m}{!upnmlgothr-v}
+\pxDeclareBasicCJKShape{J30}{hgt}{bx}{!upnmlgothb-v}
+\pxDeclareBasicCJKShape{J30}{hgt}{eb}{!upnmlgotheb-v}
+\pxDeclareKanjiFamily{J30}{mg}
+\pxDeclareBasicCJKShape{J30}{mg}{m}{!upnmlmgothr-v}
+
+% UniJIS2004
+\pxDeclareBasicCJKShape{J24}{hmc}{l}{!upnmlminln-h}
+\pxDeclareBasicCJKShape{J24}{hmc}{m}{!upnmlminrn-h}
+\pxDeclareBasicCJKShape{J24}{hmc}{bx}{!upnmlminbn-h}
+\pxDeclareBasicCJKShape{J24}{hgt}{m}{!upnmlgothrn-h}
+\pxDeclareBasicCJKShape{J24}{hgt}{bx}{!upnmlgothbn-h}
+\pxDeclareBasicCJKShape{J24}{hgt}{eb}{!upnmlgothebn-h}
+\pxDeclareKanjiFamily{J24}{mg}
+\pxDeclareBasicCJKShape{J24}{mg}{m}{!upnmlmgothrn-h}
+
+\pxDeclareBasicCJKShape{J34}{hmc}{l}{!upnmlminln-v}
+\pxDeclareBasicCJKShape{J34}{hmc}{m}{!upnmlminrn-v}
+\pxDeclareBasicCJKShape{J34}{hmc}{bx}{!upnmlminbn-v}
+\pxDeclareBasicCJKShape{J34}{hgt}{m}{!upnmlgothrn-v}
+\pxDeclareBasicCJKShape{J34}{hgt}{bx}{!upnmlgothbn-v}
+\pxDeclareBasicCJKShape{J34}{hgt}{eb}{!upnmlgothebn-v}
+\pxDeclareKanjiFamily{J34}{mg}
+\pxDeclareBasicCJKShape{J34}{mg}{m}{!upnmlmgothrn-v}
+
+\ifpxbb@forcedeluxemulti
+
+% UniKS
+\pxDeclareBasicCJKShape{J21}{hmc}{l}{!utfkml--h}
+\pxDeclareBasicCJKShape{J21}{hmc}{m}{!utfkmr--h}
+\pxDeclareBasicCJKShape{J21}{hmc}{bx}{!utfkmb--h}
+\pxDeclareBasicCJKShape{J21}{hgt}{m}{!utfkgr--h}
+\pxDeclareBasicCJKShape{J21}{hgt}{bx}{!utfkgb--h}
+\pxDeclareBasicCJKShape{J21}{hgt}{eb}{!utfkge--h}
+\pxDeclareKanjiFamily{J21}{mg}
+\pxDeclareBasicCJKShape{J21}{mg}{m}{!utfkmgr--h}
+
+\pxDeclareBasicCJKShape{J31}{hmc}{l}{!utfkml--v}
+\pxDeclareBasicCJKShape{J31}{hmc}{m}{!utfkmr--v}
+\pxDeclareBasicCJKShape{J31}{hmc}{bx}{!utfkmb--v}
+\pxDeclareBasicCJKShape{J31}{hgt}{m}{!utfkgr--v}
+\pxDeclareBasicCJKShape{J31}{hgt}{bx}{!utfkgb--v}
+\pxDeclareBasicCJKShape{J31}{hgt}{eb}{!utfkge--v}
+\pxDeclareKanjiFamily{J31}{mg}
+\pxDeclareBasicCJKShape{J31}{mg}{m}{!utfkmgr--v}
+
+% UniGB
+\pxDeclareBasicCJKShape{J22}{hmc}{l}{!utfcml--h}
+\pxDeclareBasicCJKShape{J22}{hmc}{m}{!utfcmr--h}
+\pxDeclareBasicCJKShape{J22}{hmc}{bx}{!utfcmb--h}
+\pxDeclareBasicCJKShape{J22}{hgt}{m}{!utfcgr--h}
+\pxDeclareBasicCJKShape{J22}{hgt}{bx}{!utfcgb--h}
+\pxDeclareBasicCJKShape{J22}{hgt}{eb}{!utfcge--h}
+\pxDeclareKanjiFamily{J22}{mg}
+\pxDeclareBasicCJKShape{J22}{mg}{m}{!utfcmgr--h}
+
+\pxDeclareBasicCJKShape{J32}{hmc}{l}{!utfcml--v}
+\pxDeclareBasicCJKShape{J32}{hmc}{m}{!utfcmr--v}
+\pxDeclareBasicCJKShape{J32}{hmc}{bx}{!utfcmb--v}
+\pxDeclareBasicCJKShape{J32}{hgt}{m}{!utfcgr--v}
+\pxDeclareBasicCJKShape{J32}{hgt}{bx}{!utfcgb--v}
+\pxDeclareBasicCJKShape{J32}{hgt}{eb}{!utfcge--v}
+\pxDeclareKanjiFamily{J32}{mg}
+\pxDeclareBasicCJKShape{J32}{mg}{m}{!utfcmgr--v}
+
+% UniCNS
+\pxDeclareBasicCJKShape{J23}{hmc}{l}{!utftml--h}
+\pxDeclareBasicCJKShape{J23}{hmc}{m}{!utftmr--h}
+\pxDeclareBasicCJKShape{J23}{hmc}{bx}{!utftmb--h}
+\pxDeclareBasicCJKShape{J23}{hgt}{m}{!utftgr--h}
+\pxDeclareBasicCJKShape{J23}{hgt}{bx}{!utftgb--h}
+\pxDeclareBasicCJKShape{J23}{hgt}{eb}{!utftge--h}
+\pxDeclareKanjiFamily{J23}{mg}
+\pxDeclareBasicCJKShape{J23}{mg}{m}{!utftmgr--h}
+
+\pxDeclareBasicCJKShape{J33}{hmc}{l}{!utftml--v}
+\pxDeclareBasicCJKShape{J33}{hmc}{m}{!utftmr--v}
+\pxDeclareBasicCJKShape{J33}{hmc}{bx}{!utftmb--v}
+\pxDeclareBasicCJKShape{J33}{hgt}{m}{!utftgr--v}
+\pxDeclareBasicCJKShape{J33}{hgt}{bx}{!utftgb--v}
+\pxDeclareBasicCJKShape{J33}{hgt}{eb}{!utftge--v}
+\pxDeclareKanjiFamily{J33}{mg}
+\pxDeclareBasicCJKShape{J33}{mg}{m}{!utftmgr--v}
+
+\fi % pxbb@forcedeluxemulti
+
+\fi % pxbb@otfdeluxe
+
%--------------------------------------- add font switch to Babel \extras
\ifpxbb@switchfont
diff --git a/language/japanese/pxbase/pxbabel.tex b/language/japanese/pxbase/pxbabel.tex
index c619d0dcbb..065607a97a 100644
--- a/language/japanese/pxbase/pxbabel.tex
+++ b/language/japanese/pxbase/pxbabel.tex
@@ -1,16 +1,27 @@
% 文字コードは UTF-8
% uplatex で組版する
-\documentclass[a4paper,uplatex]{jsarticle}
+\documentclass[uplatex,dvipdfmx,a4paper]{jsarticle}
+\usepackage[T1]{fontenc}
+\usepackage{lmodern,textcomp}
+\usepackage{color}
+\definecolor{myblue}{rgb}{0,0,0.75}
+\definecolor{mygreen}{rgb}{0,0.45,0}
+\usepackage[colorlinks,hyperfootnotes=false]{hyperref}
+\usepackage{pxjahyper}
+\hypersetup{linkcolor=myblue,urlcolor=mygreen,
+ pdftitle={pxbabelパッケージ},
+ pdfauthor={八登崇之}}
+\usepackage{bxtexlogo}
+\bxtexlogoimport{*}
\usepackage{shortvrb}
\MakeShortVerb{\|}
-\newcommand{\PkgVersion}{1.1b}
-\newcommand{\PkgDate}{2017/07/03}
+\newcommand{\PkgVersion}{1.2}
+\newcommand{\PkgDate}{2021/05/22}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
\newcommand{\Note}{\par\noindent ※}
\newcommand{\Means}{:\quad\inhibitglue}
-\providecommand{\upTeX}{u\pTeX}
-\providecommand{\upLaTeX}{u\pLaTeX}
+\newcommand{\XS}{\hspace{\xkanjiskip}}
%-----------------------------------------------------------
\DeclareFontShape{JY2}{mc}{m}{ko}{<->s*[.924871]upkorrm-h}{}
\DeclareFontShape{JT2}{mc}{m}{ko}{<->s*[.924871]upkorrm-v}{}
@@ -26,9 +37,10 @@
%===========================================================
\section{概要}
+\label{sec:Overview}
{(u)\pLaTeX}における日本語・簡体字中国語・繁体字中国語・
-韓国語(以下この 4 つを「CJK言語」と総称する)の間の
+韓国語(以下この4つを「CJK言語」と総称する)の間の
「和文(CJK)フォント」の切り替えをBabelのインタフェースを
用いて行えるようにする。
@@ -46,10 +58,38 @@
\item \Pkg{japanese-otf}パッケージ({\pLaTeX}の場合)
\end{itemize}
+%-------------------
+\subsection{用語集}
+\label{ssec:terminology}
+
+\begin{itemize}
+\item CJK言語識別子\Means
+本パッケージにおいてCJK言語を指し示す、以下の文字列。
+ \begin{itemize}
+ \item |japanese|\Means 日本語
+ \item |korean|\Means 韓国語
+ \item |schinese|\Means 簡体字中国語
+ \item |tchinese|\Means 繁体字中国語
+ \end{itemize}
+\item 言語名\Means
+Babelで指定する(|\foreignlanguage| 等の引数にする)
+言語を表す文字列。
+\Note 既定ではCJK言語に対する「言語名」は「CJK言語識別子」と
+同じ(例えば日本語の「言語名」は|japanese|)であるが、
+そうでない設定も可能である。
+\item 仮想言語\Means
+Babelの言語オプション定義ファイル(|*.ldf|)の読込を伴わない
+言語のこと。
+本パッケージではCJK言語を仮想言語として扱えるため、
+各言語の定義ファイルを用意する必要がない。
+\Note CJK言語を仮想言語にせず定義ファイルを利用することも可能。
+\end{itemize}
+
%===========================================================
\section{読込}
+\label{sec:Loading}
-v0.9より\Pkg{babel}パッケージと一緒に読み込む方式
+0.9版より\Pkg{babel}パッケージと一緒に読み込む方式
(一括読込モード)をサポートした。
従来通り、別個に読み込む方式(分離読込モード)も可能である。
どちらであるかは、\Pkg{pxbabel}読込時に\Pkg{babel}が読込済か
@@ -64,45 +104,45 @@ v0.9より\Pkg{babel}パッケージと一緒に読み込む方式
|\usepackage[|\Meta{オプション}|]{pxbabel}|
\end{quote}
-オプションは以下の通り。
-なお「CJK 言語識別子」は次のいずれかの値のことを指す:
-\begin{itemize}
-\item |japanese|: 日本語
-\item |korean|: 韓国語
-\item |schinese|: 簡体字中国語
-\item |tchinese|: 繁体字中国語
-\end{itemize}
-「言語名」はBabelで指定する(|\foreignlanguage| 等の引数にする)
-言語を表す文字列のことである。
+%-------------------
+\subsection{パッケージオプション}
+\label{ssec:options}
\begin{itemize}
\item \Meta{CJK言語識別子}|=|\Meta{言語名}\Means
-各々のCJK言語に対して実際に使用するBabelの言語名を指定する。
-詳しくは「機能」の節を参照。
+CJK言語を仮想言語として扱い、実際に使用するBabelの言語名を指定する。
+\Note 詳細は\ref{sec:Commands}節を参照。
\Note 言語名の既定値はCJK言語識別子と同一名。
-(例えば |japanese|(日本語)の言語名は |japanese|。)
\item \Meta{CJK言語識別子}\Means
「\Meta{CJK言語識別子}|=|\Meta{CJK言語識別子}」と同じ。
-\Note これは既定値なので通常は指定する必要がないが、
+\Note 既定でこれと同等の設定が適用されるので通常は指定する必要がないが、
一括読込モードで「最後の言語(基底言語になる)」を
指定するのに有用である。
\item \Meta{CJK言語識別子}|=+|\Meta{言語名}\Means
-各々のCJK言語に対して実際に使用するBabelの言語名を指定し、
-かつその言語オプションの定義ファイル(|*.ldf|)を読み込む。
+CJK言語を非仮想言語として扱い、実際に使用するBabelの言語名を指定する。
+\Note 「\Meta{言語名}|.ldf|」という名前の
+言語オプション定義ファイルが読み込まれる。
\item |+|\Meta{CJK言語識別子}\Means
「\Meta{CJK言語識別子}|=+|\Meta{CJK言語識別子}」と同じ。
-\item 有効なBabel言語の名前\Means
+\item Babelの有効な言語名\Means
その言語の定義ファイルを読み込む。
-\Note 分離読込モードでもこの機能は有効である。
+\Note 現状では、分離読込モードでもこの機能は有効であるが、
+確実に動作させるのが困難であるため、将来的に
+「分離読込モードではCJK言語のみが指定可能
+\footnote{つまり、CJK言語以外は\texttt{babel}のオプションとして
+指定する必要がある。}」
+となる可能性がある。
\item |main=|\Meta{言語名}\Means
-文書開始時に有効となる基底言語を、
-言語名(CJK言語識別子でない)で指定する。
-\Note このオプションが未指定の場合、
+文書開始時に有効となる基底言語を、言語名
+\footnote{CJK言語について言語名とCJK言語識別子が異なる設定を
+用いる場合、\texttt{main}に指定するのは言語名の方であることに注意。}%
+で指定する。
+\Note |main|の指定がない場合、
分離読込モードでは\Pkg{babel}で最後に読まれた言語が基底言語になる。
一括読込モードでは\Pkg{pxbabel}で最後に読まれた言語が基底言語になる。
@@ -111,7 +151,7 @@ v0.9より\Pkg{babel}パッケージと一緒に読み込む方式
固定に関する設定を行う。
有効な値は次の通り:
\begin{itemize}
- \item 有効なBabel言語名\Means その言語に固定する。
+ \item 有効な言語名\Means その言語に固定する。
\item |main|\Means 文書開始時の基底言語に固定する。
\item |default|\Means キャプション文字列を文書クラスで
指定されたものから変更しない。
@@ -123,72 +163,55 @@ v0.9より\Pkg{babel}パッケージと一緒に読み込む方式
(仮に「仮想言語設定」と呼ぶ)の場合は |default|、
それ以外は |switch|。
\end{itemize}
-\Note Babelでは言語の切替に関して、入力言語のみを切り替えるもの
-(|\foreignlanguage| 命令、|otherlanguage*| 環境)
-と基底言語を切り替えるもの
-(|\selectlanguage| 命令、|otherlanguage| 環境)
-があり、既定の動作では
-キャプション言語は基底言語に常に追随する
-(|switch| 指定時と同じ)。
-ところが、「仮想言語設定」においては、キャプション文字列の
-設定が働かないので、基底言語を「仮想言語設定」の言語に切り替えた場合に
-キャプション言語が正しくない事態が生じる。\<\footnote{%
- ただし「文書開始時以外に基底言語を仮想言語設定に切り替える」ことを
- しなければ問題は起こらない。
- 特に、「日本語の文書クラスを用いて、かつBabelにおいて
- 仮想言語設定とした日本語を文書全体で基底言語にする」
- 場合は、キャプションは文書クラスで定めたものに固定される。}
-これによる混乱を避けるためにキャプション言語の固定が
-有用である場合がある。
-特に、「Babelによるキャプション文字列の変更を抑止して文書クラスで
-定めた文字列がいつでも有効であるようにしたい」という場合は、
-|default| を指定すればよい。
-文書開始時の基底言語が仮想言語設定である場合はこちらの使い方が
-多いと考えられるので、この場合には既定を |default| としている。
-\Note \Pkg{bxbase}パッケージの |\fixcaptiopnlanguage| によるキャプション
-言語固定の設定は、常に本パッケージでの設定より優先される。
-この使用は |main| オプションのものと一貫していないが、
-互換性のためそのままにしている。
+\Note 詳細は\ref{sec:Caption-Lang}節を参照。
\item |noswitchcaption|\Means
-|caption=default| と同じ。
-\Note v0.9 より前はこれが既定値であった。
-ゆえに、(|no|)|switchcaption| も |caption| もなく基底言語が
-仮想言語設定でない場合の |caption| 設定は、
-v0.9 より前は |default|、以降は |switch| と異なることになる。
-仮想言語設定でない場合は |default| にする必然性が少ないので、
-Babelの既定動作に合わせる目的で変更された。
+|caption=default|と同じ。
\item |switchcaption|\Means
-|caption=switch| と同じ。
+|caption=switch|と同じ。
+\Note (|no|)|switchcaption|は0.9版より前との互換性のため存在する。
-\item |switchfont|(既定で有効)\Means
-このパッケージが提供する、
+\item |switchfont|(既定値)\Means
CJK言語でフォントを切り替える機能を有効にする。
\item |noswitchfont|\Means
-このパッケージが提供する、
-CJK言語でフォントを切り替える機能を無効にする。
|switchfont| の否定。
+
+\item |forcedeluxemulti|\Means
+{\upLaTeX}で\Pkg{japanese-otf}パッケージを
+|deluxe|オプションおよび|multi|オプション付で使用している
+(|\UTFK|/|\UTFC|/|\UTFT|が多ウェイトで使える)ときに、
+日本語以外のテキストについても多ウェイトの設定を有効にする。
+\Note 本来は\XS|\UTFK|/|\UTFC|/|\UTFT|入力用である{\TeX}フォント
+(和文TFM)を使うため、約物の周りの空き調整が無効になる。
+
+\item |noforcedeluxemulti|(既定値)\Means
+|forcedeluxemulti|の否定。
+日本語以外のテキストについて多ウェイト設定を無効にする。
+\Note 約物の周りの空き調整が正常に行われる。
+\Note (|no|)|forcedeluxemulti|は試験的な機能であり、
+将来的に廃止される可能性がある。
\end{itemize}
%===========================================================
\section{ユーザ命令}
+\label{sec:Commands}
-このパッケージが提供する主要な機能であるCJKフォント切替に
+本パッケージの主要機能であるCJKフォント切替に
ついてはBabelの機能を用いて行うことになるため、
パッケージ特有の命令は存在しない。
-例えば、次のようなパッケージ読込(一括読込モード)
-の場合:
+例えば、次のようなパッケージ読込(一括読込モード)の場合
+\footnote{使用エンジンが{\upLaTeX}であるか、または
+ {\pLaTeX}で\Pkg{bxutf8}入力エンコーディングを用いているとする。}%
+:
\begin{quote}\begin{verbatim}
\usepackage[korean,japanese]{pxbabel}
\end{verbatim}\end{quote}
本文中で
-\footnote{{\upLaTeX}フォーマット使用または
-{\pLaTeX}で\Pkg{bxutf8}入力エンコーディングを用いているとする。}
\begin{quote}
-|日本語文書中に\foregnlanguage{korean}{|%
+|日本語文書中に\foreignlanguage{korean}{|%
\textgt{\Kor{한글}}|}がある。|
\end{quote}
と入力すれば次の出力が得られる。
@@ -201,58 +224,104 @@ CJK言語でフォントを切り替える機能を無効にする。
\begin{itemize}
\item |\cjklanguagename{|\Meta{CJK言語識別子}|}|\Means
そのCJK言語に対する言語名。
-\Note 例えば読込時に |schinese=chinesesimp| と指定した場合、
-|\cjklanguagename{schinese}| は |chinesesimp| に展開される。
+\Note 例えば、パッケージオプションで|schinese=chinesesimp|と指定した場合、
+|\cjklanguagename|\hspace{0pt}|{schinese}|\XS は
+「|chinesesimp|」に展開される。
\end{itemize}
%===========================================================
+\section{キャプション言語の固定に関する設定}
+\label{sec:Caption-Lang}
+
+Babelでは言語の切替に関して、入力言語のみを切り替えるもの
+(|\foreignlanguage|命令、|otherlanguage*|\XS 環境)
+と基底言語を切り替えるもの
+(|\selectlanguage|命令、|otherlanguage|環境)
+があり、既定動作ではキャプション言語は基底言語に常に追随する
+(|caption=switch|指定時と同じ)。
+
+ところが、実際の言語定義を伴わない仮想言語においては、
+キャプション文字列の設定は働かない。
+このため、基底言語を仮想言語に切り替えた場合には
+キャプション言語が正しくない事態が生じることになる。%
+\footnote{ただし「文書開始時以外に基底言語を仮想言語に切り替える」
+ ことをしなければ問題は起こらない。
+ 特に、「日本語の文書クラスを用いて、かつBabelにおいて
+ 仮想言語扱いの日本語を文書全体で基底言語にする」
+ 場合は、キャプションは文書クラスで定めたものに固定される。}
+これによる混乱を避けるために、|caption|オプションによる
+キャプション言語の固定が有用である場合がある。
+
+特に、「Babelによるキャプション文字列の変更を抑止して文書クラスで
+定めた文字列を常に有効にしたい」という場合は、
+|caption=default|を指定すればよい。
+文書開始時の基底言語が仮想言語である場合はこちらの使い方が
+多いと考えられるので、この場合に限って|caption|の既定値を
+(Babelの既定動作に相当する|switch|ではなく)
+|default|としている。
+
+\Note 0.9版より前は常に|default|を既定値としていた。
+ゆえに、|caption|(および(|no|)|switchcaption|)オプション
+指定がなく基底言語が仮想言語でない場合の|caption|設定は、
+0.9版より前は|default|、以降は|switch|と異なることになる。
+仮想言語設定でない場合は|default|にする必然性が少ないので、
+Babelの既定動作に合わせる目的で仕様が変更された。
+
+\Note \Pkg{bxbase}パッケージの\XS|\fixcaptiopnlanguage|命令による
+キャプション言語固定の設定は、常に本パッケージでの設定より優先される。
+この仕様は|main|オプションのものと一貫していないが、
+互換性のためそのままにしている。
+
+%===========================================================
\section{CJKフォント切替機能の原理}
+\label{sec:Switch-Font}
\subsection{{\upLaTeX}において}
{\upTeX}は標準で、CJK言語の{\TeX}フォント(和文TFM)を用意している。
-本パッケージはBabelにおいてCJK言語の切替処理(|\extras...|)
+本パッケージはBabelにおいてCJK言語の切替処理(|\extras...|\XS マクロ)
の中に、フォントの切替を追加し、
言語の選択に応じて適切なフォントが選ばれるようにする。
-言語に対するBabelの言語オプションの名前は変わりうるので、
-その名前をパッケージ読込時に指定できるようにした。
-また、あるCJK言語の為のオプションが読み込まれていない時は、
-フォントの切替のみをする簡易の言語オプション(仮想言語設定)
-をその場で生成する。
+%言語に対するBabelの言語オプションの名前は変わりうるので、
+%その名前をパッケージ読込時に指定できるようにした。
+%また、あるCJK言語の為のオプションが読み込まれていない時は、
+%フォントの切替のみをする簡易の言語オプション(仮想言語設定)
+%をその場で生成する。
\subsection{{\pLaTeX}において}
-\Pkg{japanese-otf}パッケージの |multi| オプションは{\pLaTeX}において
+\Pkg{japanese-otf}パッケージの|multi|オプションは{\pLaTeX}において
韓国語・中国語を扱うためのもので、
-これを使うと |\UTFK|/|\UTFC|/|\UTFT| で
-韓国語/中国語(簡体)/中国語(繁体)のフォントを用いて
+これを使うと\XS|\UTFK|/|\UTFC|/|\UTFT|の各命令で
+韓国語/簡体字中国語/繁体字中国語のフォントを用いて
文字が出力される
-(これらの命令の引数は |\UTF| と同じでUnicode値16進)。
+(これらの命令の引数は\XS|\UTF|と同じで16進表記のUnicode符号値)。
{\pLaTeX}における本パッケージの動作は次のようである。
-まず、{\upLaTeX}の場合と同じようにCJK言語のための
-Babel言語オプションを生成する。
-その上で、CJK言語に切り替わった場合には、
-|\UTF| の動作を「本来の |\UTF|」/|\UTFK|/|\UTFC|/|\UTFT|
+%まず、{\upLaTeX}の場合と同じようにCJK言語のための
+%Babel言語オプションを生成する。
+Babelの言語がCJK言語に切り替わった場合には、
+|\UTF|の動作を「本来の\XS|\UTF|」/|\UTFK|/|\UTFC|/|\UTFT|
に切り替える。
この機能は単独ではあまり有用とはいえないが、
\Pkg{bxutf8}入力エンコーディング
と併用してCJK言語のUTF-8直接入力を行う時に有用となる。
-すなわち直接入力されたCJK文字は |\UTF| に帰着するので、
+すなわち直接入力されたCJK文字は\XS|\UTF|に帰着するので、
結果的に{\upLaTeX}の時と同じように、Babelで切り替えた言語用の
フォントで出力することが可能となる。
\Note ただし、この機構には、
-「JIS X~0208にある文字はそもそも |\UTF| に変換されずに
-直接日本語フォントで出力される」
+「JIS X~0208にある文字はそもそも\XS|\UTF|に変換されないので
+常に日本語フォントで出力されてしまう」
という欠点をもつ。
これを解決するには\Pkg{pxfltsrc}パッケージ等の機能を用いて
-文書にテキスト変換フィルタを適用されるという処理が必要になる。
+文書にテキスト変換フィルタを適用するといった追加の処理が必要になる。
%===========================================================
\section{Babel一括読込モード}
+\label{sec:Lumped-Loading}
-v0.9より前では、Babel本体(\Pkg{babel}パッケージ)
+0.9版より前では、Babel本体(\Pkg{babel}パッケージ)
とは別個に読み込む方式のみを採用していた。
ところがこの場合、
「Babelの本来の機能は不要で\Pkg{pxbabel}の
@@ -267,12 +336,12 @@ v0.9より前では、Babel本体(\Pkg{babel}パッケージ)
\end{verbatim}\end{quote}
\Note \Pkg{pxbabel}を読んで基底言語を |japanese|
にする必要があるのだが、
-そうするとまず \Pkg{babel} を読む必要があり
-ここで何かダミーの言語(|english| を用いた)を指定する必要がある。
-このままでは基底が |english| になるので、
-|japanese| を基底にするのに |main| オプションが必要。
+そうするとまず\Pkg{babel}を読む必要があり
+ここで何かダミーの言語(|english|を用いた)を指定する必要がある。
+このままでは基底が|english|になるので、
+|japanese|を基底にするためさらに|main|オプションが必要となる。
-そこで、v0.9において、\Pkg{babel}と一括で読み込むことで、
+そこで、0.9版において、\Pkg{babel}と一括で読み込むことで、
\Pkg{babel}の使用言語オプション指定の方法を踏襲できるようにした。
\Pkg{babel}の読込前に\Pkg{pxbabel}を読み込むとこの動作になり、
\Pkg{babel}も一緒に読み込まれる。
@@ -281,22 +350,29 @@ v0.9より前では、Babel本体(\Pkg{babel}パッケージ)
\usepackage[korean,japanese]{pxbabel}
\end{verbatim}\end{quote}
\Note オプションは\Pkg{babel}のものと同じ理屈で書く。
-|korean| と |japanese| を用い、
-基底が |japanese| なのでこの順番になる。
+|korean|と|japanese|を用い、
+かつ基底が|japanese|なのでこの順番になる。
-目的が「{\upTeX}のSIP対応の日本語フォントが使いたい」
-だけの場合は以下のようになる。
+目的が「{\upTeX}の非BMP文字対応の日本語フォントが使いたい」
+だけの場合
+\footnote{現在の{\upLaTeX}では既定の和文フォントが既に非BMP文字に
+対応しているため、この使い方は不要である。}%
+は以下のようになる。
\begin{quote}\begin{verbatim}
\usepackage[japanese]{pxbabel}
\end{verbatim}\end{quote}
-\Note |japanese| のみ指定して、当然これが基底。
+\Note |japanese|のみ指定して、当然これを基底とする。
実際には、4つのCJK言語のオプションは「常に」出現するので、
上の2つの指定は等価であるが、
一括読込の場合は\Pkg{babel}の習慣に合わせて記述するのが
解りやすいと思われる。
+%-------------------
+\subsection{複雑な例}
+\label{ssec:complex-loading}
+
少し複雑な例を挙げておく。
ドイツ語(|ngerman|)、日本語(|japanese|)、
簡体字中国語(|simpchinese|)、繁体字中国語(|tradchinese|)
@@ -319,14 +395,9 @@ v0.9より前では、Babel本体(\Pkg{babel}パッケージ)
+japanese]{pxbabel}
\end{verbatim}\end{quote}
-\Note ldfの読込を伴う言語(|japanese|)が基底なので、
-|caption| は |switch| が既定値になる。
-なお、非CJK言語(|ngerman|)には決して |+| を付けないことに注意。
-
-%===========================================================
-\section{更新履歴}
-
-|README-ja.md| ファイルを参照。
+\Note 非仮想言語の|japanese|が基底なので、
+|caption|は|switch|が既定値になる。
+なお、非CJK言語(|ngerman|)には決して\XS|+|\XS を付けないことに注意。
%===========================================================
\end{document}
diff --git a/language/japanese/pxbase/pxbase.sty b/language/japanese/pxbase/pxbase.sty
index e10ec1c6e2..56dbb1d053 100644
--- a/language/japanese/pxbase/pxbase.sty
+++ b/language/japanese/pxbase/pxbase.sty
@@ -1,14 +1,14 @@
%%
%% This is file 'pxbase.sty'.
%%
-%% Copyright (c) 2017 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2008-2021 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
%% This package is distributed under the MIT License.
%%
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxbase}[2017/07/03 v1.1b PX base library]
+\ProvidesPackage{pxbase}[2021/05/22 v1.2 PX base library]
% The pxbase package now does the same thing as the bxbase package.
\RequirePackageWithOptions{bxbase}[2017/05/29]
\endinput
diff --git a/language/japanese/pxbase/pxbasenc.def b/language/japanese/pxbase/pxbasenc.def
index 55f1ac1130..3168617933 100644
--- a/language/japanese/pxbase/pxbasenc.def
+++ b/language/japanese/pxbase/pxbasenc.def
@@ -4,7 +4,7 @@
%% file declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesFile{pxbasenc.def}[2017/07/03 v1.1b PX encoding library]
+\ProvidesFile{pxbasenc.def}[2021/05/22 v1.2 PX encoding library]
\def\pxec@pkgname{PXbase} % bundle name
%% code guards
diff --git a/language/japanese/pxbase/pxjsfenc.def b/language/japanese/pxbase/pxjsfenc.def
index 0fc28f2e81..44ef99b3b1 100644
--- a/language/japanese/pxbase/pxjsfenc.def
+++ b/language/japanese/pxbase/pxjsfenc.def
@@ -4,7 +4,7 @@
%% file declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesFile{pxjsfenc.def}[2017/07/03 v1.1b PX JSF encoding]
+\ProvidesFile{pxjsfenc.def}[2021/05/22 v1.2 PX JSF encoding]
%% code guards
\edef\pxec@jsf@restore@codes{%
diff --git a/language/japanese/pxbase/upkcat.sty b/language/japanese/pxbase/upkcat.sty
index a97cbde36d..4f95a26d7b 100644
--- a/language/japanese/pxbase/upkcat.sty
+++ b/language/japanese/pxbase/upkcat.sty
@@ -1,7 +1,7 @@
%%
%% This is file 'upkcat.sty'.
%%
-%% Copyright (c) 2017 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2008-2021 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -35,7 +35,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{upkcat}[2017/06/19 v1.1a safe kcatcode access]
+\ProvidesPackage{upkcat}[2021/05/22 v1.2 safe kcatcode access]
%--------------------------------------- main
diff --git a/macros/latex/contrib/colorist/README.md b/macros/latex/contrib/colorist/README.md
index 48f9a8e82f..28ca41cf52 100644
--- a/macros/latex/contrib/colorist/README.md
+++ b/macros/latex/contrib/colorist/README.md
@@ -2,27 +2,28 @@
# `colorist` bundle: write you documents in a colorful way
-This is collection of styles and classes for typesetting articles and books in a
-colorful design. It mainly consists of two parts.
+A collection of styles and classes that helps you typesetting articles and books
+with a colorful design. It mainly consists of two parts.
- Main part:
- - colorist.sty : the main style
- - colorart.cls : class for typesetting articles
- - colorbook.cls : class for typesetting books
+ - `colorist.sty` : the main style
+ - `colorart.cls` : class for typesetting articles
+ - `colorbook.cls` : class for typesetting books
They can be used with any major TeX engine. Currently they have native
- support to English and French typesetting. (I have planed to add more
- language support)
+ support to English, French and German typesetting (more language to be
+ added).
- Derivative part (they have separate pages on CTAN):
- - lebhart.cls : more advanced class for typesetting articles
- - beaulivre.cls : more advanced class for typesetting books
+ - `lebhart.cls` : enhanced version of `colorart`
+ - `beaulivre.cls` : enhanced version of `colorbook`
They are similar to the main classes, but have unicode support, thus can
only be used with either XeLaTeX or LuaLaTeX. Currently they have native
- support to English, French and Chinese typesetting, and also use more
- beautiful fonts. (I have planed to add more language support)
+ support to Chinese (both simplified and traditional), English, French,
+ German, Japanese and Russian typesetting (more language to be added), and
+ also use more beautiful fonts.
# License
diff --git a/macros/latex/contrib/colorist/colorart.cls b/macros/latex/contrib/colorist/colorart.cls
index c40e2c682b..304a002614 100644
--- a/macros/latex/contrib/colorist/colorart.cls
+++ b/macros/latex/contrib/colorist/colorart.cls
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{colorart}
- [2021/03/15 A colorful article style]
+ [2021/05/24 A colorful article style]
\def\colorclass@baseclass{article}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -27,6 +27,12 @@
}
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
+
+\newif\if@colorclass@bfivepaper\@colorclass@bfivepaperfalse
+\DeclareVoidOption{b5paper}{\@colorclass@bfivepapertrue}
+\newif\if@colorclass@afourpaper\@colorclass@afourpaperfalse
+\DeclareVoidOption{a4paper}{\@colorclass@afourpapertrue}
+
\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{\colorclass@baseclass}}
\ProcessKeyvalOptions*\relax
\LoadClass{\colorclass@baseclass}
@@ -37,20 +43,41 @@
%%================================
%% Page layout
%%================================
+\RequirePackage{silence}
+\WarningFilter{geometry}{Over-specification in}
\RequirePackage[heightrounded]{geometry}
\geometry{
- % papersize={8in,11in},
+ papersize={8.5in,11in},
+ total={47em,66em},
+ hmarginratio=1:1,
+ vmarginratio=1:1,
+ footnotesep=2em plus 2pt minus 2pt,
+}
+\if@colorclass@bfivepaper
+\geometry{
+ b5paper,
+ total={40em,59em},
+ hmarginratio=1:1,
+ vmarginratio=1:1,
+ footnotesep=2em plus 2pt minus 2pt,
+}
+\fi
+\if@colorclass@afourpaper
+\geometry{
a4paper,
total={47em,70em},
hmarginratio=1:1,
vmarginratio=1:1,
footnotesep=2em plus 2pt minus 2pt,
}
+\fi
\RequirePackage{indentfirst}
\if@colorclass@fast
\PassOptionsToPackage{fast}{colorist}
+ \RequirePackage{draftwatermark}
+ \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95}
\fi
\RequirePackage{colorist}
@@ -64,6 +91,9 @@
\fi
\RequirePackage{mathpazo}
\RequirePackage{newpxtext}
+\RequirePackage{amssymb}
+
+\def\PJL@font@alreadyset{}
\RequirePackage[verbose=silent]{microtype}
@@ -73,60 +103,15 @@
\RequirePackage{graphicx}
\graphicspath{{images/}}
\RequirePackage{wrapfig}
+\RequirePackage{float}
\RequirePackage{caption}
+\captionsetup{font=small}
%%================================
%% Index
%%================================
\RequirePackage{imakeidx}
-%%================================
-%% Draft mark
-%%================================
-\def\dnfFont{\ttfamily}
-\def\needgraphFont{\ttfamily}
-
-\def\dnfTextEN{To be finished here}
-\def\needgraphTextEN{A graph is needed here}
-\def\dnfTextFR{À terminer ici}
-\def\needgraphTextFR{Il manque encore un graphique ici}
-\def\dnfTextCN{这里的内容尚未完成}
-\def\needgraphTextCN{这里需要一张图片}
-
-\definecolor{dnfColor}{RGB}{21,122,20}
-\definecolor{needgraphColor}{RGB}{70,130,180}
-
-\if@colorclass@fast
- \newcommand{\plainBox}[2][-paper]{\textcolor{#1}{%
- \setlength{\fboxsep}{1.5pt}%
- \setlength{\fboxrule}{1.2pt}%
- \fbox{#2}}}
-\else
- \PassOptionsToPackage{many}{tcolorbox}
- \RequirePackage{tcolorbox}
- \newtcbox{\plainBox}[1][-paper]{enhanced jigsaw,%
- on line, arc = 1.2pt, outer arc = 1pt,breakable,%
- colframe = #1,colupper=#1,opacityback=0,%
- boxsep = 1pt,boxrule = 1.2pt,%
- left = 1pt, right = 1pt, top = 0pt, bottom = 0pt,%
- }
-\fi
-
-\NewDocumentCommand{\dnf}{d<>}{%
- \noindent\plainBox[dnfColor]%
- {\normalfont\dnfFont\bfseries\small%
- \csname dnfText\csname\languagename ABBR\endcsname\endcsname%
- \IfNoValueF{#1}{ : #1}}%
-}
-\NewDocumentCommand{\needgraph}{d<>}{%
- \par%
- \centerline{\plainBox[needgraphColor]%
- {\normalfont\needgraphFont\bfseries\small%
- \csname needgraphText\csname\languagename ABBR\endcsname\endcsname%
- \IfNoValueF{#1}{ : #1}}}%
- \par%
-}
-
\endinput
%%
%% End of file `colorist/colorart.cls'.
diff --git a/macros/latex/contrib/colorist/colorbook.cls b/macros/latex/contrib/colorist/colorbook.cls
index e620546e5a..da8b6e75b8 100644
--- a/macros/latex/contrib/colorist/colorbook.cls
+++ b/macros/latex/contrib/colorist/colorbook.cls
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{colorbook}
- [2021/03/15 A colorful book style]
+ [2021/05/24 A colorful book style]
\def\colorclass@baseclass{book}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -27,6 +27,12 @@
}
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
+
+\newif\if@colorclass@bfivepaper\@colorclass@bfivepaperfalse
+\DeclareVoidOption{b5paper}{\@colorclass@bfivepapertrue}
+\newif\if@colorclass@afourpaper\@colorclass@afourpaperfalse
+\DeclareVoidOption{a4paper}{\@colorclass@afourpapertrue}
+
\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{\colorclass@baseclass}}
\ProcessKeyvalOptions*\relax
\LoadClass{\colorclass@baseclass}
@@ -37,20 +43,41 @@
%%================================
%% Page layout
%%================================
+\RequirePackage{silence}
+\WarningFilter{geometry}{Over-specification in}
\RequirePackage[heightrounded]{geometry}
\geometry{
- % papersize={8in,11in},
+ papersize={8.5in,11in},
+ total={47em,66em},
+ hmarginratio=1:1,
+ vmarginratio=1:1,
+ footnotesep=2em plus 2pt minus 2pt,
+}
+\if@colorclass@bfivepaper
+\geometry{
+ b5paper,
+ total={40em,59em},
+ hmarginratio=1:1,
+ vmarginratio=1:1,
+ footnotesep=2em plus 2pt minus 2pt,
+}
+\fi
+\if@colorclass@afourpaper
+\geometry{
a4paper,
total={47em,70em},
hmarginratio=1:1,
vmarginratio=1:1,
footnotesep=2em plus 2pt minus 2pt,
}
+\fi
\RequirePackage{indentfirst}
\if@colorclass@fast
\PassOptionsToPackage{fast}{colorist}
+ \RequirePackage{draftwatermark}
+ \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95}
\fi
\RequirePackage{colorist}
@@ -64,6 +91,9 @@
\fi
\RequirePackage{mathpazo}
\RequirePackage{newpxtext}
+\RequirePackage{amssymb}
+
+\def\PJL@font@alreadyset{}
\RequirePackage[verbose=silent]{microtype}
@@ -73,60 +103,15 @@
\RequirePackage{graphicx}
\graphicspath{{images/}}
\RequirePackage{wrapfig}
+\RequirePackage{float}
\RequirePackage{caption}
+\captionsetup{font=small}
%%================================
%% Index
%%================================
\RequirePackage{imakeidx}
-%%================================
-%% Draft mark
-%%================================
-\def\dnfFont{\ttfamily}
-\def\needgraphFont{\ttfamily}
-
-\def\dnfTextEN{To be finished here}
-\def\needgraphTextEN{A graph is needed here}
-\def\dnfTextFR{À terminer ici}
-\def\needgraphTextFR{Il manque encore un graphique ici}
-\def\dnfTextCN{这里的内容尚未完成}
-\def\needgraphTextCN{这里需要一张图片}
-
-\definecolor{dnfColor}{RGB}{21,122,20}
-\definecolor{needgraphColor}{RGB}{70,130,180}
-
-\if@colorclass@fast
- \newcommand{\plainBox}[2][-paper]{\textcolor{#1}{%
- \setlength{\fboxsep}{1.5pt}%
- \setlength{\fboxrule}{1.2pt}%
- \fbox{#2}}}
-\else
- \PassOptionsToPackage{many}{tcolorbox}
- \RequirePackage{tcolorbox}
- \newtcbox{\plainBox}[1][-paper]{enhanced jigsaw,%
- on line, arc = 1.2pt, outer arc = 1pt,breakable,%
- colframe = #1,colupper=#1,opacityback=0,%
- boxsep = 1pt,boxrule = 1.2pt,%
- left = 1pt, right = 1pt, top = 0pt, bottom = 0pt,%
- }
-\fi
-
-\NewDocumentCommand{\dnf}{d<>}{%
- \noindent\plainBox[dnfColor]%
- {\normalfont\dnfFont\bfseries\small%
- \csname dnfText\csname\languagename ABBR\endcsname\endcsname%
- \IfNoValueF{#1}{ : #1}}%
-}
-\NewDocumentCommand{\needgraph}{d<>}{%
- \par%
- \centerline{\plainBox[needgraphColor]%
- {\normalfont\needgraphFont\bfseries\small%
- \csname needgraphText\csname\languagename ABBR\endcsname\endcsname%
- \IfNoValueF{#1}{ : #1}}}%
- \par%
-}
-
\endinput
%%
%% End of file `colorist/colorbook.cls'.
diff --git a/macros/latex/contrib/colorist/colorist-doc.pdf b/macros/latex/contrib/colorist/colorist-doc.pdf
index 27c3d1b58c..faacf8b77a 100644
--- a/macros/latex/contrib/colorist/colorist-doc.pdf
+++ b/macros/latex/contrib/colorist/colorist-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/colorist/colorist-doc.tex b/macros/latex/contrib/colorist/colorist-doc.tex
index f61a2f99b5..14dc39da0d 100644
--- a/macros/latex/contrib/colorist/colorist-doc.tex
+++ b/macros/latex/contrib/colorist/colorist-doc.tex
@@ -1,22 +1,24 @@
%! TEX program = xelatex
-\PassOptionsToPackage{dvipsnames}{xcolor}
-\documentclass{colorart}
+\documentclass[allowbf]{colorart}
%%================================
-%% TeX logo and URL
+%% Import toolkit
%%================================
-\usepackage{hologo}
-\usepackage{url}
+\usepackage{PJLtoolkit}
+\usepackage{longtable} % breakable tables
+\usepackage{hologo} % more TeX logo
%%================================
%% For typestting code
%%================================
\usepackage{listings}
+\definecolor{maintheme}{RGB}{70,130,180}
+\definecolor{forestgreen}{RGB}{21,122,81}
\definecolor{lightergray}{gray}{0.99}
\lstset{language=[LaTeX]TeX,
- keywordstyle=\color{RoyalBlue},
+ keywordstyle=\color{maintheme},
basicstyle=\ttfamily,
- commentstyle=\color{ForestGreen}\ttfamily,
+ commentstyle=\color{forestgreen}\ttfamily,
stringstyle=\rmfamily,
showstringspaces=false,
breaklines=true,
@@ -29,92 +31,203 @@
firstnumber=last,
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
-\lstset{morekeywords=%
- {CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,
- linenumbers,nolinenumbers,subsection,maketitle
+\lstset{moretexcs=%
+ {linenumbers,nolinenumbers,subsection,
+ color,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
}
}
\lstnewenvironment{code}%
{\setkeys{lst}{columns=fullflexible,keepspaces=true}}{}
-\providecommand{\colorist}{\textsf{colorist}}
-\providecommand{\colorart}{\textsf{colorart}}
-\providecommand{\colorbook}{\textsf{colorbook}}
-\providecommand{\lebhart}{\textsf{lebhart}}
-\providecommand{\beaulivre}{\textsf{beaulivre}}
+%%================================
+%% remind
+%%================================
+\usepackage[many]{tcolorbox}
+\newenvironment{remind}[1][Remind]{%
+ \begin{tcolorbox}[breakable,
+ enhanced,
+ width = \textwidth,
+ colback = white, colbacktitle = paper,
+ colframe = gray!50, boxrule=0.2mm,
+ coltitle = black,
+ fonttitle = \sffamily,
+ attach boxed title to top left = {yshift=-\tcboxedtitleheight/2, xshift=\tcboxedtitlewidth/4},
+ boxed title style = {boxrule=0pt, colframe=paper},
+ before skip = 0.3cm,
+ after skip = 0.3cm,
+ top = 3mm,
+ bottom = 3mm,
+ title={\sffamily #1}]%
+}{\end{tcolorbox}}
+
+%%================================
+%% Names
+%%================================
+\providecommand{\colorist}{{\normalfont\textsf{colorist}}}
+\providecommand{\colorart}{{\normalfont\textsf{colorart}}}
+\providecommand{\colorbook}{{\normalfont\textsf{colorbook}}}
+\providecommand{\lebhart}{{\normalfont\textsf{lebhart}}}
+\providecommand{\beaulivre}{{\normalfont\textsf{beaulivre}}}
+
%%================================
%% Main text
%%================================
\begin{document}
-\title{\colorist{}, write your articles or books in a colorful way\thanks{Corresponding to: \texttt{\colorist{} 2021/03/15}}}
-\author{Jinwen}
-\date{March 2021, Beijing}
+\title{{\normalfont\textbf{\textsf{colorist}}}, write your articles or books in a colorful way}
+\author{Jinwen XU}
+\thanks{Corresponding to: \texttt{\colorist{} 2021/05/24}}
+\date{May 2021, Beijing}
\maketitle
\begin{abstract}
- The \colorist{} is a series of styles and classes for you to typeset your articles or books in a colorful manner. My original intention in designing this series is to write drafts and notes that look colorful yet not dazzling.
+ \colorist{} is a series of styles and classes for you to typeset your articles or books in a colorful manner. My original intention in designing this series is to write drafts and notes that look colorful yet not dazzling.
- The entire collection includes \verb|colorist.sty|, which is the main style shared by all the following classes; \verb|colorart.cls| for typesetting articles and \verb|colorbook.cls| for typesetting books. They compile with any major \TeX{} engine, with native support to English and French typesetting via \lstinline|\UseLanguage| (see the instruction below for detail).
+ The entire collection includes \verb|colorist.sty|, which is the main style shared by all of the following classes; \verb|colorart.cls| for typesetting articles and \verb|colorbook.cls| for typesetting books. They compile with any major \TeX{} engine, with native support to English, French and German typesetting via \lstinline|\UseLanguage| (see the instruction below for detail).
- You can also found \lebhart{} and \beaulivre{} on CTAN. They are the enhanced version of \colorart{} and \colorbook{} with unicode support. With this, they can access to more beautiful fonts, and also have native support for Chinese typesetting. On the other hand, they need to be compiled with \hologo{XeLaTeX} or \hologo{LuaLaTeX} (not pdf\LaTeX).
+ You can also found \lebhart{} and \beaulivre{} on CTAN. They are the enhanced version of \colorart{} and \colorbook{} with unicode support. With this, they can access to more beautiful fonts, and also have native support for Chinese, Japanese and Russian typesetting. On the other hand, they need to be compiled with \hologo{XeLaTeX} or \hologo{LuaLaTeX} (not pdf\LaTeX).
- This documentation is typeset using \colorart{}. You can think of it as a short introduction and demonstration.
+ This documentation is typeset using \colorart{} (with the option \texttt{allowbf}). You can think of it as a short introduction and demonstration.
\end{abstract}
-\begin{tcolorbox}[enhanced jigsaw,pad at break*=1mm,breakable,colback=yellow!25!paper,boxrule=0pt,frame hidden]
- Since the main body of \colorist{} is modified from the \textsf{minimalist} series, some elements have not been completely redesigned yet, especially the TOC, part and chapter style. These will be added gradually in the future versions.
-\end{tcolorbox}
-
\tableofcontents
-\section{How to load it}
+\bigskip\bigskip
+\begin{remind}
+ Multi-language support, theorem-like environments, draft marks and some other features are provided by the \ProjLib{} toolkit. Here we only briefly discuss how to use it with this document class. For more detailed information, you can refer to the documentation of \ProjLib{}.
+\end{remind}
+
+\clearpage
+\section{Initialization}
+
+\subsection{How to load it}
You can directly use \colorart{} or \colorbook{} as your document class. In this way, you can directly begin writing your document, without having to worry about the configurations.
\begin{code}
\documentclass{colorart} (*{\normalfont or}*) \documentclass{colorbook}
\end{code}
-And of course, you can also use the default classes \textsf{article} or \textsf{book}, and load the \colorist{} package. This way, only the basic styles are set, and you can thus use your preferred fonts and page layout. All the features mentioned in this article (except for draft marks) are provided.
+And of course, you can also use the default classes \textsf{article} or \textsf{book}, and load the \colorist{} package. This way, only the basic styles are set, and you can thus use your preferred fonts and page layout. All the features mentioned in this article are provided.
\begin{code}
\usepackage{colorist}
\end{code}
-\subsection{A useful switch: the option \textsf{fast} or \textsf{draft}}
-You can use the option \verb|fast| or \verb|draft| to typeset in a fast but slightly rough manner. The main differences are:
+\subsection{Options}
+
+\colorist{} offers the following options:
+
\begin{itemize}
- \item Do not use hyperref;
- \item Use draft mode for all tcolorboxes.
+ \item \texttt{draft} or \texttt{fast}
+ \begin{itemize}
+ \item The option \verb|fast| enables a faster but slightly rougher style, main differences are:
+ \begin{itemize}
+ \item Use simpler math font configuration;
+ \item Do not use hyperref;
+ \item Enable the fast mode of \ProjLib{} toolkit.
+ \end{itemize}
+ \end{itemize}
+ \item \texttt{allowbf}
+ \begin{itemize}
+ \item Allow boldface. When this option is enabled, the title, titles of all levels and names of theorem-like environments will be bolded.
+ \end{itemize}
+\end{itemize}
+
+\begin{remind}
+ \begin{itemize}
+ \item During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark "DRAFT" to indicate that you are currently in the draft mode.
+ \end{itemize}
+\end{remind}
+
+\bigskip
+Additionally, \colorart{} and \colorbook{} offers the following options:
+\begin{itemize}
+ \item \texttt{a4paper} or \texttt{b5paper}
+ \begin{itemize}
+ \item Optional paper size. The default paper size is 8.5in $\times$ 11in.
+ \end{itemize}
\end{itemize}
-During the writing stage of your document, it is recommended to use the \verb|fast| option to speed up compilation and improve the smoothness of your writing experience. At the end, you can remove the ``fast'' mark to get the final version.
\section{Some instructions}
+Many of the features described next are provided by the \ProjLib{} toolkit. Only the basic usage is mentioned here. For more details, please refer to its user documentation.
+
+\subsection{Language configuration}
+
+\colorist{} has multi-language support, including simplified Chinese, traditional Chinese, English, French, German, Japanese, and Russian. The language can be selected by the following macros:
+
+\begin{itemize}
+ \item \lstinline|\UseLanguage{|\meta{language name}\lstinline|}| is used to specify the language. The corresponding setting of the language will be applied after it. It can be used either in the preamble or in the main body. When no language is specified, ``English" is selected by default.
+ \item \lstinline|\UseOtherLanguage{|\meta{language name}\lstinline|}{|\meta{content}\lstinline|}|, which uses the specified language settings to typeset \meta{content}. Compared with \lstinline|\UseLanguage|, it will not modify the line spacing, so line spacing would remain stable when CJK and Western texts are mixed.
+\end{itemize}
+
+\clearpage
+\meta{language name} can be:
+\begin{itemize}
+ \item Simplified Chinese: \texttt{Chinese}, \texttt{chinese}, \texttt{SChinese}, \texttt{schinese}, \texttt{SimplifiedChinese} or \texttt{simplifiedchinese}
+ \item Traditional Chinese: \texttt{TChinese}, \texttt{tchinese}, \texttt{TraditionalChinese} or \texttt{traditionalchinese}
+ \item English: \texttt{English} or \texttt{english}
+ \item French: \texttt{French} or \texttt{french}
+ \item German: \texttt{German}, \texttt{german} or \texttt{ngerman}
+ \item Japanese: \texttt{Japanese} or \texttt{japanese}
+ \item Russian: \texttt{Russian} or \texttt{russian}
+\end{itemize}
+
+\medskip
+In addition, you can also add new settings to selected language:
+\begin{itemize}
+ \item \lstinline|\AddLanguageSetting{|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item Add \meta{settings} to all supported languages.
+ \end{itemize}
+ \item \lstinline|\AddLanguageSetting(|\meta{language name}\lstinline|){|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item Add \meta{settings} to the selected language \meta{language name}.
+ \end{itemize}
+\end{itemize}
+For example, \lstinline|\AddLanguageSetting(German){\color{orange}}| can make all German text displayed in orange (of course, one then need to add \lstinline|\AddLanguageSetting{\color{black}}| in order to correct the color of the text in other languages).
+
+
\subsection{Theorems and how to reference them}
-Environments such as definitions and theorems have been pre-defined and can be used directly, for example:
+Environments such as definitions and theorems have been pre-defined and can be used directly.
+
+More specifically, preset environments include:
+\texttt{assumption}, \texttt{axiom}, \texttt{conjecture}, \texttt{convention}, \texttt{corollary}, \texttt{definition}, \texttt{definition-proposition}, \texttt{definition-theorem}, \texttt{example}, \texttt{exercise}, \texttt{fact}, \texttt{hypothesis}, \texttt{lemma}, \texttt{notation}, \texttt{problem}, \texttt{property}, \texttt{proposition}, \texttt{question}, \texttt{remark}, \texttt{theorem}, and the corresponding unnumbered version with an asterisk \lstinline|*| in the name. The display of these environments will change according to the current language.
+
+\medskip
+When referencing a theorem-like environment, it is recommended to use clever reference \lstinline|\cref{|\meta{label}\texttt{\}}. In this way, there is no need to explicitly write down the name of the corresponding environment every time.
+
+\begin{remind}[Example]
\begin{code}
\begin{definition}[Strange things] \label{def: strange} ...
\end{code}
+
will produce
\begin{definition}[Strange things]\label{def: strange}
This is the definition of some strange objects.
\end{definition}
-\begin{definition}[Another definition]
- Different definitions are automatically glued together, and there will be no gaps in between.
-\end{definition}
+\lstinline|\cref{def: strange}| will be displayed as: \cref{def: strange}.
-When referencing, you can directly use clever reference \lstinline|\cref{(label name)}|. For example, \lstinline|\cref{def: strange}| will be displayed as: \cref{def: strange}.
+\medskip
+After using \lstinline|\UseLanguage{French}|, a theorem will be displayed as:
+
+\UseLanguage{French}
+\begin{theorem}[Inutile]\label{thm}
+ Un théorème en français.
+\end{theorem}
+
+By default, when referenced, the name of the theorem always matches the language of the context in which the theorem is located. For example, the definition above is still displayed in English in the current French mode: \cref{def: strange} and \cref{thm}. If you want the name of the theorem to match the current context when referencing, you can add \texttt{regionalref} to the global options.
+\end{remind}
-\bigskip
-The following are several other styles of theorem-like environments:
+\clearpage %\bigskip
+The following are the main styles of theorem-like environments:
\begin{theorem}
- Theorem style: theorem, proposition, lemma, corollary
+ Theorem style: theorem, proposition, lemma, corollary, ...
\end{theorem}
\begin{proof}
@@ -130,93 +243,273 @@ The following are several other styles of theorem-like environments:
\end{conjecture}
\begin{example*}
- Example style: example, fact
+ Example style: example, fact, ...
\end{example*}
\begin{problem}
- Problem style
+ Problem style: problem, question, ...
\end{problem}
+\medskip
+For aesthetics, adjacent definitions will be connected together automatically:
+\begin{definition}
+ First definition.
+\end{definition}
+
+\begin{definition}
+ Second definition.
+\end{definition}
+
+\UseLanguage{English}
+
+% \clearpage
\subsection{Define a new theorem-like environment}
-First define the name of this environment in the language used: \lstinline|\(name of environment)(language name)|. Where \lstinline|(language name)| can be \lstinline|EN|, \lstinline|FR|, \lstinline|CN|, etc., and then define this environment in one of the following four ways:
+If you need to define a new theorem-like environment, you must first define the name of the environment in the language used: \lstinline|\|\meta{name of environment}\meta{language abbr}, where \meta{language abbr} is the abbreviation of language, which can be:
+% \vspace{-.5\baselineskip}
+\begin{longtable}{ll|ll}
+ \texttt{CN} & Simplified Chinese & \texttt{DE} & German\\
+ \texttt{TC} & Traditional Chinese & \texttt{JP} & Japanese\\
+ \texttt{EN} & English & \texttt{RU} & Russian\\
+ \texttt{FR} & French & &\\
+\end{longtable}
+
+\vspace{-.5\baselineskip}
+\begin{remind}
+ If you want to define an environment with an asterisk \lstinline|*| after the name, you don't need to write an asterisk in the \meta{name of environment} above. See the example below.
+\end{remind}
+
+And then define this environment in one of following five ways:
\begin{itemize}
- \item \lstinline|\CreateTheorem*{(name of environment)}|
- \item \lstinline|\CreateTheorem{(name of environment)}[(numbered like)]|
- \item \lstinline|\CreateTheorem{(name of environment)}<(numbered within)>|
- \item \lstinline|\CreateTheorem{(name of environment)}|
+ \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item Define an unnumbered environment \meta{name of environment}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item Define a numbered environment \meta{name of environment}, numbered in order 1,2,3,\dots
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
+ \begin{itemize}
+ \item Define a numbered environment \meta{name of environment}, which shares the counter \meta{numbered like}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
+ \begin{itemize}
+ \item Define a numbered environment \meta{name of environment}, numbered within the \\counter \meta{numbered within}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|\\
+ \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|
+ \begin{itemize}
+ \item Identify \meta{name of environment} with \meta{existed environment} or \meta{existed environment}\lstinline|*|.
+ \item This method is usually useful in the following two situations:
+ \begin{enumerate}
+ \item To use a more concise name. For example, with \lstinline|\CreateTheorem{thm}|\\\lstinline|(theorem)|, one can then use the name \texttt{thm} to write theorem.
+ \item To remove the numbering. For example, one can remove the numbering of the \texttt{remark} environment with \lstinline|\CreateTheorem{remark}(remark*)|.
+ \end{enumerate}
+ \end{itemize}
\end{itemize}
+\medskip
+\begin{remind}
+ It uses \textsf{amsthm} internally, so the traditional \texttt{theoremstyle} is also applicable to it. One only needs declare the style before the relevant definitions.
+\end{remind}
+
\def\proofideanameEN{Idea}
-\CreateTheorem*{proofidea}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>
-For example,
+\bigskip
+Here is an example. The following code:
\begin{code}
\def\proofideanameEN{Idea}
- \CreateTheorem*{proofidea}
+ \CreateTheorem*{proofidea*}
+ \CreateTheorem{proofidea}<subsection>
\end{code}
-defines an unnumbered environment \lstinline|proofidea|, which supports using in the English context, and the effect is as follows:
+defines an unnumbered environment \lstinline|proofidea*| and a numbered environment \lstinline|proofidea| (numbered within subsection) respectively. They can be used in English context. The effect is as follows:
+
+\begin{proofidea*}
+ The \lstinline|proofidea*| environment.
+\end{proofidea*}
\begin{proofidea}
- ...
+ The \lstinline|proofidea| environment.
\end{proofidea}
+\bigskip
\subsection{Draft mark}
You can use \lstinline|\dnf| to mark the unfinished part. For example:
\begin{itemize}
- \item \lstinline|\dnf|: \quad \dnf
- \item \lstinline|\dnf<Still need ...>|: \quad \dnf<Still need ...>
+ \item \lstinline|\dnf| or \lstinline|\dnf<...>|. The effect is: \dnf~ or \dnf<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\dnf} in French mode.
\end{itemize}
-Similarly, there is \lstinline|\needgraph| :
+Similarly, there is \lstinline|\needgraph| :
\begin{itemize}
- \item \lstinline|\needgraph|: \needgraph
- \item \lstinline|\needgraph<About ...>|: \needgraph<About ...>
+ \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \needgraph or \needgraph<...>The prompt text changes according to the current language. For example, in French mode, it will be displayed as \UseOtherLanguage{French}{\needgraph}
\end{itemize}
-\subsection{Language configuration}
-You can use \lstinline|\UseLanguage{(name of language))}| at any time to change the language, Language names include Chinese, English, French (the case of the first letter is arbitrary, for example, ``chinese'' is also acceptable). With this, the effects of various commands and environments will also change accordingly.
+\clearpage
+\subsection{On the title, abstract and keywords}
-For example, after using \lstinline|\UseLanguage{French}|, the theorem and the draft mark will be displayed as:
+\colorart{} has both the features of standard classes and that of the \AmS{} classes.
-\UseLanguage{French}
-\begin{theorem}[Inutile]\label{thm}
- Un théorème en français. \dnf
+Therefore, the title part can either be written in the usual way, in accordance with the standard class \textsf{article}:
+
+\begin{code}
+ \title{(*\meta{title}*)}
+ \author{(*\meta{author}*)}
+ \date{(*\meta{date}*)}
+ \maketitle
+ \begin{abstract}
+ (*\meta{abstract}*)
+ \end{abstract}
+ \begin{keyword}
+ (*\meta{keywords}*)
+ \end{keyword}
+\end{code}
+
+or written in the way of \AmS{} classes:
+
+\begin{code}
+ \title{(*\meta{title}*)}
+ \author{(*\meta{author}*)}
+ \address{(*\meta{address}*)}
+ \email{(*\meta{email}*)}
+ \date{(*\meta{date}*)}
+ \keywords{(*\meta{keywords}*)}
+ \subjclass{(*\meta{subjclass}*)}
+ \begin{abstract}
+ (*\meta{abstract}*)
+ \end{abstract}
+ \maketitle
+\end{code}
+
+\medskip
+The author information can contain multiple groups, written as:
+
+\begin{code}
+ \author{(*\meta{author 1}*)}
+ \address{(*\meta{address 1}*)}
+ \email{(*\meta{email 1}*)}
+ \author{(*\meta{author 2}*)}
+ \address{(*\meta{address 2}*)}
+ \email{(*\meta{email 2}*)}
+ ...
+\end{code}
+
+Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| is not important.
+
+
+\section{Known issues}
+
+\begin{itemize}[itemsep=.6em]
+ \item The font settings are still not perfect.
+ \item Since many features are based on the \ProjLib{} toolkit, \colorist{} inherits all its problems. For details, please refer to the "Known Issues" section of the \ProjLib{} documentation.
+ \item The error handling mechanism is incomplete: there is no corresponding error prompt when some problems occur.
+ \item There are still many things that can be optimized in the code.
+\end{itemize}
+
+\clearpage
+\section{Document templates}
+
+\subsection{The standard way}
+
+If you want to write in the standard way, you can refer to the following example:
+
+\begin{code}
+\documentclass{colorart}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
+
+\UseLanguage{French} % Use French from here
+
+\begin{document}
+
+\title{Le Titre}
+\author{Auteur}
+\date{\PJLdate{2022-04-01}}
+
+\maketitle
+
+\begin{abstract}
+ Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
+\end{abstract}
+\begin{keyword}
+ AAA, BBB, CCC, DDD, EEE
+\end{keyword}
+
+\section{Un théorème}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
\end{theorem}
-When referenced, the name of the theorem always matches the language of the region in which the theorem is located, for example, the definition of the beginning is still displayed in English in the current French mode: \cref{def: strange} and \cref{thm}。
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
+
+\end{document}
+\end{code}
+
+If you wish to switch to the standard class later, just replace the first two lines with:
+
+\begin{code}
+\documentclass{article}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
-\UseLanguage{English}
\clearpage
+\subsection{The \texorpdfstring{\AmS{}}{AMS} way}
-\section{Document templates}
+If you intend to switch to the journal template in the future and thus want to use the writing style as in the \AmS{} classes, you can refer to the following example:
-\begin{center}
-\begin{minipage}{0.4\textwidth}
\begin{code}
-%! TEX program = xelatex
-\documentclass{lebhartfast}
+\documentclass{colorart}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
-\UseLanguage{French}
+\UseLanguage{French} % Use French from here
\begin{document}
-\title{Titre}
-\author{Nom}
-\date{03 / 2021, Lieu}
+\title{Le Titre}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 1}{Courriel 1}}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 2}{Courriel 2}}
+\date{\PJLdate{2022-04-01}}
+\subjclass{*****}
+\keywords{...}
+
+\begin{abstract}
+ Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
+\end{abstract}
\maketitle
-%% Texte ici
+\section{Première section}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
\end{document}
\end{code}
-\end{minipage}
-\end{center}
-\bigskip
-(\lstinline|\UseLanguage| can be placed either in the preamble or in the body part, and can be used repeatedly as needed)
+In this way, if you wish to switch to \AmS{} class later, just replace the first two lines with:
+
+\begin{code}
+\documentclass{amsart}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
\end{document}
diff --git a/macros/latex/contrib/colorist/colorist.sty b/macros/latex/contrib/colorist/colorist.sty
index 0aebdb922f..aaf8a32829 100644
--- a/macros/latex/contrib/colorist/colorist.sty
+++ b/macros/latex/contrib/colorist/colorist.sty
@@ -17,22 +17,28 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{colorist}
- [2021/03/15 A colorful style for articles and books]
-\RequirePackage{etoolbox}
+ [2021/05/24 A colorful style for articles and books]
\RequirePackage{kvoptions}
+\RequirePackage{etoolbox}
\SetupKeyvalOptions{%
family = @colorist,
prefix = @colorist@
}
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
-\DeclareBoolOption[false]{polyglossia}
+\DeclareBoolOption[false]{allowbf}
\ProcessKeyvalOptions*\relax
\if@colorist@draft
\@colorist@fasttrue
\fi
+\if@colorist@allowbf
+ \newcommand{\conditionalbfseries}{\bfseries\colorlet{PJLtempcolor}{.}\color{PJLtempcolor!90!paper}}
+\else
+ \newcommand{\conditionalbfseries}{}
+\fi
+
\newif\ifIsBook
\ifdefined\chapter\IsBooktrue\else\IsBookfalse\fi
@@ -40,22 +46,23 @@
%% Title fonts
%%================================
\RequirePackage{anyfontsize}
-\newcommand{\partfont}{\sffamily}
-\newcommand{\chapfont}{\sffamily}
-\newcommand{\secfont}{\sffamily}
-\newcommand{\subsecfont}{}
-\newcommand{\subsubsecfont}{}
+\newcommand{\partfont}{\conditionalbfseries\sffamily}
+\newcommand{\chapfont}{\conditionalbfseries\sffamily}
+\newcommand{\secfont}{\conditionalbfseries\sffamily}
+\newcommand{\subsecfont}{\conditionalbfseries\sffamily}
+\newcommand{\subsubsecfont}{\conditionalbfseries\sffamily}
+
+%%================================
+%% Paper configuration
+%%================================
+\RequirePackage{PJLpaper}
%%================================
%% Color
%%================================
-\RequirePackage{xcolor}
-\definecolor{paper}{RGB}{255,255,255}
-\definecolor{skyblue}{RGB}{60,120,234}
-\definecolor{steelblue}{RGB}{70,130,180}
+\definecolor{maintheme}{RGB}{70,130,180}
\definecolor{forestgreen}{RGB}{21,122,81}
\definecolor{lightorange}{RGB}{255,185,88}
-\definecolor{lightskyblue}{RGB}{35,198,255}
%%================================
%% Footer
@@ -63,6 +70,7 @@
\RequirePackage{geometry}
\RequirePackage{fancyhdr}
\RequirePackage{extramarks}
+\AtEndPreamble{\fancyhfoffset{0pt}}
\fancypagestyle{fancy}{
\fancyhf{}
\if@twoside
@@ -109,8 +117,9 @@
%%================================
%% Line spacing
%%================================
-\RequirePackage{setspace}
-\setstretch{1.07}
+\RequirePackage{PJLlang}
+\PJLsetlinespacing{\setstretch{1.07}}
+\PJLsetCJKlinespacing{\onehalfspacing}
\raggedbottom
%%================================
@@ -120,12 +129,26 @@
\PassOptionsToPackage{normalem}{ulem}
\RequirePackage{ulem}
+\newcommand{\partstring}{\MakeUppercase{{\partname~\protect\thepart}}}
+\gappto{\PJLlang@langconfig@common}{%
+\renewcommand{\partstring}{\MakeUppercase{{\partname~\protect\thepart}}}%
+}
+\gappto{\PJLlang@langconfig@chinese}{%
+\renewcommand{\partstring}{第~\thepart~部分}%
+}
+\gappto{\PJLlang@langconfig@tchinese}{%
+\renewcommand{\partstring}{第~\thepart~部分}%
+}
+\gappto{\PJLlang@langconfig@japanese}{%
+\renewcommand{\partstring}{第~\thepart~部}%
+}
+
\ifbool{IsBook}{
%% Part
\titleclass{\part}{top} % make part like a chapter
\titleformat{\part}[display]
{\partfont\filleft}
- {\MakeUppercase{\partname~\protect\thepart}}
+ {\partstring}
{1em}
{\fontsize{20}{0}\selectfont\MakeUppercase{#1}}
\titleformat{name=\part,numberless}[display]
@@ -148,28 +171,78 @@
}
%% Chapter
- \titleformat{\chapter}
- {\thispagestyle{fancy}%
- \color{black!80!paper}\chapfont\fontsize{16}{0}\selectfont}{}{0em}
- {\rlap{\hspace*{-.5em}{\color{gray!25!paper}%
- \fontsize{80}{0}\selectfont\raisebox{-7pt}{\thechapter}}}#1}
- \titleformat{name=\chapter,numberless}
- {\thispagestyle{fancy}% \phantomsection\addcontentsline{toc}{chapter}{#1}%
- \color{black!80!paper}\chapfont\fontsize{16}{0}\selectfont}{}{0em}
- {\rlap{\hspace*{-.5em}{\color{gray!25!paper}%
- \fontsize{80}{0}\selectfont\normalfont\raisebox{-7pt}{*}}}#1}
+ \newlength{\colorist@chapboxwidth}
+
+ \newcommand{\MakeChapBox}[2]{%
+ \settowidth{\colorist@chapboxwidth}{#1}
+ \begin{tcolorbox}[
+ enhanced,
+ skin = bicolor,
+ frame engine = path,
+ sharp corners = all,
+ width = 0.9\textwidth,
+ top = 4mm, bottom = 4mm,
+ sidebyside,
+ frame hidden,
+ boxrule = 0mm,
+ lefthand width = 1.5\colorist@chapboxwidth,
+ colupper = white,
+ colback = maintheme!80!paper,
+ colbacklower = maintheme!20!paper,
+ sidebyside align=center,
+ halign=center]
+ \Huge #1%
+ \tcblower%
+ #2%
+ \end{tcolorbox}%
+ }
+
+ \newcommand{\MakeChapBoxSingle}[1]{%
+ \begin{tcolorbox}[
+ enhanced,
+ width = 0.7\textwidth,
+ sharp corners = all,
+ top = 4mm, bottom = 4mm,
+ frame hidden,
+ boxrule = 0mm,
+ colback = maintheme!20!paper,
+ halign=center]
+ #1
+ \end{tcolorbox}
+ }
+
+ \titleformat{name=\chapter}
+ {\filright\chapfont\huge} % Format
+ {} % Label
+ {0mm} % Sep
+ {\MakeChapBox{\thechapter}{#1}} % Before-code
+ \titlespacing*{name=\chapter}
+ {0em}{*2}{0em} % {left}{before-sep}{after-sep}
+
+ \titleformat{name=\chapter, numberless}
+ {\filcenter\chapfont\huge} % Format
+ {} % Label
+ {0mm} % Sep
+ {\MakeChapBoxSingle{#1}} % Before-code
+ \titlespacing*{name=\chapter, numberless}
+ {0em}{*2}{0em} % {left}{before-sep}{after-sep}
%% Section
\titleformat{\section}
- {\secfont\large\color{steelblue}}
+ {\color{maintheme}\secfont\large}
{\thesection}{.75em}{#1}
- [{\titlerule[.75pt]}]
+ % [{\titlerule[.75pt]}]
+
+ %% Subsection
+ \titleformat{\subsection}
+ {\subsecfont}{\thesubsection}{.75em}
+ {#1}
}{
%% Part
\titleformat{\part}[display]
{%
\partfont\filleft}
- {\MakeUppercase{\partname~\protect\thepart}}
+ {\partstring}
{.3em}
{\fontsize{16}{0}\selectfont\MakeUppercase{#1}}
\titleformat{name=\part,numberless}[display]
@@ -189,24 +262,24 @@
%% Section
\titleformat{\section}
- {\secfont\large\color{steelblue}}
+ {\color{maintheme}\secfont\large}
{\thesection}{.75em}{\scshape #1}
- [{\titlerule[.75pt]}]
-}
+ % [{\titlerule[.75pt]}]
-%% Subsection
-\titleformat{\subsection}
- {\subsecfont}{}{0em}
- {\textsf{\thesubsection}~~\textcolor{gray!55!paper}{$|$}~~#1}
-\titleformat{name=\subsection,numberless}
- {\subsecfont}{}{0em}
- {#1}
+ %% Subsection
+ \titleformat{\subsection}
+ {\subsecfont}{\thesubsection}{.75em}
+ {\scshape #1}
+}
%% Subsubsection
\titleformat{\subsubsection}
- {\subsubsecfont}{\sffamily\thesubsubsection}{.5em}
+ {\color{paper!30!-paper}\subsubsecfont}{\thesubsubsection}{.5em}
{#1}
-\titlespacing{\subsubsection}{0pt}{.8\baselineskip}{.5\baselineskip}
+
+\titlespacing{\section}{0pt}{\baselineskip}{.6\baselineskip}
+\titlespacing{\subsection}{0pt}{.75\baselineskip}{.4\baselineskip}
+\titlespacing{\subsubsection}{0pt}{.5\baselineskip}{.2\baselineskip}
%%================================
%% TOC format
@@ -214,7 +287,7 @@
\RequirePackage{titletoc}
\titlecontents{part}
[0em]
- {\addvspace{1.5pc}\filcenter\partfont}
+ {\addvspace{1.5pc}\filcenter\sffamily}
{\thecontentslabel\\\uppercase}
{}
{} % without page number
@@ -222,35 +295,35 @@
\ifbool{IsBook}{
\titlecontents{chapter}
[2em] % i.e., 0em (part) + 2em
- {\addvspace{.5pc}\chapfont}
+ {\addvspace{1pc}\normalfont\color{maintheme}\sffamily\conditionalbfseries}
{\contentslabel{2em}}
{\hspace*{-2em}}
- {\normalfont\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\color{maintheme}\contentspage}
\titlecontents{section}
[4em] % i.e., 2em (chapter) + 2em
- {\secfont}
+ {\addvspace{.3pc}\normalfont\color{maintheme}\sffamily}
{\contentslabel{1.75em}}
{\hspace*{-1.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\color{maintheme}\contentspage}
\titlecontents{subsection}
[7em] % i.e., 4em (section) + 3em
- {\subsecfont}
+ {\addvspace{.15pc}\normalfont\sffamily}
{\contentslabel{2.75em}}
{\hspace*{-2.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\color{paper!55!-paper}\contentspage}
}{
\titlecontents{section}
[2em] % i.e., 0em (part) + 2em
- {\secfont}
+ {\addvspace{.3pc}\normalfont\color{maintheme}\sffamily}
{\contentslabel{1.75em}}
{\hspace*{-1.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\color{maintheme}\contentspage}
\titlecontents{subsection}
[5em] % i.e., 2em (section) + 3em
- {\subsecfont}
+ {\addvspace{.15pc}\normalfont\sffamily}
{\contentslabel{2.75em}}
{\hspace*{-2.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\color{paper!55!-paper}\contentspage}
}
%%================================
@@ -259,6 +332,8 @@
\RequirePackage{enumitem}
\setlist{noitemsep,leftmargin=2em}
\renewcommand\labelitemi{\color{gray!50}$\bullet$}
+\renewcommand\labelitemii{\color{gray!55}--}
+\renewcommand\labelitemiii{\color{gray!55}\texttt{*}}
%%================================
%% Blank page
@@ -275,6 +350,11 @@
\null\newpage\fi\fi}
%%================================
+%% Draft mark
+%%================================
+\RequirePackage{PJLdraft}
+
+%%================================
%% Icons
%%================================
\RequirePackage{tikz}
@@ -317,7 +397,7 @@
{\normalfont}{}%
{\normalfont}{}%
{0pt}%
- {\thmname{\textsc{#1}}\thmnumber{ #2}\hspace{.4em}%
+ {\conditionalbfseries\thmname{#1}\thmnumber{ #2}\hspace{.4em}%
\textcolor{gray!55!paper}{$|$}\hspace{.4em}%
\color{gray}\thmnote{\ensuremath{(\text{#3})}~~}\pushQED{\qed}}
\def\@endtheorem{\popQED\endtrivlist\@endpefalse }
@@ -328,127 +408,177 @@
\newtheoremstyle{basic}
{0pt}{0pt}{\normalfont}{0pt}
{}{\;}{0.25em}
- {\thmname{#1}~\thmnumber{\textup{#2}}
+ {{\thmname{#1}~\thmnumber{\textup{#2}}}
\thmnote{\normalfont\sffamily\color{black}~(#3)}}
\newtheoremstyle{emphasis}
{0pt}{0pt}{\itshape}{0pt}{}{}{0pt}
- {\thmnote{\normalfont\sffamily\color{black}#3\hspace*{0.25em}}}
+ {\thmnote{\normalfont\sffamily\color{black}#3\hspace*{0.5em}}}
-\if@colorist@fast\else
+\if@colorist@fast
+ \providecommand{\phantomsection}{}
+ \RequirePackage{url}
+ \newcommand{\href}[2]{#2}
+\else
\PassOptionsToPackage{hidelinks,linktoc=all}{hyperref}
\RequirePackage{bookmark}
\RequirePackage{hyperref}
\fi
-\RequirePackage{aliascnt}
-\PassOptionsToPackage{nameinlink}{cleveref}
-\RequirePackage{cleveref}
-
-\newcommand\englishABBR{EN}
-\newcommand\frenchABBR{FR}
-\newcommand\chineseABBR{CN}
-
-\RequirePackage{xstring}
-\newcommand\PassFirstToSecond[2]{#2{#1}}%
-\NewDocumentCommand{\CreateTheorem}{sm}{%
- \begingroup
- \protected@edef\temp{#2}%
- \expandafter\IfEndWith\expandafter{\temp}{*}{%
- \expandafter\StrGobbleRight\expandafter{\temp}{1}[\temp]%
- \PassFirstToSecond{*}%
- }{%
- \PassFirstToSecond{}%
- }%
- {\expandafter\PassFirstToSecond%
- \expandafter{\temp}{\endgroup\InnerCreateTheorem{#1}}}%
-}%
-\NewDocumentCommand{\InnerCreateTheorem}{mmmod<>}{%
- \IfBooleanTF{#1}{%
- \IfValueTF{#4}
- {\@firstoftwo}
- {\IfValueTF{#5}{\@firstoftwo}{\@secondoftwo}}%
- }{%
- \IfValueTF{#4}
- {\IfValueTF{#5}{\@firstoftwo}{\@secondoftwo}}{
- \@secondoftwo}
- }%
- {%
- \GenericError{}%
- {\string\CreateTheorem\space syntax error\on@line}{%
- You cannot call the starred variant with optional argument,\MessageBreak
- nor call the unstarred variant with several optional arguments.}%
- {}%
- }{%
- \IfBooleanTF{#1}{%
- \newtheorem*{#2EN#3}{\csname#2nameEN\endcsname}
- \newtheorem*{#2FR#3}{\csname#2nameFR\endcsname}
- \newtheorem*{#2CN#3}{\csname#2nameCN\endcsname}
- }{%
- \IfValueTF{#5}{%
- \newcounter{#2#3}[{#5}]%
- \expandafter\renewcommand\expandafter*%
- \csname the#2#3\expandafter\endcsname%
- \expandafter{\csname the#5\endcsname.\arabic{#2#3}}%
- }{%
- \IfValueTF{#4}
- {\newaliascnt{#2#3}{#4}}
- {\newcounter{#2#3}}%
- }%
- %-------------------------------------------------------------------
- \CreateTheoremNumberedLikeAliasCounter{#2}{EN}{#3}%
- \CreateTheoremNumberedLikeAliasCounter{#2}{FR}{#3}%
- \CreateTheoremNumberedLikeAliasCounter{#2}{CN}{#3}%
- %-------------------------------------------------------------------
- }%
- \NewDocumentEnvironment{#2#3}{}
- {\csname#2\csname\languagename ABBR\endcsname#3\endcsname}%
- {\csname end#2\csname\languagename ABBR\endcsname#3\endcsname}%
- }%
-}%
-\NewDocumentCommand{\CreateTheoremNumberedLikeAliasCounter}{mmm}{%
- \newaliascnt{#1#2#3}{#1#3}%
- \newtheorem{#1#2#3}[{#1#2#3}]{\csname#1name#2\endcsname}%
- \aliascntresetthe{#1#2#3}%
- \crefname{#1#2#3}%
- {\csname#1name#2\endcsname}%
- {\csname#1name#2\endcsname}%
-}%
-
-%% English theorems names
-\def\theoremnameEN{\sffamily\color{orange}\textsc{Theorem}}
-\def\lemmanameEN{\sffamily\color{orange}\textsc{Lemma}}
-\def\propositionnameEN{\sffamily\color{orange}\textsc{Proposition}}
-\def\corollarynameEN{\sffamily\color{orange}\textsc{Corollary}}
-\def\factnameEN{\sffamily\color{black}\textsc{Fact}}
-\def\conjecturenameEN{\sffamily\color{purple}\textsc{Conjecture}}
-\def\definitionnameEN{\sffamily\color{forestgreen}\textsc{Definition}}
-\def\examplenameEN{\sffamily\color{black}\textsc{Example}}
-\def\problemnameEN{\sffamily\color{black}\textsc{Problem}}
-\def\remarknameEN{\sffamily\color{black}\textsc{Remark}}
-
-%% French theorems names
-\def\theoremnameFR{\sffamily\color{orange}\textsc{Théorème}}
-\def\lemmanameFR{\sffamily\color{orange}\textsc{Lemme}}
-\def\propositionnameFR{\sffamily\color{orange}\textsc{Proposition}}
-\def\corollarynameFR{\sffamily\color{orange}\textsc{Corollaire}}
-\def\factnameFR{\sffamily\color{black}\textsc{Fait}}
-\def\conjecturenameFR{\sffamily\color{purple}\textsc{Conjecture}}
-\def\definitionnameFR{\sffamily\color{forestgreen}\textsc{Définition}}
-\def\examplenameFR{\sffamily\color{black}\textsc{Exemple}}
-\def\problemnameFR{\sffamily\color{black}\textsc{Problème}}
-\def\remarknameFR{\sffamily\color{black}\textsc{Remarque}}
-
-%% Chinese theorems names
-\def\theoremnameCN{\sffamily\color{orange}定理}
-\def\lemmanameCN{\sffamily\color{orange}引理}
-\def\propositionnameCN{\sffamily\color{orange}命题}
-\def\corollarynameCN{\sffamily\color{orange}推论}
-\def\factnameCN{\sffamily\color{black}事实}
-\def\conjecturenameCN{\sffamily\color{purple}猜想}
-\def\definitionnameCN{\sffamily\color{forestgreen}定义}
-\def\examplenameCN{\sffamily\color{black}例}
-\def\problemnameCN{\sffamily\color{black}问题}
-\def\remarknameCN{\sffamily\color{black}备注}
+
+\RequirePackage[nothms]{PJLthm}
+
+%% Redefine English theorems names
+\def\theoremnameEN{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Theorem}}
+\def\lemmanameEN{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Lemma}}
+\def\propositionnameEN{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Proposition}}
+\def\corollarynameEN{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Corollary}}
+\def\propertynameEN{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Property}}
+\def\factnameEN{\normalfont\sffamily\color{black}\conditionalbfseries\textsc{Fact}}
+\def\conjecturenameEN{\normalfont\sffamily\color{purple}\conditionalbfseries\textsc{Conjecture}}
+\def\definitionnameEN{\normalfont\sffamily\color{forestgreen}\conditionalbfseries\textsc{Definition}}
+\def\axiomnameEN{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Axiom}}
+\def\assumptionnameEN{\normalfont\sffamily\color{forestgreen}\conditionalbfseries\textsc{Assumption}}
+\def\conventionnameEN{\normalfont\sffamily\color{forestgreen}\conditionalbfseries\textsc{Convention}}
+\def\hypothesisnameEN{\normalfont\sffamily\color{forestgreen}\conditionalbfseries\textsc{Hypothesis}}
+\def\notationnameEN{\normalfont\sffamily\color{forestgreen}\conditionalbfseries\textsc{Notation}}
+\def\examplenameEN{\normalfont\sffamily\color{black}\conditionalbfseries\textsc{Example}}
+\def\problemnameEN{\normalfont\sffamily\color{black}\conditionalbfseries\textsc{Problem}}
+\def\questionnameEN{\normalfont\sffamily\color{black}\conditionalbfseries\textsc{Question}}
+\def\exercisenameEN{\normalfont\sffamily\color{black}\conditionalbfseries\textsc{Exercise}}
+\def\remarknameEN{\normalfont\sffamily\color{black}\conditionalbfseries\textsc{Remark}}
+\expandafter\def\csname definition-propositionnameEN\endcsname{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Definition}-\propositionnameEN}
+\expandafter\def\csname definition-theoremnameEN\endcsname{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Definition}-\theoremnameEN}
+
+%% Redefine French theorems names
+\def\theoremnameFR{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Théorème}}
+\def\lemmanameFR{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Lemme}}
+\def\propositionnameFR{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Proposition}}
+\def\corollarynameFR{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Corollaire}}
+\def\propertynameFR{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Propriété}}
+\def\factnameFR{\normalfont\sffamily\color{black}\conditionalbfseries\textsc{Fait}}
+\def\conjecturenameFR{\normalfont\sffamily\color{purple}\conditionalbfseries\textsc{Conjecture}}
+\def\definitionnameFR{\normalfont\sffamily\color{forestgreen}\conditionalbfseries\textsc{Définition}}
+\def\axiomnameFR{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Axiome}}
+\def\assumptionnameFR{\normalfont\sffamily\color{forestgreen}\conditionalbfseries\textsc{Supposition}}
+\def\conventionnameFR{\normalfont\sffamily\color{forestgreen}\conditionalbfseries\textsc{Convention}}
+\def\hypothesisnameFR{\normalfont\sffamily\color{forestgreen}\conditionalbfseries\textsc{Hypothèse}}
+\def\notationnameFR{\normalfont\sffamily\color{forestgreen}\conditionalbfseries\textsc{Notation}}
+\def\examplenameFR{\normalfont\sffamily\color{black}\conditionalbfseries\textsc{Exemple}}
+\def\problemnameFR{\normalfont\sffamily\color{black}\conditionalbfseries\textsc{Problème}}
+\def\questionnameFR{\normalfont\sffamily\color{black}\conditionalbfseries\textsc{Question}}
+\def\exercisenameFR{\normalfont\sffamily\color{black}\conditionalbfseries\textsc{Exercice}}
+\def\remarknameFR{\normalfont\sffamily\color{black}\conditionalbfseries\textsc{Remarque}}
+\expandafter\def\csname definition-propositionnameFR\endcsname{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Définition}-\propositionnameFR}
+\expandafter\def\csname definition-theoremnameFR\endcsname{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Définition}-\theoremnameFR}
+
+%% Redefine German theorems names
+\def\theoremnameDE{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Satz}}
+\def\lemmanameDE{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Lemma}}
+\def\propositionnameDE{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Proposition}}
+\def\corollarynameDE{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Korollar}}
+\def\propertynameDE{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Eigenschaft}}
+\def\factnameDE{\normalfont\sffamily\color{black}\conditionalbfseries\textsc{Fakt}}
+\def\conjecturenameDE{\normalfont\sffamily\color{purple}\conditionalbfseries\textsc{Vermutung}}
+\def\definitionnameDE{\normalfont\sffamily\color{forestgreen}\conditionalbfseries\textsc{Definition}}
+\def\axiomnameDE{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Axiom}}
+\def\assumptionnameDE{\normalfont\sffamily\color{forestgreen}\conditionalbfseries\textsc{Annahme}}
+\def\conventionnameDE{\normalfont\sffamily\color{forestgreen}\conditionalbfseries\textsc{Konvention}}
+\def\hypothesisnameDE{\normalfont\sffamily\color{forestgreen}\conditionalbfseries\textsc{Hypothese}}
+\def\notationnameDE{\normalfont\sffamily\color{forestgreen}\conditionalbfseries\textsc{Notation}}
+\def\examplenameDE{\normalfont\sffamily\color{black}\conditionalbfseries\textsc{Beispiel}}
+\def\problemnameDE{\normalfont\sffamily\color{black}\conditionalbfseries\textsc{Problem}}
+\def\questionnameDE{\normalfont\sffamily\color{black}\conditionalbfseries\textsc{Frage}}
+\def\exercisenameDE{\normalfont\sffamily\color{black}\conditionalbfseries\textsc{Übung}}
+\def\remarknameDE{\normalfont\sffamily\color{black}\conditionalbfseries\textsc{Bemerkung}}
+\expandafter\def\csname definition-propositionnameDE\endcsname{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Definition}-\propositionnameDE}
+\expandafter\def\csname definition-theoremnameDE\endcsname{\normalfont\sffamily\color{orange}\conditionalbfseries\textsc{Definition}-\theoremnameDE}
+
+%% Redefine Chinese theorems names
+\def\theoremnameCN{\normalfont\sffamily\color{orange}\conditionalbfseries 定理}
+\def\lemmanameCN{\normalfont\sffamily\color{orange}\conditionalbfseries 引理}
+\def\propositionnameCN{\normalfont\sffamily\color{orange}\conditionalbfseries 命题}
+\def\corollarynameCN{\normalfont\sffamily\color{orange}\conditionalbfseries 推论}
+\def\propertynameCN{\normalfont\sffamily\color{orange}\conditionalbfseries 性质}
+\def\factnameCN{\normalfont\sffamily\color{black}\conditionalbfseries 事实}
+\def\conjecturenameCN{\normalfont\sffamily\color{purple}\conditionalbfseries 猜想}
+\def\definitionnameCN{\normalfont\sffamily\color{forestgreen}\conditionalbfseries 定义}
+\def\axiomnameCN{\normalfont\sffamily\color{orange}\conditionalbfseries 公理}
+\def\assumptionnameCN{\normalfont\sffamily\color{forestgreen}\conditionalbfseries 假设}
+\def\conventionnameCN{\normalfont\sffamily\color{forestgreen}\conditionalbfseries 约定}
+\def\hypothesisnameCN{\normalfont\sffamily\color{forestgreen}\conditionalbfseries 假设}
+\def\notationnameCN{\normalfont\sffamily\color{forestgreen}\conditionalbfseries 记号}
+\def\examplenameCN{\normalfont\sffamily\color{black}\conditionalbfseries 例}
+\def\problemnameCN{\normalfont\sffamily\color{black}\conditionalbfseries 问题}
+\def\questionnameCN{\normalfont\sffamily\color{black}\conditionalbfseries 问题}
+\def\exercisenameCN{\normalfont\sffamily\color{black}\conditionalbfseries 练习}
+\def\remarknameCN{\normalfont\sffamily\color{black}\conditionalbfseries 备注}
+\expandafter\def\csname definition-propositionnameCN\endcsname{\normalfont\sffamily\color{orange}\conditionalbfseries 定义-\propositionnameCN}
+\expandafter\def\csname definition-theoremnameCN\endcsname{\normalfont\sffamily\color{orange}\conditionalbfseries 定义-\theoremnameCN}
+
+\def\theoremnameTC{\normalfont\sffamily\color{orange}\conditionalbfseries 定理}
+\def\lemmanameTC{\normalfont\sffamily\color{orange}\conditionalbfseries 引理}
+\def\propositionnameTC{\normalfont\sffamily\color{orange}\conditionalbfseries 命題}
+\def\corollarynameTC{\normalfont\sffamily\color{orange}\conditionalbfseries 推論}
+\def\propertynameTC{\normalfont\sffamily\color{orange}\conditionalbfseries 性質}
+\def\factnameTC{\normalfont\sffamily\color{black}\conditionalbfseries 事實}
+\def\conjecturenameTC{\normalfont\sffamily\color{purple}\conditionalbfseries 猜想}
+\def\definitionnameTC{\normalfont\sffamily\color{forestgreen}\conditionalbfseries 定義}
+\def\axiomnameTC{\normalfont\sffamily\color{orange}\conditionalbfseries 公理}
+\def\assumptionnameTC{\normalfont\sffamily\color{forestgreen}\conditionalbfseries 假設}
+\def\conventionnameTC{\normalfont\sffamily\color{forestgreen}\conditionalbfseries 約定}
+\def\hypothesisnameTC{\normalfont\sffamily\color{forestgreen}\conditionalbfseries 假設}
+\def\notationnameTC{\normalfont\sffamily\color{forestgreen}\conditionalbfseries 記號}
+\def\examplenameTC{\normalfont\sffamily\color{black}\conditionalbfseries 例}
+\def\problemnameTC{\normalfont\sffamily\color{black}\conditionalbfseries 問題}
+\def\questionnameTC{\normalfont\sffamily\color{black}\conditionalbfseries 問題}
+\def\exercisenameTC{\normalfont\sffamily\color{black}\conditionalbfseries 練習}
+\def\remarknameTC{\normalfont\sffamily\color{black}\conditionalbfseries 備註}
+\expandafter\def\csname definition-propositionnameTC\endcsname{\normalfont\sffamily\color{orange}\conditionalbfseries 定義-\propositionnameTC}
+\expandafter\def\csname definition-theoremnameTC\endcsname{\normalfont\sffamily\color{orange}\conditionalbfseries 定義-\theoremnameTC}
+
+%% Redefine Japanese theorems names
+\def\theoremnameJP{\normalfont\sffamily\color{orange}\conditionalbfseries 定理}
+\def\lemmanameJP{\normalfont\sffamily\color{orange}\conditionalbfseries 補題}
+\def\propositionnameJP{\normalfont\sffamily\color{orange}\conditionalbfseries 命題}
+\def\corollarynameJP{\normalfont\sffamily\color{orange}\conditionalbfseries 系}
+\def\propertynameJP{\normalfont\sffamily\color{orange}\conditionalbfseries 性質}
+\def\factnameJP{\normalfont\sffamily\color{black}\conditionalbfseries 事実}
+\def\conjecturenameJP{\normalfont\sffamily\color{purple}\conditionalbfseries 予想}
+\def\definitionnameJP{\normalfont\sffamily\color{forestgreen}\conditionalbfseries 定義}
+\def\axiomnameJP{\normalfont\sffamily\color{orange}\conditionalbfseries 公理}
+\def\assumptionnameJP{\normalfont\sffamily\color{forestgreen}\conditionalbfseries 仮定}
+\def\conventionnameJP{\normalfont\sffamily\color{forestgreen}\conditionalbfseries 慣例}
+\def\hypothesisnameJP{\normalfont\sffamily\color{forestgreen}\conditionalbfseries 仮設}
+\def\notationnameJP{\normalfont\sffamily\color{forestgreen}\conditionalbfseries 記法}
+\def\examplenameJP{\normalfont\sffamily\color{black}\conditionalbfseries 例}
+\def\problemnameJP{\normalfont\sffamily\color{black}\conditionalbfseries 問題}
+\def\questionnameJP{\normalfont\sffamily\color{black}\conditionalbfseries 問題}
+\def\exercisenameJP{\normalfont\sffamily\color{black}\conditionalbfseries 練習}
+\def\remarknameJP{\normalfont\sffamily\color{black}\conditionalbfseries 注釈}
+\expandafter\def\csname definition-propositionnameJP\endcsname{\normalfont\sffamily\color{orange}\conditionalbfseries 定義-\propositionnameJP}
+\expandafter\def\csname definition-theoremnameJP\endcsname{\normalfont\sffamily\color{orange}\conditionalbfseries 定義-\theoremnameJP}
+
+%% Redefine Russian theorems names
+\def\theoremnameRU{\normalfont\sffamily\color{orange}\conditionalbfseries Теорема}
+\def\lemmanameRU{\normalfont\sffamily\color{orange}\conditionalbfseries Лемма}
+\def\propositionnameRU{\normalfont\sffamily\color{orange}\conditionalbfseries Предложение}
+\def\corollarynameRU{\normalfont\sffamily\color{orange}\conditionalbfseries Следствие}
+\def\propertynameRU{\normalfont\sffamily\color{orange}\conditionalbfseries Имущество}
+\def\factnameRU{\normalfont\sffamily\color{black}\conditionalbfseries Факт}
+\def\conjecturenameRU{\normalfont\sffamily\color{purple}\conditionalbfseries Гипотеза}
+\def\definitionnameRU{\normalfont\sffamily\color{forestgreen}\conditionalbfseries Определение}
+\def\axiomnameRU{\normalfont\sffamily\color{orange}\conditionalbfseries Аксиома}
+\def\assumptionnameRU{\normalfont\sffamily\color{forestgreen}\conditionalbfseries Предположение}
+\def\conventionnameRU{\normalfont\sffamily\color{forestgreen}\conditionalbfseries Конвенция}
+\def\hypothesisnameRU{\normalfont\sffamily\color{forestgreen}\conditionalbfseries Гипотеза}
+\def\notationnameRU{\normalfont\sffamily\color{forestgreen}\conditionalbfseries Нотация}
+\def\examplenameRU{\normalfont\sffamily\color{black}\conditionalbfseries Пример}
+\def\problemnameRU{\normalfont\sffamily\color{black}\conditionalbfseries Проблема}
+\def\questionnameRU{\normalfont\sffamily\color{black}\conditionalbfseries Вопрос}
+\def\exercisenameRU{\normalfont\sffamily\color{black}\conditionalbfseries Упражнение}
+\def\remarknameRU{\normalfont\sffamily\color{black}\conditionalbfseries Замечание}
+\expandafter\def\csname definition-propositionnameRU\endcsname{\normalfont\sffamily\color{orange}\conditionalbfseries Определение-\propositionnameRU}
+\expandafter\def\csname definition-theoremnameRU\endcsname{\normalfont\sffamily\color{orange}\conditionalbfseries Определение-\theoremnameRU}
%% Theorem environments
\theoremstyle{basic}
@@ -461,29 +591,222 @@
\CreateTheorem{lemma}[theorem]
\CreateTheorem{proposition}[theorem]
\CreateTheorem{corollary}[theorem]
+\CreateTheorem{definition-proposition}[theorem]
+\CreateTheorem{definition-theorem}[theorem]
+\CreateTheorem{property}[theorem]
\CreateTheorem{fact}[theorem]
-\CreateTheorem{conjecture}<highest>
+\CreateTheorem{conjecture}[theorem]
\CreateTheorem*{theorem*}
\CreateTheorem*{lemma*}
\CreateTheorem*{proposition*}
\CreateTheorem*{corollary*}
+\CreateTheorem*{definition-proposition*}
+\CreateTheorem*{definition-theorem*}
+\CreateTheorem*{property*}
\CreateTheorem*{fact*}
\CreateTheorem*{conjecture*}
\CreateTheorem{definition}[theorem]
-\CreateTheorem{example}<highest>
-\CreateTheorem{problem}<highest>
+\CreateTheorem{axiom}[theorem]
+\CreateTheorem{assumption}[theorem]
+\CreateTheorem{convention}[theorem]
+\CreateTheorem{hypothesis}[theorem]
+\CreateTheorem{notation}[theorem]
+\CreateTheorem{example}[theorem]
+\CreateTheorem{problem}[theorem]
+\CreateTheorem{question}[theorem]
+\CreateTheorem{exercise}[theorem]
\CreateTheorem*{definition*}
+\CreateTheorem*{axiom*}
+\CreateTheorem*{assumption*}
+\CreateTheorem*{convention*}
+\CreateTheorem*{hypothesis*}
+\CreateTheorem*{notation*}
\CreateTheorem*{example*}
\CreateTheorem*{problem*}
+\CreateTheorem*{question*}
+\CreateTheorem*{exercise*}
\theoremstyle{emphasis}
\CreateTheorem{remark}<highest>
\CreateTheorem*{remark*}
+\numberwithin{equation}{highest}
+
+%% Cref label format
+\creflabelformat{theoremEN}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{lemmaEN}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{propositionEN}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{corollaryEN}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{propertyEN}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{factEN}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{conjectureEN}{#2{\normalfont\sffamily\color{purple}\conditionalbfseries#1}#3}
+\creflabelformat{definitionEN}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{axiomEN}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{assumptionEN}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{conventionEN}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{hypothesisEN}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{notationEN}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{exampleEN}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{problemEN}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{questionEN}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{exerciseEN}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{definition-theoremEN}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{definition-propositionEN}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+
+\creflabelformat{theoremFR}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{lemmaFR}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{propositionFR}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{corollaryFR}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{propertyFR}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{factFR}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{conjectureFR}{#2{\normalfont\sffamily\color{purple}\conditionalbfseries#1}#3}
+\creflabelformat{definitionFR}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{axiomFR}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{assumptionFR}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{conventionFR}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{hypothesisFR}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{notationFR}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{exampleFR}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{problemFR}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{questionFR}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{exerciseFR}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{definition-theoremFR}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{definition-propositionFR}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+
+\creflabelformat{theoremDE}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{lemmaDE}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{propositionDE}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{corollaryDE}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{propertyDE}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{factDE}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{conjectureDE}{#2{\normalfont\sffamily\color{purple}\conditionalbfseries#1}#3}
+\creflabelformat{definitionDE}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{axiomDE}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{assumptionDE}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{conventionDE}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{hypothesisDE}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{notationDE}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{exampleDE}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{problemDE}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{questionDE}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{exerciseDE}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{definition-theoremDE}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{definition-propositionDE}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+
+\creflabelformat{theoremCN}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{lemmaCN}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{propositionCN}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{corollaryCN}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{propertyCN}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{factCN}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{conjectureCN}{#2{\normalfont\sffamily\color{purple}\conditionalbfseries#1}#3}
+\creflabelformat{definitionCN}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{axiomCN}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{assumptionCN}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{conventionCN}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{hypothesisCN}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{notationCN}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{exampleCN}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{problemCN}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{questionCN}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{exerciseCN}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{definition-theoremCN}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{definition-propositionCN}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+
+\creflabelformat{theoremTC}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{lemmaTC}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{propositionTC}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{corollaryTC}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{propertyTC}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{factTC}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{conjectureTC}{#2{\normalfont\sffamily\color{purple}\conditionalbfseries#1}#3}
+\creflabelformat{definitionTC}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{axiomTC}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{assumptionTC}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{conventionTC}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{hypothesisTC}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{notationTC}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{exampleTC}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{problemTC}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{questionTC}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{exerciseTC}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{definition-theoremTC}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{definition-propositionTC}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+
+\creflabelformat{theoremJP}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{lemmaJP}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{propositionJP}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{corollaryJP}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{propertyJP}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{factJP}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{conjectureJP}{#2{\normalfont\sffamily\color{purple}\conditionalbfseries#1}#3}
+\creflabelformat{definitionJP}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{axiomJP}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{assumptionJP}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{conventionJP}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{hypothesisJP}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{notationJP}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{exampleJP}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{problemJP}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{questionJP}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{exerciseJP}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{definition-theoremJP}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{definition-propositionJP}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+
+\creflabelformat{theoremRU}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{lemmaRU}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{propositionRU}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{corollaryRU}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{propertyRU}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{factRU}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{conjectureRU}{#2{\normalfont\sffamily\color{purple}\conditionalbfseries#1}#3}
+\creflabelformat{definitionRU}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{axiomRU}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{assumptionRU}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{conventionRU}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{hypothesisRU}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{notationRU}{#2{\normalfont\sffamily\color{forestgreen}\conditionalbfseries#1}#3}
+\creflabelformat{exampleRU}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{problemRU}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{questionRU}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{exerciseRU}{#2{\normalfont\sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{definition-theoremRU}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+\creflabelformat{definition-propositionRU}{#2{\normalfont\sffamily\color{orange}\conditionalbfseries#1}#3}
+
+%% Icons on the margin
\RequirePackage{marginnote}
+\RequirePackage{ifoddpage}
\newcommand{\mparadjust}[1]{\renewcommand*{\marginnotevadjust}{#1}}
-\apptocmd{\remark}{\reversemarginpar\mparadjust{-.25em}\marginnote{\ideabulb[0.3]{orange}\hspace*{-.5em}}\normalmarginpar}{}{\FAIL}
-\apptocmd{\conjecture}{\reversemarginpar\mparadjust{-.25em}\marginnote{\questionmark[0.3]{purple}\hspace*{-.5em}}\normalmarginpar}{}{\FAIL}
+\pretocmd{\remark}{%
+ \if@twoside\checkoddpage%
+ \ifoddpage\reversemarginpar\fi%
+ \else%
+ \reversemarginpar%
+ \fi%
+ \mparadjust{-.25em}%
+ \marginnote{\ideabulb[0.3]{orange}%
+ \ifIsBook%
+ \hspace*{-.2em}%
+ \else%
+ \hspace*{-.5em}%
+ \fi%
+ }\normalmarginpar%
+}{}{\FAIL}
+\pretocmd{\conjecture}{%
+ \if@twoside\checkoddpage%
+ \ifoddpage\reversemarginpar\fi%
+ \else%
+ \reversemarginpar%
+ \fi%
+ \mparadjust{-.25em}%
+ \marginnote{\questionmark[0.3]{purple}%
+ \ifIsBook%
+ \hspace*{-.2em}%
+ \else%
+ \hspace*{-.5em}%
+ \fi%
+ }\normalmarginpar%
+}{}{\FAIL}
\RequirePackage{iftex}
\ifXeTeX
@@ -519,15 +842,20 @@
\theoremstyle{simple}% as the default style for user-defined environments
-\let\proof\relax
-\let\endproof\relax
-\def\proofnameCN{\proofname}
-\def\proofnameEN{\proofname}
-\def\proofnameFR{\proofname}
-\CreateTheorem*{proof}
+\renewenvironment{proof}[1][\proofname]{\par
+ \pushQED{\qed}%
+ \normalfont \topsep6\p@\@plus6\p@\relax
+ \trivlist
+ \item[\hskip\labelsep
+ \itshape
+ #1\hspace{.4em}%
+ \textcolor{gray!55!paper}{$|$}]\ignorespaces
+}{%
+ \popQED\endtrivlist\@endpefalse
+}
\RequirePackage[many]{tcolorbox}
-\if@colorclass@fast
+\if@colorist@fast
\tcbstartdraftmode
\fi
\tcolorboxenvironment{theorem}
@@ -562,6 +890,38 @@
{enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
left=3.5mm,right=3.5mm,
opacityframe=0.9,colframe=orange,arc=.7mm}
+\tcolorboxenvironment{property}
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ left=3.5mm,right=3.5mm,
+ opacityframe=0.9,colframe=orange,arc=.7mm}
+\tcolorboxenvironment{property*}
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ left=3.5mm,right=3.5mm,
+ opacityframe=0.9,colframe=orange,arc=.7mm}
+\tcolorboxenvironment{axiom}
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ left=3.5mm,right=3.5mm,
+ opacityframe=0.9,colframe=orange,arc=.7mm}
+\tcolorboxenvironment{axiom*}
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ left=3.5mm,right=3.5mm,
+ opacityframe=0.9,colframe=orange,arc=.7mm}
+\tcolorboxenvironment{definition-proposition}
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ left=3.5mm,right=3.5mm,
+ opacityframe=0.9,colframe=orange,arc=.7mm}
+\tcolorboxenvironment{definition-proposition*}
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ left=3.5mm,right=3.5mm,
+ opacityframe=0.9,colframe=orange,arc=.7mm}
+\tcolorboxenvironment{definition-theorem}
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ left=3.5mm,right=3.5mm,
+ opacityframe=0.9,colframe=orange,arc=.7mm}
+\tcolorboxenvironment{definition-theorem*}
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ left=3.5mm,right=3.5mm,
+ opacityframe=0.9,colframe=orange,arc=.7mm}
\tcolorboxenvironment{fact}
{enhanced jigsaw,pad at break*=1mm,breakable,colback=gray!10!paper,
@@ -589,13 +949,53 @@
left=4mm,right=4mm,top=1mm,bottom=1mm,
colback=lightorange!10!paper,boxrule=0pt,frame hidden,
borderline west={1.5mm}{-1mm}{forestgreen},arc=.7mm}
+\tcolorboxenvironment{assumption}
+ {enhanced jigsaw,pad at break*=1mm,breakable,
+ left=4mm,right=4mm,top=1mm,bottom=1mm,
+ colback=lightorange!10!paper,boxrule=0pt,frame hidden,
+ borderline west={1.5mm}{-1mm}{forestgreen},arc=.7mm}
+\tcolorboxenvironment{assumption*}
+ {enhanced jigsaw,pad at break*=1mm,breakable,
+ left=4mm,right=4mm,top=1mm,bottom=1mm,
+ colback=lightorange!10!paper,boxrule=0pt,frame hidden,
+ borderline west={1.5mm}{-1mm}{forestgreen},arc=.7mm}
+\tcolorboxenvironment{convention}
+ {enhanced jigsaw,pad at break*=1mm,breakable,
+ left=4mm,right=4mm,top=1mm,bottom=1mm,
+ colback=lightorange!10!paper,boxrule=0pt,frame hidden,
+ borderline west={1.5mm}{-1mm}{forestgreen},arc=.7mm}
+\tcolorboxenvironment{convention*}
+ {enhanced jigsaw,pad at break*=1mm,breakable,
+ left=4mm,right=4mm,top=1mm,bottom=1mm,
+ colback=lightorange!10!paper,boxrule=0pt,frame hidden,
+ borderline west={1.5mm}{-1mm}{forestgreen},arc=.7mm}
+\tcolorboxenvironment{hypothesis}
+ {enhanced jigsaw,pad at break*=1mm,breakable,
+ left=4mm,right=4mm,top=1mm,bottom=1mm,
+ colback=lightorange!10!paper,boxrule=0pt,frame hidden,
+ borderline west={1.5mm}{-1mm}{forestgreen},arc=.7mm}
+\tcolorboxenvironment{hypothesis*}
+ {enhanced jigsaw,pad at break*=1mm,breakable,
+ left=4mm,right=4mm,top=1mm,bottom=1mm,
+ colback=lightorange!10!paper,boxrule=0pt,frame hidden,
+ borderline west={1.5mm}{-1mm}{forestgreen},arc=.7mm}
+\tcolorboxenvironment{notation}
+ {enhanced jigsaw,pad at break*=1mm,breakable,
+ left=4mm,right=4mm,top=1mm,bottom=1mm,
+ colback=lightorange!10!paper,boxrule=0pt,frame hidden,
+ borderline west={1.5mm}{-1mm}{forestgreen},arc=.7mm}
+\tcolorboxenvironment{notation*}
+ {enhanced jigsaw,pad at break*=1mm,breakable,
+ left=4mm,right=4mm,top=1mm,bottom=1mm,
+ colback=lightorange!10!paper,boxrule=0pt,frame hidden,
+ borderline west={1.5mm}{-1mm}{forestgreen},arc=.7mm}
\tcolorboxenvironment{example}
{enhanced jigsaw,pad at break*=1mm,breakable,colback=gray!10!paper,
- boxrule=0pt,frame hidden,arc=.7mm}
+ boxrule=0pt,frame hidden,arc=.7mm,lines before break=3}
\tcolorboxenvironment{example*}
{enhanced jigsaw,pad at break*=1mm,breakable,colback=gray!10!paper,
- boxrule=0pt,frame hidden,arc=.7mm}
+ boxrule=0pt,frame hidden,arc=.7mm,lines before break=3}
\tcolorboxenvironment{problem}
{enhanced jigsaw,pad at break*=1mm,breakable,colback=yellow!25!paper,
@@ -604,6 +1004,13 @@
{enhanced jigsaw,pad at break*=1mm,breakable,colback=yellow!25!paper,
boxrule=0pt,frame hidden,arc=.7mm}
+\tcolorboxenvironment{remark}
+ {enhanced jigsaw,pad at break*=1mm,breakable,oversize,
+ opacityframe=0,opacityback=0,lines before break=3}
+\tcolorboxenvironment{remark*}
+ {enhanced jigsaw,pad at break*=1mm,breakable,oversize,
+ opacityframe=0,opacityback=0,lines before break=3}
+
\ExplSyntaxOn
\NewDocumentCommand \AfterEnvEnd { +m }
{ \colorist_after_env_end:nw {#1} }
@@ -665,88 +1072,63 @@
{\ScanEnv*{definition*}%
{\vspace{-1.05\baselineskip}}%
{}}}}
-
\AddToHook{env/definition/end}{\scandefinitionenv}%
\AddToHook{env/definition*/end}{\scandefinitionenv}%
-%%================================
-%% Language configuration
-%%================================
-\if@colorist@polyglossia
- \RequirePackage{polyglossia}
- \setdefaultlanguage{english}
- \setotherlanguage[frenchpart=false]{french}
-\else
- \PassOptionsToPackage{french,english}{babel}
- \RequirePackage{babel}
- \frenchsetup{PartNameFull=false}
-\fi
-\newcommand{\colorist@langconfig@chinese}{%
- \def\abstractname{摘要}%
- \def\proofname{证明}%
- \def\contentsname{目录}%
- \def\listfigurename{插图}%
- \def\listtablename{表格}%
- \def\figurename{图}%
- \def\tablename{表}%
- \def\indexname{索引}%
- \def\appendixname{附录}%
- \def\bibname{参考文献}%
- \renewcommand{\languagename}{chinese}%
-}
-\newcommand{\colorist@langconfig@english}{%
- \selectlanguage{english}%
-}
-\newcommand{\colorist@langconfig@french}{%
- \selectlanguage{french}%
- \def\frenchpartname{Partie}%
-}
-\newcommand{\UseLanguageCORE}[1]{%
- \ifstrequal{#1}{chinese}{\onehalfspacing\colorist@langconfig@chinese}{}%
- \ifstrequal{#1}{Chinese}{\onehalfspacing\colorist@langconfig@chinese}{}%
- \ifstrequal{#1}{english}{\setstretch{1.07}\colorist@langconfig@english}{}%
- \ifstrequal{#1}{English}{\setstretch{1.07}\colorist@langconfig@english}{}%
- \ifstrequal{#1}{french}{\setstretch{1.07}\colorist@langconfig@french}{}%
- \ifstrequal{#1}{French}{\setstretch{1.07}\colorist@langconfig@french}{}%
-}
-\newcommand{\UseLanguage}[1]{%
- \ifx\@onlypreamble\@notprerr%
- \UseLanguageCORE{#1}%
- \else%
- \AfterEndPreamble{\UseLanguageCORE{#1}}%
- \fi%
-}
-\newcommand{\UseOtherLanguage}[2]{%
-\begingroup%
- \ifstrequal{#1}{chinese}{\colorist@langconfig@chinese}{}%
- \ifstrequal{#1}{Chinese}{\colorist@langconfig@chinese}{}%
- \ifstrequal{#1}{english}{\colorist@langconfig@english}{}%
- \ifstrequal{#1}{English}{\colorist@langconfig@english}{}%
- \ifstrequal{#1}{french}{\colorist@langconfig@french}{}%
- \ifstrequal{#1}{French}{\colorist@langconfig@french}{}%
- #2%
-\endgroup%
-}
+\def\scanassumptionenv{%
+ \AfterEnvEnd{%
+ \ScanEnv*{assumption}%
+ {\vspace{-1.05\baselineskip}}%
+ {\ScanEnv*{assumption*}%
+ {\vspace{-1.05\baselineskip}}%
+ {}}}}
+\AddToHook{env/assumption/end}{\scanassumptionenv}%
+\AddToHook{env/assumption*/end}{\scanassumptionenv}%
-\ifbool{IsBook}{}{
+\def\scanconventionenv{%
+ \AfterEnvEnd{%
+ \ScanEnv*{convention}%
+ {\vspace{-1.05\baselineskip}}%
+ {\ScanEnv*{convention*}%
+ {\vspace{-1.05\baselineskip}}%
+ {}}}}
+\AddToHook{env/convention/end}{\scanconventionenv}%
+\AddToHook{env/convention*/end}{\scanconventionenv}%
+
+\def\scanhypothesisenv{%
+ \AfterEnvEnd{%
+ \ScanEnv*{hypothesis}%
+ {\vspace{-1.05\baselineskip}}%
+ {\ScanEnv*{hypothesis*}%
+ {\vspace{-1.05\baselineskip}}%
+ {}}}}
+\AddToHook{env/hypothesis/end}{\scanhypothesisenv}%
+\AddToHook{env/hypothesis*/end}{\scanhypothesisenv}%
+
+\def\scannotationenv{%
+ \AfterEnvEnd{%
+ \ScanEnv*{notation}%
+ {\vspace{-1.05\baselineskip}}%
+ {\ScanEnv*{notation*}%
+ {\vspace{-1.05\baselineskip}}%
+ {}}}}
+\AddToHook{env/notation/end}{\scannotationenv}%
+\AddToHook{env/notation*/end}{\scannotationenv}%
+
+\ifbool{IsBook}{}{%
%%================================
%% Title block style
%%================================
\renewcommand{\@maketitle}{%
- \noindent%
- {\textcolor{gray!55!paper}{\rule{\textwidth}{0.75pt}}}%
- \vspace{-\parskip}%
- \begin{center}%
- {\large\@title}\\\medskip%
- \color{black!80!paper}%
- {\scshape\@author}\\\smallskip%
- {\@date}%
- \end{center}%
- \vspace{-\parskip}%
- \vspace{-.5\baselineskip}%
- {\textcolor{gray!55!paper}{\rule{\textwidth}{0.75pt}}\par}%
- \medskip%
+\begin{center}%
+ \color{maintheme}%
+ {\Large\sffamily\scshape\conditionalbfseries\@title}\\\bigskip%
+ \color{black!80!paper}%
+ {\scshape\@author}\\\smallskip%
+ {\@date}%
+\end{center}%
+\medskip%
}
\apptocmd{\maketitle}{\thispagestyle{fancy}}{}{\FAIL}
@@ -754,10 +1136,31 @@
%% Abstract style
%%================================
\renewenvironment{abstract}
-{\small\centerline{\textsc{\abstractname}\vspace{-0.3\baselineskip}}
+{\small{\centerline{\textsc{\conditionalbfseries\abstractname}}\vspace{-0.3\baselineskip}}
\color{black!80!paper}\begin{quotation}}
{\end{quotation}\medskip}
+%%================================
+%% Keyword
+%%================================
+\def\keywordnameEN{\textsc{Keywords}}
+\def\keywordnameFR{\textsc{Mots clés}}
+\def\keywordnameDE{\textsc{Schlüsselwörter}}
+\def\keywordnameCN{关键词}
+\def\keywordnameTC{關鍵詞}
+\def\keywordnameJP{キーワード}
+\def\keywordnameRU{Ключевые слова}
+
+\newenvironment{keyword}
+{\small{\centerline{{\conditionalbfseries\csname keywordname\csname\languagename ABBR\endcsname\endcsname}}\vspace{-0.3\baselineskip}}
+ \color{black!80!paper}\begin{center}}
+{\end{center}\medskip}
+
+%%================================
+%% Simulate features of amsart
+%%================================
+\RequirePackage{PJLamssim}
+
}
\endinput
diff --git a/macros/latex/contrib/minimalist/README.md b/macros/latex/contrib/minimalist/README.md
index 084e34972f..05a62e0477 100644
--- a/macros/latex/contrib/minimalist/README.md
+++ b/macros/latex/contrib/minimalist/README.md
@@ -2,27 +2,28 @@
# `minimalist` bundle: write you documents in a simple and clear way
-This is collection of styles and classes for typesetting articles and books in a
-simple and clear design. It mainly consists of two parts.
+A collection of styles and classes that helps you typesetting articles and books
+with a simple and clear design. It mainly consists of two parts.
- Main part:
- - minimalist.sty : the main style
- - minimart.cls : class for typesetting articles
- - minimbook.cls : class for typesetting books
+ - `minimalist.sty` : the main style
+ - `minimart.cls` : class for typesetting articles
+ - `minimbook.cls` : class for typesetting books
- They can be used with any LaTeX engine. Currently they have native support
- to English and French typesetting. (I have planed to add more language
- support)
+ They can be used with any major TeX engine. Currently they have native
+ support to English, French and German typesetting (more language to be
+ added).
- Derivative part (they have separate pages on CTAN):
- - einfart.cls : more advanced class for typesetting articles
- - simplivre.cls : more advanced class for typesetting books
+ - `einfart.cls` : more advanced class for typesetting articles
+ - `simplivre.cls` : more advanced class for typesetting books
They are similar to the main classes, but have unicode support, thus can
only be used with either XeLaTeX or LuaLaTeX. Currently they have native
- support to English, French and Chinese typesetting, and also use more
- beautiful fonts. (I have planed to add more language support)
+ support to Chinese (both simplified and traditional), English, French,
+ German, Japanese and Russian typesetting (more language to be added), and
+ also use more beautiful fonts.
# License
diff --git a/macros/latex/contrib/minimalist/minimalist-doc.pdf b/macros/latex/contrib/minimalist/minimalist-doc.pdf
index ac42223ffa..c89d0a2595 100644
--- a/macros/latex/contrib/minimalist/minimalist-doc.pdf
+++ b/macros/latex/contrib/minimalist/minimalist-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/minimalist/minimalist-doc.tex b/macros/latex/contrib/minimalist/minimalist-doc.tex
index c6c5cf1b2f..0b1b537bc8 100644
--- a/macros/latex/contrib/minimalist/minimalist-doc.tex
+++ b/macros/latex/contrib/minimalist/minimalist-doc.tex
@@ -1,24 +1,26 @@
%! TEX program = xelatex
-\PassOptionsToPackage{dvipsnames}{xcolor}
\documentclass{minimart}
\linenumbers % Enable line numbers
%%================================
-%% TeX logo and URL
+%% Import toolkit
%%================================
-\usepackage{hologo}
-\usepackage{url}
+\usepackage{PJLtoolkit}
+\usepackage{longtable} % breakable tables
+\usepackage{hologo} % more TeX logo
%%================================
%% For typestting code
%%================================
\usepackage{listings}
+\definecolor{maintheme}{RGB}{70,130,180}
+\definecolor{forestgreen}{RGB}{21,122,81}
\definecolor{lightergray}{gray}{0.99}
\lstset{language=[LaTeX]TeX,
- keywordstyle=\color{RoyalBlue},
+ keywordstyle=\color{maintheme},
basicstyle=\ttfamily,
- commentstyle=\color{ForestGreen}\ttfamily,
+ commentstyle=\color{forestgreen}\ttfamily,
stringstyle=\rmfamily,
showstringspaces=false,
breaklines=true,
@@ -31,9 +33,9 @@
firstnumber=last,
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
-\lstset{morekeywords=%
- {CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,
- linenumbers,nolinenumbers,subsection,maketitle
+\lstset{moretexcs=%
+ {linenumbers,nolinenumbers,subsection,
+ color,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
}
}
\lstnewenvironment{code}%
@@ -42,6 +44,31 @@
}
{\ResumeLineNumbers}
+%%================================
+%% remind
+%%================================
+\usepackage[many]{tcolorbox}
+\newenvironment{remind}[1][Remind]{%
+ \LocallyStopLineNumbers%
+ \begin{tcolorbox}[breakable,
+ enhanced,
+ width = \textwidth,
+ colback = white, colbacktitle = paper,
+ colframe = gray!50, boxrule=0.2mm,
+ coltitle = black,
+ fonttitle = \sffamily,
+ attach boxed title to top left = {yshift=-\tcboxedtitleheight/2, xshift=\tcboxedtitlewidth/4},
+ boxed title style = {boxrule=0pt, colframe=paper},
+ before skip = 0.3cm,
+ after skip = 0.3cm,
+ top = 3mm,
+ bottom = 3mm,
+ title={\sffamily #1}]%
+}{\end{tcolorbox}\ResumeLineNumbers}
+
+%%================================
+%% Names
+%%================================
\providecommand{\minimalist}{\textsf{minimalist}}
\providecommand{\minimart}{\textsf{minimart}}
\providecommand{\minimbook}{\textsf{minimbook}}
@@ -53,117 +80,306 @@
%%================================
\begin{document}
-\title{\minimalist{}, write your articles or books in a simple and clear way\thanks{Corresponding to: \texttt{\minimalist{} 2021/03/15}}}
-\author{Jinwen}
-\date{March 2021, Beijing}
+\title{\minimalist{}, write your articles or books in a simple and clear way}
+\author{Jinwen XU}
+\thanks{Corresponding to: \texttt{\minimalist{} 2021/05/23}}
+\date{May 2021, Beijing}
\maketitle
\begin{abstract}
- \minimalist{} is series of styles and classes for you to typeset your articles or books in a simple and clear manner. My original intention in designing this series was to write drafts and notes that look simple but not shabby.
+ \minimalist{} is a series of styles and classes for you to typeset your articles or books in a simple and clear manner. My original intention in designing this series was to write drafts and notes that look simple yet not shabby.
- The entire collection includes \verb|minimalist.sty|, which is the main style shared by all the following classes; \verb|minimart.cls| for typesetting articles and \verb|minimbook.cls| for typesetting books. They can be used with all LaTeX engines, with native support to English and French typesetting via \lstinline|\UseLanguage|, see the instruction below for detail.
+ The entire collection includes \verb|minimalist.sty|, which is the main style shared by all of the following classes; \verb|minimart.cls| for typesetting articles and \verb|minimbook.cls| for typesetting books. They compile with any major \TeX{} engine, with native support to English, French and German typesetting via \lstinline|\UseLanguage| (see the instruction below for detail).
- You can also found \einfart{} and \simplivre{} on CTAN. They are the enhanced version of \minimart{} and \minimbook{} with unicode support. With this, they can access to more beautiful fonts, and also have native support for Chinese typesetting. On the other hand, they need to be compiled with \hologo{XeLaTeX} or \hologo{LuaLaTeX} (not pdf\LaTeX).
+ You can also found \einfart{} and \simplivre{} on CTAN. They are the enhanced version of \minimart{} and \minimbook{} with unicode support. With this, they can access to more beautiful fonts, and also have native support for Chinese, Japanese and Russian typesetting. On the other hand, they need to be compiled with \hologo{XeLaTeX} or \hologo{LuaLaTeX} (not pdf\LaTeX).
This documentation is typeset using \minimart{}. You can think of it as a short introduction and demonstration.
\end{abstract}
\tableofcontents
-\section{How to load it}
+
+\bigskip
+\begin{remind}
+ Multi-language support, theorem-like environments, draft marks and some other features are provided by the \ProjLib{} toolkit. Here we only briefly discuss how to use it with this document class. For more detailed information, you can refer to the documentation of \ProjLib{}.
+\end{remind}
+
+\clearpage
+\section{Initialization}
+
+\subsection{How to load it}
You can directly use \minimart{} or \minimbook{} as your document class. In this way, you can directly begin writing your document, without having to worry about the configurations.
\begin{code}
\documentclass{minimart} (*{\normalfont or}*) \documentclass{minimbook}
\end{code}
-And of course, you can also use the default classes \textsf{article} or \textsf{book}, and load the \minimalist{} package. This way, only the basic styles are set, and you can thus use your preferred fonts and page layout. All the features mentioned in this article (except for draft marks) are provided.
+And of course, you can also use the default classes \textsf{article} or \textsf{book}, and load the \minimalist{} package. This way, only the basic styles are set, and you can thus use your preferred fonts and page layout. All the features mentioned in this article are provided.
+
\begin{code}
\usepackage{minimalist}
\end{code}
-\subsection{A useful switch: the option \textsf{fast} or \textsf{draft}}
-You can use the option \verb|fast| or \verb|draft| to typeset in a fast but slightly rough manner. The main differences are:
+\subsection{Options}
+
+\minimalist{} offers the following options:
+
\begin{itemize}
- \item Do not use hyperref;
- \item Do not use tikz (and thus tcolorbox);
+ \item \texttt{draft} or \texttt{fast}
+ \begin{itemize}
+ \item The option \verb|fast| enables a faster but slightly rougher style, main differences are:
+ \begin{itemize}
+ \item Use simpler math font configuration;
+ \item Do not use hyperref;
+ \item Enable the fast mode of \ProjLib{} toolkit.
+ \end{itemize}
+ \end{itemize}
+ \item \texttt{allowbf}
+ \begin{itemize}
+ \item Allow boldface. When this option is enabled, the title, titles of all levels and names of theorem-like environments will be bolded.
+ \end{itemize}
+ \item \texttt{classical}
+ \begin{itemize}
+ \item Classic mode. When this option is enabled, the style will become more regular: paragraphs are indented, the use of underlines are reduced, heading styles are changed, and the theorem styles will be much closer to common styles.
+ \end{itemize}
\end{itemize}
-During the writing stage of your document, it is recommended to use the \verb|fast| option to speed up compilation and improve the smoothness of your writing experience. At the end, you can remove the ``fast'' mark to get the final version.
+\begin{remind}
+ \begin{itemize}
+ \item During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark "DRAFT" to indicate that you are currently in the draft mode.
+ \item \texttt{allowbf} + \texttt{classical} is probably a good choice if you prefer traditional style.
+ \end{itemize}
+\end{remind}
+
+\bigskip
+Additionally, \minimart{} and \minimbook{} offers the following options:
+\begin{itemize}
+ \item \texttt{a4paper} or \texttt{b5paper}
+ \begin{itemize}
+ \item Optional paper size. The default paper size is 7in $\times$ 10in.
+ \end{itemize}
+\end{itemize}
+
+% \section{On the fonts}
+% By default, \minimart{} and \minimbook{} uses Palatino Linotype as the English font, FounderType's YouSong and YouHei GBK as the Chinese fonts, and partially uses Neo Euler as the math font. Among them, Neo Euler can be downloaded at \url{https://github.com/khaledhosny/euler-otf}. The other fonts are not free, you need to purchase and use them on your own. (For the Chinese fonts, visit FounderType's website for detail: \url{https://www.foundertype.com} ).
+
+% % \begin{itemize}
+% % \item English main font. \textsf{English sans serif font}.
+% % \item 中文主要字体, \textsf{中文无衬线字体}
+% % \item Math demonstration: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
+% % \end{itemize}
+
+% When the corresponding font is not installed, fonts that comes with TeX Live will be used instead. In this case, the experience might be reduced.
\section{Some instructions}
-There is no indentation at the beginning of each paragraph, but there will be a half-line space between each two paragraphs. like this ---
+Many of the features described next are provided by the \ProjLib{} toolkit. Only the basic usage is mentioned here. For more details, please refer to its user documentation.
+
+\subsection{Language configuration}
+
+\minimart{} has multi-language support, including simplified Chinese, traditional Chinese, English, French, German, Japanese, and Russian. The language can be selected by the following macros:
+
+\begin{itemize}
+ \item \lstinline|\UseLanguage{|\meta{language name}\lstinline|}| is used to specify the language. The corresponding setting of the language will be applied after it. It can be used either in the preamble or in the main body. When no language is specified, ``English" is selected by default.
+ \item \lstinline|\UseOtherLanguage{|\meta{language name}\lstinline|}{|\meta{content}\lstinline|}|, which uses the specified language settings to typeset \meta{content}. Compared with \lstinline|\UseLanguage|, it will not modify the line spacing, so line spacing would remain stable when CJK and Western texts are mixed.
+\end{itemize}
+
+\meta{language name} can be:
+\begin{itemize}
+ \item Simplified Chinese: \texttt{Chinese}, \texttt{chinese}, \texttt{SChinese}, \texttt{schinese}, \texttt{SimplifiedChinese} or \texttt{simplifiedchinese}
+ \item Traditional Chinese: \texttt{TChinese}, \texttt{tchinese}, \texttt{TraditionalChinese} or \texttt{traditionalchinese}
+ \item English: \texttt{English} or \texttt{english}
+ \item French: \texttt{French} or \texttt{french}
+ \item German: \texttt{German}, \texttt{german} or \texttt{ngerman}
+ \item Japanese: \texttt{Japanese} or \texttt{japanese}
+ \item Russian: \texttt{Russian} or \texttt{russian}
+\end{itemize}
+
+\medskip
+In addition, you can also add new settings to selected language:
+\begin{itemize}
+ \item \lstinline|\AddLanguageSetting{|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item Add \meta{settings} to all supported languages.
+ \end{itemize}
+ \item \lstinline|\AddLanguageSetting(|\meta{language name}\lstinline|){|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item Add \meta{settings} to the selected language \meta{language name}.
+ \end{itemize}
+\end{itemize}
+For example, \lstinline|\AddLanguageSetting(German){\color{orange}}| can make all German text displayed in orange (of course, one then need to add \lstinline|\AddLanguageSetting{\color{black}}| in order to correct the color of the text in other languages).
-Here is the next paragraph.
\subsection{Theorems and how to reference them}
-Environments such as definitions and theorems have been pre-defined and can be used directly, for example:
+Environments such as definitions and theorems have been pre-defined and can be used directly.
+
+More specifically, preset environments include:
+\texttt{assumption}, \texttt{axiom}, \texttt{conjecture}, \texttt{convention}, \texttt{corollary}, \texttt{definition}, \texttt{definition-proposition}, \texttt{definition-theorem}, \texttt{example}, \texttt{exercise}, \texttt{fact}, \texttt{hypothesis}, \texttt{lemma}, \texttt{notation}, \texttt{problem}, \texttt{property}, \texttt{proposition}, \texttt{question}, \texttt{remark}, \texttt{theorem}, and the corresponding unnumbered version with an asterisk \lstinline|*| in the name. The display of these environments will change according to the current language.
+
+When referencing a theorem-like environment, it is recommended to use clever reference \lstinline|\cref{|\meta{label}\texttt{\}}. In this way, there is no need to explicitly write down the name of the corresponding environment every time.
+
+\begin{remind}[Example]
\begin{code}
\begin{definition}[Strange things] \label{def: strange} ...
\end{code}
+
will produce
\begin{definition}[Strange things]\label{def: strange}
- This is the definition of some strange objects.
+ This is the definition of some strange objects. There is approximately an one-line space before and after the theorem environment, and there will be a symbol to mark the end of the environment.
\end{definition}
-There is approximately an one-line space before and after the theorem environment. There will be a symbol to mark the end of the environment.
+\lstinline|\cref{def: strange}| will be displayed as: \cref{def: strange}.
+
+After using \lstinline|\UseLanguage{French}|, a theorem will be displayed as:
+
+\UseLanguage{French}
+\begin{theorem}[Inutile]\label{thm}
+ Un théorème en français.
+\end{theorem}
+
+By default, when referenced, the name of the theorem always matches the language of the context in which the theorem is located. For example, the definition above is still displayed in English in the current French mode: \cref{def: strange} and \cref{thm}. If you want the name of the theorem to match the current context when referencing, you can add \texttt{regionalref} to the global options.
+\end{remind}
+
+\UseLanguage{English}
-When referencing, you can directly use clever reference \lstinline|\cref{(label name)}|. For example, \lstinline|\cref{def: strange}| will be displayed as: \cref{def: strange}.
\subsection{Define a new theorem-like environment}
-First define the name of this environment in the language used: \lstinline|\(name of environment)(language name)|. Where \lstinline|(language name)| can be \lstinline|EN|, \lstinline|FR|, \lstinline|CN|, etc., and then define this environment in one of the following four ways:
+If you need to define a new theorem-like environment, you must first define the name of the environment in the language used: \lstinline|\|\meta{name of environment}\meta{language abbr}, where \meta{language abbr} is the abbreviation of language, which can be:
+% \vspace{-.5\baselineskip}
+\begin{longtable}{ll|ll}
+ \texttt{CN} & Simplified Chinese & \texttt{DE} & German\\
+ \texttt{TC} & Traditional Chinese & \texttt{JP} & Japanese\\
+ \texttt{EN} & English & \texttt{RU} & Russian\\
+ \texttt{FR} & French & &\\
+\end{longtable}
+
+\vspace{-.5\baselineskip}
+\begin{remind}
+ If you want to define an environment with an asterisk \lstinline|*| after the name, you don't need to write an asterisk in the \meta{name of environment} above. See the example below.
+\end{remind}
+
+And then define this environment in one of following five ways:
\begin{itemize}
- \item \lstinline|\CreateTheorem*{(name of environment)}|
- \item \lstinline|\CreateTheorem{(name of environment)}[(numbered like)]|
- \item \lstinline|\CreateTheorem{(name of environment)}<(numbered within)>|
- \item \lstinline|\CreateTheorem{(name of environment)}|
+ \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item Define an unnumbered environment \meta{name of environment}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item Define a numbered environment \meta{name of environment}, numbered in order 1,2,3,\dots
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
+ \begin{itemize}
+ \item Define a numbered environment \meta{name of environment}, which shares the counter \meta{numbered like}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
+ \begin{itemize}
+ \item Define a numbered environment \meta{name of environment}, numbered within the \\counter \meta{numbered within}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|\\
+ \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|
+ \begin{itemize}
+ \item Identify \meta{name of environment} with \meta{existed environment} or \meta{existed environment}\lstinline|*|.
+ \item This method is usually useful in the following two situations:
+ \begin{enumerate}
+ \item To use a more concise name. For example, with \lstinline|\CreateTheorem{thm}|\\\lstinline|(theorem)|, one can then use the name \texttt{thm} to write theorem.
+ \item To remove the numbering. For example, one can remove the numbering of the \texttt{remark} environment with \lstinline|\CreateTheorem{remark}(remark*)|.
+ \end{enumerate}
+ \end{itemize}
\end{itemize}
+\begin{remind}
+ It uses \textsf{amsthm} internally, so the traditional \texttt{theoremstyle} is also applicable to it. One only needs declare the style before the relevant definitions.
+\end{remind}
+
\def\proofideanameEN{Idea}
-\CreateTheorem*{proofidea}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>
+
+\bigskip
+Here is an example. The following code:
-For example,
\begin{code}
\def\proofideanameEN{Idea}
- \CreateTheorem*{proofidea}
+ \CreateTheorem*{proofidea*}
+ \CreateTheorem{proofidea}<subsection>
\end{code}
-defines an unnumbered environment \lstinline|proofidea|, which supports using in the English context, and the effect is as follows:
+
+defines an unnumbered environment \lstinline|proofidea*| and a numbered environment \lstinline|proofidea| (numbered within subsection) respectively. They can be used in English context. The effect is as follows:
+
+\begin{proofidea*}
+ The \lstinline|proofidea*| environment.
+\end{proofidea*}
\begin{proofidea}
- ...
+ The \lstinline|proofidea| environment.
\end{proofidea}
\subsection{Draft mark}
-You can use \lstinline|\dnf| to mark the unfinished part (this is a feature provide by the classes, not the \minimalist{} package). For example:
+You can use \lstinline|\dnf| to mark the unfinished part. For example:
\begin{itemize}
- \item \lstinline|\dnf|: \quad \dnf
- \item \lstinline|\dnf<Still need ...>|: \quad \dnf<Still need ...>
+ \item \lstinline|\dnf| or \lstinline|\dnf<...>|. The effect is: \dnf~ or \dnf<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\dnf} in French mode.
\end{itemize}
-Similarly, there is \lstinline|\needgraph|:
+Similarly, there is \lstinline|\needgraph| :
\begin{itemize}
- \item \lstinline|\needgraph|: \needgraph
- \item \lstinline|\needgraph<About ...>|: \needgraph<About ...>
+ \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \needgraph or \needgraph<...>The prompt text changes according to the current language. For example, in French mode, it will be displayed as \UseOtherLanguage{French}{\needgraph}
\end{itemize}
-\subsection{Language configuration}
-You can use \lstinline|\UseLanguage{(name of language))}| at any time to change the language, Language names include Chinese, English, French (the case of the first letter is arbitrary, for example, ``chinese'' is also acceptable). With this, the effects of various commands and environments will also change accordingly.
+\subsection{On the title, abstract and keywords}
-For example, after using \lstinline|\UseLanguage{French}|, the theorem and the draft mark will be displayed as:
+\minimart{} has both the features of standard classes and that of the \AmS{} classes.
-\UseLanguage{French}
-\begin{theorem}[Inutile]\label{thm}
- Un théorème en français. \dnf
-\end{theorem}
+Therefore, the title part can either be written in the usual way, in accordance with the standard class \textsf{article}:
-When referenced, the name of the theorem always matches the language of the region in which the theorem is located, for example, the definition of the beginning is still displayed in English in the current French mode: \cref{def: strange} and \cref{thm}.
+\begin{code}
+ \title{(*\meta{title}*)}
+ \author{(*\meta{author}*)}
+ \date{(*\meta{date}*)}
+ \maketitle
+ \begin{abstract}
+ (*\meta{abstract}*)
+ \end{abstract}
+ \begin{keyword}
+ (*\meta{keywords}*)
+ \end{keyword}
+\end{code}
+
+or written in the way of \AmS{} classes:
+
+\begin{code}
+ \title{(*\meta{title}*)}
+ \author{(*\meta{author}*)}
+ \address{(*\meta{address}*)}
+ \email{(*\meta{email}*)}
+ \date{(*\meta{date}*)}
+ \keywords{(*\meta{keywords}*)}
+ \subjclass{(*\meta{subjclass}*)}
+ \begin{abstract}
+ (*\meta{abstract}*)
+ \end{abstract}
+ \maketitle
+\end{code}
+
+\medskip
+The author information can contain multiple groups, written as:
+
+\begin{code}
+ \author{(*\meta{author 1}*)}
+ \address{(*\meta{address 1}*)}
+ \email{(*\meta{email 1}*)}
+ \author{(*\meta{author 2}*)}
+ \address{(*\meta{address 2}*)}
+ \email{(*\meta{email 2}*)}
+ ...
+\end{code}
+
+Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| is not important.
-\UseLanguage{English}
\subsection{On the line numbers}
Line numbers can be turned on and off at any time. \lstinline|\linenumbers| is used to enable the line numbers, and \lstinline|\nolinenumbers| is used to disable them. For the sake of beauty, the title, table of contents, index and some other elements are not numbered.
@@ -176,35 +392,117 @@ In \lstinline|\section| or \lstinline|\subsection| , if you wish to add footnote
\end{itemize}
This is a disadvantage brought about by the underline decoration of the title.
+
+\section{Known issues}
+
+\begin{itemize}[itemsep=.6em]
+ \item The font settings are still not perfect.
+ \item Since many features are based on the \ProjLib{} toolkit, \minimalist{} (and hence \minimart{} and \minimbook{}) inherits all its problems. For details, please refer to the "Known Issues" section of the \ProjLib{} documentation.
+ \item The error handling mechanism is incomplete: there is no corresponding error prompt when some problems occur.
+ \item There are still many things that can be optimized in the code.
+\end{itemize}
+
+\clearpage
\section{Document templates}
-\singlespacing
+\subsection{The standard way}
+
+If you want to write in the standard way, you can refer to the following example:
-\LocallyStopLineNumbers
-\begin{minipage}{0.45\textwidth}
\begin{code}
-\documentclass[fast]{minimart}
+\documentclass{minimart}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
-\linenumbers
-\UseLanguage{French}
+\UseLanguage{French} % Use French from here
\begin{document}
-\title{Titre}
-\author{Nom}
-\date{03 / 2021, Lieu}
+\title{Le Titre}
+\author{Auteur}
+\date{\PJLdate{2022-04-01}}
\maketitle
-%% Texte ici
+\begin{abstract}
+ Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
+\end{abstract}
+\begin{keyword}
+ AAA, BBB, CCC, DDD, EEE
+\end{keyword}
+
+\section{Un théorème}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
\end{document}
\end{code}
-\end{minipage}
-\par
-\ResumeLineNumbers
-\bigskip
-(\lstinline|\UseLanguage| can be placed either in the preamble or in the body part, and can be used repeatedly as needed)
+If you wish to switch to the standard class later, just replace the first two lines with:
+
+\begin{code}
+\documentclass{article}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
+
+
+\clearpage
+\subsection{The \texorpdfstring{\AmS{}}{AMS} way}
+
+If you intend to switch to the journal template in the future and thus want to use the writing style as in the \AmS{} classes, you can refer to the following example:
+
+\begin{code}
+\documentclass{minimart}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
+
+\UseLanguage{French} % Use French from here
+
+\begin{document}
+
+\title{Le Titre}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 1}{Courriel 1}}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 2}{Courriel 2}}
+\date{\PJLdate{2022-04-01}}
+\subjclass{*****}
+\keywords{...}
+
+\begin{abstract}
+ Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
+\end{abstract}
+
+\maketitle
+
+\section{Première section}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
+
+\end{document}
+\end{code}
+
+In this way, if you wish to switch to \AmS{} class later, just replace the first two lines with:
+
+\begin{code}
+\documentclass{amsart}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
\end{document}
diff --git a/macros/latex/contrib/minimalist/minimalist.sty b/macros/latex/contrib/minimalist/minimalist.sty
index 2648a34701..12a4b33407 100644
--- a/macros/latex/contrib/minimalist/minimalist.sty
+++ b/macros/latex/contrib/minimalist/minimalist.sty
@@ -17,22 +17,29 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{minimalist}
- [2021/03/15 A simple and clear style for articles and books]
-\RequirePackage{etoolbox}
+ [2021/05/23 A simple and clear style for articles and books]
\RequirePackage{kvoptions}
+\RequirePackage{etoolbox}
\SetupKeyvalOptions{%
family = @minimalist,
prefix = @minimalist@
}
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
-\DeclareBoolOption[false]{polyglossia}
+\DeclareBoolOption[false]{allowbf}
+\DeclareBoolOption[false]{classical}
\ProcessKeyvalOptions*\relax
\if@minimalist@draft
\@minimalist@fasttrue
\fi
+\if@minimalist@allowbf
+ \newcommand{\conditionalbfseries}{\bfseries\colorlet{PJLtempcolor}{.}\color{PJLtempcolor!83!paper}}
+\else
+ \newcommand{\conditionalbfseries}{}
+\fi
+
\newif\ifIsBook
\ifdefined\chapter\IsBooktrue\else\IsBookfalse\fi
@@ -40,17 +47,24 @@
%% Title fonts
%%================================
\RequirePackage{anyfontsize}
-\newcommand{\partfont}{\sffamily}
-\newcommand{\chapfont}{\sffamily}
-\newcommand{\secfont}{}
-\newcommand{\subsecfont}{}
-\newcommand{\subsubsecfont}{}
+\if@minimalist@classical
+\newcommand{\partfont}{\conditionalbfseries\sffamily}
+\newcommand{\chapfont}{\conditionalbfseries\sffamily}
+\newcommand{\secfont}{\conditionalbfseries\sffamily}
+\newcommand{\subsecfont}{\conditionalbfseries\sffamily}
+\newcommand{\subsubsecfont}{\conditionalbfseries\sffamily}
+\else
+\newcommand{\partfont}{\conditionalbfseries\sffamily}
+\newcommand{\chapfont}{\conditionalbfseries\sffamily}
+\newcommand{\secfont}{\conditionalbfseries}
+\newcommand{\subsecfont}{\conditionalbfseries}
+\newcommand{\subsubsecfont}{\conditionalbfseries}
+\fi
%%================================
-%% Color
+%% Paper configuration
%%================================
-\RequirePackage{xcolor}
-\definecolor{paper}{RGB}{255,255,255}
+\RequirePackage{PJLpaper}
%%================================
%% Footer
@@ -58,6 +72,7 @@
\RequirePackage{geometry}
\RequirePackage{fancyhdr}
\RequirePackage{extramarks}
+\AtEndPreamble{\fancyhfoffset{0pt}}
\fancypagestyle{fancy}{
\fancyhf{}
\if@twoside
@@ -128,8 +143,7 @@
\renewcommand{\chaptermark}[1]{\markboth{\textsc{#1}}{\textsc{#1}}}
\fi
\renewcommand*{\sectionmark}[1]{%
- \markright{\raisebox{.03em}{\footnotesize/}%
- ~\thesection~\raisebox{.03em}{\footnotesize/}~~~#1}}
+ \markright{\sec@decochar~\thesection~\sec@decochar~~~#1}}
}{
\if@twoside
\renewcommand*{\sectionmark}[1]{\markboth{\textsc{#1}}{}}
@@ -137,11 +151,12 @@
\renewcommand*{\sectionmark}[1]{\markboth{\textsc{#1}}{\textsc{#1}}}
\fi
}
-%%===============================
+%%================================
%% Line spacing
%%================================
-\RequirePackage{setspace}
-\setstretch{1.07}
+\RequirePackage{PJLlang}
+\PJLsetlinespacing{\setstretch{1.07}}
+\PJLsetCJKlinespacing{\onehalfspacing}
\raggedbottom
%%================================
@@ -154,11 +169,12 @@
\RequirePackage{mathtools}
+\ifdefined\linenomathpatch\else
\newcommand*\linenomathpatch[1]{%
\cspreto{#1}{\linenomath}%
\cspreto{#1*}{\linenomath}%
- \cspreto{end#1}{\endlinenomath}%
- \cspreto{end#1*}{\endlinenomath}%
+ \csappto{end#1}{\endlinenomath}%
+ \csappto{end#1*}{\endlinenomath}%
}
\newcommand*\linenomathpatchAMS[1]{%
\cspreto{#1}{\linenomathAMS}%
@@ -179,6 +195,7 @@
\linenomathpatchAMS{align}
\linenomathpatchAMS{alignat}
\linenomathpatchAMS{flalign}
+\fi
\newif\ifLNturnsON
\def\LocallyStopLineNumbers{\LNturnsONfalse%
@@ -196,6 +213,20 @@
\PassOptionsToPackage{normalem}{ulem}
\RequirePackage{ulem}
+\newcommand{\partstring}{\MakeUppercase{{\partname~\protect\thepart}}}
+\gappto{\PJLlang@langconfig@common}{%
+\renewcommand{\partstring}{\MakeUppercase{{\partname~\protect\thepart}}}%
+}
+\gappto{\PJLlang@langconfig@chinese}{%
+\renewcommand{\partstring}{第~\thepart~部分}%
+}
+\gappto{\PJLlang@langconfig@tchinese}{%
+\renewcommand{\partstring}{第~\thepart~部分}%
+}
+\gappto{\PJLlang@langconfig@japanese}{%
+\renewcommand{\partstring}{第~\thepart~部}%
+}
+
\ifbool{IsBook}{
%% Part
\titleclass{\part}{top} % make part like a chapter
@@ -203,7 +234,7 @@
{\thispagestyle{part}%
\LocallyStopLineNumbers%
\partfont\filleft}
- {\MakeUppercase{\partname~\protect\thepart}}
+ {\partstring}
{1em}
{\fontsize{20}{0}\selectfont\MakeUppercase{#1}}
[\ResumeLineNumbers]
@@ -252,7 +283,7 @@
\titleformat{\part}[display]
{\LocallyStopLineNumbers%
\partfont\filleft}
- {\MakeUppercase{\partname~\protect\thepart}}
+ {\partstring}
{.3em}
{\fontsize{16}{0}\selectfont\MakeUppercase{#1}}
[\ResumeLineNumbers]
@@ -277,15 +308,25 @@
}
%% Section
+\renewcommand\thesection{\arabic{section}}
+\if@minimalist@classical
+\newcommand\sec@decochar{}
+\titleformat{\section}
+ {\LocallyStopLineNumbers%
+ \secfont\centering}
+ {\thesection}{.75em}
+ {#1}
+ [\ResumeLineNumbers]
+\else
\newcommand\seculine{\bgroup\markoverwith{\color{gray!55!paper}%
\rule[-0.9ex]{2pt}{.6pt}\hspace{-2pt}\rule[-1.2ex]{2pt}{.6pt}}\ULon}
-\renewcommand\thesection{\arabic{section}}
+\newcommand\sec@decochar{\raisebox{.03em}{\normalfont\footnotesize/}}
\titleformat{\section}
{\LocallyStopLineNumbers%
\secfont\centering}{}{0em}
- {{\small\textcolor{gray!55!paper}{\raisebox{.03em}{\footnotesize/}}%
- \,\,\textcolor{black!80!paper}{\arabic{section}}%
- \,\,\textcolor{gray!55!paper}{\raisebox{.03em}{\footnotesize/}}}\\
+ {{\small\textcolor{gray!55!paper}{\sec@decochar}%
+ \,\,\textcolor{black!90!paper}{\conditionalbfseries\arabic{section}}%
+ \,\,\textcolor{gray!55!paper}{\sec@decochar}}\\
\seculine{#1}}
[\ResumeLineNumbers]
\titleformat{name=\section,numberless}
@@ -294,12 +335,21 @@
\secfont\centering}{}{0em}
{\seculine{#1}}
[\ResumeLineNumbers]
+\fi
%% Subsection
-\newcommand\subseculine{\bgroup\markoverwith{\color{gray!55!paper}%
- \rule[-1ex]{2pt}{.75pt}}\ULon}
\renewcommand\thesubsection{%
\ifnum\c@section=0\else\arabic{section}.\fi\arabic{subsection}}
+\if@minimalist@classical
+\titleformat{\subsection}
+ {\LocallyStopLineNumbers%
+ \subsecfont}
+ {\thesubsection}{.75em}
+ {#1}
+ [\ResumeLineNumbers]
+\else
+\newcommand\subseculine{\bgroup\markoverwith{\color{gray!55!paper}%
+ \rule[-1ex]{2pt}{.75pt}}\ULon}
\titleformat{\subsection}
{\LocallyStopLineNumbers%
\subsecfont}{}{0em}
@@ -310,22 +360,26 @@
\subsecfont}{}{0em}
{\subseculine{#1}}
[\ResumeLineNumbers]
+\fi
%% Subsubsection
\titleformat{\subsubsection}
{\LocallyStopLineNumbers%
- \subsubsecfont}{\thesubsubsection}{1em}
+ \color{paper!30!-paper}\subsubsecfont}{\thesubsubsection}{1em}
{#1}
[\ResumeLineNumbers]
-\titlespacing{\subsubsection}{0pt}{.8\baselineskip}{.5\baselineskip}
+
+\titlespacing{\section}{0pt}{\baselineskip}{.6\baselineskip}
+\titlespacing{\subsection}{0pt}{.75\baselineskip}{.4\baselineskip}
+\titlespacing{\subsubsection}{0pt}{.5\baselineskip}{.2\baselineskip}
%%================================
-%% TOC format
+%% ToC format
%%================================
\RequirePackage{titletoc}
\titlecontents{part}
[0em]
- {\addvspace{1.5pc}\filcenter\partfont}
+ {\addvspace{1.5pc}\filcenter\normalfont}
{\thecontentslabel\\\uppercase}
{}
{} % without page number
@@ -333,32 +387,32 @@
\ifbool{IsBook}{
\titlecontents{chapter}
[2em] % i.e., 0em (part) + 2em
- {\addvspace{.5pc}\chapfont}
+ {\addvspace{.5pc}\normalfont}
{\contentslabel{2em}}
{\hspace*{-2em}}
- {\normalfont\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
\titlecontents{section}
[4em] % i.e., 2em (chapter) + 2em
- {\secfont}
+ {\normalfont}
{\contentslabel{1.75em}}
{\hspace*{-1.75em}}
{\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
\titlecontents{subsection}
[7em] % i.e., 4em (section) + 3em
- {\subsecfont}
+ {\normalfont}
{\contentslabel{2.75em}}
{\hspace*{-2.75em}}
{\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
}{
\titlecontents{section}
[2em] % i.e., 0em (part) + 2em
- {\secfont}
+ {\normalfont}
{\contentslabel{1.75em}}
{\hspace*{-1.75em}}
{\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
\titlecontents{subsection}
[5em] % i.e., 2em (section) + 3em
- {\subsecfont}
+ {\normalfont}
{\contentslabel{2.75em}}
{\hspace*{-2.75em}}
{\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
@@ -370,6 +424,8 @@
\RequirePackage{enumitem}
\setlist{noitemsep,leftmargin=2em}
\renewcommand\labelitemi{\color{gray!50}$\bullet$}
+\renewcommand\labelitemii{\color{gray!55}--}
+\renewcommand\labelitemiii{\color{gray!55}\texttt{*}}
%%================================
%% Blank page
@@ -386,136 +442,120 @@
\null\newpage\fi\fi}
%%================================
+%% Draft mark
+%%================================
+\RequirePackage{PJLdraft}
+
+%%================================
%% Theorems
%%================================
\RequirePackage{amsthm}
+\if@minimalist@classical
+ \if@minimalist@allowbf
+ \newtheoremstyle{simple}%
+ {}{}%
+ {\normalfont}{}%
+ {\normalfont}{}%
+ {0pt}%
+ {{\conditionalbfseries\sffamily\thmname{#1}\thmnumber{ #2}}\hspace{.4em}%
+ {\color{gray}\thmnote{\ensuremath{(\text{#3})}~~}}}
+ \else
+ \newcommand\thmuline{\bgroup\markoverwith{\color{gray!55!paper}%
+ \rule[-.6ex]{2pt}{.5pt}}\ULon}
+ \newtheoremstyle{simple}%
+ {}{}%
+ {\normalfont}{}%
+ {\normalfont}{}%
+ {0pt}%
+ {{\sffamily\thmuline{\thmname{\textsc{#1}}\thmnumber{ #2}}}\hspace{.4em}%
+ {\color{gray}\thmnote{\ensuremath{(\text{#3})}~~}}}
+ \fi
+\else
\newtheoremstyle{simple}%
{}{}%
{\normalfont}{}%
{\normalfont}{}%
{0pt}%
- {\thmname{\textsc{#1}}\thmnumber{ #2}\hspace{.4em}%
+ {{\conditionalbfseries\thmname{#1}\thmnumber{ #2}}\hspace{.4em}%
\textcolor{gray!55!paper}{$|$}\hspace{.4em}%
\color{gray}\thmnote{\ensuremath{(\text{#3})}~~}\pushQED{\qed}}
\def\@endtheorem{\popQED\endtrivlist\@endpefalse }
+\fi
\renewcommand{\qedsymbol}{%
\makebox[1em]{\color{gray!55!paper}\rule[-0.1em]{.95em}{.95em}}}
-\if@minimalist@fast\else
+\if@minimalist@fast
+ \providecommand{\phantomsection}{}
+ \RequirePackage{url}
+ \newcommand{\href}[2]{#2}
+\else
\PassOptionsToPackage{hidelinks,linktoc=all}{hyperref}
\RequirePackage{bookmark}
\RequirePackage{hyperref}
\fi
-\RequirePackage{aliascnt}
-\PassOptionsToPackage{nameinlink}{cleveref}
-\RequirePackage{cleveref}
-
-\newcommand\englishABBR{EN}
-\newcommand\frenchABBR{FR}
-\newcommand\chineseABBR{CN}
-
-\RequirePackage{xstring}
-\newcommand\PassFirstToSecond[2]{#2{#1}}%
-\NewDocumentCommand{\CreateTheorem}{sm}{%
- \begingroup
- \protected@edef\temp{#2}%
- \expandafter\IfEndWith\expandafter{\temp}{*}{%
- \expandafter\StrGobbleRight\expandafter{\temp}{1}[\temp]%
- \PassFirstToSecond{*}%
- }{%
- \PassFirstToSecond{}%
- }%
- {\expandafter\PassFirstToSecond%
- \expandafter{\temp}{\endgroup\InnerCreateTheorem{#1}}}%
-}%
-\NewDocumentCommand{\InnerCreateTheorem}{mmmod<>}{%
- \IfBooleanTF{#1}{%
- \IfValueTF{#4}
- {\@firstoftwo}
- {\IfValueTF{#5}{\@firstoftwo}{\@secondoftwo}}%
- }{%
- \IfValueTF{#4}
- {\IfValueTF{#5}{\@firstoftwo}{\@secondoftwo}}{
- \@secondoftwo}
- }%
- {%
- \GenericError{}%
- {\string\CreateTheorem\space syntax error\on@line}{%
- You cannot call the starred variant with optional argument,\MessageBreak
- nor call the unstarred variant with several optional arguments.}%
- {}%
- }{%
- \IfBooleanTF{#1}{%
- \newtheorem*{#2EN#3}{\csname#2nameEN\endcsname}
- \newtheorem*{#2FR#3}{\csname#2nameFR\endcsname}
- \newtheorem*{#2CN#3}{\csname#2nameCN\endcsname}
- }{%
- \IfValueTF{#5}{%
- \newcounter{#2#3}[{#5}]%
- \expandafter\renewcommand\expandafter*%
- \csname the#2#3\expandafter\endcsname%
- \expandafter{\csname the#5\endcsname.\arabic{#2#3}}%
- }{%
- \IfValueTF{#4}
- {\newaliascnt{#2#3}{#4}}
- {\newcounter{#2#3}}%
- }%
- %-------------------------------------------------------------------
- \CreateTheoremNumberedLikeAliasCounter{#2}{EN}{#3}%
- \CreateTheoremNumberedLikeAliasCounter{#2}{FR}{#3}%
- \CreateTheoremNumberedLikeAliasCounter{#2}{CN}{#3}%
- %-------------------------------------------------------------------
- }%
- \NewDocumentEnvironment{#2#3}{}
- {\csname#2\csname\languagename ABBR\endcsname#3\endcsname}%
- {\csname end#2\csname\languagename ABBR\endcsname#3\endcsname}%
- }%
-}%
-\NewDocumentCommand{\CreateTheoremNumberedLikeAliasCounter}{mmm}{%
- \newaliascnt{#1#2#3}{#1#3}%
- \newtheorem{#1#2#3}[{#1#2#3}]{\csname#1name#2\endcsname}%
- \aliascntresetthe{#1#2#3}%
- \crefname{#1#2#3}%
- {\csname#1name#2\endcsname}%
- {\csname#1name#2\endcsname}%
-}%
-
-%% English theorems names
+
+\RequirePackage[nothms]{PJLthm}
+
+%% Redefine English theorems names
\def\theoremnameEN{\textsc{Theorem}}
\def\lemmanameEN{\textsc{Lemma}}
\def\propositionnameEN{\textsc{Proposition}}
\def\corollarynameEN{\textsc{Corollary}}
+\def\propertynameEN{\textsc{Property}}
\def\factnameEN{\textsc{Fact}}
\def\conjecturenameEN{\textsc{Conjecture}}
\def\definitionnameEN{\textsc{Definition}}
+\def\axiomnameEN{\textsc{Axiom}}
+\def\assumptionnameEN{\textsc{Assumption}}
+\def\conventionnameEN{\textsc{Convention}}
+\def\hypothesisnameEN{\textsc{Hypothesis}}
+\def\notationnameEN{\textsc{Notation}}
\def\examplenameEN{\textsc{Example}}
\def\problemnameEN{\textsc{Problem}}
+\def\questionnameEN{\textsc{Question}}
+\def\exercisenameEN{\textsc{Exercise}}
\def\remarknameEN{\textsc{Remark}}
-%% French theorems names
+%% Redefine French theorems names
\def\theoremnameFR{\textsc{Théorème}}
\def\lemmanameFR{\textsc{Lemme}}
\def\propositionnameFR{\textsc{Proposition}}
\def\corollarynameFR{\textsc{Corollaire}}
+\def\propertynameFR{\textsc{Propriété}}
\def\factnameFR{\textsc{Fait}}
\def\conjecturenameFR{\textsc{Conjecture}}
\def\definitionnameFR{\textsc{Définition}}
+\def\axiomnameFR{\textsc{Axiome}}
+\def\assumptionnameFR{\textsc{Supposition}}
+\def\conventionnameFR{\textsc{Convention}}
+\def\hypothesisnameFR{\textsc{Hypothèse}}
+\def\notationnameFR{\textsc{Notation}}
\def\examplenameFR{\textsc{Exemple}}
\def\problemnameFR{\textsc{Problème}}
+\def\questionnameFR{\textsc{Question}}
+\def\exercisenameFR{\textsc{Exercice}}
\def\remarknameFR{\textsc{Remarque}}
-%% Chinese theorems names
-\def\theoremnameCN{定理}
-\def\lemmanameCN{引理}
-\def\propositionnameCN{命题}
-\def\corollarynameCN{推论}
-\def\factnameCN{事实}
-\def\conjecturenameCN{猜想}
-\def\definitionnameCN{定义}
-\def\examplenameCN{例}
-\def\problemnameCN{问题}
-\def\remarknameCN{备注}
+%% Redefine German theorems names
+\def\theoremnameDE{\textsc{Satz}}
+\def\lemmanameDE{\textsc{Lemma}}
+\def\propositionnameDE{\textsc{Proposition}}
+\def\corollarynameDE{\textsc{Korollar}}
+\def\propertynameDE{\textsc{Eigenschaft}}
+\def\factnameDE{\textsc{Fakt}}
+\def\conjecturenameDE{\textsc{Vermutung}}
+\def\definitionnameDE{\textsc{Definition}}
+\def\axiomnameDE{\textsc{Axiom}}
+\def\assumptionnameDE{\textsc{Annahme}}
+\def\conventionnameDE{\textsc{Konvention}}
+\def\hypothesisnameDE{\textsc{Hypothese}}
+\def\notationnameDE{\textsc{Notation}}
+\def\examplenameDE{\textsc{Beispiel}}
+\def\problemnameDE{\textsc{Problem}}
+\def\questionnameDE{\textsc{Frage}}
+\def\exercisenameDE{\textsc{Übung}}
+\def\remarknameDE{\textsc{Bemerkung}}
%% Theorem environments
\theoremstyle{simple}
@@ -528,113 +568,117 @@
\CreateTheorem{lemma}[theorem]
\CreateTheorem{proposition}[theorem]
\CreateTheorem{corollary}[theorem]
+\CreateTheorem{definition-proposition}[theorem]
+\CreateTheorem{definition-theorem}[theorem]
+\CreateTheorem{property}[theorem]
\CreateTheorem{fact}[theorem]
-\CreateTheorem{conjecture}<highest>
+\CreateTheorem{conjecture}[theorem]
\CreateTheorem*{theorem*}
\CreateTheorem*{lemma*}
\CreateTheorem*{proposition*}
\CreateTheorem*{corollary*}
+\CreateTheorem*{definition-proposition*}
+\CreateTheorem*{definition-theorem*}
+\CreateTheorem*{property*}
\CreateTheorem*{fact*}
\CreateTheorem*{conjecture*}
\CreateTheorem{definition}[theorem]
-\CreateTheorem{example}<highest>
-\CreateTheorem{problem}<highest>
+\CreateTheorem{axiom}[theorem]
+\CreateTheorem{assumption}[theorem]
+\CreateTheorem{convention}[theorem]
+\CreateTheorem{hypothesis}[theorem]
+\CreateTheorem{notation}[theorem]
+\CreateTheorem{example}[theorem]
+\CreateTheorem{problem}[theorem]
+\CreateTheorem{question}[theorem]
+\CreateTheorem{exercise}[theorem]
\CreateTheorem*{definition*}
+\CreateTheorem*{axiom*}
+\CreateTheorem*{assumption*}
+\CreateTheorem*{convention*}
+\CreateTheorem*{hypothesis*}
+\CreateTheorem*{notation*}
\CreateTheorem*{example*}
\CreateTheorem*{problem*}
+\CreateTheorem*{question*}
+\CreateTheorem*{exercise*}
\CreateTheorem{remark}<highest>
\CreateTheorem*{remark*}
-%%================================
-%% Language configuration
-%%================================
-\if@minimalist@polyglossia
- \RequirePackage{polyglossia}
- \setdefaultlanguage{english}
- \setotherlanguage[frenchpart=false]{french}
-\else
- \PassOptionsToPackage{french,english}{babel}
- \RequirePackage{babel}
- \frenchsetup{PartNameFull=false}
-\fi
-\newcommand{\minimalist@langconfig@chinese}{%
- \def\abstractname{摘要}%
- \def\proofname{证明}%
- \def\contentsname{目录}%
- \def\listfigurename{插图}%
- \def\listtablename{表格}%
- \def\figurename{图}%
- \def\tablename{表}%
- \def\indexname{索引}%
- \def\appendixname{附录}%
- \def\bibname{参考文献}%
- \renewcommand{\languagename}{chinese}%
-}
-\newcommand{\minimalist@langconfig@english}{%
- \selectlanguage{english}%
-}
-\newcommand{\minimalist@langconfig@french}{%
- \selectlanguage{french}%
- \def\frenchpartname{Partie}%
-}
-\newcommand{\UseLanguageCORE}[1]{%
- \ifstrequal{#1}{chinese}{\onehalfspacing\minimalist@langconfig@chinese}{}%
- \ifstrequal{#1}{Chinese}{\onehalfspacing\minimalist@langconfig@chinese}{}%
- \ifstrequal{#1}{english}{\setstretch{1.07}\minimalist@langconfig@english}{}%
- \ifstrequal{#1}{English}{\setstretch{1.07}\minimalist@langconfig@english}{}%
- \ifstrequal{#1}{french}{\setstretch{1.07}\minimalist@langconfig@french}{}%
- \ifstrequal{#1}{French}{\setstretch{1.07}\minimalist@langconfig@french}{}%
-}
-\newcommand{\UseLanguage}[1]{%
- \ifx\@onlypreamble\@notprerr%
- \UseLanguageCORE{#1}%
- \else%
- \AfterEndPreamble{\UseLanguageCORE{#1}}%
- \fi%
-}
-\newcommand{\UseOtherLanguage}[2]{%
-\begingroup%
- \ifstrequal{#1}{chinese}{\minimalist@langconfig@chinese}{}%
- \ifstrequal{#1}{Chinese}{\minimalist@langconfig@chinese}{}%
- \ifstrequal{#1}{english}{\minimalist@langconfig@english}{}%
- \ifstrequal{#1}{English}{\minimalist@langconfig@english}{}%
- \ifstrequal{#1}{french}{\minimalist@langconfig@french}{}%
- \ifstrequal{#1}{French}{\minimalist@langconfig@french}{}%
- #2%
-\endgroup%
-}
+\setlength{\parindent}{2em}
-\ifbool{IsBook}{}{
+\ifbool{IsBook}{}{%
%%================================
%% Title block style
%%================================
+\if@minimalist@classical
+\renewcommand{\@maketitle}{%
+ \LocallyStopLineNumbers%
+ \begin{center}%
+ {\conditionalbfseries\sffamily\large\@title}\\\bigskip%
+ \color{black!80!paper}%
+ {\small\scshape\@author}\\[2pt]%
+ {\small\@date}%
+ \end{center}%
+ \bigskip\par%
+ \ResumeLineNumbers%
+}
+\else
\renewcommand{\@maketitle}{%
\LocallyStopLineNumbers%
\noindent%
{\textcolor{gray!55!paper}{\rule{\textwidth}{0.75pt}}}%
- \vspace{-\parskip}%
+ % \vspace{-\parskip}%
+ \vspace{-.5\baselineskip}%
\begin{flushright}%
- {\@title}\\\medskip%
+ {\conditionalbfseries\@title}\\\medskip%
\color{black!80!paper}%
- {\small\scshape\@author}\\[2pt]%
+ {\small\scshape\@author}%
+ \par\vspace{-\parskip}\vspace{2pt}%
{\small\@date}%
\end{flushright}%
- \vspace{-\parskip}%
+ % \vspace{-\parskip}%
\vspace{-.5\baselineskip}%
+ \ifx\@date\@empty%
+ \vspace{-.2\baselineskip}%
+ \else%
+ \vspace{-.5\baselineskip}%
+ \fi%
{\textcolor{gray!55!paper}{\rule{\textwidth}{0.75pt}}\par}%
\ResumeLineNumbers%
}
+\fi
\apptocmd{\maketitle}{\thispagestyle{fancy}}{}{\FAIL}
%%================================
%% Abstract style
%%================================
+\if@minimalist@classical
+\renewenvironment{abstract}{%
+ \LocallyStopLineNumbers%
+ \vspace{-\baselineskip}%
+ \begin{center}%
+ \textsc{\conditionalbfseries\small\abstractname}\\%
+ \vspace{-.3\baselineskip}%
+ \begin{minipage}[t]{.833\textwidth}%
+ \vspace{0pt}%
+ \color{black!80!paper}%
+ \footnotesize%
+ \parindent=2em
+}{%
+ \end{minipage}%
+ \end{center}%
+ \medskip%
+ \ResumeLineNumbers%
+}
+\else
\renewenvironment{abstract}{%
\LocallyStopLineNumbers%
\begin{flushright}%
- \textsc{\small\abstractname}\par%
- \vspace{-.75\baselineskip}%
+ \textsc{\conditionalbfseries\small\abstractname}\par%
+ \vspace{-\parskip}%
+ \vspace{-.25\baselineskip}%
\begin{minipage}[t]{.833\textwidth}%
\vspace{0pt}%
\color{black!80!paper}%
@@ -643,8 +687,68 @@
}{%
\end{minipage}%
\end{flushright}%
+ \bigskip%
\ResumeLineNumbers%
}
+\fi
+
+%%================================
+%% Keyword environment
+%%================================
+\def\keywordnameEN{\textsc{Keywords}}
+\def\keywordnameFR{\textsc{Mots clés}}
+\def\keywordnameDE{\textsc{Schlüsselwörter}}
+\def\keywordnameCN{关键词}
+\def\keywordnameTC{關鍵詞}
+\def\keywordnameJP{キーワード}
+\def\keywordnameRU{Ключевые слова}
+
+\if@minimalist@classical
+\newenvironment{keyword}{%
+ \LocallyStopLineNumbers%
+ \vspace{-.75\baselineskip}%
+ \begin{center}%
+ {\conditionalbfseries\small\csname keywordname\csname\languagename ABBR\endcsname\endcsname}\\%
+ \vspace{-.3\baselineskip}%
+ \begin{minipage}[t]{.833\textwidth}%
+ \vspace{0pt}%
+ \color{black!80!paper}%
+ \footnotesize%
+ \parindent=2em
+ \begin{center}%
+}{%
+ \end{center}%
+ \end{minipage}%
+ \end{center}%
+ \medskip%
+ \ResumeLineNumbers%
+}
+\else
+\newenvironment{keyword}{%
+ \LocallyStopLineNumbers%
+ \vspace{-.5\baselineskip}%
+ \begin{flushright}%
+ {\conditionalbfseries\small\csname keywordname\csname\languagename ABBR\endcsname\endcsname}\par%
+ \vspace{-\parskip}%
+ \vspace{-.30\baselineskip}%
+ \begin{minipage}[t]{.833\textwidth}%
+ \vspace{0pt}%
+ \color{black!80!paper}%
+ \footnotesize%
+ \parindent=2em
+ \raggedleft%
+}{%
+ \end{minipage}%
+ \end{flushright}%
+ \bigskip%
+ \ResumeLineNumbers%
+}
+\fi
+
+%%================================
+%% Simulate features of amsart
+%%================================
+\RequirePackage{PJLamssim}
}
diff --git a/macros/latex/contrib/minimalist/minimart.cls b/macros/latex/contrib/minimalist/minimart.cls
index b9a5a27142..9b19f187b1 100644
--- a/macros/latex/contrib/minimalist/minimart.cls
+++ b/macros/latex/contrib/minimalist/minimart.cls
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{minimart}
- [2021/03/15 A simple and clear article style]
+ [2021/05/23 A simple and clear article style]
\def\minimclass@baseclass{article}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -27,6 +27,13 @@
}
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
+\DeclareBoolOption[false]{classical}
+
+\newif\if@minimclass@bfivepaper\@minimclass@bfivepaperfalse
+\DeclareVoidOption{b5paper}{\@minimclass@bfivepapertrue}
+\newif\if@minimclass@afourpaper\@minimclass@afourpaperfalse
+\DeclareVoidOption{a4paper}{\@minimclass@afourpapertrue}
+
\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{\minimclass@baseclass}}
\ProcessKeyvalOptions*\relax
\LoadClass{\minimclass@baseclass}
@@ -37,6 +44,8 @@
%%================================
%% Page layout
%%================================
+\RequirePackage{silence}
+\WarningFilter{geometry}{Over-specification in}
\RequirePackage[heightrounded]{geometry}
\geometry{
papersize={7in,10in},
@@ -45,12 +54,36 @@
vmarginratio=1:1,
footnotesep=2em plus 2pt minus 2pt,
}
+\if@minimclass@bfivepaper
+\geometry{
+ b5paper,
+ total={40em,59em},
+ hmarginratio=1:1,
+ vmarginratio=1:1,
+ footnotesep=2em plus 2pt minus 2pt,
+}
+\fi
+\if@minimclass@afourpaper
+\geometry{
+ a4paper,
+ total={47em,70em},
+ hmarginratio=1:1,
+ vmarginratio=1:1,
+ footnotesep=2em plus 2pt minus 2pt,
+}
+\fi
\if@minimclass@fast
\PassOptionsToPackage{fast}{minimalist}
+ \RequirePackage{draftwatermark}
+ \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95}
+\fi
+\if@minimclass@classical
+ \RequirePackage{indentfirst}
+\else
+ \AtEndPreamble{\RequirePackage{parskip}}
\fi
\RequirePackage{minimalist}
-\AtEndPreamble{\RequirePackage{parskip}}
%%================================
%% Fonts
@@ -62,6 +95,9 @@
\fi
\RequirePackage{mathpazo}
\RequirePackage{newpxtext}
+\RequirePackage{amssymb}
+
+\def\PJL@font@alreadyset{}
\RequirePackage[verbose=silent]{microtype}
@@ -71,7 +107,9 @@
\RequirePackage{graphicx}
\graphicspath{{images/}}
\RequirePackage{wrapfig}
+\RequirePackage{float}
\RequirePackage{caption}
+\captionsetup{font=small}
%%================================
%% Index
@@ -80,53 +118,6 @@
\pretocmd{\printindex}{\LocallyStopLineNumbers}{}{\FAIL}
\apptocmd{\printindex}{\ResumeLineNumbers}{}{\FAIL}
-%%================================
-%% Draft mark
-%%================================
-\def\dnfFont{\ttfamily}
-\def\needgraphFont{\ttfamily}
-
-\def\dnfTextEN{To be finished here}
-\def\needgraphTextEN{A graph is needed here}
-\def\dnfTextFR{À terminer ici}
-\def\needgraphTextFR{Il manque encore un graphique ici}
-\def\dnfTextCN{这里的内容尚未完成}
-\def\needgraphTextCN{这里需要一张图片}
-
-\definecolor{dnfColor}{RGB}{21,122,20}
-\definecolor{needgraphColor}{RGB}{70,130,180}
-
-\if@minimclass@fast
- \newcommand{\plainBox}[2][-paper]{\textcolor{#1}{%
- \setlength{\fboxsep}{1.5pt}%
- \setlength{\fboxrule}{1.2pt}%
- \fbox{#2}}}
-\else
- \PassOptionsToPackage{many}{tcolorbox}
- \RequirePackage{tcolorbox}
- \newtcbox{\plainBox}[1][-paper]{enhanced jigsaw,%
- on line, arc = 1.2pt, outer arc = 1pt,breakable,%
- colframe = #1,colupper=#1,opacityback=0,%
- boxsep = 1pt,boxrule = 1.2pt,%
- left = 1pt, right = 1pt, top = 0pt, bottom = 0pt,%
- }
-\fi
-
-\NewDocumentCommand{\dnf}{d<>}{%
- \noindent\plainBox[dnfColor]%
- {\normalfont\dnfFont\bfseries\small%
- \csname dnfText\csname\languagename ABBR\endcsname\endcsname%
- \IfNoValueF{#1}{ : #1}}%
-}
-\NewDocumentCommand{\needgraph}{d<>}{%
- \par%
- \centerline{\plainBox[needgraphColor]%
- {\normalfont\needgraphFont\bfseries\small%
- \csname needgraphText\csname\languagename ABBR\endcsname\endcsname%
- \IfNoValueF{#1}{ : #1}}}%
- \par%
-}
-
\endinput
%%
%% End of file `minimalist/minimart.cls'.
diff --git a/macros/latex/contrib/minimalist/minimbook.cls b/macros/latex/contrib/minimalist/minimbook.cls
index 8030889279..b998e53dd7 100644
--- a/macros/latex/contrib/minimalist/minimbook.cls
+++ b/macros/latex/contrib/minimalist/minimbook.cls
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{minimbook}
- [2021/03/15 A simple and clear book style]
+ [2021/05/23 A simple and clear book style]
\def\minimclass@baseclass{book}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -27,6 +27,13 @@
}
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
+\DeclareBoolOption[false]{classical}
+
+\newif\if@minimclass@bfivepaper\@minimclass@bfivepaperfalse
+\DeclareVoidOption{b5paper}{\@minimclass@bfivepapertrue}
+\newif\if@minimclass@afourpaper\@minimclass@afourpaperfalse
+\DeclareVoidOption{a4paper}{\@minimclass@afourpapertrue}
+
\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{\minimclass@baseclass}}
\ProcessKeyvalOptions*\relax
\LoadClass{\minimclass@baseclass}
@@ -37,6 +44,8 @@
%%================================
%% Page layout
%%================================
+\RequirePackage{silence}
+\WarningFilter{geometry}{Over-specification in}
\RequirePackage[heightrounded]{geometry}
\geometry{
papersize={7in,10in},
@@ -45,12 +54,36 @@
vmarginratio=1:1,
footnotesep=2em plus 2pt minus 2pt,
}
+\if@minimclass@bfivepaper
+\geometry{
+ b5paper,
+ total={40em,59em},
+ hmarginratio=1:1,
+ vmarginratio=1:1,
+ footnotesep=2em plus 2pt minus 2pt,
+}
+\fi
+\if@minimclass@afourpaper
+\geometry{
+ a4paper,
+ total={47em,70em},
+ hmarginratio=1:1,
+ vmarginratio=1:1,
+ footnotesep=2em plus 2pt minus 2pt,
+}
+\fi
\if@minimclass@fast
\PassOptionsToPackage{fast}{minimalist}
+ \RequirePackage{draftwatermark}
+ \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95}
+\fi
+\if@minimclass@classical
+ \RequirePackage{indentfirst}
+\else
+ \AtEndPreamble{\RequirePackage{parskip}}
\fi
\RequirePackage{minimalist}
-\AtEndPreamble{\RequirePackage{parskip}}
%%================================
%% Fonts
@@ -62,6 +95,9 @@
\fi
\RequirePackage{mathpazo}
\RequirePackage{newpxtext}
+\RequirePackage{amssymb}
+
+\def\PJL@font@alreadyset{}
\RequirePackage[verbose=silent]{microtype}
@@ -71,7 +107,9 @@
\RequirePackage{graphicx}
\graphicspath{{images/}}
\RequirePackage{wrapfig}
+\RequirePackage{float}
\RequirePackage{caption}
+\captionsetup{font=small}
%%================================
%% Index
@@ -80,53 +118,6 @@
\pretocmd{\printindex}{\LocallyStopLineNumbers}{}{\FAIL}
\apptocmd{\printindex}{\ResumeLineNumbers}{}{\FAIL}
-%%================================
-%% Draft mark
-%%================================
-\def\dnfFont{\ttfamily}
-\def\needgraphFont{\ttfamily}
-
-\def\dnfTextEN{To be finished here}
-\def\needgraphTextEN{A graph is needed here}
-\def\dnfTextFR{À terminer ici}
-\def\needgraphTextFR{Il manque encore un graphique ici}
-\def\dnfTextCN{这里的内容尚未完成}
-\def\needgraphTextCN{这里需要一张图片}
-
-\definecolor{dnfColor}{RGB}{21,122,20}
-\definecolor{needgraphColor}{RGB}{70,130,180}
-
-\if@minimclass@fast
- \newcommand{\plainBox}[2][-paper]{\textcolor{#1}{%
- \setlength{\fboxsep}{1.5pt}%
- \setlength{\fboxrule}{1.2pt}%
- \fbox{#2}}}
-\else
- \PassOptionsToPackage{many}{tcolorbox}
- \RequirePackage{tcolorbox}
- \newtcbox{\plainBox}[1][-paper]{enhanced jigsaw,%
- on line, arc = 1.2pt, outer arc = 1pt,breakable,%
- colframe = #1,colupper=#1,opacityback=0,%
- boxsep = 1pt,boxrule = 1.2pt,%
- left = 1pt, right = 1pt, top = 0pt, bottom = 0pt,%
- }
-\fi
-
-\NewDocumentCommand{\dnf}{d<>}{%
- \noindent\plainBox[dnfColor]%
- {\normalfont\dnfFont\bfseries\small%
- \csname dnfText\csname\languagename ABBR\endcsname\endcsname%
- \IfNoValueF{#1}{ : #1}}%
-}
-\NewDocumentCommand{\needgraph}{d<>}{%
- \par%
- \centerline{\plainBox[needgraphColor]%
- {\normalfont\needgraphFont\bfseries\small%
- \csname needgraphText\csname\languagename ABBR\endcsname\endcsname%
- \IfNoValueF{#1}{ : #1}}}%
- \par%
-}
-
\endinput
%%
%% End of file `minimalist/minimbook.cls'.
diff --git a/macros/latex/contrib/ot-tableau/README b/macros/latex/contrib/ot-tableau/README
index 588e69e6af..059cc0f56c 100644
--- a/macros/latex/contrib/ot-tableau/README
+++ b/macros/latex/contrib/ot-tableau/README
@@ -1,3 +1,10 @@
-This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license.
-Requires packages: xstring, amssymb, bbding, suffix, colortbl, rotating, hhline,tabu
+
+
+The package makes it easy to create beautiful optimality-theoretic tableaux. The LaTeX source is visually very similar to a formatted tableau, which makes working with the source code painless (well, less painful). A variety of stylistic variants are available to suit personal taste.
+
+The package is maintained by Adam Baker (adam@adambaker.org).
+
+This material is subject to the LaTeX Project Public License. See http://www.latex-project.org/lppl.txt for the details of that license.
+
+Requires packages: xstring, amssymb, bbding, suffix, colortbl, rotating, hhline (optionally), arydshln, tipa (optionally)
diff --git a/macros/latex/contrib/ot-tableau/ot-tableau.pdf b/macros/latex/contrib/ot-tableau/ot-tableau.pdf
index bbda62b020..46a08bd942 100644
--- a/macros/latex/contrib/ot-tableau/ot-tableau.pdf
+++ b/macros/latex/contrib/ot-tableau/ot-tableau.pdf
Binary files differ
diff --git a/macros/latex/contrib/ot-tableau/ot-tableau.sty b/macros/latex/contrib/ot-tableau/ot-tableau.sty
index 84528124dc..3d2ac05907 100644
--- a/macros/latex/contrib/ot-tableau/ot-tableau.sty
+++ b/macros/latex/contrib/ot-tableau/ot-tableau.sty
@@ -1,4 +1,21 @@
-\ProvidesPackage{ot-tableau}[2017/07/23]
+%% ot-tableau.sty
+%% Copyright 2021 Adam Baker
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Adam Bker.
+%
+% This work consists of the files ot-tableau.sty and ot-tableau.tex.
+
+\ProvidesPackage{ot-tableau}[2021-05-19]
% Package option: notipa
\newif\ifottableau@tipa
@@ -9,6 +26,11 @@
\newif\ifottableau@circledviolations
\DeclareOption{circledviolations}{\ottableau@circledviolationstrue}
+% Package option: usehhline
+\newif\ifottableau@usehhline
+\ottableau@usehhlinefalse % default to false
+\DeclareOption{usehhline}{\ottableau@usehhlinetrue}
+
% Package option: shadedcells
\newif\ifottableau@shadedcells
\DeclareOption{shadedcells}{\ottableau@shadedcellstrue}
@@ -29,8 +51,13 @@
\RequirePackage{rotating}
% fancy table and lines
-\RequirePackage{hhline,tabu}
-\newtabulinestyle { dashed=.5pt on 1.5pt off 1.5pt }
+% 2021-05-19: Removing hhline, which makes the nice lines, because hhline conflicts with arydshln
+\ifottableau@usehhline
+ \RequirePackage{hhline}
+\else
+\fi
+
+\RequirePackage{arydshln}
% IPA typesetting macros
\def\ipa#1{#1}
@@ -91,25 +118,34 @@
% Automatic row lettering
\newcommand*{\rowletter}{\stepcounter{tableaurow}\alph{tableaurow}. }
-% https://tex.stackexchange.com/questions/382843/using-the-tabu-environment-within-a-conditional-within-newenvironment
+
+
+
\newenvironment{tableau}[1]{\setcounter{tableaurow}{0}%
\gdef\ConstraintString{#1}
\StrSubstitute{#1}{s}{c}[\NoS]
\StrCount{\NoS}{c}[\ConstraintCount]%
+ \ifottableau@usehhline
+ \gdef\TopOrBottomLine{\hhline{---||*{\ConstraintCount}{-|}}}
+ \gdef\DoubleLine{\hhline{---||*{\ConstraintCount}{-|}}}
+ \else
+ \gdef\TopOrBottomLine{\hline}
+ \gdef\DoubleLine{\hline\hline}
+ \fi
\ifottableau@fingerfirst % finger first: this is the default
\expandafter\@firstoftwo
\else % finger second
\expandafter\@secondoftwo
\fi
- {\begin{tabu}{|r@{\hspace{4pt}}l@{\hspace{3pt}}l||#1|}} % finger first
- {\begin{tabu}{|l@{\hspace{2pt}}r@{\hspace{4pt}}l||#1|}} % finger second
- \hhline{|---||*{\ConstraintCount}{-|}}
- }{\\\hhline{|---||*{\ConstraintCount}{-|}}\end{tabu}}
-
+ {\begin{tabular}{|r@{\hspace{4pt}}l@{\hspace{3pt}}l||#1|}} % finger first
+ {\begin{tabular}{|l@{\hspace{2pt}}r@{\hspace{4pt}}l||#1|}} % finger second
+ \TopOrBottomLine
+ }{\\\TopOrBottomLine\end{tabular}}
+
% draw two lines after the constraints, one line elsewhere
\def\properlines{\ifthenelse{\thetableaurow=0}%
- {\\\hhline{:===::*{\ConstraintCount}{=:}}}%
- {\\\hhline{|---||*{\ConstraintCount}{-|}}}}
+ {\\\DoubleLine}%
+ {\\\TopOrBottomLine}}
\newcommand\cand[2][]{\OptimalOff\properlines%
\ifottableau@fingerfirst \ipa{#1} \else \rowletter \fi%
@@ -142,6 +178,3 @@
\newcommand\const[1]{&\textsc{#1}\UnshadeTheCell}
\WithSuffix\newcommand\const*[1]{&#1\UnshadeTheCell}
-
-% 2017-07-22: This doesn't work for some reason if it's toward the top of the file
-\newcolumntype{:}{|[dashed]}
diff --git a/macros/latex/contrib/ot-tableau/ot-tableau.tex b/macros/latex/contrib/ot-tableau/ot-tableau.tex
index e63c9c43aa..0eba320896 100644
--- a/macros/latex/contrib/ot-tableau/ot-tableau.tex
+++ b/macros/latex/contrib/ot-tableau/ot-tableau.tex
@@ -1,8 +1,10 @@
\documentclass{article}
\usepackage[notipa]{ot-tableau}
+% use the usehhline option to use the hhline for prettier lines (which currently does not work)
+%\usepackage[notipa,usehhline]{ot-tableau}
\usepackage{fullpage,pifont}
\title{The \textsf{ot-tableau} package}
-\date{Revised 2017-07-23}
+\date{Revised 2021-05-19}
\author{Adam Baker}
\def\eg{e.g.,~}
\def\tabl{\textsf{ot-tableau}}
@@ -88,6 +90,7 @@ The default \verb+\cand+ and \verb+\const+ commands typeset the argument with TI
If you are using Unicode input for your phonetic symbols, use the package option \verb+notipa+ to disable TIPA.
\subsection{Controlling cell shading}
+
There are two systems in use for shading OT tableaux. One system is to shade cells in a row after the crucial violation. The other system is to shade an entire column, if the associate constraint generates no crucial violations.
\tabl\ will do cell-shading automatically with the \verb+shadedcells+ package option.\footnote{More specifically, \tabl\ will look for the exclamation point. You have to provide the exclamation point.} This tableau...
@@ -204,8 +207,7 @@ Using the optional argument to \verb+\cand+, you can add any annotation to a can
\end{tableau}
\end{verbatim}
-You can mark the optimal candidate with the \verb+\Optimal+ command. This
-By default, \tabl\ typesets \textsf{bbding}'s \verb+\HandRight+ symbol (\HandRight), which I find to be the most attractive. \tabl\ also replaces asterisks with the more attractive asterisks in \textsf{amssymb}. You can replace these symbols with others if you wish, using \verb+\renewcommand+:
+You can mark the optimal candidate with the \verb+\Optimal+ command. By default, \tabl\ typesets \textsf{bbding}'s \verb+\HandRight+ symbol (\HandRight), which I find to be the most attractive. \tabl\ also replaces asterisks with the more attractive asterisks in \textsf{amssymb}. You can replace these symbols with others if you wish, using \verb+\renewcommand+:
\begin{center}
\CircledViolationsOn
@@ -232,6 +234,10 @@ By default, \tabl\ typesets \textsf{bbding}'s \verb+\HandRight+ symbol (\HandRig
\end{tableau}
\end{verbatim}
+\subsection{Prettier lines}
+\textbf{As of 2021-05-19:} A conflict between \verb+hhline+ and \verb+arydshln+ means that it's not possible to have the prettier tableau lines that \verb+hhline+ offers. (Extra whitespace is introduced above the first line.) It's possible that this will be fixed in the future, in which case you can get the prettier lines back with the \verb+usehhline+ package option, e.g., \verb+\usepackage[notipa,usehhline]{ot-tableau}+.
+
+
\section{Package Options}
It makes the most sense to set these options as package options, but if you want to change the settings in the middle of the documents, you can use the commands indicated in parentheses.
@@ -240,6 +246,7 @@ It makes the most sense to set these options as package options, but if you want
\item[circledviolations] Circle the optimal candidate's constraint violations. The optimal candidate must be identified with \verb+\cand[\Optimal]+. (\verb+\CircledViolationsOn+, \verb+\CircledViolationsOff+)
\item[shadedcells] Shade cells for a constraint that follow the candidate's fatal violation. (\verb+\ShadingOn+, \verb+\ShadingOff+)
\item[fingerafter] Place the finger-of-optimality after the letter rather than before it. (\verb+\FingerBeforeLetter+, \verb+\LetterBeforeFinger+)
+\item[usehhline] Use the \verb+hhline+ package to draw prettier tableau lines. (As of 2021-05-19, a package conflict means that the lines are not actually prettier. Hopefully this will be fixed in the future and we can go back to pretty lines!)
\end{description}
\end{document}
diff --git a/macros/latex/contrib/tcolorbox/CHANGES b/macros/latex/contrib/tcolorbox/CHANGES
index 0b75eb6406..a82b952189 100644
--- a/macros/latex/contrib/tcolorbox/CHANGES
+++ b/macros/latex/contrib/tcolorbox/CHANGES
@@ -1,7 +1,7 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -1192,3 +1192,30 @@ version 4.42 (2020/10/09)
* color stacks (by pdfcol) are not mandatory any more,
but are optional now with 'use color stack'. Note that effects of whatsits
on the vertical space have to be expected.
+
+version 4.50 (2021/05/21)
+- bug fix (#128): 'tcbincludepdf' ignored some raster options
+- bug fix (#138): visible seam for 'bicolor' and 'tile' in 'sidebyside' mode
+ around the lower (i.e. rightward) part
+- (#125) Using group around arguments for title in the examples
+- (#134) Allocate write registers \tcb@out and \tcb@record@out only when needed
+- (#135) Documentation: recommend to use initialization options after loading hyperref
+- (#118) Documentation: warn user about white title color becoming invisible
+ for the skin 'empty'
+- documentation correction (#127)
+- documentation of library skins is split into a general part and the catalog of skins
+- (#124) '\tcblistof' enhanced to take an optional short title and mimic
+ '\listoffigures' where applicable
+- library 'skins':
+ * new option 'opacitybacklower'
+ * new jigsaw variant of 'bicolor':
+ 'bicolor jigsaw', 'bicolorfirst jigsaw', 'bicolormiddle jigsaw', 'bicolorlast jigsaw'
+ * implementation of bicolor overhauled
+ * skin documentation complemented with sidebyside examples.
+- library 'theorems':
+ * (#126) new option 'theorem hanging indent'
+- library 'vignette':
+ * (#133) documentation examples for fading styles for every side added
+- library 'raster':
+ * (#119) '\thetcbrasternum' changed output the content of a counter.
+ LaTeX counter 'tcbrasterrow', 'tcbrastercolumn', 'tcbrasternum' documented.
diff --git a/macros/latex/contrib/tcolorbox/README b/macros/latex/contrib/tcolorbox/README
index 55edf61ca4..e8391f6ff8 100644
--- a/macros/latex/contrib/tcolorbox/README
+++ b/macros/latex/contrib/tcolorbox/README
@@ -1,7 +1,7 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
diff --git a/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex b/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex
index d77ecad60b..5e9133d668 100644
--- a/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcbbreakable.code.tex: Code for breakable colorboxes
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.42}
+\tcb@set@library@version{4.50}
\RequirePackage{pdfcol}
\pdfcolInitStack{tcb@breakable}
diff --git a/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex b/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex
index 569308b3b5..8fa8fde32e 100644
--- a/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcbdocumentation.code.tex: Code for LaTeX documentations
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.42}
+\tcb@set@library@version{4.50}
\tcbuselibrary{listings,skins,xparse,external,raster}
diff --git a/macros/latex/contrib/tcolorbox/tcbexternal.code.tex b/macros/latex/contrib/tcolorbox/tcbexternal.code.tex
index 776a5694ec..cee87d113d 100644
--- a/macros/latex/contrib/tcolorbox/tcbexternal.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbexternal.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcbexternal.code.tex: Code for externalization
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.42}
+\tcb@set@library@version{4.50}
\tcbuselibrary{pro@cessing}
@@ -69,6 +69,7 @@
\begingroup%
\ifnum\the\catcode`\"=13 \tcbexternal@activate@normal@dq\fi%
\message{=== Compile external '\tcbexternal@job@name': }%
+ \tcb@allocate@tcb@out%
\immediate\openout\tcb@out="\tcbexternal@run@tex"
\immediate\write\tcb@out{\string\gdef\string\TCBEXTERNALINPUT{"\tcbexternal@job@source"}}%
\immediate\write\tcb@out{\string\gdef\string\TCBEXTERNALSAFETY{\tcbexternal@safety}}%
diff --git a/macros/latex/contrib/tcolorbox/tcbfitting.code.tex b/macros/latex/contrib/tcolorbox/tcbfitting.code.tex
index 31e0b37980..c9a63da68f 100644
--- a/macros/latex/contrib/tcolorbox/tcbfitting.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbfitting.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcbfitting.code.tex: Code for fit boxes
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.42}
+\tcb@set@library@version{4.50}
\newdimen\tcbfitdim
\newdimen\tcb@lowerfitdim
diff --git a/macros/latex/contrib/tcolorbox/tcbhooks.code.tex b/macros/latex/contrib/tcolorbox/tcbhooks.code.tex
index 9e3be34df0..db39f0cb23 100644
--- a/macros/latex/contrib/tcolorbox/tcbhooks.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbhooks.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcbhooks.code.tex: Code for adding hooks
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.42}
+\tcb@set@library@version{4.50}
\tcbset{%
before upper app/.code={\appto\kvtcb@before@upper{#1}},%
diff --git a/macros/latex/contrib/tcolorbox/tcblistings.code.tex b/macros/latex/contrib/tcolorbox/tcblistings.code.tex
index f44cbe9a4e..84e3bccff5 100644
--- a/macros/latex/contrib/tcolorbox/tcblistings.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcblistings.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcblistings.code.tex: Code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.42}
+\tcb@set@library@version{4.50}
\RequirePackage{listings}[2007/02/22]
diff --git a/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex b/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex
index b070c4e727..5f0afcc8af 100644
--- a/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.42}
+\tcb@set@library@version{4.50}
\tcbuselibrary{pro@cessing}
diff --git a/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex b/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex
index b4fb28f987..1ad84adf57 100644
--- a/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.42}
+\tcb@set@library@version{4.50}
\tcbuselibrary{listings}
diff --git a/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex b/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex
index 0e29cfe97d..caa2b0cb0f 100644
--- a/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcbmagazine.code.tex: Code for box sets and magazine styles
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.42}
+\tcb@set@library@version{4.50}
\tcbuselibrary{breakable}
diff --git a/macros/latex/contrib/tcolorbox/tcbminted.code.tex b/macros/latex/contrib/tcolorbox/tcbminted.code.tex
index 20b548f0ae..13f1e26f9e 100644
--- a/macros/latex/contrib/tcolorbox/tcbminted.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbminted.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcbminted.code.tex: Code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.42}
+\tcb@set@library@version{4.50}
\RequirePackage{minted}[2011/09/17]
diff --git a/macros/latex/contrib/tcolorbox/tcbposter.code.tex b/macros/latex/contrib/tcolorbox/tcbposter.code.tex
index 591806e8e5..cdec336256 100644
--- a/macros/latex/contrib/tcolorbox/tcbposter.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbposter.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcbposter.code.tex: Code for posters
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.42}
+\tcb@set@library@version{4.50}
\tcbuselibrary{breakable,magazine,skins,fitting}
diff --git a/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex b/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex
index 14e7c8d430..7de64918b3 100644
--- a/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcbprocessing.code.tex: Code for conditional processing
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.42}
+\tcb@set@library@version{4.50}
\RequirePackage{pdftexcmds}
\RequirePackage{shellesc}
@@ -35,6 +35,7 @@
}
\def\tcbproc@writemdfive#1{%
+ \tcb@allocate@tcb@out%
\immediate\openout\tcb@out=#1%
\immediate\write\tcb@out{\string\def\string\tcbproclastmdfivesum{\tcbprocmdfivesum}\@percentchar}%
\immediate\closeout\tcb@out%
diff --git a/macros/latex/contrib/tcolorbox/tcbraster.code.tex b/macros/latex/contrib/tcolorbox/tcbraster.code.tex
index 2cdfbfcd7b..3a00af7be6 100644
--- a/macros/latex/contrib/tcolorbox/tcbraster.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbraster.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,14 +17,13 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.42}
+\tcb@set@library@version{4.50}
\newcounter{tcbrastercolumn}
\newcounter{tcbrasterrow}
+\newcounter{tcbrasternum}
\newcounter{tcbraster}
-\newrobustcmd{\thetcbrasternum}{\the\numexpr(\c@tcbrasterrow-1)*\kvtcb@raster@columns+\c@tcbrastercolumn\relax}
-
\def\tcb@raster@ehg@all{%
\tcbset{equal height group={\kvtcb@raster@ehgid}}%
}
@@ -75,7 +74,7 @@
\tcb@warning{'raster multicolumn' combined too much columns}%
\else%
\tcbset@late@options{%
- code={\preto\kvtcb@afterbox{\addtocounter{tcbrastercolumn}{\numexpr#1-1}}},
+ code={\preto\kvtcb@afterbox{\addtocounter{tcbrastercolumn}{\numexpr#1-1}\addtocounter{tcbrasternum}{\numexpr#1-1}}},
width=(\tcb@raster@box@width+\tcb@raster@xskip)*#1-\tcb@raster@xskip}%
\fi%
},
@@ -130,10 +129,11 @@
\edef\tcb@raster@save@column{\number\c@tcbrastercolumn}%
\edef\tcb@raster@save@row{\number\c@tcbrasterrow}%
\let\tcb@raster@change@fitbox\@empty%
+ \setcounter{tcbrasternum}{1}%
\setcounter{tcbrastercolumn}{1}%
\setcounter{tcbrasterrow}{1}%
\let\tcb@height@fill@unbroken\tcb@height@fill@unbroken@raster%
- \tcbset{every box on layer \the\numexpr\number\c@tcblayer+1\relax/.code={%
+ \tcbset{every box on layer \the\numexpr\number\c@tcblayer+1\relax/.append code={%
\tcb@raster@ehg@set%
\tcbset{raster every box/.try}%
\ifodd\c@tcbrastercolumn\relax%
@@ -148,13 +148,13 @@
\tcbset{raster even row/.try}%
\fi%
\tcbset{raster row \number\c@tcbrasterrow/.try}%
- \ifodd\thetcbrasternum\relax%
+ \ifodd\c@tcbrasternum\relax%
\tcbset{raster odd number/.try}%
\else%
\tcbset{raster even number/.try}%
\fi%
\tcbset{raster row \number\c@tcbrasterrow\space column \number\c@tcbrastercolumn/.try}%
- \tcbset{raster number \thetcbrasternum/.try}%
+ \tcbset{raster number \number\c@tcbrasternum/.try}%
}}%
\tcbset{#1}%
% sanitize
@@ -171,9 +171,10 @@
\ifnum\c@tcbrasterrow>1 \parindent\z@\parskip\z@\par\nointerlineskip\addvspace{\the\dimexpr\tcb@raster@yskip\relax}\noindent\fi%
\kern\tcb@raster@skip@left\fi},
after={%
+ \stepcounter{tcbrasternum}%
\ifnum\c@tcbrastercolumn=\kvtcb@raster@columns\relax%
\kern\tcb@raster@skip@right%
- \setcounter{tcbrastercolumn}{1}\addtocounter{tcbrasterrow}{1}%
+ \setcounter{tcbrastercolumn}{1}\stepcounter{tcbrasterrow}%
\else%
\stepcounter{tcbrastercolumn}%
\fi},%
@@ -216,6 +217,7 @@
\tcb@end@raster%
\setcounter{tcbrastercolumn}{\tcb@raster@save@column}%
\setcounter{tcbrasterrow}{\tcb@raster@save@row}%
+ \setcounter{tcbrasternum}{\the\numexpr(\c@tcbrasterrow-1)*\kvtcb@raster@columns+\c@tcbrastercolumn\relax}%
}
\newcommand{\tcbitem@following}[1][]{%
diff --git a/macros/latex/contrib/tcolorbox/tcbskins.code.tex b/macros/latex/contrib/tcolorbox/tcbskins.code.tex
index 0df4c6b0c6..fc1ad843fa 100644
--- a/macros/latex/contrib/tcolorbox/tcbskins.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbskins.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcbskins.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.42}
+\tcb@set@library@version{4.50}
\RequirePackage{tikz}[2010/10/13]
@@ -111,6 +111,7 @@
\tikzset{%
tcb fill frame/.style={fill=tcbcolframe,fill opacity=\kvtcb@opacityframe,tcb@spec,frame@style},%
tcb fill interior/.style={fill=tcbcolback,fill opacity=\kvtcb@opacityback,tcb@spec,interior@style},%
+ tcb fill lower bicolor/.style={fill=tcbcolbacklower,fill opacity=\kvtcb@opacitybacklower,tcb@spec,segmentation@style},%
tcb fill title/.style={fill=tcbcolbacktitle,fill opacity=\kvtcb@opacitybacktitle,tcb@spec,title@style},%
}
@@ -225,33 +226,63 @@
{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}%
}
-\def\tcb@drawspec@sbs@A#1{%
- \tcb@pathbase{#1,segmentation@style}{segmentation.south}{interior.north east}%
+\def\tcb@drawspec@sbs@a{%
+ \tcb@pathbase{tcb fill interior}{interior.south west}{segmentation.north}%
+ {\tcb@arc@ins@SW}{\tcb@arc@ins@NW}{\tcb@arc@zpt}{\tcb@arc@zpt}%
+}
+
+\def\tcb@drawspec@sbs@A{%
+ \tcb@pathbase{tcb fill lower bicolor}{segmentation.south}{interior.north east}%
{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@ins@NE}{\tcb@arc@ins@SE}%
}
-\def\tcb@drawspec@sbs@B#1{%
- \tcb@pathbase{#1,segmentation@style}{segmentation.south}{interior.north east}%
+\def\tcb@drawspec@sbs@b{%
+ \tcb@pathbase{tcb fill interior}{interior.south west}{segmentation.north}%
+ {\tcb@arc@ins@SW}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}%
+}
+
+\def\tcb@drawspec@sbs@B{%
+ \tcb@pathbase{tcb fill lower bicolor}{segmentation.south}{interior.north east}%
{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@ins@SE}%
}
-\def\tcb@drawspec@sbs@C#1{%
- \tcb@pathbase{#1,segmentation@style}{segmentation.south|-frame.south}{interior.north east}%
+\def\tcb@drawspec@sbs@c{%
+ \tcb@pathbase{tcb fill interior}{interior.south west|-frame.south}{segmentation.north}%
+ {\tcb@arc@zpt}{\tcb@arc@ins@NW}{\tcb@arc@zpt}{\tcb@arc@zpt}%
+}
+
+\def\tcb@drawspec@sbs@C{%
+ \tcb@pathbase{tcb fill lower bicolor}{segmentation.south|-frame.south}{interior.north east}%
{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@ins@NE}{\tcb@arc@zpt}%
}
-\def\tcb@drawspec@sbs@D#1{%
- \tcb@pathbase{#1,segmentation@style}{segmentation.south|-frame.south}{interior.north east}%
+\def\tcb@drawspec@sbs@d{%
+ \tcb@pathbase{tcb fill interior}{interior.south west|-frame.south}{segmentation.north}%
+ {\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}%
+}
+
+\def\tcb@drawspec@sbs@D{%
+ \tcb@pathbase{tcb fill lower bicolor}{segmentation.south|-frame.south}{interior.north east}%
{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}%
}
-\def\tcb@drawspec@sbs@E#1{%
- \tcb@pathbase{#1,segmentation@style}{segmentation.south|-frame.south}{interior.east|-frame.north}%
+\def\tcb@drawspec@sbs@e{%
+ \tcb@pathbase{tcb fill interior}{interior.south west|-frame.south}{segmentation.north|-frame.north}%
+ {\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}%
+}
+
+\def\tcb@drawspec@sbs@E{%
+ \tcb@pathbase{tcb fill lower bicolor}{segmentation.south|-frame.south}{interior.east|-frame.north}%
{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}%
}
-\def\tcb@drawspec@sbs@F#1{%
- \tcb@pathbase{#1,segmentation@style}{segmentation.south}{interior.east|-frame.north}%
+\def\tcb@drawspec@sbs@f{%
+ \tcb@pathbase{tcb fill interior}{interior.south west}{segmentation.north|-frame.north}%
+ {\tcb@arc@ins@SW}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}%
+}
+
+\def\tcb@drawspec@sbs@F{%
+ \tcb@pathbase{tcb fill lower bicolor}{segmentation.south}{interior.east|-frame.north}%
{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@zpt}{\tcb@arc@ins@SE}%
}
@@ -377,6 +408,7 @@
([yshift=-\kvtcb@title@rule/2]title.south west)--([yshift=-\kvtcb@title@rule/2]title.south east);
\fi}},%
colbacklower/.colorlet=tcbcolbacklower,%
+ opacitybacklower/.store in=\kvtcb@opacitybacklower,
clear@spec/.code={\tcb@spec{}},%
tikz/.code={\appto\tcb@tikz@option@hook{,#1}},%
tikz reset/.code={\let\tcb@tikz@option@hook\@empty},%
@@ -511,30 +543,45 @@
interior titled code={%
\iftcb@lowerseparated%
\ifcase\tcbsegmentstate%
- {\tcb@spec{fill=tcbcolback}\tcb@drawwithtitle@path}%
+ \iftcb@sidebyside%
+ \tcb@drawspec@sbs@b%
+ \else%
+ \tcb@drawwithtitle@path%
+ \fi
\or%
- \tcb@spec{fill=tcbcolback}\tcb@drawspec@UT%
+ \tcb@drawspec@UT%
\else%
- {\tcbset{interior style={fill=tcbcolbacklower,segmentation@style}}\tcb@drawwithtitle@path}%
+ {\tcbset{interior style={fill=tcbcolbacklower,fill opacity=\kvtcb@opacitybacklower,segmentation@style}}\tcb@drawwithtitle@path}%
\fi%
\else%
- {\tcb@spec{fill=tcbcolback}\tcb@drawwithtitle@path}%
+ \tcb@drawwithtitle@path%
\fi\tcb@spec{}},
interior code={%
\iftcb@lowerseparated%
\ifcase\tcbsegmentstate%
- {\tcb@spec{fill=tcbcolback}\tcb@drawwithouttitle@path}%
+ \iftcb@sidebyside%
+ \tcb@drawspec@sbs@a%
+ \else%
+ \tcb@drawwithouttitle@path%
+ \fi%
\or%
- \tcb@spec{fill=tcbcolback}\tcb@drawspec@UR%
+ \tcb@drawspec@UR%
\else%
- {\tcbset{interior style={fill=tcbcolbacklower,segmentation@style}}\tcb@drawwithouttitle@path}%
+ {\tcbset{interior style={fill=tcbcolbacklower,fill opacity=\kvtcb@opacitybacklower,segmentation@style}}\tcb@drawwithouttitle@path}%
\fi%
\else%
- {\tcb@spec{fill=tcbcolback}\tcb@drawwithouttitle@path}%
+ \tcb@drawwithouttitle@path%
\fi\tcb@spec{}},
- segmentation code={\iftcb@sidebyside%
- \iftcb@hasTitle\tcb@drawspec@sbs@B{fill=tcbcolbacklower}\else%
- \tcb@drawspec@sbs@A{fill=tcbcolbacklower}\fi\else\tcb@drawspec@LR{fill=tcbcolbacklower}\fi\tcb@spec{}},%
+ segmentation code={%
+ \iftcb@sidebyside%
+ \iftcb@hasTitle%
+ \tcb@drawspec@sbs@B%
+ \else%
+ \tcb@drawspec@sbs@A%
+ \fi%
+ \else%
+ \tcb@drawspec@LR{fill=tcbcolbacklower,fill opacity=\kvtcb@opacitybacklower}%
+ \fi\tcb@spec{}},%
skin first=bicolorfirst,skin middle=bicolormiddle,skin last=bicolorlast}
\tcbset{bicolor/.style={skin=bicolor}}
@@ -544,30 +591,45 @@
interior titled code={%
\iftcb@lowerseparated%
\ifcase\tcbsegmentstate%
- {\tcb@spec{fill=tcbcolback}\tcb@drawwithtitle@pathfirst}%
+ \iftcb@sidebyside%
+ \tcb@drawspec@sbs@d%
+ \else%
+ \tcb@drawwithtitle@pathfirst%
+ \fi%
\or%
- \tcb@spec{fill=tcbcolback}\tcb@drawspec@UT%
+ \tcb@drawspec@UT%
\else%
- {\tcbset{interior style={fill=tcbcolbacklower,segmentation@style}}\tcb@drawwithtitle@pathfirst}%
+ {\tcbset{interior style={fill=tcbcolbacklower,fill opacity=\kvtcb@opacitybacklower,segmentation@style}}\tcb@drawwithtitle@pathfirst}%
\fi%
\else%
- {\tcb@spec{fill=tcbcolback}\tcb@drawwithtitle@pathfirst}%
+ \tcb@drawwithtitle@pathfirst%
\fi\tcb@spec{}},
interior code={%
\iftcb@lowerseparated%
\ifcase\tcbsegmentstate%
- {\tcb@spec{fill=tcbcolback}\tcb@drawwithouttitle@pathfirst}%
+ \iftcb@sidebyside%
+ \tcb@drawspec@sbs@c%
+ \else%
+ \tcb@drawwithouttitle@pathfirst%
+ \fi%
\or%
- \tcb@spec{fill=tcbcolback}\tcb@drawspec@UR%
+ \tcb@drawspec@UR%
\else%
- {\tcbset{interior style={fill=tcbcolbacklower,segmentation@style}}\tcb@drawwithouttitle@pathfirst}%
+ {\tcbset{interior style={fill=tcbcolbacklower,fill opacity=\kvtcb@opacitybacklower,segmentation@style}}\tcb@drawwithouttitle@pathfirst}%
\fi%
\else%
- {\tcb@spec{fill=tcbcolback}\tcb@drawwithouttitle@pathfirst}%
+ \tcb@drawwithouttitle@pathfirst%
\fi\tcb@spec{}},
- segmentation code={\iftcb@sidebyside%
- \iftcb@hasTitle\tcb@drawspec@sbs@D{fill=tcbcolbacklower}\else%
- \tcb@drawspec@sbs@C{fill=tcbcolbacklower}\fi\else\tcb@drawspec@LS{fill=tcbcolbacklower}\fi\tcb@spec{}},%
+ segmentation code={%
+ \iftcb@sidebyside%
+ \iftcb@hasTitle%
+ \tcb@drawspec@sbs@D%
+ \else%
+ \tcb@drawspec@sbs@C
+ \fi%
+ \else%
+ \tcb@drawspec@LS{fill=tcbcolbacklower,fill opacity=\kvtcb@opacitybacklower}%
+ \fi\tcb@spec{}},%
skin first=bicolorfirst,skin middle=bicolormiddle,skin last=bicolormiddle}
\tcb@new@skin{bicolormiddle}{base@middle,%
@@ -575,30 +637,45 @@
interior titled code={%
\iftcb@lowerseparated%
\ifcase\tcbsegmentstate%
- {\tcb@spec{fill=tcbcolback}\tcb@drawwithtitle@pathmiddle}%
+ \iftcb@sidebyside%
+ \tcb@drawspec@sbs@d%
+ \else%
+ \tcb@drawwithtitle@pathmiddle%
+ \fi%
\or%
- \tcb@spec{fill=tcbcolback}\tcb@drawspec@UT%
+ \tcb@drawspec@UT%
\else%
- {\tcbset{interior style={fill=tcbcolbacklower,segmentation@style}}\tcb@drawwithtitle@pathmiddle}%
+ {\tcbset{interior style={fill=tcbcolbacklower,fill opacity=\kvtcb@opacitybacklower,segmentation@style}}\tcb@drawwithtitle@pathmiddle}%
\fi%
\else%
- {\tcb@spec{fill=tcbcolback}\tcb@drawwithtitle@pathmiddle}%
+ \tcb@drawwithtitle@pathmiddle%
\fi\tcb@spec{}},%
interior code={%
\iftcb@lowerseparated%
\ifcase\tcbsegmentstate%
- {\tcb@spec{fill=tcbcolback}\tcb@drawwithouttitle@pathmiddle}%
+ \iftcb@sidebyside%
+ \tcb@drawspec@sbs@e%
+ \else%
+ \tcb@drawwithouttitle@pathmiddle%
+ \fi%
\or%
- \tcb@spec{fill=tcbcolback}\tcb@drawspec@US%
+ \tcb@drawspec@US%
\else%
- {\tcbset{interior style={fill=tcbcolbacklower,segmentation@style}}\tcb@drawwithouttitle@pathmiddle}%
+ {\tcbset{interior style={fill=tcbcolbacklower,fill opacity=\kvtcb@opacitybacklower,segmentation@style}}\tcb@drawwithouttitle@pathmiddle}%
\fi%
\else%
- {\tcb@spec{fill=tcbcolback}\tcb@drawwithouttitle@pathmiddle}%
+ \tcb@drawwithouttitle@pathmiddle%
\fi\tcb@spec{}},
- segmentation code={\iftcb@sidebyside%
- \iftcb@hasTitle\tcb@drawspec@sbs@D{fill=tcbcolbacklower}\else%
- \tcb@drawspec@sbs@E{fill=tcbcolbacklower}\fi\else\tcb@drawspec@LS{fill=tcbcolbacklower}\fi\tcb@spec{}},%
+ segmentation code={%
+ \iftcb@sidebyside%
+ \iftcb@hasTitle%
+ \tcb@drawspec@sbs@D%
+ \else%
+ \tcb@drawspec@sbs@E%
+ \fi%
+ \else%
+ \tcb@drawspec@LS{fill=tcbcolbacklower,fill opacity=\kvtcb@opacitybacklower}%
+ \fi\tcb@spec{}},%
skin first=bicolormiddle,skin middle=bicolormiddle,skin last=bicolormiddle}
\tcb@new@skin{bicolorlast}{base@last,%
@@ -606,30 +683,45 @@
interior titled code={%
\iftcb@lowerseparated%
\ifcase\tcbsegmentstate
- {\tcb@spec{fill=tcbcolback}\tcb@drawwithtitle@pathlast}%
+ \iftcb@sidebyside%
+ \tcb@drawspec@sbs@b%
+ \else%
+ \tcb@drawwithtitle@pathlast%
+ \fi%
\or%
- \tcb@spec{fill=tcbcolback}\tcb@drawspec@UT%
+ \tcb@drawspec@UT%
\else%
- {\tcbset{interior style={fill=tcbcolbacklower,segmentation@style}}\tcb@drawwithtitle@pathlast}%
+ {\tcbset{interior style={fill=tcbcolbacklower,fill opacity=\kvtcb@opacitybacklower,segmentation@style}}\tcb@drawwithtitle@pathlast}%
\fi%
\else%
- {\tcb@spec{fill=tcbcolback}\tcb@drawwithtitle@pathlast}%
+ \tcb@drawwithtitle@pathlast%
\fi\tcb@spec{}},
interior code={%
\iftcb@lowerseparated%
\ifcase\tcbsegmentstate%
- {\tcb@spec{fill=tcbcolback}\tcb@drawwithouttitle@pathlast}%
+ \iftcb@sidebyside%
+ \tcb@drawspec@sbs@f%
+ \else%
+ \tcb@drawwithouttitle@pathlast%
+ \fi%
\or%
- \tcb@spec{fill=tcbcolback}\tcb@drawspec@US%
+ \tcb@drawspec@US%
\else
- {\tcbset{interior style={fill=tcbcolbacklower,segmentation@style}}\tcb@drawwithouttitle@pathlast}%
+ {\tcbset{interior style={fill=tcbcolbacklower,fill opacity=\kvtcb@opacitybacklower,segmentation@style}}\tcb@drawwithouttitle@pathlast}%
\fi%
\else%
- {\tcb@spec{fill=tcbcolback}\tcb@drawwithouttitle@pathlast}%
+ \tcb@drawwithouttitle@pathlast%
+ \fi\tcb@spec{}},%
+ segmentation code={%
+ \iftcb@sidebyside%
+ \iftcb@hasTitle%
+ \tcb@drawspec@sbs@B%
+ \else%
+ \tcb@drawspec@sbs@F%
+ \fi%
+ \else%
+ \tcb@drawspec@LR{fill=tcbcolbacklower,fill opacity=\kvtcb@opacitybacklower}%
\fi\tcb@spec{}},%
- segmentation code={\iftcb@sidebyside%
- \iftcb@hasTitle\tcb@drawspec@sbs@B{fill=tcbcolbacklower}\else%
- \tcb@drawspec@sbs@F{fill=tcbcolbacklower}\fi\else\tcb@drawspec@LR{fill=tcbcolbacklower}\fi\tcb@spec{}},%
skin first=bicolormiddle,skin middle=bicolormiddle,skin last=bicolorlast}
\tcb@new@skin{tile}{skin@bicolor,frame engine=empty,%
@@ -1830,17 +1922,17 @@
}
\newcommand{\tcbincludepdf}[2][]{%
- \begingroup%
- \tcb@layer@pushup%
- \tcb@apply@box@options{enhanced,clip upper=true,valign=center,center upper,#1}%
- \appto\kvtcb@graphics@options{,page=\imagepage}%
\tcb@include@graphics@preparefile{#2}%
\tcb@set@pdfpages\pdfpages{\imagepath}%
\foreach \imagepage in \kvtcb@graphics@pages%
{%
+ \begingroup%
+ \tcb@layer@pushup%
+ \tcb@apply@box@options{enhanced,clip upper=true,valign=center,center upper,#1}%
+ \appto\kvtcb@graphics@options{,page=\imagepage}%
\tcb@include@graphics%
+ \endgroup%
}%
- \endgroup%
}
\tcbset{%
@@ -1891,7 +1983,7 @@
\tcbset{%
reset@skins/.style={%
frame style=,interior style=,segmentation style=,@title style=,%
- colbacklower=black!15!white,%
+ colbacklower=black!15!white,opacitybacklower=1.0,%
extend freelance=,extend freelancefirst=,extend freelancemiddle=,extend freelancelast=,%
clear@spec,%
watermark opacity=1.00,watermark color=tcbcolback!85!tcbcolframe,%
diff --git a/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex b/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex
index ca0940971a..5ea2f296ae 100644
--- a/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.42}
+\tcb@set@library@version{4.50}
\tcbuselibrary{skins}
@@ -217,10 +217,31 @@
set@extensions@preframe={\tcb@draw@shadowjigsaw@last},%
skin first=enhancedmiddle jigsaw,skin middle=enhancedmiddle jigsaw,skin last=enhancedlast jigsaw}
+\tcb@new@skin{bicolor jigsaw}{skin@bicolor,%
+ frame engine=pathjigsaw,%
+ set@extensions@preframe={\tcb@draw@shadowjigsaw@unbroken},%
+ skin first=bicolorfirst jigsaw,skin middle=bicolormiddle jigsaw,skin last=bicolorlast jigsaw}
+
+\tcb@new@skin{bicolorfirst jigsaw}{skin@bicolorfirst,%
+ frame engine=pathfirstjigsaw,%
+ set@extensions@preframe={\tcb@draw@shadowjigsaw@first},%
+ skin first=bicolorfirst jigsaw,skin middle=bicolormiddle jigsaw,skin last=bicolormiddle jigsaw}
+
+\tcb@new@skin{bicolormiddle jigsaw}{skin@bicolormiddle,%
+ frame engine=pathmiddlejigsaw,%
+ set@extensions@preframe={\tcb@draw@shadowjigsaw@middle},%
+ skin first=bicolormiddle jigsaw,skin middle=bicolormiddle jigsaw,skin last=bicolormiddle jigsaw}
+
+\tcb@new@skin{bicolorlast jigsaw}{skin@bicolorlast,%
+ frame engine=pathlastjigsaw,%
+ set@extensions@preframe={\tcb@draw@shadowjigsaw@last},%
+ skin first=bicolormiddle jigsaw,skin middle=bicolormiddle jigsaw,skin last=bicolorlast jigsaw}
+
\tcbset{%
enhanced jigsaw/.style={skin=enhanced jigsaw},%
enhanced standard jigsaw/.style={skin=enhanced jigsaw,
skin first=enhanced jigsaw,skin middle=enhanced jigsaw,skin last=enhanced jigsaw},%
+ bicolor jigsaw/.style={skin=bicolor jigsaw},%
frame engine/pathjigsaw/.style={frame code=\tcb@drawframe@pathjigsaw},
frame engine/pathfirstjigsaw/.style={frame code=\tcb@drawframe@pathfirstjigsaw},
frame engine/pathmiddlejigsaw/.style={frame code=\tcb@drawframe@pathmiddlejigsaw},
diff --git a/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex b/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex
index 334f51dea9..fb99f3ef12 100644
--- a/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcbtheorems.code.tex: Code for theorems in colorboxes
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.42}
+\tcb@set@library@version{4.50}
\RequirePackage{amsmath}
@@ -30,6 +30,8 @@
\def\tcb@theo@desc@form@std#1{\tcb@desc@col\kvtcb@desc@font\kvtcb@desc@delim@left#1\kvtcb@desc@delim@right}
+\def\tcb@theo@title@indent@std#1{\hangindent#1\hangafter=1\relax}
+
\def\tcb@theo@title#1#2#3{%
\ifdefempty{#2}{\setbox\z@=\color@hbox#1\color@endbox}{\setbox\z@=\tcb@theo@form{#1}{#2}}%
\def\temp@a{#3}%
@@ -37,8 +39,7 @@
\unhbox\z@\kvtcb@terminatorsign%
\else%
\setbox\z@=\hbox{\unhbox\z@\kvtcb@separatorsign\ }%
- \hangindent\wd\z@%
- \hangafter=1%
+ \tcb@theo@title@indent{\wd\z@}%
\mbox{\unhbox\z@}{\tcb@theo@desc@form{#3}}\kvtcb@terminatorsign%
\fi%
}
@@ -136,6 +137,23 @@
theorem style/margin break/.style={theorem style=margin,attach title to upper={\par}},
theorem label supplement/.style={tcb@theo@label@supp/.style={#1}},
theorem full label supplement/.style={tcb@theo@full@label@supp/.style={#1}},
+ theorem hanging indent/.code={%
+ \ifstrequal{#1}{auto}{%
+ \let\tcb@theo@title@indent\tcb@theo@title@indent@std%
+ }{%
+ \def\tcb@theo@title@indent##1{%
+ \ifdim#1=0pt\relax%
+ \else%
+ \ifdim#1>0pt\relax%
+ \hangindent#1\hangafter=1\relax%
+ \else%
+ \hangindent\dimexpr-#1\relax\hangafter=-1\relax%
+ \fi%
+ \fi
+ }%
+ }%
+ },
+ theorem hanging indent/.default=auto,
}
\newcommand{\new@tcbtheorem}[5][]{%
@@ -165,6 +183,7 @@
highlight math style={colframe=red,colback=yellow!25!white},%
theorem style=standard,label separator=:,%
theorem label supplement=,theorem full label supplement=,%
+ theorem hanging indent%
},
initialize@reset=reset@theorems,
}
diff --git a/macros/latex/contrib/tcolorbox/tcbvignette.code.tex b/macros/latex/contrib/tcolorbox/tcbvignette.code.tex
index cd02d69ff3..ec97bb5363 100644
--- a/macros/latex/contrib/tcolorbox/tcbvignette.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbvignette.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcbvignette.code.tex: Code for ornamental frames
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.42}
+\tcb@set@library@version{4.50}
\tcbuselibrary{skins}
diff --git a/macros/latex/contrib/tcolorbox/tcbxparse.code.tex b/macros/latex/contrib/tcolorbox/tcbxparse.code.tex
index 8fbf7fb8a1..00586c8109 100644
--- a/macros/latex/contrib/tcolorbox/tcbxparse.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbxparse.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcbxparse.code.tex: Code for xparse features
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.42}
+\tcb@set@library@version{4.50}
\RequirePackage{xparse}[2013/12/31]
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf
index 8df5f0fb63..4fc9120250 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf
Binary files differ
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex
index 7561a6fa3d..9bd42004ef 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcolorbox-example-poster.tex: a poster example for tcolorbox
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf
index 8d7e1b9e17..7421a0d17f 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf
Binary files differ
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example.tex b/macros/latex/contrib/tcolorbox/tcolorbox-example.tex
index 0d1cb965bd..94dbb582d0 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-example.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-example.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcolorbox-example.tex: an example for tcolorbox
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf
index 71727a970e..7cf183600b 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf
Binary files differ
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex
index de4c7d17b9..1b49b54687 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex
@@ -1,9 +1,9 @@
% \LaTeX-Main\
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcolorbox-tutorial-poster.tex: a tutorial for poster creation with tcolorbox
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex
index 9720be99f0..344cf30273 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex
@@ -852,6 +852,11 @@ the \emph{break sequence} parts are displayed.
\tcbbreakskininto{bicolormiddle}{bicolormiddle}{bicolormiddle}{bicolormiddle}{bicolor}
\tcbbreakskininto{bicolorlast}{bicolormiddle}{bicolormiddle}{bicolorlast}{bicolor}
\clearpage
+\tcbbreakskininto{bicolor jigsaw}{bicolorfirst jigsaw}{bicolormiddle jigsaw}{bicolorlast jigsaw}{bicolor jigsaw}
+\tcbbreakskininto{bicolorfirst jigsaw}{bicolorfirst jigsaw}{bicolormiddle jigsaw}{bicolormiddle jigsaw}{bicolor jigsaw}
+\tcbbreakskininto{bicolormiddle jigsaw}{bicolormiddle jigsaw}{bicolormiddle jigsaw}{bicolormiddle jigsaw}{bicolor jigsaw}
+\tcbbreakskininto{bicolorlast jigsaw}{bicolormiddle jigsaw}{bicolormiddle jigsaw}{bicolorlast jigsaw}{bicolor jigsaw}
+\clearpage
\tcbbreakskininto{tile}{tilefirst}{tilemiddle}{tilelast}{tile,colbacktitle=Navy}
\tcbbreakskininto{tilefirst}{tilefirst}{tilemiddle}{tilemiddle}{tile,colbacktitle=Navy}
\tcbbreakskininto{tilemiddle}{tilemiddle}{tilemiddle}{tilemiddle}{tile,colbacktitle=Navy}
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.coremacros.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.coremacros.tex
index 795c0bae49..c396417530 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.coremacros.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.coremacros.tex
@@ -173,7 +173,7 @@ This is my own box.
\begin{dispExample*}{sbs,lefthand ratio=0.6}
\newtcolorbox{mybox}[1]{colback=red!5!white,
colframe=red!75!black,fonttitle=\bfseries,
- title=#1}
+ title={#1}}
\begin{mybox}{Hello there}
This is my own box with a mandatory title.
@@ -185,7 +185,7 @@ This is my own box with a mandatory title.
colframe=red!75!black,fonttitle=\bfseries,
colbacktitle=red!85!black,enhanced,
attach boxed title to top center={yshift=-2mm},
- title=#2,#1}
+ title={#2},#1}
\begin{mybox}[colback=yellow]{Hello there}
This is my own box with a mandatory title
@@ -229,7 +229,7 @@ numbered title and options.
\begin{dispExample*}{sbs,lefthand ratio=0.6}
\newtcbox{\mybox}[1]{colback=red!5!white,
colframe=red!75!black,fonttitle=\bfseries,
- title=#1}
+ title={#1}}
\mybox{Hello there}{This is my own box.}
\end{dispExample*}
@@ -237,7 +237,7 @@ numbered title and options.
\begin{dispExample*}{sbs,lefthand ratio=0.6}
\newtcbox{\mybox}[2][]{colback=red!5!white,
colframe=red!75!black,fonttitle=\bfseries,
- title=#2,#1}
+ title={#2},#1}
\mybox[colback=yellow]{Hello there}%
{This is my own box.}
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex
index d885f48279..7fe459fc94 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex
@@ -409,7 +409,7 @@ This is the lower part.
\tcolorbox[savedelimiter=mybox,
savelowerto=\jobname_bspsave2.tex,lowerbox=ignored,
colback=red!5!white,colframe=red!75!black,fonttitle=\bfseries,
- title=#1]}%
+ title={#1}]}%
{\endtcolorbox}
\begin{mybox}{My Example}
@@ -432,7 +432,7 @@ allows a more convenient usage:
\newtcolorbox{mybox}[1]{%
savelowerto=\jobname_bspsave2.tex,lowerbox=ignored,
colback=red!5!white,colframe=red!75!black,fonttitle=\bfseries,
- title=#1}%
+ title={#1}}%
\begin{mybox}{My Example}
Upper part.
@@ -469,6 +469,7 @@ This is a \textbf{tcolorbox}.
\end{exdispExample*}
\end{docTcbKey}
+Also see \refKey{/tcb/colbacklower} of the \mylib{skins} library.
\begin{docTcbKey}{title filled}{\colOpt{=true\textbar false}}{default |true|, initially |false|}
Switches the drawing of the title background according to the given value.
@@ -1537,7 +1538,9 @@ skin variants, see \Vref{subsec:skinjigsaw}.
\begin{docTcbKey}{opacityframe}{=\meta{fraction}}{no default, initially \texttt{1.0}}
Sets the frame opacity of the box to the given \meta{fraction}.
-\begin{exdispExample*}{opacityframe}{sbs,lefthand ratio=0.6,segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
+\begin{exdispExample*}{opacityframe}{sbs,lefthand ratio=0.6,
+ segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}
+ }
\begin{tcolorbox}[opacityframe=0.25,
colframe=red]
This is a \textbf{tcolorbox}.
@@ -1555,6 +1558,7 @@ This is a \textbf{tcolorbox}.
\end{exdispExample*}
\end{docTcbKey}
+Also see \refKey{/tcb/opacitybacklower} of the \mylib{skins} library.
\begin{docTcbKey}{opacitybacktitle}{=\meta{fraction}}{no default, initially \texttt{1.0}}
Sets the title background opacity of the box to the given \meta{fraction}.
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.fitting.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.fitting.tex
index 607ef00769..7b3147217b 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.fitting.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.fitting.tex
@@ -497,7 +497,7 @@ are adapted. In the following, adapting the font size means adapting
bottom=1mm,right=1mm,boxsep=0mm,width=3.5cm,height=7cm,nobeforeafter,
before upper=\textcolor{blue}{\rule{5mm}{5mm}}\ ,
enhanced,watermark text={\tcbfitsteps},
- fonttitle=\bfseries,adjusted title=#1,fit algorithm=#1}
+ fonttitle=\bfseries,adjusted title={#1},fit algorithm=#1}
\mybox{fontsize}{\lipsum[2]}\hfill
\mybox{hybrid}{\lipsum[2]}\hfill
@@ -513,7 +513,7 @@ Quality \dotfill versus \dotfill Speed
\newtcboxfit{mybox}[2]{colback=red!5!white,colframe=red!75!black,left=1mm,top=1mm,
size=tight,width=7.2cm,height=5cm,nobeforeafter,
before upper=\textcolor{blue}{\rule{5mm}{5mm}}\ ,
- enhanced,fonttitle=\bfseries,adjusted title=#2,fit algorithm=#1}
+ enhanced,fonttitle=\bfseries,adjusted title={#2},fit algorithm=#1}
\mybox{hybrid}{hybrid (possible gap at end)}{\lipsum[1]}\hfill
\mybox{hybrid*}{hybrid* (no gap but possibly squeezed)}{\lipsum[1]}
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.hooks.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.hooks.tex
index f3fab2221b..da47d26378 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.hooks.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.hooks.tex
@@ -187,7 +187,7 @@ from page \pageref{subsec:overlays}.
\begin{scope}[shift={([xshift=\x]frame.north west)}]
\path[draw=green!65!black,fill=green!10,line width=1mm] (0,0) arc (0:180:5mm);
\path[fill=black] (-0.2,0) arc (0:180:1mm);
- \end{scope}}}]}}
+ \end{scope}}}}}
\tcbset{ribbon/.style={overlay app={%
\path[fill=blue!75!white,draw=blue,double=white!85!blue,
preaction={opacity=0.6,fill=blue!75!white},
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex
index ef1ebcf055..48af585551 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex
@@ -20,6 +20,9 @@ Particularly, they can be used for
Typically, these options may generate counters and alike.
It is \textbf{strongly} recommended that you use initialization options inside
the preamble only. Otherwise, you may get trouble when using \LaTeX's |\include| features.
+Also, it is recommended to generate new environments and commands with these
+options \emph{after} |hyperref| is loaded to avoid warnings about
+\emph{duplicate identifiers}.
\end{marker}
@@ -337,16 +340,43 @@ be redefined or a new \meta{type} can be assigned.
\end{newTcbKey}
-\begin{docCommand}{tcblistof}{\oarg{macro}\marg{name}\marg{title text}}
+\clearpage
+\begin{docCommand}[doc updated=2021-05-20]{tcblistof}{\oarg{macro}\marg{name}\oarg{short}\marg{title text}}
Displays the generated list of |tcolorbox|es with the given \meta{name}.
-The heading is generated by \meta{macro}\marg{title text} where \texttt{\textbackslash section}
-is the default setting for \meta{macro}.\par
+The heading is generated by \meta{macro}\oarg{short}\marg{title text} where \texttt{\textbackslash section}
+is the default setting for \meta{macro}.
+Here, as usual, \meta{title text} is the title of the section or chapter
+while \meta{short} is a shorter title for headings and table of contents.
+\begin{itemize}
+\item If \meta{macro} ends with a |*|, \refCom{tcblistof} mimics the behavior of
+ |\listoffigures| from the standard \LaTeX\ classes and adds the title
+ to the left and right mark for headings.
+\item If \meta{macro} starts with |\chapter|, a possible two column document setting
+ is restored to one column (as standard \LaTeX\ classes do for |\listoffigures|).
+\end{itemize}
+
+\medskip
To display the list inside a subsection, use for example:
\begin{dispListing}
\tcblistof[\subsection]{exam}{List of Exercises}
\end{dispListing}
The result of the example is found as Subsection \ref{listofexercises} on
page \pageref{listofexercises}.
+
+\medskip
+To apply the list similar to |\listoffigures| for a report or book, use for example:
+\begin{dispListing}
+\tcblistof[\chapter*]{exam}{List of Exercises}
+\end{dispListing}
+
+\medskip
+To set a short title for headings with the default |\section| setting, use for example:
+\begin{dispListing}
+\tcblistof{exam}[List of Exercises]{Elaborate List of Fine Exercises
+ for all Students of my Course}
+\end{dispListing}
+
+\medskip
\begin{marker}
The core of the list is generated by |\@starttoc|\marg{name} which
can be wrapped into an own macro.
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.listings.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.listings.tex
index 8f99797bc2..d6b884dc19 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.listings.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.listings.tex
@@ -234,7 +234,7 @@ This is my \LaTeX\ box.
colback=red!5!white,
colframe=red!75!black,
fonttitle=\bfseries,
- title=#1}
+ title={#1}}
\begin{mybox}{Listing Box}
This is my \LaTeX\ box.
@@ -246,7 +246,7 @@ This is my \LaTeX\ box.
colback=red!5!white,
colframe=red!75!black,
fonttitle=\bfseries,
- title=#2,#1}
+ title={#2},#1}
\begin{mybox}[listing only]
{Listing Box}
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.raster.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.raster.tex
index 3a9c7524aa..a2eb8ac395 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.raster.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.raster.tex
@@ -108,8 +108,13 @@ parameters and to set the properties for the enclosed boxes.
\item The boxes inside a raster are numbered automatically.
\docAuxCommand{thetcbrasternum} may be used inside a box to access
this number.
+ The \LaTeX\ counter \docCounter{tcbrastercolumn} holds the current column,
+ the counter \docCounter{tcbrasterrow} holds the current row,
+ and the counter \docCounter{tcbrasternum} holds the current box number.
\end{itemize}
+\enlargethispage*{1cm}
+
\begin{dispExample}
\begin{tcbraster}[raster columns=3, raster equal height,
size=small,colframe=red!50!black,colback=red!10!white,colbacktitle=red!50!white,
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty b/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty
index e9379a6fdd..63944de20a 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty
@@ -227,6 +227,8 @@
posterbox,tcbposterwidth,tcbposterheight,tcbpostercolspacing,
tcbposterrowspacing,tcbpostercolumns,tcbposterrows,tcbpostercolwidth,
tcbposterrowheight,tcbposterset,
+ % extras
+ skinExampleSet,
},
texcsstyle=*\color{Definition}\bfseries,
classoffset=0% restore default
@@ -247,7 +249,7 @@
before skip balanced=4pt plus 2pt minus 1pt,
after skip balanced=5pt plus 2pt minus 1pt
},
- base example/.style={bicolor,
+ base example/.style={bicolor jigsaw,
beforeafter example,arc is angular,fonttitle=\bfseries,
fontlower=\footnotesize,
colframe=Blue_Dark,
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.skincatalog.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.skincatalog.tex
new file mode 100644
index 0000000000..5e039aee63
--- /dev/null
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.skincatalog.tex
@@ -0,0 +1,1636 @@
+% !TeX root = tcolorbox.tex
+% include file of tcolorbox.tex (manual of the LaTeX package tcolorbox)
+\clearpage
+\section{Library \mylib{skins} - Catalog of Skins}\label{sec:skincatalog}%
+\tcbset{external/prefix=external/skincatalog_}%
+The \mylib{skins} library provides a catalog of skins to choose from which
+is documented in the following. The \mylib{skins} library has to be loaded
+by a package option or inside the preamble by:
+\begin{dispListing}
+\tcbuselibrary{skins}
+\end{dispListing}
+
+See \Vref{sec:skins} for the documentation of all other options of the \mylib{skins} library.
+
+\begin{itemize}
+\item In principle, a skin is applied by choosing a value for
+ \refKey{/tcb/skin}, e.g. \docValue*{enhanced}.
+ Since the parts of a breakable box should look different,
+ there are individual skins for breakable boxes, also see \Vref{subsec:breaksequence}.
+ Skins for breakable boxes derived from a base skin are called a skin family
+ in the following.
+\item Instead of setting values for \refKey{/tcb/skin}, equally named options
+ can be used which are shortcuts and which sometimes also change some
+ geometry or style settings. These are the intended options for normal users.
+ Typically, one of the following options is sufficient to select a skin:
+ \begin{itemize}
+ \item \refKey{/tcb/standard}
+ \item \refKey{/tcb/standard jigsaw}
+ \item \refKey{/tcb/enhanced}
+ \item \refKey{/tcb/enhanced jigsaw}
+ \item \refKey{/tcb/enhanced standard}
+ \item \refKey{/tcb/enhanced standard jigsaw}
+ \item \refKey{/tcb/bicolor}
+ \item \refKey{/tcb/tile}
+ \item \refKey{/tcb/beamer}
+ \item \refKey{/tcb/widget}
+ \item \refKey{/tcb/empty}
+ \item \refKey{/tcb/spartan}
+ \item \refKey{/tcb/draft}
+ \end{itemize}
+ Additionally, there are some special applications:
+ \begin{itemize}
+ \item \refKey{/tcb/marker}
+ \item \refKey{/tcb/blank}
+ \item \refKey{/tcb/blanker}
+ \item \refKey{/tcb/blankest}
+ \end{itemize}
+\end{itemize}
+
+
+
+\clearpage
+
+The auxiliary macro \docAuxCommand{skinExampleSet} is used for the
+following examples to display skin applications. Note that
+\docAuxCommand{skinExampleSet} is not part of the package, but is
+defined just for this documentation.
+
+\begin{dispListing}
+\NewDocumentCommand{\skinExampleSet}{m}{%
+ \begin{tcbraster}[raster equal height,raster columns=3,
+ colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
+ #1,
+ left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm,
+ sidebyside gap=4mm]
+ \begin{tcolorbox}
+ This is my content.
+ \end{tcolorbox}
+ \begin{tcolorbox}
+ This is my content.
+ \tcblower
+ More content.
+ \end{tcolorbox}
+ \begin{tcolorbox}[sidebyside]
+ My content.
+ \tcblower
+ More content.
+ \end{tcolorbox}
+ \begin{tcolorbox}[adjusted title=My title]
+ This is my content.
+ \end{tcolorbox}
+ \begin{tcolorbox}[adjusted title=My title]
+ This is my content.
+ \tcblower
+ More content.
+ \end{tcolorbox}
+ \begin{tcolorbox}[adjusted title=My title,sidebyside]
+ My content.
+ \tcblower
+ More content.
+ \end{tcolorbox}
+ \end{tcbraster}
+}
+\end{dispListing}
+\tcbusetemp
+
+
+\clearpage
+\tcbset{skintable/.style={colframe=red!50!yellow!50!black,
+ colback=red!50!yellow!5!white,coltitle=red!50!yellow!3!white,
+ fonttitle=\bfseries,before=\par\smallskip,
+ title=Environment and engines for the skin \enquote{\texttt{#1}}}}
+
+\subsection{Skin Family \enquote{standard}}\label{subsec:skinstandard}
+\begin{marker}Note that the option keys \refKey{/tcb/frame style},
+ \refKey{/tcb/interior style},
+ \refKey{/tcb/segmentation style}, and
+ \refKey{/tcb/title style} are not be applicable to the standard skin.
+ Also, watermarks (see Subsection \ref{subsec:watermarks})
+ are not usable with the standard skin.
+\end{marker}
+
+\begin{docSkin}{standard}
+ This is the standard skin from the core package. All drawing engines
+ are set to type |standard|. The drawing is based on |pgf| commands and
+ does not need the |tikz| package.
+\begin{tcolorbox}[skintable=standard]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |pgfpicture|\\
+ \refKey{/tcb/frame engine}: \> |standard|\\
+ \refKey{/tcb/interior titled engine}: \> |standard|\\
+ \refKey{/tcb/interior engine}: \> |standard|\\
+ \refKey{/tcb/segmentation engine}: \> |standard|\\
+ \refKey{/tcb/title engine}: \> |standard|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+\begin{docTcbKey}{standard}{}{style, no value}
+ This is an abbreviation for setting |skin=standard|.
+\end{docTcbKey}
+
+\begin{dispExample}
+\skinExampleSet{standard}
+\end{dispExample}
+
+\clearpage
+
+\begin{docSkin}{standard jigsaw}
+ This is the standard jigsaw skin from the core package. It differs from
+ the skin \refSkin{standard} by its frame engine, see \Vref{subsec:skinjigsaw}.
+\begin{tcolorbox}[skintable=standard jigsaw]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |pgfpicture|\\
+ \refKey{/tcb/frame engine}: \> |standardjigsaw|\\
+ \refKey{/tcb/interior titled engine}: \> |standard|\\
+ \refKey{/tcb/interior engine}: \> |standard|\\
+ \refKey{/tcb/segmentation engine}: \> |standard|\\
+ \refKey{/tcb/title engine}: \> |standard|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+\begin{docTcbKey}{standard jigsaw}{}{style, no value}
+ This is an abbreviation for setting |skin=standard jigsaw|.
+\end{docTcbKey}
+
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
+\skinExampleSet{standard jigsaw,
+ opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
+}
+\end{dispExample*}
+
+
+\clearpage
+\subsection{Skin Family \enquote{enhanced}}
+\begin{marker}
+If you like the standard appearance of a |tcolorbox| but you want to
+have some \enquote{enhanced} features, the |enhanced| skin is what you are looking for.
+\end{marker}
+
+\begin{docSkin}{enhanced}
+ This skin translates the drawing commands of the core package into |tikz|
+ path commands. Therefore, it allows all |tikz| high level options for
+ these paths and has more flexibility compared to the \refSkin{standard} skin.
+ You pay for this with some prolonged compilation time.
+ The |tikz| path options can
+ be given with the option keys
+ \refKey{/tcb/frame style},
+ \refKey{/tcb/interior style},
+ \refKey{/tcb/segmentation style}, and
+ \refKey{/tcb/title style}.
+\begin{tcolorbox}[skintable=enhanced]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |path|\\
+ \refKey{/tcb/interior titled engine}: \> |path|\\
+ \refKey{/tcb/interior engine}: \> |path|\\
+ \refKey{/tcb/segmentation engine}: \> |path|\\
+ \refKey{/tcb/title engine}: \> |path|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{docTcbKey}{enhanced}{}{style, no value}
+ This is an abbreviation for setting |skin=enhanced|.
+\end{docTcbKey}
+
+\begin{dispExample}
+\skinExampleSet{enhanced}
+\end{dispExample}
+
+\clearpage
+
+\begin{dispExample}
+% \usetikzlibrary{shadings} % preamble
+\tcbset{skin=enhanced,fonttitle=\bfseries,
+ frame style={upper left=blue,upper right=red,lower left=yellow,lower right=green},
+ interior style={white,opacity=0.5},
+ segmentation style={black,solid,opacity=0.2,line width=1pt}}
+
+\begin{tcolorbox}[title=Nice box in rainbow colors]
+ With the \enquote{enhanced} skin, it is quite easy to produce fancy looking effects.
+ \tcblower
+ Note that this is still a \texttt{tcolorbox}.
+\end{tcolorbox}
+\end{dispExample}
+
+
+\begin{dispExample}
+% \usetikzlibrary{decorations.pathmorphing} % preamble
+\tcbset{skin=enhanced,fonttitle=\bfseries,boxrule=1mm,
+ frame style={draw=FireBrick,fill=Salmon},drop fuzzy shadow,
+ interior style={draw=FireBrick,top color=Salmon!10,bottom color=Salmon!20},
+ segmentation style={draw=FireBrick,solid,decorate,
+ decoration={coil,aspect=0,segment length=10.1mm}}}
+
+\begin{tcblisting}{title=A listing box with shadow and some specials}
+Of course, skins can be used for listings also.
+\begin{equation}
+ \int\limits_1^2 \frac{1}{x}~dx = \ln(2).
+\end{equation}
+\end{tcblisting}
+\end{dispExample}
+
+
+\clearpage
+
+
+\begin{docTcbKey}{enhanced standard}{}{style, no value}
+ For unbreakable boxes, this is identical to using \refKey{/tcb/enhanced}.
+ But, for breakable boxes, the \emph{break sequence} is identical to the \refSkin{standard} skin,
+ see Section \ref{subsec:breaksequence} from page \pageref{subsec:breaksequence}.
+\end{docTcbKey}
+
+
+\begin{docTcbKey}{blank}{}{style, initially unset}
+ This style relies on the skin \refSkin{enhanced}. All drawing operations
+ are hidden and all margins are set to |0pt|. See \refKey{/tcb/blanker}
+ for switching off the drawing engines.
+\begin{dispExample}
+\begin{tcolorbox}[blank,watermark text=A blank box]
+\lipsum[1]
+\end{tcolorbox}
+\end{dispExample}
+\end{docTcbKey}
+
+\clearpage
+\begin{docCommand}{tcbline}{}
+ Sometimes, a line is only a line. With \refCom{tcblower} you separate
+ the box content into two functional units. |\tcbline| draws only a line
+ which looks like the segmentation line between upper and lower part.
+ Furthermore, you can use |\tcbline| more than just once.
+ |\tcbline| always uses the |path| drawing engine. Therefore,
+ the \refKey{/tcb/segmentation style} can be applied.
+
+\begin{dispExample}
+\tcbset{enhanced,colframe=blue!50!black,colback=white}
+
+\begin{tcolorbox}[colupper=red!50!black,collower=green!50!black]
+\lipsum[1]
+\tcbline
+\lipsum[2]
+\tcblower
+\lipsum[3]
+\tcbline
+\lipsum[4]
+\end{tcolorbox}
+\end{dispExample}
+\end{docCommand}
+
+\begin{docCommand}{tcbline*}{}
+ Equivalent to \refCom{tcbline}, but in a breakable box, \refCom{tcbline*}
+ is removed if at a page/box break. Also, it is removed at the end
+ of a box.
+\end{docCommand}
+
+\clearpage
+\begin{docSkin}{enhancedfirst}
+This is a flavor of \refSkin{enhanced} which is used as a \emph{first} part
+in a break sequence for \refSkin{enhanced}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=enhancedfirst]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathfirst|\\
+ \refKey{/tcb/interior titled engine}: \> |pathfirst|\\
+ \refKey{/tcb/interior engine}: \> |pathfirst|\\
+ \refKey{/tcb/segmentation engine}: \> |path|\\
+ \refKey{/tcb/title engine}: \> |pathfirst|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{dispExample}
+\skinExampleSet{skin=enhancedfirst}
+\end{dispExample}
+
+\medskip
+
+%\clearpage
+\begin{docSkin}{enhancedmiddle}
+This is a flavor of \refSkin{enhanced} which is used as a \emph{middle} part
+in a break sequence for \refSkin{enhanced}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=enhancedmiddle]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathmiddle|\\
+ \refKey{/tcb/interior titled engine}: \> |pathmiddle|\\
+ \refKey{/tcb/interior engine}: \> |pathmiddle|\\
+ \refKey{/tcb/segmentation engine}: \> |path|\\
+ \refKey{/tcb/title engine}: \> |pathmiddle|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{dispExample}
+\skinExampleSet{skin=enhancedmiddle}
+\end{dispExample}
+
+
+\clearpage
+\begin{docSkin}{enhancedlast}
+This is a flavor of \refSkin{enhanced} which is used as a \emph{last} part
+in a break sequence for \refSkin{enhanced}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=enhancedlast]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathlast|\\
+ \refKey{/tcb/interior titled engine}: \> |pathlast|\\
+ \refKey{/tcb/interior engine}: \> |pathlast|\\
+ \refKey{/tcb/segmentation engine}: \> |path|\\
+ \refKey{/tcb/title engine}: \> |pathlast|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+\begin{dispExample}
+\skinExampleSet{skin=enhancedlast}
+\end{dispExample}
+
+\clearpage
+
+\begin{docSkin}{enhanced jigsaw}
+ This is the jigsaw variant of skin \refSkin{enhanced}.
+ It differs by its frame engine, see \Vref{subsec:skinjigsaw}.
+\begin{tcolorbox}[skintable=enhanced jigsaw]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathjigsaw|\\
+ \refKey{/tcb/interior titled engine}: \> |path|\\
+ \refKey{/tcb/interior engine}: \> |path|\\
+ \refKey{/tcb/segmentation engine}: \> |path|\\
+ \refKey{/tcb/title engine}: \> |path|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+\begin{docTcbKey}{enhanced jigsaw}{}{style, no value}
+ This is an abbreviation for setting |skin=enhanced jigsaw|.
+\end{docTcbKey}
+
+
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
+\skinExampleSet{enhanced jigsaw,
+ opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
+}
+\end{dispExample*}
+
+
+\begin{docTcbKey}[][doc new=2017-07-01]{enhanced standard jigsaw}{}{style, no value}
+ For unbreakable boxes, this is identical to using \refKey{/tcb/enhanced jigsaw}.
+ But, for breakable boxes, the \emph{break sequence} is identical to the \refSkin{standard jigsaw} skin,
+ see Section \ref{subsec:breaksequence} from page \pageref{subsec:breaksequence}.
+\end{docTcbKey}
+
+
+\clearpage
+\begin{docSkin}{enhancedfirst jigsaw}
+ This is the jigsaw variant of skin \refSkin{enhancedfirst}.
+ It differs by its frame engine, see \Vref{subsec:skinjigsaw}.
+\begin{tcolorbox}[skintable=enhancedfirst jigsaw]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathfirstjigsaw|\\
+ \refKey{/tcb/interior titled engine}: \> |pathfirst|\\
+ \refKey{/tcb/interior engine}: \> |pathfirst|\\
+ \refKey{/tcb/segmentation engine}: \> |path|\\
+ \refKey{/tcb/title engine}: \> |pathfirst|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
+\skinExampleSet{skin=enhancedfirst jigsaw,
+ opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
+}
+\end{dispExample*}
+
+
+\clearpage
+\begin{docSkin}{enhancedmiddle jigsaw}
+ This is the jigsaw variant of skin \refSkin{enhancedmiddle}.
+ It differs by its frame engine, see \Vref{subsec:skinjigsaw}.
+\begin{tcolorbox}[skintable=enhancedmiddle jigsaw]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathmiddlejigsaw|\\
+ \refKey{/tcb/interior titled engine}: \> |pathmiddle|\\
+ \refKey{/tcb/interior engine}: \> |pathmiddle|\\
+ \refKey{/tcb/segmentation engine}: \> |path|\\
+ \refKey{/tcb/title engine}: \> |pathmiddle|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
+\skinExampleSet{skin=enhancedmiddle jigsaw,
+ opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
+}
+\end{dispExample*}
+
+
+\begin{docTcbKey}{marker}{}{style, no value}
+ This styles relies on the skin \refSkin{enhancedmiddle jigsaw}. It is
+ intended to be used as an optical marker like a highlighter pen.
+\begin{dispExample}
+\begin{tcolorbox}[marker]
+\lipsum[2]
+\end{tcolorbox}
+\end{dispExample}
+\end{docTcbKey}
+
+\clearpage
+
+\begin{dispListing*}{before upper={This examples demonstrates the creation of several
+ \emph{text marker} environments based on \refSkin{enhancedmiddle}.\par\medskip}}
+\tcbset{textmarker/.style={%
+ skin=enhancedmiddle jigsaw,breakable,parbox=false,
+ boxrule=0mm,leftrule=5mm,rightrule=5mm,boxsep=0mm,arc=0mm,outer arc=0mm,
+ left=3mm,right=3mm,top=1mm,bottom=1mm,toptitle=1mm,bottomtitle=1mm,oversize}}
+
+\newtcolorbox{yellow}{textmarker,colback=yellow!5!white,colframe=yellow}
+\newtcolorbox{orange}{textmarker,colback=DarkOrange!5!white,
+ colframe=DarkOrange!75!yellow}
+\newtcolorbox{red}{textmarker,colback=red!5!white,colframe=red}
+\newtcolorbox{blue}{textmarker,colback=DeepSkyBlue!5!white,colframe=DeepSkyBlue}
+\newtcolorbox{green}{textmarker,colback=Chartreuse!5!white,colframe=Chartreuse}
+\newtcolorbox{rainbow}{textmarker,interior hidden,
+ frame style={top color=blue,bottom color=red,middle color=green}}
+
+\begin{yellow}
+ \lipsum[1-3]
+\end{yellow}
+
+\begin{orange}
+ \lipsum[4]
+\end{orange}
+
+\begin{red}
+ \lipsum[5]
+\end{red}
+
+\begin{green}
+ \lipsum[6]
+\end{green}
+
+\begin{blue}
+ \lipsum[7]
+\end{blue}
+
+\begin{rainbow}
+ \lipsum[8]
+\end{rainbow}
+\end{dispListing*}
+{\tcbusetemp}
+
+
+\clearpage
+\begin{docSkin}{enhancedlast jigsaw}
+ This is the jigsaw variant of skin \refSkin{enhancedlast}.
+ It differs by its frame engine, see \Vref{subsec:skinjigsaw}.
+\begin{tcolorbox}[skintable=enhancedlast]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathlastjigsaw|\\
+ \refKey{/tcb/interior titled engine}: \> |pathlast|\\
+ \refKey{/tcb/interior engine}: \> |pathlast|\\
+ \refKey{/tcb/segmentation engine}: \> |path|\\
+ \refKey{/tcb/title engine}: \> |pathlast|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
+\skinExampleSet{skin=enhancedlast jigsaw,
+ opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
+}
+\end{dispExample*}
+
+
+
+\clearpage
+\subsection{Skin Family \enquote{bicolor}}
+\begin{docSkin}{bicolor}
+ This skin is quite similar to the \refSkin{standard} and \refSkin{enhanced} skin.
+ But instead of a segmentation line, the optional lower part of the box is filled with a
+ different color or drawn with a different style.
+\begin{tcolorbox}[skintable=bicolor]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |path|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |path|
+ \end{tabbing}
+\end{tcolorbox}
+ \begin{itemize}
+ \item The most basic usage of this skin is to set the background color of
+ the lower part by \refKey{/tcb/colbacklower} and all other options like for
+ the \refSkin{standard} skin.
+\begin{dispExample}
+\begin{tcolorbox}[skin=bicolor,title=The title,
+ colframe=FireBrick!75!black,colback=Salmon!50!white,colbacklower=Salmon]
+ The upper part.
+ \tcblower
+ The lower part.
+\end{tcolorbox}
+\end{dispExample}
+ \item The more advanced usage of this skin is to apply the \refKey{/tcb/frame style}
+ and the \refKey{/tcb/interior style} like for
+ the \refSkin{enhanced} skin. Also, the \refKey{/tcb/segmentation style} can be
+ used, but it is applied to the whole lower part.
+\begin{dispExample}
+\begin{tcolorbox}[skin=bicolor,title=The title,
+ frame style={top color=FireBrick,
+ bottom color=FireBrick!15!white,draw=black},
+ interior style={left color=Salmon,right color=Salmon!50!white},
+ segmentation style={right color=Salmon,left color=Salmon!50!white}]
+ The upper part.
+ \tcblower
+ The lower part.
+\end{tcolorbox}
+\end{dispExample}
+ \end{itemize}
+\end{docSkin}
+
+\clearpage
+
+\begin{docTcbKey}{bicolor}{}{style, no value}
+ This is an abbreviation for setting |skin=bicolor|.
+\end{docTcbKey}
+
+
+\begin{dispExample}
+\skinExampleSet{bicolor,
+ colbacklower=LimeGreen!75!LightGreen,
+}
+\end{dispExample}
+
+\clearpage
+
+
+\begin{marker}
+ The following options \refKey{/tcb/colbacklower} and \refKey{/tcb/opacitybacklower}
+ are executed before \refKey{/tcb/segmentation style}, i.e.
+ \refKey{/tcb/segmentation style} overrules them.
+\end{marker}
+
+\begin{docTcbKey}{colbacklower}{=\meta{color}}{no default, initially \texttt{black!15!white}}
+ Sets the background \meta{color} of the lower part. It depends on the skin,
+ if this value is used.
+\end{docTcbKey}
+
+\begin{dispExample}
+\tcbset{gitexample/.style={listing and comment,comment={#1},
+ skin=bicolor,boxrule=1mm,fonttitle=\bfseries,coltitle=black,
+ frame style={draw=black,left color=Gold,right color=Goldenrod!50!Gold},
+ colback=black,colbacklower=Goldenrod!75!Gold,
+ colupper=white,collower=black,
+ listing options={language={bash},aboveskip=0pt,belowskip=0pt,nolol,
+ basicstyle=\ttfamily\bfseries,extendedchars=true}}}
+
+\begin{tcblisting}{title={Snapshot of the staging area},
+ gitexample={The option `-a' automatically stages all tracked and modified
+ files before the commit.\par
+ This can be combined with the message option `-m'
+ as seen in the third line.}}
+git commit
+git commit -a
+git commit -am 'changes to my example'
+\end{tcblisting}
+\end{dispExample}
+
+\smallskip
+
+\begin{docTcbKey}[][doc new=2021-05-21]{opacitybacklower}{=\meta{fraction}}{no default, initially \texttt{1.0}}
+ Sets the background opacity of the lower part to the given \meta{fraction}.
+ It depends on the skin, if this value is used.
+\end{docTcbKey}
+
+\begin{dispExample}
+\begin{tcolorbox}[bicolor,
+ frame style={preaction={fill=blue!50!black},
+ pattern=checkerboard,pattern color=blue!50!gray},
+ fonttitle=\bfseries,
+ colback=blue!10, colbacklower=white, opacitybacklower=0.65,
+ title={Example for a semilucent lower part}]
+This is the upper part.
+\tcblower
+And that is the lower part.
+\end{tcolorbox}
+\end{dispExample}
+
+\clearpage
+
+\begin{docSkin}{bicolorfirst}
+This is a flavor of \refSkin{bicolor} which is used as a \emph{first} part
+in a break sequence for \refSkin{bicolor}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=bicolorfirst]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathfirst|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |pathfirst|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+\begin{dispExample}
+\skinExampleSet{skin=bicolorfirst,
+ colbacklower=LimeGreen!75!LightGreen,
+}
+\end{dispExample}
+
+
+\clearpage
+
+\begin{docSkin}{bicolormiddle}
+This is a flavor of \refSkin{bicolor} which is used as a \emph{middle} part
+in a break sequence for \refSkin{bicolor}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=bicolormiddle]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathmiddle|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |pathmiddle|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{dispExample}
+\skinExampleSet{skin=bicolormiddle,
+ colbacklower=LimeGreen!75!LightGreen,
+}
+\end{dispExample}
+
+
+\clearpage
+\begin{docSkin}{bicolorlast}
+This is a flavor of \refSkin{bicolor} which is used as a \emph{last} part
+in a break sequence for \refSkin{bicolor}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=bicolorlast]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathlast|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |pathlast|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{dispExample}
+\skinExampleSet{skin=bicolorlast,
+ colbacklower=LimeGreen!75!LightGreen,
+}
+\end{dispExample}
+
+
+\clearpage
+
+\begin{docSkin}[doc new=2021-05-21]{bicolor jigsaw}
+ This is the jigsaw variant of skin \refSkin{bicolor}.
+ It differs by its frame engine, see \Vref{subsec:skinjigsaw}.
+\begin{tcolorbox}[skintable=bicolor jigsaw]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathjigsaw|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |path|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+\begin{docTcbKey}{bicolor jigsaw}{}{style, no value}
+ This is an abbreviation for setting |skin=enhanced jigsaw|.
+\end{docTcbKey}
+
+
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
+\skinExampleSet{bicolor jigsaw,
+ colbacklower=LimeGreen!75!LightGreen,
+ opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
+ opacitybacklower=0.5,
+}
+\end{dispExample*}
+
+
+\clearpage
+
+
+\begin{docSkin}[doc new=2021-05-21]{bicolorfirst jigsaw}
+ This is the jigsaw variant of skin \refSkin{bicolorfirst}.
+ It differs by its frame engine, see \Vref{subsec:skinjigsaw}.
+\begin{tcolorbox}[skintable=bicolorfirst jigsaw]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathfirstjigsaw|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |pathfirst|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
+\skinExampleSet{skin=bicolorfirst jigsaw,
+ colbacklower=LimeGreen!75!LightGreen,
+ opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
+ opacitybacklower=0.5,
+}
+\end{dispExample*}
+
+
+
+\clearpage
+
+\begin{docSkin}[doc new=2021-05-21]{bicolormiddle jigsaw}
+ This is the jigsaw variant of skin \refSkin{bicolormiddle}.
+ It differs by its frame engine, see \Vref{subsec:skinjigsaw}.
+\begin{tcolorbox}[skintable=bicolormiddle jigsaw]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathmiddlejigsaw|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |pathmiddle|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
+\skinExampleSet{skin=bicolormiddle jigsaw,
+ colbacklower=LimeGreen!75!LightGreen,
+ opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
+ opacitybacklower=0.5,
+}
+\end{dispExample*}
+
+
+\clearpage
+\begin{docSkin}[doc new=2021-05-21]{bicolorlast jigsaw}
+ This is the jigsaw variant of skin \refSkin{bicolorlast}.
+ It differs by its frame engine, see \Vref{subsec:skinjigsaw}.
+\begin{tcolorbox}[skintable=bicolorlast jigsaw]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathlastjigsaw|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |pathlast|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
+\skinExampleSet{skin=bicolorlast jigsaw,
+ colbacklower=LimeGreen!75!LightGreen,
+ opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
+ opacitybacklower=0.5,
+}
+\end{dispExample*}
+
+
+
+\clearpage
+\subsection{Skin Family \enquote{tile}}
+\begin{docSkin}[doc new=2016-02-25]{tile}
+ This skin is a variant of skin \refSkin{bicolor}. Especially, the
+ optional lower part of the box is colored by \refKey{/tcb/colbacklower}.
+ The main difference to \refSkin{bicolor} is that \refSkin{tile} has no
+ frame.
+\begin{tcolorbox}[skintable=tile]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |empty|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |path|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+\begin{docTcbKey}[][doc new=2016-02-25]{tile}{}{style, initially\\
+ |skin=tile,boxrule=0pt,sharp corners,title filled,fonttitle=\textbackslash bfseries|
+}
+ This key applies |skin=tile| and in addition changes the geometry and some style options.
+\end{docTcbKey}
+
+
+\begin{dispExample}
+\skinExampleSet{tile,
+ colbacklower=LimeGreen!75!LightGreen,
+}
+\end{dispExample}
+
+
+\clearpage
+\begin{docSkin}[doc new=2016-02-25]{tilefirst}
+This is a flavor of \refSkin{tile} which is used as a \emph{first} part
+in a break sequence for \refSkin{tile}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=tilefirst]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |empty|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |pathfirst|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+\begin{dispExample}
+\skinExampleSet{skin=tilefirst,
+ colbacklower=LimeGreen!75!LightGreen,
+ boxrule=0pt,
+}
+\end{dispExample}
+
+
+\clearpage
+\begin{docSkin}[doc new=2016-02-25]{tilemiddle}
+This is a flavor of \refSkin{tile} which is used as a \emph{middle} part
+in a break sequence for \refSkin{tile}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=tilemiddle]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |empty|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |pathmiddle|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{dispExample}
+\skinExampleSet{skin=tilemiddle,
+ colbacklower=LimeGreen!75!LightGreen,
+ boxrule=0pt,
+}
+\end{dispExample}
+
+
+\clearpage
+\begin{docSkin}[doc new=2016-02-25]{tilelast}
+This is a flavor of \refSkin{tile} which is used as a \emph{last} part
+in a break sequence for \refSkin{tile}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=tilelast]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |empty|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |pathlast|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{dispExample}
+\skinExampleSet{skin=tilelast,
+ colbacklower=LimeGreen!75!LightGreen,
+ boxrule=0pt,
+}
+\end{dispExample}
+
+
+
+\clearpage
+\subsection{Skin Family \enquote{beamer}}
+
+\begin{docSkin}{beamer}
+ This skin resembles boxes known from the |beamer| class and therefore is
+ called \enquote{beamer}. It uses the normal colors from the core package but shades
+ them a little bit.
+\begin{tcolorbox}[skintable=beamer]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |path|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |path|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+
+\begin{docTcbKey}{beamer}{}{style, initially\\
+ |skin=beamer,boxrule=0mm,titlerule=1mm,toptitle=0.5mm,|\\
+ |arc=2mm,fonttitle=\textbackslash bfseries,drop fuzzy shadow|
+}
+ This key applies |skin=beamer| and in addition changes the geometry and some style options.
+\end{docTcbKey}
+
+
+
+\begin{dispExample}
+\skinExampleSet{beamer,title filled=false}
+\end{dispExample}
+
+
+
+\begin{dispExample}
+\begin{tcolorbox}[beamer,colback=Salmon!50!white,colframe=FireBrick!75!black,
+ adjusted title=A colored box with the \enquote{beamer} skin]
+This box looks like a box provided by the \texttt{beamer} class.
+\end{tcolorbox}
+\end{dispExample}
+
+
+\begin{dispExample}
+\begin{tcolorbox}[beamer,colframe=blue,colback=black,
+ watermark graphics=lichtspiel.jpg,
+ coltext=white,watermark opacity=0.75,watermark stretch=1.0,
+ title=Beamer Box with background picture]
+\lipsum[1]
+\end{tcolorbox}
+\end{dispExample}
+
+
+\begin{dispExample}
+\newtcolorbox{myblock}[2][]{%
+ beamer,breakable,colback=LightBlue,colframe=DarkBlue,#1,title={#2}}%
+
+\begin{myblock}{Beamerish \texttt{block}: \texttt{myblock}}
+\lipsum[1]
+\end{myblock}
+\end{dispExample}
+
+
+\clearpage
+\begin{docSkin}{beamerfirst}
+This is a flavor of \refSkin{beamer} which is used as a \emph{first} part
+in a break sequence for \refSkin{beamer}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=beamerfirst]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathfirst|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |pathfirst|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{dispExample}
+\skinExampleSet{beamer,title filled=false,skin=beamerfirst}
+\end{dispExample}
+
+
+\medskip
+
+\begin{docSkin}{beamermiddle}
+This is a flavor of \refSkin{beamer} which is used as a \emph{middle} part
+in a break sequence for \refSkin{beamer}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=beamermiddle]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathmiddle|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |pathmiddle|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{dispExample}
+\skinExampleSet{beamer,title filled=false,skin=beamermiddle}
+\end{dispExample}
+
+
+\clearpage
+\begin{docSkin}{beamerlast}
+This is a flavor of \refSkin{beamer} which is used as a \emph{last} part
+in a break sequence for \refSkin{beamer}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=beamerlast]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathlast|\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> |pathlast|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+\begin{dispExample}
+\skinExampleSet{beamer,title filled=false,skin=beamerlast}
+\end{dispExample}
+
+
+
+\clearpage
+\subsection{Skin Family \enquote{widget}}
+\begin{docSkin}{widget}
+ This skin uses the normal colors from the core package but shades
+ them a little bit.
+ The appearance of the skin can be controlled by \refKey{/tcb/frame style},
+ \refKey{/tcb/interior style}, and \refKey{/tcb/segmentation style},
+ if needed.
+\begin{tcolorbox}[skintable=widget]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |path|\\
+ \refKey{/tcb/interior titled engine}: \> |path|\\
+ \refKey{/tcb/interior engine}: \> |path|\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> \emph{special}
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{docTcbKey}[][doc updated={2020-09-23}]{widget}{}{style, initially\\
+ |skin=widget,arc=0.5mm,fonttitle=\bfseries,titlerule=0mm|
+}
+ This key applies |skin=widget| and in addition changes the geometry and some style options.
+\end{docTcbKey}
+
+
+\begin{dispExample}
+\skinExampleSet{widget}
+\end{dispExample}
+
+
+\begin{dispExample}
+\begin{tcolorbox}[widget,colback=Salmon!50!white,colframe=FireBrick!75!black,
+ adjusted title=A colored box with the \enquote{widget} skin]
+This is my content.
+\end{tcolorbox}
+\end{dispExample}
+
+\clearpage
+
+\begin{docSkin}{widgetfirst}
+This is a flavor of \refSkin{widget} which is used as a \emph{first} part
+in a break sequence for \refSkin{widget}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=widgetfirst]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathfirst|\\
+ \refKey{/tcb/interior titled engine}: \> |pathfirst|\\
+ \refKey{/tcb/interior engine}: \> |pathfirst|\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> \emph{special}
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{dispExample}
+\skinExampleSet{widget,skin=widgetfirst}
+\end{dispExample}
+
+\medskip
+
+\begin{docSkin}{widgetmiddle}
+This is a flavor of \refSkin{widget} which is used as a \emph{middle} part
+in a break sequence for \refSkin{widget}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=widgetmiddle]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathmiddle|\\
+ \refKey{/tcb/interior titled engine}: \> |pathmiddle|\\
+ \refKey{/tcb/interior engine}: \> |pathmiddle|\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> \emph{special}
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+\begin{dispExample}
+\skinExampleSet{widget,skin=widgetmiddle}
+\end{dispExample}
+
+
+\clearpage
+\begin{docSkin}{widgetlast}
+This is a flavor of \refSkin{widget} which is used as a \emph{last} part
+in a break sequence for \refSkin{widget}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=widgetlast]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |pathlast|\\
+ \refKey{/tcb/interior titled engine}: \> |pathlast|\\
+ \refKey{/tcb/interior engine}: \> |pathlast|\\
+ \refKey{/tcb/segmentation engine}: \> \emph{special}\\
+ \refKey{/tcb/title engine}: \> \emph{special}
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{dispExample}
+\skinExampleSet{widget,skin=widgetlast}
+\end{dispExample}
+
+
+\clearpage
+\subsection{Skin Family \enquote{empty}}
+
+\begin{docSkin}{empty}
+ This skin sets all engines to |empty|, i.\,e.\ nothing is drawn at all.
+ Therefore, this skin is a good starting point to create a complete
+ new style by yourself.
+\begin{tcolorbox}[skintable=empty]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |empty|\\
+ \refKey{/tcb/interior titled engine}: \> |empty|\\
+ \refKey{/tcb/interior engine}: \> |empty|\\
+ \refKey{/tcb/segmentation engine}: \> |empty|\\
+ \refKey{/tcb/title engine}: \> |empty|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{marker}
+ Note that the text colors stay unchanged when a skin is applied.
+ Since the standard title color
+ is white, the title of a box with skin \docValue*{empty} becomes
+ invisible, if not set to another color by \refKey{/tcb/coltitle}.
+\end{marker}
+
+
+\begin{docTcbKey}{empty}{}{style, no value}
+ This is an abbreviation for setting |skin=empty|.
+\end{docTcbKey}
+
+
+\begin{dispExample}
+\skinExampleSet{empty,
+ coltitle=Navy,borderline={2pt}{0pt}{black!10!white},
+}
+\end{dispExample}
+
+
+\clearpage
+\begin{docTcbKey}{blanker}{}{style, initially unset}
+ This style relies on the skin \refSkin{empty}. All engines
+ are set to empty and all margins are set to |0pt|.
+ In contrast to \refKey{/tcb/blank}, the graphical paths are
+ not constructed with exception of the geometry nodes.
+\begin{dispExample}
+\begin{tcolorbox}[blanker,watermark text=A blank box]
+\lipsum[1]
+\end{tcolorbox}
+\end{dispExample}
+
+\begin{dispExample}
+% \tcbuselibrary{fitting}
+\newtcboxfit{\mybox}[1]{blanker,width=4cm,height=7cm,top=4pt,
+ watermark text=#1}
+
+\begin{tabular}{|c|c|c|}\hline
+A & B & C\\\hline
+\mybox{A}{\lipsum[1]} & \mybox{B}{\lipsum[2]} & \mybox{C}{\lipsum[3]}\\\hline
+\end{tabular}
+\end{dispExample}
+\end{docTcbKey}
+
+
+
+\clearpage
+\begin{docTcbKey}{blankest}{}{style, initially unset}
+ This style extends \refKey{/tcb/blanker}.
+ All engines are set to empty and all margins are set to |0pt|.
+ In contrast to \refKey{/tcb/blanker}, also title, shadow, underlay,
+ overlay, finish and borderline are removed.
+
+\begin{dispExample}
+% \tcbuselibrary{raster}
+\begin{tcbraster}[raster columns=3,raster equal height,
+ title=Box \thetcbrasternum,
+ enhanced,size=small,colframe=red!50!black,colback=red!10!white,
+ coltitle=yellow!85!black,
+ drop fuzzy shadow,watermark text={Box \thetcbrasternum},
+ borderline={.25mm}{-0.5mm}{green!40!black},
+ finish={\begin{tcbclipframe}\draw[blue,opacity=0.1,line width=1cm]
+ (frame.south west) -- (frame.north east);\end{tcbclipframe}},
+ ]
+ \begin{tcolorbox}\lipsum[4]\end{tcolorbox}
+ \begin{tcolorbox}[blanker]\lipsum[4]\end{tcolorbox}
+ \begin{tcolorbox}[blankest]\lipsum[4]\end{tcolorbox}
+\end{tcbraster}
+\end{dispExample}
+\end{docTcbKey}
+
+
+\clearpage
+\begin{docSkin}{emptyfirst}
+This is a flavor of \refSkin{empty} which is used as a \emph{first} part
+in a break sequence for \refSkin{empty}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=emptyfirst]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |empty|\\
+ \refKey{/tcb/interior titled engine}: \> |empty|\\
+ \refKey{/tcb/interior engine}: \> |empty|\\
+ \refKey{/tcb/segmentation engine}: \> |empty|\\
+ \refKey{/tcb/title engine}: \> |empty|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{dispExample}
+\skinExampleSet{skin=emptyfirst,
+ coltitle=Navy,borderline={2pt}{0pt}{black!10!white},
+}
+\end{dispExample}
+
+
+\clearpage
+
+\begin{docSkin}{emptymiddle}
+This is a flavor of \refSkin{empty} which is used as a \emph{middle} part
+in a break sequence for \refSkin{empty}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=emptymiddle]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |empty|\\
+ \refKey{/tcb/interior titled engine}: \> |empty|\\
+ \refKey{/tcb/interior engine}: \> |empty|\\
+ \refKey{/tcb/segmentation engine}: \> |empty|\\
+ \refKey{/tcb/title engine}: \> |empty|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{dispExample}
+\skinExampleSet{skin=emptymiddle,
+ coltitle=Navy,borderline={2pt}{0pt}{black!10!white},
+}
+\end{dispExample}
+
+
+\clearpage
+\begin{docSkin}{emptylast}
+This is a flavor of \refSkin{empty} which is used as a \emph{last} part
+in a break sequence for \refSkin{empty}.
+Nevertheless, this skin can be applied independently.
+\begin{tcolorbox}[skintable=emptylast]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |empty|\\
+ \refKey{/tcb/interior titled engine}: \> |empty|\\
+ \refKey{/tcb/interior engine}: \> |empty|\\
+ \refKey{/tcb/segmentation engine}: \> |empty|\\
+ \refKey{/tcb/title engine}: \> |empty|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+\begin{dispExample}
+\skinExampleSet{skin=emptylast,
+ coltitle=Navy,borderline={2pt}{0pt}{black!10!white},
+}
+\end{dispExample}
+
+\clearpage
+\begin{dispListing*}{breakable,phantomlabel=freeboxexample,before upper={This example demonstrates
+a breakable customized box. Here, we define an environment |freebox|.
+The first application of |freebox| produces an unbroken |tcolorbox|.
+The box is drawn by the code given by \refKey{/tcb/frame code}
+and \refKey{/tcb/interior code}.\par
+The second application of |freebox| is broken into several parts which
+are drawn by the codes given by
+\refKey{/tcb/skin first is subskin of},
+\refKey{/tcb/skin middle is subskin of}, and
+\refKey{/tcb/skin last is subskin of}.
+\par\bigskip
+}}
+% Preamble:
+%\usepackage{tikz,lipsum}
+%\tcbuselibrary{skins,breakable}
+\tikzset{coltria/.style={fill=red!15!white}}
+
+\newtcolorbox{freebox}[1][]{empty,
+ breakable,height fixed for=first and middle,
+ leftrule=5mm,left=2mm,
+ frame style={fill,top color=red!75!black,bottom color=red!75!black,middle color=red},
+ colback=yellow!50!white,
+ watermark color=red!50!yellow!75!white,
+ watermark text on=unbroken is unbroken box,
+ watermark text on=first is first part,
+ watermark text on=middle is middle part,
+ watermark text on=last is last part,
+ % code for unbroken boxes:
+ frame code={\path[tcb fill frame] (frame.south west)--(frame.north west)
+ --([xshift=-5mm]frame.north east)--([yshift=-5mm]frame.north east)
+ --([yshift=5mm]frame.south east)--([xshift=-5mm]frame.south east)--cycle; },
+ interior code={\path[tcb fill interior] (interior.south west)--(interior.north west)
+ --([xshift=-4.8mm]interior.north east)--([yshift=-4.8mm]interior.north east)
+ --([yshift=4.8mm]interior.south east)--([xshift=-4.8mm]interior.south east)
+ --cycle; },
+ % code for the first part of a break sequence:
+ skin first is subskin of={emptyfirst}{%
+ frame code={\path[tcb fill frame] (frame.south west)--(frame.north west)
+ --([xshift=-5mm]frame.north east)--([yshift=-5mm]frame.north east)
+ --(frame.south east)--cycle;
+ \path[coltria] ([xshift=2.5mm,yshift=1mm]frame.south west) -- +(120:2mm)
+ -- +(60:2mm)-- cycle; },
+ interior code={\path[tcb fill interior] (interior.south west|-frame.south)
+ --(interior.north west)--([xshift=-4.8mm]interior.north east)
+ --([yshift=-4.8mm]interior.north east)--(interior.south east|-frame.south)
+ --cycle; },
+ },%
+ % code for the middle part of a break sequence:
+ skin middle is subskin of={emptymiddle}{%
+ frame code={\path[tcb fill frame] (frame.south west)--(frame.north west)
+ --(frame.north east)--(frame.south east)--cycle;
+ \path[coltria] ([xshift=2.5mm,yshift=-1mm]frame.north west) -- +(240:2mm)
+ -- +(300:2mm) -- cycle;
+ \path[coltria] ([xshift=2.5mm,yshift=1mm]frame.south west) -- +(120:2mm)
+ -- +(60:2mm) -- cycle;
+ },
+ interior code={\path[tcb fill interior] (interior.south west|-frame.south)
+ --(interior.north west|-frame.north)--(interior.north east|-frame.north)
+ --(interior.south east|-frame.south)--cycle; },
+ },
+ % code for the last part of a break sequence:
+ skin last is subskin of={emptylast}{%
+ frame code={\path[tcb fill frame] (frame.south west)--(frame.north west)
+ --(frame.north east)--([yshift=5mm]frame.south east)
+ --([xshift=-5mm]frame.south east)--cycle;
+ \path[coltria] ([xshift=2.5mm,yshift=-1mm]frame.north west) -- +(240:2mm)
+ -- +(300:2mm) -- cycle;
+ },
+ interior code={\path[tcb fill interior] (interior.south west)
+ --(interior.north west|-frame.north)--(interior.north east|-frame.north)
+ --([yshift=4.8mm]interior.south east)--([xshift=-4.8mm]interior.south east)
+ --cycle; },
+ },
+ #1}
+
+\begin{freebox}
+\lipsum[1]
+\end{freebox}
+
+\begin{freebox}
+\lipsum[1-12]
+\end{freebox}
+\end{dispListing*}
+{\tcbusetemp}
+
+
+\clearpage
+
+\subsection{Skin \enquote{spartan}}\label{subsec:spartan}
+
+\begin{docSkin}{spartan}
+ This skin is quite \ldots\ spartan.
+ It supports no rounded corners, no overlays, no shadows, no borderlines,
+ and no finishes. The only exception are underlays.
+ One cannot do very fancy things with this skin, but it compiles very fast.
+ Therefore, the |spartan| skin is
+ used for the draft mode, see \Vref{subsec:draftmode}.
+ Nevertheless, it can be used as a normal skin.
+
+\begin{tcolorbox}[skintable=spartan]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |spartan|\\
+ \refKey{/tcb/interior titled engine}: \> |spartan|\\
+ \refKey{/tcb/interior engine}: \> |spartan|\\
+ \refKey{/tcb/segmentation engine}: \> |spartan|\\
+ \refKey{/tcb/title engine}: \> |spartan|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+
+\begin{docTcbKey}{spartan}{}{style, no value}
+ This is an abbreviation for setting |skin=spartan|.
+\end{docTcbKey}
+
+
+\begin{dispExample}
+\skinExampleSet{spartan}
+\end{dispExample}
+
+
+\clearpage
+
+\subsection{Skin \enquote{draft}}\label{subsec:draft}
+
+\begin{docSkin}{draft}
+ This skin is intended to be used while drafting new geometric settings
+ for a |tcolorbox|.
+\begin{tcolorbox}[skintable=draft]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> \emph{special}\\
+ \refKey{/tcb/interior titled engine}: \> \emph{special}\\
+ \refKey{/tcb/interior engine}: \> \emph{special}\\
+ \refKey{/tcb/segmentation engine}: \> |path|\\
+ \refKey{/tcb/title engine}: \> |path|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+\begin{docTcbKey}{draft}{}{style, no value}
+ This is an abbreviation for setting |skin=draft|.
+\end{docTcbKey}
+
+
+\begin{dispExample}
+\skinExampleSet{draft}
+\end{dispExample}
+
+
+
+\begin{dispExample}
+\vspace*{3mm}
+\begin{tcolorbox}[draft,title=A colored box with the \enquote{draft} skin]
+\lipsum[1-3]
+\tcblower
+\lipsum[4-6]
+\end{tcolorbox}
+\end{dispExample}
+
+
+
+\clearpage
+\subsection{Skin Family \enquote{freelance}}
+\begin{marker}
+This skin family \enquote{freelance} is deprecated with |tcolorbox| 3.00.
+It is not longer needed, because
+\refKey{/tcb/frame code},
+\refKey{/tcb/interior code},
+\refKey{/tcb/interior titled code}, and
+\refKey{/tcb/title code}
+can be applied to every skin now. In this sense, everything has become
+\emph{freelance} now.\par
+For users of \refKey{/tcb/freelance}: Old code should continue to work. There may be
+exceptions for breakable freelance boxes under certain circumstances.
+For new code, use \refKey{/tcb/empty} or \refKey{/tcb/enhanced} where
+you would have used \refKey{/tcb/freelance} before.
+\end{marker}
+
+\begin{docSkin}{freelance}
+ This skin gives full freedom for the appearance of the |tcolorbox|.
+ All drawing engines are set to type |freelance|; they use the |tikz| package
+ and compute the \refKey{/tcb/geometry nodes}.
+ %This skin is useful for boxes which should differ much from the normal
+ %appearance. Note that this difference has to be programmed by the user.
+ %The drawing code can be given
+ %with the following option keys. As default value, the code from the |standard|
+ %skin is set.
+\begin{tcolorbox}[skintable=freelance]
+ \begin{tabbing}
+ \refKey{/tcb/interior titled engine}: \=\kill
+ \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
+ \refKey{/tcb/frame engine}: \> |freelance|\\
+ \refKey{/tcb/interior titled engine}: \> |freelance|\\
+ \refKey{/tcb/interior engine}: \> |freelance|\\
+ \refKey{/tcb/segmentation engine}: \> |freelance|\\
+ \refKey{/tcb/title engine}: \> |freelance|
+ \end{tabbing}
+\end{tcolorbox}
+\end{docSkin}
+
+\begin{docTcbKey}{freelance}{}{style, no value}
+ This is an abbreviation for setting |skin=freelance|.
+\end{docTcbKey}
+
+\begin{docSkin}{freelancefirst}
+ This skin equals \refSkin{freelance} with exception of the break sequence,
+ see \Vref{subsec:breaksequence}.
+ %It is used as first part of the
+ %break sequence of \refSkin{freelance}. \refKey{/tcb/extend freelancefirst}
+ %can be used to customize this part.
+\end{docSkin}
+
+\begin{docSkin}{freelancemiddle}
+ This skin equals \refSkin{freelance} with exception of the break sequence,
+ see \Vref{subsec:breaksequence}.
+ %It is used as middle part of the
+ %break sequence of \refSkin{freelance}. \refKey{/tcb/extend freelancemiddle}
+ %can be used to customize this part.
+\end{docSkin}
+
+\begin{docSkin}{freelancelast}
+ This skin equals \refSkin{freelance} with exception of the break sequence,
+ see \Vref{subsec:breaksequence}.
+ %It is used as last part of the
+ %break sequence of \refSkin{freelance}. \refKey{/tcb/extend freelancelast}
+ %can be used to customize this part.
+\end{docSkin}
+
+
+\begin{docTcbKey}{extend freelance}{=\meta{options}}{no default, initially empty}
+The \meta{options} are added to the skin definition of \refSkin{freelance}.
+\end{docTcbKey}
+
+\begin{docTcbKey}{extend freelancefirst}{=\meta{options}}{no default, initially empty}
+The \meta{options} are added to the skin definition of \refSkin{freelancefirst} which
+is used as first part of the break sequence of \refSkin{freelance}.
+See \refKey{/tcb/skin first is subskin of} for a substitute of this key.
+\end{docTcbKey}
+
+\begin{docTcbKey}{extend freelancemiddle}{=\meta{options}}{no default, initially empty}
+The \meta{options} are added to the skin definition of \refSkin{freelancemiddle} which
+is used as middle part of the break sequence of \refSkin{freelance}.
+See \refKey{/tcb/skin middle is subskin of} for a substitute of this key.
+\end{docTcbKey}
+
+\enlargethispage*{1cm}
+
+\begin{docTcbKey}{extend freelancelast}{=\meta{options}}{no default, initially empty}
+The \meta{options} are added to the skin definition of \refSkin{freelancelast} which
+is used as last part of the break sequence of \refSkin{freelance}.
+See \refKey{/tcb/skin last is subskin of} for a substitute of this key.
+\end{docTcbKey}
+
+
+
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex
index 32b395673d..1f3833a7f7 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex
@@ -10,6 +10,10 @@ The library is loaded by a package option or inside the preamble by:
This also loads the package |tikz| \cite{tantau:tikz_and_pgf}. Typically but not necessarily,
the following skins use |tikz| instead of |pgf|.
+In the following, general settings and options of the library are
+documented.
+The actual catalog of skins is found in \Vref{sec:skincatalog}.
+
\subsection{Style Option Keys}\label{subsec:addstyleoptions}
The following style options are applicable for all skins which
use engines of type |path|, |pathfirst|, |pathmiddle|, or |pathlast|.
@@ -2837,9 +2841,9 @@ For certain boxes, a more delicate procedure is needed. E.g., if the box should
be translucent, an already painted area cannot be made unpainted. Therefore,
more elaborate frame engines saw holes into the frame where the interior area and
optionally the title area will be painted.
-The resulting skins are called \emph{jigsaw} skins. For \refSkin{standard}
-and \refSkin{enhanced}, there are variants called \refSkin{standard jigsaw}
-and \refSkin{enhanced jigsaw}.
+The resulting skins are called \emph{jigsaw} skins. For \refSkin{standard},
+\refSkin{enhanced}, and \refSkin{bicolor}, there are variants called \refSkin{standard jigsaw},
+\refSkin{enhanced jigsaw}, and \refSkin{bicolor jigsaw}.
\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
@@ -2971,1978 +2975,3 @@ This box looks like a box provided by the \texttt{beamer} class.
\end{docTcbKey}
-
-\clearpage
-\tcbset{skintable/.style={colframe=red!50!yellow!50!black,
- colback=red!50!yellow!5!white,coltitle=red!50!yellow!3!white,
- fonttitle=\bfseries,before=\par\smallskip,
- title=Environment and engines for the skin \enquote{\texttt{#1}}}}
-
-\subsection{Skin Family \enquote{standard}}\label{subsec:skinstandard}
-\begin{marker}Note that the option keys \refKey{/tcb/frame style},
- \refKey{/tcb/interior style},
- \refKey{/tcb/segmentation style}, and
- \refKey{/tcb/title style} are not be applicable to the standard skin.
- Also, watermarks (see Subsection \ref{subsec:watermarks})
- are not usable with the standard skin.
-\end{marker}
-
-\begin{docSkin}{standard}
- This is the standard skin from the core package. All drawing engines
- are set to type |standard|. The drawing is based on |pgf| commands and
- does not need the |tikz| package.
-\begin{tcolorbox}[skintable=standard]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |pgfpicture|\\
- \refKey{/tcb/frame engine}: \> |standard|\\
- \refKey{/tcb/interior titled engine}: \> |standard|\\
- \refKey{/tcb/interior engine}: \> |standard|\\
- \refKey{/tcb/segmentation engine}: \> |standard|\\
- \refKey{/tcb/title engine}: \> |standard|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-\begin{docTcbKey}{standard}{}{style, no value}
- This is an abbreviation for setting |skin=standard|.
-\end{docTcbKey}
-
-\begin{dispExample}
-\begin{tcbraster}[standard,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-\clearpage
-
-\begin{docSkin}{standard jigsaw}
- This is the standard jigsaw skin from the core package. It differs from
- the skin \refSkin{standard} by its frame engine, see \Vref{subsec:skinjigsaw}.
-\begin{tcolorbox}[skintable=standard jigsaw]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |pgfpicture|\\
- \refKey{/tcb/frame engine}: \> |standardjigsaw|\\
- \refKey{/tcb/interior titled engine}: \> |standard|\\
- \refKey{/tcb/interior engine}: \> |standard|\\
- \refKey{/tcb/segmentation engine}: \> |standard|\\
- \refKey{/tcb/title engine}: \> |standard|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-\begin{docTcbKey}{standard jigsaw}{}{style, no value}
- This is an abbreviation for setting |skin=standard jigsaw|.
-\end{docTcbKey}
-
-\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
-\begin{tcbraster}[standard jigsaw,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
- opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample*}
-
-
-\clearpage
-\subsection{Skin Family \enquote{enhanced}}
-\begin{marker}
-If you like the standard appearance of a |tcolorbox| but you want to
-have some \enquote{enhanced} features, the |enhanced| skin is what you are looking for.
-\end{marker}
-
-\begin{docSkin}{enhanced}
- This skin translates the drawing commands of the core package into |tikz|
- path commands. Therefore, it allows all |tikz| high level options for
- these paths and has more flexibility compared to the \refSkin{standard} skin.
- You pay for this with some prolonged compilation time.
- The |tikz| path options can
- be given with the option keys
- \refKey{/tcb/frame style},
- \refKey{/tcb/interior style},
- \refKey{/tcb/segmentation style}, and
- \refKey{/tcb/title style}.
-\begin{tcolorbox}[skintable=enhanced]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |path|\\
- \refKey{/tcb/interior titled engine}: \> |path|\\
- \refKey{/tcb/interior engine}: \> |path|\\
- \refKey{/tcb/segmentation engine}: \> |path|\\
- \refKey{/tcb/title engine}: \> |path|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-\begin{docTcbKey}{enhanced}{}{style, no value}
- This is an abbreviation for setting |skin=enhanced|.
-\end{docTcbKey}
-
-\begin{dispExample}
-\begin{tcbraster}[enhanced,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-\begin{dispExample}
-% \usetikzlibrary{shadings} % preamble
-\tcbset{skin=enhanced,fonttitle=\bfseries,
- frame style={upper left=blue,upper right=red,lower left=yellow,lower right=green},
- interior style={white,opacity=0.5},
- segmentation style={black,solid,opacity=0.2,line width=1pt}}
-
-\begin{tcolorbox}[title=Nice box in rainbow colors]
- With the \enquote{enhanced} skin, it is quite easy to produce fancy looking effects.
- \tcblower
- Note that this is still a \texttt{tcolorbox}.
-\end{tcolorbox}
-\end{dispExample}
-
-
-\begin{dispExample}
-% \usetikzlibrary{decorations.pathmorphing} % preamble
-\tcbset{skin=enhanced,fonttitle=\bfseries,boxrule=1mm,
- frame style={draw=FireBrick,fill=Salmon},drop fuzzy shadow,
- interior style={draw=FireBrick,top color=Salmon!10,bottom color=Salmon!20},
- segmentation style={draw=FireBrick,solid,decorate,
- decoration={coil,aspect=0,segment length=10.1mm}}}
-
-\begin{tcblisting}{title=A listing box with shadow and some specials}
-Of course, skins can be used for listings also.
-\begin{equation}
- \int\limits_1^2 \frac{1}{x}~dx = \ln(2).
-\end{equation}
-\end{tcblisting}
-\end{dispExample}
-
-
-\clearpage
-
-
-\begin{docTcbKey}{enhanced standard}{}{style, no value}
- For unbreakable boxes, this is identical to using \refKey{/tcb/enhanced}.
- But, for breakable boxes, the \emph{break sequence} is identical to the \refSkin{standard} skin,
- see Section \ref{subsec:breaksequence} from page \pageref{subsec:breaksequence}.
-\end{docTcbKey}
-
-
-\begin{docTcbKey}{blank}{}{style, initially unset}
- This style relies on the skin \refSkin{enhanced}. All drawing operations
- are hidden and all margins are set to |0pt|. See \refKey{/tcb/blanker}
- for switching off the drawing engines.
-\begin{dispExample}
-\begin{tcolorbox}[blank,watermark text=A blank box]
-\lipsum[1]
-\end{tcolorbox}
-\end{dispExample}
-\end{docTcbKey}
-
-\clearpage
-\begin{docCommand}{tcbline}{}
- Sometimes, a line is only a line. With \refCom{tcblower} you separate
- the box content into two functional units. |\tcbline| draws only a line
- which looks like the segmentation line between upper and lower part.
- Furthermore, you can use |\tcbline| more than just once.
- |\tcbline| always uses the |path| drawing engine. Therefore,
- the \refKey{/tcb/segmentation style} can be applied.
-
-\begin{dispExample}
-\tcbset{enhanced,colframe=blue!50!black,colback=white}
-
-\begin{tcolorbox}[colupper=red!50!black,collower=green!50!black]
-\lipsum[1]
-\tcbline
-\lipsum[2]
-\tcblower
-\lipsum[3]
-\tcbline
-\lipsum[4]
-\end{tcolorbox}
-\end{dispExample}
-\end{docCommand}
-
-\begin{docCommand}{tcbline*}{}
- Equivalent to \refCom{tcbline}, but in a breakable box, \refCom{tcbline*}
- is removed if at a page/box break. Also, it is removed at the end
- of a box.
-\end{docCommand}
-
-\clearpage
-\begin{docSkin}{enhancedfirst}
-This is a flavor of \refSkin{enhanced} which is used as a \emph{first} part
-in a break sequence for \refSkin{enhanced}.
-Nevertheless, this skin can be applied independently.
-\begin{tcolorbox}[skintable=enhancedfirst]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |pathfirst|\\
- \refKey{/tcb/interior titled engine}: \> |pathfirst|\\
- \refKey{/tcb/interior engine}: \> |pathfirst|\\
- \refKey{/tcb/segmentation engine}: \> |path|\\
- \refKey{/tcb/title engine}: \> |pathfirst|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-\begin{dispExample}
-\begin{tcbraster}[skin=enhancedfirst,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-
-\clearpage
-\begin{docSkin}{enhancedmiddle}
-This is a flavor of \refSkin{enhanced} which is used as a \emph{middle} part
-in a break sequence for \refSkin{enhanced}.
-Nevertheless, this skin can be applied independently.
-\begin{tcolorbox}[skintable=enhancedmiddle]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |pathmiddle|\\
- \refKey{/tcb/interior titled engine}: \> |pathmiddle|\\
- \refKey{/tcb/interior engine}: \> |pathmiddle|\\
- \refKey{/tcb/segmentation engine}: \> |path|\\
- \refKey{/tcb/title engine}: \> |pathmiddle|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-\begin{dispExample}
-\begin{tcbraster}[skin=enhancedmiddle,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-
-
-\clearpage
-\begin{docSkin}{enhancedlast}
-This is a flavor of \refSkin{enhanced} which is used as a \emph{last} part
-in a break sequence for \refSkin{enhanced}.
-Nevertheless, this skin can be applied independently.
-\begin{tcolorbox}[skintable=enhancedlast]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |pathlast|\\
- \refKey{/tcb/interior titled engine}: \> |pathlast|\\
- \refKey{/tcb/interior engine}: \> |pathlast|\\
- \refKey{/tcb/segmentation engine}: \> |path|\\
- \refKey{/tcb/title engine}: \> |pathlast|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-\begin{dispExample}
-\begin{tcbraster}[skin=enhancedlast,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-\clearpage
-\begin{docSkin}{enhanced jigsaw}
- This is the jigsaw variant of skin \refSkin{enhanced}.
- It differs by its frame engine, see \Vref{subsec:skinjigsaw}.
-\begin{tcolorbox}[skintable=enhanced jigsaw]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |pathjigsaw|\\
- \refKey{/tcb/interior titled engine}: \> |path|\\
- \refKey{/tcb/interior engine}: \> |path|\\
- \refKey{/tcb/segmentation engine}: \> |path|\\
- \refKey{/tcb/title engine}: \> |path|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-\begin{docTcbKey}{enhanced jigsaw}{}{style, no value}
- This is an abbreviation for setting |skin=enhanced jigsaw|.
-\end{docTcbKey}
-
-\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
-\begin{tcbraster}[enhanced jigsaw,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
- opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample*}
-
-
-\begin{docTcbKey}[][doc new=2017-07-01]{enhanced standard jigsaw}{}{style, no value}
- For unbreakable boxes, this is identical to using \refKey{/tcb/enhanced jigsaw}.
- But, for breakable boxes, the \emph{break sequence} is identical to the \refSkin{standard jigsaw} skin,
- see Section \ref{subsec:breaksequence} from page \pageref{subsec:breaksequence}.
-\end{docTcbKey}
-
-
-\clearpage
-\begin{docSkin}{enhancedfirst jigsaw}
- This is the jigsaw variant of skin \refSkin{enhancedfirst}.
- It differs by its frame engine, see \Vref{subsec:skinjigsaw}.
-\begin{tcolorbox}[skintable=enhancedfirst jigsaw]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |pathfirstjigsaw|\\
- \refKey{/tcb/interior titled engine}: \> |pathfirst|\\
- \refKey{/tcb/interior engine}: \> |pathfirst|\\
- \refKey{/tcb/segmentation engine}: \> |path|\\
- \refKey{/tcb/title engine}: \> |pathfirst|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
-\begin{tcbraster}[skin=enhancedfirst jigsaw,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
- opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample*}
-
-
-\clearpage
-\begin{docSkin}{enhancedmiddle jigsaw}
- This is the jigsaw variant of skin \refSkin{enhancedmiddle}.
- It differs by its frame engine, see \Vref{subsec:skinjigsaw}.
-\begin{tcolorbox}[skintable=enhancedmiddle jigsaw]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |pathmiddlejigsaw|\\
- \refKey{/tcb/interior titled engine}: \> |pathmiddle|\\
- \refKey{/tcb/interior engine}: \> |pathmiddle|\\
- \refKey{/tcb/segmentation engine}: \> |path|\\
- \refKey{/tcb/title engine}: \> |pathmiddle|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
-\begin{tcbraster}[skin=enhancedmiddle jigsaw,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
- opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample*}
-
-
-\begin{docTcbKey}{marker}{}{style, no value}
- This styles relies on the skin \refSkin{enhancedmiddle jigsaw}. It is
- intended to be used as an optical marker like a highlighter pen.
-\begin{dispExample}
-\begin{tcolorbox}[marker]
-\lipsum[2]
-\end{tcolorbox}
-\end{dispExample}
-\end{docTcbKey}
-
-\clearpage
-
-\begin{dispListing*}{before upper={This examples demonstrates the creation of several
- \emph{text marker} environments based on \refSkin{enhancedmiddle}.\par\medskip}}
-\tcbset{textmarker/.style={%
- skin=enhancedmiddle jigsaw,breakable,parbox=false,
- boxrule=0mm,leftrule=5mm,rightrule=5mm,boxsep=0mm,arc=0mm,outer arc=0mm,
- left=3mm,right=3mm,top=1mm,bottom=1mm,toptitle=1mm,bottomtitle=1mm,oversize}}
-
-\newtcolorbox{yellow}{textmarker,colback=yellow!5!white,colframe=yellow}
-\newtcolorbox{orange}{textmarker,colback=DarkOrange!5!white,
- colframe=DarkOrange!75!yellow}
-\newtcolorbox{red}{textmarker,colback=red!5!white,colframe=red}
-\newtcolorbox{blue}{textmarker,colback=DeepSkyBlue!5!white,colframe=DeepSkyBlue}
-\newtcolorbox{green}{textmarker,colback=Chartreuse!5!white,colframe=Chartreuse}
-\newtcolorbox{rainbow}{textmarker,interior hidden,
- frame style={top color=blue,bottom color=red,middle color=green}}
-
-\begin{yellow}
- \lipsum[1-3]
-\end{yellow}
-
-\begin{orange}
- \lipsum[4]
-\end{orange}
-
-\begin{red}
- \lipsum[5]
-\end{red}
-
-\begin{green}
- \lipsum[6]
-\end{green}
-
-\begin{blue}
- \lipsum[7]
-\end{blue}
-
-\begin{rainbow}
- \lipsum[8]
-\end{rainbow}
-\end{dispListing*}
-{\tcbusetemp}
-
-
-\clearpage
-\begin{docSkin}{enhancedlast jigsaw}
- This is the jigsaw variant of skin \refSkin{enhancedlast}.
- It differs by its frame engine, see \Vref{subsec:skinjigsaw}.
-\begin{tcolorbox}[skintable=enhancedlast]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |pathlastjigsaw|\\
- \refKey{/tcb/interior titled engine}: \> |pathlast|\\
- \refKey{/tcb/interior engine}: \> |pathlast|\\
- \refKey{/tcb/segmentation engine}: \> |path|\\
- \refKey{/tcb/title engine}: \> |pathlast|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
-\begin{tcbraster}[skin=enhancedlast jigsaw,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
- opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample*}
-
-
-
-\clearpage
-\subsection{Skin Family \enquote{bicolor}}
-\begin{docSkin}{bicolor}
- This skin is quite similar to the \refSkin{standard} and \refSkin{enhanced} skin.
- But instead of a segmentation line, the optional lower part of the box is filled with a
- different color or drawn with a different style.
-\begin{tcolorbox}[skintable=bicolor]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |path|\\
- \refKey{/tcb/interior titled engine}: \> \emph{special}\\
- \refKey{/tcb/interior engine}: \> \emph{special}\\
- \refKey{/tcb/segmentation engine}: \> \emph{special}\\
- \refKey{/tcb/title engine}: \> |path|
- \end{tabbing}
-\end{tcolorbox}
- \begin{itemize}
- \item The most basic usage of this skin is to set the background color of
- the lower part by \refKey{/tcb/colbacklower} and all other options like for
- the \refSkin{standard} skin.
-\begin{dispExample}
-\begin{tcolorbox}[skin=bicolor,title=The title,
- colframe=FireBrick!75!black,colback=Salmon!50!white,colbacklower=Salmon]
- The upper part.
- \tcblower
- The lower part.
-\end{tcolorbox}
-\end{dispExample}
- \item The more advanced usage of this skin is to apply the \refKey{/tcb/frame style}
- and the \refKey{/tcb/interior style} like for
- the \refSkin{enhanced} skin. Also, the \refKey{/tcb/segmentation style} can be
- used, but it is applied to the whole lower part.
-\begin{dispExample}
-\begin{tcolorbox}[skin=bicolor,title=The title,
- frame style={top color=FireBrick,
- bottom color=FireBrick!15!white,draw=black},
- interior style={left color=Salmon,right color=Salmon!50!white},
- segmentation style={right color=Salmon,left color=Salmon!50!white}]
- The upper part.
- \tcblower
- The lower part.
-\end{tcolorbox}
-\end{dispExample}
- \end{itemize}
-\end{docSkin}
-
-\clearpage
-
-\begin{docTcbKey}{bicolor}{}{style, no value}
- This is an abbreviation for setting |skin=bicolor|.
-\end{docTcbKey}
-
-
-\begin{dispExample}
-\begin{tcbraster}[bicolor,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen,
- colbacktitle=LimeGreen!75!DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-\enlargethispage*{1cm}
-
-\begin{docTcbKey}{colbacklower}{=\meta{color}}{no default, initially \texttt{black!15!white}}
- Sets the background \meta{color} of the lower part. It depends on the skin,
- if this value is used.
-\end{docTcbKey}
-
-\begin{dispExample}
-\tcbset{gitexample/.style={listing and comment,comment={#1},
- skin=bicolor,boxrule=1mm,fonttitle=\bfseries,coltitle=black,
- frame style={draw=black,left color=Gold,right color=Goldenrod!50!Gold},
- colback=black,colbacklower=Goldenrod!75!Gold,
- colupper=white,collower=black,
- listing options={language={bash},aboveskip=0pt,belowskip=0pt,nolol,
- basicstyle=\ttfamily\bfseries,extendedchars=true}}}
-
-\begin{tcblisting}{title={Snapshot of the staging area},
- gitexample={The option `-a' automatically stages all tracked and modified
- files before the commit.\par
- This can be combined with the message option `-m'
- as seen in the third line.}}
-git commit
-git commit -a
-git commit -am 'changes to my example'
-\end{tcblisting}
-\end{dispExample}
-
-
-\clearpage
-
-
-\begin{docSkin}{bicolorfirst}
-This is a flavor of \refSkin{bicolor} which is used as a \emph{first} part
-in a break sequence for \refSkin{bicolor}.
-Nevertheless, this skin can be applied independently.
-\begin{tcolorbox}[skintable=bicolorfirst]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |pathfirst|\\
- \refKey{/tcb/interior titled engine}: \> \emph{special}\\
- \refKey{/tcb/interior engine}: \> \emph{special}\\
- \refKey{/tcb/segmentation engine}: \> \emph{special}\\
- \refKey{/tcb/title engine}: \> |pathfirst|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-\begin{dispExample}
-\begin{tcbraster}[skin=bicolorfirst,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen,
- colbacktitle=LimeGreen!75!DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-\clearpage
-\begin{docSkin}{bicolormiddle}
-This is a flavor of \refSkin{bicolor} which is used as a \emph{middle} part
-in a break sequence for \refSkin{bicolor}.
-Nevertheless, this skin can be applied independently.
-\begin{tcolorbox}[skintable=bicolormiddle]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |pathmiddle|\\
- \refKey{/tcb/interior titled engine}: \> \emph{special}\\
- \refKey{/tcb/interior engine}: \> \emph{special}\\
- \refKey{/tcb/segmentation engine}: \> \emph{special}\\
- \refKey{/tcb/title engine}: \> |pathmiddle|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-\begin{dispExample}
-\begin{tcbraster}[skin=bicolormiddle,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen,
- colbacktitle=LimeGreen!75!DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-\clearpage
-\begin{docSkin}{bicolorlast}
-This is a flavor of \refSkin{bicolor} which is used as a \emph{last} part
-in a break sequence for \refSkin{bicolor}.
-Nevertheless, this skin can be applied independently.
-\begin{tcolorbox}[skintable=bicolorlast]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |pathlast|\\
- \refKey{/tcb/interior titled engine}: \> \emph{special}\\
- \refKey{/tcb/interior engine}: \> \emph{special}\\
- \refKey{/tcb/segmentation engine}: \> \emph{special}\\
- \refKey{/tcb/title engine}: \> |pathlast|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-\begin{dispExample}
-\begin{tcbraster}[skin=bicolorlast,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen,
- colbacktitle=LimeGreen!75!DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-
-\clearpage
-\subsection{Skin Family \enquote{tile}}
-\begin{docSkin}[doc new=2016-02-25]{tile}
- This skin is a variant of skin \refSkin{bicolor}. Especially, the
- optional lower part of the box is colored by \refKey{/tcb/colbacklower}.
- The main difference to \refSkin{bicolor} is that \refSkin{tile} has no
- frame.
-\begin{tcolorbox}[skintable=tile]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |empty|\\
- \refKey{/tcb/interior titled engine}: \> \emph{special}\\
- \refKey{/tcb/interior engine}: \> \emph{special}\\
- \refKey{/tcb/segmentation engine}: \> \emph{special}\\
- \refKey{/tcb/title engine}: \> |path|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-\begin{docTcbKey}[][doc new=2016-02-25]{tile}{}{style, initially\\
- |skin=tile,boxrule=0pt,sharp corners,title filled,fonttitle=\textbackslash bfseries|
-}
- This key applies |skin=tile| and in addition changes the geometry and some style options.
-\end{docTcbKey}
-
-
-\begin{dispExample}
-\begin{tcbraster}[tile,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen,
- colbacktitle=LimeGreen!75!DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-\clearpage
-\begin{docSkin}[doc new=2016-02-25]{tilefirst}
-This is a flavor of \refSkin{tile} which is used as a \emph{first} part
-in a break sequence for \refSkin{tile}.
-Nevertheless, this skin can be applied independently.
-\begin{tcolorbox}[skintable=tilefirst]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |empty|\\
- \refKey{/tcb/interior titled engine}: \> \emph{special}\\
- \refKey{/tcb/interior engine}: \> \emph{special}\\
- \refKey{/tcb/segmentation engine}: \> \emph{special}\\
- \refKey{/tcb/title engine}: \> |pathfirst|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-\begin{dispExample}
-\begin{tcbraster}[skin=tilefirst,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen,
- colbacktitle=LimeGreen!75!DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm,boxrule=0pt]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-\clearpage
-\begin{docSkin}[doc new=2016-02-25]{tilemiddle}
-This is a flavor of \refSkin{tile} which is used as a \emph{middle} part
-in a break sequence for \refSkin{tile}.
-Nevertheless, this skin can be applied independently.
-\begin{tcolorbox}[skintable=tilemiddle]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |empty|\\
- \refKey{/tcb/interior titled engine}: \> \emph{special}\\
- \refKey{/tcb/interior engine}: \> \emph{special}\\
- \refKey{/tcb/segmentation engine}: \> \emph{special}\\
- \refKey{/tcb/title engine}: \> |pathmiddle|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-\begin{dispExample}
-\begin{tcbraster}[skin=tilemiddle,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen,
- colbacktitle=LimeGreen!75!DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm,boxrule=0pt]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-\clearpage
-\begin{docSkin}[doc new=2016-02-25]{tilelast}
-This is a flavor of \refSkin{tile} which is used as a \emph{last} part
-in a break sequence for \refSkin{tile}.
-Nevertheless, this skin can be applied independently.
-\begin{tcolorbox}[skintable=tilelast]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |empty|\\
- \refKey{/tcb/interior titled engine}: \> \emph{special}\\
- \refKey{/tcb/interior engine}: \> \emph{special}\\
- \refKey{/tcb/segmentation engine}: \> \emph{special}\\
- \refKey{/tcb/title engine}: \> |pathlast|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-\begin{dispExample}
-\begin{tcbraster}[skin=tilelast,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacklower=LimeGreen!75!LightGreen,
- colbacktitle=LimeGreen!75!DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm,boxrule=0pt]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-
-\clearpage
-\subsection{Skin Family \enquote{beamer}}
-
-\begin{docSkin}{beamer}
- This skin resembles boxes known from the |beamer| class and therefore is
- called \enquote{beamer}. It uses the normal colors from the core package but shades
- them a little bit.
-\begin{tcolorbox}[skintable=beamer]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |path|\\
- \refKey{/tcb/interior titled engine}: \> \emph{special}\\
- \refKey{/tcb/interior engine}: \> \emph{special}\\
- \refKey{/tcb/segmentation engine}: \> \emph{special}\\
- \refKey{/tcb/title engine}: \> |path|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-
-\begin{docTcbKey}{beamer}{}{style, initially\\
- |skin=beamer,boxrule=0mm,titlerule=1mm,toptitle=0.5mm,|\\
- |arc=2mm,fonttitle=\textbackslash bfseries,drop fuzzy shadow|
-}
- This key applies |skin=beamer| and in addition changes the geometry and some style options.
-\end{docTcbKey}
-
-
-
-\begin{dispExample}
-\begin{tcbraster}[beamer,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-
-\begin{dispExample}
-\begin{tcolorbox}[beamer,colback=Salmon!50!white,colframe=FireBrick!75!black,
- adjusted title=A colored box with the \enquote{beamer} skin]
-This box looks like a box provided by the \texttt{beamer} class.
-\end{tcolorbox}
-\end{dispExample}
-
-
-\begin{dispExample}
-\begin{tcolorbox}[beamer,colframe=blue,colback=black,
- watermark graphics=lichtspiel.jpg,
- coltext=white,watermark opacity=0.75,watermark stretch=1.0,
- title=Beamer Box with background picture]
-\lipsum[1]
-\end{tcolorbox}
-\end{dispExample}
-
-
-\begin{dispExample}
-\newtcolorbox{myblock}[2][]{%
- beamer,breakable,colback=LightBlue,colframe=DarkBlue,#1,title=#2}%
-
-\begin{myblock}{Beamerish \texttt{block}: \texttt{myblock}}
-\lipsum[1]
-\end{myblock}
-\end{dispExample}
-
-
-\clearpage
-\begin{docSkin}{beamerfirst}
-This is a flavor of \refSkin{beamer} which is used as a \emph{first} part
-in a break sequence for \refSkin{beamer}.
-Nevertheless, this skin can be applied independently.
-\begin{tcolorbox}[skintable=beamerfirst]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |pathfirst|\\
- \refKey{/tcb/interior titled engine}: \> \emph{special}\\
- \refKey{/tcb/interior engine}: \> \emph{special}\\
- \refKey{/tcb/segmentation engine}: \> \emph{special}\\
- \refKey{/tcb/title engine}: \> |pathfirst|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-\begin{dispExample}
-\begin{tcbraster}[beamer,skin=beamerfirst,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-\clearpage
-
-\begin{docSkin}{beamermiddle}
-This is a flavor of \refSkin{beamer} which is used as a \emph{middle} part
-in a break sequence for \refSkin{beamer}.
-Nevertheless, this skin can be applied independently.
-\begin{tcolorbox}[skintable=beamermiddle]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |pathmiddle|\\
- \refKey{/tcb/interior titled engine}: \> \emph{special}\\
- \refKey{/tcb/interior engine}: \> \emph{special}\\
- \refKey{/tcb/segmentation engine}: \> \emph{special}\\
- \refKey{/tcb/title engine}: \> |pathmiddle|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-\begin{dispExample}
-\begin{tcbraster}[beamer,skin=beamermiddle,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-\clearpage
-\begin{docSkin}{beamerlast}
-This is a flavor of \refSkin{beamer} which is used as a \emph{last} part
-in a break sequence for \refSkin{beamer}.
-Nevertheless, this skin can be applied independently.
-\begin{tcolorbox}[skintable=beamerlast]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |pathlast|\\
- \refKey{/tcb/interior titled engine}: \> \emph{special}\\
- \refKey{/tcb/interior engine}: \> \emph{special}\\
- \refKey{/tcb/segmentation engine}: \> \emph{special}\\
- \refKey{/tcb/title engine}: \> |pathlast|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-\begin{dispExample}
-\begin{tcbraster}[beamer,skin=beamerlast,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-
-\clearpage
-\subsection{Skin Family \enquote{widget}}
-\begin{docSkin}{widget}
- This skin uses the normal colors from the core package but shades
- them a little bit.
- The appearance of the skin can be controlled by \refKey{/tcb/frame style},
- \refKey{/tcb/interior style}, and \refKey{/tcb/segmentation style},
- if needed.
-\begin{tcolorbox}[skintable=widget]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |path|\\
- \refKey{/tcb/interior titled engine}: \> |path|\\
- \refKey{/tcb/interior engine}: \> |path|\\
- \refKey{/tcb/segmentation engine}: \> \emph{special}\\
- \refKey{/tcb/title engine}: \> \emph{special}
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-\begin{docTcbKey}[][doc updated={2020-09-23}]{widget}{}{style, initially\\
- |skin=widget,arc=0.5mm,fonttitle=\bfseries,titlerule=0mm|
-}
- This key applies |skin=widget| and in addition changes the geometry and some style options.
-\end{docTcbKey}
-
-
-
-\begin{dispExample}
-\begin{tcbraster}[widget,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-\begin{dispExample}
-\begin{tcolorbox}[widget,colback=Salmon!50!white,colframe=FireBrick!75!black,
- adjusted title=A colored box with the \enquote{widget} skin]
-This is my content.
-\end{tcolorbox}
-\end{dispExample}
-
-\clearpage
-
-\begin{docSkin}{widgetfirst}
-This is a flavor of \refSkin{widget} which is used as a \emph{first} part
-in a break sequence for \refSkin{widget}.
-Nevertheless, this skin can be applied independently.
-\begin{tcolorbox}[skintable=widgetfirst]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |pathfirst|\\
- \refKey{/tcb/interior titled engine}: \> |pathfirst|\\
- \refKey{/tcb/interior engine}: \> |pathfirst|\\
- \refKey{/tcb/segmentation engine}: \> \emph{special}\\
- \refKey{/tcb/title engine}: \> \emph{special}
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-\begin{dispExample}
-\begin{tcbraster}[widget,skin=widgetfirst,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-\clearpage
-
-\begin{docSkin}{widgetmiddle}
-This is a flavor of \refSkin{widget} which is used as a \emph{middle} part
-in a break sequence for \refSkin{widget}.
-Nevertheless, this skin can be applied independently.
-\begin{tcolorbox}[skintable=widgetmiddle]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |pathmiddle|\\
- \refKey{/tcb/interior titled engine}: \> |pathmiddle|\\
- \refKey{/tcb/interior engine}: \> |pathmiddle|\\
- \refKey{/tcb/segmentation engine}: \> \emph{special}\\
- \refKey{/tcb/title engine}: \> \emph{special}
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-\begin{dispExample}
-\begin{tcbraster}[widget,skin=widgetmiddle,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-\clearpage
-\begin{docSkin}{widgetlast}
-This is a flavor of \refSkin{widget} which is used as a \emph{last} part
-in a break sequence for \refSkin{widget}.
-Nevertheless, this skin can be applied independently.
-\begin{tcolorbox}[skintable=widgetlast]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |pathlast|\\
- \refKey{/tcb/interior titled engine}: \> |pathlast|\\
- \refKey{/tcb/interior engine}: \> |pathlast|\\
- \refKey{/tcb/segmentation engine}: \> \emph{special}\\
- \refKey{/tcb/title engine}: \> \emph{special}
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-\begin{dispExample}
-\begin{tcbraster}[widget,skin=widgetlast,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-
-
-\clearpage
-\subsection{Skin Family \enquote{empty}}
-
-\begin{docSkin}{empty}
- This skin sets all engines to |empty|, i.\,e.\ nothing is drawn at all.
- Therefore, this skin is a good starting point to create a complete
- new style by yourself.
-\begin{tcolorbox}[skintable=empty]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |empty|\\
- \refKey{/tcb/interior titled engine}: \> |empty|\\
- \refKey{/tcb/interior engine}: \> |empty|\\
- \refKey{/tcb/segmentation engine}: \> |empty|\\
- \refKey{/tcb/title engine}: \> |empty|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-\begin{docTcbKey}{empty}{}{style, no value}
- This is an abbreviation for setting |skin=empty|.
-\end{docTcbKey}
-
-\begin{dispExample}
-\begin{tcbraster}[empty,raster equal height,raster columns=4,
- coltitle=Navy,borderline={2pt}{0pt}{black!10!white},
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-\clearpage
-\begin{docTcbKey}{blanker}{}{style, initially unset}
- This style relies on the skin \refSkin{empty}. All engines
- are set to empty and all margins are set to |0pt|.
- In contrast to \refKey{/tcb/blank}, the graphical paths are
- not constructed with exception of the geometry nodes.
-\begin{dispExample}
-\begin{tcolorbox}[blanker,watermark text=A blank box]
-\lipsum[1]
-\end{tcolorbox}
-\end{dispExample}
-
-\begin{dispExample}
-% \tcbuselibrary{fitting}
-\newtcboxfit{\mybox}[1]{blanker,width=4cm,height=7cm,top=4pt,
- watermark text=#1}
-
-\begin{tabular}{|c|c|c|}\hline
-A & B & C\\\hline
-\mybox{A}{\lipsum[1]} & \mybox{B}{\lipsum[2]} & \mybox{C}{\lipsum[3]}\\\hline
-\end{tabular}
-\end{dispExample}
-\end{docTcbKey}
-
-
-
-\clearpage
-\begin{docTcbKey}{blankest}{}{style, initially unset}
- This style extends \refKey{/tcb/blanker}.
- All engines are set to empty and all margins are set to |0pt|.
- In contrast to \refKey{/tcb/blanker}, also title, shadow, underlay,
- overlay, finish and borderline are removed.
-
-\begin{dispExample}
-% \tcbuselibrary{raster}
-\begin{tcbraster}[raster columns=3,raster equal height,
- title=Box \thetcbrasternum,
- enhanced,size=small,colframe=red!50!black,colback=red!10!white,
- coltitle=yellow!85!black,
- drop fuzzy shadow,watermark text={Box \thetcbrasternum},
- borderline={.25mm}{-0.5mm}{green!40!black},
- finish={\begin{tcbclipframe}\draw[blue,opacity=0.1,line width=1cm]
- (frame.south west) -- (frame.north east);\end{tcbclipframe}},
- ]
- \begin{tcolorbox}\lipsum[4]\end{tcolorbox}
- \begin{tcolorbox}[blanker]\lipsum[4]\end{tcolorbox}
- \begin{tcolorbox}[blankest]\lipsum[4]\end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-\end{docTcbKey}
-
-
-\clearpage
-\begin{docSkin}{emptyfirst}
-This is a flavor of \refSkin{empty} which is used as a \emph{first} part
-in a break sequence for \refSkin{empty}.
-Nevertheless, this skin can be applied independently.
-\begin{tcolorbox}[skintable=emptyfirst]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |empty|\\
- \refKey{/tcb/interior titled engine}: \> |empty|\\
- \refKey{/tcb/interior engine}: \> |empty|\\
- \refKey{/tcb/segmentation engine}: \> |empty|\\
- \refKey{/tcb/title engine}: \> |empty|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-\begin{dispExample}
-\begin{tcbraster}[empty,skin=emptyfirst,raster equal height,raster columns=4,
- coltitle=Navy,borderline={2pt}{0pt}{black!10!white},
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-\clearpage
-
-\begin{docSkin}{emptymiddle}
-This is a flavor of \refSkin{empty} which is used as a \emph{middle} part
-in a break sequence for \refSkin{empty}.
-Nevertheless, this skin can be applied independently.
-\begin{tcolorbox}[skintable=emptymiddle]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |empty|\\
- \refKey{/tcb/interior titled engine}: \> |empty|\\
- \refKey{/tcb/interior engine}: \> |empty|\\
- \refKey{/tcb/segmentation engine}: \> |empty|\\
- \refKey{/tcb/title engine}: \> |empty|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-\begin{dispExample}
-\begin{tcbraster}[empty,skin=emptymiddle,raster equal height,raster columns=4,
- coltitle=Navy,borderline={2pt}{0pt}{black!10!white},
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-\clearpage
-\begin{docSkin}{emptylast}
-This is a flavor of \refSkin{empty} which is used as a \emph{last} part
-in a break sequence for \refSkin{empty}.
-Nevertheless, this skin can be applied independently.
-\begin{tcolorbox}[skintable=emptylast]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |empty|\\
- \refKey{/tcb/interior titled engine}: \> |empty|\\
- \refKey{/tcb/interior engine}: \> |empty|\\
- \refKey{/tcb/segmentation engine}: \> |empty|\\
- \refKey{/tcb/title engine}: \> |empty|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-\begin{dispExample}
-\begin{tcbraster}[empty,skin=emptylast,raster equal height,raster columns=4,
- coltitle=Navy,borderline={2pt}{0pt}{black!10!white},
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-\clearpage
-\begin{dispListing*}{breakable,phantomlabel=freeboxexample,before upper={This example demonstrates
-a breakable customized box. Here, we define an environment |freebox|.
-The first application of |freebox| produces an unbroken |tcolorbox|.
-The box is drawn by the code given by \refKey{/tcb/frame code}
-and \refKey{/tcb/interior code}.\par
-The second application of |freebox| is broken into several parts which
-are drawn by the codes given by
-\refKey{/tcb/skin first is subskin of},
-\refKey{/tcb/skin middle is subskin of}, and
-\refKey{/tcb/skin last is subskin of}.
-\par\bigskip
-}}
-% Preamble:
-%\usepackage{tikz,lipsum}
-%\tcbuselibrary{skins,breakable}
-\tikzset{coltria/.style={fill=red!15!white}}
-
-\newtcolorbox{freebox}[1][]{empty,
- breakable,height fixed for=first and middle,
- leftrule=5mm,left=2mm,
- frame style={fill,top color=red!75!black,bottom color=red!75!black,middle color=red},
- colback=yellow!50!white,
- watermark color=red!50!yellow!75!white,
- watermark text on=unbroken is unbroken box,
- watermark text on=first is first part,
- watermark text on=middle is middle part,
- watermark text on=last is last part,
- % code for unbroken boxes:
- frame code={\path[tcb fill frame] (frame.south west)--(frame.north west)
- --([xshift=-5mm]frame.north east)--([yshift=-5mm]frame.north east)
- --([yshift=5mm]frame.south east)--([xshift=-5mm]frame.south east)--cycle; },
- interior code={\path[tcb fill interior] (interior.south west)--(interior.north west)
- --([xshift=-4.8mm]interior.north east)--([yshift=-4.8mm]interior.north east)
- --([yshift=4.8mm]interior.south east)--([xshift=-4.8mm]interior.south east)
- --cycle; },
- % code for the first part of a break sequence:
- skin first is subskin of={emptyfirst}{%
- frame code={\path[tcb fill frame] (frame.south west)--(frame.north west)
- --([xshift=-5mm]frame.north east)--([yshift=-5mm]frame.north east)
- --(frame.south east)--cycle;
- \path[coltria] ([xshift=2.5mm,yshift=1mm]frame.south west) -- +(120:2mm)
- -- +(60:2mm)-- cycle; },
- interior code={\path[tcb fill interior] (interior.south west|-frame.south)
- --(interior.north west)--([xshift=-4.8mm]interior.north east)
- --([yshift=-4.8mm]interior.north east)--(interior.south east|-frame.south)
- --cycle; },
- },%
- % code for the middle part of a break sequence:
- skin middle is subskin of={emptymiddle}{%
- frame code={\path[tcb fill frame] (frame.south west)--(frame.north west)
- --(frame.north east)--(frame.south east)--cycle;
- \path[coltria] ([xshift=2.5mm,yshift=-1mm]frame.north west) -- +(240:2mm)
- -- +(300:2mm) -- cycle;
- \path[coltria] ([xshift=2.5mm,yshift=1mm]frame.south west) -- +(120:2mm)
- -- +(60:2mm) -- cycle;
- },
- interior code={\path[tcb fill interior] (interior.south west|-frame.south)
- --(interior.north west|-frame.north)--(interior.north east|-frame.north)
- --(interior.south east|-frame.south)--cycle; },
- },
- % code for the last part of a break sequence:
- skin last is subskin of={emptylast}{%
- frame code={\path[tcb fill frame] (frame.south west)--(frame.north west)
- --(frame.north east)--([yshift=5mm]frame.south east)
- --([xshift=-5mm]frame.south east)--cycle;
- \path[coltria] ([xshift=2.5mm,yshift=-1mm]frame.north west) -- +(240:2mm)
- -- +(300:2mm) -- cycle;
- },
- interior code={\path[tcb fill interior] (interior.south west)
- --(interior.north west|-frame.north)--(interior.north east|-frame.north)
- --([yshift=4.8mm]interior.south east)--([xshift=-4.8mm]interior.south east)
- --cycle; },
- },
- #1}
-
-\begin{freebox}
-\lipsum[1]
-\end{freebox}
-
-\begin{freebox}
-\lipsum[1-12]
-\end{freebox}
-\end{dispListing*}
-{\tcbusetemp}
-
-
-\clearpage
-
-\subsection{Skin \enquote{spartan}}\label{subsec:spartan}
-
-\begin{docSkin}{spartan}
- This skin is quite \ldots\ spartan.
- It supports no rounded corners, no overlays, no shadows, no borderlines,
- and no finishes. The only exception are underlays.
- One cannot do very fancy things with this skin, but it compiles very fast.
- Therefore, the |spartan| skin is
- used for the draft mode, see \Vref{subsec:draftmode}.
- Nevertheless, it can be used as a normal skin.
-
-\begin{tcolorbox}[skintable=spartan]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |spartan|\\
- \refKey{/tcb/interior titled engine}: \> |spartan|\\
- \refKey{/tcb/interior engine}: \> |spartan|\\
- \refKey{/tcb/segmentation engine}: \> |spartan|\\
- \refKey{/tcb/title engine}: \> |spartan|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-
-\begin{docTcbKey}{spartan}{}{style, no value}
- This is an abbreviation for setting |skin=spartan|.
-\end{docTcbKey}
-
-
-\begin{dispExample}
-\begin{tcbraster}[spartan,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-\clearpage
-
-\subsection{Skin \enquote{draft}}\label{subsec:draft}
-
-\begin{docSkin}{draft}
- This skin is intended to be used while drafting new geometric settings
- for a |tcolorbox|.
-\begin{tcolorbox}[skintable=draft]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> \emph{special}\\
- \refKey{/tcb/interior titled engine}: \> \emph{special}\\
- \refKey{/tcb/interior engine}: \> \emph{special}\\
- \refKey{/tcb/segmentation engine}: \> |path|\\
- \refKey{/tcb/title engine}: \> |path|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-\begin{docTcbKey}{draft}{}{style, no value}
- This is an abbreviation for setting |skin=draft|.
-\end{docTcbKey}
-
-
-\begin{dispExample}
-\begin{tcbraster}[draft,raster equal height,raster columns=4,
- colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
- left=1mm,right=1mm,top=1mm,bottom=1mm,middle=1mm]
- \begin{tcolorbox}
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \end{tcolorbox}
- \begin{tcolorbox}[adjusted title=My title]
- This is my content.
- \tcblower
- More content.
- \end{tcolorbox}
-\end{tcbraster}
-\end{dispExample}
-
-
-\begin{dispExample}
-\vspace*{3mm}
-\begin{tcolorbox}[draft,title=A colored box with the \enquote{draft} skin]
-\lipsum[1-3]
-\tcblower
-\lipsum[4-6]
-\end{tcolorbox}
-\end{dispExample}
-
-
-
-\clearpage
-\subsection{Skin Family \enquote{freelance}}
-\begin{marker}
-This skin family \enquote{freelance} is deprecated with |tcolorbox| 3.00.
-It is not longer needed, because
-\refKey{/tcb/frame code},
-\refKey{/tcb/interior code},
-\refKey{/tcb/interior titled code}, and
-\refKey{/tcb/title code}
-can be applied to every skin now. In this sense, everything has become
-\emph{freelance} now.\par
-For users of \refKey{/tcb/freelance}: Old code should continue to work. There may be
-exceptions for breakable freelance boxes under certain circumstances.
-For new code, use \refKey{/tcb/empty} or \refKey{/tcb/enhanced} where
-you would have used \refKey{/tcb/freelance} before.
-\end{marker}
-
-\begin{docSkin}{freelance}
- This skin gives full freedom for the appearance of the |tcolorbox|.
- All drawing engines are set to type |freelance|; they use the |tikz| package
- and compute the \refKey{/tcb/geometry nodes}.
- %This skin is useful for boxes which should differ much from the normal
- %appearance. Note that this difference has to be programmed by the user.
- %The drawing code can be given
- %with the following option keys. As default value, the code from the |standard|
- %skin is set.
-\begin{tcolorbox}[skintable=freelance]
- \begin{tabbing}
- \refKey{/tcb/interior titled engine}: \=\kill
- \refKey{/tcb/graphical environment}: \> |tikzpicture|\\
- \refKey{/tcb/frame engine}: \> |freelance|\\
- \refKey{/tcb/interior titled engine}: \> |freelance|\\
- \refKey{/tcb/interior engine}: \> |freelance|\\
- \refKey{/tcb/segmentation engine}: \> |freelance|\\
- \refKey{/tcb/title engine}: \> |freelance|
- \end{tabbing}
-\end{tcolorbox}
-\end{docSkin}
-
-\begin{docTcbKey}{freelance}{}{style, no value}
- This is an abbreviation for setting |skin=freelance|.
-\end{docTcbKey}
-
-\begin{docSkin}{freelancefirst}
- This skin equals \refSkin{freelance} with exception of the break sequence,
- see \Vref{subsec:breaksequence}.
- %It is used as first part of the
- %break sequence of \refSkin{freelance}. \refKey{/tcb/extend freelancefirst}
- %can be used to customize this part.
-\end{docSkin}
-
-\begin{docSkin}{freelancemiddle}
- This skin equals \refSkin{freelance} with exception of the break sequence,
- see \Vref{subsec:breaksequence}.
- %It is used as middle part of the
- %break sequence of \refSkin{freelance}. \refKey{/tcb/extend freelancemiddle}
- %can be used to customize this part.
-\end{docSkin}
-
-\begin{docSkin}{freelancelast}
- This skin equals \refSkin{freelance} with exception of the break sequence,
- see \Vref{subsec:breaksequence}.
- %It is used as last part of the
- %break sequence of \refSkin{freelance}. \refKey{/tcb/extend freelancelast}
- %can be used to customize this part.
-\end{docSkin}
-
-
-\begin{docTcbKey}{extend freelance}{=\meta{options}}{no default, initially empty}
-The \meta{options} are added to the skin definition of \refSkin{freelance}.
-\end{docTcbKey}
-
-\begin{docTcbKey}{extend freelancefirst}{=\meta{options}}{no default, initially empty}
-The \meta{options} are added to the skin definition of \refSkin{freelancefirst} which
-is used as first part of the break sequence of \refSkin{freelance}.
-See \refKey{/tcb/skin first is subskin of} for a substitute of this key.
-\end{docTcbKey}
-
-\begin{docTcbKey}{extend freelancemiddle}{=\meta{options}}{no default, initially empty}
-The \meta{options} are added to the skin definition of \refSkin{freelancemiddle} which
-is used as middle part of the break sequence of \refSkin{freelance}.
-See \refKey{/tcb/skin middle is subskin of} for a substitute of this key.
-\end{docTcbKey}
-
-\enlargethispage*{1cm}
-
-\begin{docTcbKey}{extend freelancelast}{=\meta{options}}{no default, initially empty}
-The \meta{options} are added to the skin definition of \refSkin{freelancelast} which
-is used as last part of the break sequence of \refSkin{freelance}.
-See \refKey{/tcb/skin last is subskin of} for a substitute of this key.
-\end{docTcbKey}
-
-
-
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex
index 2d316a3379..abaf34a4d4 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex
@@ -439,6 +439,43 @@ This automated \hyperlink{XYZ-myex3}{hyper target can be linked to with a
\end{docTcbKey}
+\clearpage
+
+\begin{docTcbKey}[][doc new=2020-10-21]{theorem hanging indent}{\colOpt{=\docValue*{auto}\textbar \meta{length}}}{default \docValue*{auto}, initially \docValue*{auto}}
+ Sets the hanging indent of the theorem title to \docValue{auto} or the
+ given \meta{length}.
+ For \docValue{auto}, the hanging indent matches the display name, number and
+ separator sign of the theorem.
+ If \meta{length} is negative, the theorem title is indented positively
+ without hanging indent.
+
+\begin{dispExample}
+\newtcbtheorem[use counter from=mytheo]{sometheorem}{Theorem}%
+ {colback=white,colframe=red!50!black,fonttitle=\bfseries}{theo}
+
+\begin{sometheorem}{This is a very long and complicated title for a quite
+ short and nearly empty theorem}{myexA1}
+My theorem text.
+\end{sometheorem}
+
+\begin{sometheorem}[theorem hanging indent=5mm]{This is a very long and
+ complicated title for a quite short and nearly empty theorem}{myexA2}
+My theorem text.
+\end{sometheorem}
+
+\begin{sometheorem}[theorem hanging indent=0pt]{This is a very long and
+ complicated title for a quite short and nearly empty theorem}{myexA3}
+My theorem text.
+\end{sometheorem}
+
+\begin{sometheorem}[theorem hanging indent=-5mm]{This is a very long and
+ complicated title for a quite short and nearly empty theorem}{myexA4}
+My theorem text.
+\end{sometheorem}
+\end{dispExample}
+\end{docTcbKey}
+
+
\clearpage
\begin{docTcbKey}{theorem name and number}{}{style, no value, initially set}
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.vignette.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.vignette.tex
index ebf9f137d5..733c356d8e 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.vignette.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.vignette.tex
@@ -533,7 +533,42 @@ These fadings are much \emph{weaker} than the normal fadings.
\end{dispExample*}
\end{vigTcbKey}
+\clearpage
+It is possible to assign different fadings for each side of the vignette,
+if needed. Therefore, the fadings have to be applied individually with
+the four style options
+ \refKey{/tcb/vig/north style},
+ \refKey{/tcb/vig/south style},
+ \refKey{/tcb/vig/east style}, and
+ \refKey{/tcb/vig/west style}.
+\begin{dispExample*}{sbs,righthand width=3cm,center lower}
+\begin{tikzpicture}
+ \fill [black!20] (-0.5,-0.5) rectangle (1.5,1.5);
+ \path [pattern=checkerboard,pattern color=black!30]
+ (-0.5,-0.5) rectangle (1.5,1.5);
+ \tcbvignette{
+ north style={blue,path fading=south},
+ east style ={blue,path fading=semi west},
+ south style={blue,path fading=semi north},
+ west style ={blue,path fading=east}
+ }
+\end{tikzpicture}
+\end{dispExample*}
+
+\begin{dispExample*}{sbs,righthand width=3cm,center lower}
+\begin{tikzpicture}
+ \fill [black!20] (-0.5,-0.5) rectangle (1.5,1.5);
+ \path [pattern=checkerboard,pattern color=black!30]
+ (-0.5,-0.5) rectangle (1.5,1.5);
+ \tcbvignette{
+ north style={blue,path fading=west},
+ east style ={blue,path fading=south},
+ south style={red,path fading=east},
+ west style ={red,path fading=north}
+ }
+\end{tikzpicture}
+\end{dispExample*}
\clearpage
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex
index 752b5b35ad..43b623d6ca 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex
@@ -412,7 +412,7 @@ Besides \mylib{xparse}, the following commands also need the \mylib{listings} li
IfBooleanTF={#1}
{listing side text}
{text side listing},
- title=#3,#2}
+ title={#3},#2}
\begin{mybox}{Listing Box}
This is my
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.pdf b/macros/latex/contrib/tcolorbox/tcolorbox.pdf
index f4d99c53ae..efc1e20d97 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.pdf
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.pdf
Binary files differ
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.sty b/macros/latex/contrib/tcolorbox/tcolorbox.sty
index a5f9d23397..9dc3606c0e 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.sty
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.sty
@@ -1,8 +1,8 @@
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcolorbox.sty: Text color boxes
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,8 +18,8 @@
%% This work consists of all files listed in README
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tcolorbox}[2020/10/09 version 4.42 text color boxes]
-\def\tcb@version{4.42}
+\ProvidesPackage{tcolorbox}[2021/05/21 version 4.50 text color boxes]
+\def\tcb@version{4.50}
\RequirePackage{pgf}[2008/01/15]
\RequirePackage{verbatim}[2003/08/22]
@@ -2105,19 +2105,57 @@
\newcommand*\l@tcolorbox{\@dottedtocline{1}{1.5em}{2.3em}}
-\newcommand{\tcblistof}[3][\section]{%
- \ifnum\c@tocdepth<1\relax%
- \tcb@warning{'tocdepth' value lower than 1 for 'tcblistof'}%
- \fi%
- #1{#3}%
- \@starttoc{#2}%
-}
-
+\ExplSyntaxOn
+\NewDocumentCommand{\tcblistof}{ O{\section} m o m }
+ {
+ \ifnum\c@tocdepth<1\relax
+ \tcb@warning{'tocdepth'~value~lower~than~1~for~'tcblistof'}
+ \fi
+ \tl_set:Nx \l_tmpa_tl {\tl_trim_spaces:n{#1}}
+ \tl_set:Nx \l_tmpb_tl {\str_range:Nnn \l_tmpa_tl {2}{8}}
+ \str_if_eq:VnT \l_tmpb_tl { chapter }
+ {
+ \if@twocolumn
+ \@restonecoltrue\onecolumn
+ \else
+ \@restonecolfalse
+ \fi
+ }
+ \tl_set:Nx \l_tmpa_tl {\str_item:Nn \l_tmpa_tl {-1}}
+ \str_if_eq:VnTF \l_tmpa_tl { * }
+ {
+ #1{#4}
+ \IfNoValueTF{#3}
+ {
+ \@mkboth{\MakeUppercase{#4}}
+ {\MakeUppercase{#4}}
+ }
+ {
+ \@mkboth{\MakeUppercase{#3}}
+ {\MakeUppercase{#3}}
+ }
+ }
+ {
+ \IfNoValueTF{#3}
+ {
+ #1{#4}
+ }
+ {
+ #1[#3]{#4}
+ }
+ }
+ \@starttoc{#2}
+ \if@restonecol\twocolumn\fi
+ }
+\ExplSyntaxOff
% verbatim output as in 'verbatim'
-\newwrite\tcb@out
+\def\tcb@allocate@tcb@out{%
+ \newwrite\tcb@out%
+ \xdef\tcb@allocate@tcb@out{}%
+}
\let\tcb@verbatim@begin@hook\@empty
\let\tcb@verbatim@end@hook\@empty
@@ -2125,6 +2163,7 @@
\def\tcbverbatimwrite#1{%
\@bsphack
+ \tcb@allocate@tcb@out%
\immediate\openout\tcb@out #1
\tcb@verbatim@begin@hook%
\let\do\@makeother\dospecials
@@ -2185,7 +2224,11 @@
% recording
-\newwrite\tcb@record@out
+\def\tcb@allocate@tcb@record@out{%
+ \newwrite\tcb@record@out%
+ \xdef\tcb@allocate@tcb@out{}%
+}
+
\def\tcb@null#1{}
\newcommand{\tcb@record}[1]{\immediate\write\tcb@record@out{#1}}
@@ -2193,6 +2236,7 @@
\newcommand{\tcbstartrecording}[1][\jobname.records]{%
\let\tcbrecord\tcb@record%
\edef\tcb@record@file{#1}%
+ \tcb@allocate@tcb@record@out%
\immediate\openout\tcb@record@out\tcb@record@file%
}
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.tex b/macros/latex/contrib/tcolorbox/tcolorbox.tex
index 39dcde9f3b..977c3895df 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.tex
@@ -1,9 +1,9 @@
% \LaTeX-Main\
-%% The LaTeX package tcolorbox - version 4.42 (2020/10/09)
+%% The LaTeX package tcolorbox - version 4.50 (2021/05/21)
%% tcolorbox.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2006-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -43,8 +43,8 @@
\setlength{\bibitemsep}{\smallskipamount}
\addbibresource{tcolorbox.doc.bib}
-\def\version{4.42}%
-\def\datum{2020/10/09}%
+\def\version{4.50}%
+\def\datum{2021/05/21}%
\makeindex
\hypersetup{
@@ -62,7 +62,7 @@
%\geometry{showframe}
%\tcbset{draftmode}
\tcbset{/tcb/external/-}% for final run
-%\includeonly{tcolorbox.doc.breakable}
+%\includeonly{tcolorbox.doc.skins}
%\hypersetup{colorlinks=false}
@@ -79,6 +79,7 @@
\include{tcolorbox.doc.recording}
\include{tcolorbox.doc.technical}
\include{tcolorbox.doc.skins}
+\include{tcolorbox.doc.skincatalog}
\include{tcolorbox.doc.graphics}
\include{tcolorbox.doc.filling}
\include{tcolorbox.doc.beamer}
diff --git a/macros/unicodetex/latex/beaulivre/README.md b/macros/unicodetex/latex/beaulivre/README.md
index ac62b1b3ac..34f2b47f0b 100644
--- a/macros/unicodetex/latex/beaulivre/README.md
+++ b/macros/unicodetex/latex/beaulivre/README.md
@@ -5,10 +5,11 @@
`beaulivre` is a LaTeX class for typesetting books, which has a colorful
design.
-Currently, it has native support to English, French and Chinese typesetting. And
-it may compile with either XeLaTeX or LuaLaTeX.
+Currently, it has native support to Chinese (simplified and traditional),
+English, French, German, Japanese and Russian typesetting. And it may compile
+with either XeLaTeX or LuaLaTeX.
-This is part of the colorist class series.
+This is part of the `colorist` class series.
# License
diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf
index 11b51c967a..d299dac883 100644
--- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf
+++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex
index fc31cfd996..3ffe9d002f 100644
--- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex
+++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex
@@ -1,24 +1,26 @@
%! TEX program = xelatex
-\PassOptionsToPackage{dvipsnames}{xcolor}
-\documentclass{beaulivre}
-
-\UseLanguage{Chinese}
+\documentclass[allowbf]{beaulivre}
%%================================
-%% TeX logo 与 网址
+%% 引入工具集
%%================================
-\usepackage{hologo}
-\usepackage{url}
+\usepackage{PJLtoolkit}
+\usepackage{longtable} % breakable tables
+\usepackage{hologo} % more TeX logo
+
+\UseLanguage{Chinese}
%%================================
%% 排版代码
%%================================
\usepackage{listings}
+\definecolor{maintheme}{RGB}{70,130,180}
+\definecolor{forestgreen}{RGB}{21,122,81}
\definecolor{lightergray}{gray}{0.99}
\lstset{language=[LaTeX]TeX,
- keywordstyle=\color{RoyalBlue},
+ keywordstyle=\color{maintheme},
basicstyle=\ttfamily,
- commentstyle=\color{ForestGreen}\ttfamily,
+ commentstyle=\color{forestgreen}\ttfamily,
stringstyle=\rmfamily,
showstringspaces=false,
breaklines=true,
@@ -31,70 +33,213 @@
firstnumber=last,
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
-\lstset{morekeywords=%
- {CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,
- linenumbers,nolinenumbers,subsection,maketitle
+\lstset{moretexcs=%
+ {color,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
}
}
\lstnewenvironment{code}%
{\setkeys{lst}{columns=fullflexible,keepspaces=true}}{}
-\providecommand{\colorist}{\textsf{colorist}}
-\providecommand{\colorart}{\textsf{colorart}}
-\providecommand{\colorbook}{\textsf{colorbook}}
-\providecommand{\lebhart}{\textsf{lebhart}}
-\providecommand{\beaulivre}{\textsf{beaulivre}}
+%%================================
+%% remind
+%%================================
+\usepackage[many]{tcolorbox}
+\newenvironment{remind}[1][提示]{%
+ \begin{tcolorbox}[breakable,
+ enhanced,
+ width = \textwidth,
+ colback = white, colbacktitle = paper,
+ colframe = gray!50, boxrule=0.2mm,
+ coltitle = black,
+ fonttitle = \sffamily,
+ attach boxed title to top left = {yshift=-\tcboxedtitleheight/2, xshift=\tcboxedtitlewidth/4},
+ boxed title style = {boxrule=0pt, colframe=paper},
+ before skip = 0.3cm,
+ after skip = 0.3cm,
+ top = 3mm,
+ bottom = 3mm,
+ title={\sffamily #1}]%
+}{\end{tcolorbox}}
+
+%%================================
+%% 名称
+%%================================
+\providecommand{\colorist}{{\normalfont\textsf{colorist}}}
+\providecommand{\colorart}{{\normalfont\textsf{colorart}}}
+\providecommand{\colorbook}{{\normalfont\textsf{colorbook}}}
+\providecommand{\lebhart}{{\normalfont\textsf{lebhart}}}
+\providecommand{\beaulivre}{{\normalfont\textsf{beaulivre}}}
+
+\usetikzlibrary{calc}
+
+\usepackage{blindtext}
%%================================
%% 正文
%%================================
\begin{document}
-\title{\beaulivre{},以多彩的方式排版你的图书\thanks{对应版本. \texttt{\beaulivre{} 2021/03/15}}}
-\author{锦文}
-\date{2021年3月,北京}
+% \title{\beaulivre{},以多彩的方式排版你的图书}
+% \author{许锦文}
+% \thanks{对应版本. \texttt{\beaulivre{} 2021/05/24}}
+% \date{2021年5月,北京}
-\maketitle
+% \maketitle
\frontmatter
+
+\begin{titlepage} % Suppresses displaying the page number on the title page and the subsequent page counts as page 1
+\begin{tikzpicture}[overlay,remember picture]
+ \fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(25,-7)$);
+ \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$);
+ \node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\\hspace*{-.05em}以多彩的方式排版你的图书\\[10pt]\tiny 对应版本. \texttt{\beaulivre{} 2021/05/24}}};
+ \node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{许锦文}};
+ \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{2021年5月,北京}};
+\end{tikzpicture}%
+\end{titlepage}%
+\cleardoublepage%
+
+
\chapter*{前言}
-\beaulivre{}是\colorist{}文档类系列的成员之一,整个系列包含用于排版文章的\colorart{}、\lebhart{}以及用于排版书的\colorbook{}、\beaulivre{}。我设计这一系列的初衷是为了撰写草稿与笔记,使之多彩而不缭乱。
+\beaulivre{} 是 \colorist{} 文档类系列的成员之一,其名称取自于法文的beau (美丽),以及livre (书),由二者组合而成。整个 \colorist{} 系列包含用于排版文章的 \colorart{}、\lebhart{} 以及用于排版书的 \colorbook{}、\beaulivre{}。我设计这一系列的初衷是为了撰写草稿与笔记,使之多彩而不缭乱。
-其中,\lebhart{}与\beaulivre{}支持英文、法文、中文三种语言,并且同一篇文档中三种语言可以很好地协调。由于采用了自定义字体,需要采用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 进行编译。
+\beaulivre{} 支持英文、法文、德文、中文、日文、俄文六种语言,并且同一篇文档中这些语言可以很好地协调。由于采用了自定义字体,需要用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 引擎进行编译。
-这篇说明文档是用\beaulivre{}排版的,你可以把它看作一份简短的说明与演示。
+这篇说明文档即是用 \beaulivre{} 排版的 (使用了参数 \texttt{allowbf}),你可以把它看作一份简短的说明与演示。
+\bigskip
\begin{tcolorbox}[enhanced jigsaw,pad at break*=1mm,breakable,colback=yellow!25!paper,boxrule=0pt,frame hidden]
由于\colorist{}主体是从\textsf{minimalist}系列修改而来的,因而一些页面元素还未完全重新设计,特别是目录、part和chapter的样式。这些内容会在将来逐渐加入。
\end{tcolorbox}
+\bigskip
+\begin{remind}
+ 多语言支持、定理类环境、未完成标记等功能是由 \ProjLib{} 工具箱提供的,这里只给出了将其与本文档类搭配使用的要点。如需获取更详细的信息,可以参阅 \ProjLib{} 的说明文档。
+\end{remind}
+
\tableofcontents
\mainmatter
-\chapter{关于文档类的名称与选项}
+\chapter{初始化}
-\lebhart{}取自于德文的lebhaft (活泼),并取了artikel (文章)的前三个字母组合而成。
+\section{如何载入}
-\beaulivre{}取自于法文的beau (美丽),以及livre (书),由二者组合而成。
+只需要在第一行写:
-\medskip
-你可以使用选项 \verb|fast| 来启用快速但略微粗糙的样式,主要区别是:
+\begin{code}
+ \documentclass{beaulivre}
+\end{code}
+
+即可使用 \beaulivre{} 文档类。
+
+\begin{remind}[请注意]
+ 要使用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 引擎才能编译。
+\end{remind}
+
+\section{选项}
+
+\beaulivre{} 文档类有下面几个选项:
+
+\begin{itemize}
+ \item \texttt{draft} 或 \texttt{fast}
+ \begin{itemize}
+ \item 你可以使用选项 \verb|fast| 来启用快速但略微粗糙的样式,主要区别是:
+ \begin{itemize}
+ \item 使用较为简单的数学字体设置;
+ \item 不启用超链接;
+ \item 启用 \ProjLib{} 工具箱的快速模式。
+ \end{itemize}
+ \end{itemize}
+ \item \texttt{a4paper} 或 \texttt{b5paper}
+ \begin{itemize}
+ \item 可选的纸张大小。默认的纸张大小为 8.5in $\times$ 11in。
+ \end{itemize}
+ \item \texttt{allowbf}
+ \begin{itemize}
+ \item 允许加粗。启用这一选项时,题目、各级标题、定理类环境名称会被加粗。
+ \end{itemize}
+\end{itemize}
+
+\begin{remind}
+ \begin{itemize}
+ \item 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。
+ \end{itemize}
+\end{remind}
+
+\bigskip
+另外,排版图书时常用的 \texttt{oneside}、\texttt{twoside} 选项也是可以使用的。默认采用双页排版。
+
+\chapter{关于文档类中使用的字体}
+\beaulivre{} 默认使用 Palatino Linotype 作为英文字体,方正悠宋、悠黑GBK作为中文字体,并部分使用了 Neo Euler 作为数学字体。其中,Neo Euler可以在 \url{https://github.com/khaledhosny/euler-otf} 下载。其他字体不是免费字体,需要自行购买使用。可以在方正字库网站查询详细资料:\url{https://www.foundertype.com}。
+
+\begin{remind}[字体演示]
+ \begin{itemize}
+ \item English main font. \textsf{English sans serif font}. \texttt{English typewriter font}.
+ \item 中文主要字体,\textsf{中文无衬线字体}
+ \item 数学示例: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
+ \end{itemize}
+\end{remind}
+
+\bigskip
+在没有安装相应的字体时,将采用TeX Live中自带的字体来代替,效果可能会有所折扣。
+
+
+\chapter{使用说明}
+
+接下来介绍的许多功能是由 \ProjLib{} 工具箱提供的。这里只介绍了基本使用方法,更多细节可以直接参阅其用户文档。
+
+\section{语言设置}
+
+\beaulivre{} 提供了多语言支持,包括简体中文、繁体中文、英文、法文、德文、日文、俄文。可以通过下列命令来选定语言:
+\begin{itemize}
+ \item \lstinline|\UseLanguage{|\meta{language name}\lstinline|}|,用于指定语言,在其后将使用对应的语言设定。
+ \begin{itemize}
+ \item 既可以用于导言部分,也可以用于正文部分。在不指定语言时,默认选定 “English”。
+ \end{itemize}
+ \item \lstinline|\UseOtherLanguage{|\meta{language name}\lstinline|}{|\meta{content}\lstinline|}|,用指定的语言的设定排版 \meta{content}。
+ \begin{itemize}
+ \item 相比较 \lstinline|\UseLanguage|,它不会对行距进行修改,因此中西文字混排时能够保持行距稳定。
+ \end{itemize}
+\end{itemize}
+
+\meta{language name} 有下列选择:
+\begin{itemize}
+ \item 简体中文:\texttt{Chinese}、\texttt{chinese}、\texttt{SChinese}、\texttt{schinese}、\texttt{SimplifiedChinese} \\\hspace*{5em}或 \texttt{simplifiedchinese}
+ \item 繁体中文:\texttt{TChinese}、\texttt{tchinese}、\texttt{TraditionalChinese} 或 \texttt{traditionalchinese}
+ \item 英文:\texttt{English} 或 \texttt{english}
+ \item 法文:\texttt{French} 或 \texttt{french}
+ \item 德文:\texttt{German}、\texttt{german} 或 \texttt{ngerman}
+ \item 日文:\texttt{Japanese} 或 \texttt{japanese}
+ \item 俄文:\texttt{Russian} 或 \texttt{russian}
+\end{itemize}
+
+另外,还可以通过下面的方式来填加相应语言的设置:
\begin{itemize}
- \item 使用较为简单的数学字体设置;
- \item 不使用hyperref;
- \item 所有tcolorbox使用draft模式;
- \item 使用polyglossia而不是babel来支持多语言。(使用polyglossia编译速度会略有提高,但目前对于中文的兼容不太完善,在它更加稳定后,将会考虑全面切换到polyglossia)
+ \item \lstinline|\AddLanguageSetting{|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item 向所有支持的语言增加设置 \meta{settings}。
+ \end{itemize}
+ \item \lstinline|\AddLanguageSetting(|\meta{language name}\lstinline|){|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item 向指定的语言 \meta{language name} 增加设置 \meta{settings}。
+ \end{itemize}
\end{itemize}
+例如,\lstinline|\AddLanguageSetting(German){\color{orange}}| 可以让所有德语以橙色显示(当然,还需要再加上 \lstinline|\AddLanguageSetting{\color{black}}| 来修正其他语言的颜色)。
-在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。
-\chapter{一些使用说明}
+\section{定理类环境及其引用}
-\section{定理,以及引用}
+定义、定理等环境已经被预定义,可以直接使用。
-定义、定理等环境已经被预定义,可以直接使用,例如:
+具体来说,预设的定理类环境包括:
+\texttt{assumption}、\texttt{axiom}、\texttt{conjecture}、\texttt{convention}、\texttt{corollary}、\texttt{definition}、\texttt{definition-proposition}、\texttt{definition-theorem}、\texttt{example}、\texttt{exercise}、\texttt{fact}、\texttt{hypothesis}、\texttt{lemma}、\texttt{notation}、\texttt{problem}、\texttt{property}、\texttt{proposition}、\texttt{question}、\texttt{remark}、\texttt{theorem},以及相应的带有星号 \lstinline|*| 的无编号版本。
+
+在引用定理类环境时,建议使用智能引用 \lstinline|\cref{|\meta{label}\lstinline|}|。这样就不必每次都写上相应环境的名称了。
+
+\begin{remind}[例子]
\begin{code}
\begin{definition}[奇异物品] \label{def: strange} ...
\end{code}
@@ -103,23 +248,30 @@
这是奇异物品的定义。
\end{definition}
-\begin{definition}[另一个定义]
- 不同的定义会自动粘结在一起,中间不会有空隙。
-\end{definition}
+\lstinline|\cref{def: strange}| 会显示为:\cref{def: strange}。
-引用时,可以直接使用智能引用 \lstinline|\cref{标签名称}|,例如:\lstinline|\cref{def: strange}| 会显示为:\cref{def: strange}。
+使用 \lstinline|\UseLanguage{English}| 后,定理会显示为:
-\bigskip
-下面是定理类环境的其他几种样式:
+\UseLanguage{English}
+\begin{theorem}[Useless]\label{thm}
+ A theorem in English.
+\end{theorem}
+默认情况下,引用时,定理的名称总是与定理所在区域的语言匹配,例如,上面的定义在现在的英文模式下依然显示为中文:\cref{def: strange} 和 \cref{thm}。如果在引用时想让定理的名称与当前语境相匹配,可以在全局选项中加入 \texttt{regionalref}。
+\end{remind}
+
+\medskip
+下面是定理类环境的几种主要样式:
\begin{theorem}
- Theorem style: theorem, proposition, lemma, corollary
+ Theorem style: theorem, proposition, lemma, corollary, ...
\end{theorem}
\begin{proof}
Proof style
\end{proof}
+\vspace{-\baselineskip}
+
\begin{remark}
Remark style
\end{remark}
@@ -129,132 +281,268 @@
\end{conjecture}
\begin{example*}
- Example style: example, fact
+ Example style: example, fact, ...
\end{example*}
\begin{problem}
- Problem style
+ Problem style: problem, question, ...
\end{problem}
+\medskip
+为了美观,相邻的定义环境会自动连在一起:
+\begin{definition}
+ First definition.
+\end{definition}
+
+\begin{definition}
+ Second definition.
+\end{definition}
+
+\UseLanguage{Chinese}
+
+
\section{定义新的定理型环境}
-首先定义这个环境在所用语言下的名称 \lstinline|\(name of environment)(language name)|,其中 \\\lstinline|(language name)| 是 \lstinline|EN|、\lstinline|FR|、\lstinline|CN| 等,然后用下面四种方式之一定义这一环境:
+若需要定义新的定理类环境,首先要定义这个环境在所用语言下的名称 \lstinline|\|\meta{name of environment}\meta{language abbr},其中 \meta{language abbr} 是语言的简写,分别为:
+\begin{longtable}{ll|ll}
+ \texttt{CN} & 简体中文 & \texttt{DE} & 德文\\
+ \texttt{TC} & 繁体中文 & \texttt{JP} & 日文\\
+ \texttt{EN} & 英文 & \texttt{RU} & 俄文\\
+ \texttt{FR} & 法文 & &\\
+\end{longtable}
+
+\vspace{-0.3\baselineskip}
+\begin{remind}
+ 如果要定义名称后带有星号 \lstinline|*| 的环境,那么在上面的 \meta{name of environment} 中不用写星号。
+\end{remind}
+
+然后用下面五种方式之一定义这一环境:
\begin{itemize}
- \item \lstinline|\CreateTheorem*{(name of environment)}|
- \item \lstinline|\CreateTheorem{(name of environment)}[(numbered like)]|
- \item \lstinline|\CreateTheorem{(name of environment)}<(numbered within)>|
- \item \lstinline|\CreateTheorem{(name of environment)}|
+ \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item 定义不编号的环境 \meta{name of environment}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item 定义编号环境 \meta{name of environment},按顺序编号
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
+ \begin{itemize}
+ \item 定义编号环境 \meta{name of environment},与 \meta{numbered like} 计数器共用编号
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
+ \begin{itemize}
+ \item 定义编号环境 \meta{name of environment},在 \meta{numbered within} 计数器内编号
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|\\
+ \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|
+ \begin{itemize}
+ \item 将 \meta{name of environment} 与 \meta{existed environment} 或 \meta{existed environment}\lstinline|*| 等同。
+ \item 这种方式通常在两种情况下比较有用:
+ \begin{enumerate}
+ \item 希望定义更简洁的名称。例如,使用 \lstinline|\CreateTheorem{thm}(theorem)|,便可以直接用名称 \texttt{thm} 来撰写定理。
+ \item 希望去除某些环境的编号。例如,使用 \lstinline|\CreateTheorem{remark}(remark*)|,便可以去除 \texttt{remark} 环境的编号。
+ \end{enumerate}
+ \end{itemize}
\end{itemize}
+\begin{remind}
+ 其内部使用了 \textsf{amsthm},因此传统的 \texttt{theoremstyle} 对其也是适用的,只需在相关定义前标明即可。
+\end{remind}
+
\def\proofideanameCN{思路}
-\CreateTheorem*{proofidea}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<section>
-例如,
+\bigskip
+下面提供一个例子。这三行代码:
\begin{code}
\def\proofideanameCN{思路}
- \CreateTheorem*{proofidea}
+ \CreateTheorem*{proofidea*}
+ \CreateTheorem{proofidea}<section>
\end{code}
-可以定义不编号的环境 \lstinline|proofidea|,它支持在中文环境中使用,效果如下所示:
+
+可以分别定义不编号的环境 \lstinline|proofidea*| 和编号的环境 \lstinline|proofidea| (在 section 内编号),它们支持在简体中文语境中使用,效果如下所示:
+
+\begin{proofidea*}
+ \lstinline|proofidea*| 环境。
+\end{proofidea*}
\begin{proofidea}
- ...
+ \lstinline|proofidea| 环境。
\end{proofidea}
\section{未完成标记}
你可以通过 \lstinline|\dnf| 来标记尚未完成的部分。例如:
\begin{itemize}
- \item \lstinline|\dnf|: \quad \dnf
- \item \lstinline|\dnf<还需加入…>|: \quad \dnf<还需加入…>
+ \item \lstinline|\dnf| 或 \lstinline|\dnf<...>|。效果为:\dnf~或 \dnf<...>。\\其提示文字与当前语言相对应,例如,在法语模式下将会显示为 \UseOtherLanguage{French}{\dnf}。
\end{itemize}
类似的,还有 \lstinline|\needgraph| :
\begin{itemize}
- \item \lstinline|\needgraph|: \needgraph
- \item \lstinline|\needgraph<关于…>|: \needgraph<关于…>
+ \item \lstinline|\needgraph| 或 \lstinline|\needgraph<...>|。效果为:\needgraph~或 \needgraph<...>其提示文字与当前语言相对应,例如,在法语模式下将会显示为 \UseOtherLanguage{French}{\needgraph}
\end{itemize}
-\section{语言设置}
-可以随时使用 \lstinline|\UseLanguage{语言名称}| 更改语言,语言名称包括Chinese、English、French(首字母大小写随意,例如chinese亦可)。这样,各种指令和环境的效果也会随之变动。
-
-例如,使用 \lstinline|\UseLanguage{English}| 后,定理与未完成标记会显示为:
-
-\UseLanguage{English}
-\begin{theorem}[Useless]\label{thm}
- Some theorem in English. \dnf
-\end{theorem}
-
-引用时,定理的名称总是与定理所在区域的语言匹配,例如,开头的定义在现在的英文模式下依然显示为中文:\cref{def: strange} 和 \cref{thm}。
-\UseLanguage{Chinese}
-
-\section{关于字体}
-\lebhart{}与\beaulivre{}使用Palatino Linotype作为英文字体,方正悠宋、悠黑简体作为中文字体,并部分使用了Neo Euler作为数学字体:
-\begin{itemize}
- \item English main font. \textsf{English sans serif font}.
- \item 中文主要字体,\textsf{中文无衬线字体}
- \item 数学示例: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
+% \section{关于文章标题、摘要与关键词}
+
+% % 由于引入了 \ProjLib{} 工具箱的 \textsf{PJLamssim} 组件,
+% \beaulivre{} 同时具有标准文档类与\AmS{} 文档类的一些特性。
+
+% 因此,文章的标题部分既可以按照标准文档类 \textsf{article} 的写法来写:
+
+% \begin{code}
+% \title{(*\meta{title}*)}
+% \author{(*\meta{author}*)}
+% \date{(*\meta{date}*)}
+% \maketitle
+% \begin{abstract}
+% (*\meta{abstract}*)
+% \end{abstract}
+% \begin{keyword}
+% (*\meta{keywords}*)
+% \end{keyword}
+% \end{code}
+
+% 也可以按照 \AmS{} 文档类的方式来写:
+
+% \begin{code}
+% \title{(*\meta{title}*)}
+% \author{(*\meta{author}*)}
+% \address{(*\meta{address}*)}
+% \email{(*\meta{email}*)}
+% \date{(*\meta{date}*)}
+% \keywords{(*\meta{keywords}*)}
+% \subjclass{(*\meta{subjclass}*)}
+% \begin{abstract}
+% (*\meta{abstract}*)
+% \end{abstract}
+% \maketitle
+% \end{code}
+
+% 作者信息可以包含多组,输入方式为:
+
+% \begin{code}
+% \author{(*\meta{author 1}*)}
+% \address{(*\meta{address 1}*)}
+% \email{(*\meta{email 1}*)}
+% \author{(*\meta{author 2}*)}
+% \address{(*\meta{address 2}*)}
+% \email{(*\meta{email 2}*)}
+% ...
+% \end{code}
+
+% 其中 \lstinline|\address|、\lstinline|\curraddr|、\lstinline|\email| 的相互顺序是不重要的。
+
+
+\section{目前存在的问题}
+
+\begin{itemize}[itemsep=.6em]
+ \item 对于字体的设置仍然不够完善。
+ \item 由于很多核心功能建立在 \ProjLib{} 工具箱的基础上,因此 \beaulivre{} 自然继承了其所有问题。详情可以参阅 \ProjLib{} 用户文档的“目前存在的问题”这一小节。
+ \item 错误处理功能不完善,在出现一些问题时没有相应的错误提示。
+ \item 代码中仍有许多可优化之处。
\end{itemize}
-其中,Neo Euler可以在 \url{https://github.com/khaledhosny/euler-otf} 下载。
-其他字体不是免费字体,需要自行购买使用(你可以在方正字库网站查询详细资料:\url{https://www.foundertype.com})。
+\UseLanguage{English}
-在没有安装相应的字体时,将采用TeX Live中自带的字体来代替,效果可能会有所折扣。
\chapter{文档示例}
-\singlespacing
+\vspace*{-1.5\baselineskip}
+
+\section{标准文档类写法}
+
+如果想采用标准文档类中的写法,可以参考下面的例子:
-\begin{minipage}{0.45\textwidth}
\begin{code}
-%! TEX program = xelatex
-\documentclass[fast]{lebhart}
+\documentclass{beaulivre}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
-\linenumbers
-\UseLanguage{French}
+\UseLanguage{French} % Use French from here
\begin{document}
-\title{Titre}
-\author{Nom}
-\date{03 / 2021, Lieu}
+\title{Le Titre}
+\author{Auteur}
+\date{\PJLdate{2022-04-01}}
\maketitle
-%% Texte ici
+\chapter{Un théorème}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
\end{document}
\end{code}
-\end{minipage}
-%
-\hfill
-%
-\begin{minipage}{0.45\textwidth}
+
+如果以后想切换到标准文档类,只需要将前两行换为:
+
\begin{code}
-%! TEX program = xelatex
-\documentclass[fast]{lebhart}
+\documentclass{book}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
-\linenumbers
-\UseLanguage{Chinese}
+
+% \clearpage
+\section{\texorpdfstring{\AmS{}}{AMS} 文档类写法}
+
+如果日后有意切换到期刊模版,想采用 \AmS{} 文档类中的写法,可以参考下面的例子:
+
+\begin{code}
+\documentclass{beaulivre}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
+
+\UseLanguage{French} % Use French from here
\begin{document}
-\title{标题}
-\author{姓名}
-\date{2021年3月,地点}
+\title{Le Titre}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 1}{Courriel 1}}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 2}{Courriel 2}}
+\date{\PJLdate{2022-04-01}}
+\subjclass{*****}
+\keywords{...}
\maketitle
-%% 正文部分
+\section{Première section}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
\end{document}
\end{code}
-\end{minipage}
-\par
-\bigskip
-(\lstinline|\UseLanguage| 既可以放在导言中,也可以放在正文部分,并且可以按照需要反复使用)
+这样,若想切换到 \AmS{} 文档类,只需要将前两行换为:
+
+\begin{code}
+\documentclass{amsbook}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
+
+\blinddocument
\end{document}
diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf
index 5a68cba694..52a279ea3b 100644
--- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf
+++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex
index 0b269455e8..645ba984c0 100644
--- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex
+++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex
@@ -1,22 +1,24 @@
%! TEX program = xelatex
-\PassOptionsToPackage{dvipsnames}{xcolor}
-\documentclass{beaulivre}
+\documentclass[allowbf]{beaulivre}
%%================================
-%% TeX logo and URL
+%% Import toolkit
%%================================
-\usepackage{hologo}
-\usepackage{url}
+\usepackage{PJLtoolkit}
+\usepackage{longtable} % breakable tables
+\usepackage{hologo} % more TeX logo
%%================================
%% For typestting code
%%================================
\usepackage{listings}
+\definecolor{maintheme}{RGB}{70,130,180}
+\definecolor{forestgreen}{RGB}{21,122,81}
\definecolor{lightergray}{gray}{0.99}
\lstset{language=[LaTeX]TeX,
- keywordstyle=\color{RoyalBlue},
+ keywordstyle=\color{maintheme},
basicstyle=\ttfamily,
- commentstyle=\color{ForestGreen}\ttfamily,
+ commentstyle=\color{forestgreen}\ttfamily,
stringstyle=\rmfamily,
showstringspaces=false,
breaklines=true,
@@ -29,226 +31,514 @@
firstnumber=last,
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
-\lstset{morekeywords=%
- {CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,
- linenumbers,nolinenumbers,subsection,maketitle
+\lstset{moretexcs=%
+ {linenumbers,nolinenumbers,subsection,
+ color,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
}
}
\lstnewenvironment{code}%
{\setkeys{lst}{columns=fullflexible,keepspaces=true}}{}
-\providecommand{\colorist}{\textsf{colorist}}
-\providecommand{\colorart}{\textsf{colorart}}
-\providecommand{\colorbook}{\textsf{colorbook}}
-\providecommand{\lebhart}{\textsf{lebhart}}
-\providecommand{\beaulivre}{\textsf{beaulivre}}
+%%================================
+%% remind
+%%================================
+\usepackage[many]{tcolorbox}
+\newenvironment{remind}[1][Remind]{%
+ \begin{tcolorbox}[breakable,
+ enhanced,
+ width = \textwidth,
+ colback = white, colbacktitle = paper,
+ colframe = gray!50, boxrule=0.2mm,
+ coltitle = black,
+ fonttitle = \sffamily,
+ attach boxed title to top left = {yshift=-\tcboxedtitleheight/2, xshift=\tcboxedtitlewidth/4},
+ boxed title style = {boxrule=0pt, colframe=paper},
+ before skip = 0.3cm,
+ after skip = 0.3cm,
+ top = 3mm,
+ bottom = 3mm,
+ title={\sffamily #1}]%
+}{\end{tcolorbox}}
+
+%%================================
+%% Names
+%%================================
+\providecommand{\colorist}{{\normalfont\textsf{colorist}}}
+\providecommand{\colorart}{{\normalfont\textsf{colorart}}}
+\providecommand{\colorbook}{{\normalfont\textsf{colorbook}}}
+\providecommand{\lebhart}{{\normalfont\textsf{lebhart}}}
+\providecommand{\beaulivre}{{\normalfont\textsf{beaulivre}}}
+
+\usetikzlibrary{calc}
+
+\usepackage{blindtext}
%%================================
%% Main text
%%================================
\begin{document}
-\title{\beaulivre{}, write your books in a colorful way\thanks{Corresponding to: \texttt{\beaulivre{} 2021/03/15}}}
-\author{Jinwen}
-\date{March 2021, Beijing}
+% \title{\beaulivre{}, write your books in a colorful way}
+% \author{Jinwen XU}
+% \thanks{Corresponding to: \texttt{\beaulivre{} 2021/05/24}}
+% \date{May 2021, Beijing}
-\maketitle
+% \maketitle
+
+\frontmatter
+
+\begin{titlepage} % Suppresses displaying the page number on the title page and the subsequent page counts as page 1
+\begin{tikzpicture}[overlay,remember picture]
+ \fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(25,-7)$);
+ \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$);
+ \node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\\textsc{Write your books in \\a colorful way}\\[10pt]\tiny Corresponding to: \texttt{\beaulivre{} 2021/05/24}}};
+ \node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{Jinwen XU}};
+ \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{May 2021, Beijing}};
+\end{tikzpicture}%
+\end{titlepage}%
+\cleardoublepage%
\frontmatter
\chapter*{Preface}
-\beaulivre{} is a member of the \colorist{} class series. The entire collection includes \colorart{} and \lebhart{} for typesetting articles and \colorbook{} and \beaulivre{} for typesetting books. My original intention in designing this series was to write drafts and notes that look colorful yet not dazzling.
+\beaulivre{} is a member of the \colorist{} class series. Its name is taken from French words ``beau'' (for ``beautiful'') and ``livre'' (for ``book''). The entire collection includes \colorart{} and \lebhart{} for typesetting articles and \colorbook{} and \beaulivre{} for typesetting books. My original intention in designing this series was to write drafts and notes that look colorful yet not dazzling.
-Among them, \lebhart{} and \beaulivre{} support three languages: English, French, and Chinese, and these three languages can be switched seamlessly in a single document. Due to the usage of custom fonts, they need to be compiled with \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
+\beaulivre{} supports six languages: English, French, German, Chinese, Japanese and Russian. These languages can be switched seamlessly in a single document. Due to the usage of custom fonts, \beaulivre{} requires \hologo{XeLaTeX} or \hologo{LuaLaTeX} to compile.
-This documentation is typeset using \beaulivre{}. You can think of it as a short introduction and demonstration.
+This documentation is typeset using \beaulivre{} (with the option \texttt{allowbf}). You can think of it as a short introduction and demonstration.
+\bigskip
\begin{tcolorbox}[enhanced jigsaw,pad at break*=1mm,breakable,colback=yellow!25!paper,boxrule=0pt,frame hidden]
Since the main body of \colorist{} is modified from the \textsf{minimalist} series, some elements have not been completely redesigned yet, especially the TOC, part and chapter style. These will be added gradually in the future versions.
\end{tcolorbox}
+\bigskip
+\begin{remind}
+ Multi-language support, theorem-like environments, draft marks and some other features are provided by the \ProjLib{} toolkit. Here we only briefly discuss how to use it with this document class. For more detailed information, you can refer to the documentation of \ProjLib{}.
+\end{remind}
+
\tableofcontents
\mainmatter
-\chapter{On the naming and options}
+\chapter{Initialization}
+
+\section{How to load}
+
+One only needs to put
+\begin{code}
+ \documentclass{beaulivre}
+\end{code}
+as the first line to use the \beaulivre{} class.
+
+\begin{remind}[Attention]
+ You need to use either \hologo{XeLaTeX} or \hologo{LuaLaTeX} engine to compile.
+\end{remind}
+
+\section{Options}
+
+\beaulivre{} offers the following options:
+
\begin{itemize}
- \item \lebhart{} is taken from German word ``lebhaft'' (``vividly''), combined with the first three letters of ``artikel'' (``article'').
- \item \beaulivre{} is taken from French words ``beau'' (for ``beautiful'') and ``livre'' (for ``book'').
+ \item \texttt{draft} or \texttt{fast}
+ \begin{itemize}
+ \item The option \verb|fast| enables a faster but slightly rougher style, main differences are:
+ \begin{itemize}
+ \item Use simpler math font configuration;
+ \item Do not use hyperref;
+ \item Enable the fast mode of \ProjLib{} toolkit.
+ \end{itemize}
+ \end{itemize}
+ \item \texttt{a4paper} or \texttt{b5paper}
+ \begin{itemize}
+ \item Optional paper size. The default paper size is 8.5in $\times$ 11in.
+ \end{itemize}
+ \item \texttt{allowbf}
+ \begin{itemize}
+ \item Allow boldface. When this option is enabled, the title, titles of all levels and names of theorem-like environments will be bolded.
+ \end{itemize}
\end{itemize}
-You can use the option \verb|fast| to enable a fast but slightly rough version. The main differences are:
+\begin{remind}
+ \begin{itemize}
+ \item During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark "DRAFT" to indicate that you are currently in the draft mode.
+ \end{itemize}
+\end{remind}
+
+\bigskip
+In addition, the commonly used \texttt{oneside} and \texttt{twoside} options are also available. Two-page layout is used by default.
+
+\chapter{On the fonts}
+By default, \beaulivre{} uses Palatino Linotype as the English font, FounderType's YouSong and YouHei GBK as the Chinese fonts, and partially uses Neo Euler as the math font. Among them, Neo Euler can be downloaded at \url{https://github.com/khaledhosny/euler-otf}. The other fonts are not free, you need to purchase and use them on your own. (For the Chinese fonts, visit FounderType's website for detail: \url{https://www.foundertype.com} ).
+
+\medskip
+\begin{remind}[Font demonstration]
+ \begin{itemize}
+ \item English main font. \textsf{English sans serif font}. \texttt{English typewriter font}.
+ \item 中文主要字体,\textsf{中文无衬线字体}
+ \item 数学示例: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
+ \end{itemize}
+\end{remind}
+
+\bigskip
+When the corresponding font is not installed, fonts that comes with TeX Live will be used instead. In this case, the experience might be reduced.
+
+
+\chapter{Some instructions}
+
+% \vspace{-\baselineskip}
+Many of the features described next are provided by the \ProjLib{} toolkit. Only the basic usage is mentioned here. For more details, please refer to its user documentation.
+
+\section{Language configuration}
+
+\beaulivre{} has multi-language support, including simplified Chinese, traditional Chinese, English, French, German, Japanese, and Russian. The language can be selected by the following macros:
+
\begin{itemize}
- \item Use simpler math font configuration;
- \item Do not use hyperref;
- \item Use draft mode for all tcolorboxes;
- \item Use polyglossia instead of babel to support multiple languages. (Using polyglossia will increase the compilation speed slightly, but the current compatibility with Chinese is not perfect. When it becomes more stable, I will consider fully switching to polyglossia)
+ \item \lstinline|\UseLanguage{|\meta{language name}\lstinline|}| is used to specify the language. The corresponding setting of the language will be applied after it. It can be used either in the preamble or in the main body. When no language is specified, ``English" is selected by default.
+ \item \lstinline|\UseOtherLanguage{|\meta{language name}\lstinline|}{|\meta{content}\lstinline|}|, which uses the specified language settings to typeset \meta{content}. Compared with \lstinline|\UseLanguage|, it will not modify the line spacing, so line spacing would remain stable when CJK and Western texts are mixed.
\end{itemize}
-During the writing stage of your document, it is recommended to use the \verb|fast| option to speed up compilation and improve the smoothness of your writing experience. At the end, you can remove the ``fast'' mark to get the final version.
+\meta{language name} can be:
+\begin{itemize}
+ \item Simplified Chinese: \texttt{Chinese}, \texttt{chinese}, \texttt{SChinese}, \texttt{schinese}, \texttt{SimplifiedChinese} or \texttt{simplifiedchinese}
+ \item Traditional Chinese: \texttt{TChinese}, \texttt{tchinese}, \texttt{TraditionalChinese} or \texttt{traditionalchinese}
+ \item English: \texttt{English} or \texttt{english}
+ \item French: \texttt{French} or \texttt{french}
+ \item German: \texttt{German}, \texttt{german} or \texttt{ngerman}
+ \item Japanese: \texttt{Japanese} or \texttt{japanese}
+ \item Russian: \texttt{Russian} or \texttt{russian}
+\end{itemize}
-\chapter{Some instructions}
+\medskip
+In addition, you can also add new settings to selected language:
+\begin{itemize}
+ \item \lstinline|\AddLanguageSetting{|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item Add \meta{settings} to all supported languages.
+ \end{itemize}
+ \item \lstinline|\AddLanguageSetting(|\meta{language name}\lstinline|){|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item Add \meta{settings} to the selected language \meta{language name}.
+ \end{itemize}
+\end{itemize}
+For example, \lstinline|\AddLanguageSetting(German){\color{orange}}| can make all German text displayed in orange (of course, one then need to add \lstinline|\AddLanguageSetting{\color{black}}| in order to correct the color of the text in other languages).
+\clearpage
\section{Theorems and how to reference them}
-Environments such as definitions and theorems have been pre-defined and can be used directly, for example:
+Environments such as definitions and theorems have been pre-defined and can be used directly.
+
+More specifically, preset environments include:
+\texttt{assumption}, \texttt{axiom}, \texttt{conjecture}, \texttt{convention}, \texttt{corollary}, \texttt{definition}, \texttt{definition-proposition}, \texttt{definition-theorem}, \texttt{example}, \texttt{exercise}, \texttt{fact}, \texttt{hypothesis}, \texttt{lemma}, \texttt{notation}, \texttt{problem}, \texttt{property}, \texttt{proposition}, \texttt{question}, \texttt{remark}, \texttt{theorem}, and the corresponding unnumbered version with an asterisk \lstinline|*| in the name. The display of these environments will change according to the current language.
+
+When referencing a theorem-like environment, it is recommended to use clever reference \lstinline|\cref{|\meta{label}\texttt{\}}. In this way, there is no need to explicitly write down the name of the corresponding environment every time.
+
+\begin{remind}[Example]
\begin{code}
\begin{definition}[Strange things] \label{def: strange} ...
\end{code}
+
will produce
\begin{definition}[Strange things]\label{def: strange}
This is the definition of some strange objects.
\end{definition}
-\begin{definition}[Another definition]
- Different definitions are automatically glued together, and there will be no gaps in between.
-\end{definition}
+\lstinline|\cref{def: strange}| will be displayed as: \cref{def: strange}.
-When referencing, you can directly use clever reference \lstinline|\cref{(label name)}|. For example, \lstinline|\cref{def: strange}| will be displayed as: \cref{def: strange}.
+After using \lstinline|\UseLanguage{French}|, a theorem will be displayed as:
-\bigskip
-The following are several other styles of theorem-like environments:
+\UseLanguage{French}
+\begin{theorem}[Inutile]\label{thm}
+ Un théorème en français.
+\end{theorem}
+
+By default, when referenced, the name of the theorem always matches the language of the context in which the theorem is located. For example, the definition above is still displayed in English in the current French mode: \cref{def: strange} and \cref{thm}. If you want the name of the theorem to match the current context when referencing, you can add \texttt{regionalref} to the global options.
+\end{remind}
+\medskip
+The following are the main styles of theorem-like environments:
\begin{theorem}
- Theorem style: theorem, proposition, lemma, corollary
+ Theorem style: theorem, proposition, lemma, corollary, ...
\end{theorem}
\begin{proof}
Proof style
\end{proof}
+\vspace{-\baselineskip}
\begin{remark}
Remark style
\end{remark}
+\vspace{-.5\baselineskip}
\begin{conjecture}
Conjecture style
\end{conjecture}
\begin{example*}
- Example style: example, fact
+ Example style: example, fact, ...
\end{example*}
\begin{problem}
- Problem style
+ Problem style: problem, question, ...
\end{problem}
+\medskip
+For aesthetics, adjacent definitions will be connected together automatically:
+\begin{definition}
+ First definition.
+\end{definition}
+
+\begin{definition}
+ Second definition.
+\end{definition}
+
+\UseLanguage{English}
+
+\bigskip
\section{Define a new theorem-like environment}
-First define the name of this environment in the language used: \lstinline|\(name of environment)(language name)|. Where \lstinline|(language name)| can be \lstinline|EN|, \lstinline|FR|, \lstinline|CN|, etc., and then define this environment in one of the following four ways:
+If you need to define a new theorem-like environment, you must first define the name of the environment in the language used: \lstinline|\|\meta{name of environment}\meta{language abbr}, where \meta{language abbr} is the abbreviation of language, which can be:
+% \vspace{-.5\baselineskip}
+\begin{longtable}{ll|ll}
+ \texttt{CN} & Simplified Chinese & \texttt{DE} & German\\
+ \texttt{TC} & Traditional Chinese & \texttt{JP} & Japanese\\
+ \texttt{EN} & English & \texttt{RU} & Russian\\
+ \texttt{FR} & French & &\\
+\end{longtable}
+
+\vspace{-.5\baselineskip}
+\begin{remind}
+ If you want to define an environment with an asterisk \lstinline|*| after the name, you don't need to write an asterisk in the \meta{name of environment} above. See the example below.
+\end{remind}
+
+% \clearpage
+And then define this environment in one of following five ways:
\begin{itemize}
- \item \lstinline|\CreateTheorem*{(name of environment)}|
- \item \lstinline|\CreateTheorem{(name of environment)}[(numbered like)]|
- \item \lstinline|\CreateTheorem{(name of environment)}<(numbered within)>|
- \item \lstinline|\CreateTheorem{(name of environment)}|
+ \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item Define an unnumbered environment \meta{name of environment}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item Define a numbered environment \meta{name of environment}, numbered in order 1,2,3,\dots
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
+ \begin{itemize}
+ \item Define a numbered environment \meta{name of environment}, which shares the counter \meta{numbered like}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
+ \begin{itemize}
+ \item Define a numbered environment \meta{name of environment}, numbered within the \\counter \meta{numbered within}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|\\
+ \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|
+ \begin{itemize}
+ \item Identify \meta{name of environment} with \meta{existed environment} or \meta{existed environment}\lstinline|*|.
+ \item This method is usually useful in the following two situations:
+ \begin{enumerate}
+ \item To use a more concise name. For example, with \lstinline|\CreateTheorem{thm}|\\\lstinline|(theorem)|, one can then use the name \texttt{thm} to write theorem.
+ \item To remove the numbering. For example, one can remove the numbering of the \texttt{remark} environment with \lstinline|\CreateTheorem{remark}(remark*)|.
+ \end{enumerate}
+ \end{itemize}
\end{itemize}
+\begin{remind}
+ It uses \textsf{amsthm} internally, so the traditional \texttt{theoremstyle} is also applicable to it. One only needs declare the style before the relevant definitions.
+\end{remind}
+
\def\proofideanameEN{Idea}
-\CreateTheorem*{proofidea}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<section>
-For example,
+\bigskip
+Here is an example. The following code:
\begin{code}
\def\proofideanameEN{Idea}
- \CreateTheorem*{proofidea}
+ \CreateTheorem*{proofidea*}
+ \CreateTheorem{proofidea}<section>
\end{code}
-defines an unnumbered environment \lstinline|proofidea|, which supports using in the English context, and the effect is as follows:
+defines an unnumbered environment \lstinline|proofidea*| and a numbered environment \lstinline|proofidea| (numbered within section) respectively. They can be used in English context. The effect is as follows:
+
+\begin{proofidea*}
+ The \lstinline|proofidea*| environment.
+\end{proofidea*}
\begin{proofidea}
- ...
+ The \lstinline|proofidea| environment.
\end{proofidea}
+\clearpage
\section{Draft mark}
You can use \lstinline|\dnf| to mark the unfinished part. For example:
\begin{itemize}
- \item \lstinline|\dnf|: \quad \dnf
- \item \lstinline|\dnf<Still need ...>|: \quad \dnf<Still need ...>
+ \item \lstinline|\dnf| or \lstinline|\dnf<...>|. The effect is: \dnf~ or \dnf<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\dnf} in French mode.
\end{itemize}
-Similarly, there is \lstinline|\needgraph| :
+Similarly, there is \lstinline|\needgraph| :
\begin{itemize}
- \item \lstinline|\needgraph|: \needgraph
- \item \lstinline|\needgraph<About ...>|: \needgraph<About ...>
+ \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \needgraph or \needgraph<...>The prompt text changes according to the current language. For example, in French mode, it will be displayed as \UseOtherLanguage{French}{\needgraph}
\end{itemize}
-\section{Language configuration}
-You can use \lstinline|\UseLanguage{(name of language))}| at any time to change the language, Language names include Chinese, English, French (the case of the first letter is arbitrary, for example, ``chinese'' is also acceptable). With this, the effects of various commands and environments will also change accordingly.
-
-For example, after using \lstinline|\UseLanguage{French}|, the theorem and the draft mark will be displayed as:
-
-\UseLanguage{French}
-\begin{theorem}[Inutile]\label{thm}
- Un théorème en français. \dnf
-\end{theorem}
-
-When referenced, the name of the theorem always matches the language of the region in which the theorem is located, for example, the definition of the beginning is still displayed in English in the current French mode: \cref{def: strange} and \cref{thm}.
-
-\UseLanguage{English}
-
-\section{On the fonts}
-\lebhart{} and \beaulivre{} use Palatino Linotype as the English font, FounderType's YouSong and YouHei Simplified as the Chinese fonts, and partially use Neo Euler as the mathematical font:
-\begin{itemize}
- \item English main font. \textsf{English sans serif font}.
- \item 中文主要字体, \textsf{中文无衬线字体}
- \item Math demonstration: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
+% \vspace{-.5\baselineskip}
+% \section{On the title, abstract and keywords}
+
+% \beaulivre{} has both the features of standard classes and that of the \AmS{} classes.
+
+% Therefore, the title part can either be written in the usual way, in accordance with the standard class \textsf{article}:
+
+% \begin{code}
+% \title{(*\meta{title}*)}
+% \author{(*\meta{author}*)}
+% \date{(*\meta{date}*)}
+% \maketitle
+% \begin{abstract}
+% (*\meta{abstract}*)
+% \end{abstract}
+% \begin{keyword}
+% (*\meta{keywords}*)
+% \end{keyword}
+% \end{code}
+
+% \vspace{-.5\baselineskip}
+% or written in the way of \AmS{} classes:
+
+% \begin{code}
+% \title{(*\meta{title}*)}
+% \author{(*\meta{author}*)}
+% \address{(*\meta{address}*)}
+% \email{(*\meta{email}*)}
+% \date{(*\meta{date}*)}
+% \keywords{(*\meta{keywords}*)}
+% \subjclass{(*\meta{subjclass}*)}
+% \begin{abstract}
+% (*\meta{abstract}*)
+% \end{abstract}
+% \maketitle
+% \end{code}
+
+% \medskip
+% The author information can contain multiple groups, written as:
+
+% \begin{code}
+% \author{(*\meta{author 1}*)}
+% \address{(*\meta{address 1}*)}
+% \email{(*\meta{email 1}*)}
+% \author{(*\meta{author 2}*)}
+% \address{(*\meta{address 2}*)}
+% \email{(*\meta{email 2}*)}
+% ...
+% \end{code}
+
+% Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| is not important.
+
+
+\section{Known issues}
+
+\begin{itemize}[itemsep=.6em]
+ \item The font settings are still not perfect.
+ \item Since many features are based on the \ProjLib{} toolkit, \beaulivre{} inherits all its problems. For details, please refer to the "Known Issues" section of the \ProjLib{} documentation.
+ \item The error handling mechanism is incomplete: there is no corresponding error prompt when some problems occur.
+ \item There are still many things that can be optimized in the code.
\end{itemize}
-Among them, Neo Euler can be downloaded at \url{https://github.com/khaledhosny/euler-otf}. Other fonts are not free, you need to purchase and use them on your own. (For the Chinese fonts, visit FounderType's website for detail: \url{https://www.foundertype.com} ).
-
-When the corresponding font is not installed, the font that comes with TeX Live will be used instead, and the experience might be reduced.
\chapter{Document templates}
-\singlespacing
+% \vspace*{-1.5\baselineskip}
+
+\section{The standard way}
+
+If you want to write in the standard way, you can refer to the following example:
-\begin{minipage}{0.45\textwidth}
\begin{code}
-%! TEX program = xelatex
-\documentclass[fast]{lebhart}
+\documentclass{beaulivre}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
-\linenumbers
-\UseLanguage{French}
+\UseLanguage{French} % Use French from here
\begin{document}
-\title{Titre}
-\author{Nom}
-\date{03 / 2021, Lieu}
+\title{Le Titre}
+\author{Auteur}
+\date{\PJLdate{2022-04-01}}
\maketitle
-%% Texte ici
+\chapter{Un théorème}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
\end{document}
\end{code}
-\end{minipage}
-%
-\hfill
-%
-\begin{minipage}{0.45\textwidth}
+
+If you wish to switch to the standard class later, just replace the first two lines with:
+
\begin{code}
-%! TEX program = xelatex
-\documentclass[fast]{lebhart}
+\documentclass{article}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
+
+
+\clearpage
+\section{The \texorpdfstring{\AmS{}}{AMS} way}
-\linenumbers
-\UseLanguage{Chinese}
+If you intend to switch to the journal template in the future and thus want to use the writing style as in the \AmS{} classes, you can refer to the following example:
+
+\begin{code}
+\documentclass{beaulivre}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
+
+\UseLanguage{French} % Use French from here
\begin{document}
-\title{标题}
-\author{姓名}
-\date{2021年3月,地点}
+\title{Le Titre}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 1}{Courriel 1}}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 2}{Courriel 2}}
+\date{\PJLdate{2022-04-01}}
+\subjclass{*****}
+\keywords{...}
\maketitle
-%% 正文部分
+\chapter{Première section}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
\end{document}
\end{code}
-\end{minipage}
-\par
-\bigskip
-(\lstinline|\UseLanguage| can be placed either in the preamble or in the body part, and can be used repeatedly as needed)
+\vspace{-0.3\baselineskip}
+In this way, if you wish to switch to \AmS{} class later, just replace the first two lines with:
+
+\begin{code}
+\documentclass{amsart}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
+
+\blinddocument
\end{document}
diff --git a/macros/unicodetex/latex/beaulivre/beaulivre.cls b/macros/unicodetex/latex/beaulivre/beaulivre.cls
index 694a337fae..e1fa8d3e8b 100644
--- a/macros/unicodetex/latex/beaulivre/beaulivre.cls
+++ b/macros/unicodetex/latex/beaulivre/beaulivre.cls
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{beaulivre}
- [2021/03/15 A colorful book style]
+ [2021/05/24 A colorful book style]
\def\colorclass@baseclass{book}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -27,6 +27,12 @@
}
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
+
+\newif\if@colorclass@bfivepaper\@colorclass@bfivepaperfalse
+\DeclareVoidOption{b5paper}{\@colorclass@bfivepapertrue}
+\newif\if@colorclass@afourpaper\@colorclass@afourpaperfalse
+\DeclareVoidOption{a4paper}{\@colorclass@afourpapertrue}
+
\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{\colorclass@baseclass}}
\ProcessKeyvalOptions*\relax
\LoadClass{\colorclass@baseclass}
@@ -37,23 +43,41 @@
%%================================
%% Page layout
%%================================
+\RequirePackage{silence}
+\WarningFilter{geometry}{Over-specification in}
\RequirePackage[heightrounded]{geometry}
\geometry{
- % papersize={8in,11in},
+ papersize={8.5in,11in},
+ total={47em,66em},
+ hmarginratio=1:1,
+ vmarginratio=1:1,
+ footnotesep=2em plus 2pt minus 2pt,
+}
+\if@colorclass@bfivepaper
+\geometry{
+ b5paper,
+ total={40em,59em},
+ hmarginratio=1:1,
+ vmarginratio=1:1,
+ footnotesep=2em plus 2pt minus 2pt,
+}
+\fi
+\if@colorclass@afourpaper
+\geometry{
a4paper,
total={47em,70em},
hmarginratio=1:1,
vmarginratio=1:1,
footnotesep=2em plus 2pt minus 2pt,
}
+\fi
\RequirePackage{indentfirst}
\if@colorclass@fast
\PassOptionsToPackage{fast}{colorist}
-\fi
-\if@colorclass@fast
- \PassOptionsToPackage{polyglossia}{colorist}
+ \RequirePackage{draftwatermark}
+ \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95}
\fi
\RequirePackage{colorist}
@@ -71,27 +95,32 @@
\IfFontExistsTF{Palatino Linotype}{%
\setmainfont{Palatino Linotype}
}{
- \setmainfont{texgyrepagella-regular.otf}[
- BoldFont = texgyrepagella-bold.otf ,
- ItalicFont = texgyrepagella-italic.otf ,
- BoldItalicFont = texgyrepagella-bolditalic.otf ]
+ \setmainfont{TeXGyrePagellaX-Regular.otf}[
+ BoldFont = TeXGyrePagellaX-Bold.otf ,
+ ItalicFont = TeXGyrePagellaX-Italic.otf ,
+ BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf ]
}
\setsansfont{SourceSansPro-Regular.otf}[
- Scale = MatchLowercase,
+ Scale = MatchLowercase ,
BoldFont = SourceSansPro-Bold.otf ,
ItalicFont = SourceSansPro-RegularIt.otf ,
BoldItalicFont = SourceSansPro-BoldIt.otf ]
+ \setmonofont{cmuntt.otf}[
+ Scale = 1.05 ,
+ BoldFont = cmuntb.otf ,
+ ItalicFont = cmunst.otf ,
+ BoldItalicFont = cmuntb.otf ]
%% Chinese fonts
\PassOptionsToPackage{fontset=none,scheme=plain}{ctex}
\RequirePackage{ctex}
-\IfFontExistsTF{FZYouSongS 507R}{%
- \setCJKmainfont{FZYouSongS 507R}[
- BoldFont = FZYouSongS 509R ,
- BoldFeatures = {FakeBold=2} ,
+\IfFontExistsTF{FZYOUSK_507R--GBK1-0}{%
+ \setCJKmainfont{FZYOUSK_507R--GBK1-0}[
+ BoldFont = FZYOUSK_509R--GBK1-0 ,
+ BoldFeatures = {FakeBold=4} ,
ItalicFont = * ,
- BoldItalicFont = FZYouSongS 509R ,
- BoldItalicFeatures = {FakeBold=2} ,
+ BoldItalicFont = FZYOUSK_509R--GBK1-0 ,
+ BoldItalicFeatures = {FakeBold=4} ,
SmallCapsFont = * ]
}{
\setCJKmainfont{FandolSong-Regular.otf}[
@@ -101,13 +130,13 @@
BoldItalicFeatures = {FakeBold=4} ,
SmallCapsFont = * ]
}
-\IfFontExistsTF{FZYouSongS 507R}{%
- \setCJKmonofont{FZYouSongS 507R}[
- BoldFont = FZYouSongS 509R ,
- BoldFeatures = {FakeBold=2} ,
+\IfFontExistsTF{FZYOUSK_507R--GBK1-0}{%
+ \setCJKmonofont{FZYOUSK_507R--GBK1-0}[
+ BoldFont = FZYOUSK_509R--GBK1-0 ,
+ BoldFeatures = {FakeBold=4} ,
ItalicFont = * ,
- BoldItalicFont = FZYouSongS 509R ,
- BoldItalicFeatures = {FakeBold=2} ,
+ BoldItalicFont = FZYOUSK_509R--GBK1-0 ,
+ BoldItalicFeatures = {FakeBold=4} ,
SmallCapsFont = * ]
}{
\setCJKmonofont{FandolFang-Regular.otf}[
@@ -118,11 +147,12 @@
BoldItalicFeatures = {FakeBold=4} ,
SmallCapsFont = * ]
}
-\IfFontExistsTF{FZYouHeiS 506L}{%
- \setCJKsansfont{FZYouHeiS 506L}[
- BoldFont = FZYouHeiS 509R,
+\IfFontExistsTF{FZYOUHK_506L--GBK1-0}{%
+ \setCJKsansfont{FZYOUHK_506L--GBK1-0}[
+ BoldFont = FZYOUHK_509R--GBK1-0 ,
+ BoldFeatures = {FakeBold=4} ,
ItalicFont = * ,
- BoldItalicFont = FZYouHeiS 509R ,
+ BoldItalicFont = FZYOUHK_509R--GBK1-0 ,
SmallCapsFont = * ]
}{
\setCJKsansfont{FandolHei-Regular.otf}[
@@ -133,14 +163,16 @@
}
%% Math font
-\if@colorclass@fast\else
+\if@colorclass@fast
+\RequirePackage{amssymb}
+\else
\PassOptionsToPackage
{warnings-off={mathtools-colon,mathtools-overbracket}}{unicode-math}
\RequirePackage{unicode-math}
-\unimathsetup{math-style=ISO}
+\unimathsetup{math-style=ISO, partial=upright, nabla=upright}
\setmathfont{Asana-Math.otf}
\IfFontExistsTF{Neo Euler}{%
-\setmathfont{Neo Euler} % From https://tex.stackexchange.com/a/425887
+\setmathfont{Neo Euler}
[range={"0000-"0001,"0020-"007E,
"00A0,"00A7-"00A8,"00AC,"00AF,"00B1,"00B4-"00B5,"00B7,
"00D7,"00F7,
@@ -167,9 +199,22 @@
"1D507-"1D50A,"1D50D-"1D514,"1D516-"1D51C,"1D51E-"1D537,
"1D56C-"1D59F,"1D6A8-"1D6B8,"1D6BA-"1D6D2,"1D6D4-"1D6DD,
"1D6DF,"1D6E1,"1D7CE-"1D7D7 }]
+\setmathfont[range=up/{greek,Greek}, script-features={}, sscript-features={}
+ ]{Neo Euler}
+\setmathfont[range=up/{latin,Latin}, script-features={}, sscript-features={}
+ ]{Neo Euler}
+\setmathfont[range={bfup/{latin, Latin, greek, Greek}, frak, bffrak, cal},
+ script-features={}, sscript-features={}
+ ]{Neo Euler}
+\setmathfont[range={up/num, bfup/num, it, bfit, scr, bfscr,
+ sfup, sfit, bfsfup, bfsfit, tt}
+ ]{Asana-Math.otf}
+\setmathfont[range=bfcal, Scale=MatchUppercase, Alternate]{Asana-Math.otf}
}{}
\fi
+\def\PJL@font@alreadyset{}
+
\RequirePackage[verbose=silent]{microtype}
%%================================
@@ -178,60 +223,15 @@
\RequirePackage{graphicx}
\graphicspath{{images/}}
\RequirePackage{wrapfig}
+\RequirePackage{float}
\RequirePackage{caption}
+\captionsetup{font=small}
%%================================
%% Index
%%================================
\RequirePackage{imakeidx}
-%%================================
-%% Draft mark
-%%================================
-\def\dnfFont{\ttfamily}
-\def\needgraphFont{\ttfamily}
-
-\def\dnfTextEN{To be finished here}
-\def\needgraphTextEN{A graph is needed here}
-\def\dnfTextFR{À terminer ici}
-\def\needgraphTextFR{Il manque encore un graphique ici}
-\def\dnfTextCN{这里的内容尚未完成}
-\def\needgraphTextCN{这里需要一张图片}
-
-\definecolor{dnfColor}{RGB}{21,122,20}
-\definecolor{needgraphColor}{RGB}{70,130,180}
-
-\if@colorclass@fast
- \newcommand{\plainBox}[2][-paper]{\textcolor{#1}{%
- \setlength{\fboxsep}{1.5pt}%
- \setlength{\fboxrule}{1.2pt}%
- \fbox{#2}}}
-\else
- \PassOptionsToPackage{many}{tcolorbox}
- \RequirePackage{tcolorbox}
- \newtcbox{\plainBox}[1][-paper]{enhanced jigsaw,%
- on line, arc = 1.2pt, outer arc = 1pt,breakable,%
- colframe = #1,colupper=#1,opacityback=0,%
- boxsep = 1pt,boxrule = 1.2pt,%
- left = 1pt, right = 1pt, top = 0pt, bottom = 0pt,%
- }
-\fi
-
-\NewDocumentCommand{\dnf}{d<>}{%
- \noindent\plainBox[dnfColor]%
- {\normalfont\dnfFont\bfseries\small%
- \csname dnfText\csname\languagename ABBR\endcsname\endcsname%
- \IfNoValueF{#1}{ : #1}}%
-}
-\NewDocumentCommand{\needgraph}{d<>}{%
- \par%
- \centerline{\plainBox[needgraphColor]%
- {\normalfont\needgraphFont\bfseries\small%
- \csname needgraphText\csname\languagename ABBR\endcsname\endcsname%
- \IfNoValueF{#1}{ : #1}}}%
- \par%
-}
-
\endinput
%%
%% End of file `beaulivre/beaulivre.cls'.
diff --git a/macros/unicodetex/latex/einfart/README.md b/macros/unicodetex/latex/einfart/README.md
index 0984daa1d4..58ceae6fbf 100644
--- a/macros/unicodetex/latex/einfart/README.md
+++ b/macros/unicodetex/latex/einfart/README.md
@@ -5,10 +5,11 @@
`einfart` is a LaTeX class for typesetting articles, which has a simple and
clear design.
-Currently, it has native support to English, French and Chinese typesetting. And
-it may compile with either XeLaTeX or LuaLaTeX.
+Currently, it has native support to Chinese (simplified and traditional),
+English, French, German, Japanese and Russian typesetting. And it may compile
+with either XeLaTeX or LuaLaTeX.
-This is part of the minimalist class series.
+This is part of the `minimalist` class series.
# License
diff --git a/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf b/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf
index 54f896a49c..fece759401 100644
--- a/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf
+++ b/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/einfart/einfart-doc-cn.tex b/macros/unicodetex/latex/einfart/einfart-doc-cn.tex
index 984b1d075a..058440e3fa 100644
--- a/macros/unicodetex/latex/einfart/einfart-doc-cn.tex
+++ b/macros/unicodetex/latex/einfart/einfart-doc-cn.tex
@@ -1,25 +1,28 @@
%! TEX program = xelatex
-\PassOptionsToPackage{dvipsnames}{xcolor}
\documentclass{einfart}
\linenumbers % 开启行号
-\UseLanguage{Chinese}
%%================================
-%% TeX logo 与 网址
+%% 引入工具集
%%================================
-\usepackage{hologo}
-\usepackage{url}
+\usepackage{PJLtoolkit}
+\usepackage{longtable} % breakable tables
+\usepackage{hologo} % more TeX logo
+
+\UseLanguage{Chinese}
%%================================
%% 排版代码
%%================================
\usepackage{listings}
+\definecolor{maintheme}{RGB}{70,130,180}
+\definecolor{forestgreen}{RGB}{21,122,81}
\definecolor{lightergray}{gray}{0.99}
\lstset{language=[LaTeX]TeX,
- keywordstyle=\color{RoyalBlue},
+ keywordstyle=\color{maintheme},
basicstyle=\ttfamily,
- commentstyle=\color{ForestGreen}\ttfamily,
+ commentstyle=\color{forestgreen}\ttfamily,
stringstyle=\rmfamily,
showstringspaces=false,
breaklines=true,
@@ -32,9 +35,9 @@
firstnumber=last,
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
-\lstset{morekeywords=%
- {CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,
- linenumbers,nolinenumbers,subsection,maketitle
+\lstset{moretexcs=%
+ {linenumbers,nolinenumbers,subsection,
+ color,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
}
}
\lstnewenvironment{code}%
@@ -43,6 +46,31 @@
}
{\ResumeLineNumbers}
+%%================================
+%% remind
+%%================================
+\usepackage[many]{tcolorbox}
+\newenvironment{remind}[1][提示]{%
+ \LocallyStopLineNumbers%
+ \begin{tcolorbox}[breakable,
+ enhanced,
+ width = \textwidth,
+ colback = white, colbacktitle = paper,
+ colframe = gray!50, boxrule=0.2mm,
+ coltitle = black,
+ fonttitle = \sffamily,
+ attach boxed title to top left = {yshift=-\tcboxedtitleheight/2, xshift=\tcboxedtitlewidth/4},
+ boxed title style = {boxrule=0pt, colframe=paper},
+ before skip = 0.3cm,
+ after skip = 0.3cm,
+ top = 3mm,
+ bottom = 3mm,
+ title={\sffamily #1}]%
+}{\end{tcolorbox}\ResumeLineNumbers}
+
+%%================================
+%% 名称
+%%================================
\providecommand{\minimalist}{\textsf{minimalist}}
\providecommand{\minimart}{\textsf{minimart}}
\providecommand{\minimbook}{\textsf{minimbook}}
@@ -54,111 +82,298 @@
%%================================
\begin{document}
-\title{\einfart{},以极简主义风格排版你的文章\thanks{对应版本. \texttt{\einfart{} 2021/03/15}}}
-\author{锦文}
-\date{2021年3月,北京}
+\title{\einfart{},以极简主义风格排版你的文章}
+\author{许锦文}
+\thanks{对应版本. \texttt{\einfart{} 2021/05/23}}
+\date{2021年5月,北京}
\maketitle
\begin{abstract}
- \einfart{}是\minimalist{}文档类系列的成员之一,整个系列包含用于排版文章的\minimart{}、\einfart{}以及用于排版书的\minimbook{}、\simplivre{}。我设计这一系列的初衷是为了撰写草稿与笔记,使之看上去简朴而不简陋。
+ \einfart{} 是 \minimalist{} 文档类系列的成员之一,其名称取自于德文的 einfach (``简约''),并取了 artikel (``文章'') 的前三个字母组合而成。整个 \minimalist{} 系列包含用于排版文章的 \minimart{}、\einfart{} 以及用于排版书的 \minimbook{}、\simplivre{}。我设计这一系列的初衷是为了撰写草稿与笔记,使之看上去简朴而不简陋。
- 其中,\einfart{}与\simplivre{}支持英文、法文、中文三种语言,并且同一篇文档中三种语言可以很好地协调。由于采用了自定义字体,需要采用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 进行编译。
+ \einfart{} 支持英文、法文、德文、中文、日文、俄文六种语言,并且同一篇文档中这些语言可以很好地协调。由于采用了自定义字体,需要用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 引擎进行编译。
- 这篇说明文档是用\einfart{}排版的,你可以把它看作一份简短的说明与演示。
+ 这篇说明文档即是用 \einfart{} 排版的,你可以把它看作一份简短的说明与演示。
\end{abstract}
\tableofcontents
-\section{关于文档类的名称与选项}
+\bigskip
+\begin{remind}
+ 多语言支持、定理类环境、未完成标记等功能是由 \ProjLib{} 工具箱提供的,这里只给出了将其与本文档类搭配使用的要点。如需获取更详细的信息,可以参阅 \ProjLib{} 的说明文档。
+\end{remind}
+
+\clearpage
+\section{初始化}
+
+\subsection{如何载入}
+
+只需要在第一行写:
+
+\begin{code}
+ \documentclass{einfart}
+\end{code}
+
+即可使用 \einfart{} 文档类。请注意,要使用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 引擎才能编译。
+
+\subsection{选项}
+
+\einfart{} 文档类有下面几个选项:
+
+\begin{itemize}
+ \item \texttt{draft} 或 \texttt{fast}
+ \begin{itemize}
+ \item 你可以使用选项 \verb|fast| 来启用快速但略微粗糙的样式,主要区别是:
+ \begin{itemize}
+ \item 使用较为简单的数学字体设置;
+ \item 不启用超链接;
+ \item 启用 \ProjLib{} 工具箱的快速模式。
+ \end{itemize}
+ \end{itemize}
+ \item \texttt{a4paper} 或 \texttt{b5paper}
+ \begin{itemize}
+ \item 可选的纸张大小。默认的纸张大小为 7in $\times$ 10in。
+ \end{itemize}
+ \item \texttt{allowbf}
+ \begin{itemize}
+ \item 允许加粗。启用这一选项时,题目、各级标题、定理类环境名称会被加粗。
+ \end{itemize}
+ \item \texttt{classical}
+ \begin{itemize}
+ \item 经典模式。启用这一选项时,样式会变得更加中规中矩:段落呈首行缩进样式、各类下划线减少、标题样式改变、定理类环境的样式也会更贴近常见的设置。
+ \end{itemize}
+\end{itemize}
+
+\begin{remind}
+ \begin{itemize}
+ \item 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。
+ \item 如果你喜欢更加传统的样式,\texttt{allowbf} + \texttt{classical} 是一个不错的搭配。
+ \end{itemize}
+\end{remind}
+
+\section{关于文档类中使用的字体}
+\einfart{} 默认使用 Palatino Linotype 作为英文字体,方正悠宋、悠黑GBK作为中文字体,并部分使用了 Neo Euler 作为数学字体。其中,Neo Euler可以在 \url{https://github.com/khaledhosny/euler-otf} 下载。其他字体不是免费字体,需要自行购买使用。可以在方正字库网站查询详细资料:\url{https://www.foundertype.com}。
+
+% \begin{itemize}
+% \item English main font. \textsf{English sans serif font}.
+% \item 中文主要字体,\textsf{中文无衬线字体}
+% \item 数学示例: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
+% \end{itemize}
+
+在没有安装相应的字体时,将采用TeX Live中自带的字体来代替,效果可能会有所折扣。
+
-\einfart{}取自于德文的einfach (“简约”),并取了artikel (“文章”)的前三个字母组合而成。
+\section{使用说明}
-\simplivre{}取自于法文的simple (“简约”),以及livre (“书”),由二者组合而成。
+接下来介绍的许多功能是由 \ProjLib{} 工具箱提供的。这里只介绍了基本使用方法,更多细节可以直接参阅其用户文档。
+
+\subsection{语言设置}
-你可以使用选项 \verb|fast| 来启用快速但略微粗糙的样式,主要区别是:
+\einfart{} 提供了多语言支持,包括简体中文、繁体中文、英文、法文、德文、日文、俄文。可以通过下列命令来选定语言:
\begin{itemize}
- \item 使用较为简单的数学字体设置;
- \item 不使用hyperref;
- \item 不使用tikz;
- \item 使用polyglossia而不是babel来支持多语言。(使用polyglossia编译速度会略有提高,但目前对于中文的兼容不太完善,在它更加稳定后,将会考虑全面切换到polyglossia)
+ \item \lstinline|\UseLanguage{|\meta{language name}\lstinline|}|,用于指定语言,在其后将使用对应的语言设定。
+ \begin{itemize}
+ \item 既可以用于导言部分,也可以用于正文部分。在不指定语言时,默认选定 “English”。
+ \end{itemize}
+ \item \lstinline|\UseOtherLanguage{|\meta{language name}\lstinline|}{|\meta{content}\lstinline|}|,用指定的语言的设定排版 \meta{content}。
+ \begin{itemize}
+ \item 相比较 \lstinline|\UseLanguage|,它不会对行距进行修改,因此中西文字混排时能够保持行距稳定。
+ \end{itemize}
\end{itemize}
-在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。
+\meta{language name} 有下列选择:
+\begin{itemize}
+ \item 简体中文:\texttt{Chinese}、\texttt{chinese}、\texttt{SChinese}、\texttt{schinese}、\texttt{SimplifiedChinese} \\\hspace*{5em}或 \texttt{simplifiedchinese}
+ \item 繁体中文:\texttt{TChinese}、\texttt{tchinese}、\texttt{TraditionalChinese} 或 \texttt{traditionalchinese}
+ \item 英文:\texttt{English} 或 \texttt{english}
+ \item 法文:\texttt{French} 或 \texttt{french}
+ \item 德文:\texttt{German}、\texttt{german} 或 \texttt{ngerman}
+ \item 日文:\texttt{Japanese} 或 \texttt{japanese}
+ \item 俄文:\texttt{Russian} 或 \texttt{russian}
+\end{itemize}
-\section{一些使用说明}
+另外,还可以通过下面的方式来填加相应语言的设置:
+\begin{itemize}
+ \item \lstinline|\AddLanguageSetting{|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item 向所有支持的语言增加设置 \meta{settings}。
+ \end{itemize}
+ \item \lstinline|\AddLanguageSetting(|\meta{language name}\lstinline|){|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item 向指定的语言 \meta{language name} 增加设置 \meta{settings}。
+ \end{itemize}
+\end{itemize}
+例如,\lstinline|\AddLanguageSetting(German){\color{orange}}| 可以让所有德语以橙色显示(当然,还需要再加上 \lstinline|\AddLanguageSetting{\color{black}}| 来修正其他语言的颜色)。
+
+
+\subsection{定理类环境及其引用}
-正文部分每段的开头没有缩进,但每两段之间会有半行左右的间距。就像这样——
+定义、定理等环境已经被预定义,可以直接使用。
-这里是下一个自然段。
+具体来说,预设的定理类环境包括:
+\texttt{assumption}、\texttt{axiom}、\texttt{conjecture}、\texttt{convention}、\texttt{corollary}、\texttt{definition}、\texttt{definition-proposition}、\texttt{definition-theorem}、\texttt{example}、\texttt{exercise}、\texttt{fact}、\texttt{hypothesis}、\texttt{lemma}、\texttt{notation}、\texttt{problem}、\texttt{property}、\texttt{proposition}、\texttt{question}、\texttt{remark}、\texttt{theorem},以及相应的带有星号 \lstinline|*| 的无编号版本。
-\subsection{定理,以及引用}
+在引用定理类环境时,建议使用智能引用 \lstinline|\cref{|\meta{label}\lstinline|}|。这样就不必每次都写上相应环境的名称了。
-定义、定理等环境已经被预定义,可以直接使用,例如:
+\begin{remind}[例子]
\begin{code}
\begin{definition}[奇异物品] \label{def: strange} ...
\end{code}
将会生成
\begin{definition}[奇异物品]\label{def: strange}
- 这是奇异物品的定义。
+ 这是奇异物品的定义。定理类环境的前后有一行左右的间距。在定义结束的时候会有一个符号来标记。
\end{definition}
-定理类环境的前后有一行左右的间距。在定义结束的时候会有一个符号来标记。
+\lstinline|\cref{def: strange}| 会显示为:\cref{def: strange}。
+
+使用 \lstinline|\UseLanguage{English}| 后,定理会显示为:
+
+\UseLanguage{English}
+\begin{theorem}[Useless]\label{thm}
+ A theorem in English.
+\end{theorem}
+
+默认情况下,引用时,定理的名称总是与定理所在区域的语言匹配,例如,上面的定义在现在的英文模式下依然显示为中文:\cref{def: strange} 和 \cref{thm}。如果在引用时想让定理的名称与当前语境相匹配,可以在全局选项中加入 \texttt{regionalref}。
+\end{remind}
+
+\UseLanguage{Chinese}
-引用时,可以直接使用智能引用 \lstinline|\cref{标签名称}|,例如:\lstinline|\cref{def: strange}| 会显示为:\cref{def: strange}。
\subsection{定义新的定理型环境}
-首先定义这个环境在所用语言下的名称 \lstinline|\(name of environment)(language name)|,其中 \\\lstinline|(language name)| 是 \lstinline|EN|、\lstinline|FR|、\lstinline|CN| 等,然后用下面四种方式之一定义这一环境:
+若需要定义新的定理类环境,首先要定义这个环境在所用语言下的名称 \lstinline|\|\meta{name of environment}\meta{language abbr},其中 \meta{language abbr} 是语言的简写,分别为:
+\begin{longtable}{ll|ll}
+ \texttt{CN} & 简体中文 & \texttt{DE} & 德文\\
+ \texttt{TC} & 繁体中文 & \texttt{JP} & 日文\\
+ \texttt{EN} & 英文 & \texttt{RU} & 俄文\\
+ \texttt{FR} & 法文 & &\\
+\end{longtable}
+
+\vspace{-0.3\baselineskip}
+\begin{remind}
+ 如果要定义名称后带有星号 \lstinline|*| 的环境,那么在上面的 \meta{name of environment} 中不用写星号。
+\end{remind}
+
+然后用下面五种方式之一定义这一环境:
\begin{itemize}
- \item \lstinline|\CreateTheorem*{(name of environment)}|
- \item \lstinline|\CreateTheorem{(name of environment)}[(numbered like)]|
- \item \lstinline|\CreateTheorem{(name of environment)}<(numbered within)>|
- \item \lstinline|\CreateTheorem{(name of environment)}|
+ \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item 定义不编号的环境 \meta{name of environment}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item 定义编号环境 \meta{name of environment},按顺序编号
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
+ \begin{itemize}
+ \item 定义编号环境 \meta{name of environment},与 \meta{numbered like} 计数器共用编号
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
+ \begin{itemize}
+ \item 定义编号环境 \meta{name of environment},在 \meta{numbered within} 计数器内编号
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|\\
+ \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|
+ \begin{itemize}
+ \item 将 \meta{name of environment} 与 \meta{existed environment} 或 \meta{existed environment}\lstinline|*| 等同。
+ \item 这种方式通常在两种情况下比较有用:
+ \begin{enumerate}
+ \item 希望定义更简洁的名称。例如,使用 \lstinline|\CreateTheorem{thm}(theorem)|,便可以直接用名称 \texttt{thm} 来撰写定理。
+ \item 希望去除某些环境的编号。例如,使用 \lstinline|\CreateTheorem{remark}(remark*)|,便可以去除 \texttt{remark} 环境的编号。
+ \end{enumerate}
+ \end{itemize}
\end{itemize}
+\begin{remind}
+ 其内部使用了 \textsf{amsthm},因此传统的 \texttt{theoremstyle} 对其也是适用的,只需在相关定义前标明即可。
+\end{remind}
+
\def\proofideanameCN{思路}
-\CreateTheorem*{proofidea}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>
-例如,
+\bigskip
+下面提供一个例子。这三行代码:
\begin{code}
\def\proofideanameCN{思路}
- \CreateTheorem*{proofidea}
+ \CreateTheorem*{proofidea*}
+ \CreateTheorem{proofidea}<subsection>
\end{code}
-可以定义不编号的环境 \lstinline|proofidea|,它支持在中文环境中使用,效果如下所示:
+
+可以分别定义不编号的环境 \lstinline|proofidea*| 和编号的环境 \lstinline|proofidea| (在 subsection 内编号),它们支持在简体中文语境中使用,效果如下所示:
+
+\begin{proofidea*}
+ \lstinline|proofidea*| 环境。
+\end{proofidea*}
\begin{proofidea}
- ...
+ \lstinline|proofidea| 环境。
\end{proofidea}
\subsection{未完成标记}
你可以通过 \lstinline|\dnf| 来标记尚未完成的部分。例如:
\begin{itemize}
- \item \lstinline|\dnf|: \quad \dnf
- \item \lstinline|\dnf<还需加入…>|: \quad \dnf<还需加入…>
+ \item \lstinline|\dnf| 或 \lstinline|\dnf<...>|。效果为:\dnf~或 \dnf<...>。\\其提示文字与当前语言相对应,例如,在法语模式下将会显示为 \UseOtherLanguage{French}{\dnf}。
\end{itemize}
类似的,还有 \lstinline|\needgraph| :
\begin{itemize}
- \item \lstinline|\needgraph|: \needgraph
- \item \lstinline|\needgraph<关于…>|: \needgraph<关于…>
+ \item \lstinline|\needgraph| 或 \lstinline|\needgraph<...>|。效果为:\needgraph~或 \needgraph<...>其提示文字与当前语言相对应,例如,在法语模式下将会显示为 \UseOtherLanguage{French}{\needgraph}
\end{itemize}
-\subsection{语言设置}
-可以随时使用 \lstinline|\UseLanguage{语言名称}| 更改语言,语言名称包括Chinese、English、French(首字母大小写随意,例如chinese亦可)。这样,各种指令和环境的效果也会随之变动。
-例如,使用 \lstinline|\UseLanguage{English}| 后,定理与未完成标记会显示为:
+\subsection{关于文章标题、摘要与关键词}
-\UseLanguage{English}
-\begin{theorem}[Useless]\label{thm}
- Some theorem in English. \dnf
-\end{theorem}
+% 由于引入了 \ProjLib{} 工具箱的 \textsf{PJLamssim} 组件,
+\einfart{} 同时具有标准文档类与\AmS{} 文档类的一些特性。
-引用时,定理的名称总是与定理所在区域的语言匹配,例如,开头的定义在现在的英文模式下依然显示为中文:\cref{def: strange} 和 \cref{thm}。
+因此,文章的标题部分既可以按照标准文档类 \textsf{article} 的写法来写:
-\UseLanguage{Chinese}
+\begin{code}
+ \title{(*\meta{title}*)}
+ \author{(*\meta{author}*)}
+ \date{(*\meta{date}*)}
+ \maketitle
+ \begin{abstract}
+ (*\meta{abstract}*)
+ \end{abstract}
+ \begin{keyword}
+ (*\meta{keywords}*)
+ \end{keyword}
+\end{code}
+
+也可以按照 \AmS{} 文档类的方式来写:
+
+\begin{code}
+ \title{(*\meta{title}*)}
+ \author{(*\meta{author}*)}
+ \address{(*\meta{address}*)}
+ \email{(*\meta{email}*)}
+ \date{(*\meta{date}*)}
+ \keywords{(*\meta{keywords}*)}
+ \subjclass{(*\meta{subjclass}*)}
+ \begin{abstract}
+ (*\meta{abstract}*)
+ \end{abstract}
+ \maketitle
+\end{code}
+
+作者信息可以包含多组,输入方式为:
+
+\begin{code}
+ \author{(*\meta{author 1}*)}
+ \address{(*\meta{address 1}*)}
+ \email{(*\meta{email 1}*)}
+ \author{(*\meta{author 2}*)}
+ \address{(*\meta{address 2}*)}
+ \email{(*\meta{email 2}*)}
+ ...
+\end{code}
+
+其中 \lstinline|\address|、\lstinline|\curraddr|、\lstinline|\email| 的相互顺序是不重要的。
\subsection{关于行号}
行号可以随时开启和关闭。\lstinline|\linenumbers| 用来开启行号,\lstinline|\nolinenumbers| 用来关闭行号。标题、目录、索引等位置为了美观,不进行编号。
@@ -171,74 +386,121 @@
\end{itemize}
这是标题使用下划线装饰之后带来的一个缺点。
-\subsection{关于字体}
-\einfart{}与\simplivre{}使用Palatino Linotype作为英文字体,方正悠宋、悠黑简体作为中文字体,并部分使用了Neo Euler作为数学字体:
-\begin{itemize}
- \item English main font. \textsf{English sans serif font}.
- \item 中文主要字体,\textsf{中文无衬线字体}
- \item 数学示例: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
+
+\section{目前存在的问题}
+
+\begin{itemize}[itemsep=.6em]
+ \item 对于字体的设置仍然不够完善。
+ \item 由于很多核心功能建立在 \ProjLib{} 工具箱的基础上,因此 \einfart{} 自然继承了其所有问题。详情可以参阅 \ProjLib{} 用户文档的“目前存在的问题”这一小节。
+ \item 错误处理功能不完善,在出现一些问题时没有相应的错误提示。
+ \item 代码中仍有许多可优化之处。
\end{itemize}
-其中,Neo Euler可以在 \url{https://github.com/khaledhosny/euler-otf} 下载。
-其他字体不是免费字体,需要自行购买使用(你可以在方正字库网站查询详细资料:\url{https://www.foundertype.com})。
-在没有安装相应的字体时,将采用TeX Live中自带的字体来代替,效果可能会有所折扣。
+\UseLanguage{English}
+\clearpage
\section{文档示例}
-\singlespacing
+\subsection{标准文档类写法}
+
+如果想采用标准文档类中的写法,可以参考下面的例子:
-\LocallyStopLineNumbers
-\begin{minipage}{0.45\textwidth}
\begin{code}
-%! TEX program = xelatex
-\documentclass[fast]{einfart}
+\documentclass{einfart}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
-\linenumbers
-\UseLanguage{French}
+\UseLanguage{French} % Use French from here
\begin{document}
-\title{Titre}
-\author{Nom}
-\date{03 / 2021, Lieu}
+\title{Le Titre}
+\author{Auteur}
+\date{\PJLdate{2022-04-01}}
\maketitle
-%% Texte ici
+\begin{abstract}
+ Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
+\end{abstract}
+\begin{keyword}
+ AAA, BBB, CCC, DDD, EEE
+\end{keyword}
+
+\section{Un théorème}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
\end{document}
\end{code}
-\end{minipage}
-%
-\hfill
-%
-\begin{minipage}{0.45\textwidth}
+
+如果以后想切换到标准文档类,只需要将前两行换为:
+
\begin{code}
-%! TEX program = xelatex
-\documentclass[fast]{einfart}
+\documentclass{article}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
-\linenumbers
-\UseLanguage{Chinese}
+
+\clearpage
+\subsection{\texorpdfstring{\AmS{}}{AMS} 文档类写法}
+
+如果日后有意切换到期刊模版,想采用 \AmS{} 文档类中的写法,可以参考下面的例子:
+
+\begin{code}
+\documentclass{einfart}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
+
+\UseLanguage{French} % Use French from here
\begin{document}
-\title{标题}
-\author{姓名}
-\date{2021年3月,地点}
+\title{Le Titre}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 1}{Courriel 1}}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 2}{Courriel 2}}
+\date{\PJLdate{2022-04-01}}
+\subjclass{*****}
+\keywords{...}
+
+\begin{abstract}
+ Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
+\end{abstract}
\maketitle
-%% 正文部分
+\section{Première section}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
\end{document}
\end{code}
-\end{minipage}
-\par
-\ResumeLineNumbers
-\bigskip
-(\lstinline|\UseLanguage| 既可以放在导言中,也可以放在正文部分,并且可以按照需要反复使用)
+这样,若想切换到 \AmS{} 文档类,只需要将前两行换为:
+
+\begin{code}
+\documentclass{amsart}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
\end{document}
diff --git a/macros/unicodetex/latex/einfart/einfart-doc-en.pdf b/macros/unicodetex/latex/einfart/einfart-doc-en.pdf
index ffef04eabe..9fecd39dda 100644
--- a/macros/unicodetex/latex/einfart/einfart-doc-en.pdf
+++ b/macros/unicodetex/latex/einfart/einfart-doc-en.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/einfart/einfart-doc-en.tex b/macros/unicodetex/latex/einfart/einfart-doc-en.tex
index 49b04581a0..5e42a556a0 100644
--- a/macros/unicodetex/latex/einfart/einfart-doc-en.tex
+++ b/macros/unicodetex/latex/einfart/einfart-doc-en.tex
@@ -1,24 +1,26 @@
%! TEX program = xelatex
-\PassOptionsToPackage{dvipsnames}{xcolor}
\documentclass{einfart}
\linenumbers % Enable line numbers
%%================================
-%% TeX logo and URL
+%% Import toolkit
%%================================
-\usepackage{hologo}
-\usepackage{url}
+\usepackage{PJLtoolkit}
+\usepackage{longtable} % breakable tables
+\usepackage{hologo} % more TeX logo
%%================================
%% For typestting code
%%================================
\usepackage{listings}
+\definecolor{maintheme}{RGB}{70,130,180}
+\definecolor{forestgreen}{RGB}{21,122,81}
\definecolor{lightergray}{gray}{0.99}
\lstset{language=[LaTeX]TeX,
- keywordstyle=\color{RoyalBlue},
+ keywordstyle=\color{maintheme},
basicstyle=\ttfamily,
- commentstyle=\color{ForestGreen}\ttfamily,
+ commentstyle=\color{forestgreen}\ttfamily,
stringstyle=\rmfamily,
showstringspaces=false,
breaklines=true,
@@ -31,9 +33,9 @@
firstnumber=last,
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
-\lstset{morekeywords=%
- {CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,
- linenumbers,nolinenumbers,subsection,maketitle
+\lstset{moretexcs=%
+ {linenumbers,nolinenumbers,subsection,
+ color,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
}
}
\lstnewenvironment{code}%
@@ -42,6 +44,31 @@
}
{\ResumeLineNumbers}
+%%================================
+%% remind
+%%================================
+\usepackage[many]{tcolorbox}
+\newenvironment{remind}[1][Remind]{%
+ \LocallyStopLineNumbers%
+ \begin{tcolorbox}[breakable,
+ enhanced,
+ width = \textwidth,
+ colback = white, colbacktitle = paper,
+ colframe = gray!50, boxrule=0.2mm,
+ coltitle = black,
+ fonttitle = \sffamily,
+ attach boxed title to top left = {yshift=-\tcboxedtitleheight/2, xshift=\tcboxedtitlewidth/4},
+ boxed title style = {boxrule=0pt, colframe=paper},
+ before skip = 0.3cm,
+ after skip = 0.3cm,
+ top = 3mm,
+ bottom = 3mm,
+ title={\sffamily #1}]%
+}{\end{tcolorbox}\ResumeLineNumbers}
+
+%%================================
+%% 名称
+%%================================
\providecommand{\minimalist}{\textsf{minimalist}}
\providecommand{\minimart}{\textsf{minimart}}
\providecommand{\minimbook}{\textsf{minimbook}}
@@ -53,110 +80,294 @@
%%================================
\begin{document}
-\title{\einfart{}, write your articles in a simple and clear way\thanks{Corresponding to: \texttt{\einfart{} 2021/03/15}}}
-\author{Jinwen}
-\date{March 2021, Beijing}
+\title{\einfart{}, write your articles in a simple and clear way}
+\author{Jinwen XU}
+\thanks{Corresponding to: \texttt{\einfart{} 2021/05/23}}
+\date{May 2021, Beijing}
\maketitle
\begin{abstract}
- \einfart{} is a member of the \minimalist{} class series. The entire collection includes \minimart{} and \einfart{} for typesetting articles and \minimbook{} and \simplivre{} for typesetting books. My original intention in designing this series was to write drafts and notes that look simple but not shabby.
+ \einfart{} is part of the \minimalist{} class series, whose name is taken from German word ``einfach'' (``simple''), combined with the first three letters of ``artikel'' (``article''). The entire collection includes \minimart{} and \einfart{} for typesetting articles, and \minimbook{} and \simplivre{} for typesetting books. My original intention in designing them was to write drafts and notes that look simple yet not shabby.
- Among them, \einfart{} and \simplivre{} support three languages: English, French, and Chinese, and these three languages can be switched seamlessly in a single document. Due to the usage of custom fonts, they need to be compiled with \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
+ \einfart{} supports six languages: English, French, German, Chinese, Japanese and Russian. These languages can be switched seamlessly in a single document. Due to the usage of custom fonts, \einfart{} requires \hologo{XeLaTeX} or \hologo{LuaLaTeX} to compile.
This documentation is typeset using \einfart{}. You can think of it as a short introduction and demonstration.
\end{abstract}
\tableofcontents
-\section{On the naming and options}
-\einfart{} is taken from German word ``einfach'' (``simple''), combined with the first three letters of ``artikel'' (``article'').
+\bigskip
+\begin{remind}
+ Multi-language support, theorem-like environments, draft marks and some other features are provided by the \ProjLib{} toolkit. Here we only briefly discuss how to use it with this document class. For more detailed information, you can refer to the documentation of \ProjLib{}.
+\end{remind}
+
+\clearpage
+\section{Initialization}
+
+\subsection{How to load}
+
+One only needs to put
+\begin{code}
+ \documentclass{einfart}
+\end{code}
+as the first line to use the \einfart{} class. Please note that you need to use either \hologo{XeLaTeX} or \hologo{LuaLaTeX} engine to compile.
+
+\subsection{Options}
-\simplivre{} is taken from French words ``simple'' and ``livre'' (for ``book'').
+\einfart{} offers the following options:
-You can use the option \verb|fast| to enable a fast but slightly rough version. The main differences are:
\begin{itemize}
- \item Use simpler math font configuration;
- \item Do not use hyperref;
- \item Do not use tikz;
- \item Use polyglossia instead of babel to support multiple languages. (Using polyglossia will increase the compilation speed slightly, but the current compatibility with Chinese is not perfect. When it becomes more stable, I will consider fully switching to polyglossia)
+ \item \texttt{draft} or \texttt{fast}
+ \begin{itemize}
+ \item The option \verb|fast| enables a faster but slightly rougher style, main differences are:
+ \begin{itemize}
+ \item Use simpler math font configuration;
+ \item Do not use hyperref;
+ \item Enable the fast mode of \ProjLib{} toolkit.
+ \end{itemize}
+ \end{itemize}
+ \item \texttt{a4paper} or \texttt{b5paper}
+ \begin{itemize}
+ \item Optional paper size. The default paper size is 7in $\times$ 10in.
+ \end{itemize}
+ \item \texttt{allowbf}
+ \begin{itemize}
+ \item Allow boldface. When this option is enabled, the title, titles of all levels and names of theorem-like environments will be bolded.
+ \end{itemize}
+ \item \texttt{classical}
+ \begin{itemize}
+ \item Classic mode. When this option is enabled, the style will become more regular: paragraphs are indented, the use of underlines are reduced, heading styles are changed, and the theorem styles will be much closer to common styles.
+ \end{itemize}
\end{itemize}
-During the writing stage of your document, it is recommended to use the \verb|fast| option to speed up compilation and improve the smoothness of your writing experience. At the end, you can remove the ``fast'' mark to get the final version.
+\begin{remind}
+ \begin{itemize}
+ \item During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark "DRAFT" to indicate that you are currently in the draft mode.
+ \item \texttt{allowbf} + \texttt{classical} is probably a good choice if you prefer traditional style.
+ \end{itemize}
+\end{remind}
+
+\section{On the fonts}
+By default, \einfart{} uses Palatino Linotype as the English font, FounderType's YouSong and YouHei GBK as the Chinese fonts, and partially uses Neo Euler as the math font. Among them, Neo Euler can be downloaded at \url{https://github.com/khaledhosny/euler-otf}. The other fonts are not free, you need to purchase and use them on your own. (For the Chinese fonts, visit FounderType's website for detail: \url{https://www.foundertype.com} ).
+
+% \begin{itemize}
+% \item English main font. \textsf{English sans serif font}.
+% \item 中文主要字体, \textsf{中文无衬线字体}
+% \item Math demonstration: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
+% \end{itemize}
+
+When the corresponding font is not installed, fonts that comes with TeX Live will be used instead. In this case, the experience might be reduced.
\section{Some instructions}
-There is no indentation at the beginning of each paragraph, but there will be a half-line space between each two paragraphs. like this ---
+Many of the features described next are provided by the \ProjLib{} toolkit. Only the basic usage is mentioned here. For more details, please refer to its user documentation.
+
+\subsection{Language configuration}
+
+\einfart{} has multi-language support, including simplified Chinese, traditional Chinese, English, French, German, Japanese, and Russian. The language can be selected by the following macros:
+
+\begin{itemize}
+ \item \lstinline|\UseLanguage{|\meta{language name}\lstinline|}| is used to specify the language. The corresponding setting of the language will be applied after it. It can be used either in the preamble or in the main body. When no language is specified, ``English" is selected by default.
+ \item \lstinline|\UseOtherLanguage{|\meta{language name}\lstinline|}{|\meta{content}\lstinline|}|, which uses the specified language settings to typeset \meta{content}. Compared with \lstinline|\UseLanguage|, it will not modify the line spacing, so line spacing would remain stable when CJK and Western texts are mixed.
+\end{itemize}
+
+\meta{language name} can be:
+\begin{itemize}
+ \item Simplified Chinese: \texttt{Chinese}, \texttt{chinese}, \texttt{SChinese}, \texttt{schinese}, \texttt{SimplifiedChinese} or \texttt{simplifiedchinese}
+ \item Traditional Chinese: \texttt{TChinese}, \texttt{tchinese}, \texttt{TraditionalChinese} or \texttt{traditionalchinese}
+ \item English: \texttt{English} or \texttt{english}
+ \item French: \texttt{French} or \texttt{french}
+ \item German: \texttt{German}, \texttt{german} or \texttt{ngerman}
+ \item Japanese: \texttt{Japanese} or \texttt{japanese}
+ \item Russian: \texttt{Russian} or \texttt{russian}
+\end{itemize}
+
+\medskip
+In addition, you can also add new settings to selected language:
+\begin{itemize}
+ \item \lstinline|\AddLanguageSetting{|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item Add \meta{settings} to all supported languages.
+ \end{itemize}
+ \item \lstinline|\AddLanguageSetting(|\meta{language name}\lstinline|){|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item Add \meta{settings} to the selected language \meta{language name}.
+ \end{itemize}
+\end{itemize}
+For example, \lstinline|\AddLanguageSetting(German){\color{orange}}| can make all German text displayed in orange (of course, one then need to add \lstinline|\AddLanguageSetting{\color{black}}| in order to correct the color of the text in other languages).
-Here is the next paragraph.
\subsection{Theorems and how to reference them}
-Environments such as definitions and theorems have been pre-defined and can be used directly, for example:
+Environments such as definitions and theorems have been pre-defined and can be used directly.
+
+More specifically, preset environments include:
+\texttt{assumption}, \texttt{axiom}, \texttt{conjecture}, \texttt{convention}, \texttt{corollary}, \texttt{definition}, \texttt{definition-proposition}, \texttt{definition-theorem}, \texttt{example}, \texttt{exercise}, \texttt{fact}, \texttt{hypothesis}, \texttt{lemma}, \texttt{notation}, \texttt{problem}, \texttt{property}, \texttt{proposition}, \texttt{question}, \texttt{remark}, \texttt{theorem}, and the corresponding unnumbered version with an asterisk \lstinline|*| in the name. The display of these environments will change according to the current language.
+
+When referencing a theorem-like environment, it is recommended to use clever reference \lstinline|\cref{|\meta{label}\texttt{\}}. In this way, there is no need to explicitly write down the name of the corresponding environment every time.
+
+\begin{remind}[Example]
\begin{code}
\begin{definition}[Strange things] \label{def: strange} ...
\end{code}
+
will produce
\begin{definition}[Strange things]\label{def: strange}
- This is the definition of some strange objects.
+ This is the definition of some strange objects. There is approximately an one-line space before and after the theorem environment, and there will be a symbol to mark the end of the environment.
\end{definition}
-There is approximately an one-line space before and after the theorem environment. There will be a symbol to mark the end of the environment.
+\lstinline|\cref{def: strange}| will be displayed as: \cref{def: strange}.
+
+After using \lstinline|\UseLanguage{French}|, a theorem will be displayed as:
+
+\UseLanguage{French}
+\begin{theorem}[Inutile]\label{thm}
+ Un théorème en français.
+\end{theorem}
+
+By default, when referenced, the name of the theorem always matches the language of the context in which the theorem is located. For example, the definition above is still displayed in English in the current French mode: \cref{def: strange} and \cref{thm}. If you want the name of the theorem to match the current context when referencing, you can add \texttt{regionalref} to the global options.
+\end{remind}
+
+\UseLanguage{English}
-When referencing, you can directly use clever reference \lstinline|\cref{(label name)}|. For example, \lstinline|\cref{def: strange}| will be displayed as: \cref{def: strange}.
\subsection{Define a new theorem-like environment}
-First define the name of this environment in the language used: \lstinline|\(name of environment)(language name)|. Where \lstinline|(language name)| can be \lstinline|EN|, \lstinline|FR|, \lstinline|CN|, etc., and then define this environment in one of the following four ways:
+If you need to define a new theorem-like environment, you must first define the name of the environment in the language used: \lstinline|\|\meta{name of environment}\meta{language abbr}, where \meta{language abbr} is the abbreviation of language, which can be:
+% \vspace{-.5\baselineskip}
+\begin{longtable}{ll|ll}
+ \texttt{CN} & Simplified Chinese & \texttt{DE} & German\\
+ \texttt{TC} & Traditional Chinese & \texttt{JP} & Japanese\\
+ \texttt{EN} & English & \texttt{RU} & Russian\\
+ \texttt{FR} & French & &\\
+\end{longtable}
+
+\vspace{-.5\baselineskip}
+\begin{remind}
+ If you want to define an environment with an asterisk \lstinline|*| after the name, you don't need to write an asterisk in the \meta{name of environment} above. See the example below.
+\end{remind}
+
+And then define this environment in one of following five ways:
\begin{itemize}
- \item \lstinline|\CreateTheorem*{(name of environment)}|
- \item \lstinline|\CreateTheorem{(name of environment)}[(numbered like)]|
- \item \lstinline|\CreateTheorem{(name of environment)}<(numbered within)>|
- \item \lstinline|\CreateTheorem{(name of environment)}|
+ \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item Define an unnumbered environment \meta{name of environment}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item Define a numbered environment \meta{name of environment}, numbered in order 1,2,3,\dots
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
+ \begin{itemize}
+ \item Define a numbered environment \meta{name of environment}, which shares the counter \meta{numbered like}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
+ \begin{itemize}
+ \item Define a numbered environment \meta{name of environment}, numbered within the \\counter \meta{numbered within}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|\\
+ \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|
+ \begin{itemize}
+ \item Identify \meta{name of environment} with \meta{existed environment} or \meta{existed environment}\lstinline|*|.
+ \item This method is usually useful in the following two situations:
+ \begin{enumerate}
+ \item To use a more concise name. For example, with \lstinline|\CreateTheorem{thm}|\\\lstinline|(theorem)|, one can then use the name \texttt{thm} to write theorem.
+ \item To remove the numbering. For example, one can remove the numbering of the \texttt{remark} environment with \lstinline|\CreateTheorem{remark}(remark*)|.
+ \end{enumerate}
+ \end{itemize}
\end{itemize}
+\begin{remind}
+ It uses \textsf{amsthm} internally, so the traditional \texttt{theoremstyle} is also applicable to it. One only needs declare the style before the relevant definitions.
+\end{remind}
+
\def\proofideanameEN{Idea}
-\CreateTheorem*{proofidea}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>
+
+\bigskip
+Here is an example. The following code:
-For example,
\begin{code}
\def\proofideanameEN{Idea}
- \CreateTheorem*{proofidea}
+ \CreateTheorem*{proofidea*}
+ \CreateTheorem{proofidea}<subsection>
\end{code}
-defines an unnumbered environment \lstinline|proofidea|, which supports using in the English context, and the effect is as follows:
+
+defines an unnumbered environment \lstinline|proofidea*| and a numbered environment \lstinline|proofidea| (numbered within subsection) respectively. They can be used in English context. The effect is as follows:
+
+\begin{proofidea*}
+ The \lstinline|proofidea*| environment.
+\end{proofidea*}
\begin{proofidea}
- ...
+ The \lstinline|proofidea| environment.
\end{proofidea}
\subsection{Draft mark}
You can use \lstinline|\dnf| to mark the unfinished part. For example:
\begin{itemize}
- \item \lstinline|\dnf|: \quad \dnf
- \item \lstinline|\dnf<Still need ...>|: \quad \dnf<Still need ...>
+ \item \lstinline|\dnf| or \lstinline|\dnf<...>|. The effect is: \dnf~ or \dnf<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\dnf} in French mode.
\end{itemize}
-Similarly, there is \lstinline|\needgraph| :
+Similarly, there is \lstinline|\needgraph| :
\begin{itemize}
- \item \lstinline|\needgraph|: \needgraph
- \item \lstinline|\needgraph<About ...>|: \needgraph<About ...>
+ \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \needgraph or \needgraph<...>The prompt text changes according to the current language. For example, in French mode, it will be displayed as \UseOtherLanguage{French}{\needgraph}
\end{itemize}
-\subsection{Language configuration}
-You can use \lstinline|\UseLanguage{(name of language))}| at any time to change the language, Language names include Chinese, English, French (the case of the first letter is arbitrary, for example, ``chinese'' is also acceptable). With this, the effects of various commands and environments will also change accordingly.
+\subsection{On the title, abstract and keywords}
-For example, after using \lstinline|\UseLanguage{French}|, the theorem and the draft mark will be displayed as:
+\einfart{} has both the features of standard classes and that of the \AmS{} classes.
-\UseLanguage{French}
-\begin{theorem}[Inutile]\label{thm}
- Un théorème en français. \dnf
-\end{theorem}
+Therefore, the title part can either be written in the usual way, in accordance with the standard class \textsf{article}:
+
+\begin{code}
+ \title{(*\meta{title}*)}
+ \author{(*\meta{author}*)}
+ \date{(*\meta{date}*)}
+ \maketitle
+ \begin{abstract}
+ (*\meta{abstract}*)
+ \end{abstract}
+ \begin{keyword}
+ (*\meta{keywords}*)
+ \end{keyword}
+\end{code}
-When referenced, the name of the theorem always matches the language of the region in which the theorem is located, for example, the definition of the beginning is still displayed in English in the current French mode: \cref{def: strange} and \cref{thm}.
+or written in the way of \AmS{} classes:
-\UseLanguage{English}
+\begin{code}
+ \title{(*\meta{title}*)}
+ \author{(*\meta{author}*)}
+ \address{(*\meta{address}*)}
+ \email{(*\meta{email}*)}
+ \date{(*\meta{date}*)}
+ \keywords{(*\meta{keywords}*)}
+ \subjclass{(*\meta{subjclass}*)}
+ \begin{abstract}
+ (*\meta{abstract}*)
+ \end{abstract}
+ \maketitle
+\end{code}
+
+\medskip
+The author information can contain multiple groups, written as:
+
+\begin{code}
+ \author{(*\meta{author 1}*)}
+ \address{(*\meta{address 1}*)}
+ \email{(*\meta{email 1}*)}
+ \author{(*\meta{author 2}*)}
+ \address{(*\meta{address 2}*)}
+ \email{(*\meta{email 2}*)}
+ ...
+\end{code}
+Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| is not important.
+
+\clearpage
\subsection{On the line numbers}
Line numbers can be turned on and off at any time. \lstinline|\linenumbers| is used to enable the line numbers, and \lstinline|\nolinenumbers| is used to disable them. For the sake of beauty, the title, table of contents, index and some other elements are not numbered.
@@ -168,72 +379,117 @@ In \lstinline|\section| or \lstinline|\subsection| , if you wish to add footnote
\end{itemize}
This is a disadvantage brought about by the underline decoration of the title.
-\subsection{On the fonts}
-\einfart{} and \simplivre{} use Palatino Linotype as the English font, FounderType's YouSong and YouHei Simplified as the Chinese fonts, and partially use Neo Euler as the mathematical font:
-\begin{itemize}
- \item English main font. \textsf{English sans serif font}.
- \item 中文主要字体, \textsf{中文无衬线字体}
- \item Math demonstration: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
-\end{itemize}
-Among them, Neo Euler can be downloaded at \url{https://github.com/khaledhosny/euler-otf}. Other fonts are not free, you need to purchase and use them on your own. (For the Chinese fonts, visit FounderType's website for detail: \url{https://www.foundertype.com} ).
+\section{Known issues}
-When the corresponding font is not installed, the font that comes with TeX Live will be used instead, and the experience might be reduced.
+\begin{itemize}[itemsep=.6em]
+ \item The font settings are still not perfect.
+ \item Since many features are based on the \ProjLib{} toolkit, \einfart{} inherits all its problems. For details, please refer to the "Known Issues" section of the \ProjLib{} documentation.
+ \item The error handling mechanism is incomplete: there is no corresponding error prompt when some problems occur.
+ \item There are still many things that can be optimized in the code.
+\end{itemize}
+\clearpage
\section{Document templates}
-\singlespacing
+\subsection{The standard way}
+
+If you want to write in the standard way, you can refer to the following example:
-\LocallyStopLineNumbers
-\begin{minipage}{0.45\textwidth}
\begin{code}
-%! TEX program = xelatex
-\documentclass[fast]{einfart}
+\documentclass{einfart}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
-\linenumbers
-\UseLanguage{French}
+\UseLanguage{French} % Use French from here
\begin{document}
-\title{Titre}
-\author{Nom}
-\date{03 / 2021, Lieu}
+\title{Le Titre}
+\author{Auteur}
+\date{\PJLdate{2022-04-01}}
\maketitle
-%% Texte ici
+\begin{abstract}
+ Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
+\end{abstract}
+\begin{keyword}
+ AAA, BBB, CCC, DDD, EEE
+\end{keyword}
+
+\section{Un théorème}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
\end{document}
\end{code}
-\end{minipage}
-%
-\hfill
-%
-\begin{minipage}{0.45\textwidth}
+
+If you wish to switch to the standard class later, just replace the first two lines with:
+
\begin{code}
-%! TEX program = xelatex
-\documentclass[fast]{einfart}
+\documentclass{article}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
+
+
+\clearpage
+\subsection{The \texorpdfstring{\AmS{}}{AMS} way}
-\linenumbers
-\UseLanguage{Chinese}
+If you intend to switch to the journal template in the future and thus want to use the writing style as in the \AmS{} classes, you can refer to the following example:
+
+\begin{code}
+\documentclass{einfart}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
+
+\UseLanguage{French} % Use French from here
\begin{document}
-\title{标题}
-\author{姓名}
-\date{2021年3月,地点}
+\title{Le Titre}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 1}{Courriel 1}}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 2}{Courriel 2}}
+\date{\PJLdate{2022-04-01}}
+\subjclass{*****}
+\keywords{...}
+
+\begin{abstract}
+ Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
+\end{abstract}
\maketitle
-%% 正文部分
+\section{Première section}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
\end{document}
\end{code}
-\end{minipage}
-\par
-\ResumeLineNumbers
-\bigskip
-(\lstinline|\UseLanguage| can be placed either in the preamble or in the body part, and can be used repeatedly as needed)
+In this way, if you wish to switch to \AmS{} class later, just replace the first two lines with:
+
+\begin{code}
+\documentclass{amsart}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
\end{document}
diff --git a/macros/unicodetex/latex/einfart/einfart.cls b/macros/unicodetex/latex/einfart/einfart.cls
index 50dae49c48..52bad4daaa 100644
--- a/macros/unicodetex/latex/einfart/einfart.cls
+++ b/macros/unicodetex/latex/einfart/einfart.cls
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{einfart}
- [2021/03/15 A simple and clear article style]
+ [2021/05/23 A simple and clear article style]
\def\minimclass@baseclass{article}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -27,6 +27,13 @@
}
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
+\DeclareBoolOption[false]{classical}
+
+\newif\if@minimclass@bfivepaper\@minimclass@bfivepaperfalse
+\DeclareVoidOption{b5paper}{\@minimclass@bfivepapertrue}
+\newif\if@minimclass@afourpaper\@minimclass@afourpaperfalse
+\DeclareVoidOption{a4paper}{\@minimclass@afourpapertrue}
+
\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{\minimclass@baseclass}}
\ProcessKeyvalOptions*\relax
\LoadClass{\minimclass@baseclass}
@@ -37,6 +44,8 @@
%%================================
%% Page layout
%%================================
+\RequirePackage{silence}
+\WarningFilter{geometry}{Over-specification in}
\RequirePackage[heightrounded]{geometry}
\geometry{
papersize={7in,10in},
@@ -45,15 +54,36 @@
vmarginratio=1:1,
footnotesep=2em plus 2pt minus 2pt,
}
+\if@minimclass@bfivepaper
+\geometry{
+ b5paper,
+ total={40em,59em},
+ hmarginratio=1:1,
+ vmarginratio=1:1,
+ footnotesep=2em plus 2pt minus 2pt,
+}
+\fi
+\if@minimclass@afourpaper
+\geometry{
+ a4paper,
+ total={47em,70em},
+ hmarginratio=1:1,
+ vmarginratio=1:1,
+ footnotesep=2em plus 2pt minus 2pt,
+}
+\fi
\if@minimclass@fast
\PassOptionsToPackage{fast}{minimalist}
+ \RequirePackage{draftwatermark}
+ \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95}
\fi
-\if@minimclass@fast
- \PassOptionsToPackage{polyglossia}{minimalist}
+\if@minimclass@classical
+ \RequirePackage{indentfirst}
+\else
+ \AtEndPreamble{\RequirePackage{parskip}}
\fi
\RequirePackage{minimalist}
-\AtEndPreamble{\RequirePackage{parskip}}
%%================================
%% Fonts
@@ -69,27 +99,32 @@
\IfFontExistsTF{Palatino Linotype}{%
\setmainfont{Palatino Linotype}
}{
- \setmainfont{texgyrepagella-regular.otf}[
- BoldFont = texgyrepagella-bold.otf ,
- ItalicFont = texgyrepagella-italic.otf ,
- BoldItalicFont = texgyrepagella-bolditalic.otf ]
+ \setmainfont{TeXGyrePagellaX-Regular.otf}[
+ BoldFont = TeXGyrePagellaX-Bold.otf ,
+ ItalicFont = TeXGyrePagellaX-Italic.otf ,
+ BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf ]
}
\setsansfont{SourceSansPro-Regular.otf}[
- Scale = MatchLowercase,
+ Scale = MatchLowercase ,
BoldFont = SourceSansPro-Bold.otf ,
ItalicFont = SourceSansPro-RegularIt.otf ,
BoldItalicFont = SourceSansPro-BoldIt.otf ]
+ \setmonofont{cmuntt.otf}[
+ Scale = 1.05 ,
+ BoldFont = cmuntb.otf ,
+ ItalicFont = cmunst.otf ,
+ BoldItalicFont = cmuntb.otf ]
%% Chinese fonts
\PassOptionsToPackage{fontset=none,scheme=plain}{ctex}
\RequirePackage{ctex}
-\IfFontExistsTF{FZYouSongS 507R}{%
- \setCJKmainfont{FZYouSongS 507R}[
- BoldFont = FZYouSongS 509R ,
- BoldFeatures = {FakeBold=2} ,
+\IfFontExistsTF{FZYOUSK_507R--GBK1-0}{%
+ \setCJKmainfont{FZYOUSK_507R--GBK1-0}[
+ BoldFont = FZYOUSK_509R--GBK1-0 ,
+ BoldFeatures = {FakeBold=4} ,
ItalicFont = * ,
- BoldItalicFont = FZYouSongS 509R ,
- BoldItalicFeatures = {FakeBold=2} ,
+ BoldItalicFont = FZYOUSK_509R--GBK1-0 ,
+ BoldItalicFeatures = {FakeBold=4} ,
SmallCapsFont = * ]
}{
\setCJKmainfont{FandolSong-Regular.otf}[
@@ -99,13 +134,13 @@
BoldItalicFeatures = {FakeBold=4} ,
SmallCapsFont = * ]
}
-\IfFontExistsTF{FZYouSongS 507R}{%
- \setCJKmonofont{FZYouSongS 507R}[
- BoldFont = FZYouSongS 509R ,
- BoldFeatures = {FakeBold=2} ,
+\IfFontExistsTF{FZYOUSK_507R--GBK1-0}{%
+ \setCJKmonofont{FZYOUSK_507R--GBK1-0}[
+ BoldFont = FZYOUSK_509R--GBK1-0 ,
+ BoldFeatures = {FakeBold=4} ,
ItalicFont = * ,
- BoldItalicFont = FZYouSongS 509R ,
- BoldItalicFeatures = {FakeBold=2} ,
+ BoldItalicFont = FZYOUSK_509R--GBK1-0 ,
+ BoldItalicFeatures = {FakeBold=4} ,
SmallCapsFont = * ]
}{
\setCJKmonofont{FandolFang-Regular.otf}[
@@ -116,11 +151,12 @@
BoldItalicFeatures = {FakeBold=4} ,
SmallCapsFont = * ]
}
-\IfFontExistsTF{FZYouHeiS 506L}{%
- \setCJKsansfont{FZYouHeiS 506L}[
- BoldFont = FZYouHeiS 509R,
+\IfFontExistsTF{FZYOUHK_506L--GBK1-0}{%
+ \setCJKsansfont{FZYOUHK_506L--GBK1-0}[
+ BoldFont = FZYOUHK_509R--GBK1-0 ,
+ BoldFeatures = {FakeBold=4} ,
ItalicFont = * ,
- BoldItalicFont = FZYouHeiS 509R ,
+ BoldItalicFont = FZYOUHK_509R--GBK1-0 ,
SmallCapsFont = * ]
}{
\setCJKsansfont{FandolHei-Regular.otf}[
@@ -131,14 +167,16 @@
}
%% Math font
-\if@minimclass@fast\else
+\if@minimclass@fast
+\RequirePackage{amssymb}
+\else
\PassOptionsToPackage
{warnings-off={mathtools-colon,mathtools-overbracket}}{unicode-math}
\RequirePackage{unicode-math}
-\unimathsetup{math-style=ISO}
+\unimathsetup{math-style=ISO, partial=upright, nabla=upright}
\setmathfont{Asana-Math.otf}
\IfFontExistsTF{Neo Euler}{%
-\setmathfont{Neo Euler} % From https://tex.stackexchange.com/a/425887
+\setmathfont{Neo Euler}
[range={"0000-"0001,"0020-"007E,
"00A0,"00A7-"00A8,"00AC,"00AF,"00B1,"00B4-"00B5,"00B7,
"00D7,"00F7,
@@ -165,9 +203,22 @@
"1D507-"1D50A,"1D50D-"1D514,"1D516-"1D51C,"1D51E-"1D537,
"1D56C-"1D59F,"1D6A8-"1D6B8,"1D6BA-"1D6D2,"1D6D4-"1D6DD,
"1D6DF,"1D6E1,"1D7CE-"1D7D7 }]
+\setmathfont[range=up/{greek,Greek}, script-features={}, sscript-features={}
+ ]{Neo Euler}
+\setmathfont[range=up/{latin,Latin}, script-features={}, sscript-features={}
+ ]{Neo Euler}
+\setmathfont[range={bfup/{latin, Latin, greek, Greek}, frak, bffrak, cal},
+ script-features={}, sscript-features={}
+ ]{Neo Euler}
+\setmathfont[range={up/num, bfup/num, it, bfit, scr, bfscr,
+ sfup, sfit, bfsfup, bfsfit, tt}
+ ]{Asana-Math.otf}
+\setmathfont[range=bfcal, Scale=MatchUppercase, Alternate]{Asana-Math.otf}
}{}
\fi
+\def\PJL@font@alreadyset{}
+
\RequirePackage[verbose=silent]{microtype}
%%================================
@@ -176,7 +227,9 @@
\RequirePackage{graphicx}
\graphicspath{{images/}}
\RequirePackage{wrapfig}
+\RequirePackage{float}
\RequirePackage{caption}
+\captionsetup{font=small}
%%================================
%% Index
@@ -185,53 +238,6 @@
\pretocmd{\printindex}{\LocallyStopLineNumbers}{}{\FAIL}
\apptocmd{\printindex}{\ResumeLineNumbers}{}{\FAIL}
-%%================================
-%% Draft mark
-%%================================
-\def\dnfFont{\ttfamily}
-\def\needgraphFont{\ttfamily}
-
-\def\dnfTextEN{To be finished here}
-\def\needgraphTextEN{A graph is needed here}
-\def\dnfTextFR{À terminer ici}
-\def\needgraphTextFR{Il manque encore un graphique ici}
-\def\dnfTextCN{这里的内容尚未完成}
-\def\needgraphTextCN{这里需要一张图片}
-
-\definecolor{dnfColor}{RGB}{21,122,20}
-\definecolor{needgraphColor}{RGB}{70,130,180}
-
-\if@minimclass@fast
- \newcommand{\plainBox}[2][-paper]{\textcolor{#1}{%
- \setlength{\fboxsep}{1.5pt}%
- \setlength{\fboxrule}{1.2pt}%
- \fbox{#2}}}
-\else
- \PassOptionsToPackage{many}{tcolorbox}
- \RequirePackage{tcolorbox}
- \newtcbox{\plainBox}[1][-paper]{enhanced jigsaw,%
- on line, arc = 1.2pt, outer arc = 1pt,breakable,%
- colframe = #1,colupper=#1,opacityback=0,%
- boxsep = 1pt,boxrule = 1.2pt,%
- left = 1pt, right = 1pt, top = 0pt, bottom = 0pt,%
- }
-\fi
-
-\NewDocumentCommand{\dnf}{d<>}{%
- \noindent\plainBox[dnfColor]%
- {\normalfont\dnfFont\bfseries\small%
- \csname dnfText\csname\languagename ABBR\endcsname\endcsname%
- \IfNoValueF{#1}{ : #1}}%
-}
-\NewDocumentCommand{\needgraph}{d<>}{%
- \par%
- \centerline{\plainBox[needgraphColor]%
- {\normalfont\needgraphFont\bfseries\small%
- \csname needgraphText\csname\languagename ABBR\endcsname\endcsname%
- \IfNoValueF{#1}{ : #1}}}%
- \par%
-}
-
\endinput
%%
%% End of file `einfart/einfart.cls'.
diff --git a/macros/unicodetex/latex/lebhart/README.md b/macros/unicodetex/latex/lebhart/README.md
index a5904f6091..de8ab4733b 100644
--- a/macros/unicodetex/latex/lebhart/README.md
+++ b/macros/unicodetex/latex/lebhart/README.md
@@ -5,10 +5,11 @@
`lebhart` is a LaTeX class for typesetting articles, which has a colorful
design.
-Currently, it has native support to English, French and Chinese typesetting. And
-it may compile with either XeLaTeX or LuaLaTeX.
+Currently, it has native support to Chinese (simplified and traditional),
+English, French, German, Japanese and Russian typesetting. And it may compile
+with either XeLaTeX or LuaLaTeX.
-This is part of the colorist class series.
+This is part of the `colorist` class series.
# License
diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf
index c8bebc1013..c9caec16c3 100644
--- a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf
+++ b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex
index 421a013c9a..196b121790 100644
--- a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex
+++ b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex
@@ -1,24 +1,26 @@
%! TEX program = xelatex
-\PassOptionsToPackage{dvipsnames}{xcolor}
-\documentclass{lebhart}
-
-\UseLanguage{Chinese}
+\documentclass[allowbf]{lebhart}
%%================================
-%% TeX logo 与 网址
+%% 引入工具集
%%================================
-\usepackage{hologo}
-\usepackage{url}
+\usepackage{PJLtoolkit}
+\usepackage{longtable} % breakable tables
+\usepackage{hologo} % more TeX logo
+
+\UseLanguage{Chinese}
%%================================
%% 排版代码
%%================================
\usepackage{listings}
+\definecolor{maintheme}{RGB}{70,130,180}
+\definecolor{forestgreen}{RGB}{21,122,81}
\definecolor{lightergray}{gray}{0.99}
\lstset{language=[LaTeX]TeX,
- keywordstyle=\color{RoyalBlue},
+ keywordstyle=\color{maintheme},
basicstyle=\ttfamily,
- commentstyle=\color{ForestGreen}\ttfamily,
+ commentstyle=\color{forestgreen}\ttfamily,
stringstyle=\rmfamily,
showstringspaces=false,
breaklines=true,
@@ -31,67 +33,183 @@
firstnumber=last,
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
-\lstset{morekeywords=%
- {CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,
- linenumbers,nolinenumbers,subsection,maketitle
+\lstset{moretexcs=%
+ {color,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
}
}
\lstnewenvironment{code}%
{\setkeys{lst}{columns=fullflexible,keepspaces=true}}{}
-\providecommand{\colorist}{\textsf{colorist}}
-\providecommand{\colorart}{\textsf{colorart}}
-\providecommand{\colorbook}{\textsf{colorbook}}
-\providecommand{\lebhart}{\textsf{lebhart}}
-\providecommand{\beaulivre}{\textsf{beaulivre}}
+%%================================
+%% remind
+%%================================
+\usepackage[many]{tcolorbox}
+\newenvironment{remind}[1][提示]{%
+ \begin{tcolorbox}[breakable,
+ enhanced,
+ width = \textwidth,
+ colback = white, colbacktitle = paper,
+ colframe = gray!50, boxrule=0.2mm,
+ coltitle = black,
+ fonttitle = \sffamily,
+ attach boxed title to top left = {yshift=-\tcboxedtitleheight/2, xshift=\tcboxedtitlewidth/4},
+ boxed title style = {boxrule=0pt, colframe=paper},
+ before skip = 0.3cm,
+ after skip = 0.3cm,
+ top = 3mm,
+ bottom = 3mm,
+ title={\sffamily #1}]%
+}{\end{tcolorbox}}
+
+%%================================
+%% 名称
+%%================================
+\providecommand{\colorist}{{\normalfont\textsf{colorist}}}
+\providecommand{\colorart}{{\normalfont\textsf{colorart}}}
+\providecommand{\colorbook}{{\normalfont\textsf{colorbook}}}
+\providecommand{\lebhart}{{\normalfont\textsf{lebhart}}}
+\providecommand{\beaulivre}{{\normalfont\textsf{beaulivre}}}
%%================================
%% 正文
%%================================
\begin{document}
-\title{\lebhart{},以多彩的方式排版你的文章\thanks{对应版本. \texttt{\lebhart{} 2021/03/15}}}
-\author{锦文}
-\date{2021年3月,北京}
+\title{{\normalfont\textbf{\textsf{lebhart}}},以多彩的方式排版你的文章}
+\author{许锦文}
+\thanks{对应版本. \texttt{\lebhart{} 2021/05/24}}
+\date{2021年5月,北京}
\maketitle
\begin{abstract}
- \lebhart{}是\colorist{}文档类系列的成员之一,整个系列包含用于排版文章的\colorart{}、\lebhart{}以及用于排版书的\colorbook{}、\beaulivre{}。我设计这一系列的初衷是为了撰写草稿与笔记,使之多彩而不缭乱。
+ \lebhart{} 是 \colorist{} 文档类系列的成员之一,其名称取自于德文的lebhaft (活泼),并取了artikel (文章)的前三个字母组合而成。整个 \colorist{} 系列包含用于排版文章的 \colorart{}、\lebhart{} 以及用于排版书的 \colorbook{}、\beaulivre{}。我设计这一系列的初衷是为了撰写草稿与笔记,使之多彩而不缭乱。
- 其中,\lebhart{}与\beaulivre{}支持英文、法文、中文三种语言,并且同一篇文档中三种语言可以很好地协调。由于采用了自定义字体,需要采用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 进行编译。
+ \lebhart{} 支持英文、法文、德文、中文、日文、俄文六种语言,并且同一篇文档中这些语言可以很好地协调。由于采用了自定义字体,需要用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 引擎进行编译。
- 这篇说明文档是用\lebhart{}排版的,你可以把它看作一份简短的说明与演示。
+ 这篇说明文档即是用 \lebhart{} 排版的 (使用了参数 \texttt{allowbf}),你可以把它看作一份简短的说明与演示。
\end{abstract}
-\begin{tcolorbox}[enhanced jigsaw,pad at break*=1mm,breakable,colback=yellow!25!paper,boxrule=0pt,frame hidden]
- 由于\colorist{}主体是从\textsf{minimalist}系列修改而来的,因而一些页面元素还未完全重新设计,特别是目录、part和chapter的样式。这些内容会在将来逐渐加入。
-\end{tcolorbox}
-
\tableofcontents
-\section{关于文档类的名称与选项}
+\bigskip\bigskip
+\begin{remind}
+ 多语言支持、定理类环境、未完成标记等功能是由 \ProjLib{} 工具箱提供的,这里只给出了将其与本文档类搭配使用的要点。如需获取更详细的信息,可以参阅 \ProjLib{} 的说明文档。
+\end{remind}
+
+\clearpage
+\section{初始化}
+
+\subsection{如何载入}
+
+只需要在第一行写:
+
+\begin{code}
+ \documentclass{lebhart}
+\end{code}
+
+即可使用 \lebhart{} 文档类。请注意,要使用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 引擎才能编译。
+
+\subsection{选项}
+
+\lebhart{} 文档类有下面几个选项:
+
+\begin{itemize}
+ \item \texttt{draft} 或 \texttt{fast}
+ \begin{itemize}
+ \item 你可以使用选项 \verb|fast| 来启用快速但略微粗糙的样式,主要区别是:
+ \begin{itemize}
+ \item 使用较为简单的数学字体设置;
+ \item 不启用超链接;
+ \item 启用 \ProjLib{} 工具箱的快速模式。
+ \end{itemize}
+ \end{itemize}
+ \item \texttt{a4paper} 或 \texttt{b5paper}
+ \begin{itemize}
+ \item 可选的纸张大小。默认的纸张大小为 8.5in $\times$ 11in。
+ \end{itemize}
+ \item \texttt{allowbf}
+ \begin{itemize}
+ \item 允许加粗。启用这一选项时,题目、各级标题、定理类环境名称会被加粗。
+ \end{itemize}
+\end{itemize}
+
+\begin{remind}
+ \begin{itemize}
+ \item 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。
+ \end{itemize}
+\end{remind}
+
+\medskip
+\section{关于文档类中使用的字体}
+\lebhart{} 默认使用 Palatino Linotype 作为英文字体,方正悠宋、悠黑GBK作为中文字体,并部分使用了 Neo Euler 作为数学字体。其中,Neo Euler可以在 \url{https://github.com/khaledhosny/euler-otf} 下载。其他字体不是免费字体,需要自行购买使用。可以在方正字库网站查询详细资料:\url{https://www.foundertype.com}。
+
+\begin{remind}[字体演示]
+ \begin{itemize}
+ \item English main font. \textsf{English sans serif font}. \texttt{English typewriter font}.
+ \item 中文主要字体,\textsf{中文无衬线字体}
+ \item 数学示例: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
+ \end{itemize}
+\end{remind}
+
+在没有安装相应的字体时,将采用TeX Live中自带的字体来代替,效果可能会有所折扣。
-\lebhart{}取自于德文的lebhaft (活泼),并取了artikel (文章)的前三个字母组合而成。
+\clearpage
+\section{使用说明}
-\beaulivre{}取自于法文的beau (美丽),以及livre (书),由二者组合而成。
+接下来介绍的许多功能是由 \ProjLib{} 工具箱提供的。这里只介绍了基本使用方法,更多细节可以直接参阅其用户文档。
\medskip
-你可以使用选项 \verb|fast| 来启用快速但略微粗糙的样式,主要区别是:
+\subsection{语言设置}
+
+\lebhart{} 提供了多语言支持,包括简体中文、繁体中文、英文、法文、德文、日文、俄文。可以通过下列命令来选定语言:
+\begin{itemize}
+ \item \lstinline|\UseLanguage{|\meta{language name}\lstinline|}|,用于指定语言,在其后将使用对应的语言设定。
+ \begin{itemize}
+ \item 既可以用于导言部分,也可以用于正文部分。在不指定语言时,默认选定 “English”。
+ \end{itemize}
+ \item \lstinline|\UseOtherLanguage{|\meta{language name}\lstinline|}{|\meta{content}\lstinline|}|,用指定的语言的设定排版 \meta{content}。
+ \begin{itemize}
+ \item 相比较 \lstinline|\UseLanguage|,它不会对行距进行修改,因此中西文字混排时能够保持行距稳定。
+ \end{itemize}
+\end{itemize}
+
+\meta{language name} 有下列选择:
+\begin{itemize}
+ \item 简体中文:\texttt{Chinese}、\texttt{chinese}、\texttt{SChinese}、\texttt{schinese}、\texttt{SimplifiedChinese} \\\hspace*{5em}或 \texttt{simplifiedchinese}
+ \item 繁体中文:\texttt{TChinese}、\texttt{tchinese}、\texttt{TraditionalChinese} 或 \texttt{traditionalchinese}
+ \item 英文:\texttt{English} 或 \texttt{english}
+ \item 法文:\texttt{French} 或 \texttt{french}
+ \item 德文:\texttt{German}、\texttt{german} 或 \texttt{ngerman}
+ \item 日文:\texttt{Japanese} 或 \texttt{japanese}
+ \item 俄文:\texttt{Russian} 或 \texttt{russian}
+\end{itemize}
+
+另外,还可以通过下面的方式来填加相应语言的设置:
\begin{itemize}
- \item 使用较为简单的数学字体设置;
- \item 不使用hyperref;
- \item 所有tcolorbox使用draft模式;
- \item 使用polyglossia而不是babel来支持多语言。(使用polyglossia编译速度会略有提高,但目前对于中文的兼容不太完善,在它更加稳定后,将会考虑全面切换到polyglossia)
+ \item \lstinline|\AddLanguageSetting{|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item 向所有支持的语言增加设置 \meta{settings}。
+ \end{itemize}
+ \item \lstinline|\AddLanguageSetting(|\meta{language name}\lstinline|){|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item 向指定的语言 \meta{language name} 增加设置 \meta{settings}。
+ \end{itemize}
\end{itemize}
+例如,\lstinline|\AddLanguageSetting(German){\color{orange}}| 可以让所有德语以橙色显示(当然,还需要再加上 \lstinline|\AddLanguageSetting{\color{black}}| 来修正其他语言的颜色)。
+
+\medskip
+\subsection{定理类环境及其引用}
-在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。
+定义、定理等环境已经被预定义,可以直接使用。
-\section{一些使用说明}
+具体来说,预设的定理类环境包括:
+\texttt{assumption}、\texttt{axiom}、\texttt{conjecture}、\texttt{convention}、\texttt{corollary}、\texttt{definition}、\texttt{definition-proposition}、\texttt{definition-theorem}、\texttt{example}、\texttt{exercise}、\texttt{fact}、\texttt{hypothesis}、\texttt{lemma}、\texttt{notation}、\texttt{problem}、\texttt{property}、\texttt{proposition}、\texttt{question}、\texttt{remark}、\texttt{theorem},以及相应的带有星号 \lstinline|*| 的无编号版本。
-\subsection{定理,以及引用}
+\medskip
+在引用定理类环境时,建议使用智能引用 \lstinline|\cref{|\meta{label}\lstinline|}|。这样就不必每次都写上相应环境的名称了。
-定义、定理等环境已经被预定义,可以直接使用,例如:
+\begin{remind}[例子]
\begin{code}
\begin{definition}[奇异物品] \label{def: strange} ...
\end{code}
@@ -100,17 +218,23 @@
这是奇异物品的定义。
\end{definition}
-\begin{definition}[另一个定义]
- 不同的定义会自动粘结在一起,中间不会有空隙。
-\end{definition}
+\lstinline|\cref{def: strange}| 会显示为:\cref{def: strange}。
-引用时,可以直接使用智能引用 \lstinline|\cref{标签名称}|,例如:\lstinline|\cref{def: strange}| 会显示为:\cref{def: strange}。
+\medskip
+使用 \lstinline|\UseLanguage{English}| 后,定理会显示为:
-\bigskip
-下面是定理类环境的其他几种样式:
+\UseLanguage{English}
+\begin{theorem}[Useless]\label{thm}
+ A theorem in English.
+\end{theorem}
+
+默认情况下,引用时,定理的名称总是与定理所在区域的语言匹配,例如,上面的定义在现在的英文模式下依然显示为中文:\cref{def: strange} 和 \cref{thm}。如果在引用时想让定理的名称与当前语境相匹配,可以在全局选项中加入 \texttt{regionalref}。
+\end{remind}
+\bigskip
+下面是定理类环境的几种主要样式:
\begin{theorem}
- Theorem style: theorem, proposition, lemma, corollary
+ Theorem style: theorem, proposition, lemma, corollary, ...
\end{theorem}
\begin{proof}
@@ -126,132 +250,277 @@
\end{conjecture}
\begin{example*}
- Example style: example, fact
+ Example style: example, fact, ...
\end{example*}
\begin{problem}
- Problem style
+ Problem style: problem, question, ...
\end{problem}
+\medskip
+为了美观,相邻的定义环境会自动连在一起:
+\begin{definition}
+ First definition.
+\end{definition}
+
+\begin{definition}
+ Second definition.
+\end{definition}
+
+\UseLanguage{Chinese}
+
+\clearpage
\subsection{定义新的定理型环境}
-首先定义这个环境在所用语言下的名称 \lstinline|\(name of environment)(language name)|,其中 \\\lstinline|(language name)| 是 \lstinline|EN|、\lstinline|FR|、\lstinline|CN| 等,然后用下面四种方式之一定义这一环境:
+若需要定义新的定理类环境,首先要定义这个环境在所用语言下的名称 \lstinline|\|\meta{name of environment}\meta{language abbr},其中 \meta{language abbr} 是语言的简写,分别为:
+\begin{longtable}{ll|ll}
+ \texttt{CN} & 简体中文 & \texttt{DE} & 德文\\
+ \texttt{TC} & 繁体中文 & \texttt{JP} & 日文\\
+ \texttt{EN} & 英文 & \texttt{RU} & 俄文\\
+ \texttt{FR} & 法文 & &\\
+\end{longtable}
+
+\vspace{-\baselineskip}
+\begin{remind}
+ 如果要定义名称后带有星号 \lstinline|*| 的环境,那么在上面的 \meta{name of environment} 中不用写星号。
+\end{remind}
+
+然后用下面五种方式之一定义这一环境:
\begin{itemize}
- \item \lstinline|\CreateTheorem*{(name of environment)}|
- \item \lstinline|\CreateTheorem{(name of environment)}[(numbered like)]|
- \item \lstinline|\CreateTheorem{(name of environment)}<(numbered within)>|
- \item \lstinline|\CreateTheorem{(name of environment)}|
+ \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item 定义不编号的环境 \meta{name of environment}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item 定义编号环境 \meta{name of environment},按顺序编号
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
+ \begin{itemize}
+ \item 定义编号环境 \meta{name of environment},与 \meta{numbered like} 计数器共用编号
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
+ \begin{itemize}
+ \item 定义编号环境 \meta{name of environment},在 \meta{numbered within} 计数器内编号
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|\\
+ \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|
+ \begin{itemize}
+ \item 将 \meta{name of environment} 与 \meta{existed environment} 或 \meta{existed environment}\lstinline|*| 等同。
+ \item 这种方式通常在两种情况下比较有用:
+ \begin{enumerate}
+ \item 希望定义更简洁的名称。例如,使用 \lstinline|\CreateTheorem{thm}(theorem)|,便可以直接用名称 \texttt{thm} 来撰写定理。
+ \item 希望去除某些环境的编号。例如,使用 \lstinline|\CreateTheorem{remark}(remark*)|,便可以去除 \texttt{remark} 环境的编号。
+ \end{enumerate}
+ \end{itemize}
\end{itemize}
+\begin{remind}
+ 其内部使用了 \textsf{amsthm},因此传统的 \texttt{theoremstyle} 对其也是适用的,只需在相关定义前标明即可。
+\end{remind}
+
\def\proofideanameCN{思路}
-\CreateTheorem*{proofidea}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>
-例如,
+\bigskip
+下面提供一个例子。这三行代码:
\begin{code}
\def\proofideanameCN{思路}
- \CreateTheorem*{proofidea}
+ \CreateTheorem*{proofidea*}
+ \CreateTheorem{proofidea}<subsection>
\end{code}
-可以定义不编号的环境 \lstinline|proofidea|,它支持在中文环境中使用,效果如下所示:
+
+可以分别定义不编号的环境 \lstinline|proofidea*| 和编号的环境 \lstinline|proofidea| (在 subsection 内编号),它们支持在简体中文语境中使用,效果如下所示:
+
+\begin{proofidea*}
+ \lstinline|proofidea*| 环境。
+\end{proofidea*}
\begin{proofidea}
- ...
+ \lstinline|proofidea| 环境。
\end{proofidea}
\subsection{未完成标记}
你可以通过 \lstinline|\dnf| 来标记尚未完成的部分。例如:
\begin{itemize}
- \item \lstinline|\dnf|: \quad \dnf
- \item \lstinline|\dnf<还需加入…>|: \quad \dnf<还需加入…>
+ \item \lstinline|\dnf| 或 \lstinline|\dnf<...>|。效果为:\dnf~或 \dnf<...>。\\其提示文字与当前语言相对应,例如,在法语模式下将会显示为 \UseOtherLanguage{French}{\dnf}。
\end{itemize}
类似的,还有 \lstinline|\needgraph| :
\begin{itemize}
- \item \lstinline|\needgraph|: \needgraph
- \item \lstinline|\needgraph<关于…>|: \needgraph<关于…>
+ \item \lstinline|\needgraph| 或 \lstinline|\needgraph<...>|。效果为:\needgraph~或 \needgraph<...>其提示文字与当前语言相对应,例如,在法语模式下将会显示为 \UseOtherLanguage{French}{\needgraph}
\end{itemize}
-\subsection{语言设置}
-可以随时使用 \lstinline|\UseLanguage{语言名称}| 更改语言,语言名称包括Chinese、English、French(首字母大小写随意,例如chinese亦可)。这样,各种指令和环境的效果也会随之变动。
-例如,使用 \lstinline|\UseLanguage{English}| 后,定理与未完成标记会显示为:
+\subsection{关于文章标题、摘要与关键词}
-\UseLanguage{English}
-\begin{theorem}[Useless]\label{thm}
- Some theorem in English. \dnf
-\end{theorem}
+% 由于引入了 \ProjLib{} 工具箱的 \textsf{PJLamssim} 组件,
+\lebhart{} 同时具有标准文档类与\AmS{} 文档类的一些特性。
-引用时,定理的名称总是与定理所在区域的语言匹配,例如,开头的定义在现在的英文模式下依然显示为中文:\cref{def: strange} 和 \cref{thm}。
+因此,文章的标题部分既可以按照标准文档类 \textsf{article} 的写法来写:
-\UseLanguage{Chinese}
+\begin{code}
+ \title{(*\meta{title}*)}
+ \author{(*\meta{author}*)}
+ \date{(*\meta{date}*)}
+ \maketitle
+ \begin{abstract}
+ (*\meta{abstract}*)
+ \end{abstract}
+ \begin{keyword}
+ (*\meta{keywords}*)
+ \end{keyword}
+\end{code}
-\subsection{关于字体}
-\lebhart{}与\beaulivre{}使用Palatino Linotype作为英文字体,方正悠宋、悠黑简体作为中文字体,并部分使用了Neo Euler作为数学字体:
-\begin{itemize}
- \item English main font. \textsf{English sans serif font}.
- \item 中文主要字体,\textsf{中文无衬线字体}
- \item 数学示例: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
-\end{itemize}
+也可以按照 \AmS{} 文档类的方式来写:
+
+\begin{code}
+ \title{(*\meta{title}*)}
+ \author{(*\meta{author}*)}
+ \address{(*\meta{address}*)}
+ \email{(*\meta{email}*)}
+ \date{(*\meta{date}*)}
+ \keywords{(*\meta{keywords}*)}
+ \subjclass{(*\meta{subjclass}*)}
+ \begin{abstract}
+ (*\meta{abstract}*)
+ \end{abstract}
+ \maketitle
+\end{code}
-其中,Neo Euler可以在 \url{https://github.com/khaledhosny/euler-otf} 下载。
+作者信息可以包含多组,输入方式为:
-其他字体不是免费字体,需要自行购买使用(你可以在方正字库网站查询详细资料:\url{https://www.foundertype.com})。
+\begin{code}
+ \author{(*\meta{author 1}*)}
+ \address{(*\meta{address 1}*)}
+ \email{(*\meta{email 1}*)}
+ \author{(*\meta{author 2}*)}
+ \address{(*\meta{address 2}*)}
+ \email{(*\meta{email 2}*)}
+ ...
+\end{code}
-在没有安装相应的字体时,将采用TeX Live中自带的字体来代替,效果可能会有所折扣。
+其中 \lstinline|\address|、\lstinline|\curraddr|、\lstinline|\email| 的相互顺序是不重要的。
+
+
+\medskip
+\section{目前存在的问题}
+
+\begin{itemize}[itemsep=.6em]
+ \item 目录、part、chapter 的设计依然有待改良。
+ \item 对于字体的设置仍然不够完善。
+ \item 由于很多核心功能建立在 \ProjLib{} 工具箱的基础上,因此 \lebhart{} 自然继承了其所有问题。详情可以参阅 \ProjLib{} 用户文档的“目前存在的问题”这一小节。
+ \item 错误处理功能不完善,在出现一些问题时没有相应的错误提示。
+ \item 代码中仍有许多可优化之处。
+\end{itemize}
+
+\UseLanguage{English}
+
+\clearpage
\section{文档示例}
-\singlespacing
+\subsection{标准文档类写法}
+
+如果想采用标准文档类中的写法,可以参考下面的例子:
-\begin{minipage}{0.45\textwidth}
\begin{code}
-%! TEX program = xelatex
-\documentclass[fast]{lebhart}
+\documentclass{lebhart}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
-\linenumbers
-\UseLanguage{French}
+\UseLanguage{French} % Use French from here
\begin{document}
-\title{Titre}
-\author{Nom}
-\date{03 / 2021, Lieu}
+\title{Le Titre}
+\author{Auteur}
+\date{\PJLdate{2022-04-01}}
\maketitle
-%% Texte ici
+\begin{abstract}
+ Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
+\end{abstract}
+\begin{keyword}
+ AAA, BBB, CCC, DDD, EEE
+\end{keyword}
+
+\section{Un théorème}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
\end{document}
\end{code}
-\end{minipage}
-%
-\hfill
-%
-\begin{minipage}{0.45\textwidth}
+
+如果以后想切换到标准文档类,只需要将前两行换为:
+
\begin{code}
-%! TEX program = xelatex
-\documentclass[fast]{lebhart}
+\documentclass{article}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
-\linenumbers
-\UseLanguage{Chinese}
+
+\clearpage
+\subsection{\texorpdfstring{\AmS{}}{AMS} 文档类写法}
+
+如果日后有意切换到期刊模版,想采用 \AmS{} 文档类中的写法,可以参考下面的例子:
+
+\begin{code}
+\documentclass{lebhart}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
+
+\UseLanguage{French} % Use French from here
\begin{document}
-\title{标题}
-\author{姓名}
-\date{2021年3月,地点}
+\title{Le Titre}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 1}{Courriel 1}}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 2}{Courriel 2}}
+\date{\PJLdate{2022-04-01}}
+\subjclass{*****}
+\keywords{...}
+
+\begin{abstract}
+ Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
+\end{abstract}
\maketitle
-%% 正文部分
+\section{Première section}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
\end{document}
\end{code}
-\end{minipage}
-\par
-\bigskip
-(\lstinline|\UseLanguage| 既可以放在导言中,也可以放在正文部分,并且可以按照需要反复使用)
+这样,若想切换到 \AmS{} 文档类,只需要将前两行换为:
+
+\begin{code}
+\documentclass{amsart}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
\end{document}
diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf b/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf
index 78b7bea93b..c3f8cefee0 100644
--- a/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf
+++ b/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex b/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex
index 9985713280..53da4a67c5 100644
--- a/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex
+++ b/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex
@@ -1,22 +1,24 @@
%! TEX program = xelatex
-\PassOptionsToPackage{dvipsnames}{xcolor}
-\documentclass{lebhart}
+\documentclass[allowbf]{lebhart}
%%================================
-%% TeX logo and URL
+%% Import toolkit
%%================================
-\usepackage{hologo}
-\usepackage{url}
+\usepackage{PJLtoolkit}
+\usepackage{longtable} % breakable tables
+\usepackage{hologo} % more TeX logo
%%================================
%% For typestting code
%%================================
\usepackage{listings}
+\definecolor{maintheme}{RGB}{70,130,180}
+\definecolor{forestgreen}{RGB}{21,122,81}
\definecolor{lightergray}{gray}{0.99}
\lstset{language=[LaTeX]TeX,
- keywordstyle=\color{RoyalBlue},
+ keywordstyle=\color{maintheme},
basicstyle=\ttfamily,
- commentstyle=\color{ForestGreen}\ttfamily,
+ commentstyle=\color{forestgreen}\ttfamily,
stringstyle=\rmfamily,
showstringspaces=false,
breaklines=true,
@@ -29,85 +31,205 @@
firstnumber=last,
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
-\lstset{morekeywords=%
- {CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,
- linenumbers,nolinenumbers,subsection,maketitle
+\lstset{moretexcs=%
+ {linenumbers,nolinenumbers,subsection,
+ color,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
}
}
\lstnewenvironment{code}%
{\setkeys{lst}{columns=fullflexible,keepspaces=true}}{}
-\providecommand{\colorist}{\textsf{colorist}}
-\providecommand{\colorart}{\textsf{colorart}}
-\providecommand{\colorbook}{\textsf{colorbook}}
-\providecommand{\lebhart}{\textsf{lebhart}}
-\providecommand{\beaulivre}{\textsf{beaulivre}}
+%%================================
+%% remind
+%%================================
+\usepackage[many]{tcolorbox}
+\newenvironment{remind}[1][Remind]{%
+ \begin{tcolorbox}[breakable,
+ enhanced,
+ width = \textwidth,
+ colback = white, colbacktitle = paper,
+ colframe = gray!50, boxrule=0.2mm,
+ coltitle = black,
+ fonttitle = \sffamily,
+ attach boxed title to top left = {yshift=-\tcboxedtitleheight/2, xshift=\tcboxedtitlewidth/4},
+ boxed title style = {boxrule=0pt, colframe=paper},
+ before skip = 0.3cm,
+ after skip = 0.3cm,
+ top = 3mm,
+ bottom = 3mm,
+ title={\sffamily #1}]%
+}{\end{tcolorbox}}
+
+%%================================
+%% Names
+%%================================
+\providecommand{\colorist}{{\normalfont\textsf{colorist}}}
+\providecommand{\colorart}{{\normalfont\textsf{colorart}}}
+\providecommand{\colorbook}{{\normalfont\textsf{colorbook}}}
+\providecommand{\lebhart}{{\normalfont\textsf{lebhart}}}
+\providecommand{\beaulivre}{{\normalfont\textsf{beaulivre}}}
%%================================
%% Main text
%%================================
\begin{document}
-\title{\lebhart{}, write your articles in a colorful way\thanks{Corresponding to: \texttt{\lebhart{} 2021/03/15}}}
-\author{Jinwen}
-\date{March 2021, Beijing}
+\title{{\normalfont\textbf{\textsf{lebhart}}}, write your articles in a colorful way}
+\author{Jinwen XU}
+\thanks{Corresponding to: \texttt{\lebhart{} 2021/05/24}}
+\date{May 2021, Beijing}
\maketitle
\begin{abstract}
- \lebhart{} is a member of the \colorist{} class series. The entire collection includes \colorart{} and \lebhart{} for typesetting articles and \colorbook{} and \beaulivre{} for typesetting books. My original intention in designing this series was to write drafts and notes that look colorful yet not dazzling.
+ \lebhart{} is a member of the \colorist{} class series. Its name is taken from German word ``lebhaft'' (``vividly''), combined with the first three letters of ``artikel'' (``article''). The entire collection includes \colorart{} and \lebhart{} for typesetting articles and \colorbook{} and \beaulivre{} for typesetting books. My original intention in designing this series was to write drafts and notes that look colorful yet not dazzling.
- Among them, \lebhart{} and \beaulivre{} support three languages: English, French, and Chinese, and these three languages can be switched seamlessly in a single document. Due to the usage of custom fonts, they need to be compiled with \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
+ \lebhart{} supports six languages: English, French, German, Chinese, Japanese and Russian. These languages can be switched seamlessly in a single document. Due to the usage of custom fonts, \lebhart{} requires \hologo{XeLaTeX} or \hologo{LuaLaTeX} to compile.
- This documentation is typeset using \lebhart{}. You can think of it as a short introduction and demonstration.
+ This documentation is typeset using \lebhart{} (with the option \texttt{allowbf}). You can think of it as a short introduction and demonstration.
\end{abstract}
-\begin{tcolorbox}[enhanced jigsaw,pad at break*=1mm,breakable,colback=yellow!25!paper,boxrule=0pt,frame hidden]
- Since the main body of \colorist{} is modified from the \textsf{minimalist} series, some elements have not been completely redesigned yet, especially the TOC, part and chapter style. These will be added gradually in the future versions.
-\end{tcolorbox}
-
\tableofcontents
-\section{On the naming and options}
+\bigskip
+\begin{remind}
+ Multi-language support, theorem-like environments, draft marks and some other features are provided by the \ProjLib{} toolkit. Here we only briefly discuss how to use it with this document class. For more detailed information, you can refer to the documentation of \ProjLib{}.
+\end{remind}
+
+
+\clearpage
+\section{Initialization}
+
+\subsection{How to load}
+
+One only needs to put
+\begin{code}
+ \documentclass{lebhart}
+\end{code}
+as the first line to use the \lebhart{} class. Please note that you need to use either \hologo{XeLaTeX} or \hologo{LuaLaTeX} engine to compile.
+
+\subsection{Options}
+
+\lebhart{} offers the following options:
+
\begin{itemize}
- \item \lebhart{} is taken from German word ``lebhaft'' (``vividly''), combined with the first three letters of ``artikel'' (``article'').
- \item \beaulivre{} is taken from French words ``beau'' (for ``beautiful'') and ``livre'' (for ``book'').
+ \item \texttt{draft} or \texttt{fast}
+ \begin{itemize}
+ \item The option \verb|fast| enables a faster but slightly rougher style, main differences are:
+ \begin{itemize}
+ \item Use simpler math font configuration;
+ \item Do not use hyperref;
+ \item Enable the fast mode of \ProjLib{} toolkit.
+ \end{itemize}
+ \end{itemize}
+ \item \texttt{a4paper} or \texttt{b5paper}
+ \begin{itemize}
+ \item Optional paper size. The default paper size is 8.5in $\times$ 11in.
+ \end{itemize}
+ \item \texttt{allowbf}
+ \begin{itemize}
+ \item Allow boldface. When this option is enabled, the title, titles of all levels and names of theorem-like environments will be bolded.
+ \end{itemize}
\end{itemize}
-You can use the option \verb|fast| to enable a fast but slightly rough version. The main differences are:
+\begin{remind}
+ \begin{itemize}
+ \item During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark "DRAFT" to indicate that you are currently in the draft mode.
+ \end{itemize}
+\end{remind}
+
+\section{On the fonts}
+By default, \lebhart{} uses Palatino Linotype as the English font, FounderType's YouSong and YouHei GBK as the Chinese fonts, and partially uses Neo Euler as the math font. Among them, Neo Euler can be downloaded at \url{https://github.com/khaledhosny/euler-otf}. The other fonts are not free, you need to purchase and use them on your own. (For the Chinese fonts, visit FounderType's website for detail: \url{https://www.foundertype.com} ).
+
+\begin{remind}[Font demonstration]
+ \begin{itemize}
+ \item English main font. \textsf{English sans serif font}. \texttt{English typewriter font}.
+ \item 中文主要字体,\textsf{中文无衬线字体}
+ \item 数学示例: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
+ \end{itemize}
+\end{remind}
+
+When the corresponding font is not installed, fonts that comes with TeX Live will be used instead. In this case, the experience might be reduced.
+
+\section{Some instructions}
+
+Many of the features described next are provided by the \ProjLib{} toolkit. Only the basic usage is mentioned here. For more details, please refer to its user documentation.
+
+\bigskip
+\subsection{Language configuration}
+
+\lebhart{} has multi-language support, including simplified Chinese, traditional Chinese, English, French, German, Japanese, and Russian. The language can be selected by the following macros:
+
\begin{itemize}
- \item Use simpler math font configuration;
- \item Do not use hyperref;
- \item Use draft mode for all tcolorboxes;
- \item Use polyglossia instead of babel to support multiple languages. (Using polyglossia will increase the compilation speed slightly, but the current compatibility with Chinese is not perfect. When it becomes more stable, I will consider fully switching to polyglossia)
+ \item \lstinline|\UseLanguage{|\meta{language name}\lstinline|}| is used to specify the language. The corresponding setting of the language will be applied after it. It can be used either in the preamble or in the main body. When no language is specified, ``English" is selected by default.
+ \item \lstinline|\UseOtherLanguage{|\meta{language name}\lstinline|}{|\meta{content}\lstinline|}|, which uses the specified language settings to typeset \meta{content}. Compared with \lstinline|\UseLanguage|, it will not modify the line spacing, so line spacing would remain stable when CJK and Western texts are mixed.
\end{itemize}
-During the writing stage of your document, it is recommended to use the \verb|fast| option to speed up compilation and improve the smoothness of your writing experience. At the end, you can remove the ``fast'' mark to get the final version.
+\meta{language name} can be:
+\begin{itemize}
+ \item Simplified Chinese: \texttt{Chinese}, \texttt{chinese}, \texttt{SChinese}, \texttt{schinese}, \texttt{SimplifiedChinese} or \texttt{simplifiedchinese}
+ \item Traditional Chinese: \texttt{TChinese}, \texttt{tchinese}, \texttt{TraditionalChinese} or \texttt{traditionalchinese}
+ \item English: \texttt{English} or \texttt{english}
+ \item French: \texttt{French} or \texttt{french}
+ \item German: \texttt{German}, \texttt{german} or \texttt{ngerman}
+ \item Japanese: \texttt{Japanese} or \texttt{japanese}
+ \item Russian: \texttt{Russian} or \texttt{russian}
+\end{itemize}
-\section{Some instructions}
+\medskip
+In addition, you can also add new settings to selected language:
+\begin{itemize}
+ \item \lstinline|\AddLanguageSetting{|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item Add \meta{settings} to all supported languages.
+ \end{itemize}
+ \item \lstinline|\AddLanguageSetting(|\meta{language name}\lstinline|){|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item Add \meta{settings} to the selected language \meta{language name}.
+ \end{itemize}
+\end{itemize}
+For example, \lstinline|\AddLanguageSetting(German){\color{orange}}| can make all German text displayed in orange (of course, one then need to add \lstinline|\AddLanguageSetting{\color{black}}| in order to correct the color of the text in other languages).
+\bigskip
\subsection{Theorems and how to reference them}
-Environments such as definitions and theorems have been pre-defined and can be used directly, for example:
+Environments such as definitions and theorems have been pre-defined and can be used directly.
+
+More specifically, preset environments include:
+\texttt{assumption}, \texttt{axiom}, \texttt{conjecture}, \texttt{convention}, \texttt{corollary}, \texttt{definition}, \texttt{definition-proposition}, \texttt{definition-theorem}, \texttt{example}, \texttt{exercise}, \texttt{fact}, \texttt{hypothesis}, \texttt{lemma}, \texttt{notation}, \texttt{problem}, \texttt{property}, \texttt{proposition}, \texttt{question}, \texttt{remark}, \texttt{theorem}, and the corresponding unnumbered version with an asterisk \lstinline|*| in the name. The display of these environments will change according to the current language.
+
+\medskip
+When referencing a theorem-like environment, it is recommended to use clever reference \lstinline|\cref{|\meta{label}\texttt{\}}. In this way, there is no need to explicitly write down the name of the corresponding environment every time.
+
+\clearpage
+\begin{remind}[Example]
\begin{code}
\begin{definition}[Strange things] \label{def: strange} ...
\end{code}
+
will produce
\begin{definition}[Strange things]\label{def: strange}
- This is the definition of some strange objects.
+ This is the definition of some strange objects.
\end{definition}
-\begin{definition}[Another definition]
- Different definitions are automatically glued together, and there will be no gaps in between.
-\end{definition}
+\lstinline|\cref{def: strange}| will be displayed as: \cref{def: strange}.
-When referencing, you can directly use clever reference \lstinline|\cref{(label name)}|. For example, \lstinline|\cref{def: strange}| will be displayed as: \cref{def: strange}.
+\medskip
+After using \lstinline|\UseLanguage{French}|, a theorem will be displayed as:
-\bigskip
-The following are several other styles of theorem-like environments:
+\UseLanguage{French}
+\begin{theorem}[Inutile]\label{thm}
+ Un théorème en français.
+\end{theorem}
+By default, when referenced, the name of the theorem always matches the language of the context in which the theorem is located. For example, the definition above is still displayed in English in the current French mode: \cref{def: strange} and \cref{thm}. If you want the name of the theorem to match the current context when referencing, you can add \texttt{regionalref} to the global options.
+\end{remind}
+
+
+\bigskip
+The following are the main styles of theorem-like environments:
\begin{theorem}
- Theorem style: theorem, proposition, lemma, corollary
+ Theorem style: theorem, proposition, lemma, corollary, ...
\end{theorem}
\begin{proof}
@@ -123,129 +245,270 @@ The following are several other styles of theorem-like environments:
\end{conjecture}
\begin{example*}
- Example style: example, fact
+ Example style: example, fact, ...
\end{example*}
\begin{problem}
- Problem style
+ Problem style: problem, question, ...
\end{problem}
+\medskip
+For aesthetics, adjacent definitions will be connected together automatically:
+\begin{definition}
+ First definition.
+\end{definition}
+
+\begin{definition}
+ Second definition.
+\end{definition}
+
+\UseLanguage{English}
+
+\clearpage
\subsection{Define a new theorem-like environment}
-First define the name of this environment in the language used: \lstinline|\(name of environment)(language name)|. Where \lstinline|(language name)| can be \lstinline|EN|, \lstinline|FR|, \lstinline|CN|, etc., and then define this environment in one of the following four ways:
+If you need to define a new theorem-like environment, you must first define the name of the environment in the language used: \lstinline|\|\meta{name of environment}\meta{language abbr}, where \meta{language abbr} is the abbreviation of language, which can be:
+% \vspace{-.5\baselineskip}
+\begin{longtable}{ll|ll}
+ \texttt{CN} & Simplified Chinese & \texttt{DE} & German\\
+ \texttt{TC} & Traditional Chinese & \texttt{JP} & Japanese\\
+ \texttt{EN} & English & \texttt{RU} & Russian\\
+ \texttt{FR} & French & &\\
+\end{longtable}
+
+\vspace{-.5\baselineskip}
+\begin{remind}
+ If you want to define an environment with an asterisk \lstinline|*| after the name, you don't need to write an asterisk in the \meta{name of environment} above. See the example below.
+\end{remind}
+
+And then define this environment in one of following five ways:
\begin{itemize}
- \item \lstinline|\CreateTheorem*{(name of environment)}|
- \item \lstinline|\CreateTheorem{(name of environment)}[(numbered like)]|
- \item \lstinline|\CreateTheorem{(name of environment)}<(numbered within)>|
- \item \lstinline|\CreateTheorem{(name of environment)}|
+ \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item Define an unnumbered environment \meta{name of environment}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item Define a numbered environment \meta{name of environment}, numbered in order 1,2,3,\dots
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
+ \begin{itemize}
+ \item Define a numbered environment \meta{name of environment}, which shares the counter \meta{numbered like}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
+ \begin{itemize}
+ \item Define a numbered environment \meta{name of environment}, numbered within the \\counter \meta{numbered within}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|\\
+ \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|
+ \begin{itemize}
+ \item Identify \meta{name of environment} with \meta{existed environment} or \meta{existed environment}\lstinline|*|.
+ \item This method is usually useful in the following two situations:
+ \begin{enumerate}
+ \item To use a more concise name. For example, with \lstinline|\CreateTheorem{thm}|\\\lstinline|(theorem)|, one can then use the name \texttt{thm} to write theorem.
+ \item To remove the numbering. For example, one can remove the numbering of the \texttt{remark} environment with \lstinline|\CreateTheorem{remark}(remark*)|.
+ \end{enumerate}
+ \end{itemize}
\end{itemize}
+\begin{remind}
+ It uses \textsf{amsthm} internally, so the traditional \texttt{theoremstyle} is also applicable to it. One only needs declare the style before the relevant definitions.
+\end{remind}
+
\def\proofideanameEN{Idea}
-\CreateTheorem*{proofidea}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>
-For example,
+\bigskip
+Here is an example. The following code:
\begin{code}
\def\proofideanameEN{Idea}
- \CreateTheorem*{proofidea}
+ \CreateTheorem*{proofidea*}
+ \CreateTheorem{proofidea}<subsection>
\end{code}
-defines an unnumbered environment \lstinline|proofidea|, which supports using in the English context, and the effect is as follows:
+defines an unnumbered environment \lstinline|proofidea*| and a numbered environment \lstinline|proofidea| (numbered within subsection) respectively. They can be used in English context. The effect is as follows:
+
+\begin{proofidea*}
+ The \lstinline|proofidea*| environment.
+\end{proofidea*}
\begin{proofidea}
- ...
+ The \lstinline|proofidea| environment.
\end{proofidea}
\subsection{Draft mark}
You can use \lstinline|\dnf| to mark the unfinished part. For example:
\begin{itemize}
- \item \lstinline|\dnf|: \quad \dnf
- \item \lstinline|\dnf<Still need ...>|: \quad \dnf<Still need ...>
+ \item \lstinline|\dnf| or \lstinline|\dnf<...>|. The effect is: \dnf~ or \dnf<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\dnf} in French mode.
\end{itemize}
-Similarly, there is \lstinline|\needgraph| :
+Similarly, there is \lstinline|\needgraph| :
\begin{itemize}
- \item \lstinline|\needgraph|: \needgraph
- \item \lstinline|\needgraph<About ...>|: \needgraph<About ...>
+ \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \needgraph or \needgraph<...>The prompt text changes according to the current language. For example, in French mode, it will be displayed as \UseOtherLanguage{French}{\needgraph}
\end{itemize}
-\subsection{Language configuration}
-You can use \lstinline|\UseLanguage{(name of language))}| at any time to change the language, Language names include Chinese, English, French (the case of the first letter is arbitrary, for example, ``chinese'' is also acceptable). With this, the effects of various commands and environments will also change accordingly.
+\subsection{On the title, abstract and keywords}
-For example, after using \lstinline|\UseLanguage{French}|, the theorem and the draft mark will be displayed as:
+\lebhart{} has both the features of standard classes and that of the \AmS{} classes.
-\UseLanguage{French}
-\begin{theorem}[Inutile]\label{thm}
- Un théorème en français. \dnf
-\end{theorem}
+Therefore, the title part can either be written in the usual way, in accordance with the standard class \textsf{article}:
-When referenced, the name of the theorem always matches the language of the region in which the theorem is located, for example, the definition of the beginning is still displayed in English in the current French mode: \cref{def: strange} and \cref{thm}.
+\begin{code}
+ \title{(*\meta{title}*)}
+ \author{(*\meta{author}*)}
+ \date{(*\meta{date}*)}
+ \maketitle
+ \begin{abstract}
+ (*\meta{abstract}*)
+ \end{abstract}
+ \begin{keyword}
+ (*\meta{keywords}*)
+ \end{keyword}
+\end{code}
-\UseLanguage{English}
+or written in the way of \AmS{} classes:
-\subsection{On the fonts}
-\lebhart{} and \beaulivre{} use Palatino Linotype as the English font, FounderType's YouSong and YouHei Simplified as the Chinese fonts, and partially use Neo Euler as the mathematical font:
-\begin{itemize}
- \item English main font. \textsf{English sans serif font}.
- \item 中文主要字体, \textsf{中文无衬线字体}
- \item Math demonstration: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
-\end{itemize}
+\begin{code}
+ \title{(*\meta{title}*)}
+ \author{(*\meta{author}*)}
+ \address{(*\meta{address}*)}
+ \email{(*\meta{email}*)}
+ \date{(*\meta{date}*)}
+ \keywords{(*\meta{keywords}*)}
+ \subjclass{(*\meta{subjclass}*)}
+ \begin{abstract}
+ (*\meta{abstract}*)
+ \end{abstract}
+ \maketitle
+\end{code}
+
+\clearpage %\medskip
+The author information can contain multiple groups, written as:
-Among them, Neo Euler can be downloaded at \url{https://github.com/khaledhosny/euler-otf}. Other fonts are not free, you need to purchase and use them on your own. (For the Chinese fonts, visit FounderType's website for detail: \url{https://www.foundertype.com} ).
+\begin{code}
+ \author{(*\meta{author 1}*)}
+ \address{(*\meta{address 1}*)}
+ \email{(*\meta{email 1}*)}
+ \author{(*\meta{author 2}*)}
+ \address{(*\meta{address 2}*)}
+ \email{(*\meta{email 2}*)}
+ ...
+\end{code}
-When the corresponding font is not installed, the font that comes with TeX Live will be used instead, and the experience might be reduced.
+Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| is not important.
+
+\section{Known issues}
+
+\begin{itemize}[itemsep=.6em]
+ \item The font settings are still not perfect.
+ \item Since many features are based on the \ProjLib{} toolkit, \lebhart{} inherits all its problems. For details, please refer to the "Known Issues" section of the \ProjLib{} documentation.
+ \item The error handling mechanism is incomplete: there is no corresponding error prompt when some problems occur.
+ \item There are still many things that can be optimized in the code.
+\end{itemize}
+
+\clearpage
\section{Document templates}
-\singlespacing
+\subsection{The standard way}
+
+If you want to write in the standard way, you can refer to the following example:
-\begin{minipage}{0.45\textwidth}
\begin{code}
-%! TEX program = xelatex
-\documentclass[fast]{lebhart}
+\documentclass{lebhart}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
-\linenumbers
-\UseLanguage{French}
+\UseLanguage{French} % Use French from here
\begin{document}
-\title{Titre}
-\author{Nom}
-\date{03 / 2021, Lieu}
+\title{Le Titre}
+\author{Auteur}
+\date{\PJLdate{2022-04-01}}
\maketitle
-%% Texte ici
+\begin{abstract}
+ Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
+\end{abstract}
+\begin{keyword}
+ AAA, BBB, CCC, DDD, EEE
+\end{keyword}
+
+\section{Un théorème}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
\end{document}
\end{code}
-\end{minipage}
-%
-\hfill
-%
-\begin{minipage}{0.45\textwidth}
+
+If you wish to switch to the standard class later, just replace the first two lines with:
+
\begin{code}
-%! TEX program = xelatex
-\documentclass[fast]{lebhart}
+\documentclass{article}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
+
-\linenumbers
-\UseLanguage{Chinese}
+\clearpage
+\subsection{The \texorpdfstring{\AmS{}}{AMS} way}
+
+If you intend to switch to the journal template in the future and thus want to use the writing style as in the \AmS{} classes, you can refer to the following example:
+
+\begin{code}
+\documentclass{lebhart}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
+
+\UseLanguage{French} % Use French from here
\begin{document}
-\title{标题}
-\author{姓名}
-\date{2021年3月,地点}
+\title{Le Titre}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 1}{Courriel 1}}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 2}{Courriel 2}}
+\date{\PJLdate{2022-04-01}}
+\subjclass{*****}
+\keywords{...}
+
+\begin{abstract}
+ Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
+\end{abstract}
\maketitle
-%% 正文部分
+\section{Première section}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
\end{document}
\end{code}
-\end{minipage}
-\par
-\bigskip
-(\lstinline|\UseLanguage| can be placed either in the preamble or in the body part, and can be used repeatedly as needed)
+In this way, if you wish to switch to \AmS{} class later, just replace the first two lines with:
+
+\begin{code}
+\documentclass{amsart}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
\end{document}
diff --git a/macros/unicodetex/latex/lebhart/lebhart.cls b/macros/unicodetex/latex/lebhart/lebhart.cls
index 6c2e93cca4..7a3b261fe8 100644
--- a/macros/unicodetex/latex/lebhart/lebhart.cls
+++ b/macros/unicodetex/latex/lebhart/lebhart.cls
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{lebhart}
- [2021/03/15 A colorful article style]
+ [2021/05/24 A colorful article style]
\def\colorclass@baseclass{article}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -27,6 +27,12 @@
}
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
+
+\newif\if@colorclass@bfivepaper\@colorclass@bfivepaperfalse
+\DeclareVoidOption{b5paper}{\@colorclass@bfivepapertrue}
+\newif\if@colorclass@afourpaper\@colorclass@afourpaperfalse
+\DeclareVoidOption{a4paper}{\@colorclass@afourpapertrue}
+
\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{\colorclass@baseclass}}
\ProcessKeyvalOptions*\relax
\LoadClass{\colorclass@baseclass}
@@ -37,23 +43,41 @@
%%================================
%% Page layout
%%================================
+\RequirePackage{silence}
+\WarningFilter{geometry}{Over-specification in}
\RequirePackage[heightrounded]{geometry}
\geometry{
- % papersize={8in,11in},
+ papersize={8.5in,11in},
+ total={47em,66em},
+ hmarginratio=1:1,
+ vmarginratio=1:1,
+ footnotesep=2em plus 2pt minus 2pt,
+}
+\if@colorclass@bfivepaper
+\geometry{
+ b5paper,
+ total={40em,59em},
+ hmarginratio=1:1,
+ vmarginratio=1:1,
+ footnotesep=2em plus 2pt minus 2pt,
+}
+\fi
+\if@colorclass@afourpaper
+\geometry{
a4paper,
total={47em,70em},
hmarginratio=1:1,
vmarginratio=1:1,
footnotesep=2em plus 2pt minus 2pt,
}
+\fi
\RequirePackage{indentfirst}
\if@colorclass@fast
\PassOptionsToPackage{fast}{colorist}
-\fi
-\if@colorclass@fast
- \PassOptionsToPackage{polyglossia}{colorist}
+ \RequirePackage{draftwatermark}
+ \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95}
\fi
\RequirePackage{colorist}
@@ -71,27 +95,32 @@
\IfFontExistsTF{Palatino Linotype}{%
\setmainfont{Palatino Linotype}
}{
- \setmainfont{texgyrepagella-regular.otf}[
- BoldFont = texgyrepagella-bold.otf ,
- ItalicFont = texgyrepagella-italic.otf ,
- BoldItalicFont = texgyrepagella-bolditalic.otf ]
+ \setmainfont{TeXGyrePagellaX-Regular.otf}[
+ BoldFont = TeXGyrePagellaX-Bold.otf ,
+ ItalicFont = TeXGyrePagellaX-Italic.otf ,
+ BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf ]
}
\setsansfont{SourceSansPro-Regular.otf}[
- Scale = MatchLowercase,
+ Scale = MatchLowercase ,
BoldFont = SourceSansPro-Bold.otf ,
ItalicFont = SourceSansPro-RegularIt.otf ,
BoldItalicFont = SourceSansPro-BoldIt.otf ]
+ \setmonofont{cmuntt.otf}[
+ Scale = 1.05 ,
+ BoldFont = cmuntb.otf ,
+ ItalicFont = cmunst.otf ,
+ BoldItalicFont = cmuntb.otf ]
%% Chinese fonts
\PassOptionsToPackage{fontset=none,scheme=plain}{ctex}
\RequirePackage{ctex}
-\IfFontExistsTF{FZYouSongS 507R}{%
- \setCJKmainfont{FZYouSongS 507R}[
- BoldFont = FZYouSongS 509R ,
- BoldFeatures = {FakeBold=2} ,
+\IfFontExistsTF{FZYOUSK_507R--GBK1-0}{%
+ \setCJKmainfont{FZYOUSK_507R--GBK1-0}[
+ BoldFont = FZYOUSK_509R--GBK1-0 ,
+ BoldFeatures = {FakeBold=4} ,
ItalicFont = * ,
- BoldItalicFont = FZYouSongS 509R ,
- BoldItalicFeatures = {FakeBold=2} ,
+ BoldItalicFont = FZYOUSK_509R--GBK1-0 ,
+ BoldItalicFeatures = {FakeBold=4} ,
SmallCapsFont = * ]
}{
\setCJKmainfont{FandolSong-Regular.otf}[
@@ -101,13 +130,13 @@
BoldItalicFeatures = {FakeBold=4} ,
SmallCapsFont = * ]
}
-\IfFontExistsTF{FZYouSongS 507R}{%
- \setCJKmonofont{FZYouSongS 507R}[
- BoldFont = FZYouSongS 509R ,
- BoldFeatures = {FakeBold=2} ,
+\IfFontExistsTF{FZYOUSK_507R--GBK1-0}{%
+ \setCJKmonofont{FZYOUSK_507R--GBK1-0}[
+ BoldFont = FZYOUSK_509R--GBK1-0 ,
+ BoldFeatures = {FakeBold=4} ,
ItalicFont = * ,
- BoldItalicFont = FZYouSongS 509R ,
- BoldItalicFeatures = {FakeBold=2} ,
+ BoldItalicFont = FZYOUSK_509R--GBK1-0 ,
+ BoldItalicFeatures = {FakeBold=4} ,
SmallCapsFont = * ]
}{
\setCJKmonofont{FandolFang-Regular.otf}[
@@ -118,11 +147,12 @@
BoldItalicFeatures = {FakeBold=4} ,
SmallCapsFont = * ]
}
-\IfFontExistsTF{FZYouHeiS 506L}{%
- \setCJKsansfont{FZYouHeiS 506L}[
- BoldFont = FZYouHeiS 509R,
+\IfFontExistsTF{FZYOUHK_506L--GBK1-0}{%
+ \setCJKsansfont{FZYOUHK_506L--GBK1-0}[
+ BoldFont = FZYOUHK_509R--GBK1-0 ,
+ BoldFeatures = {FakeBold=4} ,
ItalicFont = * ,
- BoldItalicFont = FZYouHeiS 509R ,
+ BoldItalicFont = FZYOUHK_509R--GBK1-0 ,
SmallCapsFont = * ]
}{
\setCJKsansfont{FandolHei-Regular.otf}[
@@ -133,14 +163,16 @@
}
%% Math font
-\if@colorclass@fast\else
+\if@colorclass@fast
+\RequirePackage{amssymb}
+\else
\PassOptionsToPackage
{warnings-off={mathtools-colon,mathtools-overbracket}}{unicode-math}
\RequirePackage{unicode-math}
-\unimathsetup{math-style=ISO}
+\unimathsetup{math-style=ISO, partial=upright, nabla=upright}
\setmathfont{Asana-Math.otf}
\IfFontExistsTF{Neo Euler}{%
-\setmathfont{Neo Euler} % From https://tex.stackexchange.com/a/425887
+\setmathfont{Neo Euler}
[range={"0000-"0001,"0020-"007E,
"00A0,"00A7-"00A8,"00AC,"00AF,"00B1,"00B4-"00B5,"00B7,
"00D7,"00F7,
@@ -167,9 +199,22 @@
"1D507-"1D50A,"1D50D-"1D514,"1D516-"1D51C,"1D51E-"1D537,
"1D56C-"1D59F,"1D6A8-"1D6B8,"1D6BA-"1D6D2,"1D6D4-"1D6DD,
"1D6DF,"1D6E1,"1D7CE-"1D7D7 }]
+\setmathfont[range=up/{greek,Greek}, script-features={}, sscript-features={}
+ ]{Neo Euler}
+\setmathfont[range=up/{latin,Latin}, script-features={}, sscript-features={}
+ ]{Neo Euler}
+\setmathfont[range={bfup/{latin, Latin, greek, Greek}, frak, bffrak, cal},
+ script-features={}, sscript-features={}
+ ]{Neo Euler}
+\setmathfont[range={up/num, bfup/num, it, bfit, scr, bfscr,
+ sfup, sfit, bfsfup, bfsfit, tt}
+ ]{Asana-Math.otf}
+\setmathfont[range=bfcal, Scale=MatchUppercase, Alternate]{Asana-Math.otf}
}{}
\fi
+\def\PJL@font@alreadyset{}
+
\RequirePackage[verbose=silent]{microtype}
%%================================
@@ -178,60 +223,15 @@
\RequirePackage{graphicx}
\graphicspath{{images/}}
\RequirePackage{wrapfig}
+\RequirePackage{float}
\RequirePackage{caption}
+\captionsetup{font=small}
%%================================
%% Index
%%================================
\RequirePackage{imakeidx}
-%%================================
-%% Draft mark
-%%================================
-\def\dnfFont{\ttfamily}
-\def\needgraphFont{\ttfamily}
-
-\def\dnfTextEN{To be finished here}
-\def\needgraphTextEN{A graph is needed here}
-\def\dnfTextFR{À terminer ici}
-\def\needgraphTextFR{Il manque encore un graphique ici}
-\def\dnfTextCN{这里的内容尚未完成}
-\def\needgraphTextCN{这里需要一张图片}
-
-\definecolor{dnfColor}{RGB}{21,122,20}
-\definecolor{needgraphColor}{RGB}{70,130,180}
-
-\if@colorclass@fast
- \newcommand{\plainBox}[2][-paper]{\textcolor{#1}{%
- \setlength{\fboxsep}{1.5pt}%
- \setlength{\fboxrule}{1.2pt}%
- \fbox{#2}}}
-\else
- \PassOptionsToPackage{many}{tcolorbox}
- \RequirePackage{tcolorbox}
- \newtcbox{\plainBox}[1][-paper]{enhanced jigsaw,%
- on line, arc = 1.2pt, outer arc = 1pt,breakable,%
- colframe = #1,colupper=#1,opacityback=0,%
- boxsep = 1pt,boxrule = 1.2pt,%
- left = 1pt, right = 1pt, top = 0pt, bottom = 0pt,%
- }
-\fi
-
-\NewDocumentCommand{\dnf}{d<>}{%
- \noindent\plainBox[dnfColor]%
- {\normalfont\dnfFont\bfseries\small%
- \csname dnfText\csname\languagename ABBR\endcsname\endcsname%
- \IfNoValueF{#1}{ : #1}}%
-}
-\NewDocumentCommand{\needgraph}{d<>}{%
- \par%
- \centerline{\plainBox[needgraphColor]%
- {\normalfont\needgraphFont\bfseries\small%
- \csname needgraphText\csname\languagename ABBR\endcsname\endcsname%
- \IfNoValueF{#1}{ : #1}}}%
- \par%
-}
-
\endinput
%%
%% End of file `lebhart/lebhart.cls'.
diff --git a/macros/unicodetex/latex/simplivre/README.md b/macros/unicodetex/latex/simplivre/README.md
index cce0b457f5..57c73bd0f7 100644
--- a/macros/unicodetex/latex/simplivre/README.md
+++ b/macros/unicodetex/latex/simplivre/README.md
@@ -5,10 +5,11 @@
`simplivre` is a LaTeX class for typesetting books, which has a simple and clear
design.
-Currently, it has native support to English, French and Chinese typesetting. And
-it may compile with either XeLaTeX or LuaLaTeX.
+Currently, it has native support to Chinese (simplified and traditional),
+English, French, German, Japanese and Russian typesetting. And it may compile
+with either XeLaTeX or LuaLaTeX.
-This is part of the minimalist class series.
+This is part of the `minimalist` class series.
# License
diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf
index 5000712458..61587e4a51 100644
--- a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf
+++ b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex
index a432d7bce8..0a16c1d99b 100644
--- a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex
+++ b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex
@@ -1,25 +1,28 @@
%! TEX program = xelatex
-\PassOptionsToPackage{dvipsnames}{xcolor}
\documentclass{simplivre}
\linenumbers % 开启行号
-\UseLanguage{Chinese}
%%================================
-%% TeX logo 与 网址
+%% 引入工具集
%%================================
-\usepackage{hologo}
-\usepackage{url}
+\usepackage{PJLtoolkit}
+\usepackage{longtable} % breakable tables
+\usepackage{hologo} % more TeX logo
+
+\UseLanguage{Chinese}
%%================================
%% 排版代码
%%================================
\usepackage{listings}
+\definecolor{maintheme}{RGB}{70,130,180}
+\definecolor{forestgreen}{RGB}{21,122,81}
\definecolor{lightergray}{gray}{0.99}
\lstset{language=[LaTeX]TeX,
- keywordstyle=\color{RoyalBlue},
+ keywordstyle=\color{maintheme},
basicstyle=\ttfamily,
- commentstyle=\color{ForestGreen}\ttfamily,
+ commentstyle=\color{forestgreen}\ttfamily,
stringstyle=\rmfamily,
showstringspaces=false,
breaklines=true,
@@ -32,9 +35,9 @@
firstnumber=last,
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
-\lstset{morekeywords=%
- {CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,
- linenumbers,nolinenumbers,subsection,maketitle
+\lstset{moretexcs=%
+ {linenumbers,nolinenumbers,part,chapter,section,subsection,
+ color,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib,parttext
}
}
\lstnewenvironment{code}%
@@ -43,125 +46,365 @@
}
{\ResumeLineNumbers}
+%%================================
+%% remind
+%%================================
+\usepackage[many]{tcolorbox}
+\newenvironment{remind}[1][提示]{%
+ \LocallyStopLineNumbers%
+ \begin{tcolorbox}[breakable,
+ enhanced,
+ width = \textwidth,
+ colback = white, colbacktitle = paper,
+ colframe = gray!50, boxrule=0.2mm,
+ coltitle = black,
+ fonttitle = \sffamily,
+ attach boxed title to top left = {yshift=-\tcboxedtitleheight/2, xshift=\tcboxedtitlewidth/4},
+ boxed title style = {boxrule=0pt, colframe=paper},
+ before skip = 0.3cm,
+ after skip = 0.3cm,
+ top = 3mm,
+ bottom = 3mm,
+ title={\sffamily #1}]%
+}{\end{tcolorbox}\ResumeLineNumbers}
+
+%%================================
+%% 名称
+%%================================
\providecommand{\minimalist}{\textsf{minimalist}}
\providecommand{\minimart}{\textsf{minimart}}
\providecommand{\minimbook}{\textsf{minimbook}}
\providecommand{\einfart}{\textsf{einfart}}
\providecommand{\simplivre}{\textsf{simplivre}}
+\usetikzlibrary{calc}
+
+\usepackage{blindtext}
+
%%================================
%% 正文
%%================================
\begin{document}
-\title{\simplivre{},以极简主义风格排版你的图书\thanks{对应版本. \texttt{\simplivre{} 2021/03/15}}}
-\author{锦文}
-\date{2021年3月,北京}
+% \title{\simplivre{},以极简主义风格排版你的图书\thanks{对应版本. \texttt{\simplivre{} 2021/05/23}}}
+% \author{许锦文}
+% \date{2021年5月,北京}
-\maketitle
+% \maketitle
\frontmatter
+
+\begin{titlepage} % Suppresses displaying the page number on the title page and the subsequent page counts as page 1
+\begin{tikzpicture}[overlay,remember picture]
+ \fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(21,-7)$);
+ \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$);
+ \node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\\hspace*{-.05em}以极简主义风格排版你的图书\\[10pt]\tiny 对应版本. \texttt{\simplivre{} 2021/05/23}}};
+ \node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{许锦文}};
+ \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{2021年5月,北京}};
+\end{tikzpicture}%
+\end{titlepage}%
+\cleardoublepage%
+
\chapter*{前言}
-\simplivre{}是\minimalist{}文档类系列的成员之一,整个系列包含用于排版文章的\minimart{}、\einfart{}以及用于排版书的\minimbook{}、\simplivre{}。我设计这一系列的初衷是为了撰写草稿与笔记,使之看上去简朴而不简陋。
+\simplivre{} 是 \minimalist{} 文档类系列的成员之一,其名称取自于法文的 simple (“简约”),以及 livre (“书”),由二者组合而成。整个 \minimalist{} 系列包含用于排版文章的 \minimart{}、\einfart{} 以及用于排版书的 \minimbook{}、\simplivre{}。我设计这一系列的初衷是为了撰写草稿与笔记,使之看上去简朴而不简陋。
-其中,\einfart{}与\simplivre{}支持英文、法文、中文三种语言,并且同一篇文档中三种语言可以很好地协调。由于采用了自定义字体,需要采用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 进行编译。
+\simplivre{} 支持英文、法文、德文、中文、日文、俄文六种语言,并且同一篇文档中这些语言可以很好地协调。由于采用了自定义字体,需要用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 引擎进行编译。
-最后,这篇说明文档是用\simplivre{}排版的,你可以把它看作一份简短的说明与演示。
+这篇说明文档即是用 \simplivre{} 排版的,你可以把它看作一份简短的说明与演示。
+
+\bigskip
+\begin{remind}
+ 多语言支持、定理类环境、未完成标记等功能是由 \ProjLib{} 工具箱提供的,这里只给出了将其与本文档类搭配使用的要点。如需获取更详细的信息,可以参阅 \ProjLib{} 的说明文档。
+\end{remind}
\tableofcontents
\mainmatter
-\chapter{关于文档类的名称与选项}
+\part{说明}
+\parttext{可以通过 \lstinline|\\parttext|\meta{text} 在这里添加一些说明}
+
+\chapter{初始化}
+
+\section{如何载入}
+
+只需要在第一行写:
+
+\begin{code}
+ \documentclass{simplivre}
+\end{code}
+
+即可使用 \simplivre{} 文档类。
+
+\begin{remind}[请注意]
+ 要使用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 引擎才能编译。
+\end{remind}
+
+\section{选项}
+
+\simplivre{} 文档类有下面几个选项:
-\einfart{}取自于德文的einfach (“简约”),并取了artikel (“文章”)的前三个字母组合而成。
+\begin{itemize}
+ \item \texttt{draft} 或 \texttt{fast}
+ \begin{itemize}
+ \item 你可以使用选项 \verb|fast| 来启用快速但略微粗糙的样式,主要区别是:
+ \begin{itemize}
+ \item 使用较为简单的数学字体设置;
+ \item 不启用超链接;
+ \item 启用 \ProjLib{} 工具箱的快速模式。
+ \end{itemize}
+ \end{itemize}
+ \item \texttt{a4paper} 或 \texttt{b5paper}
+ \begin{itemize}
+ \item 可选的纸张大小。默认的纸张大小为 7in $\times$ 10in。
+ \end{itemize}
+ \item \texttt{allowbf}
+ \begin{itemize}
+ \item 允许加粗。启用这一选项时,题目、各级标题、定理类环境名称会被加粗。
+ \end{itemize}
+ \item \texttt{classical}
+ \begin{itemize}
+ \item 经典模式。启用这一选项时,样式会变得更加中规中矩:段落呈首行缩进样式、各类下划线减少、标题样式改变、定理类环境的样式也会更贴近常见的设置。
+ \end{itemize}
+\end{itemize}
-\simplivre{}取自于法文的simple (“简约”),以及livre (“书”),由二者组合而成。
+\begin{remind}
+ \begin{itemize}
+ \item 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。
+ \item 如果你喜欢更加传统的样式,\texttt{allowbf} + \texttt{classical} 是一个不错的搭配。
+ \end{itemize}
+\end{remind}
+
+\bigskip
+另外,排版图书时常用的 \texttt{oneside}、\texttt{twoside} 选项也是可以使用的。默认采用双页排版。
-你可以使用选项 \verb|fast| 来启用快速但略微粗糙的样式,主要区别是:
+\chapter{关于文档类中使用的字体}
+\simplivre{} 默认使用 Palatino Linotype 作为英文字体,方正悠宋、悠黑GBK作为中文字体,并部分使用了 Neo Euler 作为数学字体。其中,Neo Euler可以在 \url{https://github.com/khaledhosny/euler-otf} 下载。其他字体不是免费字体,需要自行购买使用。可以在方正字库网站查询详细资料:\url{https://www.foundertype.com}。
+
+\begin{remind}[字体演示]
+ \begin{itemize}
+ \item English main font. \textsf{English sans serif font}. \texttt{English typewriter font}.
+ \item 中文主要字体,\textsf{中文无衬线字体}
+ \item 数学示例: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
+ \end{itemize}
+\end{remind}
+
+\bigskip
+在没有安装相应的字体时,将采用TeX Live中自带的字体来代替,效果可能会有所折扣。
+
+
+\chapter{使用说明}
+
+接下来介绍的许多功能是由 \ProjLib{} 工具箱提供的。这里只介绍了基本使用方法,更多细节可以直接参阅其用户文档。
+
+\section{语言设置}
+
+\simplivre{} 提供了多语言支持,包括简体中文、繁体中文、英文、法文、德文、日文、俄文。可以通过下列命令来选定语言:
+\begin{itemize}
+ \item \lstinline|\UseLanguage{|\meta{language name}\lstinline|}|,用于指定语言,在其后将使用对应的语言设定。
+ \begin{itemize}
+ \item 既可以用于导言部分,也可以用于正文部分。在不指定语言时,默认选定 “English”。
+ \end{itemize}
+ \item \lstinline|\UseOtherLanguage{|\meta{language name}\lstinline|}{|\meta{content}\lstinline|}|,用指定的语言的设定排版 \meta{content}。
+ \begin{itemize}
+ \item 相比较 \lstinline|\UseLanguage|,它不会对行距进行修改,因此中西文字混排时能够保持行距稳定。
+ \end{itemize}
+\end{itemize}
+
+\meta{language name} 有下列选择:
+\begin{itemize}
+ \item 简体中文:\texttt{Chinese}、\texttt{chinese}、\texttt{SChinese}、\texttt{schinese}、\texttt{SimplifiedChinese} \\\hspace*{5em}或 \texttt{simplifiedchinese}
+ \item 繁体中文:\texttt{TChinese}、\texttt{tchinese}、\texttt{TraditionalChinese} 或 \texttt{traditionalchinese}
+ \item 英文:\texttt{English} 或 \texttt{english}
+ \item 法文:\texttt{French} 或 \texttt{french}
+ \item 德文:\texttt{German}、\texttt{german} 或 \texttt{ngerman}
+ \item 日文:\texttt{Japanese} 或 \texttt{japanese}
+ \item 俄文:\texttt{Russian} 或 \texttt{russian}
+\end{itemize}
+
+另外,还可以通过下面的方式来填加相应语言的设置:
\begin{itemize}
- \item 使用较为简单的数学字体设置;
- \item 不使用hyperref;
- \item 不使用tikz;
- \item 使用polyglossia而不是babel来支持多语言。(使用polyglossia编译速度会略有提高,但目前对于中文的兼容不太完善,在它更加稳定后,将会考虑全面切换到polyglossia)
+ \item \lstinline|\AddLanguageSetting{|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item 向所有支持的语言增加设置 \meta{settings}。
+ \end{itemize}
+ \item \lstinline|\AddLanguageSetting(|\meta{language name}\lstinline|){|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item 向指定的语言 \meta{language name} 增加设置 \meta{settings}。
+ \end{itemize}
\end{itemize}
+例如,\lstinline|\AddLanguageSetting(German){\color{orange}}| 可以让所有德语以橙色显示(当然,还需要再加上 \lstinline|\AddLanguageSetting{\color{black}}| 来修正其他语言的颜色)。
-在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。
-\chapter{一些使用说明}
+\section{定理类环境及其引用}
-正文部分每段的开头没有缩进,但每两段之间会有半行左右的间距。就像这样——
+定义、定理等环境已经被预定义,可以直接使用。
-这里是下一个自然段。
+具体来说,预设的定理类环境包括:
+\texttt{assumption}、\texttt{axiom}、\texttt{conjecture}、\texttt{convention}、\texttt{corollary}、\texttt{definition}、\texttt{definition-proposition}、\texttt{definition-theorem}、\texttt{example}、\texttt{exercise}、\texttt{fact}、\texttt{hypothesis}、\texttt{lemma}、\texttt{notation}、\texttt{problem}、\texttt{property}、\texttt{proposition}、\texttt{question}、\texttt{remark}、\texttt{theorem},以及相应的带有星号 \lstinline|*| 的无编号版本。
-\section{定理,以及引用}
+在引用定理类环境时,建议使用智能引用 \lstinline|\cref{|\meta{label}\lstinline|}|。这样就不必每次都写上相应环境的名称了。
-定义、定理等环境已经被预定义,可以直接使用,例如:
+\begin{remind}[例子]
\begin{code}
\begin{definition}[奇异物品] \label{def: strange} ...
\end{code}
将会生成
\begin{definition}[奇异物品]\label{def: strange}
- 这是奇异物品的定义。
+ 这是奇异物品的定义。定理类环境的前后有一行左右的间距。在定义结束的时候会有一个符号来标记。
\end{definition}
-定理类环境的前后有一行左右的间距。在定义结束的时候会有一个符号来标记。
+\lstinline|\cref{def: strange}| 会显示为:\cref{def: strange}。
+
+使用 \lstinline|\UseLanguage{English}| 后,定理会显示为:
+
+\UseLanguage{English}
+\begin{theorem}[Useless]\label{thm}
+ A theorem in English.
+\end{theorem}
+
+默认情况下,引用时,定理的名称总是与定理所在区域的语言匹配,例如,上面的定义在现在的英文模式下依然显示为中文:\cref{def: strange} 和 \cref{thm}。如果在引用时想让定理的名称与当前语境相匹配,可以在全局选项中加入 \texttt{regionalref}。
+\end{remind}
+
+\UseLanguage{Chinese}
-引用时,可以直接使用智能引用 \lstinline|\cref{标签名称}|,例如:\lstinline|\cref{def: strange}| 会显示为:\cref{def: strange}。
\section{定义新的定理型环境}
-首先定义这个环境在所用语言下的名称 \lstinline|\(name of environment)(language name)|,其中 \\\lstinline|(language name)| 是 \lstinline|EN|、\lstinline|FR|、\lstinline|CN| 等,然后用下面四种方式之一定义这一环境:
+若需要定义新的定理类环境,首先要定义这个环境在所用语言下的名称 \lstinline|\|\meta{name of environment}\meta{language abbr},其中 \meta{language abbr} 是语言的简写,分别为:
+\begin{longtable}{ll|ll}
+ \texttt{CN} & 简体中文 & \texttt{DE} & 德文\\
+ \texttt{TC} & 繁体中文 & \texttt{JP} & 日文\\
+ \texttt{EN} & 英文 & \texttt{RU} & 俄文\\
+ \texttt{FR} & 法文 & &\\
+\end{longtable}
+
+\vspace{-0.3\baselineskip}
+\begin{remind}
+ 如果要定义名称后带有星号 \lstinline|*| 的环境,那么在上面的 \meta{name of environment} 中不用写星号。
+\end{remind}
+
+然后用下面五种方式之一定义这一环境:
\begin{itemize}
- \item \lstinline|\CreateTheorem*{(name of environment)}|
- \item \lstinline|\CreateTheorem{(name of environment)}[(numbered like)]|
- \item \lstinline|\CreateTheorem{(name of environment)}<(numbered within)>|
- \item \lstinline|\CreateTheorem{(name of environment)}|
+ \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item 定义不编号的环境 \meta{name of environment}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item 定义编号环境 \meta{name of environment},按顺序编号
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
+ \begin{itemize}
+ \item 定义编号环境 \meta{name of environment},与 \meta{numbered like} 计数器共用编号
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
+ \begin{itemize}
+ \item 定义编号环境 \meta{name of environment},在 \meta{numbered within} 计数器内编号
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|\\
+ \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|
+ \begin{itemize}
+ \item 将 \meta{name of environment} 与 \meta{existed environment} 或 \meta{existed environment}\lstinline|*| 等同。
+ \item 这种方式通常在两种情况下比较有用:
+ \begin{enumerate}
+ \item 希望定义更简洁的名称。例如,使用 \lstinline|\CreateTheorem{thm}(theorem)|,便可以直接用名称 \texttt{thm} 来撰写定理。
+ \item 希望去除某些环境的编号。例如,使用 \lstinline|\CreateTheorem{remark}(remark*)|,便可以去除 \texttt{remark} 环境的编号。
+ \end{enumerate}
+ \end{itemize}
\end{itemize}
+\begin{remind}
+ 其内部使用了 \textsf{amsthm},因此传统的 \texttt{theoremstyle} 对其也是适用的,只需在相关定义前标明即可。
+\end{remind}
+
\def\proofideanameCN{思路}
-\CreateTheorem*{proofidea}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<section>
-例如,
+\bigskip
+下面提供一个例子。这三行代码:
\begin{code}
\def\proofideanameCN{思路}
- \CreateTheorem*{proofidea}
+ \CreateTheorem*{proofidea*}
+ \CreateTheorem{proofidea}<section>
\end{code}
-可以定义不编号的环境 \lstinline|proofidea|,它支持在中文环境中使用,效果如下所示:
+
+可以分别定义不编号的环境 \lstinline|proofidea*| 和编号的环境 \lstinline|proofidea| (在 section 内编号),它们支持在简体中文语境中使用,效果如下所示:
+
+\begin{proofidea*}
+ \lstinline|proofidea*| 环境。
+\end{proofidea*}
\begin{proofidea}
- ...
+ \lstinline|proofidea| 环境。
\end{proofidea}
\section{未完成标记}
你可以通过 \lstinline|\dnf| 来标记尚未完成的部分。例如:
\begin{itemize}
- \item \lstinline|\dnf|: \quad \dnf
- \item \lstinline|\dnf<还需加入…>|: \quad \dnf<还需加入…>
+ \item \lstinline|\dnf| 或 \lstinline|\dnf<...>|。效果为:\dnf~或 \dnf<...>。\\其提示文字与当前语言相对应,例如,在法语模式下将会显示为 \UseOtherLanguage{French}{\dnf}。
\end{itemize}
类似的,还有 \lstinline|\needgraph| :
\begin{itemize}
- \item \lstinline|\needgraph|: \needgraph
- \item \lstinline|\needgraph<关于…>|: \needgraph<关于…>
+ \item \lstinline|\needgraph| 或 \lstinline|\needgraph<...>|。效果为:\needgraph~或 \needgraph<...>其提示文字与当前语言相对应,例如,在法语模式下将会显示为 \UseOtherLanguage{French}{\needgraph}
\end{itemize}
-\section{语言设置}
-可以随时使用 \lstinline|\UseLanguage{语言名称}| 更改语言,语言名称包括Chinese、English、French(首字母大小写随意,例如chinese亦可)。这样,各种指令和环境的效果也会随之变动。
-例如,使用 \lstinline|\UseLanguage{English}| 后,定理与未完成标记会显示为:
-
-\UseLanguage{English}
-\begin{theorem}[Useless]\label{thm}
- Some theorem in English. \dnf
-\end{theorem}
-
-引用时,定理的名称总是与定理所在区域的语言匹配,例如,开头的定义在现在的英文模式下依然显示为中文:\cref{def: strange} 和 \cref{thm}。
-
-\UseLanguage{Chinese}
+% \section{关于文章标题、摘要与关键词}
+
+% % 由于引入了 \ProjLib{} 工具箱的 \textsf{PJLamssim} 组件,
+% \simplivre{} 同时具有标准文档类与\AmS{} 文档类的一些特性。
+
+% 因此,文章的标题部分既可以按照标准文档类 \textsf{article} 的写法来写:
+
+% \begin{code}
+% \title{(*\meta{title}*)}
+% \author{(*\meta{author}*)}
+% \date{(*\meta{date}*)}
+% \maketitle
+% \begin{abstract}
+% (*\meta{abstract}*)
+% \end{abstract}
+% \begin{keyword}
+% (*\meta{keywords}*)
+% \end{keyword}
+% \end{code}
+
+% 也可以按照 \AmS{} 文档类的方式来写:
+
+% \begin{code}
+% \title{(*\meta{title}*)}
+% \author{(*\meta{author}*)}
+% \address{(*\meta{address}*)}
+% \email{(*\meta{email}*)}
+% \date{(*\meta{date}*)}
+% \keywords{(*\meta{keywords}*)}
+% \subjclass{(*\meta{subjclass}*)}
+% \begin{abstract}
+% (*\meta{abstract}*)
+% \end{abstract}
+% \maketitle
+% \end{code}
+
+% 作者信息可以包含多组,输入方式为:
+
+% \begin{code}
+% \author{(*\meta{author 1}*)}
+% \address{(*\meta{address 1}*)}
+% \email{(*\meta{email 1}*)}
+% \author{(*\meta{author 2}*)}
+% \address{(*\meta{address 2}*)}
+% \email{(*\meta{email 2}*)}
+% ...
+% \end{code}
+
+% 其中 \lstinline|\address|、\lstinline|\curraddr|、\lstinline|\email| 的相互顺序是不重要的。
\section{关于行号}
行号可以随时开启和关闭。\lstinline|\linenumbers| 用来开启行号,\lstinline|\nolinenumbers| 用来关闭行号。标题、目录、索引等位置为了美观,不进行编号。
@@ -174,74 +417,115 @@
\end{itemize}
这是标题使用下划线装饰之后带来的一个缺点。
-\section{关于字体}
-\einfart{}与\simplivre{}使用Palatino Linotype作为英文字体,方正悠宋、悠黑简体作为中文字体,并部分使用了Neo Euler作为数学字体:
-\begin{itemize}
- \item English main font. \textsf{English sans serif font}.
- \item 中文主要字体,\textsf{中文无衬线字体}
- \item 数学示例: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
+
+\section{目前存在的问题}
+
+\begin{itemize}[itemsep=.6em]
+ \item 对于字体的设置仍然不够完善。
+ \item 由于很多核心功能建立在 \ProjLib{} 工具箱的基础上,因此 \simplivre{} 自然继承了其所有问题。详情可以参阅 \ProjLib{} 用户文档的“目前存在的问题”这一小节。
+ \item 错误处理功能不完善,在出现一些问题时没有相应的错误提示。
+ \item 代码中仍有许多可优化之处。
\end{itemize}
-其中,Neo Euler可以在 \url{https://github.com/khaledhosny/euler-otf} 下载。
-其他字体不是免费字体,需要自行购买使用(你可以在方正字库网站查询详细资料:\url{https://www.foundertype.com})。
-在没有安装相应的字体时,将采用TeX Live中自带的字体来代替,效果可能会有所折扣。
+\UseLanguage{English}
+
+\part{演示}
+
+\chapter{文档示例}
+
+\vspace*{-1.5\baselineskip}
-\section{文档示例}
+\section{标准文档类写法}
-\singlespacing
+如果想采用标准文档类中的写法,可以参考下面的例子:
-\LocallyStopLineNumbers
-\begin{minipage}{0.45\textwidth}
\begin{code}
-%! TEX program = xelatex
-\documentclass[fast]{simplivre}
+\documentclass{simplivre}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
-\linenumbers
-\UseLanguage{French}
+\UseLanguage{French} % Use French from here
\begin{document}
-\title{Titre}
-\author{Nom}
-\date{03 / 2021, Lieu}
+\title{Le Titre}
+\author{Auteur}
+\date{\PJLdate{2022-04-01}}
\maketitle
-%% Texte ici
+\chapter{Un théorème}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
\end{document}
\end{code}
-\end{minipage}
-%
-\hfill
-%
-\begin{minipage}{0.45\textwidth}
+
+如果以后想切换到标准文档类,只需要将前两行换为:
+
\begin{code}
-%! TEX program = xelatex
-\documentclass[fast]{simplivre}
+\documentclass{book}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
-\linenumbers
-\UseLanguage{Chinese}
+
+% \clearpage
+\section{\texorpdfstring{\AmS{}}{AMS} 文档类写法}
+
+如果日后有意切换到期刊模版,想采用 \AmS{} 文档类中的写法,可以参考下面的例子:
+
+\begin{code}
+\documentclass{simplivre}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
+
+\UseLanguage{French} % Use French from here
\begin{document}
-\title{标题}
-\author{姓名}
-\date{2021年3月,地点}
+\title{Le Titre}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 1}{Courriel 1}}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 2}{Courriel 2}}
+\date{\PJLdate{2022-04-01}}
+\subjclass{*****}
+\keywords{...}
\maketitle
-%% 正文部分
+\section{Première section}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
\end{document}
\end{code}
-\end{minipage}
-\par
-\ResumeLineNumbers
-\bigskip
-(\lstinline|\UseLanguage| 既可以放在导言中,也可以放在正文部分,并且可以按照需要反复使用)
+这样,若想切换到 \AmS{} 文档类,只需要将前两行换为:
+
+\begin{code}
+\documentclass{amsbook}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
+
+\blinddocument
\end{document}
diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf b/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf
index 3da188c5dd..ba97fdde84 100644
--- a/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf
+++ b/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex b/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex
index d1a7f6d328..db1db8e751 100644
--- a/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex
+++ b/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex
@@ -1,24 +1,26 @@
%! TEX program = xelatex
-\PassOptionsToPackage{dvipsnames}{xcolor}
\documentclass{simplivre}
\linenumbers % Enable line numbers
%%================================
-%% TeX logo and URL
+%% Import toolkit
%%================================
-\usepackage{hologo}
-\usepackage{url}
+\usepackage{PJLtoolkit}
+\usepackage{longtable} % breakable tables
+\usepackage{hologo} % more TeX logo
%%================================
%% For typestting code
%%================================
\usepackage{listings}
+\definecolor{maintheme}{RGB}{70,130,180}
+\definecolor{forestgreen}{RGB}{21,122,81}
\definecolor{lightergray}{gray}{0.99}
\lstset{language=[LaTeX]TeX,
- keywordstyle=\color{RoyalBlue},
+ keywordstyle=\color{maintheme},
basicstyle=\ttfamily,
- commentstyle=\color{ForestGreen}\ttfamily,
+ commentstyle=\color{forestgreen}\ttfamily,
stringstyle=\rmfamily,
showstringspaces=false,
breaklines=true,
@@ -31,9 +33,9 @@
firstnumber=last,
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
-\lstset{morekeywords=%
- {CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,
- linenumbers,nolinenumbers,section,maketitle
+\lstset{moretexcs=%
+ {linenumbers,nolinenumbers,part,chapter,section,subsection,
+ color,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib,parttext
}
}
\lstnewenvironment{code}%
@@ -42,202 +44,484 @@
}
{\ResumeLineNumbers}
+%%================================
+%% remind
+%%================================
+\usepackage[many]{tcolorbox}
+\newenvironment{remind}[1][Remind]{%
+ \LocallyStopLineNumbers%
+ \begin{tcolorbox}[breakable,
+ enhanced,
+ width = \textwidth,
+ colback = white, colbacktitle = paper,
+ colframe = gray!50, boxrule=0.2mm,
+ coltitle = black,
+ fonttitle = \sffamily,
+ attach boxed title to top left = {yshift=-\tcboxedtitleheight/2, xshift=\tcboxedtitlewidth/4},
+ boxed title style = {boxrule=0pt, colframe=paper},
+ before skip = 0.3cm,
+ after skip = 0.3cm,
+ top = 3mm,
+ bottom = 3mm,
+ title={\sffamily #1}]%
+}{\end{tcolorbox}\ResumeLineNumbers}
+
+%%================================
+%% 名称
+%%================================
\providecommand{\minimalist}{\textsf{minimalist}}
\providecommand{\minimart}{\textsf{minimart}}
\providecommand{\minimbook}{\textsf{minimbook}}
\providecommand{\einfart}{\textsf{einfart}}
\providecommand{\simplivre}{\textsf{simplivre}}
+\usetikzlibrary{calc}
+
+\usepackage{blindtext}
+
%%================================
%% Main text
%%================================
\begin{document}
-\title{\simplivre{}, write your books in a simple and clear way\thanks{Corresponding to: \texttt{\simplivre{} 2021/03/15}}}
-\author{Jinwen}
-\date{March 2021, Beijing}
+% \title{\simplivre{}, write your books in a simple and clear way}
+% \author{Jinwen XU}
+% \thanks{Corresponding to: \texttt{\simplivre{} 2021/05/23}}
+% \date{May 2021, Beijing}
-\maketitle
+% \maketitle
\frontmatter
+
+\begin{titlepage} % Suppresses displaying the page number on the title page and the subsequent page counts as page 1
+\begin{tikzpicture}[overlay,remember picture]
+ \fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(21,-7)$);
+ \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$);
+ \node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\\textsc{Write your books in \\a simple and clear way}\\[10pt]\tiny Corresponding to: \texttt{\simplivre{} 2021/05/23}}};
+ \node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{Jinwen XU}};
+ \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{May 2021, Beijing}};
+\end{tikzpicture}%
+\end{titlepage}%
+\cleardoublepage%
+
\chapter*{Preface}
-\simplivre{} is a member of the \minimalist{} class series. The entire collection includes \minimart{} and \einfart{} for typesetting articles and \minimbook{} and \simplivre{} for typesetting books. My original intention in designing this series was to write drafts and notes that look simple but not shabby.
+\simplivre{} is part of the \minimalist{} class series. Its name is taken from French words ``simple'' and ``livre'' (for ``book''). The entire collection includes \minimart{} and \einfart{} for typesetting articles, and \minimbook{} and \simplivre{} for typesetting books. My original intention in designing them was to write drafts and notes that look simple yet not shabby.
-Among them, \einfart{} and \simplivre{} support three languages: English, French, and Chinese, and these three languages can be switched seamlessly in a single document. Due to the usage of custom fonts, they need to be compiled with \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
+\simplivre{} supports six languages: English, French, German, Chinese, Japanese and Russian. These languages can be switched seamlessly in a single document. Due to the usage of custom fonts, \einfart{} requires \hologo{XeLaTeX} or \hologo{LuaLaTeX} to compile.
-This documentation is typeset using \einfart{}. You can think of it as a short introduction and demonstration.
+This documentation is typeset using \simplivre{}. You can think of it as a short introduction and demonstration.
+\bigskip
+\begin{remind}
+ Multi-language support, theorem-like environments, draft marks and some other features are provided by the \ProjLib{} toolkit. Here we only briefly discuss how to use it with this document class. For more detailed information, you can refer to the documentation of \ProjLib{}.
+\end{remind}
\tableofcontents
\mainmatter
-\chapter{On the naming and differences}
-\einfart{} is taken from German word ``einfach'' (``simple''), combined with the first three letters of ``artikel'' (``article'').
+\part{Instruction}
+\parttext{You can add some introduction text here via \lstinline|\\parttext|\meta{text}.}
+
+\chapter{Initialization}
-\simplivre{} is taken from French words ``simple'' and ``livre'' (for ``book'').
+\section{How to load}
+
+One only needs to put
+\begin{code}
+ \documentclass{simplivre}
+\end{code}
+as the first line to use the \simplivre{} class.
+
+\begin{remind}[Attention]
+ You need to use either \hologo{XeLaTeX} or \hologo{LuaLaTeX} engine to compile.
+\end{remind}
+
+\section{Options}
+
+\simplivre{} offers the following options:
-You can use the option \verb|fast| to enable a fast but slightly rough version. The main differences are:
\begin{itemize}
- \item Use simpler math font configuration;
- \item Do not use hyperref;
- \item Do not use tikz;
- \item Use polyglossia instead of babel to support multiple languages. (Using polyglossia will increase the compilation speed slightly, but the current compatibility with Chinese is not perfect. When it becomes more stable, I will consider fully switching to polyglossia)
+ \item \texttt{draft} or \texttt{fast}
+ \begin{itemize}
+ \item The option \verb|fast| enables a faster but slightly rougher style, main differences are:
+ \begin{itemize}
+ \item Use simpler math font configuration;
+ \item Do not use hyperref;
+ \item Enable the fast mode of \ProjLib{} toolkit.
+ \end{itemize}
+ \end{itemize}
+ \item \texttt{a4paper} or \texttt{b5paper}
+ \begin{itemize}
+ \item Optional paper size. The default paper size is 7in $\times$ 10in.
+ \end{itemize}
+ \item \texttt{allowbf}
+ \begin{itemize}
+ \item Allow boldface. When this option is enabled, the title, titles of all levels and names of theorem-like environments will be bolded.
+ \end{itemize}
+ \item \texttt{classical}
+ \begin{itemize}
+ \item Classic mode. When this option is enabled, the style will become more regular: paragraphs are indented, the use of underlines are reduced, heading styles are changed, and the theorem styles will be much closer to common styles.
+ \end{itemize}
\end{itemize}
-During the writing stage of your document, it is recommended to use the \verb|fast| option to speed up compilation and improve the smoothness of your writing experience. At the end, you can remove the ``fast'' mark to get the final version.
+\begin{remind}
+ \begin{itemize}
+ \item During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark "DRAFT" to indicate that you are currently in the draft mode.
+ \item \texttt{allowbf} + \texttt{classical} is probably a good choice if you prefer traditional style.
+ \end{itemize}
+\end{remind}
+
+\bigskip
+In addition, the commonly used \texttt{oneside} and \texttt{twoside} options are also available. Two-page layout is used by default.
+
+\chapter{On the fonts}
+By default, \simplivre{} uses Palatino Linotype as the English font, FounderType's YouSong and YouHei GBK as the Chinese fonts, and partially uses Neo Euler as the math font. Among them, Neo Euler can be downloaded at \url{https://github.com/khaledhosny/euler-otf}. The other fonts are not free, you need to purchase and use them on your own. (For the Chinese fonts, visit FounderType's website for detail: \url{https://www.foundertype.com} ).
+
+\begin{remind}[Font demonstration]
+ \begin{itemize}
+ \item English main font. \textsf{English sans serif font}. \texttt{English typewriter font}.
+ \item 中文主要字体,\textsf{中文无衬线字体}
+ \item 数学示例: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
+ \end{itemize}
+\end{remind}
+
+\bigskip
+When the corresponding font is not installed, fonts that comes with TeX Live will be used instead. In this case, the experience might be reduced.
+
\chapter{Some instructions}
-There is no indentation at the beginning of each paragraph, but there will be a half-line space between each two paragraphs. like this ---
+\vspace{-1.5\baselineskip}
+Many of the features described next are provided by the \ProjLib{} toolkit. Only the basic usage is mentioned here. For more details, please refer to its user documentation.
+
+\section{Language configuration}
+
+\simplivre{} has multi-language support, including simplified Chinese, traditional Chinese, English, French, German, Japanese, and Russian. The language can be selected by the following macros:
+
+\begin{itemize}
+ \item \lstinline|\UseLanguage{|\meta{language name}\lstinline|}| is used to specify the language. The corresponding setting of the language will be applied after it. It can be used either in the preamble or in the main body. When no language is specified, ``English" is selected by default.
+ \item \lstinline|\UseOtherLanguage{|\meta{language name}\lstinline|}{|\meta{content}\lstinline|}|, which uses the specified language settings to typeset \meta{content}. Compared with \lstinline|\UseLanguage|, it will not modify the line spacing, so line spacing would remain stable when CJK and Western texts are mixed.
+\end{itemize}
+
+\meta{language name} can be:
+\begin{itemize}
+ \item Simplified Chinese: \texttt{Chinese}, \texttt{chinese}, \texttt{SChinese}, \texttt{schinese}, \texttt{SimplifiedChinese} or \texttt{simplifiedchinese}
+ \item Traditional Chinese: \texttt{TChinese}, \texttt{tchinese}, \texttt{TraditionalChinese} or \texttt{traditionalchinese}
+ \item English: \texttt{English} or \texttt{english}
+ \item French: \texttt{French} or \texttt{french}
+ \item German: \texttt{German}, \texttt{german} or \texttt{ngerman}
+ \item Japanese: \texttt{Japanese} or \texttt{japanese}
+ \item Russian: \texttt{Russian} or \texttt{russian}
+\end{itemize}
+
+\medskip
+In addition, you can also add new settings to selected language:
+\begin{itemize}
+ \item \lstinline|\AddLanguageSetting{|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item Add \meta{settings} to all supported languages.
+ \end{itemize}
+ \item \lstinline|\AddLanguageSetting(|\meta{language name}\lstinline|){|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item Add \meta{settings} to the selected language \meta{language name}.
+ \end{itemize}
+\end{itemize}
+For example, \lstinline|\AddLanguageSetting(German){\color{orange}}| can make all German text displayed in orange (of course, one then need to add \lstinline|\AddLanguageSetting{\color{black}}| in order to correct the color of the text in other languages).
-Here is the next paragraph.
\section{Theorems and how to reference them}
-Environments such as definitions and theorems have been pre-defined and can be used directly, for example:
+Environments such as definitions and theorems have been pre-defined and can be used directly.
+
+More specifically, preset environments include:
+\texttt{assumption}, \texttt{axiom}, \texttt{conjecture}, \texttt{convention}, \texttt{corollary}, \texttt{definition}, \texttt{definition-proposition}, \texttt{definition-theorem}, \texttt{example}, \texttt{exercise}, \texttt{fact}, \texttt{hypothesis}, \texttt{lemma}, \texttt{notation}, \texttt{problem}, \texttt{property}, \texttt{proposition}, \texttt{question}, \texttt{remark}, \texttt{theorem}, and the corresponding unnumbered version with an asterisk \lstinline|*| in the name. The display of these environments will change according to the current language.
+
+When referencing a theorem-like environment, it is recommended to use clever reference \lstinline|\cref{|\meta{label}\texttt{\}}. In this way, there is no need to explicitly write down the name of the corresponding environment every time.
+
+\begin{remind}[Example]
\begin{code}
\begin{definition}[Strange things] \label{def: strange} ...
\end{code}
+
will produce
\begin{definition}[Strange things]\label{def: strange}
- This is the definition of some strange objects.
+ This is the definition of some strange objects. There is approximately an one-line space before and after the theorem environment, and there will be a symbol to mark the end of the environment.
\end{definition}
-There is approximately an one-line space before and after the theorem environment. There will be a symbol to mark the end of the environment.
+\lstinline|\cref{def: strange}| will be displayed as: \cref{def: strange}.
+
+After using \lstinline|\UseLanguage{French}|, a theorem will be displayed as:
+
+\UseLanguage{French}
+\begin{theorem}[Inutile]\label{thm}
+ Un théorème en français.
+\end{theorem}
+
+By default, when referenced, the name of the theorem always matches the language of the context in which the theorem is located. For example, the definition above is still displayed in English in the current French mode: \cref{def: strange} and \cref{thm}. If you want the name of the theorem to match the current context when referencing, you can add \texttt{regionalref} to the global options.
+\end{remind}
+
+\UseLanguage{English}
-When referencing, you can directly use clever reference \lstinline|\cref{(label name)}|. For example, \lstinline|\cref{def: strange}| will be displayed as: \cref{def: strange}.
\section{Define a new theorem-like environment}
-First define the name of this environment in the language used: \lstinline|\(name of environment)(language name)|. Where \lstinline|(language name)| can be \lstinline|EN|, \lstinline|FR|, \lstinline|CN|, etc., and then define this environment in one of the following four ways:
+If you need to define a new theorem-like environment, you must first define the name of the environment in the language used: \lstinline|\|\meta{name of environment}\meta{language abbr}, where \meta{language abbr} is the abbreviation of language, which can be:
+% \vspace{-.5\baselineskip}
+\begin{longtable}{ll|ll}
+ \texttt{CN} & Simplified Chinese & \texttt{DE} & German\\
+ \texttt{TC} & Traditional Chinese & \texttt{JP} & Japanese\\
+ \texttt{EN} & English & \texttt{RU} & Russian\\
+ \texttt{FR} & French & &\\
+\end{longtable}
+
+\vspace{-.5\baselineskip}
+\begin{remind}
+ If you want to define an environment with an asterisk \lstinline|*| after the name, you don't need to write an asterisk in the \meta{name of environment} above. See the example below.
+\end{remind}
+
+And then define this environment in one of following five ways:
\begin{itemize}
- \item \lstinline|\CreateTheorem*{(name of environment)}|
- \item \lstinline|\CreateTheorem{(name of environment)}[(numbered like)]|
- \item \lstinline|\CreateTheorem{(name of environment)}<(numbered within)>|
- \item \lstinline|\CreateTheorem{(name of environment)}|
+ \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item Define an unnumbered environment \meta{name of environment}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
+ \begin{itemize}
+ \item Define a numbered environment \meta{name of environment}, numbered in order 1,2,3,\dots
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
+ \begin{itemize}
+ \item Define a numbered environment \meta{name of environment}, which shares the counter \meta{numbered like}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
+ \begin{itemize}
+ \item Define a numbered environment \meta{name of environment}, numbered within the \\counter \meta{numbered within}
+ \end{itemize}
+ \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|\\
+ \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|
+ \begin{itemize}
+ \item Identify \meta{name of environment} with \meta{existed environment} or \meta{existed environment}\lstinline|*|.
+ \item This method is usually useful in the following two situations:
+ \begin{enumerate}
+ \item To use a more concise name. For example, with \lstinline|\CreateTheorem{thm}|\\\lstinline|(theorem)|, one can then use the name \texttt{thm} to write theorem.
+ \item To remove the numbering. For example, one can remove the numbering of the \texttt{remark} environment with \lstinline|\CreateTheorem{remark}(remark*)|.
+ \end{enumerate}
+ \end{itemize}
\end{itemize}
+\begin{remind}
+ It uses \textsf{amsthm} internally, so the traditional \texttt{theoremstyle} is also applicable to it. One only needs declare the style before the relevant definitions.
+\end{remind}
+
\def\proofideanameEN{Idea}
-\CreateTheorem*{proofidea}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<section>
+
+\bigskip
+Here is an example. The following code:
-For example,
\begin{code}
\def\proofideanameEN{Idea}
- \CreateTheorem*{proofidea}
+ \CreateTheorem*{proofidea*}
+ \CreateTheorem{proofidea}<section>
\end{code}
-defines an unnumbered environment \lstinline|proofidea|, which supports using in the English context, and the effect is as follows:
+
+defines an unnumbered environment \lstinline|proofidea*| and a numbered environment \lstinline|proofidea| (numbered within section) respectively. They can be used in English context. The effect is as follows:
+
+\begin{proofidea*}
+ The \lstinline|proofidea*| environment.
+\end{proofidea*}
\begin{proofidea}
- ...
+ The \lstinline|proofidea| environment.
\end{proofidea}
+\clearpage
\section{Draft mark}
You can use \lstinline|\dnf| to mark the unfinished part. For example:
\begin{itemize}
- \item \lstinline|\dnf|: \quad \dnf
- \item \lstinline|\dnf<Still need ...>|: \quad \dnf<Still need ...>
+ \item \lstinline|\dnf| or \lstinline|\dnf<...>|. The effect is: \dnf~ or \dnf<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\dnf} in French mode.
\end{itemize}
-Similarly, there is \lstinline|\needgraph| :
+Similarly, there is \lstinline|\needgraph| :
\begin{itemize}
- \item \lstinline|\needgraph|: \needgraph
- \item \lstinline|\needgraph<About ...>|: \needgraph<About ...>
+ \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \needgraph or \needgraph<...>The prompt text changes according to the current language. For example, in French mode, it will be displayed as \UseOtherLanguage{French}{\needgraph}
\end{itemize}
-\section{Language configuration}
-You can use \lstinline|\UseLanguage{(name of language))}| at any time to change the language, Language names include Chinese, English, French (the case of the first letter is arbitrary, for example, ``chinese'' is also acceptable). With this, the effects of various commands and environments will also change accordingly.
-
-For example, after using \lstinline|\UseLanguage{French}|, the theorem and the draft mark will be displayed as:
-
-\UseLanguage{French}
-\begin{theorem}[Inutile]\label{thm}
- Un théorème en français. \dnf
-\end{theorem}
-
-When referenced, the name of the theorem always matches the language of the region in which the theorem is located, for example, the definition of the beginning is still displayed in English in the current French mode: \cref{def: strange} and \cref{thm}.
-
-\UseLanguage{English}
+% \vspace{-.5\baselineskip}
+% \section{On the title, abstract and keywords}
+
+% \simplivre{} has both the features of standard classes and that of the \AmS{} classes.
+
+% Therefore, the title part can either be written in the usual way, in accordance with the standard class \textsf{article}:
+
+% \begin{code}
+% \title{(*\meta{title}*)}
+% \author{(*\meta{author}*)}
+% \date{(*\meta{date}*)}
+% \maketitle
+% \begin{abstract}
+% (*\meta{abstract}*)
+% \end{abstract}
+% \begin{keyword}
+% (*\meta{keywords}*)
+% \end{keyword}
+% \end{code}
+
+% \vspace{-.5\baselineskip}
+% or written in the way of \AmS{} classes:
+
+% \begin{code}
+% \title{(*\meta{title}*)}
+% \author{(*\meta{author}*)}
+% \address{(*\meta{address}*)}
+% \email{(*\meta{email}*)}
+% \date{(*\meta{date}*)}
+% \keywords{(*\meta{keywords}*)}
+% \subjclass{(*\meta{subjclass}*)}
+% \begin{abstract}
+% (*\meta{abstract}*)
+% \end{abstract}
+% \maketitle
+% \end{code}
+
+% \medskip
+% The author information can contain multiple groups, written as:
+
+% \begin{code}
+% \author{(*\meta{author 1}*)}
+% \address{(*\meta{address 1}*)}
+% \email{(*\meta{email 1}*)}
+% \author{(*\meta{author 2}*)}
+% \address{(*\meta{address 2}*)}
+% \email{(*\meta{email 2}*)}
+% ...
+% \end{code}
+
+% Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| is not important.
\section{On the line numbers}
Line numbers can be turned on and off at any time. \lstinline|\linenumbers| is used to enable the line numbers, and \lstinline|\nolinenumbers| is used to disable them. For the sake of beauty, the title, table of contents, index and some other elements are not numbered.
\section{On the footnotes in the title}
-In \lstinline|\chapter| or \lstinline|\chapter| , if you wish to add footnotes, you can only:
+In \lstinline|\section| or \lstinline|\subsection| , if you wish to add footnotes, you can only:
\begin{itemize}
\item first write \lstinline|\mbox{\protect\footnotemark}|,
\item then add \lstinline|\footnotetext{...}| afterwards.
\end{itemize}
This is a disadvantage brought about by the underline decoration of the title.
-\section{On the fonts}
-\einfart{} and \simplivre{} use Palatino Linotype as the English font, FounderType's YouSong and YouHei Simplified as the Chinese fonts, and partially use Neo Euler as the mathematical font:
-\begin{itemize}
- \item English main font. \textsf{English sans serif font}.
- \item 中文主要字体, \textsf{中文无衬线字体}
- \item Math demonstration: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
+
+\section{Known issues}
+
+\begin{itemize}[itemsep=.6em]
+ \item The font settings are still not perfect.
+ \item Since many features are based on the \ProjLib{} toolkit, \simplivre{} inherits all its problems. For details, please refer to the "Known Issues" section of the \ProjLib{} documentation.
+ \item The error handling mechanism is incomplete: there is no corresponding error prompt when some problems occur.
+ \item There are still many things that can be optimized in the code.
\end{itemize}
-Among them, Neo Euler can be downloaded at \url{https://github.com/khaledhosny/euler-otf}. Other fonts are not free, you need to purchase and use them on your own. (For the Chinese fonts, visit FounderType's website for detail: \url{https://www.foundertype.com} ).
-When the corresponding font is not installed, the font that comes with TeX Live will be used instead, and the experience might be reduced.
+\part{Demonstration}
\chapter{Document templates}
-\singlespacing
+\vspace*{-1.5\baselineskip}
+
+\section{The standard way}
+
+If you want to write in the standard way, you can refer to the following example:
-\LocallyStopLineNumbers
-\begin{minipage}{0.45\textwidth}
\begin{code}
-%! TEX program = xelatex
-\documentclass[fast]{simplivre}
+\documentclass{simplivre}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
-\linenumbers
-\UseLanguage{French}
+\UseLanguage{French} % Use French from here
\begin{document}
-\title{Titre}
-\author{Nom}
-\date{03 / 2021, Lieu}
+\title{Le Titre}
+\author{Auteur}
+\date{\PJLdate{2022-04-01}}
\maketitle
-%% Texte ici
+\chapter{Un théorème}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
\end{document}
\end{code}
-\end{minipage}
-%
-\hfill
-%
-\begin{minipage}{0.45\textwidth}
+
+If you wish to switch to the standard class later, just replace the first two lines with:
+
\begin{code}
-%! TEX program = xelatex
-\documentclass[fast]{simplivre}
+\documentclass{article}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
-\linenumbers
-\UseLanguage{Chinese}
+
+\clearpage
+\section{The \texorpdfstring{\AmS{}}{AMS} way}
+
+If you intend to switch to the journal template in the future and thus want to use the writing style as in the \AmS{} classes, you can refer to the following example:
+
+\begin{code}
+\documentclass{simplivre}
+\usepackage{PJLtoolkit} % Load ProjLib toolkit
+
+\UseLanguage{French} % Use French from here
\begin{document}
-\title{标题}
-\author{姓名}
-\date{2021年3月, 地点}
+\title{Le Titre}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 1}{Courriel 1}}
+\author{Auteur 1}
+\address{Adresse 1}
+\email{\href{Courriel 2}{Courriel 2}}
+\date{\PJLdate{2022-04-01}}
+\subjclass{*****}
+\keywords{...}
\maketitle
-%% 正文部分
+\chapter{Première section}
+
+%% Theorem-like environments can be used directly
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+
+Référence du théorème: \cref{thm:abc}
+ % It is recommended to use clever reference
\end{document}
\end{code}
-\end{minipage}
-\par
-\ResumeLineNumbers
-\bigskip
-(\lstinline|\UseLanguage| can be placed either in the preamble or in the body part, and can be used repeatedly as needed)
+\vspace{-0.3\baselineskip}
+In this way, if you wish to switch to \AmS{} class later, just replace the first two lines with:
+
+\begin{code}
+\documentclass{amsart}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\end{code}
+
+\blinddocument
\end{document}
diff --git a/macros/unicodetex/latex/simplivre/simplivre.cls b/macros/unicodetex/latex/simplivre/simplivre.cls
index 43aec4f462..bab668ae35 100644
--- a/macros/unicodetex/latex/simplivre/simplivre.cls
+++ b/macros/unicodetex/latex/simplivre/simplivre.cls
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{simplivre}
- [2021/03/15 A simple and clear book style]
+ [2021/05/23 A simple and clear book style]
\def\minimclass@baseclass{book}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -27,6 +27,13 @@
}
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
+\DeclareBoolOption[false]{classical}
+
+\newif\if@minimclass@bfivepaper\@minimclass@bfivepaperfalse
+\DeclareVoidOption{b5paper}{\@minimclass@bfivepapertrue}
+\newif\if@minimclass@afourpaper\@minimclass@afourpaperfalse
+\DeclareVoidOption{a4paper}{\@minimclass@afourpapertrue}
+
\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{\minimclass@baseclass}}
\ProcessKeyvalOptions*\relax
\LoadClass{\minimclass@baseclass}
@@ -37,6 +44,8 @@
%%================================
%% Page layout
%%================================
+\RequirePackage{silence}
+\WarningFilter{geometry}{Over-specification in}
\RequirePackage[heightrounded]{geometry}
\geometry{
papersize={7in,10in},
@@ -45,15 +54,36 @@
vmarginratio=1:1,
footnotesep=2em plus 2pt minus 2pt,
}
+\if@minimclass@bfivepaper
+\geometry{
+ b5paper,
+ total={40em,59em},
+ hmarginratio=1:1,
+ vmarginratio=1:1,
+ footnotesep=2em plus 2pt minus 2pt,
+}
+\fi
+\if@minimclass@afourpaper
+\geometry{
+ a4paper,
+ total={47em,70em},
+ hmarginratio=1:1,
+ vmarginratio=1:1,
+ footnotesep=2em plus 2pt minus 2pt,
+}
+\fi
\if@minimclass@fast
\PassOptionsToPackage{fast}{minimalist}
+ \RequirePackage{draftwatermark}
+ \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95}
\fi
-\if@minimclass@fast
- \PassOptionsToPackage{polyglossia}{minimalist}
+\if@minimclass@classical
+ \RequirePackage{indentfirst}
+\else
+ \AtEndPreamble{\RequirePackage{parskip}}
\fi
\RequirePackage{minimalist}
-\AtEndPreamble{\RequirePackage{parskip}}
%%================================
%% Fonts
@@ -69,27 +99,32 @@
\IfFontExistsTF{Palatino Linotype}{%
\setmainfont{Palatino Linotype}
}{
- \setmainfont{texgyrepagella-regular.otf}[
- BoldFont = texgyrepagella-bold.otf ,
- ItalicFont = texgyrepagella-italic.otf ,
- BoldItalicFont = texgyrepagella-bolditalic.otf ]
+ \setmainfont{TeXGyrePagellaX-Regular.otf}[
+ BoldFont = TeXGyrePagellaX-Bold.otf ,
+ ItalicFont = TeXGyrePagellaX-Italic.otf ,
+ BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf ]
}
\setsansfont{SourceSansPro-Regular.otf}[
- Scale = MatchLowercase,
+ Scale = MatchLowercase ,
BoldFont = SourceSansPro-Bold.otf ,
ItalicFont = SourceSansPro-RegularIt.otf ,
BoldItalicFont = SourceSansPro-BoldIt.otf ]
+ \setmonofont{cmuntt.otf}[
+ Scale = 1.05 ,
+ BoldFont = cmuntb.otf ,
+ ItalicFont = cmunst.otf ,
+ BoldItalicFont = cmuntb.otf ]
%% Chinese fonts
\PassOptionsToPackage{fontset=none,scheme=plain}{ctex}
\RequirePackage{ctex}
-\IfFontExistsTF{FZYouSongS 507R}{%
- \setCJKmainfont{FZYouSongS 507R}[
- BoldFont = FZYouSongS 509R ,
- BoldFeatures = {FakeBold=2} ,
+\IfFontExistsTF{FZYOUSK_507R--GBK1-0}{%
+ \setCJKmainfont{FZYOUSK_507R--GBK1-0}[
+ BoldFont = FZYOUSK_509R--GBK1-0 ,
+ BoldFeatures = {FakeBold=4} ,
ItalicFont = * ,
- BoldItalicFont = FZYouSongS 509R ,
- BoldItalicFeatures = {FakeBold=2} ,
+ BoldItalicFont = FZYOUSK_509R--GBK1-0 ,
+ BoldItalicFeatures = {FakeBold=4} ,
SmallCapsFont = * ]
}{
\setCJKmainfont{FandolSong-Regular.otf}[
@@ -99,13 +134,13 @@
BoldItalicFeatures = {FakeBold=4} ,
SmallCapsFont = * ]
}
-\IfFontExistsTF{FZYouSongS 507R}{%
- \setCJKmonofont{FZYouSongS 507R}[
- BoldFont = FZYouSongS 509R ,
- BoldFeatures = {FakeBold=2} ,
+\IfFontExistsTF{FZYOUSK_507R--GBK1-0}{%
+ \setCJKmonofont{FZYOUSK_507R--GBK1-0}[
+ BoldFont = FZYOUSK_509R--GBK1-0 ,
+ BoldFeatures = {FakeBold=4} ,
ItalicFont = * ,
- BoldItalicFont = FZYouSongS 509R ,
- BoldItalicFeatures = {FakeBold=2} ,
+ BoldItalicFont = FZYOUSK_509R--GBK1-0 ,
+ BoldItalicFeatures = {FakeBold=4} ,
SmallCapsFont = * ]
}{
\setCJKmonofont{FandolFang-Regular.otf}[
@@ -116,11 +151,12 @@
BoldItalicFeatures = {FakeBold=4} ,
SmallCapsFont = * ]
}
-\IfFontExistsTF{FZYouHeiS 506L}{%
- \setCJKsansfont{FZYouHeiS 506L}[
- BoldFont = FZYouHeiS 509R,
+\IfFontExistsTF{FZYOUHK_506L--GBK1-0}{%
+ \setCJKsansfont{FZYOUHK_506L--GBK1-0}[
+ BoldFont = FZYOUHK_509R--GBK1-0 ,
+ BoldFeatures = {FakeBold=4} ,
ItalicFont = * ,
- BoldItalicFont = FZYouHeiS 509R ,
+ BoldItalicFont = FZYOUHK_509R--GBK1-0 ,
SmallCapsFont = * ]
}{
\setCJKsansfont{FandolHei-Regular.otf}[
@@ -131,14 +167,16 @@
}
%% Math font
-\if@minimclass@fast\else
+\if@minimclass@fast
+\RequirePackage{amssymb}
+\else
\PassOptionsToPackage
{warnings-off={mathtools-colon,mathtools-overbracket}}{unicode-math}
\RequirePackage{unicode-math}
-\unimathsetup{math-style=ISO}
+\unimathsetup{math-style=ISO, partial=upright, nabla=upright}
\setmathfont{Asana-Math.otf}
\IfFontExistsTF{Neo Euler}{%
-\setmathfont{Neo Euler} % From https://tex.stackexchange.com/a/425887
+\setmathfont{Neo Euler}
[range={"0000-"0001,"0020-"007E,
"00A0,"00A7-"00A8,"00AC,"00AF,"00B1,"00B4-"00B5,"00B7,
"00D7,"00F7,
@@ -165,9 +203,22 @@
"1D507-"1D50A,"1D50D-"1D514,"1D516-"1D51C,"1D51E-"1D537,
"1D56C-"1D59F,"1D6A8-"1D6B8,"1D6BA-"1D6D2,"1D6D4-"1D6DD,
"1D6DF,"1D6E1,"1D7CE-"1D7D7 }]
+\setmathfont[range=up/{greek,Greek}, script-features={}, sscript-features={}
+ ]{Neo Euler}
+\setmathfont[range=up/{latin,Latin}, script-features={}, sscript-features={}
+ ]{Neo Euler}
+\setmathfont[range={bfup/{latin, Latin, greek, Greek}, frak, bffrak, cal},
+ script-features={}, sscript-features={}
+ ]{Neo Euler}
+\setmathfont[range={up/num, bfup/num, it, bfit, scr, bfscr,
+ sfup, sfit, bfsfup, bfsfit, tt}
+ ]{Asana-Math.otf}
+\setmathfont[range=bfcal, Scale=MatchUppercase, Alternate]{Asana-Math.otf}
}{}
\fi
+\def\PJL@font@alreadyset{}
+
\RequirePackage[verbose=silent]{microtype}
%%================================
@@ -176,7 +227,9 @@
\RequirePackage{graphicx}
\graphicspath{{images/}}
\RequirePackage{wrapfig}
+\RequirePackage{float}
\RequirePackage{caption}
+\captionsetup{font=small}
%%================================
%% Index
@@ -185,53 +238,6 @@
\pretocmd{\printindex}{\LocallyStopLineNumbers}{}{\FAIL}
\apptocmd{\printindex}{\ResumeLineNumbers}{}{\FAIL}
-%%================================
-%% Draft mark
-%%================================
-\def\dnfFont{\ttfamily}
-\def\needgraphFont{\ttfamily}
-
-\def\dnfTextEN{To be finished here}
-\def\needgraphTextEN{A graph is needed here}
-\def\dnfTextFR{À terminer ici}
-\def\needgraphTextFR{Il manque encore un graphique ici}
-\def\dnfTextCN{这里的内容尚未完成}
-\def\needgraphTextCN{这里需要一张图片}
-
-\definecolor{dnfColor}{RGB}{21,122,20}
-\definecolor{needgraphColor}{RGB}{70,130,180}
-
-\if@minimclass@fast
- \newcommand{\plainBox}[2][-paper]{\textcolor{#1}{%
- \setlength{\fboxsep}{1.5pt}%
- \setlength{\fboxrule}{1.2pt}%
- \fbox{#2}}}
-\else
- \PassOptionsToPackage{many}{tcolorbox}
- \RequirePackage{tcolorbox}
- \newtcbox{\plainBox}[1][-paper]{enhanced jigsaw,%
- on line, arc = 1.2pt, outer arc = 1pt,breakable,%
- colframe = #1,colupper=#1,opacityback=0,%
- boxsep = 1pt,boxrule = 1.2pt,%
- left = 1pt, right = 1pt, top = 0pt, bottom = 0pt,%
- }
-\fi
-
-\NewDocumentCommand{\dnf}{d<>}{%
- \noindent\plainBox[dnfColor]%
- {\normalfont\dnfFont\bfseries\small%
- \csname dnfText\csname\languagename ABBR\endcsname\endcsname%
- \IfNoValueF{#1}{ : #1}}%
-}
-\NewDocumentCommand{\needgraph}{d<>}{%
- \par%
- \centerline{\plainBox[needgraphColor]%
- {\normalfont\needgraphFont\bfseries\small%
- \csname needgraphText\csname\languagename ABBR\endcsname\endcsname%
- \IfNoValueF{#1}{ : #1}}}%
- \par%
-}
-
\endinput
%%
%% End of file `simplivre/simplivre.cls'.
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index 21444abee4..c564e096c0 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 937 2021-05-16 16:55:43Z michal_h21 $
+% $Id: tex4ht-4ht.tex 939 2021-05-23 22:14:27Z karl $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2021 TeX Users Group
@@ -17554,10 +17554,9 @@ UnDFexyz}%
\Link[http://ctan.tug.org/ctan/tex-archive/macros/latex/contrib/supported/elsevier/]{}{}elsevier\EndLink
\<elsart.4ht\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% elsart.4ht |version %
-% Copyright (C) |CopyYear.1999. Eitan M. Gurari %
-|<TeX4ht copyright|>
+% elsart.4ht (|version), generated from |jobname.tex
+% Copyright |CopyYear.1999. Eitan M. Gurari
+|<TeX4ht copywrite|>
\edef\@ptsize{\ifdim \normalbaselineskip>14pt 2\else
\ifdim \normalbaselineskip>13pt 2\else 0\fi\fi}
\input article.4ht
@@ -26202,7 +26201,7 @@ Was \`'\def\color@setgroup{\begingroup \ht:special {color push
\<color.4ht\><<<
% color.4ht (|version), generated from |jobname.tex
% Copyright |CopyYear.1997. Eitan M. Gurari
-|<TeX4ht copyright|>
+|<TeX4ht copywrite|>
\expandafter\ifx \csname color:def\endcsname\relax
\let\color:def\def
\else \expandafter\endinput\fi
@@ -35930,10 +35929,9 @@ the configuration is empty.
%%%%%%%%%%%%%%%%%%
\<eplain.4ht\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% eplain.4ht |version %
-% Copyright (C) |CopyYear.2004. Eitan M. Gurari %
-|<TeX4ht copyright|>
+% eplain.4ht (|version), generated from |jobname.tex
+% Copyright |CopyYear.2004. Eitan M. Gurari
+|<TeX4ht copywrite|>
|<shared plain,eplain|>
|<eplain hooks|>
|<eplain listing|>
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 7a04340811..e2bf5424a6 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -17,6 +17,7 @@ $mirrors = {
'https://mirror.bjtu.edu.cn/CTAN/' => 1,
'https://mirrors.aliyun.com/CTAN/' => 1,
'https://mirrors.bfsu.edu.cn/CTAN/' => 1,
+ 'https://mirrors.cqu.edu.cn/CTAN/' => 1,
'https://mirrors.dgut.edu.cn/CTAN/' => 1,
'https://mirrors.hit.edu.cn/CTAN/' => 1,
'https://mirrors.nju.edu.cn/CTAN/' => 1,
@@ -54,6 +55,9 @@ $mirrors = {
'https://mirror.navercorp.com/CTAN/' => 1,
'https://mirror.yongbok.net/ctan/' => 1,
},
+ 'Philippines' => {
+ 'https://mirror.pregi.net/tex-archive/' => 1,
+ },
'Singapore' => {
'https://download.nus.edu.sg/mirror/ctan/' => 1,
},
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 47979751d9..e231dc12f5 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,7 +26,7 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2021
-depend revision/59310
+depend revision/59324
name 00texlive.image
category TLCore
@@ -4392,7 +4392,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 59302
+revision 59312
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
@@ -34042,22 +34042,23 @@ catalogue-version 0.2
name beaulivre
category Package
-revision 58503
+revision 59320
shortdesc Write your books in a colorful way
relocated 1
longdesc This package provides a LaTeX class for typesetting books with
-longdesc a colorful design. Currently, it has native support for
-longdesc English, French, and Chinese typesetting. It compiles with
-longdesc either XeLaTeX or LuaLaTeX. This is part of the colorist class
-longdesc series and depends on colorist.sty from the colorist package.
-longdesc The package name "beaulivre" is taken from the French words
-longdesc "beau" (= "beautiful") and "livre" (= "book").
+longdesc a colorful design. Currently, it has native support for Chinese
+longdesc (both simplified and traditional), English, French, German,
+longdesc Japanese and Russian typesetting. It compiles with either
+longdesc XeLaTeX or LuaLaTeX. This is part of the colorist class series
+longdesc and depends on colorist.sty from the colorist package. The
+longdesc package name "beaulivre" is taken from the French words "beau"
+longdesc (= "beautiful") and "livre" (= "book").
depend colorist
-containersize 3024
-containerchecksum 68117aaa40fb49c0fa7da73fb4f5cd1445191efadb4ed1ad08a12878fc1681cea13804fbf949484a63834cb0a14b3d306bb6def553e3dfe2420ef7e2b84614ab
-doccontainersize 275784
-doccontainerchecksum 263b5b5bd27c13db1247354429ccc93953e522213a2b154c08918489eb4c2ee3fc36f5a2922a901f1113b2bffd11301b4d3d71f90876886c32e07a38f28e30b9
-docfiles size=82
+containersize 2856
+containerchecksum 79ec710a588d33f66523b5364ac948b1caae87adcd37c0711f3dd836f2a3d1fce8343426bb2f683cf41c9ddea8bdc22bb82bdbc8af4c87a658ffcb08fc083e35
+doccontainersize 479340
+doccontainerchecksum e920543b06c2c06ba924ffb1abe7d145c5cdc2ca784583a3fe25c7e2cbcb67bcecaae1b420dc5c7b4ef78908f8762197222de334a0bd194d26783a7215d72878
+docfiles size=138
RELOC/doc/latex/beaulivre/LICENSE
RELOC/doc/latex/beaulivre/README.md details="Readme"
RELOC/doc/latex/beaulivre/beaulivre-doc-cn.pdf details="Package documentation (Chinese)" language="zh"
@@ -69996,29 +69997,29 @@ catalogue-version 0.2
name colorist
category Package
-revision 58434
+revision 59316
shortdesc Write your articles or books in a colorful way
relocated 1
longdesc This package offers you a LaTeX style file and two classes to
longdesc typeset articles or books in a colorful way. These classes
-longdesc currently have native support for English and French
+longdesc currently have native support for English, French, and German
longdesc typesetting. They compile with any major TeX engine. You may
longdesc also wish to consider the packages lebhart and beaulivre, which
longdesc are enhanced versions of the classes provided here. They have
longdesc unicode support, thus can only be used with either XeLaTeX or
-longdesc LuaLaTeX. Currently they have native support for English,
-longdesc French, and Chinese typesetting, and also use more beautiful
-longdesc fonts.
-containersize 7328
-containerchecksum 9787be368fba699437305f4757434ad5e8cd19bbf200bd42517478a46ce01173cef8d7fdef204c1b02fbec0b09f40d44a84a7e79ba98b54705f5864dcbe511db
-doccontainersize 54348
-doccontainerchecksum e6991e2a45b789f907d4534e86970d6a0abb63e98fc1e281f2568303d83bcde569881f808813ead6c09f598a62b2d0411589355db2529a90e2f48d22594f29f3
-docfiles size=21
+longdesc LuaLaTeX. Currently they have native support for Chinese (both
+longdesc simplified and traditional), English, French, German, Japanese,
+longdesc and Russian typesetting, and also use more beautiful fonts.
+containersize 8672
+containerchecksum 4f7c22cafac37cefe7c9b3701045556be0a427df260c216e3f9ede71220a9f85729737f36d1038a66d219820bfecc7b96755e49cb80a70f3f5059b9c42ab95a5
+doccontainersize 91372
+doccontainerchecksum c1cbefe8d86e518c679a8ca9cf78f613bb126cd187c5f97d6d222814c6798b546632d85f580dbf6dd40398b8dbf9841518e6db05e17cfaaa12d7ae90ccac3d6c
+docfiles size=31
RELOC/doc/latex/colorist/LICENSE
RELOC/doc/latex/colorist/README.md details="Readme"
RELOC/doc/latex/colorist/colorist-doc.pdf details="Package documentation"
RELOC/doc/latex/colorist/colorist-doc.tex
-runfiles size=9
+runfiles size=16
RELOC/tex/latex/colorist/colorart.cls
RELOC/tex/latex/colorist/colorbook.cls
RELOC/tex/latex/colorist/colorist.sty
@@ -103496,23 +103497,24 @@ catalogue-topics collection
name einfart
category Package
-revision 58414
+revision 59321
shortdesc Write your articles in a simple and clear way
relocated 1
longdesc This package provides a LaTeX class for typesetting articles
longdesc with a simple and clear design. Currently, it has native
-longdesc support to English, French, and Chinese typesetting. It
-longdesc compiles with either XeLaTeX or LuaLaTeX. This is part of the
-longdesc minimalist class series and depends on minimalist.sty from the
-longdesc minimalist package. The package name "einfart" is taken from
-longdesc the German word "einfach" ("simple"), combined with the first
-longdesc three letters of "Artikel" ("article").
+longdesc support for Chinese (both simplified and traditional), English,
+longdesc French, German, Japanese and Russian typesetting. It compiles
+longdesc with either XeLaTeX or LuaLaTeX. This is part of the minimalist
+longdesc class series and depends on minimalist.sty from the minimalist
+longdesc package. The package name "einfart" is taken from the German
+longdesc word "einfach" ("simple"), combined with the first three
+longdesc letters of "Artikel" ("article").
depend minimalist
-containersize 3112
-containerchecksum 3e49ed89f9a3653db65cbd6a65f285d918691268d5cc61a20e74c7080cbfa8a5038a1fad197675075df1334bd14e9d52000e18bc3a574e731df002380e749349
-doccontainersize 262400
-doccontainerchecksum b50e6abddaff2e79e9d89fa9f8fca9fe80ac727849245c02eb8eb879769d48be3c91ce6007cea4716fed4f396fcb06d36e1a9fe24f090284f3eb1e0c72c83ec6
-docfiles size=76
+containersize 2968
+containerchecksum 84515bbbfa16ec9939dfe002a256d4b1850fe8e34aaa722347cbe9ac28d6582f2b1c8f2a1faaf213f70af876b9722be0036c01eb32031935893e65eb6a87d729
+doccontainersize 380244
+doccontainerchecksum b4346fabf334df3cad0c8a75b46e6a303e2decd3857cd7c78a45b354d611d85cf07a5839489c987e8d6891f9ddeef78922c4b70dd394aa68c93b686198fe5d47
+docfiles size=111
RELOC/doc/latex/einfart/LICENSE
RELOC/doc/latex/einfart/README.md details="Readme"
RELOC/doc/latex/einfart/einfart-doc-cn.pdf details="Package documentation (Chinese)" language="zh"
@@ -170586,23 +170588,24 @@ catalogue-version 2.1a
name lebhart
category Package
-revision 58503
+revision 59322
shortdesc Write your articles in a colorful way
relocated 1
longdesc This package provides a LaTeX class for typesetting articles
longdesc with a colorful design. Currently, it has native support for
-longdesc English, French, and Chinese typesetting. It compiles with
+longdesc Chinese (both simplified and traditional), English, French,
+longdesc German, Japanese and Russian typesetting. It compiles with
longdesc either XeLaTeX or LuaLaTeX. This is part of the colorist class
longdesc series and depends on colorist.sty from the colorist package.
longdesc The package name "lebhart" is taken from the German word
longdesc "lebhaft" ("vivid"), combined with the first three letters of
longdesc "Artikel" ("article").
depend colorist
-containersize 3044
-containerchecksum 9f2e2a2b45593dcbcf57bb5a41b0785c73b3e920d26b2311f25776d5902b325db23931f3d9fb642804c374ac00495b350af5559b9bf7bc7fd367f90919a4e94f
-doccontainersize 273048
-doccontainerchecksum b3f9af0dd9a4a08034bbe769a3d8a0f76aa741431646ce9be168d6292688c63070d57c3757c799fc2d37391cee12e65828e31062c9abad80b2ca7167ab881f4f
-docfiles size=81
+containersize 2880
+containerchecksum 0b866ea13769cb6402381669582ff4ae3f1805a4640484f46043357a663bd37252fdae01cf7e019f5665c0dd71e092bf1b4bcb27e9a06735ec1258c87a8a46a9
+doccontainersize 445972
+doccontainerchecksum 4d496d96e62fd1bc178c099f3c2be44792af66c61524f3fd2c87305924fa602541a0f4be99c68c312416aeae119e9ba650bb9ffa4d475f12cd7a3b349366f9c1
+docfiles size=127
RELOC/doc/latex/lebhart/LICENSE
RELOC/doc/latex/lebhart/README.md details="Readme"
RELOC/doc/latex/lebhart/lebhart-doc-cn.pdf details="Package documentation (Chinese)" language="zh"
@@ -192094,17 +192097,17 @@ catalogue-version 0.4
name mcf2graph
category Package
-revision 59086
+revision 59314
shortdesc Draw chemical structure diagrams with Metafont/MetaPost
relocated 1
longdesc The Molecular Coding Format (MCF) is a linear notation for
longdesc describing chemical structure diagrams. This package converts
longdesc MCF to graphic files using Metafont / MetaPost.
-containersize 23336
-containerchecksum 117e5b4e716ff374220c58c940577790c9275be0261bb9423e34a88ae1089f8d6e78aea16e9ee35f9a3d29d21662a4319fd45bd54b0382877b795b2222e7f8b5
-doccontainersize 909748
-doccontainerchecksum d468ca257179f947831ee70e9575de2f7d750cc358ce103b22b2e2eed1725de1d6c1991f5e51be904c690f0b241761d6e7829c3ec171edb767d5525500231264
-docfiles size=265
+containersize 23476
+containerchecksum f8de4acdd630cbb273184a29fe175b59d4bc498a027176d3226540776de95c2100abebf29ee0eb692a66f785c83089982a3653a982f34c9bbb130e65e189c625
+doccontainersize 916312
+doccontainerchecksum 8c4d12892f2863b5db7239f400f6235ac5cdc1cbc3b28b2052f19d1d02536cff31a878f111705d6a2f93c546c961c7d783d5b0f9d8075d571c01a692b08a6dbb
+docfiles size=280
RELOC/doc/metapost/mcf2graph/CHANGELOG
RELOC/doc/metapost/mcf2graph/README details="Readme"
RELOC/doc/metapost/mcf2graph/mcf_data_base.mcf
@@ -192122,7 +192125,7 @@ runfiles size=27
catalogue-ctan /graphics/mcf2graph
catalogue-license mit
catalogue-topics graphics graphics-mpost chemistry
-catalogue-version 4.64
+catalogue-version 4.65
name mcite
category Package
@@ -197381,24 +197384,25 @@ catalogue-version 0.96
name minimalist
category Package
-revision 58395
+revision 59317
shortdesc Write your articles or books in a simple and clear way
relocated 1
longdesc This package offers you a LaTeX style file and two classes to
longdesc typeset articles or books in a simple and clear way. These
-longdesc classes currently have native support for English and French
-longdesc typesetting. They compile with any major TeX engine. You may
-longdesc also wish to consider the packages einfart and simplivre, which
-longdesc are enhanced versions of the classes provided here. They have
-longdesc unicode support, thus can only be used with either XeLaTeX or
-longdesc LuaLaTeX. Currently they have native support for English,
-longdesc French, and Chinese typesetting, and also use more beautiful
+longdesc classes currently have native support for English, French and
+longdesc German typesetting. They compile with any major TeX engine. You
+longdesc may also wish to consider the packages einfart and simplivre,
+longdesc which are enhanced versions of the classes provided here. They
+longdesc have unicode support, thus can only be used with either XeLaTeX
+longdesc or LuaLaTeX. Currently they have native support for Chinese
+longdesc (both simplified and traditional), English, French, German,
+longdesc Japanese and Russian typesetting, and also use more beautiful
longdesc fonts.
-containersize 6420
-containerchecksum 4ce14a43f724cb6dea4106e6a25b345cca94208724828383add74386943a1769bb5fb756424290cf2b49baeb4cb93658982d38c43ecbe6fc338bdf534905f4c5
-doccontainersize 53552
-doccontainerchecksum d10d1a10e2bf8bcc6cde857af2e94a0dfe7edc4c1c1013646273f0add9cae841b92a47313dfe6ebbaabf70132ddd9ee67c3588a606d084357ca937031289df7f
-docfiles size=21
+containersize 6176
+containerchecksum 14f06c1659a97008be521f6e160c514c7dfd46e5067c54976aa663994b8768cf92d2ca0c3ba47c1757a5120a3c3b9cab66ee5ed9838eb7c31dd33b50a7845dc0
+doccontainersize 90148
+doccontainerchecksum fc09137052faae5c07a349f3b6a150847552efd9ef695940b1b4b4b24e0a3d135640081ac54615aa8c64bf77f1c9f95d79011388c09ef833da7c694d645baca0
+docfiles size=32
RELOC/doc/latex/minimalist/LICENSE
RELOC/doc/latex/minimalist/README.md details="Readme"
RELOC/doc/latex/minimalist/minimalist-doc.pdf details="Package documentation"
@@ -212672,7 +212676,7 @@ catalogue-version 1.0
name newtx
category Package
-revision 59277
+revision 59313
shortdesc Alternative uses of the TX fonts, with improved metrics
relocated 1
longdesc The bundle splits txfonts.sty (from the TX fonts distribution)
@@ -212688,9 +212692,9 @@ longdesc text-with-maths combination.
depend kastrup
execute addMap newtx.map
containersize 5604344
-containerchecksum 3a0f001e1ce154c47d8bdad5b01411b9f25f7176d5c9f41d24401162638f2c3184127c9de893ca248eb2d78047e4a48f2d1b796f35413d0cd03c55fc62824a82
-doccontainersize 966784
-doccontainerchecksum 35940d4fcb342f29bc88d1e844c57f14bf07bfb527621b6ce5c913c33770a0f4a913ef1026b93be88fbcaee170d5af18e0eb1c5d2086898b072a4214a75905a1
+containerchecksum 9fc6979bd43143f6a6d0a1d978948f02e5aa5a26e4a8fac36c8933c87f548726373a49aa9393d615cc5ec97b1ca00eb5a3bd4c139431d843832f628f73d05542
+doccontainersize 966880
+doccontainerchecksum f58ab4fb0f2bf360e24ba183f0f4f28c3b2c5eb7b7fa94c1bd854666fa3745a415095e0bc058aa927be23aa1dd68c93dad66eac2d09e6351fbc42a7cd3e7054f
docfiles size=436
RELOC/doc/fonts/newtx/MANIFEST-newtx.txt
RELOC/doc/fonts/newtx/README details="Readme"
@@ -213528,7 +213532,7 @@ catalogue-also minion2newtx
catalogue-ctan /fonts/newtx
catalogue-license lppl1.3
catalogue-topics font font-body font-maths font-serif font-proportional font-type1 font-otf font-supp font-t1enc
-catalogue-version 1.651
+catalogue-version 1.652
name newtxsf
category Package
@@ -233580,27 +233584,30 @@ catalogue-topics font font-sans font-proportional font-type1 font-supp font-t1en
name ot-tableau
category Package
-revision 44889
+revision 59318
shortdesc Optimality Theory tableaux in LaTeX
relocated 1
longdesc The package makes it easy to create beautiful
longdesc optimality-theoretic tableaux. The LaTeX source is visually
longdesc very similar to a formatted tableau, which makes working with
longdesc the source code painless (well, less painful). A variety of
-longdesc stylistic variants are available to suit personal taste.
-containersize 2096
-containerchecksum f3240c0688276ab6537201b20d6eee422a795d5d994c6bc8eab3f275a037e7adcec7e54c9500a3a5a6d2fe237b44b0b350a7ce6f72c7012bb48a69c9c43f2fca
-doccontainersize 81048
-doccontainerchecksum 396256f0ce1bda04fe1c84cb45928d82651b4f6363928e33bf092737ee6ab224f473567aa5432fa00a8e4cfd9b5a3f7e7ad8448090afaaaf89f97b33ff695876
-docfiles size=25
+longdesc stylistic variants are available to suit personal taste. The
+longdesc package requires xstring, amssymb, bbding, suffix, colortbl,
+longdesc rotating, hhline (optionally), arydshln, and tipa (optionally).
+containersize 2392
+containerchecksum 0a9c219d69f6eec4d9fbf8937e0cdde60b34cf38ce154332147ccc172b0ce90932ee08c7a85a68d4e5163461352745a5c0abdc6b8bdc187be5fce5b121f45c75
+doccontainersize 66132
+doccontainerchecksum 8345d881600cf9f4d73cd2a23d12ff32f11a4d3a66b61262b0eae7dd3bc9039e20b187a6a9e45e9b15729015fb76b0e4e3e76c011e47688df09f4a848e508c4c
+docfiles size=21
RELOC/doc/latex/ot-tableau/README details="Readme"
RELOC/doc/latex/ot-tableau/ot-tableau.pdf details="Package documentation"
RELOC/doc/latex/ot-tableau/ot-tableau.tex
runfiles size=2
RELOC/tex/latex/ot-tableau/ot-tableau.sty
+catalogue-contact-home https://github.com/adamb924/ot-tableau
catalogue-ctan /macros/latex/contrib/ot-tableau
-catalogue-license lppl
-catalogue-topics linguistic
+catalogue-license lppl1.3
+catalogue-topics linguistic table
name othello
category Package
@@ -257746,24 +257753,24 @@ catalogue-version 4.6.2
name pxbase
category Package
-revision 44756
+revision 59315
shortdesc Tools for use with (u)pLaTeX
relocated 1
longdesc The main purpose of this package is to provide auxiliary
longdesc functions which are utilized by other packages created by the
longdesc same author. It also provides a few user commands to assist in
longdesc creating Japanese documents using (u)pLaTeX.
-containersize 11640
-containerchecksum e567378515039b55eab0a12ca645ba5ff17c2dbaf56309c3273beb0d05c7e6e2dcf3d7d22091907df5636451df8e91d09673607918dd9ac091908cb6ef1e4de1
-doccontainersize 160380
-doccontainerchecksum d6d87123dce0a2afe3380cf32fffc8954e30d22e9822d0ff89500bea6a455c70a6699576265cebad29ba33c0fa5e7b63a40f26f7579d1fe9dc0cbcb528c45d00
-docfiles size=47
+containersize 12068
+containerchecksum 08cb0379315a9bc3075d69a581795099fe0f6eec1ea49fee062a117181a2dda5d255596517ac307c78304763ef2546655e996af2e945123822ca67d1f2f3968b
+doccontainersize 145104
+doccontainerchecksum d9d96f023681d3f984badf2615bb7f9df4b2a097cc144cc60445406cfc1d37df8a07588de87794f77a97775fd01b7ed4730912b00e732a165132438f7fb25e06
+docfiles size=44
RELOC/doc/platex/pxbase/LICENSE
RELOC/doc/platex/pxbase/README-ja.md details="Readme (Japanese)" language="ja"
RELOC/doc/platex/pxbase/README.md details="Readme"
RELOC/doc/platex/pxbase/pxbabel.pdf
RELOC/doc/platex/pxbase/pxbabel.tex
-runfiles size=16
+runfiles size=17
RELOC/tex/platex/pxbase/pxbabel.sty
RELOC/tex/platex/pxbase/pxbase.def
RELOC/tex/platex/pxbase/pxbase.sty
@@ -257776,7 +257783,7 @@ catalogue-contact-home https://github.com/zr-tex8r/PXbase
catalogue-ctan /language/japanese/pxbase
catalogue-license mit
catalogue-topics japanese
-catalogue-version 1.1b
+catalogue-version 1.2
name pxchfon
category Package
@@ -273771,22 +273778,23 @@ catalogue-topics tut-latex
name simplivre
category Package
-revision 58414
+revision 59323
shortdesc Write your books in a simple and clear way
relocated 1
longdesc This package provides a LaTeX class for typesetting books with
-longdesc a simple and clear design. Currently, it has native support to
-longdesc English, French, and Chinese typesetting. It compiles with
+longdesc a simple and clear design. Currently, it has native support for
+longdesc Chinese (both simplified and traditional), English, French,
+longdesc German, Japanese and Russian typesetting. It compiles with
longdesc either XeLaTeX or LuaLaTeX. This is part of the minimalist
longdesc class series and depends on minimalist.sty from the minimalist
longdesc package. The package name "simplivre" is taken from the French
longdesc words "simple" and "livre" (= "book").
depend minimalist
-containersize 3072
-containerchecksum cdcaa2083a2005e7b3dfb3b2e931a49da6f18c7860fad8dd0411bf88251a799836b6032382e661611487f6cd549a1d916977542f448ac689d976dd194c0a49a3
-doccontainersize 271784
-doccontainerchecksum 8bacd8834d8b54707d564b2a16a4f7d177205e9ab9704d2a47a42be399c0bf5e0ca1728f1b44e48e3957a69285615587df40d3ce9f98147bbb692ec06ac7875b
-docfiles size=78
+containersize 2940
+containerchecksum 585d9e104ed7f8db532adc52351a5dccaeda41b45932f9ca92f4e9fbabf82da09d565432b01aad963fb5f422d1f74cf95311146d2ccf0a2a7c814ca504a7f239
+doccontainersize 449068
+doccontainerchecksum 8f1e7450cd7d26bd0169201a7bcf9d9f15b90138664cfc069832c175bd7eed75aad47c62ddb6b6ac713d6bd7292459e5aa14ea75a48a32346b7fc504821383b8
+docfiles size=135
RELOC/doc/latex/simplivre/LICENSE
RELOC/doc/latex/simplivre/README.md details="Readme"
RELOC/doc/latex/simplivre/simplivre-doc-cn.pdf details="Package documentation (Chinese)" language="zh"
@@ -287228,7 +287236,7 @@ catalogue-version 2.40
name tcolorbox
category Package
-revision 56610
+revision 59319
shortdesc Coloured boxes, for LaTeX examples and theorems, etc
relocated 1
longdesc This package provides an environment for coloured and framed
@@ -287240,11 +287248,11 @@ longdesc output. Another common use case is the setting of theorems. The
longdesc package supports saving and reuse of source code and text
longdesc parts. The package depends on the pgf, verbatim, environ, and
longdesc etoolbox packages.
-containersize 230544
-containerchecksum 70647656ee420fcb3c832e8552c2340229b0586a638f7c55404f96f20dcb3e8fd2c561a44ece09e6f507a3c4e2be189aa4cb3a3c4d8bc338ca4396e5d4b9416d
-doccontainersize 4716812
-doccontainerchecksum 5ec6c748b48b0166555437e0f75203e616e43a8b15787890b00d36df7c86de1971d2a876c5e7228f60f9ccd2e14c7b30ec061f35127a76f6194722c7103c9c0f
-docfiles size=2321
+containersize 231064
+containerchecksum 5084a335fd0f9d4f0c959059537d6faa247d1796c5ca494ebabf64b686e7092c77346ccc2d58c7f4ec5fce7edb43cdead5608c06fa0a57ececdf91bfd4343f5c
+doccontainersize 4770092
+doccontainerchecksum 3e740903ada41659911267629528ce0ff37ca60ef28d7b013f4a50899ccd6ff3cca257cbd8f1ccf9cfea1c5c8591a929a829f7beb0e9a1050e9ff75c171a94dc
+docfiles size=2330
RELOC/doc/latex/tcolorbox/Basilica_5.png
RELOC/doc/latex/tcolorbox/CHANGES
RELOC/doc/latex/tcolorbox/README details="Readme"
@@ -287281,6 +287289,7 @@ docfiles size=2321
RELOC/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty
RELOC/doc/latex/tcolorbox/tcolorbox.doc.s_snippet.sty
RELOC/doc/latex/tcolorbox/tcolorbox.doc.sidebyside.tex
+ RELOC/doc/latex/tcolorbox/tcolorbox.doc.skincatalog.tex
RELOC/doc/latex/tcolorbox/tcolorbox.doc.skins.tex
RELOC/doc/latex/tcolorbox/tcolorbox.doc.technical.tex
RELOC/doc/latex/tcolorbox/tcolorbox.doc.theorems.tex
@@ -287289,7 +287298,7 @@ docfiles size=2321
RELOC/doc/latex/tcolorbox/tcolorbox.doc.xparse.tex
RELOC/doc/latex/tcolorbox/tcolorbox.pdf details="Package documentation"
RELOC/doc/latex/tcolorbox/tcolorbox.tex
-runfiles size=143
+runfiles size=144
RELOC/tex/latex/tcolorbox/blueshade.png
RELOC/tex/latex/tcolorbox/crinklepaper.png
RELOC/tex/latex/tcolorbox/goldshade.png
@@ -287317,7 +287326,7 @@ catalogue-contact-bugs https://github.com/T-F-S/tcolorbox/issues
catalogue-ctan /macros/latex/contrib/tcolorbox
catalogue-license lppl1.3
catalogue-topics boxing colour verbatim listing macro-demo
-catalogue-version 4.42
+catalogue-version 4.50
name tdclock
category Package
@@ -290419,7 +290428,7 @@ binfiles arch=x86_64-solaris size=1
name tex4ht
category Package
-revision 59249
+revision 59324
shortdesc Convert (La)TeX to HTML/XML
longdesc A converter from TeX and LaTeX to SGML-based formats such as
longdesc (X)HTML, MathML, OpenDocument, and Docbook, providing a
@@ -290432,10 +290441,10 @@ longdesc helper DVI file that it can then process. This technique allows
longdesc TeX4ht to approach the robustness characteristic of
longdesc restricted-syntax systems such as gellmu.
depend tex4ht.ARCH
-containersize 901928
-containerchecksum fe80bcc2ff9c1990d9114d69f5adf70321904b346ec2a04aa6079b043ccbfaeb9745b521272d2bee2a51466a803df3decc56905dab57775a5c167954ce78ddda
+containersize 901988
+containerchecksum c86c134b8594df866bd30424775e05b684e97a116a74860f18e2189c0dff3eba92f39d099795567253ab0d8090e757b5ee06fefedd8b0b94906c04432f1eee19
doccontainersize 136384
-doccontainerchecksum 5df83a76407d3e675e6624ccfaec2eb81cd703d7e98be441dc6bc8da67f3cc2c523f19583b43c634aacf6029b72d16fdc8f724886118d1e4d6b6b07d00cc4420
+doccontainerchecksum 30aab273e51ff9052500d64c8c111a76426b1f08752dbb963e2ba8b9b0d5e7b3d7cf320f2da772f6691ebecc34a7894ef854786e10881c141f8dc14310df5a67
docfiles size=260
texmf-dist/doc/generic/tex4ht/Makefile
texmf-dist/doc/generic/tex4ht/README details="Readme"
@@ -290507,8 +290516,8 @@ docfiles size=260
texmf-dist/doc/generic/tex4ht/mn56.html
texmf-dist/doc/generic/tex4ht/mn5x.png
texmf-dist/doc/generic/tex4ht/mn6x.png
-srccontainersize 1210104
-srccontainerchecksum 7f104eaf055352f193fa150790fba292c3968ec3e33d38c740c6040db5d820303473c9bc317895f7d4c0d8aa9f283219f4cb41902174c6aab74db184284f7e56
+srccontainersize 1209160
+srccontainerchecksum 671c7af1f0600b8f296c868bc14e9573aad4e20f4ed0088aa609d80651d6063a0e1b7ccb6eb2c9cc697e567b67bba1377a3565be25eddd1e64be67a9816c6585
srcfiles size=3623
texmf-dist/source/generic/tex4ht/ChangeLog
texmf-dist/source/generic/tex4ht/Makefile
@@ -290581,7 +290590,7 @@ srcfiles size=3623
texmf-dist/source/generic/tex4ht/tex4ht-xhtmml-xtpipes.tex
texmf-dist/source/generic/tex4ht/wripro.tex
texmf-dist/source/generic/tex4ht/xtpipes.tex
-runfiles size=9794
+runfiles size=9795
texmf-dist/scripts/tex4ht/ht.sh
texmf-dist/scripts/tex4ht/htcontext.sh
texmf-dist/scripts/tex4ht/htcopy.pl
@@ -299614,7 +299623,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 59302
+revision 59312
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.
@@ -299622,10 +299631,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 107976
-containerchecksum 490b93daa75212e3fd9a68cc4c0bdfad7a22a092499209846e5dad96b22fa5e96ec7e652452667305a8d0f45405fef1a74b84d439ff811221348e44fb76183d6
-doccontainersize 397412
-doccontainerchecksum b287dc9253bb56a0dac70daa11c89c291f7fdc3da35ad16924f964f3cf8e909364d9863edd0f36c91a47982dc4ed86b88628ba94c6cc52c491b75c7e6824c7ce
+containersize 107992
+containerchecksum 26fcec75e3b7bc6b29581cd9b2881987323f8936f67d53f89554293377fddff3673f4e1378498a0e146d9fda45ca931c2124c53b613f238cebd252a763a02ae1
+doccontainersize 397408
+doccontainerchecksum d48ddadeefa4b198a3a430e51e62b2e534727e302b7f7202d35fa30159d7f27de42d2bfc0be164e80b2076542a476fb63cc2dbf926c7cc8812b5944c962cc24d
docfiles size=490
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 2d41ecb0ef..82a6401443 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-d3935e95b66f953e93ac6a4e32a90a6f texlive.tlpdb
+b333dc1a0e7ed3869b930c0002b28ec2 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 9e005c2c33..b336011acd 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-3be17532338821190ef4f6b596e8fd12c4a42c84aef9d2b126a981bd38e05190e97e7a692708ca29a7b36a78a74452115f10b1ed1d638eaa6b55a4f7a9c8703e texlive.tlpdb
+e4d0f9507a61786fb36218ce94664660187559e4308967073cbfd1539ceb0094aebcef6d94790df89d98b101eb244f98d6949b1814574549b9b43f0bd7fc34d4 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index fab603243b..b7559764f3 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-----
-iQEcBAEBCgAGBQJgqZmNAAoJEEzhh34ZQ4xwNK8H/1POUifwmKsgxshhKUyeadct
-PaH6pKQycS8bqHTXdsT7UsxHpGfKiUoeYKmVR7UjUR5evZOHcEv2WuEXswa77tbX
-Na8xz3ZA8f8ST47qBE8pwOCmQvcLhGiVyC63hBjhf7dGxG+3TaNoP5Tpy/qB78oN
-Z21XmAetKQvRfmyH+plXIZ36SESiFKfvgnWQ4cyuAESuR8YFv+c4uazf14TUvP8J
-FYt3xCVTT+WaLHrHhudSTpyMHbihraoHxpK72iymQQE90TZMmNw4uJ3tYkNTSOVR
-scJP4KIt28oDp7gNMOi4c69477J8UTXEG2HSVacA3X9QAL1IEDedefoon42haV0=
-=MeQb
+iQEcBAEBCgAGBQJgqur5AAoJEEzhh34ZQ4xw7E8IAKtnjw89JIxUWa4izY9+7NX8
+bAvSHJAHMl4GrTluxT3Sg555i/nRwwOpf76LESXqKj9KpVgqTMCda/OUfP+BSnf+
+0IaOumL4ZsfpnbBdK4EkUV7dEVvL7dwgq18vzesY5xEPVZY6VebePHTUbpHmRq5o
+Vg7XcRUNny37JwkzfrqR5ix3YHcxvSKXJOYy8ZkYTRcPRIb50YRU2tcikVaLbZUq
+vwxgAkbvEn++IGsE921kW8UyFHD5PC0SwH1G9VOov3R/lzvdTmMzXtPVzW5lJWDB
+JdN6nDnpHispL0cnvWm9E1GNhA9MVossMIQDOVjP3vk+/qi4ecNhpMmZSbOK7ho=
+=rAsV
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 62336b09e8..bde0711f23 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index 1a633ffbe3..8dca9c2e13 100644
--- a/systems/win32/miktex/tm/packages/next/pr.ini
+++ b/systems/win32/miktex/tm/packages/next/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1621714491
+date=1621800888
lastupd=miktex-arctrl-bin-2.9 miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-2.9 miktex-asymptote-bin-x64-2.9 miktex-autosp-bin-2.9 miktex-autosp-bin-x64-2.9 miktex-axohelp-bin-2.9 miktex-axohelp-bin-x64-2.9 miktex-bibarts-bin-2.9 miktex-bibarts-bin-x64-2.9 miktex-bibtex-bin-2.9 miktex-bibtex-bin-x64-2.9 miktex-bibtex8bit-bin-2.9 miktex-bibtex8bit-bin-x64-2.9 miktex-bzip2-bin-2.9 miktex-bzip2-bin-x64-2.9 miktex-cairo-bin-2.9 miktex-cairo-bin-x64-2.9 miktex-chktex-bin-2.9 miktex-chktex-bin-x64-2.9
-lstdigest=9bf5df1d7f78f5a5c9765908724f0119
+lstdigest=cef95bde2a96c9810573d27a4aea17d8
numpkg=4101
relstate=next
-version=7812
+version=7813
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: awLZjsz2jz7H6lOJFaPWrJ6gEbpIbTWv2YjBHj6rsXHigc4XycjSbVQMjwoZzEfoMOvj7EsEk07EH6hANscAu8y9eA0P3gVyrJ3XOgzMrzvOStvAF6wQEkINFGfpMR8y3SDgLzA7DuiCz1WX3YL/ltrIj9gKT/1dqhJx4ZGAT6edx1MRBNz3Cfmc0V2uqXRs+AgDQMi/nbnRCbEWG7SlWKUKQWRnTlOQsysTEY1KeZjhoFcKC2x2db7qQKqxkbLmNDK5whMBLG37W1oykYFpl6EIj5uH8FC8gU7vcFXdbcCHAgYg6koq+5Rm8qKttUn9RE4L95Y0T9qIrrY6JOXX/g==
+;;;; signature/miktex: azwuNrJbJVY7qU0nKfiHdwUl1vE7SpmRmGU0EDtz+aDsbjSsoGHEMrGxaqG+1mgc3wf+Oo6Lzg1jZ04DGdcItab4KwO4dMjc38tptZwwxUp+zS9Px/ujqaFZ60cpZf7UC9KHBCHMt6+Fber0cCgbwN4atHQKmP9IgsgNFDeyv59ORnEY5/imxA6KdhmRQ6tHJZNFaJmpZCAarWC2e9D91FNSQXX5QUuap6P/AZWi78VO03/3MwAt4TKW0Rcfq6Mk+V7IORGHzHsDk9kr2HzGGKZkB0q69rd8WG/K9ZKoW9yjftf+ZOga4ALkFgWDiwe9IWt4DxRdxLG05Rz1K1tFFg==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index 956ee820bf..f025181d40 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1621714316
+date=1621800709
lastupd=alterqcm apa7 bxjscls covington easybook hvfloat hvqrurl pgfmath-xfp pm-isomath powerdot projlib siunitx tuda-ci acrotex babel biblatex-gost bnumexpr changes circuitikz codehigh
-lstdigest=e90e3f1b3fde03c2ff23c85fa3ef31bf
+lstdigest=1f77dc9d84af9f11da8b0a0bfc66b534
numpkg=4101
relstate=stable
-version=7812
+version=7813
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: devopsk4QJ9Cl4rkKwArGrWkAzyhTU4JIzl+bs6kl+iQvcgVtqVixu/WfMhMl8DrXVKXUfohUKh3hrrOgZgh22t+TeZgUtkqidBzxm+egslRgIaylmI8YWwfKAVVHtnQUmO5IhbwifNldBdBTkboazt+7gUZBawzo3cbgz6gpn6Qvp3BcO6Bqu4kZbfb4p3JktWIHoOHl2fb/TNAwZMwl/cF8Z7yCYGdbhqWA7b2DqE550q+bSiB2dHraxVu1karS73tFcNAbmuxt5vJBAb5UzEd7lZcXls1HdNU6edTdJXurvULNvzbyFen11Nk9jpqo3n7/18hKXiEPo/4uTKg7Q==
+;;;; signature/miktex: KBbvWmUgj7H5bGzri8j7CRpRNiCNz1WFMYi1mKJcxHXS8QwzszmlQ0UwtUzWgAXRbTjYXndOKrkjWG830DQyY6UbnhIiIUL1hRPBwJMm62kRO0iAfTBYFioTXtKJJHMAxoIaDI1izIGes9l8IVs0CkxBe4kRYoF3bAftKHMBWajCE9GY2kNCoCorjRC94LLAUyQ9FQTTUUXIFUt1F07VXgJxsRMaUTZERbtPU4aBnx2kzU65fGGTdip2iQ9JyJ3IIFaDHXaX0IOwnFJFhZvYqsSSf9/Cd2MzQXOGAs+gdBPohCie6HINVg/3FbnYzPMi3MKOPSlgwXspgSvEm5lhQg==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index 954df4b537..697fad7a93 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2021-05-23-02-02
+2021-05-24-02-02