From 272d21375e83d59014b6591075291d172bbfa007 Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Mon, 19 Apr 2021 03:01:15 +0000
Subject: CTAN sync 202104190301

---
 FILES.byname                                       | 589 ++++++++--------
 FILES.byname.gz                                    | Bin 2306493 -> 2306585 bytes
 FILES.last07days                                   | 608 ++++++++---------
 fonts/erewhon-math/Erewhon-Math.ltx                |  49 +-
 fonts/erewhon-math/Erewhon-Math.otf                | Bin 365464 -> 365468 bytes
 fonts/erewhon-math/Erewhon-Math.pdf                | Bin 159863 -> 166835 bytes
 fonts/erewhon-math/README.md                       |   5 +-
 fonts/erewhon-math/fourier-otf.sty                 |   2 +-
 fonts/erewhon-math/unimath-erewhon.ltx             |   2 +-
 fonts/erewhon-math/unimath-erewhon.pdf             | Bin 1348018 -> 1341654 bytes
 graphics/mcf2graph/CHANGELOG                       |  17 +-
 graphics/mcf2graph/README                          |  33 +-
 graphics/mcf2graph/mcf2graph.mf                    | 284 ++++----
 graphics/mcf2graph/mcf_data_base.mcf               | 638 ++++++++---------
 graphics/mcf2graph/mcf_exa_soc.mf                  |  50 +-
 graphics/mcf2graph/mcf_example.pdf                 | Bin 319847 -> 319877 bytes
 graphics/mcf2graph/mcf_example.tex                 |   5 +-
 graphics/mcf2graph/mcf_man_soc.mf                  |   8 +-
 graphics/mcf2graph/mcf_manual.pdf                  | Bin 374447 -> 375534 bytes
 graphics/mcf2graph/mcf_manual.tex                  | 183 +++--
 graphics/mcf2graph/mcf_mplib_exa.pdf               | Bin 195848 -> 195927 bytes
 graphics/mcf2graph/mcf_mplib_exa.tex               |  10 +-
 macros/latex/contrib/easybook/doc/chapter1.tex     | 155 ++---
 macros/latex/contrib/easybook/doc/chapter2.tex     | 165 +++--
 macros/latex/contrib/easybook/doc/chapter3.tex     |  17 +-
 .../latex/contrib/easybook/doc/easybook-demo.pdf   | Bin 262460 -> 268601 bytes
 .../latex/contrib/easybook/doc/easybook-demo.tex   |  12 +-
 macros/latex/contrib/easybook/doc/easybook.pdf     | Bin 449460 -> 454141 bytes
 macros/latex/contrib/easybook/easybook.dtx         | 105 ++-
 macros/latex/contrib/fontsize/fontsize.dtx         |  59 +-
 macros/latex/contrib/fontsize/fontsize.pdf         | Bin 404506 -> 405591 bytes
 macros/latex/contrib/huawei/README.md              |  29 +
 macros/latex/contrib/huawei/huawei.cls             | 311 +++++++++
 macros/latex/contrib/huawei/huawei.pdf             | Bin 0 -> 362777 bytes
 macros/latex/contrib/huawei/huawei.tex             | 223 ++++++
 macros/latex/contrib/runcode/runcode.pdf           | Bin 169426 -> 170764 bytes
 macros/latex/contrib/runcode/runcode.sty           |  55 +-
 macros/latex/contrib/runcode/runcode.tex           |  16 +-
 macros/latex/contrib/siunitx/2.8                   |   0
 macros/latex/contrib/siunitx/CHANGELOG.md          |   6 +
 macros/latex/contrib/siunitx/siunitx.dtx           |  11 +-
 macros/latex/contrib/siunitx/siunitx.pdf           | Bin 641392 -> 641398 bytes
 macros/latex/contrib/smflatex/README               |  37 +-
 macros/latex/contrib/smflatex/e-doc.pdf            | Bin 524328 -> 0 bytes
 macros/latex/contrib/smflatex/e-doc.tex            | 674 ------------------
 macros/latex/contrib/smflatex/f-doc.pdf            | Bin 522585 -> 0 bytes
 macros/latex/contrib/smflatex/f-doc.tex            | 753 ---------------------
 macros/latex/contrib/smflatex/smf-edoc.pdf         | Bin 0 -> 524468 bytes
 macros/latex/contrib/smflatex/smf-edoc.tex         | 674 ++++++++++++++++++
 macros/latex/contrib/smflatex/smf-fdoc.pdf         | Bin 0 -> 522659 bytes
 macros/latex/contrib/smflatex/smf-fdoc.tex         | 753 +++++++++++++++++++++
 macros/latex/contrib/smflatex/smflatex.dtx         | 134 ++--
 macros/latex/contrib/smflatex/smflatex.ins         |  44 +-
 systems/texlive/tlnet/tlpkg/texlive.tlpdb          | 242 ++++---
 systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5      |   2 +-
 systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512   |   2 +-
 .../texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc   |  14 +-
 systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz       | Bin 2298852 -> 2297428 bytes
 systems/win32/miktex/tm/packages/next/pr.ini       |   8 +-
 systems/win32/miktex/tm/packages/pr.ini            |   8 +-
 systems/win32/w32tex/ChangeLog                     |   4 +
 timestamp                                          |   2 +-
 62 files changed, 3924 insertions(+), 3074 deletions(-)
 create mode 100644 macros/latex/contrib/huawei/README.md
 create mode 100644 macros/latex/contrib/huawei/huawei.cls
 create mode 100644 macros/latex/contrib/huawei/huawei.pdf
 create mode 100644 macros/latex/contrib/huawei/huawei.tex
 create mode 100644 macros/latex/contrib/siunitx/2.8
 delete mode 100644 macros/latex/contrib/smflatex/e-doc.pdf
 delete mode 100644 macros/latex/contrib/smflatex/e-doc.tex
 delete mode 100644 macros/latex/contrib/smflatex/f-doc.pdf
 delete mode 100644 macros/latex/contrib/smflatex/f-doc.tex
 create mode 100644 macros/latex/contrib/smflatex/smf-edoc.pdf
 create mode 100644 macros/latex/contrib/smflatex/smf-edoc.tex
 create mode 100644 macros/latex/contrib/smflatex/smf-fdoc.pdf
 create mode 100644 macros/latex/contrib/smflatex/smf-fdoc.tex

diff --git a/FILES.byname b/FILES.byname
index f4867dd2f3..714c8758a2 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -3344,7 +3344,7 @@
 2020/05/02 |       4840 | dviware/dvidvi/config.h.in
 2007/07/03 |        710 | dviware/dvidvi/configure
 2020/05/02 |        953 | dviware/dvidvi/configure.ac
-2021/02/17 |     516909 | dviware/dvidvi/configure.texk
+2021/04/17 |     516913 | dviware/dvidvi/configure.texk
 2006/01/17 |       1093 | dviware/dvidvi/doubside.bat
 2006/01/17 |       1298 | dviware/dvidvi/doubside.com
 2006/01/17 |        725 | dviware/dvidvi/doubside.hlp
@@ -3360,7 +3360,7 @@
 2021/02/19 |         92 | dviware/dvidvi/tests/playout.2
 2021/02/19 |         96 | dviware/dvidvi/tests/playout.3
 2017/06/19 |       2484 | dviware/dvidvi/tests/playtate.dvi
-2021/02/21 |     176249 | dviware/dvidvi.zip
+2021/04/18 |     176252 | dviware/dvidvi.zip
 1997/08/03 |       3288 | dviware/dvi_economic/dvi_econ.txt
 1997/08/13 |      12880 | dviware/dvi_economic/dvi_four.exe
 1997/08/13 |      11152 | dviware/dvi_economic/dvi_par.exe
@@ -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/04/17 |      57246 | FILES.last07days
+2021/04/18 |      55652 | 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
@@ -37416,14 +37416,14 @@
 2021/02/27 |       3594 | fonts/erewhon/enc/zut1_zhgadb.enc
 2021/02/27 |       3915 | fonts/erewhon/enc/zut1_zx32l7.enc
 2021/02/27 |      53720 | fonts/erewhon/map/erewhon.map
-2020/10/19 |      22651 | fonts/erewhon-math/Erewhon-Math.ltx
-2020/10/19 |     365464 | fonts/erewhon-math/Erewhon-Math.otf
-2020/10/19 |     159863 | fonts/erewhon-math/Erewhon-Math.pdf
-2020/10/19 |       6326 | fonts/erewhon-math/fourier-otf.sty
-2020/10/19 |       3027 | fonts/erewhon-math/README.md
-2020/10/19 |      16285 | fonts/erewhon-math/unimath-erewhon.ltx
-2020/10/19 |    1348018 | fonts/erewhon-math/unimath-erewhon.pdf
-2020/10/19 |    1741636 | fonts/erewhon-math.zip
+2021/04/18 |      23097 | fonts/erewhon-math/Erewhon-Math.ltx
+2021/04/18 |     365468 | fonts/erewhon-math/Erewhon-Math.otf
+2021/04/18 |     166835 | fonts/erewhon-math/Erewhon-Math.pdf
+2021/04/18 |       6326 | fonts/erewhon-math/fourier-otf.sty
+2021/04/18 |       3233 | fonts/erewhon-math/README.md
+2021/04/18 |      16295 | fonts/erewhon-math/unimath-erewhon.ltx
+2021/04/18 |    1341654 | fonts/erewhon-math/unimath-erewhon.pdf
+2021/04/18 |    1737696 | fonts/erewhon-math.zip
 2021/02/27 |     220892 | fonts/erewhon/opentype/Erewhon-BoldItalic.otf
 2021/02/27 |     242872 | fonts/erewhon/opentype/Erewhon-Bold.otf
 2021/02/27 |     233308 | fonts/erewhon/opentype/Erewhon-BoldSlanted.otf
@@ -132042,7 +132042,7 @@
 2006/01/17 |       1595 | fonts/utilities/ps2pk/cluts.h
 2007/07/03 |        710 | fonts/utilities/ps2pk/configure
 2021/02/06 |       1188 | fonts/utilities/ps2pk/configure.ac
-2021/02/17 |     523293 | fonts/utilities/ps2pk/configure.texk
+2021/04/17 |     523297 | fonts/utilities/ps2pk/configure.texk
 2014/10/13 |       7615 | fonts/utilities/ps2pk/curves.c
 2014/10/12 |       2184 | fonts/utilities/ps2pk/curves.h
 2006/01/17 |       3213 | fonts/utilities/ps2pk/digit.h
@@ -132132,7 +132132,7 @@
 2014/10/13 |       4430 | fonts/utilities/ps2pk/util.c
 2014/10/13 |       8833 | fonts/utilities/ps2pk/util.h
 2006/01/17 |        730 | fonts/utilities/ps2pk/Xstuff.h
-2021/02/18 |     496913 | fonts/utilities/ps2pk.zip
+2021/04/18 |     496914 | fonts/utilities/ps2pk.zip
 1995/08/31 |       3714 | fonts/utilities/ps4mf-dos/ps4mf28.txt
 1995/08/31 |     587539 | fonts/utilities/ps4mf-dos/ps4mf28.zip
 1996/06/05 |      13889 | fonts/utilities/ps4mf/ps4mf.txt
@@ -139387,20 +139387,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/04/04 |      12406 | graphics/mcf2graph/CHANGELOG
-2021/04/04 |     102216 | graphics/mcf2graph/mcf2graph.mf
-2021/04/03 |      33612 | graphics/mcf2graph/mcf_data_base.mcf
-2021/04/04 |     319847 | graphics/mcf2graph/mcf_example.pdf
-2021/04/04 |       2309 | graphics/mcf2graph/mcf_example.tex
-2021/04/04 |       2950 | graphics/mcf2graph/mcf_exa_soc.mf
-2021/04/04 |      44379 | graphics/mcf2graph/mcf_man_soc.mf
-2021/04/04 |     374447 | graphics/mcf2graph/mcf_manual.pdf
-2021/04/04 |      54833 | graphics/mcf2graph/mcf_manual.tex
-2021/04/04 |     195848 | graphics/mcf2graph/mcf_mplib_exa.pdf
-2021/04/04 |      15795 | graphics/mcf2graph/mcf_mplib_exa.tex
+2021/04/18 |      12874 | graphics/mcf2graph/CHANGELOG
+2021/04/18 |     102433 | graphics/mcf2graph/mcf2graph.mf
+2021/04/17 |      36019 | graphics/mcf2graph/mcf_data_base.mcf
+2021/04/18 |     319877 | graphics/mcf2graph/mcf_example.pdf
+2021/04/18 |       2386 | graphics/mcf2graph/mcf_example.tex
+2021/04/18 |       2730 | graphics/mcf2graph/mcf_exa_soc.mf
+2021/04/11 |      44341 | graphics/mcf2graph/mcf_man_soc.mf
+2021/04/18 |     375534 | graphics/mcf2graph/mcf_manual.pdf
+2021/04/18 |      56906 | graphics/mcf2graph/mcf_manual.tex
+2021/04/18 |     195927 | graphics/mcf2graph/mcf_mplib_exa.pdf
+2021/04/17 |      15800 | graphics/mcf2graph/mcf_mplib_exa.tex
 2021/04/03 |       3682 | graphics/mcf2graph/mcf_setup.sty
-2021/04/04 |       4318 | graphics/mcf2graph/README
-2021/04/04 |     946320 | graphics/mcf2graph.zip
+2021/04/18 |       4484 | graphics/mcf2graph/README
+2021/04/18 |     947773 | 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
@@ -148167,7 +148167,7 @@
 2019/11/01 |       8501 | indexing/makeindexk/ChangeLog
 2007/07/03 |        710 | indexing/makeindexk/configure
 2013/10/01 |        988 | indexing/makeindexk/configure.ac
-2021/02/17 |     518375 | indexing/makeindexk/configure.texk
+2021/04/17 |     518379 | indexing/makeindexk/configure.texk
 2011/05/09 |        999 | indexing/makeindexk/CONTRIB
 2011/09/24 |       2027 | indexing/makeindexk/COPYING
 2014/06/19 |      11237 | indexing/makeindexk/genind.c
@@ -148205,7 +148205,7 @@
 2011/09/24 |        564 | indexing/makeindexk/tests/nested-range.tex
 2012/07/27 |        459 | indexing/makeindexk/tests/sample.idx
 2012/07/27 |        268 | indexing/makeindexk/tests/sample.ind
-2021/02/18 |     230828 | indexing/makeindexk.zip
+2021/04/18 |     230832 | indexing/makeindexk.zip
 1989/08/31 |      10291 | indexing/makeindex/lib/idxmac-amstex.tex
 1989/08/31 |       7082 | indexing/makeindex/lib/idxmac.tex
 1989/08/31 |        280 | indexing/makeindex/lib/makeidx.doc
@@ -172649,7 +172649,7 @@
 2012/09/24 |     130991 | install/macros/latex/contrib/scrjrnl.tds.zip
 2020/02/15 |    1097592 | install/macros/latex/contrib/sdaps.tds.zip
 2019/12/10 |     544332 | install/macros/latex/contrib/selinput.tds.zip
-2021/04/09 |     806452 | install/macros/latex/contrib/siunitx.tds.zip
+2021/04/17 |     806470 | install/macros/latex/contrib/siunitx.tds.zip
 2019/10/15 |     315856 | install/macros/latex/contrib/skmath.tds.zip
 2019/10/16 |     345652 | install/macros/latex/contrib/skrapport.tds.zip
 2019/12/15 |     357584 | install/macros/latex/contrib/soulutf8.tds.zip
@@ -196949,16 +196949,16 @@
 2021/01/24 |        422 | macros/latex/contrib/ean13isbn/README
 2021/01/24 |     322624 | macros/latex/contrib/ean13isbn.zip
 2021/04/11 |         99 | macros/latex/contrib/easybook/doc/appendix.tex
-2021/04/17 |       4250 | macros/latex/contrib/easybook/doc/chapter1.tex
-2021/04/11 |       3850 | macros/latex/contrib/easybook/doc/chapter2.tex
-2021/04/11 |       2536 | macros/latex/contrib/easybook/doc/chapter3.tex
-2021/04/17 |     262460 | macros/latex/contrib/easybook/doc/easybook-demo.pdf
-2021/04/17 |       2728 | macros/latex/contrib/easybook/doc/easybook-demo.tex
-2021/04/17 |     449460 | macros/latex/contrib/easybook/doc/easybook.pdf
+2021/04/18 |       1435 | macros/latex/contrib/easybook/doc/chapter1.tex
+2021/04/18 |       4250 | macros/latex/contrib/easybook/doc/chapter2.tex
+2021/04/18 |       2055 | macros/latex/contrib/easybook/doc/chapter3.tex
+2021/04/18 |     268601 | macros/latex/contrib/easybook/doc/easybook-demo.pdf
+2021/04/18 |       2742 | macros/latex/contrib/easybook/doc/easybook-demo.tex
+2021/04/18 |     454141 | macros/latex/contrib/easybook/doc/easybook.pdf
 2021/02/23 |        830 | macros/latex/contrib/easybook/doc/refs.bib
-2021/04/17 |     101484 | macros/latex/contrib/easybook/easybook.dtx
+2021/04/18 |     102930 | macros/latex/contrib/easybook/easybook.dtx
 2021/04/01 |       2497 | macros/latex/contrib/easybook/README.md
-2021/04/17 |     738975 | macros/latex/contrib/easybook.zip
+2021/04/18 |     748856 | macros/latex/contrib/easybook.zip
 2009/06/17 |      82589 | macros/latex/contrib/easy/doc/docbib.pdf
 2009/06/17 |      78378 | macros/latex/contrib/easy/doc/docbmat.pdf
 2009/06/17 |      99132 | macros/latex/contrib/easy/doc/doceqn.pdf
@@ -199471,10 +199471,10 @@
 2020/07/21 |     126590 | macros/latex/contrib/fontaxes/fontaxes.pdf
 2014/03/23 |       1645 | macros/latex/contrib/fontaxes/README
 2020/07/22 |     137019 | macros/latex/contrib/fontaxes.zip
-2021/04/17 |      74310 | macros/latex/contrib/fontsize/fontsize.dtx
-2021/04/17 |     404506 | macros/latex/contrib/fontsize/fontsize.pdf
-2021/04/17 |       1511 | macros/latex/contrib/fontsize/README
-2021/04/17 |     412286 | macros/latex/contrib/fontsize.zip
+2021/04/18 |      74953 | macros/latex/contrib/fontsize/fontsize.dtx
+2021/04/18 |     405591 | macros/latex/contrib/fontsize/fontsize.pdf
+2021/04/18 |       1511 | macros/latex/contrib/fontsize/README
+2021/04/18 |     414041 | macros/latex/contrib/fontsize.zip
 2017/07/14 |      46046 | macros/latex/contrib/fonttable/fonttable.dtx
 2017/07/14 |       2505 | macros/latex/contrib/fonttable/fonttable.ins
 2017/07/14 |     309980 | macros/latex/contrib/fonttable/fonttable.pdf
@@ -201536,6 +201536,11 @@
 2011/04/29 |     319943 | macros/latex/contrib/hrefhide/hrefhide.pdf
 2011/04/29 |       4295 | macros/latex/contrib/hrefhide/README
 2011/04/29 |     441688 | macros/latex/contrib/hrefhide.zip
+2021/04/17 |      15831 | macros/latex/contrib/huawei/huawei.cls
+2021/04/17 |     362777 | macros/latex/contrib/huawei/huawei.pdf
+2021/04/17 |       6717 | macros/latex/contrib/huawei/huawei.tex
+2021/04/17 |       1112 | macros/latex/contrib/huawei/README.md
+2021/04/18 |     371932 | macros/latex/contrib/huawei.zip
 2020/11/03 |     174943 | macros/latex/contrib/hulipsum/hulipsum.dtx
 2020/11/01 |       1704 | macros/latex/contrib/hulipsum/hulipsum.ins
 2020/11/03 |     145394 | macros/latex/contrib/hulipsum/hulipsum.pdf
@@ -209993,11 +209998,11 @@
 2019/04/18 |       4724 | macros/latex/contrib/rulerbox/rulerbox.sty
 2019/04/18 |       5847 | macros/latex/contrib/rulerbox/rulerbox.tex
 2019/04/18 |      60473 | macros/latex/contrib/rulerbox.zip
-2020/10/04 |       1226 | macros/latex/contrib/runcode/README
-2020/10/04 |     169426 | macros/latex/contrib/runcode/runcode.pdf
-2020/10/04 |      11027 | macros/latex/contrib/runcode/runcode.sty
-2020/10/04 |       8490 | macros/latex/contrib/runcode/runcode.tex
-2020/10/04 |     174050 | macros/latex/contrib/runcode.zip
+2021/04/18 |       1226 | macros/latex/contrib/runcode/README
+2021/04/18 |     170764 | macros/latex/contrib/runcode/runcode.pdf
+2021/04/18 |      12066 | macros/latex/contrib/runcode/runcode.sty
+2021/04/18 |       8969 | macros/latex/contrib/runcode/runcode.tex
+2021/04/18 |     175895 | macros/latex/contrib/runcode.zip
 2005/12/01 |      13008 | macros/latex/contrib/r_und_s/eng_rs.sty
 2005/12/01 |      11585 | macros/latex/contrib/r_und_s/eng_rs.tex
 2005/12/01 |      14228 | macros/latex/contrib/r_und_s/fr_rs.sty
@@ -211183,11 +211188,12 @@
 2007/12/02 |       2971 | macros/latex/contrib/SIunits/SIunits.ins
 2007/12/02 |     328621 | macros/latex/contrib/SIunits/SIunits.pdf
 2007/12/02 |     296391 | macros/latex/contrib/SIunits.zip
-2021/04/09 |      32451 | macros/latex/contrib/siunitx/CHANGELOG.md
-2021/04/09 |       2215 | macros/latex/contrib/siunitx/README.md
-2021/04/09 |     614563 | macros/latex/contrib/siunitx/siunitx.dtx
-2021/04/09 |     641392 | macros/latex/contrib/siunitx/siunitx.pdf
-2021/04/09 |     761767 | macros/latex/contrib/siunitx.zip
+2021/04/18 |          0 | macros/latex/contrib/siunitx/2.8
+2021/04/17 |      32546 | macros/latex/contrib/siunitx/CHANGELOG.md
+2021/04/17 |       2215 | macros/latex/contrib/siunitx/README.md
+2021/04/17 |     614680 | macros/latex/contrib/siunitx/siunitx.dtx
+2021/04/17 |     641398 | macros/latex/contrib/siunitx/siunitx.pdf
+2021/04/18 |     761874 | macros/latex/contrib/siunitx.zip
 2011/06/03 |     662398 | macros/latex/contrib/skb/doc/skb.pdf
 2011/03/15 |       1485 | macros/latex/contrib/skb/doc/user-guide/database/acronyms.tex
 2011/03/15 |        722 | macros/latex/contrib/skb/doc/user-guide/database/bibliography.tex
@@ -211431,14 +211437,14 @@
 2016/02/05 |      10999 | macros/latex/contrib/smartunits/smartunits.sty
 2016/02/05 |      20984 | macros/latex/contrib/smartunits/smartunits.tex
 2016/02/05 |     342240 | macros/latex/contrib/smartunits.zip
-2018/05/02 |     524328 | macros/latex/contrib/smflatex/e-doc.pdf
-2018/05/02 |      25508 | macros/latex/contrib/smflatex/e-doc.tex
-2018/05/02 |     522585 | macros/latex/contrib/smflatex/f-doc.pdf
-2018/05/02 |      28001 | macros/latex/contrib/smflatex/f-doc.tex
-2018/05/02 |       1494 | macros/latex/contrib/smflatex/README
-2018/05/30 |     255288 | macros/latex/contrib/smflatex/smflatex.dtx
-2018/05/30 |       2160 | macros/latex/contrib/smflatex/smflatex.ins
-2018/05/30 |    1122005 | macros/latex/contrib/smflatex.zip
+2021/04/18 |       2285 | macros/latex/contrib/smflatex/README
+2021/04/18 |     524468 | macros/latex/contrib/smflatex/smf-edoc.pdf
+2021/04/18 |      25508 | macros/latex/contrib/smflatex/smf-edoc.tex
+2021/04/18 |     522659 | macros/latex/contrib/smflatex/smf-fdoc.pdf
+2021/04/18 |      28001 | macros/latex/contrib/smflatex/smf-fdoc.tex
+2021/04/18 |     256808 | macros/latex/contrib/smflatex/smflatex.dtx
+2021/04/18 |       2413 | macros/latex/contrib/smflatex/smflatex.ins
+2021/04/18 |    1123185 | macros/latex/contrib/smflatex.zip
 2020/10/22 |       4230 | macros/latex/contrib/snapshot/README
 2020/10/22 |      53599 | macros/latex/contrib/snapshot/snapshot.dtx
 2020/10/22 |       2017 | macros/latex/contrib/snapshot/snapshot.ins
@@ -264475,9 +264481,9 @@
 2021/01/21 |     860228 | systems/texlive/tlnet/archive/achemso.doc.r57479.tar.xz
 2021/01/21 |      19268 | systems/texlive/tlnet/archive/achemso.r57479.tar.xz
 2021/01/21 |      31504 | systems/texlive/tlnet/archive/achemso.source.r57479.tar.xz
-2021/04/14 |    3554820 | systems/texlive/tlnet/archive/acmart.doc.r58867.tar.xz
-2021/04/14 |      38420 | systems/texlive/tlnet/archive/acmart.r58867.tar.xz
-2021/04/14 |      53764 | systems/texlive/tlnet/archive/acmart.source.r58867.tar.xz
+2021/04/18 |    3532112 | systems/texlive/tlnet/archive/acmart.doc.r58893.tar.xz
+2021/04/18 |      38456 | systems/texlive/tlnet/archive/acmart.r58893.tar.xz
+2021/04/18 |      53824 | systems/texlive/tlnet/archive/acmart.source.r58893.tar.xz
 2019/02/28 |      89944 | systems/texlive/tlnet/archive/acmconf.doc.r15878.tar.xz
 2019/02/28 |       4192 | systems/texlive/tlnet/archive/acmconf.r15878.tar.xz
 2019/02/28 |      18700 | systems/texlive/tlnet/archive/acmconf.source.r15878.tar.xz
@@ -266560,7 +266566,7 @@
 2020/03/04 |        560 | systems/texlive/tlnet/archive/collection-fontsrecommended.r54074.tar.xz
 2020/12/08 |        528 | systems/texlive/tlnet/archive/collection-fontutils.r57089.tar.xz
 2020/03/04 |        568 | systems/texlive/tlnet/archive/collection-formatsextra.r54074.tar.xz
-2020/10/11 |        532 | systems/texlive/tlnet/archive/collection-games.r56623.tar.xz
+2021/04/18 |        536 | systems/texlive/tlnet/archive/collection-games.r58896.tar.xz
 2020/10/07 |        588 | systems/texlive/tlnet/archive/collection-humanities.r56575.tar.xz
 2020/08/31 |        444 | systems/texlive/tlnet/archive/collection-langarabic.r56215.tar.xz
 2020/08/28 |        528 | systems/texlive/tlnet/archive/collection-langchinese.r56196.tar.xz
@@ -267814,7 +267820,7 @@
 2021/03/19 |     413492 | systems/texlive/tlnet/archive/dvipdfmx.i386-solaris.r58500.tar.xz
 2021/03/23 |      27124 | systems/texlive/tlnet/archive/dvipdfmx.r58645.tar.xz
 2021/03/19 |     791336 | systems/texlive/tlnet/archive/dvipdfmx.universal-darwin.r58528.tar.xz
-2021/04/15 |     332180 | systems/texlive/tlnet/archive/dvipdfmx.win32.r58879.tar.xz
+2021/04/18 |     331768 | systems/texlive/tlnet/archive/dvipdfmx.win32.r58890.tar.xz
 2021/03/19 |     403400 | systems/texlive/tlnet/archive/dvipdfmx.x86_64-cygwin.r58498.tar.xz
 2021/03/19 |     405060 | systems/texlive/tlnet/archive/dvipdfmx.x86_64-darwinlegacy.r58501.tar.xz
 2021/03/20 |     451244 | systems/texlive/tlnet/archive/dvipdfmx.x86_64-linuxmusl.r58535.tar.xz
@@ -267907,9 +267913,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/04/14 |     712880 | systems/texlive/tlnet/archive/easybook.doc.r58868.tar.xz
-2021/04/14 |      11652 | systems/texlive/tlnet/archive/easybook.r58868.tar.xz
-2021/04/14 |      24812 | systems/texlive/tlnet/archive/easybook.source.r58868.tar.xz
+2021/04/18 |     712576 | systems/texlive/tlnet/archive/easybook.doc.r58894.tar.xz
+2021/04/18 |      11664 | systems/texlive/tlnet/archive/easybook.r58894.tar.xz
+2021/04/18 |      24836 | systems/texlive/tlnet/archive/easybook.source.r58894.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
@@ -268521,9 +268527,9 @@
 2019/02/28 |      56512 | systems/texlive/tlnet/archive/fancynum.doc.r15878.tar.xz
 2019/02/28 |       1456 | systems/texlive/tlnet/archive/fancynum.r15878.tar.xz
 2019/02/28 |       5392 | systems/texlive/tlnet/archive/fancynum.source.r15878.tar.xz
-2019/02/28 |     116372 | systems/texlive/tlnet/archive/fancypar.doc.r49801.tar.xz
-2019/02/28 |       2900 | systems/texlive/tlnet/archive/fancypar.r49801.tar.xz
-2019/02/28 |       9568 | systems/texlive/tlnet/archive/fancypar.source.r49801.tar.xz
+2021/04/18 |     117660 | systems/texlive/tlnet/archive/fancypar.doc.r58895.tar.xz
+2021/04/18 |       2932 | systems/texlive/tlnet/archive/fancypar.r58895.tar.xz
+2021/04/18 |       9668 | systems/texlive/tlnet/archive/fancypar.source.r58895.tar.xz
 2019/02/28 |     104292 | systems/texlive/tlnet/archive/fancyref.doc.r15878.tar.xz
 2019/02/28 |       3384 | systems/texlive/tlnet/archive/fancyref.r15878.tar.xz
 2019/02/28 |      18944 | systems/texlive/tlnet/archive/fancyref.source.r15878.tar.xz
@@ -269929,13 +269935,13 @@
 2019/02/28 |       5216 | systems/texlive/tlnet/archive/interactiveworkbook.r15878.tar.xz
 2019/02/28 |      85428 | systems/texlive/tlnet/archive/interchar.doc.r36312.tar.xz
 2019/02/28 |       5308 | systems/texlive/tlnet/archive/interchar.r36312.tar.xz
-2020/12/24 |      55896 | systems/texlive/tlnet/archive/inter.doc.r57213.tar.xz
+2021/04/18 |      55896 | systems/texlive/tlnet/archive/inter.doc.r58892.tar.xz
 2019/02/28 |     740556 | systems/texlive/tlnet/archive/interfaces.doc.r21474.tar.xz
 2019/02/28 |      27932 | systems/texlive/tlnet/archive/interfaces.r21474.tar.xz
 2019/02/28 |      67108 | systems/texlive/tlnet/archive/interfaces.source.r21474.tar.xz
 2019/02/28 |     122152 | systems/texlive/tlnet/archive/interpreter.doc.r27232.tar.xz
 2019/02/28 |       6224 | systems/texlive/tlnet/archive/interpreter.r27232.tar.xz
-2020/12/24 |    6518676 | systems/texlive/tlnet/archive/inter.r57213.tar.xz
+2021/04/18 |    6520756 | systems/texlive/tlnet/archive/inter.r58892.tar.xz
 2019/03/07 |     325808 | systems/texlive/tlnet/archive/interval.doc.r50265.tar.xz
 2019/03/07 |       1620 | systems/texlive/tlnet/archive/interval.r50265.tar.xz
 2021/04/06 |     379136 | systems/texlive/tlnet/archive/intopdf.doc.r58743.tar.xz
@@ -271327,6 +271333,9 @@
 2019/12/01 |      10092 | systems/texlive/tlnet/archive/magicnum.source.r52983.tar.xz
 2021/01/11 |      38364 | systems/texlive/tlnet/archive/magra.doc.r57373.tar.xz
 2021/01/11 |     179260 | systems/texlive/tlnet/archive/magra.r57373.tar.xz
+2021/04/18 |     765572 | systems/texlive/tlnet/archive/mahjong.doc.r58896.tar.xz
+2021/04/18 |      95428 | systems/texlive/tlnet/archive/mahjong.r58896.tar.xz
+2021/04/18 |       7260 | systems/texlive/tlnet/archive/mahjong.source.r58896.tar.xz
 2019/02/28 |      58464 | systems/texlive/tlnet/archive/mailing.doc.r15878.tar.xz
 2019/02/28 |       1784 | systems/texlive/tlnet/archive/mailing.r15878.tar.xz
 2019/02/28 |       3524 | systems/texlive/tlnet/archive/mailing.source.r15878.tar.xz
@@ -275485,7 +275494,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/04/16 |     211612 | systems/texlive/tlnet/archive/texlive-scripts.doc.r58881.tar.xz
+2021/04/18 |     211616 | systems/texlive/tlnet/archive/texlive-scripts.doc.r58891.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
@@ -275509,7 +275518,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/04/16 |     107184 | systems/texlive/tlnet/archive/texlive-scripts.r58881.tar.xz
+2021/04/18 |     107176 | systems/texlive/tlnet/archive/texlive-scripts.r58891.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
@@ -277200,16 +277209,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/04/11 |     105270 | systems/texlive/tlnet/install-tl
-2021/04/17 |    6190083 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/04/17 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/04/17 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/04/18 |    6190025 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/04/18 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/04/18 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
 2021/04/11 |       4945 | systems/texlive/tlnet/install-tl-windows.bat
-2021/04/17 |   20128617 | systems/texlive/tlnet/install-tl-windows.exe
-2021/04/17 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/04/17 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/04/17 |   24962482 | systems/texlive/tlnet/install-tl.zip
-2021/04/17 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/04/17 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/04/18 |   20131760 | systems/texlive/tlnet/install-tl-windows.exe
+2021/04/18 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/04/18 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/04/18 |   24962491 | systems/texlive/tlnet/install-tl.zip
+2021/04/18 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/04/18 |        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
@@ -277219,7 +277228,7 @@
 2021/03/15 |       1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
 2021/01/27 |      49446 | systems/texlive/tlnet/tlpkg/installer/config.guess
 2010/11/11 |      11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2021/04/15 |       6740 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2021/04/17 |       6686 | 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
@@ -277262,12 +277271,12 @@
 2021/04/03 |      20365 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
 2021/02/20 |       5400 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
 2020/09/22 |      27563 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2021/04/17 |   17181580 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2021/04/17 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/04/18 |   17185410 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/04/18 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
 2020/05/13 |      86417 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2021/04/17 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/04/17 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/04/17 |    2297860 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/04/18 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/04/18 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/04/18 |    2298852 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
 2021/03/15 |      58775 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
 2021/03/17 |      42077 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
 2020/05/11 |      15010 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -281952,7 +281961,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/04/17 |     574530 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/04/18 |     574530 | 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
@@ -283150,9 +283159,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/04/17 |     208875 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/04/17 |    1267725 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/04/17 |    1183238 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/04/18 |     208852 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/04/18 |    1267447 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/04/18 |    1183688 | 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
@@ -283313,190 +283322,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/04/17 |     574552 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/04/17 |      50847 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/04/17 |      56457 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/04/17 |     968697 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/04/17 |    1078878 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2021/04/17 |      29053 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/04/17 |      31346 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/04/17 |      29869 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/04/17 |      34634 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/04/17 |      49972 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/04/17 |      57598 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/04/17 |      84773 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/04/17 |      94738 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/04/17 |      67679 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/04/17 |      75418 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/04/17 |      27182 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2021/04/17 |      30886 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/04/17 |     330233 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/04/17 |     392597 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/04/17 |      32744 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/04/17 |      36680 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2021/04/17 |      51433 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/04/17 |      56716 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/04/17 |       4704 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
-2021/04/17 |     239477 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/04/17 |     261962 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/04/17 |     179380 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/04/17 |     195666 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/04/17 |      52475 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/04/17 |      59144 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2021/04/17 |      21129 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/04/17 |      23290 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/04/17 |     461400 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/04/17 |      45648 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/04/17 |      51159 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/04/17 |     282107 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/04/17 |     321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2021/04/17 |      41104 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2021/04/17 |      45277 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2021/04/17 |     116931 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/04/17 |     131490 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/04/17 |    1281103 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/04/17 |    1425981 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/04/17 |      87638 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2021/04/17 |      99605 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/04/17 |      43058 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/04/17 |      47878 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/04/17 |      25154 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/04/17 |      28010 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/04/17 |      55821 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/04/17 |      62800 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/04/17 |     135005 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/04/17 |     152761 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/04/17 |      73182 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/04/17 |      77859 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/04/17 |      71568 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/04/17 |      80662 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/04/17 |     258664 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2021/04/17 |     295555 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2021/04/17 |      22040 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2021/04/17 |      25002 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/04/17 |      97490 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/04/17 |     112253 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/04/17 |      63834 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/04/17 |      72860 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/04/17 |      96145 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2021/04/17 |     115467 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/04/17 |      38069 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/04/17 |      42626 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/04/17 |     484055 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/04/17 |     567627 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/04/17 |     147138 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/04/17 |     159968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/04/17 |      94804 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/04/17 |     109274 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/04/17 |      16327 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2021/04/17 |      17958 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/04/17 |      28120 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/04/17 |      30038 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/04/17 |     625282 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/04/17 |     680049 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/04/17 |     532038 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/04/17 |     594869 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/04/17 |     475934 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/04/17 |     511633 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/04/17 |      94266 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2021/04/17 |     103324 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/04/17 |    1725549 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/04/17 |    2009491 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/04/17 |      67650 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/04/17 |      74165 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2021/04/17 |      27363 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/04/17 |      31593 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/04/17 |       7747 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/04/17 |       8774 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/04/17 |     195566 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/04/17 |     214104 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/04/17 |     250212 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/04/17 |     283977 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/04/17 |      97134 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/04/17 |     101763 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/04/17 |      60550 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/04/17 |      67930 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/04/17 |     124972 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2021/04/17 |     136426 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/04/17 |     147151 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/04/17 |     163655 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/04/17 |     199701 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/04/17 |     180048 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/04/17 |      67451 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/04/17 |      77487 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/04/17 |      31192 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/04/17 |      35063 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/04/17 |      38065 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/04/17 |      42574 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/04/17 |      42926 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/04/17 |      47008 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/04/17 |      45937 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/04/17 |      52454 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/04/17 |     193716 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2021/04/17 |     211053 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/04/17 |      35462 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2021/04/17 |      39691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/04/17 |     748363 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/04/17 |     816071 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/04/17 |     198131 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/04/17 |     202557 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/04/17 |     208182 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/04/17 |     243479 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/04/17 |      78746 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/04/17 |      87703 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/04/17 |    1171730 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/04/17 |    1307722 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/04/17 |      20121 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/04/17 |      23883 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/04/17 |      31543 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/04/17 |      37241 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/04/17 |      64017 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/04/17 |      72151 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/04/17 |      43678 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/04/17 |      51979 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/04/17 |    1295414 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/04/17 |    1424810 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/04/17 |      42388 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2021/04/17 |      51797 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/04/17 |      56222 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/04/17 |      59830 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/04/17 |      25341 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/04/17 |      27275 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/04/17 |      16110 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/04/17 |      18098 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/04/17 |      63673 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/04/17 |      70109 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2021/04/17 |     153891 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/04/17 |     167906 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2021/04/17 |      56909 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/04/17 |      65322 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/04/17 |      98517 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/04/17 |     104625 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/04/17 |    2499403 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/04/17 |    2616931 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/04/17 |      55221 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/04/17 |      62226 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/04/17 |      33441 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/04/17 |      37293 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/04/17 |      27196 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/04/17 |      33153 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/04/17 |      65731 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2021/04/17 |      70325 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/04/17 |     311191 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/04/17 |     345366 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/04/17 |      55563 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/04/17 |      57066 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/04/17 |     583628 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2021/04/17 |     618762 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/04/17 |      39564 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/04/17 |      43391 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/04/17 |     208916 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/04/17 |    1267203 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/04/17 |    1183475 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/04/17 |      13470 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/04/17 |      14354 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/04/18 |     574552 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/04/18 |      50847 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/04/18 |      56458 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/04/18 |     968700 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/04/18 |    1078877 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/04/18 |      29054 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/04/18 |      31345 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/04/18 |      29870 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/04/18 |      34635 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/04/18 |      49972 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/04/18 |      57599 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/04/18 |      84773 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/04/18 |      94736 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/04/18 |      67679 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/04/18 |      75419 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/04/18 |      27182 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/04/18 |      30886 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/04/18 |     330233 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/04/18 |     392598 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/04/18 |      32745 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/04/18 |      36680 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/04/18 |      51431 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/04/18 |      56717 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/04/18 |       4707 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
+2021/04/18 |     239478 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/04/18 |     261961 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/04/18 |     179380 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/04/18 |     195663 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/04/18 |      52476 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/04/18 |      59143 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/04/18 |      21130 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/04/18 |      23290 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/04/18 |     461397 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/04/18 |      45646 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/04/18 |      51160 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/04/18 |     282106 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/04/18 |     321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/04/18 |      41102 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/04/18 |      45276 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/04/18 |     116932 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/04/18 |     131491 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/04/18 |    1281104 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/04/18 |    1425981 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/04/18 |      87638 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/04/18 |      99604 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/04/18 |      43057 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/04/18 |      47878 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/04/18 |      25154 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/04/18 |      28009 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/04/18 |      55822 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/04/18 |      62802 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/04/18 |     135005 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/04/18 |     152763 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/04/18 |      73182 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/04/18 |      77859 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/04/18 |      71569 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/04/18 |      80660 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/04/18 |     258664 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/04/18 |     295554 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/04/18 |      22040 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/04/18 |      25002 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/04/18 |      97491 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/04/18 |     112252 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/04/18 |      63837 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/04/18 |      72861 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/04/18 |      96147 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/04/18 |     115470 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/04/18 |      38070 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/04/18 |      42627 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/04/18 |     484055 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/04/18 |     567628 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/04/18 |     147140 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/04/18 |     159968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/04/18 |      94802 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/04/18 |     109274 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/04/18 |      16327 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/04/18 |      17958 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/04/18 |      28121 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/04/18 |      30038 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/04/18 |     625283 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/04/18 |     680051 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/04/18 |     532040 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/04/18 |     594870 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/04/18 |     475934 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/04/18 |     511635 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/04/18 |      94267 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/04/18 |     103323 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/04/18 |    1725546 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/04/18 |    2009491 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/04/18 |      67651 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/04/18 |      74163 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/04/18 |      27363 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/04/18 |      31593 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/04/18 |       7747 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/04/18 |       8775 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/04/18 |     195566 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/04/18 |     214104 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/04/18 |     250212 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/04/18 |     283978 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/04/18 |      97133 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/04/18 |     101763 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/04/18 |      60552 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/04/18 |      67929 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/04/18 |     124972 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/04/18 |     136429 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/04/18 |     147151 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/04/18 |     163656 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/04/18 |     199700 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/04/18 |     180049 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/04/18 |      67452 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/04/18 |      77487 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/04/18 |      31191 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/04/18 |      35063 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/04/18 |      38066 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/04/18 |      42574 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/04/18 |      42924 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/04/18 |      47007 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/04/18 |      45936 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/04/18 |      52454 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/04/18 |     193717 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/04/18 |     211054 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/04/18 |      35463 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/04/18 |      39691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/04/18 |     748363 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/04/18 |     816072 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/04/18 |     198129 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/04/18 |     202556 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/04/18 |     208182 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/04/18 |     243480 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/04/18 |      78747 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/04/18 |      87704 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/04/18 |    1171731 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/04/18 |    1307723 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/04/18 |      20121 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/04/18 |      23881 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/04/18 |      31543 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/04/18 |      37243 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/04/18 |      64017 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/04/18 |      72150 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/04/18 |      43678 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/04/18 |      51978 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/04/18 |    1295412 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/04/18 |    1424810 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/04/18 |      42388 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/04/18 |      51798 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/04/18 |      56223 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/04/18 |      59829 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/04/18 |      25341 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/04/18 |      27275 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/04/18 |      16110 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/04/18 |      18098 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/04/18 |      63674 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/04/18 |      70110 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/04/18 |     153889 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/04/18 |     167906 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/04/18 |      56909 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/04/18 |      65322 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/04/18 |      98518 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/04/18 |     104625 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/04/18 |    2499402 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/04/18 |    2616930 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/04/18 |      55219 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/04/18 |      62226 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/04/18 |      33442 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/04/18 |      37292 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/04/18 |      27198 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/04/18 |      33151 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/04/18 |      65732 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/04/18 |      70324 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/04/18 |     311192 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/04/18 |     345366 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/04/18 |      55562 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/04/18 |      57067 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/04/18 |     583628 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/04/18 |     618763 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/04/18 |      39564 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/04/18 |      43392 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/04/18 |     208869 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/04/18 |    1267478 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/04/18 |    1183987 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/04/18 |      13470 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/04/18 |      14353 | 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/04/17 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/04/18 |       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
@@ -283830,7 +283839,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/03/03 |     372362 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2021/04/17 |        849 | systems/win32/miktex/tm/packages/pr.ini
+2021/04/18 |        849 | 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
@@ -285014,7 +285023,7 @@
 2021/04/08 |    5529984 | systems/win32/w32tex/aleph-w32.tar.xz
 2021/04/03 |   63643560 | systems/win32/w32tex/biblatex-biber.tar.xz
 2016/12/13 |   65971452 | systems/win32/w32tex/cbfonts.tar.xz
-2021/04/16 |     817292 | systems/win32/w32tex/ChangeLog
+2021/04/17 |     817937 | systems/win32/w32tex/ChangeLog
 2009/08/03 |     141221 | systems/win32/w32tex/ChangeLog.0
 2009/08/03 |     221890 | systems/win32/w32tex/ChangeLog.1
 2009/08/03 |     116462 | systems/win32/w32tex/ChangeLog.2
@@ -285023,11 +285032,11 @@
 2021/03/22 |   23474308 | systems/win32/w32tex/cjkzr.tar.xz
 2013/04/27 |   15858676 | systems/win32/w32tex/context-doc.tar.xz
 2021/04/15 |  144758684 | systems/win32/w32tex/context.tar.xz
-2021/04/07 |     911644 | systems/win32/w32tex/cweb-w32.tar.xz
+2021/04/17 |     914912 | systems/win32/w32tex/cweb-w32.tar.xz
 2021/03/22 |    6433932 | systems/win32/w32tex/datetime2.tar.xz
 2021/04/07 |     846020 | systems/win32/w32tex/dvi2ps-w32.tar.xz
 2021/04/07 |     484144 | systems/win32/w32tex/dvi2tty-w32.tar.xz
-2021/04/14 |    4663672 | systems/win32/w32tex/dvipdfm-w32.tar.xz
+2021/04/17 |    4663068 | systems/win32/w32tex/dvipdfm-w32.tar.xz
 2021/04/11 |    4551416 | systems/win32/w32tex/dvipsk-w32.tar.xz
 2021/04/07 |    2652392 | systems/win32/w32tex/dvitools-w32.tar.xz
 2021/04/02 |    1182048 | systems/win32/w32tex/extractpdfmark-w32.tar.xz
@@ -285057,19 +285066,19 @@
 2021/04/07 |    1246480 | systems/win32/w32tex/omegaj-w32.tar.xz
 2020/11/16 |     324540 | systems/win32/w32tex/otfbeta.tar.xz
 2021/04/08 |   22143948 | systems/win32/w32tex/pdftex-w32.tar.xz
-2021/04/05 |   93698752 | systems/win32/w32tex/pgfcontrib.tar.xz
+2021/04/17 |   93730920 | systems/win32/w32tex/pgfcontrib.tar.xz
 2015/01/26 |     189072 | systems/win32/w32tex/plain2-2.54-w32.tar.xz
 2021/02/14 |    2826912 | systems/win32/w32tex/platex.tar.xz
 2021/04/07 |    1726052 | systems/win32/w32tex/pmx.tar.xz
 2021/04/07 |    1170892 | systems/win32/w32tex/pstoedit-w32.tar.xz
 2021/04/08 |  274303444 | systems/win32/w32tex/pstricks.tar.xz
 2021/04/07 |     518092 | systems/win32/w32tex/psutils-w32.tar.xz
-2021/04/14 |    6760728 | systems/win32/w32tex/ptex-ng-w32.tar.xz
+2021/04/17 |    6760784 | systems/win32/w32tex/ptex-ng-w32.tar.xz
 2021/04/11 |   10682584 | systems/win32/w32tex/ptex-w32.tar.xz
 2019/04/15 |     499188 | systems/win32/w32tex/sam2p-w32.tar.xz
 2021/03/23 |   87955068 | systems/win32/w32tex/t1fonts.tar.xz
 2020/10/31 |     142032 | systems/win32/w32tex/t1utils-w32.tar.xz
-2021/04/16 |    2607616 | systems/win32/w32tex/tex4htk-w32.tar.xz
+2021/04/17 |    2611264 | systems/win32/w32tex/tex4htk-w32.tar.xz
 2018/06/20 |   15940044 | systems/win32/w32tex/tex-gyre.tar.xz
 2021/04/07 |    4485428 | systems/win32/w32tex/texinfo-w32.tar.xz
 2021/01/03 |    2050496 | systems/win32/w32tex/texinstwin.zip
@@ -285094,14 +285103,14 @@
 2013/04/08 |      13748 | systems/win32/w32tex/vf-n2bk.tar.xz
 2021/03/24 |   53260516 | systems/win32/w32tex/w32tex-src.tar.xz
 2021/04/11 |  130686980 | systems/win32/w32tex/web2c-lib.tar.xz
-2021/04/11 |   45563184 | systems/win32/w32tex/web2c-w32.tar.xz
+2021/04/17 |   45550296 | systems/win32/w32tex/web2c-w32.tar.xz
 2021/04/07 |     811472 | systems/win32/w32tex/win64/aleph-w64.tar.xz
 2020/08/20 |   22351540 | systems/win32/w32tex/win64/biblatex-biber-w64.tar.xz
 2021/04/15 |    2222036 | systems/win32/w32tex/win64/context-w64.tar.xz
-2021/04/07 |     440372 | systems/win32/w32tex/win64/cweb-w64.tar.xz
+2021/04/17 |     441656 | systems/win32/w32tex/win64/cweb-w64.tar.xz
 2021/04/07 |     758972 | systems/win32/w32tex/win64/dvi2ps-w64.tar.xz
 2021/04/07 |     448472 | systems/win32/w32tex/win64/dvi2tty-w64.tar.xz
-2021/04/14 |     809144 | systems/win32/w32tex/win64/dvipdfm-w64.tar.xz
+2021/04/17 |     808944 | systems/win32/w32tex/win64/dvipdfm-w64.tar.xz
 2021/04/11 |     760436 | systems/win32/w32tex/win64/dvipsk-w64.tar.xz
 2021/04/07 |    2365232 | systems/win32/w32tex/win64/dvitools-w64.tar.xz
 2021/04/02 |    1085612 | systems/win32/w32tex/win64/extractpdfmark-w64.tar.xz
@@ -285126,7 +285135,7 @@
 2021/04/07 |     651552 | systems/win32/w32tex/win64/pmx-w64.tar.xz
 2021/04/07 |     791152 | systems/win32/w32tex/win64/pstoedit-w64.tar.xz
 2021/04/07 |     386496 | systems/win32/w32tex/win64/psutils-w64.tar.xz
-2021/04/14 |    1690280 | systems/win32/w32tex/win64/ptex-ng-w64.tar.xz
+2021/04/17 |    1690996 | systems/win32/w32tex/win64/ptex-ng-w64.tar.xz
 2021/04/11 |    1873540 | systems/win32/w32tex/win64/ptex-w64.tar.xz
 2021/01/03 |     329592 | systems/win32/w32tex/win64/sam2p-w64.tar.xz
 2020/10/31 |      40588 | systems/win32/w32tex/win64/t1utils-w64.tar.xz
@@ -285137,8 +285146,8 @@
 2020/01/18 |      42768 | systems/win32/w32tex/win64/txtutil-w64.tar.xz
 2021/04/11 |    1806236 | systems/win32/w32tex/win64/uptex-w64.tar.xz
 2021/04/11 |    3756176 | systems/win32/w32tex/win64/web2c-w64.tar.xz
-2021/04/14 |   11123464 | systems/win32/w32tex/win64/xetex-w64.tar.xz
-2021/04/14 |   49453524 | systems/win32/w32tex/xetex-w32.tar.xz
+2021/04/17 |   11129920 | systems/win32/w32tex/win64/xetex-w64.tar.xz
+2021/04/17 |   49444956 | systems/win32/w32tex/xetex-w32.tar.xz
 2020/05/29 |    2936068 | systems/win32/w32tex/xindy-w32.tar.xz
 2013/11/19 |   11356248 | systems/win32/w32tex/xymtex.tar.xz
 2016/09/09 |    4334636 | systems/win32/w32tex/xypic.tar.xz
@@ -285235,7 +285244,7 @@
 2004/06/04 |        404 | tds/tds.sed
 2004/06/23 |      65418 | tds/tds.tex
 2019/05/29 |     304264 | tds.zip
-2021/04/18 |        186 | timestamp
+2021/04/19 |        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 4080a25b3e..f3ed363c47 100644
Binary files a/FILES.byname.gz and b/FILES.byname.gz differ
diff --git a/FILES.last07days b/FILES.last07days
index 0e51ca9f11..dbfc085971 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,300 +1,383 @@
-2021/04/17 |      99605 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/04/18 |      99604 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/04/18 |      98518 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/04/18 |      97491 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/04/18 |      97133 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/04/18 |     968700 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/04/18 |       9668 | systems/texlive/tlnet/archive/fancypar.source.r58895.tar.xz
+2021/04/18 |      96147 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/04/18 |      95428 | systems/texlive/tlnet/archive/mahjong.r58896.tar.xz
+2021/04/18 |      94802 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/04/18 |     947773 | graphics/mcf2graph.zip
+2021/04/18 |      94736 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/04/18 |      94267 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/04/18 |       8969 | macros/latex/contrib/runcode/runcode.tex
+2021/04/18 |       8775 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/04/18 |      87704 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/04/18 |      87638 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/04/18 |        849 | systems/win32/miktex/tm/packages/pr.ini
+2021/04/18 |      84773 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/04/18 |     816072 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/04/18 |      80660 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/04/18 |      78747 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/04/18 |      77859 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/04/18 |      77487 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/04/18 |       7747 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/04/18 |     765572 | systems/texlive/tlnet/archive/mahjong.doc.r58896.tar.xz
+2021/04/18 |     761874 | macros/latex/contrib/siunitx.zip
+2021/04/18 |      75419 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/04/18 |      74953 | macros/latex/contrib/fontsize/fontsize.dtx
+2021/04/18 |     748856 | macros/latex/contrib/easybook.zip
+2021/04/18 |     748363 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/04/18 |      74163 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/04/18 |      73182 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/04/18 |      72861 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/04/18 |       7260 | systems/texlive/tlnet/archive/mahjong.source.r58896.tar.xz
+2021/04/18 |      72150 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/04/18 |      71569 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/04/18 |     712576 | systems/texlive/tlnet/archive/easybook.doc.r58894.tar.xz
+2021/04/18 |      70324 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/04/18 |      70110 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/04/18 |     680051 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/04/18 |      67929 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/04/18 |      67679 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/04/18 |      67651 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/04/18 |      67452 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/04/18 |      65732 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/04/18 |      65322 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/04/18 |    6520756 | systems/texlive/tlnet/archive/inter.r58892.tar.xz
+2021/04/18 |      64017 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/04/18 |      63837 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/04/18 |      63674 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/04/18 |       6326 | fonts/erewhon-math/fourier-otf.sty
+2021/04/18 |      62802 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/04/18 |     625283 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/04/18 |      62226 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/04/18 |    6190025 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/04/18 |     618763 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/04/18 |      60552 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/04/18 |      59829 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/04/18 |     594870 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/04/18 |      59143 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/04/18 |     583628 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/04/18 |      57599 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/04/18 |     574552 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/04/18 |     574530 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/04/18 |      57067 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/04/18 |      56909 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/04/18 |      56906 | graphics/mcf2graph/mcf_manual.tex
+2021/04/18 |     567628 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/04/18 |      56717 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/04/18 |      56458 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/04/18 |      56223 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/04/18 |      55896 | systems/texlive/tlnet/archive/inter.doc.r58892.tar.xz
+2021/04/18 |      55822 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/04/18 |      55562 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/04/18 |      55219 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/04/18 |      53824 | systems/texlive/tlnet/archive/acmart.source.r58893.tar.xz
+2021/04/18 |        536 | systems/texlive/tlnet/archive/collection-games.r58896.tar.xz
+2021/04/18 |     532040 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/04/18 |      52476 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/04/18 |      52454 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/04/18 |     524468 | macros/latex/contrib/smflatex/smf-edoc.pdf
+2021/04/18 |     522659 | macros/latex/contrib/smflatex/smf-fdoc.pdf
+2021/04/18 |      51978 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/04/18 |      51798 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/04/18 |      51431 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/04/18 |     511635 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/04/18 |      51160 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/04/18 |      50847 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/04/18 |      49972 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/04/18 |     496914 | fonts/utilities/ps2pk.zip
+2021/04/18 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/04/18 |     484055 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/04/18 |      47878 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/04/18 |     475934 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/04/18 |       4707 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
+2021/04/18 |      47007 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/04/18 |     461397 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/04/18 |      45936 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/04/18 |      45646 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/04/18 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/04/18 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/04/18 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/04/18 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/04/18 |     454141 | macros/latex/contrib/easybook/doc/easybook.pdf
+2021/04/18 |      45276 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/04/18 |       4484 | graphics/mcf2graph/README
+2021/04/18 |      43678 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/04/18 |      43392 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/04/18 |      43057 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/04/18 |      42924 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/04/18 |      42627 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/04/18 |      42574 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/04/18 |       4250 | macros/latex/contrib/easybook/doc/chapter2.tex
+2021/04/18 |      42388 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/04/18 |     414041 | macros/latex/contrib/fontsize.zip
+2021/04/18 |      41102 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/04/18 |     405591 | macros/latex/contrib/fontsize/fontsize.pdf
+2021/04/18 |      39691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/04/18 |      39564 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/04/18 |     392598 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/04/18 |      38456 | systems/texlive/tlnet/archive/acmart.r58893.tar.xz
+2021/04/18 |      38070 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/04/18 |      38066 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/04/18 |     375534 | graphics/mcf2graph/mcf_manual.pdf
+2021/04/18 |      37292 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/04/18 |      37243 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/04/18 |     371932 | macros/latex/contrib/huawei.zip
+2021/04/18 |      36680 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/04/18 |     365468 | fonts/erewhon-math/Erewhon-Math.otf
+2021/04/18 |      35463 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/04/18 |    3532112 | systems/texlive/tlnet/archive/acmart.doc.r58893.tar.xz
+2021/04/18 |      35063 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/04/18 |      34635 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/04/18 |     345366 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/04/18 |      33442 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/04/18 |     331768 | systems/texlive/tlnet/archive/dvipdfmx.win32.r58890.tar.xz
+2021/04/18 |      33151 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/04/18 |     330233 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/04/18 |      32745 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/04/18 |       3233 | fonts/erewhon-math/README.md
+2021/04/18 |     321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/04/18 |     319877 | graphics/mcf2graph/mcf_example.pdf
+2021/04/18 |      31593 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/04/18 |      31543 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/04/18 |      31345 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/04/18 |      31191 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/04/18 |     311192 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/04/18 |      30886 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/04/18 |      30038 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/04/18 |      29870 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/04/18 |     295554 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/04/18 |       2932 | systems/texlive/tlnet/archive/fancypar.r58895.tar.xz
+2021/04/18 |      29054 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/04/18 |     283978 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/04/18 |     282106 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/04/18 |      28121 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/04/18 |      28009 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/04/18 |      28001 | macros/latex/contrib/smflatex/smf-fdoc.tex
+2021/04/18 |       2742 | macros/latex/contrib/easybook/doc/easybook-demo.tex
+2021/04/18 |      27363 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/04/18 |       2730 | graphics/mcf2graph/mcf_exa_soc.mf
+2021/04/18 |      27275 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/04/18 |      27198 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/04/18 |      27182 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/04/18 |     268601 | macros/latex/contrib/easybook/doc/easybook-demo.pdf
+2021/04/18 |     261961 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/04/18 |    2616930 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/04/18 |     258664 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/04/18 |     256808 | macros/latex/contrib/smflatex/smflatex.dtx
+2021/04/18 |      25508 | macros/latex/contrib/smflatex/smf-edoc.tex
+2021/04/18 |      25341 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/04/18 |      25154 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/04/18 |     250212 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/04/18 |      25002 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/04/18 |    2499402 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/04/18 |   24962491 | systems/texlive/tlnet/install-tl.zip
+2021/04/18 |      24836 | systems/texlive/tlnet/archive/easybook.source.r58894.tar.xz
+2021/04/18 |     243480 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/04/18 |       2413 | macros/latex/contrib/smflatex/smflatex.ins
+2021/04/18 |     239478 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/04/18 |      23881 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/04/18 |       2386 | graphics/mcf2graph/mcf_example.tex
+2021/04/18 |      23290 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/04/18 |      23097 | fonts/erewhon-math/Erewhon-Math.ltx
+2021/04/18 |     230832 | indexing/makeindexk.zip
+2021/04/18 |    2298852 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/04/18 |       2285 | macros/latex/contrib/smflatex/README
+2021/04/18 |      22040 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/04/18 |     214104 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/04/18 |     211616 | systems/texlive/tlnet/archive/texlive-scripts.doc.r58891.tar.xz
+2021/04/18 |      21130 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/04/18 |     211054 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/04/18 |     208869 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/04/18 |     208852 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/04/18 |     208182 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/04/18 |       2055 | macros/latex/contrib/easybook/doc/chapter3.tex
+2021/04/18 |     202556 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/04/18 |   20131760 | systems/texlive/tlnet/install-tl-windows.exe
+2021/04/18 |      20121 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/04/18 |    2009491 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/04/18 |     199700 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/04/18 |     198129 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/04/18 |     195927 | graphics/mcf2graph/mcf_mplib_exa.pdf
+2021/04/18 |     195663 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/04/18 |     195566 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/04/18 |     193717 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/04/18 |      18098 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/04/18 |     180049 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/04/18 |      17958 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/04/18 |     179380 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/04/18 |     176252 | dviware/dvidvi.zip
+2021/04/18 |     175895 | macros/latex/contrib/runcode.zip
+2021/04/18 |    1737696 | fonts/erewhon-math.zip
+2021/04/18 |    1725546 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/04/18 |   17185410 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/04/18 |     170764 | macros/latex/contrib/runcode/runcode.pdf
+2021/04/18 |     167906 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/04/18 |     166835 | fonts/erewhon-math/Erewhon-Math.pdf
+2021/04/18 |     163656 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/04/18 |      16327 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/04/18 |      16295 | fonts/erewhon-math/unimath-erewhon.ltx
+2021/04/18 |      16110 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/04/18 |     159968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/04/18 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/04/18 |     153889 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/04/18 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/04/18 |     152763 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/04/18 |       1511 | macros/latex/contrib/fontsize/README
+2021/04/18 |     147151 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/04/18 |     147140 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/04/18 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/04/18 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/04/18 |       1435 | macros/latex/contrib/easybook/doc/chapter1.tex
+2021/04/18 |      14353 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/04/18 |    1425981 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/04/18 |    1424810 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/04/18 |     136429 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/04/18 |     135005 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/04/18 |      13470 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/04/18 |    1341654 | fonts/erewhon-math/unimath-erewhon.pdf
+2021/04/18 |     131491 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/04/18 |    1307723 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/04/18 |    1295412 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/04/18 |      12874 | graphics/mcf2graph/CHANGELOG
+2021/04/18 |    1281104 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/04/18 |    1267478 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/04/18 |    1267447 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/04/18 |     124972 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/04/18 |       1226 | macros/latex/contrib/runcode/README
+2021/04/18 |      12066 | macros/latex/contrib/runcode/runcode.sty
+2021/04/18 |    1183987 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/04/18 |    1183688 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/04/18 |     117660 | systems/texlive/tlnet/archive/fancypar.doc.r58895.tar.xz
+2021/04/18 |    1171731 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/04/18 |     116932 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/04/18 |      11664 | systems/texlive/tlnet/archive/easybook.r58894.tar.xz
+2021/04/18 |     115470 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/04/18 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/04/18 |    1123185 | macros/latex/contrib/smflatex.zip
+2021/04/18 |     112252 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/04/18 |     109274 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/04/18 |    1078877 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/04/18 |     107176 | systems/texlive/tlnet/archive/texlive-scripts.r58891.tar.xz
+2021/04/18 |     104625 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/04/18 |     103323 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/04/18 |     102930 | macros/latex/contrib/easybook/easybook.dtx
+2021/04/18 |     102433 | graphics/mcf2graph/mcf2graph.mf
+2021/04/18 |     101763 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/04/18 |          0 | macros/latex/contrib/siunitx/2.8
 2021/04/17 |    9895469 | macros/latex/contrib/acmart.zip
-2021/04/17 |      98517 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/04/17 |      97490 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/04/17 |      97134 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/04/17 |     968697 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/04/17 |      96145 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2021/04/17 |      94804 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/04/17 |      94738 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/04/17 |      94266 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
 2021/04/17 |      94260 | systems/texlive/tlnet/archive/latexmk.r58886.tar.xz
+2021/04/17 |   93730920 | systems/win32/w32tex/pgfcontrib.tar.xz
+2021/04/17 |     914912 | systems/win32/w32tex/cweb-w32.tar.xz
 2021/04/17 |     906116 | systems/texlive/tlnet/archive/tex4ht.r58887.tar.xz
-2021/04/17 |       8774 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/04/17 |      87703 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/04/17 |      87638 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2021/04/17 |        849 | systems/win32/miktex/tm/packages/pr.ini
-2021/04/17 |      84773 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
 2021/04/17 |     838066 | macros/latex/contrib/acmart/acmart.pdf
-2021/04/17 |     816071 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/04/17 |      80662 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/04/17 |      78746 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/04/17 |      77859 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/04/17 |      77487 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/04/17 |       7747 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/04/17 |     817937 | systems/win32/w32tex/ChangeLog
+2021/04/17 |     808944 | systems/win32/w32tex/win64/dvipdfm-w64.tar.xz
+2021/04/17 |     806470 | install/macros/latex/contrib/siunitx.tds.zip
 2021/04/17 |     768548 | macros/latex/contrib/acmart/samples/sample-lualatex.pdf
-2021/04/17 |      75418 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/04/17 |     748363 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/04/17 |      74310 | macros/latex/contrib/fontsize/fontsize.dtx
-2021/04/17 |      74165 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2021/04/17 |     738975 | macros/latex/contrib/easybook.zip
-2021/04/17 |      73182 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/04/17 |      72860 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/04/17 |      72151 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/04/17 |      71568 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/04/17 |      70325 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/04/17 |      70109 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2021/04/17 |     680049 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/04/17 |      67930 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/04/17 |      67679 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/04/17 |      67650 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/04/17 |      67451 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/04/17 |      65731 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/04/17 |    6760784 | systems/win32/w32tex/ptex-ng-w32.tar.xz
+2021/04/17 |       6717 | macros/latex/contrib/huawei/huawei.tex
+2021/04/17 |       6686 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2021/04/17 |     653950 | macros/latex/contrib/acmart/samples/sample-xelatex.pdf
-2021/04/17 |      65322 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/04/17 |      64017 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/04/17 |      63834 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/04/17 |      63673 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/04/17 |      62800 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/04/17 |     625282 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/04/17 |      62226 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/04/17 |     641398 | macros/latex/contrib/siunitx/siunitx.pdf
 2021/04/17 |     620576 | systems/texlive/tlnet/archive/tikzlings.doc.r58885.tar.xz
-2021/04/17 |    6190083 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/04/17 |     618762 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/04/17 |     614680 | macros/latex/contrib/siunitx/siunitx.dtx
 2021/04/17 |     611151 | graphics/mahjong/mahjong-code.pdf
-2021/04/17 |      60550 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
 2021/04/17 |     598701 | macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf
-2021/04/17 |      59830 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
 2021/04/17 |     598262 | macros/latex/contrib/acmart/samples/sample-manuscript.pdf
 2021/04/17 |     596222 | macros/latex/contrib/acmart/samples/sample-acmsmall.pdf
-2021/04/17 |     594869 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/04/17 |      59144 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
 2021/04/17 |       5908 | graphics/mahjong/tiles/mahjong-9s.pdf
 2021/04/17 |     586356 | macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
-2021/04/17 |     583628 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
 2021/04/17 |       5812 | graphics/mahjong/tiles/mahjong-9p.pdf
 2021/04/17 |         57 | graphics/mahjong/mahjong-code.tex
-2021/04/17 |      57598 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/04/17 |     574552 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/04/17 |     574530 | systems/win32/miktex/tm/packages/files.csv.lzma
-2021/04/17 |      57066 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/04/17 |      56909 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/04/17 |     567627 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/04/17 |      56716 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/04/17 |      56457 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/04/17 |      56222 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/04/17 |      55821 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/04/17 |      55563 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/04/17 |      55221 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
 2021/04/17 |         54 | graphics/mahjong/mahjong.tex
 2021/04/17 |     543920 | macros/latex/contrib/acmart/samples/sample-acmtog.pdf
 2021/04/17 |       5363 | graphics/mahjong/tiles/mahjong-7p.pdf
-2021/04/17 |     532038 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
 2021/04/17 |       5312 | graphics/mahjong/tiles/mahjong-6s.pdf
-2021/04/17 |      52475 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/04/17 |      52454 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/04/17 |     523297 | fonts/utilities/ps2pk/configure.texk
 2021/04/17 |       5209 | graphics/mahjong/tiles/mahjong-8p.pdf
-2021/04/17 |      51979 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/04/17 |      51797 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/04/17 |      51433 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/04/17 |     511633 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/04/17 |      51159 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/04/17 |     518379 | indexing/makeindexk/configure.texk
+2021/04/17 |     516913 | dviware/dvidvi/configure.texk
 2021/04/17 |       5114 | graphics/mahjong/tiles/mahjong-7s.pdf
 2021/04/17 |     511487 | graphics/mahjong/mahjong.pdf
-2021/04/17 |      50847 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/04/17 |      49972 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
 2021/04/17 |       4974 | graphics/mahjong/tiles/mahjong-0s.pdf
 2021/04/17 |       4968 | graphics/mahjong/tiles/mahjong-8s.pdf
+2021/04/17 |   49444956 | systems/win32/w32tex/xetex-w32.tar.xz
 2021/04/17 |       4925 | graphics/mahjong/tiles/mahjong-5s.pdf
-2021/04/17 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2021/04/17 |     484055 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
 2021/04/17 |     479588 | systems/texlive/tlnet/archive/latexmk.doc.r58886.tar.xz
-2021/04/17 |      47878 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
 2021/04/17 |       4778 | graphics/mahjong/tiles/mahjong-6p.pdf
-2021/04/17 |     475934 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/04/17 |       4704 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
-2021/04/17 |      47008 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/04/17 |    4663068 | systems/win32/w32tex/dvipdfm-w32.tar.xz
 2021/04/17 |       4657 | graphics/mahjong/tiles/mahjong-0m.pdf
-2021/04/17 |     461400 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/04/17 |      45937 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
 2021/04/17 |       4584 | graphics/mahjong/tiles/mahjong-5m.pdf
-2021/04/17 |      45648 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/04/17 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/04/17 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2021/04/17 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/04/17 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
-2021/04/17 |      45277 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2021/04/17 |     449460 | macros/latex/contrib/easybook/doc/easybook.pdf
+2021/04/17 |   45550296 | systems/win32/w32tex/web2c-w32.tar.xz
 2021/04/17 |       4465 | graphics/mahjong/tiles/mahjong-1p.pdf
 2021/04/17 |       4432 | graphics/mahjong/tiles/mahjong-0p.pdf
+2021/04/17 |     441656 | systems/win32/w32tex/win64/cweb-w64.tar.xz
 2021/04/17 |       4373 | graphics/mahjong/tiles/mahjong-6m.pdf
-2021/04/17 |      43678 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
 2021/04/17 |       4363 | graphics/mahjong/tiles/mahjong-5p.pdf
-2021/04/17 |      43391 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
 2021/04/17 |       4327 | graphics/mahjong/tiles/mahjong-4m.pdf
-2021/04/17 |      43058 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
 2021/04/17 |       4298 | graphics/mahjong/tiles/mahjong-4s.pdf
-2021/04/17 |      42926 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/04/17 |      42626 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/04/17 |      42574 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/04/17 |       4250 | macros/latex/contrib/easybook/doc/chapter1.tex
 2021/04/17 |       4248 | graphics/mahjong/tiles/mahjong-9m.pdf
-2021/04/17 |      42388 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
 2021/04/17 |       4206 | graphics/mahjong/tiles/mahjong-6z.pdf
 2021/04/17 |       4168 | graphics/mahjong/tiles/mahjong-3m.pdf
 2021/04/17 |     413166 | macros/latex/contrib/acmart/acmguide.pdf
-2021/04/17 |     412286 | macros/latex/contrib/fontsize.zip
-2021/04/17 |      41104 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
 2021/04/17 |       4096 | graphics/mahjong/tiles/mahjong-7m.pdf
 2021/04/17 |       4050 | graphics/mahjong/tiles/mahjong-2m.pdf
 2021/04/17 |       4047 | graphics/mahjong/tiles/mahjong-8m.pdf
-2021/04/17 |     404506 | macros/latex/contrib/fontsize/fontsize.pdf
 2021/04/17 |       3997 | graphics/mahjong/tiles/mahjong-1m.pdf
 2021/04/17 |       3996 | graphics/mahjong/tiles/mahjong-3s.pdf
-2021/04/17 |      39691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/04/17 |      39564 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/04/17 |     392597 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
 2021/04/17 |       3897 | graphics/mahjong/tiles/mahjong-4p.pdf
 2021/04/17 |       3860 | graphics/mahjong/tiles/mahjong-2p.pdf
-2021/04/17 |      38069 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/04/17 |      38065 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/04/17 |      37293 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
 2021/04/17 |       3725 | graphics/mahjong/tiles/mahjong-3p.pdf
-2021/04/17 |      37241 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/04/17 |      36680 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2021/04/17 |      35462 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2021/04/17 |      35063 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/04/17 |     362777 | macros/latex/contrib/huawei/huawei.pdf
+2021/04/17 |      36019 | graphics/mcf2graph/mcf_data_base.mcf
 2021/04/17 |       3499 | graphics/mahjong/tiles/mahjong-2z.pdf
 2021/04/17 |       3463 | graphics/mahjong/tiles/mahjong-1z.pdf
-2021/04/17 |      34634 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/04/17 |     345366 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
 2021/04/17 |       3391 | graphics/mahjong/tiles/mahjong-2s.pdf
 2021/04/17 |      33642 | macros/latex/contrib/fancypar/fancypar.dtx
-2021/04/17 |      33441 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/04/17 |      33153 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/04/17 |     330233 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/04/17 |      32744 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/04/17 |      32546 | macros/latex/contrib/siunitx/CHANGELOG.md
 2021/04/17 |       3242 | graphics/mahjong/mahjong.ins
-2021/04/17 |     321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
 2021/04/17 |       3170 | graphics/mahjong/tiles/mahjong-3z.pdf
-2021/04/17 |      31593 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/04/17 |      31543 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/04/17 |      31346 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
 2021/04/17 |       3129 | graphics/mahjong/tiles/mahjong-4z.pdf
-2021/04/17 |      31192 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/04/17 |     311191 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/04/17 |      30886 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/04/17 |      30038 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
 2021/04/17 |       2994 | graphics/mahjong/tiles/mahjong-7z.pdf
-2021/04/17 |      29869 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/04/17 |     295555 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2021/04/17 |      29053 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/04/17 |     283977 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/04/17 |     282107 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/04/17 |      28120 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/04/17 |      28010 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
 2021/04/17 |       2777 | graphics/mahjong/Makefile
-2021/04/17 |      27363 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/04/17 |       2728 | macros/latex/contrib/easybook/doc/easybook-demo.tex
-2021/04/17 |      27275 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/04/17 |      27196 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/04/17 |      27182 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
 2021/04/17 |       2701 | graphics/mahjong/tiles/mahjong-Blank.pdf
 2021/04/17 |      26652 | systems/texlive/tlnet/archive/tikzlings.r58885.tar.xz
-2021/04/17 |     262460 | macros/latex/contrib/easybook/doc/easybook-demo.pdf
-2021/04/17 |     261962 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/04/17 |    2616931 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/04/17 |     258664 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/04/17 |    2611264 | systems/win32/w32tex/tex4htk-w32.tar.xz
 2021/04/17 |       2542 | graphics/mahjong/README.md
-2021/04/17 |      25341 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/04/17 |      25154 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/04/17 |     250212 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/04/17 |      25002 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/04/17 |    2499403 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/04/17 |   24962482 | systems/texlive/tlnet/install-tl.zip
 2021/04/17 |     247596 | macros/latex/contrib/acmart/acmart.dtx
-2021/04/17 |     243479 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
 2021/04/17 |       2405 | graphics/mahjong/tiles/mahjong-Back.pdf
-2021/04/17 |     239477 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/04/17 |      23883 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/04/17 |      23290 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/04/17 |    2297860 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
 2021/04/17 |       2281 | graphics/mahjong/tiles/mahjong-Space.pdf
 2021/04/17 |       2281 | graphics/mahjong/tiles/mahjong-5z.pdf
-2021/04/17 |      22040 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2021/04/17 |     214104 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/04/17 |      21129 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/04/17 |     211053 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/04/17 |     208916 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/04/17 |     208875 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/04/17 |     208182 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/04/17 |     202557 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/04/17 |   20128617 | systems/texlive/tlnet/install-tl-windows.exe
-2021/04/17 |      20121 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/04/17 |    2009491 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/04/17 |     199701 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/04/17 |     198131 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/04/17 |     195666 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/04/17 |     195566 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/04/17 |     193716 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2021/04/17 |      18098 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/04/17 |     180048 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/04/17 |      17958 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/04/17 |     179380 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/04/17 |       2215 | macros/latex/contrib/siunitx/README.md
 2021/04/17 |      17792 | graphics/mahjong/mahjong.dtx
-2021/04/17 |    1725549 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/04/17 |   17181580 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
 2021/04/17 |      16962 | graphics/mahjong/tiles/mahjong-1s.pdf
-2021/04/17 |     167906 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2021/04/17 |     163655 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/04/17 |      16327 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2021/04/17 |      16110 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/04/17 |     159968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/04/17 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/04/17 |     153891 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/04/17 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/04/17 |     152761 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/04/17 |       1511 | macros/latex/contrib/fontsize/README
-2021/04/17 |     147151 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/04/17 |     147138 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/04/17 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/04/17 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/04/17 |      14354 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
-2021/04/17 |    1425981 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/04/17 |    1424810 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/04/17 |     136426 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/04/17 |    1690996 | systems/win32/w32tex/win64/ptex-ng-w64.tar.xz
+2021/04/17 |      15831 | macros/latex/contrib/huawei/huawei.cls
+2021/04/17 |      15800 | graphics/mcf2graph/mcf_mplib_exa.tex
 2021/04/17 |     136156 | systems/texlive/tlnet/archive/tex4ht.doc.r58887.tar.xz
-2021/04/17 |     135005 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/04/17 |      13470 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/04/17 |     131490 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/04/17 |    1307722 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/04/17 |    1295414 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/04/17 |    1281103 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
 2021/04/17 |       1272 | macros/latex/contrib/fancypar/fancypar.ins
 2021/04/17 |     127086 | macros/latex/contrib/fancypar.zip
-2021/04/17 |    1267725 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/04/17 |    1267203 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/04/17 |     124972 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
 2021/04/17 |    1248635 | install/graphics/mahjong.tds.zip
 2021/04/17 |       1244 | graphics/mahjong/tiles/mahjong-Front.pdf
 2021/04/17 |    1240956 | graphics/mahjong.zip
 2021/04/17 |     118779 | macros/latex/contrib/fancypar/fancypar.pdf
-2021/04/17 |    1183475 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/04/17 |    1183238 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2021/04/17 |    1171730 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/04/17 |     116931 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/04/17 |     115467 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/04/17 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
-2021/04/17 |     112253 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/04/17 |     109274 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/04/17 |       1112 | macros/latex/contrib/huawei/README.md
+2021/04/17 |   11129920 | systems/win32/w32tex/win64/xetex-w64.tar.xz
 2021/04/17 |      10861 | macros/latex/contrib/acmart/README
-2021/04/17 |    1078878 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
 2021/04/17 |       1071 | graphics/mahjong/LICENSE
 2021/04/17 |   10507919 | fonts/inter.zip
-2021/04/17 |     104625 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/04/17 |     103324 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
 2021/04/17 |    1030676 | macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf
 2021/04/17 |    1028132 | macros/latex/contrib/acmart/samples/sample-sigplan.pdf
 2021/04/17 |    1022847 | macros/latex/contrib/acmart/samples/sample-authordraft.pdf
 2021/04/17 |    1019039 | macros/latex/contrib/acmart/samples/sample-sigconf.pdf
-2021/04/17 |     101763 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/04/17 |     101484 | macros/latex/contrib/easybook/easybook.dtx
 2021/04/16 |       9561 | graphics/pgf/contrib/tikzlings/tikzlings-squirrels.sty
 2021/04/16 |       9063 | graphics/pgf/contrib/tikzlings/tikzlings-penguins.sty
 2021/04/16 |       8975 | graphics/pgf/contrib/tikzlings/tikzlings-moles.sty
 2021/04/16 |       8876 | graphics/pgf/contrib/tikzlings/tikzlings-rhinos.sty
 2021/04/16 |       8222 | graphics/pgf/contrib/tikzlings/tikzlings-snowmen.sty
-2021/04/16 |     817292 | systems/win32/w32tex/ChangeLog
 2021/04/16 |       8112 | graphics/pgf/contrib/tikzlings/tikzlings-hippos.sty
 2021/04/16 |       7995 | graphics/pgf/contrib/tikzlings/tikzlings-elephants.sty
 2021/04/16 |       7859 | graphics/pgf/contrib/tikzlings/tikzlings-bees.sty
@@ -310,8 +393,6 @@
 2021/04/16 |      40843 | graphics/pgf/contrib/tikzlings/tikzlings-addons.sty
 2021/04/16 |        388 | systems/texlive/tlnet/archive/texlive-docindex.r58881.tar.xz
 2021/04/16 |       3383 | graphics/pgf/contrib/tikzlings/tikzlings.sty
-2021/04/16 |    2607616 | systems/win32/w32tex/tex4htk-w32.tar.xz
-2021/04/16 |     211612 | systems/texlive/tlnet/archive/texlive-scripts.doc.r58881.tar.xz
 2021/04/16 |       1870 | fonts/inter/README
 2021/04/16 |     174440 | systems/texlive/tlnet/archive/texlive-docindex.doc.r58881.tar.xz
 2021/04/16 |      16884 | graphics/pgf/contrib/tikzlings/tikzlings-sloths.sty
@@ -324,7 +405,6 @@
 2021/04/16 |      11652 | graphics/pgf/contrib/tikzlings/tikzlings-marmots.sty
 2021/04/16 |      11178 | graphics/pgf/contrib/tikzlings/tikzlings-anteaters.sty
 2021/04/16 |      10882 | graphics/pgf/contrib/tikzlings/tikzlings-mice.sty
-2021/04/16 |     107184 | systems/texlive/tlnet/archive/texlive-scripts.r58881.tar.xz
 2021/04/16 |      10715 | graphics/pgf/contrib/tikzlings/tikzlings-pigs.sty
 2021/04/16 |      10125 | graphics/pgf/contrib/tikzlings/tikzlings-koalas.sty
 2021/04/15 |        940 | systems/texlive/tlnet/archive/collection-plaingeneric.r58874.tar.xz
@@ -332,7 +412,6 @@
 2021/04/15 |     831884 | systems/texlive/tlnet/archive/metapost.aarch64-linux.r58876.tar.xz
 2021/04/15 |    7261580 | systems/texlive/tlnet/archive/uptex.x86_64-linux.r58872.tar.xz
 2021/04/15 |    7069860 | systems/texlive/tlnet/archive/uptex.aarch64-linux.r58876.tar.xz
-2021/04/15 |       6740 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2021/04/15 |       6328 | systems/texlive/tlnet/archive/collection-latexextra.r58877.tar.xz
 2021/04/15 |       5240 | systems/texlive/tlnet/archive/xintsession.r58875.tar.xz
 2021/04/15 |       4872 | systems/texlive/tlnet/archive/beamerswitch.r58873.tar.xz
@@ -340,7 +419,6 @@
 2021/04/15 |     417588 | support/latexmk/latexmk.pl
 2021/04/15 |      35850 | support/latexmk/CHANGES
 2021/04/15 |    3501672 | systems/texlive/tlnet/archive/luajittex.aarch64-linux.r58876.tar.xz
-2021/04/15 |     332180 | systems/texlive/tlnet/archive/dvipdfmx.win32.r58879.tar.xz
 2021/04/15 |    2675100 | systems/texlive/tlnet/archive/luajittex.x86_64-linux.r58872.tar.xz
 2021/04/15 |     257736 | systems/texlive/tlnet/archive/beamerswitch.doc.r58873.tar.xz
 2021/04/15 |     229428 | systems/texlive/tlnet/archive/foliono.doc.r58877.tar.xz
@@ -362,24 +440,18 @@
 2021/04/14 |   99972293 | systems/win32/w32tex/TLW64/tl-win64.zip
 2021/04/14 |    9412300 | systems/texlive/tlnet/archive/xetex.win32.r58870.tar.xz
 2021/04/14 |     908843 | systems/win32/miktex/tm/packages/polyglossia.tar.lzma
-2021/04/14 |     809144 | systems/win32/w32tex/win64/dvipdfm-w64.tar.xz
 2021/04/14 |     780768 | systems/texlive/tlnet/archive/metapost.amd64-netbsd.r58866.tar.xz
 2021/04/14 |     780342 | systems/win32/miktex/tm/packages/apa7.tar.lzma
 2021/04/14 |     777127 | systems/win32/miktex/tm/packages/siunitx.tar.lzma
 2021/04/14 |      75592 | systems/win32/miktex/tm/packages/polexpr.tar.lzma
 2021/04/14 |     751617 | systems/win32/miktex/tm/packages/easybook.tar.lzma
-2021/04/14 |     712880 | systems/texlive/tlnet/archive/easybook.doc.r58868.tar.xz
 2021/04/14 |     702696 | systems/texlive/tlnet/archive/metapost.i386-netbsd.r58866.tar.xz
 2021/04/14 |    6928976 | systems/texlive/tlnet/archive/uptex.amd64-netbsd.r58866.tar.xz
-2021/04/14 |    6760728 | systems/win32/w32tex/ptex-ng-w32.tar.xz
 2021/04/14 |    6715580 | systems/texlive/tlnet/archive/uptex.i386-netbsd.r58866.tar.xz
 2021/04/14 |      65480 | systems/win32/miktex/tm/packages/de-macro.tar.lzma
 2021/04/14 |       6494 | macros/plain/contrib/xintsession.zip
 2021/04/14 |     641576 | systems/texlive/tlnet/archive/polyglossia.doc.r58869.tar.xz
 2021/04/14 |         58 | systems/mac/mactex/MacTeXtras-20210414.zip.md5
-2021/04/14 |      53764 | systems/texlive/tlnet/archive/acmart.source.r58867.tar.xz
-2021/04/14 |   49453524 | systems/win32/w32tex/xetex-w32.tar.xz
-2021/04/14 |    4663672 | systems/win32/w32tex/dvipdfm-w32.tar.xz
 2021/04/14 |     465617 | systems/win32/miktex/tm/packages/expkv.tar.lzma
 2021/04/14 |    4556343 | systems/win32/miktex/tm/packages/nimbus15.tar.lzma
 2021/04/14 |       4277 | macros/latex/contrib/beamer-contrib/beamerswitch/README.md
@@ -387,13 +459,11 @@
 2021/04/14 |     404608 | systems/win32/miktex/tm/packages/expkv-def.tar.lzma
 2021/04/14 |    3993699 | systems/win32/miktex/tm/packages/profcollege.tar.lzma
 2021/04/14 |    3908192 | systems/texlive/tlnet/archive/luajittex.amd64-netbsd.r58866.tar.xz
-2021/04/14 |      38420 | systems/texlive/tlnet/archive/acmart.r58867.tar.xz
 2021/04/14 |      38119 | systems/mac/mactex/ExtrasFolder.pdf
 2021/04/14 |    3708779 | systems/win32/miktex/tm/packages/lwarp.tar.lzma
 2021/04/14 |      36629 | macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch-example.pdf
 2021/04/14 |    3656246 | systems/win32/miktex/tm/packages/acmart.tar.lzma
 2021/04/14 |     362579 | systems/win32/miktex/tm/packages/expkv-cs.tar.lzma
-2021/04/14 |    3554820 | systems/texlive/tlnet/archive/acmart.doc.r58867.tar.xz
 2021/04/14 |    3439536 | systems/texlive/tlnet/archive/luajittex.i386-netbsd.r58866.tar.xz
 2021/04/14 |     315886 | macros/latex/contrib/beamer-contrib/beamerswitch.zip
 2021/04/14 |     315125 | systems/win32/miktex/tm/packages/xetexko.tar.lzma
@@ -402,7 +472,6 @@
 2021/04/14 |       2627 | macros/latex/contrib/beamer-contrib/beamerswitch/Makefile
 2021/04/14 |   25718673 | systems/win32/miktex/tm/packages/haranoaji-extra.tar.lzma
 2021/04/14 |     255260 | systems/win32/miktex/tm/packages/babel-serbian.tar.lzma
-2021/04/14 |      24812 | systems/texlive/tlnet/archive/easybook.source.r58868.tar.xz
 2021/04/14 |      22998 | macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch-example-trans.pdf
 2021/04/14 |      22397 | macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch-example-handout.pdf
 2021/04/14 |    2110640 | systems/texlive/tlnet/archive/luahbtex.amd64-netbsd.r58866.tar.xz
@@ -413,7 +482,6 @@
 2021/04/14 |    1757696 | systems/win32/miktex/tm/packages/nicematrix.tar.lzma
 2021/04/14 |      17477 | systems/win32/miktex/tm/packages/ninecolors.tar.lzma
 2021/04/14 |       1711 | systems/mac/mactex/Licenses.txt
-2021/04/14 |    1690280 | systems/win32/w32tex/win64/ptex-ng-w64.tar.xz
 2021/04/14 |    1678122 | systems/win32/miktex/tm/packages/babel.tar.lzma
 2021/04/14 |      15883 | CTAN.sites
 2021/04/14 |    1585152 | systems/texlive/tlnet/archive/luatex.amd64-netbsd.r58866.tar.xz
@@ -425,9 +493,7 @@
 2021/04/14 |  122698836 | macros/context/latest/cont-tmf.zip
 2021/04/14 |    1193779 | systems/win32/miktex/tm/packages/aomart.tar.lzma
 2021/04/14 |     119000 | systems/texlive/tlnet/archive/dvips.i386-netbsd.r58866.tar.xz
-2021/04/14 |      11652 | systems/texlive/tlnet/archive/easybook.r58868.tar.xz
 2021/04/14 |     115840 | systems/texlive/tlnet/archive/polyglossia.r58869.tar.xz
-2021/04/14 |   11123464 | systems/win32/w32tex/win64/xetex-w64.tar.xz
 2021/04/14 |    1105092 | systems/texlive/tlnet/archive/ptex.i386-netbsd.r58866.tar.xz
 2021/04/14 |    1097017 | systems/win32/miktex/tm/packages/mathtools.tar.lzma
 2021/04/14 |     105830 | macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch.dtx
@@ -598,85 +664,3 @@
 2021/04/12 |    1130649 | install/macros/latex/contrib/mathtools.tds.zip
 2021/04/12 |    1108170 | install/macros/unicodetex/latex/polyglossia.tds.zip
 2021/04/12 |    1106307 | macros/latex/contrib/mathtools.zip
-2021/04/11 |         99 | macros/latex/contrib/easybook/doc/appendix.tex
-2021/04/11 |       9692 | systems/texlive/tlnet/archive/babel-serbianc.source.r58816.tar.xz
-2021/04/11 |    9421272 | systems/texlive/tlnet/update-tlmgr-r58811.sh
-2021/04/11 |    8611996 | systems/win32/w32tex/uptex-w32.tar.xz
-2021/04/11 |      83344 | systems/texlive/tlnet/archive/profcollege.r58818.tar.xz
-2021/04/11 |      77899 | macros/latex/contrib/aomart/aomart.dtx
-2021/04/11 |     760436 | systems/win32/w32tex/win64/dvipsk-w64.tar.xz
-2021/04/11 |      74256 | systems/texlive/tlnet/archive/langsci.r58820.tar.xz
-2021/04/11 |    6582116 | fonts/haranoaji/HaranoAjiMincho-Bold.otf
-2021/04/11 |    6479916 | fonts/haranoaji-extra/HaranoAjiMincho-Heavy.otf
-2021/04/11 |    6430788 | fonts/haranoaji-extra/HaranoAjiMincho-SemiBold.otf
-2021/04/11 |    6394968 | fonts/haranoaji-extra/HaranoAjiMincho-Medium.otf
-2021/04/11 |    6322076 | fonts/haranoaji/HaranoAjiMincho-Regular.otf
-2021/04/11 |    6240708 | fonts/haranoaji/HaranoAjiMincho-Light.otf
-2021/04/11 |      61549 | macros/latex/contrib/aomart/aomsample1.tex
-2021/04/11 |      61437 | macros/latex/contrib/aomart/aomsample.tex
-2021/04/11 |    5834604 | fonts/haranoaji-extra/HaranoAjiMincho-ExtraLight.otf
-2021/04/11 |       5259 | macros/latex/contrib/ninecolors/ninecolors.sty
-2021/04/11 |       5044 | systems/texlive/tlnet/archive/expkv-def.r58814.tar.xz
-2021/04/11 |    4992784 | fonts/haranoaji/HaranoAjiGothic-Heavy.otf
-2021/04/11 |       4945 | systems/texlive/tlnet/install-tl-windows.bat
-2021/04/11 |    4796608 | fonts/haranoaji/HaranoAjiGothic-Bold.otf
-2021/04/11 |     479194 | macros/latex/contrib/aomart/aomsample1.pdf
-2021/04/11 |     479193 | macros/latex/contrib/aomart/aomsample.pdf
-2021/04/11 |    4688716 | fonts/haranoaji/HaranoAjiGothic-Medium.otf
-2021/04/11 |    4671364 | fonts/haranoaji/HaranoAjiGothic-Regular.otf
-2021/04/11 |    4667292 | fonts/haranoaji-extra/HaranoAjiGothic-Normal.otf
-2021/04/11 |    4654456 | fonts/haranoaji-extra/HaranoAjiGothic-Light.otf
-2021/04/11 |        455 | systems/texlive/tlnet/update-tlmgr-r58811.sh.sha512.asc
-2021/04/11 |        455 | systems/texlive/tlnet/update-tlmgr-r58811.exe.sha512.asc
-2021/04/11 |   45563184 | systems/win32/w32tex/web2c-w32.tar.xz
-2021/04/11 |    4551416 | systems/win32/w32tex/dvipsk-w32.tar.xz
-2021/04/11 |    4375156 | fonts/haranoaji-extra/HaranoAjiGothic-ExtraLight.otf
-2021/04/11 |       4301 | fonts/haranoaji-extra/LICENSE
-2021/04/11 |       4228 | systems/texlive/tlnet/archive/babel-serbianc.r58816.tar.xz
-2021/04/11 |     414567 | macros/latex/contrib/aomart/aomart.pdf
-2021/04/11 |    4032080 | systems/texlive/tlnet/update-tlmgr-r58811.exe
-2021/04/11 |    3890800 | systems/texlive/tlnet/archive/profcollege.doc.r58818.tar.xz
-2021/04/11 |    3852648 | systems/win32/w32tex/luajittex-w32.tar.xz
-2021/04/11 |       3850 | macros/latex/contrib/easybook/doc/chapter2.tex
-2021/04/11 |    3848920 | systems/win32/w32tex/luajittex-dev-w32.tar.xz
-2021/04/11 |     382556 | systems/texlive/tlnet/archive/expkv-def.doc.r58814.tar.xz
-2021/04/11 |    3820516 | systems/win32/w32tex/luajittex-exp-w32.tar.xz
-2021/04/11 |    3756176 | systems/win32/w32tex/win64/web2c-w64.tar.xz
-2021/04/11 |    3461440 | systems/win32/w32tex/win64/luajittex-dev-w64.tar.xz
-2021/04/11 |    3455340 | systems/win32/w32tex/win64/luajittex-exp-w64.tar.xz
-2021/04/11 |    3451328 | systems/win32/w32tex/win64/luajittex-w64.tar.xz
-2021/04/11 |   32853036 | fonts/haranoaji-extra.zip
-2021/04/11 |   32608173 | fonts/haranoaji.zip
-2021/04/11 |       3209 | fonts/haranoaji/README
-2021/04/11 |       3209 | fonts/haranoaji-extra/README
-2021/04/11 |    3126016 | systems/win32/w32tex/win64/luatex-exp-w64.tar.xz
-2021/04/11 |    3123632 | systems/win32/w32tex/win64/luatex-w64.tar.xz
-2021/04/11 |    3116360 | systems/win32/w32tex/win64/luatex-dev-w64.tar.xz
-2021/04/11 |     282156 | systems/texlive/tlnet/archive/babel-serbianc.doc.r58816.tar.xz
-2021/04/11 |    2759064 | systems/texlive/tlnet/archive/texlive.infra.win32.r58810.tar.xz
-2021/04/11 |       2536 | macros/latex/contrib/easybook/doc/chapter3.tex
-2021/04/11 |       2515 | macros/latex/contrib/aomart/README
-2021/04/11 |       2508 | macros/latex/contrib/ninecolors/ninecolors.tex
-2021/04/11 |     228120 | systems/texlive/tlnet/archive/texlive.infra.r58811.tar.xz
-2021/04/11 |       2216 | systems/texlive/tlnet/archive/suppose.r58819.tar.xz
-2021/04/11 |     205352 | systems/texlive/tlnet/archive/texlive.infra.doc.r58811.tar.xz
-2021/04/11 |     204681 | macros/latex/contrib/aomart/aomfrench.pdf
-2021/04/11 |     202348 | systems/texlive/tlnet/archive/langsci.doc.r58820.tar.xz
-2021/04/11 |     196768 | systems/texlive/tlnet/archive/suppose.doc.r58819.tar.xz
-2021/04/11 |        195 | macros/latex/contrib/ninecolors/README
-2021/04/11 |   18896220 | systems/win32/w32tex/luatex-exp-w32.tar.xz
-2021/04/11 |   18886052 | systems/win32/w32tex/luatex-w32.tar.xz
-2021/04/11 |   18885936 | systems/win32/w32tex/luatex-dev-w32.tar.xz
-2021/04/11 |    1873540 | systems/win32/w32tex/win64/ptex-w64.tar.xz
-2021/04/11 |    1806236 | systems/win32/w32tex/win64/uptex-w64.tar.xz
-2021/04/11 |    1763334 | systems/doc/luatex/luatex.pdf
-2021/04/11 |      17204 | macros/latex/contrib/ninecolors.zip
-2021/04/11 |      16680 | systems/texlive/tlnet/archive/expkv-def.source.r58814.tar.xz
-2021/04/11 |    1612944 | systems/win32/w32tex/makeindex-w32.tar.xz
-2021/04/11 |        154 | systems/texlive/tlnet/update-tlmgr-r58811.exe.sha512
-2021/04/11 |        153 | systems/texlive/tlnet/update-tlmgr-r58811.sh.sha512
-2021/04/11 |       1489 | macros/latex/contrib/aomart/fullref.pl
-2021/04/11 |      14750 | macros/latex/contrib/ninecolors/ninecolors.pdf
-2021/04/11 |    1083276 | systems/win32/w32tex/win64/makeindex-w64.tar.xz
-2021/04/11 |   10682584 | systems/win32/w32tex/ptex-w32.tar.xz
-2021/04/11 |     105270 | systems/texlive/tlnet/install-tl
diff --git a/fonts/erewhon-math/Erewhon-Math.ltx b/fonts/erewhon-math/Erewhon-Math.ltx
index 65baf6f26b..b7af84f9b7 100644
--- a/fonts/erewhon-math/Erewhon-Math.ltx
+++ b/fonts/erewhon-math/Erewhon-Math.ltx
@@ -1,3 +1,5 @@
+\RequirePackage{pdfmanagement-testphase}
+\DeclareDocumentMetadata{pdfstandard=A-2b, lang=en-GB}
 \documentclass[a4paper,12pt]{scrartcl}
 
 \usepackage{amsmath, array, varioref}
@@ -7,6 +9,13 @@
 \setmonofont{Inconsolatazi4}[Scale=MatchLowercase,
                              HyphenChar=None,StylisticSet={2,3}]
 \usepackage{microtype}
+\usepackage{hyperref}
+\hypersetup{pdftitle={Erewhon-Math User’s Guide},
+            pdfauthor={Daniel FLIPO},
+            bookmarksopen,
+            colorlinks
+            }
+\newcommand*{\hlabel}[1]{\phantomsection\label{#1}}
 
 \newcommand*{\FGUT}{Fourier-GUT\textit{enberg}}
 \newcommand*{\FOTF}{Erewhon-Math}
@@ -23,7 +32,7 @@
 \title{\decofourleft\,\FOTF\,\decofourright}
 \author{Daniel Flipo \\ \texttt{daniel.flipo@free.fr}}
 
-\newcommand*{\version}{0.45}
+\newcommand*{\version}{0.46}
 
 \begin{document}
 \maketitle
@@ -124,7 +133,7 @@ table~\vref{math-style}.
 \begin{table}[ht]
   \centering
   \caption{Effects of the \opt{math-style} package option.}
-  \label{math-style}
+  \hlabel{math-style}
   \begin{tabular}{@{}>{\ttfamily}lcc@{}}
     \hline
       \rmfamily Package option & Latin & Greek \\
@@ -144,7 +153,7 @@ changed by option \opt{bold-style} as shown in table~\vref{bold-style}.
 \begin{table}[ht]
   \centering
   \caption{Effects of the \opt{bold-style} package option.}
-  \label{bold-style}
+  \hlabel{bold-style}
   \begin{tabular}{@{}>{\ttfamily}lcc@{}}
     \hline
       \rmfamily Package option & Latin & Greek \\
@@ -214,7 +223,7 @@ mandatory whenever more than one ``Character Variant’’ is selected.
 \begin{table}[ht]
   \centering
   \caption{Character variants.}
-  \label{cv}
+  \hlabel{cv}
   \begin{tabular}{@{}>{\ttfamily}lccl@{}}
     \hline
            & Default       & Variant          & Name\\
@@ -256,7 +265,7 @@ variants as shown by table~\vref{ss04}.
 \begin{table}[ht]
   \centering
   \caption{Stylistic Set 4 -- \texttt{leqslant} (slanted inequalities)}
-  \label{ss04}
+  \hlabel{ss04}
   \begin{tabular}{@{}lcc@{}}
     \hline
       Command           & Default         & Variant \\
@@ -282,7 +291,7 @@ their smaller variants as shown by table~\vref{ss05}.
 \begin{table}[ht]
   \centering
   \caption{Stylistic Set 5 -- \texttt{smaller} (smaller variants)}
-  \label{ss05}
+  \hlabel{ss05}
   \begin{tabular}{@{}lcc@{}}
     \hline
       Command                & Default             & Variant \\
@@ -304,7 +313,7 @@ symbols as shown by table~\vref{ss06}.
 \begin{table}[ht]
   \centering
   \caption{Stylistic Set 6 -- \texttt{subsetneq} (inclusion variants)}
-  \label{ss06}
+  \hlabel{ss06}
   \begin{tabular}{@{}lcc@{}}
     \hline
       Command           & Default         & Variant \\
@@ -322,7 +331,7 @@ symbols as shown by table~\vref{ss06}.
 \begin{table}[ht]
   \centering
   \caption{Stylistic Set 7 -- \texttt{parallelslant} (slanted variants)}
-  \label{ss07}
+  \hlabel{ss07}
   \begin{tabular}{@{}lcc@{}}
     \hline
       Command               & Default            & Variant \\
@@ -443,10 +452,10 @@ Various wide acccents are also supported:
 
   but this can overwritten, i.e.
 \begin{verbatim}
-\setmathfont{STIX2Math.otf}[range=frak,Scale=MatchUppercase]
+\setmathfont{STIXTwoMath-Regular.otf}[range=frak,Scale=MatchUppercase]
 $\symfrak{ABCDEFGHIJKL...XYZ abcdefghijkl...xyz}$
 \end{verbatim}
-\setmathfont{STIX2Math.otf}[range=frak,Scale=MatchUppercase]
+\setmathfont{STIXTwoMath-Regular.otf}[range=frak,Scale=MatchUppercase]
 $\symfrak{ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz}$
 
 \item Sans serif alphabet is borrowed from Latin Modern,
@@ -455,11 +464,11 @@ $\symsfup{ABCDEFGHIJKLM abcdefghijk}\quad\symsfit{NOPQRSTUVWXYZ mnopqrstuvwxyz}$
 
   but it can be borrowed from another Math font, i.e.
 \begin{verbatim}
-\setmathfont{STIX2Math.otf}[range={sfup,sfit},
+\setmathfont{STIXTwoMath-Regular.otf}[range={sfup,sfit},
                             Scale=MatchUppercase]
 $\symsfup{ABCD...klm}\quad\symsfit{NOPQ...xyz}$
 \end{verbatim}
-\setmathfont{STIX2Math.otf}[range={sfup,sfit},Scale=MatchUppercase]
+\setmathfont{STIXTwoMath-Regular.otf}[range={sfup,sfit},Scale=MatchUppercase]
 $\symsfup{ABCDEFGHIJKLM abcdefghijklm}\quad
     \symsfit{NOPQRSTUVWXYZ nopqrstuvwxyz}$
 
@@ -469,29 +478,29 @@ $\symsfup{ABCDEFGHIJKLM abcdefghijklm}\quad
 
 but it can be borrowed from  another Math font, i.e.
 \begin{verbatim}
-\setmathfont{STIX2Math.otf}[range=tt,Scale=MatchUppercase]
+\setmathfont{STIXTwoMath-Regular.otf}[range=tt,Scale=MatchUppercase]
 $\symtt{ABCDE...XYZ abcde...xyz}$
 \end{verbatim}
-\setmathfont{STIX2Math.otf}[range=tt,Scale=MatchUppercase]
+\setmathfont{STIXTwoMath-Regular.otf}[range=tt,Scale=MatchUppercase]
 $\symtt{ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz}$
 \end{itemize}
 
 \subsection{Missing symbols}
 
-\FOTF{} does not aim at being as complete as \file{STIX2Math} or
+\FOTF{} does not aim at being as complete as \file{STIXTwoMath-Regular} or
 \file{Cambria}, the current glyph coverage compares with TeXGyre Math fonts.
-In case some symbols do not show up in the output file, you see warnings
+In case some symbols do not show up in the output file, you will see warnings
 in the \file{.log} file, for instance:
 
-\setmathfont{STIX2Math.otf}[range={"2964}]
+\setmathfont{STIXTwoMath-Regular.otf}[range={"2964}]
 \texttt{Missing character: There is no }$⥤$%
 \texttt{ (U+2964) in font ErewhonMath}
 
-Borrowing them from a more complete font, say \file{STIX2Math},
+Borrowing them from a more complete font, say \file{STIXTwoMath-Regular},
 is a possible workaround:
-\verb+\setmathfont{STIX2Math.otf}[range={"2964},Scale=1.02]+\\
+\verb+\setmathfont{STIXTwoMath-Regular.otf}[range={"2964},Scale=1.02]+\\
 scaling is possible, multiple character ranges are separated with commas:\\
-\verb+\setmathfont{STIX2Math.otf}[range={"294A-"2951,"2964,"2ABB-"2ABE}]+
+\verb+\setmathfont{STIXTwoMath-Regular.otf}[range={"294A-"2951,"2964,"2ABB-"2ABE}]+
 
 \subsection{Fourier ornaments}
 
diff --git a/fonts/erewhon-math/Erewhon-Math.otf b/fonts/erewhon-math/Erewhon-Math.otf
index f1f72586e1..6e9b49c9c8 100644
Binary files a/fonts/erewhon-math/Erewhon-Math.otf and b/fonts/erewhon-math/Erewhon-Math.otf differ
diff --git a/fonts/erewhon-math/Erewhon-Math.pdf b/fonts/erewhon-math/Erewhon-Math.pdf
index c6086fba08..d66846181c 100644
Binary files a/fonts/erewhon-math/Erewhon-Math.pdf and b/fonts/erewhon-math/Erewhon-Math.pdf differ
diff --git a/fonts/erewhon-math/README.md b/fonts/erewhon-math/README.md
index 0008fbd971..d2f86445d6 100644
--- a/fonts/erewhon-math/README.md
+++ b/fonts/erewhon-math/README.md
@@ -64,8 +64,11 @@ Either version 1.3 or, at your option, any later version.
 	 Fixed right kernings of "italic f".
 	 Fixed right bearings and italic corrections of mathscr capitals.
 * v0.45  Added stretchy accents \wideoverbar, \widebreve, \widecheck.
+* v0.46  Extensible \langle, \rangle, \lAngle and \rangle delimiters are now
+         available in eight sizes (three bigger sizes added).
+         Sub- and superscript reshaped: boldness slightly reduced.
 
 ---
-Copyright 2019-2020  Michel Bovani, Daniel Flipo
+Copyright 2019-2021  Michel Bovani, Daniel Flipo
 E-mail: michel (dot) bovani (at) icloud (dot) com
         daniel (dot) flipo (at) free (dot) fr
diff --git a/fonts/erewhon-math/fourier-otf.sty b/fonts/erewhon-math/fourier-otf.sty
index dacc263d21..b6df0ae57a 100644
--- a/fonts/erewhon-math/fourier-otf.sty
+++ b/fonts/erewhon-math/fourier-otf.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}[2018/01/01]
 \def\fileversion{0.45}%
-\def\filedate{2020/10/19}%
+\def\filedate{2021/04/18}%
   \ProvidesPackage{fourier-otf}[\filedate\space\fileversion]
 
 % Ensure luatex or xetex engine
diff --git a/fonts/erewhon-math/unimath-erewhon.ltx b/fonts/erewhon-math/unimath-erewhon.ltx
index 124df888ac..048a79a593 100644
--- a/fonts/erewhon-math/unimath-erewhon.ltx
+++ b/fonts/erewhon-math/unimath-erewhon.ltx
@@ -54,7 +54,7 @@
 
 \defmathfont{lm}{latinmodern-math.otf}{CC6666}{L}
 %\defmathfont{xits}{XITSMath-Regular.otf}{6666CC}{X}
-\defmathfont{stix}{STIX2Math.otf}{66CC66}{S}
+\defmathfont{stix}{STIXTwoMath-Regular.otf}{66CC66}{S}
 \defmathfont{erewhon}{Erewhon-Math.otf}{AA6666}{E}
 \defmathfont{pagella}{texgyrepagella-math.otf}{66CCCC}{P}
 \defmathfont{dejavu}{texgyredejavu-math.otf}{AACC66}{D}
diff --git a/fonts/erewhon-math/unimath-erewhon.pdf b/fonts/erewhon-math/unimath-erewhon.pdf
index cb66c4f842..c75a741466 100644
Binary files a/fonts/erewhon-math/unimath-erewhon.pdf and b/fonts/erewhon-math/unimath-erewhon.pdf differ
diff --git a/graphics/mcf2graph/CHANGELOG b/graphics/mcf2graph/CHANGELOG
index a7aceeeb69..79a088b7db 100644
--- a/graphics/mcf2graph/CHANGELOG
+++ b/graphics/mcf2graph/CHANGELOG
@@ -1,6 +1,21 @@
 *******************************************************************************
- Changelog of mcf2graph software package          by Akira Yamaji 2021-04-04
+ Changelog of mcf2graph software package          by Akira Yamaji 2021-04-18
 *******************************************************************************
+[ver. 4.63  / 2021-04-18]
+  -add option parameter sw_output
+     sw_calc   =1 => sw_output=None
+     sw_aux_out=1 => sw_output=Info1
+     sw_aux_out=2 => sw_output=Info2
+     sw_rep_out=1 => sw_output=Report
+     sw_mol_out=1 => sw_output=MOL2k
+     sw_mol_out=2 => sw_output=MOL3k
+  -delete option parameters
+     sw_calc,sw_aux_out,sw_rep_out,sw_mol_out,
+     sw_file_open
+  -change molecular data base format
+     end MCF : "-" => "+"
+  -update MCF manual,example
+
 [ver. 4.62  / 2021-04-04]
   -add molecular data base file
      'mcf_data_base.mcf'
diff --git a/graphics/mcf2graph/README b/graphics/mcf2graph/README
index 16e950065f..44b86eb694 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.62 2021-04-04
+ version    : 4.63 2021-04-18
  E-mail     : mcf2graph@gmail.com
  Located at : http://www.ctan.org/pkg/mcf2graph
 ********************************************************************************
@@ -24,14 +24,17 @@
                             use pk font for proof print
                             use mps file for final print
                               make file 'mcf_man_soc-***.mps' before typeset
-                                >mpost -s mcf_man_soc.mf
+                                >mpost mcf_man_soc.mf
  ( 7) mcf_man_soc.mf      Molecular difinition file for mcf_manual.tex
  ( 8) mcf_manual.pdf      PDF of (4) (used pdftex(LaTeX),makeindex)
- ( 9) mcf_example.tex     LaTeX example,
+ ( 9) mcf_example.tex     LaTeX example
                             make file 'mcf_exa_soc-info.aux' before typeset
                               >mpost -s ahlength=1 mcf_exa_soc.mf
                             make file 'mcf_exa_soc-***.mps' before typeset
-                              >mpost -s mcf_exa_soc.mf
+                              >mpost mcf_exa_soc.mf
+                           (for metafont)
+                            make file 'mcf_exa_soc-mf.aux' before typeset
+                              >mpost -s ahlength=7 mcf_exa_soc.mf
  (10) mcf_exa_soc.mf      Metafont/Metapost souce file for mcf_example.tex
  (11) mcf_example.pdf     PDF of (8) typeset with pdftex(LaTeX)
  (12) mcf_mplib_exa.tex   luamplib(LuaLaTeX) example
@@ -39,21 +42,21 @@
 
 3. How to use mcf2graph with Metapost
  Minimum requirement to run mcf2graph : mpost.exe,mpost.dll,mpost.mp,plain.mp
- ( 1) >mpost -s bboxmargin=0  FILENAME  => output no graphic file
+ ( 1) >mpost                  FILENAME  => output eps(.mps) file
  ( 2) >mpost -s bboxmargin=1  FILENAME  => output first font only (for test)
- ( 3) >mpost -s ahangle=0     FILENAME  => output eps file (.mps default)
- ( 4) >mpost -s ahangle=1     FILENAME  => output png file (600dpi)
- ( 5) >mpost -s ahangle=13    FILENAME  => output png file (1200dpi)
- ( 6) >mpost -s ahangle=2     FILENAME  => output svg file 
- ( 7) >mpost -s ahangle=3     FILENAME  => output eps file (.eps)
- ( 8) >mpost -s ahlength=1    FILENAME  => output aux file
+ ( 3) >mpost -s ahangle=1     FILENAME  => output png file (600dpi)
+ ( 4) >mpost -s ahangle=11    FILENAME  => output png file (1200dpi)
+ ( 5) >mpost -s ahangle=2     FILENAME  => output svg file 
+ ( 6) >mpost -s ahangle=3     FILENAME  => output eps(.eps) file
+ ( 7) >mpost -s ahlength=1    FILENAME  => output info-aux file
                                              tag1:var1;tag2:var2;
- ( 9) >mpost -s ahlength=2    FILENAME  => output aux file
+ ( 8) >mpost -s ahlength=2    FILENAME  => output aux file
                                              tag1;tag2;
                                              var1;var2;
- (10) >mpost -s ahlength=3    FILENAME  => output report file
- (11) >mpost -s ahlength=5    FILENAME  => output mol file(V2000)
- (12) >mpost -s ahlength=6    FILENAME  => output mol file(V3000)
+ ( 9) >mpost -s ahlength=3    FILENAME  => output report file
+ (10) >mpost -s ahlength=5    FILENAME  => output mol file(V2000)
+ (11) >mpost -s ahlength=6    FILENAME  => output mol file(V3000)
+ (12) >mpost -s ahlength=7    FILENAME  => output mf-aux file
  (13) >mpost -s labeloffset=1 FILENAME  => use plain.mp 'label','drawarrow'
  (14) >mpost -s labeloffset=2 FILENAME  => atomfont="uhvr8r"
 
diff --git a/graphics/mcf2graph/mcf2graph.mf b/graphics/mcf2graph/mcf2graph.mf
index 2388b2f278..0c935ab56a 100644
--- a/graphics/mcf2graph/mcf2graph.mf
+++ b/graphics/mcf2graph/mcf2graph.mf
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 4.62     Copyright (c) 2013-2021   Akira Yamaji
+% mcf2graph ver 4.63     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,
@@ -22,9 +22,8 @@
 % This package is located at : http://www.ctan.org/pkg/mcf2graph
 % Suggestion or request mail to : mcf2graph@gmail.com 
 %--------------------------------------------------------------------------------------------------
-% Set output no image file                   : mpost -s bboxmargin=0   FILENAME
+% Set outputformat to "eps"(.mps)            : mpost                   FILENAME
 % Set output first font only                 : mpost -s bboxmargin=1   FILENAME
-% Set outputformat to "eps"(.mps)            : mpost -s ahangle=0      FILENAME
 % Set outputformat to "png"                  : mpost -s ahangle=1      FILENAME
 % Set outputformat to "svg"                  : mpost -s ahangle=2      FILENAME
 % Set outputformat to "eps" (.eps)           : mpost -s ahangle=3      FILENAME
@@ -33,12 +32,12 @@
 % Set output report                          : mpost -s ahlength=3     FILENAME
 % Set output MOL(V2000)                      : mpost -s ahlength=5     FILENAME
 % Set output MOL(V3000)                      : mpost -s ahlength=6     FILENAME
-% Set output souce file for metafont         : mpost -s ahlength=7     FILENAME
+% Set output aux file for metafont           : mpost -s ahlength=7     FILENAME
 % Set to use plain.mp (label,arrow)          : mpost -s labeloffset=1  FILENAME
 % Set to use plain.mp (label,arrow,atom)     : mpost -s labeloffset=2  FILENAME
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 tracingstats:=1;
-message "* This is mcf2graph ver 4.62  2021.04.04";
+message "* This is mcf2graph ver 4.63  2021.04.18";
 %-------------------------------------------------------------------------------------------------
 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;
@@ -47,23 +46,22 @@ numeric save_num[],comD[][],parD[][],adrD[][],cntD[],tbl_atom[],tbl_group[][],f_
         com_group[][],par_group[][],cnt_group[],colorA[],colorB[],sumA[],bondC[],hideH[],
         lineB[],sB[],eB[],angB[],angA[],lenB[],angX[],numS[],wdM[],htM[],wdA[],dxA[],
         mc_indent[],cmm_adr[];
-string  save_str[],tbl_atom_str[],strD[],tag[],file_name_output,out_file_aux,blank_str,temp_str,
-        out_file_rep,out_file_mpc,aux_delimiter,atomfont,mpfont,s_tag,s_var,cal_FM,cal_MW,cal_MI,
+string  save_str[],tbl_atom_str[],strD[],tag[],file_name_output,blank_str,temps,aux_delimiter,
+        atomfont,mpfont,s_tag,s_var,cal_FM,cal_MW,cal_MI,
         inf_NO,inf_EN,inf_JN,inf_FM,inf_CAS,inf_USE,inf_EXA,inf_EXB,inf_MW;
 pair    save_pair[],posA[],posM[][],msize,mposition,fsize,fmargin,save_mposition,posBs,posBe,dum;
 picture mol_stru[],atom_picture,save_picture,temp_picture;
 path    arrow_path,dottedline_path,line_path,arrow_head;
 %-------------------------------------------------------------------------------------------------
-char_num:=str_cnt:=tbl_cnt:=proc_end:=mangle:=sw_calc:=sw_ext_all:=0;
-sw_numberA:=sw_numberB:=sw_aux_out:=sw_expand:=sw_fframe:=sw_mframe:=sw_aframe:=sw_trimming:=0;
-sw_rep_out:=sw_mol_out:=sw_group_off:=sw_single:=sw_arrow_emu:=sw_file_open:=0;
+char_num:=str_cnt:=tbl_cnt:=proc_end:=mangle:=0;
+sw_numberA:=sw_numberB:=sw_expand:=sw_fframe:=sw_mframe:=sw_aframe:=sw_trimming:=sw_ext_all:=0;
+sw_group_off:=sw_single:=sw_arrow_emu:=sw_output:=0;
 numberA_start:=numberB_start:=1; numberA_end:=numberB_end:=4095;
 %-------------------------------------------------------------------------------------------------
-aux_max:=max_inf_num:=20;
-aux_delimiter:=";";
+aux_max:=max_inf_num:=20; aux_delimiter:=";"; blank_str:= "                             ";
 for i=1 upto aux_max: tag[i]:=""; endfor
-blank_str:= "                             ";
 dum:=(-4091,0);
+None:=11; Info1:=21; Info2:=22; Report:=31; MOL2k:=41; MOL3k:=42; Mfont:=51;
 %-------------------------------------------------------------------------------------------------
 a_prn_s:=ASCII("("); a_prn_e:=ASCII(")"); a_brc_s:=ASCII("{"); a_brc_e:=ASCII("}");
 a_brk_s:=ASCII("["); a_brk_e:=ASCII("]"); a_cmm:=ASCII(","); a_equ:=ASCII("=");
@@ -98,35 +96,25 @@ if (known green)and(known ahlength):
   color color_list[];
   prologues:=3;
   mpfont:="uhvr8r";
-  %-----------------------------------------------------------------------------------------
   atomfont:=defaultfont:="";
-  out_file_aux:=jobname&"-info.aux";
-  out_file_mpc:=jobname&"-mpc.txt";
-  out_file_rep:=jobname&"-report.txt";
-  def file_mol_output= jobname&"-"&fit_zero(char_num)&"-"&inf_EN&".mol" enddef;
   %--default ahangle=45---------------------------------------------------------------------
   if     ahangle=0:  outputformat:="eps";                      % eps format(.mps)
-  elseif ahangle=11: outputformat:="png"; hppp:=vppp:=0.24;    % png format(300dpi)
   elseif ahangle=1:  outputformat:="png"; hppp:=vppp:=0.12;    % png format(600dpi)
-  elseif ahangle=12: outputformat:="png"; hppp:=vppp:=0.10;    % png format(720dpi)
-  elseif ahangle=13: outputformat:="png"; hppp:=vppp:=0.06;    % png format(1200dpi)
-  elseif ahangle=14: outputformat:="png"; hppp:=vppp:=0.04;    % png format(1800dpi)
-  elseif ahangle=15: outputformat:="png"; hppp:=vppp:=0.03;    % png format(2400dpi)
+  elseif ahangle=11: outputformat:="png"; hppp:=vppp:=0.06;    % png format(1200dpi)
   elseif ahangle=2:  outputformat:="svg";                      % svg format
   elseif ahangle=3:  outputformat:="eps";                      % eps format(.eps)
+  elseif ahangle=45: outputformat:="eps";                      % eps format(.eps)
   fi
   %--default ahlength=4---------------------------------------------------------------------
-  if     ahlength=1: sw_aux_out:=1; bboxmargin:=0;      % output aux file
-  elseif ahlength=2: sw_aux_out:=2; bboxmargin:=0;      % output aux file(fixed mode)
-  elseif ahlength=3: sw_rep_out:=1; bboxmargin:=0;      % output report
-  elseif ahlength=5: sw_mol_out:=1; bboxmargin:=0;      % output MOL(V2000)
-  elseif ahlength=6: sw_mol_out:=2; bboxmargin:=0;      % output MOL(V3000)
+  if     ahlength=1:  sw_output:=Info1;                       % output aux file
+  elseif ahlength=2:  sw_output:=Info2;                       % output aux file(fixed mode)
+  elseif ahlength=3:  sw_output:=Report;                      % output report
+  elseif ahlength=5:  sw_output:=MOL2k;                       % output MOL(V2000)
+  elseif ahlength=6:  sw_output:=MOL3k;                       % output MOL(V3000)
+  elseif ahlength=7:  sw_output:=Mfont;                       % output Mfont
   fi
   %-- default bboxmargin=2------------------------------------------------------------------
-  if     bboxmargin=0: def shipit = enddef;             % No image file
-  elseif bboxmargin=1: proc_end:=1;                     % output first font only
-  elseif bboxmargin=3: def shipit = enddef;proc_end:=1; % No image file ,first font only
-  fi
+  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
@@ -163,21 +151,20 @@ fi
 clearit;
 %--------------------------------------------------------------------------------------------------
 if f_MP=1:
-  if     bboxmargin=0: message "* output no image file";
-  elseif bboxmargin=1: message "* output first font only";
-  elseif bboxmargin=3: message "* no image,first only";
-  fi
+  if bboxmargin=1: message "* output first font only"; fi
   message "* jobname="&jobname;
   message "* numbersystem="&numbersystem;
-  if     ahlength=1: message "* output aux file";
-                     message "* out_file_aux="&out_file_aux;
-                     message "* aux_delimiter="&aux_delimiter;
-  elseif ahlength=2: message "* output report file";
-                     message "* out_file_rep="&out_file_rep;
-  elseif ahlength=5: message "* output MOL file(V2000)";
-                     message "* "&jobname&"-nnn-"&"inf_EN"&".mol";
-  elseif ahlength=6: message "* output MOL file(V3000)";
-                     message "* "&jobname&"-nnn-"&"inf_EN"&".mol";
+  if ahlength=1: message "* output info file";
+                 message "* file name="&jobname&"-info.aux";
+                 message "* info delimiter="&aux_delimiter;
+  ef ahlength=2: message "* output report file";
+                 message "* file name="jobname&"-report.txt";
+  ef ahlength=5: message "* output MOL file(V2000)";
+                 message "* "&jobname&"-nnn-"&"inf_EN"&".mol";
+  ef ahlength=6: message "* output MOL file(V3000)";
+                 message "* "&jobname&"-nnn-"&"inf_EN"&".mol";
+  ef ahlength=7: message "* output mf file";
+                 message "* mf file name="&jobname&"-mf.aux";
   fi
   message "* outputformat="&outputformat;
   if outputformat="png": message "* hppp="&decimal(hppp)&"/vppp="&decimal(vppp); fi
@@ -221,8 +208,8 @@ def_com(-4090)(_com,_jp_atom,_jp_absA,_jp_bond,_cyc,_cyc_sB,_cyc_eB,_set_line,_t
   si,dl,dl_,dr,dr_,db,dm,dm_,tm,wf,wb,bd,bz,zf,zb,dt,wv,nl,vf,vb,nb,si_,wf_,wb_,zf_,zb_,wv_,bd_);
 %--------------------------------------------------------------------------------------------------
 def parameter_list=
-  sw_rep_out,sw_numberA,sw_numberB,sw_mframe,sw_aux_out,sw_expand,sw_mol_out,sw_calc,
-  sw_single,sw_ext_all,sw_aframe,sw_fframe,sw_group_off,sw_trimming,sw_arrow_emu,sw_file_open,
+  sw_numberA,sw_numberB,sw_mframe,sw_expand,sw_output,
+  sw_single,sw_ext_all,sw_aframe,sw_fframe,sw_group_off,sw_trimming,sw_arrow_emu,
   ratio_atom_bond,ratio_thickness_bond,ratio_char_bond,ratio_chain_ring,ratio_bondgap_bond,
   ratio_hash_black,ratio_hashgap_bond,ratio_thickness_char,ratio_wedge_bond,ratio_atomgap_atom,
   lonepairdiam,lonepairspace,blength,offset_atom,offset_wedge,max_blength,offset_hash_gap,
@@ -265,23 +252,23 @@ enddef;
 def beginfont(text s)=
   begingroup
   save ',f_beginchar,f_ext,blen,ext,add,ang_br,n_fw,n_bw,at_colon,at_semicol,info,mc,temps,
-       file_name_input,temps_a,t_tag;
+       file_name_input,t_tag,f_close;
   numeric at_semicol[];
-  string info[],mc[],temps,temps_a,mc,file_name_input,t_tag;
+  string info[],mc[],temps,mc,file_name_input,t_tag;
   %------------------------------------------------------------------------------------------------
   def ext=ext_to_font enddef;
   def add=add_to_molecule enddef;
   def '=read_ud enddef;
   %------------------------------------------------------------------------------------------------
   inf_NO:=inf_EN:=inf_JN:=inf_MW:=inf_FM:=inf_CAS:=inf_USE:=inf_EXA:=inf_EXB:="-";
-  mc:=cal_MW:=cal_MI:=cal_FM:="";
+  mc:=t_tag:=file_name_input:=cal_MW:=cal_MI:=cal_FM:="";
   %------------------------------------------------------------------------------------------------
   parts_cnt:=parts_usr_start;
   parts_int:=parts_int_start;
   %------------------------------------------------------------------------------------------------
   char_num:=char_num+1;
   store_par(parameter_list);
-  f_ext:=cntM:=mc_row:=inf_num:=0;
+  f_ext:=cntM:=mc_row:=inf_num:=f_EOF:=0; f_close:=1;
   for list=s: inf_num:=inf_num+1; info[inf_num]:=list; mc[inf_num]:=""; endfor
   %------------------------------------------------------------------------------------------------
   for j=1 upto inf_num:
@@ -296,9 +283,10 @@ def beginfont(text s)=
     ef at_colon>=1:
       s_tag:=substring (0,at_colon-1) of info[j];
       s_var:=substring (at_colon,length(info[j])) of info[j];
-      if s_tag="f": if f_MP=1: file_name_input:=s_var&".mcf"; fi
-      ef s_tag="t": if f_MP=1: t_tag:=s_var; fi
-      ef s_tag="v": if f_MP=1: nA:=extract_data(t_tag,s_var); fi
+      if s_tag="f":  if f_MP=1: file_name_input:=s_var&".mcf"; fi
+      ef s_tag="f+": if f_MP=1: file_name_input:=s_var&".mcf"; f_close:=0; fi
+      ef s_tag="t":  if f_MP=1: t_tag:=s_var; fi
+      ef s_tag="v":  if f_MP=1: pickup_data_unit(t_tag,s_var); fi
       else: if known scantokens("inf_"&s_tag): scantokens("inf_"&s_tag):=s_var; fi
       fi
     fi
@@ -308,77 +296,77 @@ def beginfont(text s)=
 enddef;
 %==================================================================================================
 def endfont=
-  if cntM>=1:
-    %-----------------------------------------------------------------------------------------
-    if sw_ext_all=1: ext_to_font(EXT_ALL); fi
-    if sw_trimming>=1:
-      nA:=nC:=4095; nB:=nD:=-4095;
-      for i=1 upto cntM:
-        if xpart(posM[1][i])<nA: nA:=xpart(posM[1][i]); fi
-        if xpart(posM[2][i])>nB: nB:=xpart(posM[2][i]); fi
-        if ypart(posM[1][i])<nC: nC:=ypart(posM[1][i]); fi
-        if ypart(posM[2][i])>nD: nD:=ypart(posM[2][i]); fi
-      endfor
-      font_wd:=nB-nA+2margin_lr;
-      font_ht:=nD-nC+2margin_tb;
-      fsize:=(font_wd,font_ht);
+  if (sw_output=0)or(sw_output=None):
+    if cntM>=1:
+      if sw_ext_all=1: ext_to_font(EXT_ALL); fi
+      if sw_trimming>=1:
+        nA:=nC:=4095; nB:=nD:=-4095;
+        for i=1 upto cntM:
+          if xpart(posM[1][i])<nA: nA:=xpart(posM[1][i]); fi
+          if xpart(posM[2][i])>nB: nB:=xpart(posM[2][i]); fi
+          if ypart(posM[1][i])<nC: nC:=ypart(posM[1][i]); fi
+          if ypart(posM[2][i])>nD: nD:=ypart(posM[2][i]); fi
+        endfor
+        font_wd:=nB-nA+2margin_lr;
+        font_ht:=nD-nC+2margin_tb;
+        fsize:=(font_wd,font_ht);
+        for i=1 upto cntM:
+          posM[0][i]:=posM[0][i]+(margin_lr-nA,margin_tb-nC);
+          posM[1][i]:=posM[1][i]+(margin_lr-nA,margin_tb-nC);
+        endfor
+      fi
+      %----------------------------------------------------------------------------------------
+      if f_MP=0: beginchar(char_num,font_wd/bp*bp#,font_ht/bp*bp#,0)
+      else:      beginfig(char_num) w:=charwd:=font_wd; h:=charht:=font_ht; chardp:=0;
+                 if (sw_fframe<>1)and(sw_fframe<>3): draw_corner((0,0),w,h,0.05bp); fi
+      fi
+      if (sw_fframe=1)or(sw_fframe=3): draw_frame((0,0),w,h,thickness_fframe); fi
+      if (sw_fframe=2)or(sw_fframe=3):
+        draw_frame((margin_lr,margin_tb),w-2margin_lr,h-2margin_tb,thickness_fframe);
+      fi
       for i=1 upto cntM:
-        posM[0][i]:=posM[0][i]+(margin_lr-nA,margin_tb-nC);
-        posM[1][i]:=posM[1][i]+(margin_lr-nA,margin_tb-nC);
+        addto currentpicture also mol_stru[i] shifted posM[0][i]; mol_stru[i]:=nullpicture;
+        if sw_mframe=1: ext(draw_frame(p[i],w[i],h[i],thickness_mframe)) fi
       endfor
+      if f_ext=1: addto currentpicture also mol_stru[0]; mol_stru[0]:=nullpicture; fi
+      %-----------------------------------------------------------------------------------------
+    else:
+      font_wd:=xpart(fsize); font_ht:=ypart(fsize);
+      if f_MP=0: beginchar(char_num,font_wd/bp*bp#,font_ht/bp*bp#,0)
+      else:      beginfig(char_num) w:=charwd:=font_wd; h:=charht:=font_ht;
+      fi
+      draw (0,h)--(0,0)--(w,0)--(w,h)--(0,h)--(w,0) wpcs thickness_fframe;
     fi
-    %----------------------------------------------------------------------------------------
-    if f_MP=0: beginchar(char_num,font_wd/bp*bp#,font_ht/bp*bp#,0)
-    else:      beginfig(char_num) w:=charwd:=font_wd; h:=charht:=font_ht; chardp:=0;
-               if (sw_fframe<>1)and(sw_fframe<>3): draw_corner((0,0),w,h,0.05bp); fi
-    fi
-    if (sw_fframe=1)or(sw_fframe=3): draw_frame((0,0),w,h,thickness_fframe); fi
-    if (sw_fframe=2)or(sw_fframe=3):
-      draw_frame((margin_lr,margin_tb),w-2margin_lr,h-2margin_tb,thickness_fframe);
-    fi
-    for i=1 upto cntM:
-      addto currentpicture also mol_stru[i] shifted posM[0][i]; mol_stru[i]:=nullpicture;
-      if sw_mframe=1: ext(draw_frame(p[i],w[i],h[i],thickness_mframe)) fi
-    endfor
-    if f_ext=1: addto currentpicture also mol_stru[0]; mol_stru[0]:=nullpicture; fi
     %-----------------------------------------------------------------------------------------
-  else:
-    font_wd:=xpart(fsize); font_ht:=ypart(fsize);
-    if f_MP=0: beginchar(char_num,font_wd/bp*bp#,font_ht/bp*bp#,0)
-    else:      beginfig(char_num) w:=charwd:=font_wd; h:=charht:=font_ht;
-    fi
-    draw (0,h)--(0,0)--(w,0)--(w,h)--(0,h)--(w,0) wpcs thickness_fframe;
+    endchar;
+    clearit;
+  %-----------------------------------------------------------------------------------------------
+  %%  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);
+  %-----------------------------------------------------------------------------------------------
   fi
-  %-----------------------------------------------------------------------------------------
-  endchar;
-  clearit;
   restore_par(parameter_list);
-  endgroup;
   if proc_end=1: scantokens("bye"); 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);
-  %-----------------------------------------------------------------------------------------------
+  endgroup;
 enddef;
 %-------------------------------------------------------------------------------------------------
-vardef extract_data(expr t,v)=
-  save data_cnt,f_end,semicol_cnt,cond,n_var;
-  f_end:=data_cnt:=semicol_cnt:=cond:=at_semicol[0]:=0;
+def pickup_data_unit(expr t,v)=
+  begingroup
+  save data_unit_cnt,f_end,semicol_cnt,cond,n_var;
+  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;
-    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)="*": f_end:=1;
     ef subc(1,temps)="+":
-      data_cnt:=data_cnt+1;
-      if t="n": if n_var=0: cond:=1; else: if data_cnt=n_var: cond:=1; fi fi
+      data_unit_cnt:=data_unit_cnt+1;
+      if v="*": cond:=1;
+      ef t="n": if data_unit_cnt=n_var: cond:=1; fi
       else: if v=scantokens("inf_"&t): cond:=1; fi
       fi
       if cond=1:
         forever:
-          temps:=readfrom file_name_input;
-          exitif subc(1,temps)="-";
+          temps:=readfrom file_name_input; 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;
@@ -387,27 +375,30 @@ vardef extract_data(expr t,v)=
         endfor
         f_end:=1;
       else:
-        forever: temps:=readfrom file_name_input; exitif subc(1,temps)="-"; endfor
+        forever: 
+          temps:=readfrom file_name_input; exitif temps=EOF; exitif subc(1,temps)="+";
+        endfor
       fi
     else:
       semicol_cnt:=0;
       for i=1 upto length(temps):
         if subc(i,temps)=";": semicol_cnt:=semicol_cnt+1; at_semicol[semicol_cnt]:=i; fi
       endfor
-      for i=1 upto semicol_cnt+1:
-        if i<=semicol_cnt: temps_a:=substring (at_semicol[i-1],at_semicol[i]-1) of temps;
-        else:              temps_a:=substring (at_semicol[semicol_cnt],length(temps)) of temps;
+      inf_num:=semicol_cnt+1;
+      for i=1 upto inf_num:
+        if i<=semicol_cnt: info[i]:=substring (at_semicol[i-1],at_semicol[i]-1) of temps;
+        else:              info[i]:=substring (at_semicol[semicol_cnt],length(temps)) of temps;
         fi
-        at_colon:=scan_char(":",temps_a,0,1);
-        s_tag:=substring (0,at_colon-1) of temps_a;
-        s_var:=substring (at_colon,length(temps_a)) of temps_a;
+        at_colon:=scan_char(":",info[i],0,1);
+        s_tag:=substring (0,at_colon-1) of info[i];
+        s_var:=substring (at_colon,length(info[i])) of info[i];
         if known scantokens("inf_"&s_tag): scantokens("inf_"&s_tag):=s_var; fi
       endfor
     fi
     exitif f_end=1;
   endfor
-  if sw_file_open=0: closefrom file_name_input; fi
-  data_cnt
+  if f_close=1: closefrom file_name_input; fi
+  endgroup;
 enddef;
 %--------------------------------------------------------------------------------------------------
 vardef scan_char(expr c,s,d,n)=
@@ -845,7 +836,9 @@ def MC(text TXT)=
   pair temp_p;
   %-----------------------------------------------------------------------------------------------
   if (sw_numberA>=1)or(sw_numberB>=1): ratio_atom_bond:=0.25; fi
-  if (sw_expand=1)or(sw_mol_out>=1): expand_set; crR:=1; else: crR:=-ratio_chain_ring; fi
+  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;
   %-----------------------------------------------------------------------------------------------
   font_wd:=xpart(fsize);
@@ -944,7 +937,7 @@ def MC(text TXT)=
   mol_stru[cntM]:=currentpicture;
   clearit;
   endgroup;
-  if ((sw_aux_out>=1)or(sw_rep_out=1)or(sw_mol_out>=1)or(sw_calc=1)): proc_calc; fi
+  if cntM=1: if (sw_output>=None)and(sw_output<=Mfont): proc_output(sw_output); fi fi
 enddef;
 %-------------------------------------------------------------------------------------------------
 def add_group=
@@ -1516,10 +1509,10 @@ vardef erase_brace(expr ATOM)=
   fi
 enddef;
 %=================================================================================================
-def proc_calc=
+def proc_output(expr n)=
   begingroup
-  save warning_cnt,knownA,bondC,tmp_wtp,bond_cnt,hideH_cnt;
-  hideH_cnt:=warning_cnt:=num_MW:=num_MI:=cen_MW:=cen_MI:=tbl_atom_max:=0;
+  save knownA,bondC,tmp_wtp,bond_cnt,warning_cnt,hideH_cnt;
+  num_MW:=num_MI:=cen_MW:=cen_MI:=tbl_atom_max:=warning_cnt:=hideH_cnt:=0;
   nE:=parts_emb_start;
   for i=1 upto tbl_atom_end: sumA[i]:=0; endfor
   for i=1 upto cntA:
@@ -1587,23 +1580,28 @@ def proc_calc=
   else:      num_MW:=cen_MW; cal_MW:=fdr(6)(cen_MW)&"*100"; fi
   if cen_MI<40: cal_MI:=substring (0,10) of decimal(num_MI);
   else:      num_MI:=cen_MI; cal_MI:=fdr(8)(cen_MI)&"*100"; fi
-  if (sw_aux_out>=1)and(cntM=1): proc_auxfile_out; fi
-  if (sw_rep_out=1)and(cntM=1):  proc_report_out;  fi
-  if (sw_mol_out>=1)and(cntM=1): proc_mol_out;     fi
+  %-------------------------------------------------------------------------------------
+  if n=Report:   proc_report_out(0);
+  ef n=Info1:    proc_auxfile_out(1);
+  ef n=Info2:    proc_auxfile_out(2);
+  ef n=MOL2k:    proc_mol_out(1);
+  ef n=MOL3k:    proc_mol_out(2);
+  ef n=Mfont:    proc_mf_out(0);
+  fi
   endgroup
 enddef;
 %=================================================================================================
-def proc_auxfile_out=
+def proc_auxfile_out(expr n)=
   message "["&decimal(char_num)&"]:"&inf_EN;
-  file_name_output:=out_file_aux;
+  file_name_output:=jobname&"-info.aux";
   %--------------------------------------------------------------------------------------
-  if (char_num=1)and(sw_aux_out=2):
+  if (char_num=1)and(n=2):
     printf tag[1] for i=2 upto aux_max: exitif tag[i]=""; &aux_delimiter&tag[i] endfor ;
   fi
   %--------------------------------------------------------------------------------------
   for i=1 upto aux_max: exitif tag[i]="";
     if i=1: printf "" else: &aux_delimiter fi
-    if (sw_aux_out=1)or(sw_aux_out=3): &tag[i]&":" fi
+    if n=1: &tag[i]&":" fi
     %-------------------------------------------
     if tag[i]="J":   & jobname
     ef tag[i]="C":   & decimal(char_num)
@@ -1630,7 +1628,6 @@ def proc_auxfile_out=
     ef tag[i]="MC":  & inf_MC
     fi
   endfor
-  if sw_aux_out=3: for i=1 upto inf_num: &aux_delimiter&info[i] endfor; fi
 enddef;
 %=================================================================================================
 vardef round_auto(expr n)=
@@ -1638,11 +1635,11 @@ vardef round_auto(expr n)=
   elseif (n<400)and(n>-400): round(n*10)/10      else: round(n) fi
 enddef;
 %-------------------------------------------------------------------------------------------------
-def proc_report_out=
+def proc_report_out(expr n)=
   message "["&decimal(char_num)&"]:"&inf_EN;
-  file_name_output:=out_file_rep;
+  file_name_output:=jobname&"-report.txt";
   printf "===========================================================================";
-  printf " No."&fdr(4)(char_num)&" / Name = "& inf_EN;
+  printf " No."&fdr(4)(char_num)&" / Name = "& inf_EN&" / file = "& file_name_input;
   if mc_row>=1:
     printf "---------------------------------------------------------------------------";
     for i=1 upto mc_row: 
@@ -1702,11 +1699,11 @@ def proc_report_out=
   printf "===========================================================================";
 enddef;
 %=================================================================================================
-def proc_mol_out=
+def proc_mol_out(expr n)=
   message "["&decimal(char_num)&"]:"&inf_EN;
-  file_name_output:=file_mol_output;
+  file_name_output:=jobname&"-"&fit_zero(char_num)&"-"&inf_EN&".mol";
   %-V2000---------------------------------------------------------------------------------------
-  if sw_mol_out=1:
+  if n=1:
     printf ""; printf "  -MCFtoMOL- "&fsl(20)(info[1]); printf "";
     printf fdr(3)(cntA)&fdr(3)(cntB)&"  0  0  0  0  0  0  0  0999 V2000";
     for i=1 upto cntA:
@@ -1721,7 +1718,7 @@ def proc_mol_out=
     endfor
     printf "M  END";
   %-V3000---------------------------------------------------------------------------------------
-  elseif sw_mol_out=2:
+  elseif n=2:
     printf ""; printf "  -MCFtoMOL- "&fsl(20)(info[1]); printf "";
     printf "  0  0  0     0  0     999 V3000"; 
     printf "M  V30 BEGIN CTAB";
@@ -1743,6 +1740,19 @@ def proc_mol_out=
     printf "M  V30 END BOND"; printf "M  V30 END CTAB"; printf "M  END";
   fi
 enddef;
+%=================================================================================================
+def proc_mf_out(expr n)=
+  message "["&decimal(char_num)&"]:"&inf_EN;
+  file_name_output:=jobname&"-mf.aux";
+  printf "beginfont("
+  for i=1 upto inf_num: &ditto&info[i]&ditto&"," endfor ;
+  for i=1 upto mc_row:
+    printf ditto&": " if i=mc_row: &mc[i]&ditto&")"; else: &mc[i]&ditto&","; fi
+  endfor
+  printf "if check(mc)=0: MC(scantokens(mc)) fi";
+  printf "endfont";
+  if n=1: printf "%-------------------------------------------------------------------------"; fi
+enddef;
 %-------------------------------------------------------------------------------------------------
 vardef fit_zero(expr n)=if n<=9: "00" elseif n<=99: "0" else: "" fi &decimal(n) enddef;
 %-------------------------------------------------------------------------------------------------
diff --git a/graphics/mcf2graph/mcf_data_base.mcf b/graphics/mcf2graph/mcf_data_base.mcf
index e10cf9c70d..015712b2df 100644
--- a/graphics/mcf2graph/mcf_data_base.mcf
+++ b/graphics/mcf2graph/mcf_data_base.mcf
@@ -1,507 +1,507 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% molecular data base file mcf_exa_data.mcf  by Akira Yamaji  2021.04.04
+% molecular data base file    mcf_data_base.mcf   by Akira Yamaji   2021.04.18
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %  tag1:var1;tag2:var2;tag3:var3 .....
 %  first character of line '%' comment out
-%  first character of line '+' begin MCF
-%  first character of line '-' end MCF
+%  first character of line '+' begin MCF , end MCF
+%  Cat = Category
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %==============================================================================
 % molecular data for mcf_example.tex  No.1-155
 %==============================================================================
-EN:Adenine;MW:135.13
+Cat:biological;EN:Adenine;MW:135.13
 +
 <30,?6,3=?5,{1,3,5,9}=dl,{2,6,9}:N,5:/NH2,7:NH
--------------------------------------------------------------------------------
-EN:Guanine;MW:151.13
++------------------------------------------------------------------------------
+Cat:biological;EN:Guanine;MW:151.13
 +
 <30,?6,3=?5,{1,3,9}=dl,{2,9}:N,{6,7}:NH,5://O,1:/NH2
--------------------------------------------------------------------------------
-EN:Cytosine;MW:111.10
++------------------------------------------------------------------------------
+Cat:biological;EN:Cytosine;MW:111.10
 +
 <30,?6,{4,6}=dl,4:N,3://O,2:NH,5:/NH2
--------------------------------------------------------------------------------
-EN:Thymine;MW:126.11
++------------------------------------------------------------------------------
+Cat:biological;EN:Thymine;MW:126.11
 +
 <30,?6,3=dl,{2,6}:NH,{1,5}://O,4:/_
--------------------------------------------------------------------------------
-EN:Uracil;MW:112.09
++------------------------------------------------------------------------------
+Cat:biological;EN:Uracil;MW:112.09
 +
 <30,?6,6=dl,{3,5}://O,{2,4}:NH
--------------------------------------------------------------------------------
-EN:Geraniol;MW:154.25
++------------------------------------------------------------------------------
+Cat:biological;EN:Geraniol;MW:154.25
 +
 <30,!8,OH,{2,6}=dr,{2,6}:/_
--------------------------------------------------------------------------------
-EN:Limonene;MW:136.24
++------------------------------------------------------------------------------
+Cat:biological;EN:Limonene;MW:136.24
 +
 <30,?6,2=dl,2:/_,@5,*\,/_,!!
--------------------------------------------------------------------------------
-EN:l-Menthol;MW:156.27
++------------------------------------------------------------------------------
+Cat:biological;EN:l-Menthol;MW:156.27
 +
 <30,?6,2:/*?!,5:*/_,3:*/OH
--------------------------------------------------------------------------------
-EN:Vanillin;MW:152.15
++------------------------------------------------------------------------------
+Cat:biological;EN:Vanillin;MW:152.15
 +
 <30,Ph,2:/OH,3:/O!,5:/CHO
--------------------------------------------------------------------------------
-EN:Allicin;MW:162.28
++------------------------------------------------------------------------------
+Cat:biological;EN:Allicin;MW:162.28
 +
 <-30,!!,!2,SO,!,S,!2,!!
--------------------------------------------------------------------------------
-EN:Stearic acid;MW:284.48
++------------------------------------------------------------------------------
+Cat:biological;EN:Stearic acid;MW:284.48
 +
 <30,!17,COOH
--------------------------------------------------------------------------------
-EN:Linoleic acid;MW:280.45
++------------------------------------------------------------------------------
+Cat:biological;EN:Linoleic acid;MW:280.45
 +
 <30,!5,-30,-30,!,-30,-30,!7,COOH,{6,9}=dr
--------------------------------------------------------------------------------
-EN:Sphingosine;MW:299.50
++------------------------------------------------------------------------------
+Cat:biological;EN:Sphingosine;MW:299.50
 +
 <30,!18,OH,14=dr,-3:*/OH,-2:/*NH2
--------------------------------------------------------------------------------
-EN:Tocopherol;MW:430.717
++------------------------------------------------------------------------------
+Cat:biological;EN:Tocopherol;MW:430.717
 +
 <30,Ph,3=?6,7:O,{1,2,5}:/_,8:/*_^60,6:/OH,@8,\,|,!12,{4,8}:/*_,12:/_
--------------------------------------------------------------------------------
-EN:Carotene;MW:536.8726
++------------------------------------------------------------------------------
+Cat:biological;EN:Carotene;MW:536.8726
 +
 <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:??
--------------------------------------------------------------------------------
-EN:Adrenalin;MW:183.21
++------------------------------------------------------------------------------
+Cat:biological;EN:Adrenalin;MW:183.21
 +
 <30,Ph,{1,6}:/OH,@4,\,*/OH,!2,NH,!
--------------------------------------------------------------------------------
-EN:Caffeine;MW:194.194
++------------------------------------------------------------------------------
+Cat:biological;EN:Caffeine;MW:194.194
 +
 <30,?6,3=dl,{1,5}://O,-4=?5,-3=dl,7:N,{2,6,9}:N!
--------------------------------------------------------------------------------
-EN:Nicotine;MW:162.23
++------------------------------------------------------------------------------
+Cat:biological;EN:Nicotine;MW:162.23
 +
 <30,Ph,2:N,@4,\,?5,8:N!
--------------------------------------------------------------------------------
-EN:Capsaicin;MW:305.418
++------------------------------------------------------------------------------
+Cat:biological;EN:Capsaicin;MW:305.418
 +
 <30,Ph,1:/OH,6:/O!,@4,\,!,NH,!,//O,!7,?!,-3=dl
--------------------------------------------------------------------------------
-EN:Thiamine;MW:300.81
++------------------------------------------------------------------------------
+Cat:biological;EN:Thiamine;MW:300.81
 +
 <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
--------------------------------------------------------------------------------
-EN:Gibberellin A3;MW:346.379
++------------------------------------------------------------------------------
+Cat:biological;EN:Gibberellin A3;MW:346.379
 +
 <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
--------------------------------------------------------------------------------
-EN:Cholesterol;MW:386.664
++------------------------------------------------------------------------------
+Cat:biological;EN:Cholesterol;MW:386.664
 +
 <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,?!
--------------------------------------------------------------------------------
-EN:Riboflavin;MW:376.37
++------------------------------------------------------------------------------
+Cat:biological;EN:Riboflavin;MW:376.37
 +
 <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
--------------------------------------------------------------------------------
-EN:Resveratrol;MW:228.24
++------------------------------------------------------------------------------
+Cat:biological;EN:Resveratrol;MW:228.24
 +
 <30,Ph,@4,\,!!,!,Ph,{2,6,-3}:/OH
--------------------------------------------------------------------------------
-EN:Glutathione;MW:307.33
++------------------------------------------------------------------------------
+Cat:biological;EN:Glutathione;MW:307.33
 +
 <-30,COOH,!,/*NH2,!3,//O,!,NH,!,*/!SH,!,//O,!,NH,!2,COOH
--------------------------------------------------------------------------------
-EN:Hexaphenylbenzene;MW:534.6876
++------------------------------------------------------------------------------
+Cat:synthetic;EN:Hexaphenylbenzene;MW:534.6876
 +
 <30,Ph,{1,2,3,4,5,6}:/Ph
--------------------------------------------------------------------------------
-EN:Kekulene;MW:600.7
++------------------------------------------------------------------------------
+Cat:synthetic;EN:Kekulene;MW:600.7
 +
 <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
--------------------------------------------------------------------------------
-EN:18-Crown-6;MW:264.32
++------------------------------------------------------------------------------
+Cat:synthetic;EN:18-Crown-6;MW:264.32
 +
 <-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
--------------------------------------------------------------------------------
-EN:Porphyrin;MW:310.4
++------------------------------------------------------------------------------
+Cat:synthetic;EN:Porphyrin;MW:310.4
 +
 <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
--------------------------------------------------------------------------------
-EN:Sulflower;MW:448.69
++------------------------------------------------------------------------------
+Cat:synthetic;EN:Sulflower;MW:448.69
 +
 <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
--------------------------------------------------------------------------------
-EN:Arsphenamine x5;MW:915.2
++------------------------------------------------------------------------------
+Cat:synthetic;EN:Arsphenamine x5;MW:915.2
 +
 <18,?5,{1,2,3,4,5}:As,{1,2,3,4,5}:/'(Ph,3:/NH2,4:/OH)
--------------------------------------------------------------------------------
-EN:Melamine;MW:126.12
++------------------------------------------------------------------------------
+Cat:synthetic;EN:Melamine;MW:126.12
 +
 <30,Ph,{2,4,6}:N,{1,3,5}:/NH2
--------------------------------------------------------------------------------
-EN:Sudan red 1;MW:248.28
++------------------------------------------------------------------------------
+Cat:synthetic;EN:Sudan red 1;MW:248.28
 +
 <30,Ph,1=Ph,4:/OH,@3,\,N,!!,N,!,Ph
--------------------------------------------------------------------------------
-EN:Basic blue 1;MW:319.86
++------------------------------------------------------------------------------
+Cat:synthetic;EN:Basic blue 1;MW:319.86
 +
 <30,Ph,3=Ph,6=Ph,2:S,5:N,{8,13}:/N?!,2:p_,@(4.2,1.5),Cl,n_^15
--------------------------------------------------------------------------------
-EN:Disperse violet 1;MW:238.25
++------------------------------------------------------------------------------
+Cat:synthetic;EN:Disperse violet 1;MW:238.25
 +
 <30,Ph,3=?6,-3=dr,9=Ph,{7,10}://O,{-1,-4}:/NH2
--------------------------------------------------------------------------------
-EN:Vat blue 1;MW:262.27
++------------------------------------------------------------------------------
+Cat:synthetic;EN:Vat blue 1;MW:262.27
 +
 <30,Ph,3=?5,@8,\\,?5,-3=dr,-3=Ph,{7,14}:NH,{9,11}://O
--------------------------------------------------------------------------------
-EN:Atrazine;MW:215.7
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Atrazine;MW:215.7
 +
 <30,Ph,{2,4,6}:N,5:/Cl,1:/NH!2,3:/NH!?!
--------------------------------------------------------------------------------
-EN:BHC;MW:290.83
++------------------------------------------------------------------------------
+Cat:pesticide;EN:BHC;MW:290.83
 +
 <30,?6`1.2,{1,3,4,6}:*/Cl,{2,5}:/*Cl
--------------------------------------------------------------------------------
-EN:pp-DDT;MW:354.49
++------------------------------------------------------------------------------
+Cat:pesticide;EN:pp-DDT;MW:354.49
 +
 <30,Ph,6:/Cl,@3,\,/CCl3,!,Ph,-3:/Cl
--------------------------------------------------------------------------------
-EN:Endrin;MW:380.91
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Endrin;MW:380.91
 +
 <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
--------------------------------------------------------------------------------
-EN:Acrinathrin;MW:541.45
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Acrinathrin;MW:541.45
 +
 <-30,?3,2^-35:*/_,2^35:/*_,
  @1,\,!~dl,!,//O,!,O,!,/CF3,!,CF3,@3,\,//O,!,O,!,/CN,!,Ph,@-4,\,O,-60,Ph
--------------------------------------------------------------------------------
-EN:Cafenstrole;MW:350.4
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Cafenstrole;MW:350.4
 +
 <30,Ph,{2,4,6}:/_,@3,\,SOO,!,|,?5,{2,5}=dl,{2,4,5}:N,@-2,\,//O,!,N,/!,!2
--------------------------------------------------------------------------------
-EN:Carfentrazone-ethyl;MW:412.19
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Carfentrazone-ethyl;MW:412.19
 +
 <30,Ph,4:/F,6:/Cl,@1,\,!,/Cl,!,//O,!,O,!2,
   @3,\,|,?5,4=dl,{1,3,5}:N,-4://O,-3:/CF2,-2:/_
--------------------------------------------------------------------------------
-EN:Carboxin;MW:235.301
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Carboxin;MW:235.301
 +
 <30,?6,3=dl,2:S,5:O,4:/_,@3,\,//O,!,NH,!,Ph
--------------------------------------------------------------------------------
-EN:Clomazone;MW:239.7
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Clomazone;MW:239.7
 +
 <30,Ph,2:/Cl,@3,\,!,|,?5,1:N,2:O,-2^-35:/_,-2^35:/_,-1://O
--------------------------------------------------------------------------------
-EN:Halfenprox;MW:477.4
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Halfenprox;MW:477.4
 +
 <30,Ph,@6,\,O,!,/F^35,/F^-35,!,Br,@3,\,!,??,!,O,!,!,Ph,@-2,\,O,60,Ph
--------------------------------------------------------------------------------
-EN:Paraquat;MW:257.16
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Paraquat;MW:257.16
 +
 Ph,@4,\,Ph,{1,10}:N!,1:p_^-90,10:p_^90,@(5,1),Cl,n_^15,@(-0.5,1),Cl,n_^15
--------------------------------------------------------------------------------
-EN:Picolinafen;MW:376.331
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Picolinafen;MW:376.331
 +
 <30,Ph,5:/CF3,@3,\,O,!,|,Ph,2:N,@3,\,//O,!,NH,!,|,Ph,4:/F
--------------------------------------------------------------------------------
-EN:Quinoxyfen;MW:308.13
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Quinoxyfen;MW:308.13
 +
 <30,Ph,4=Ph,10:N,{2,6}:/Cl,@7,\,O,!,|,Ph,4:/F
--------------------------------------------------------------------------------
-EN:Quitozene;MW:295.3
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Quitozene;MW:295.3
 +
 <30,Ph,{1,2,3,4,6}:/Cl,5:/NO2
--------------------------------------------------------------------------------
-EN:Bitertanol;MW:337.4
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Bitertanol;MW:337.4
 +
 <30,Ph,@3,\,Ph,@-3,\,O,!2,/OH,!,??!,@14,\,|,?5,{2,4}=dl,{1,2,4}:N
--------------------------------------------------------------------------------
-EN:Bifenox;MW:342.14
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Bifenox;MW:342.14
 +
 <30,Ph,{4,6}:/Cl,@3,\,O,!,Ph,-4:/COO!,-3:/NO2
--------------------------------------------------------------------------------
-EN:Simeconazole;MW:293.417
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Simeconazole;MW:293.417
 +
 <36,?5,{1,3,5}:N,{1,4}=dl,@3,30,!,/OH^30,!2,Si,/_,/_^60,!,@7,-30,Ph,-3:/F
--------------------------------------------------------------------------------
-EN:Fenamidone;MW:311.403
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fenamidone;MW:311.403
 +
 <18,?5,4=dl,{3,5}:N,2://O,@3,\,NH,!,Ph,4:/S!,1^52:*/_,1^-48~zf:/Ph
--------------------------------------------------------------------------------
-EN:Fenpyroximate;MW:421.49
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fenpyroximate;MW:421.49
 +
 <-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
--------------------------------------------------------------------------------
-EN:Chlorsulron;MW:380.648
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Chlorsulron;MW:380.648
 +
 <30,Ph,6:/NH2,@1,\,SOO,!,NH2,@3,\,SOO,!,NH2,@4,\,/Cl,60~dl,/Cl,!,Cl
--------------------------------------------------------------------------------
-EN:Enrofloxacin;MW:359.401
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Enrofloxacin;MW:359.401
 +
 <30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,@1,\,|,?6,1:N,4:N,4:/!
--------------------------------------------------------------------------------
-EN:Fenitrothion;MW:277.23
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fenitrothion;MW:277.23
 +
 <-30,!,O,!,P,//S,/O!^160,!,O,!,|,Ph,3:/_,2:/NO2
--------------------------------------------------------------------------------
-EN:Fipronil;MW:437.2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Fipronil;MW:437.2
 +
 <30,Ph,{2,4}:/Cl,6:/CF3,@3,\,|,?5,{2,4}=dl,{1,2}:N,3:/CN,5:/NH2,
   @-2,\,S,//O,!,CF3
--------------------------------------------------------------------------------
-EN:Flumequine;MW:261.225
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Flumequine;MW:261.225
 +
 <30,Ph,3=?6,(2,7)=?6[4],9=dl,7:N,6:/F,9:/COOH,10://O,13:/_
--------------------------------------------------------------------------------
-EN:Imazalil;MW:297.2
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Imazalil;MW:297.2
 +
 <-30,!2,O,!2,!~dr,@1,60,|,?5,{2,4}=dl,{1,3}:N,@$2,\,|,Ph,{4,6}:/Cl
--------------------------------------------------------------------------------
-EN:Imidacloprid;MW:255.662
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Imidacloprid;MW:255.662
 +
 <30,Ph,1:N,6:/Cl,@3,\,!,|,?5,2=dl,1:N,3:N,2:/'(NH,!,NO2)
--------------------------------------------------------------------------------
-EN:Kresoxim-Methyl;MW:313.348
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Kresoxim-Methyl;MW:313.348
 +
 <30,Ph,@3,\,/COO!,!~dr,N,!,O,!,@4,\,!,O,!,Ph,-1:/_
--------------------------------------------------------------------------------
-EN:Nalidixic acid;MW:232.239
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Nalidixic acid;MW:232.239
 +
 <30,Ph,3=?6,9=dl,5:N,6:/_,7://O,8:/COOH,10:N!2
--------------------------------------------------------------------------------
-EN:Oryzalin;MW:346.4
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Oryzalin;MW:346.4
 +
 <30,Ph,{1,3}:/NO2,@5,\,SOO,!,NH2,@2,\,/!2,N,!3
--------------------------------------------------------------------------------
-EN:Oxadiazon;MW:345.2
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Oxadiazon;MW:345.2
 +
 <30,Ph,{4,6}:/Cl,1:/O!?!,@3,\,|,?5,2=dl,{1,2}:N,4:O,5://O,3:/??!
--------------------------------------------------------------------------------
-EN:Oxadixyl;MW:278.3
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Oxadixyl;MW:278.3
 +
 <30,Ph,{2,4}:/_,@3,\,N,!1,//O,!2,O,!,@7,\,|,?5,1:N,2:O,5://O
--------------------------------------------------------------------------------
-EN:Oxyfluorfen;MW:361.701
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Oxyfluorfen;MW:361.701
 +
 <30,Ph,6:/CF3,4:/Cl,@3,\,O,!,Ph,-3:/NO2,@-4,\,O,!2
--------------------------------------------------------------------------------
-EN:Sulfadimidine;MW:278.33
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Sulfadimidine;MW:278.33
 +
 <30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,4}:N,{3,5}:/_
--------------------------------------------------------------------------------
-EN:Sulfamerazine;MW:264.303
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Sulfamerazine;MW:264.303
 +
 <30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,6}:N,3:/_
--------------------------------------------------------------------------------
-EN:Sulfadoxine;MW:310.328
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Sulfadoxine;MW:310.328
 +
 <30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{4,6}:N,{2,3}:/O!
--------------------------------------------------------------------------------
-EN:Sulfamethoxazole;MW:253.276
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Sulfamethoxazole;MW:253.276
 +
 <30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,?5,{2,5}=dl,4:O,5:N,3:/_
--------------------------------------------------------------------------------
-EN:Thiamethoxam;MW:291.71
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Thiamethoxam;MW:291.71
 +
 <30,?6,4:N,2:O,6:N!,5://'(N,!,NO2),@4,\,!,|,?5,{1,3}=dl,3:N,5:S,4:/Cl
--------------------------------------------------------------------------------
-EN:Thiamphenicol;MW:355
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Thiamphenicol;MW:355
 +
 <30,Ph,@1,\,SOO,!,@4,\,/OH,!,/!OH,!`1.1,NH,!`1.1,//O,!,/Cl,!,Cl
--------------------------------------------------------------------------------
-EN:Pyridaphenthion;MW:340.334
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Pyridaphenthion;MW:340.334
 +
 <30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,|,?6,{1,5}=dl,{2,3}:N,4://O,3:/Ph
--------------------------------------------------------------------------------
-EN:Permethrin;MW:391.288
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Permethrin;MW:391.288
 +
 <-30,?3,2^-35:*/_,2^35:/*_,1:/'(!!,/Cl,!,Cl),@3,\,//O,!,O,!2,|,Ph,@3,\,O,-60,Ph
--------------------------------------------------------------------------------
-EN:Isoprothiolane;MW:290.392
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Isoprothiolane;MW:290.392
 +
 <-30,!,?!,O,!,//O,!,//'(?5,2:S,5:S),!,//O,!,O,!,?!
--------------------------------------------------------------------------------
-EN:Oxine-Copper;MW:351.852
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Oxine-Copper;MW:351.852
 +
 Ph,4:N,5=Ph,@-4,\,O,-60,<90,Cu,-90,O,60,|,Ph,5=Ph,10:N,||,@4,&12~vf,@23,&12~vf
--------------------------------------------------------------------------------
-EN:Tetraconazole;MW:372.145
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Tetraconazole;MW:372.145
 +
 <-6,?5,{2,5}=dl,{1,2,4}:N,@4,\,!3,O,!,/F^35,/F^-35,!,CF2,@7,\,|,Ph,{4,6}:/Cl
--------------------------------------------------------------------------------
-EN:Endosulfan;MW:406.904
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Endosulfan;MW:406.904
 +
 <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
--------------------------------------------------------------------------------
-EN:Uniconazole-P;MW:291.779
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Uniconazole-P;MW:291.779
 +
 <30,Ph,6:/Cl,@3,\,!~dl,!,/OH,!,??!,@8,\,|,?5,{2,4}=dl,{1,2,4}:N
--------------------------------------------------------------------------------
-EN:Oxadiargyl;MW:341.19
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Oxadiargyl;MW:341.19
 +
 <30,Ph,{1,3}:/Cl,6:/'(O,!2,!!!),@4,\,|,?5,2=dl,{1,2}:N,4:O,5://O,3:/??!
--------------------------------------------------------------------------------
-EN:Oxaziclomefone;MW:376.277
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Oxaziclomefone;MW:376.277
 +
 <30,?6,6=dl,4:N,2:O,1:/_,5://O,6:/Ph,@4,\,??,!,|,Ph,{3,5}:/Cl
--------------------------------------------------------------------------------
-EN:Trimetoprim;MW:290.323
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Trimetoprim;MW:290.323
 +
 <30,Ph,{1,5}:N,{2,6}:/NH2,@3,\,!,|,Ph,{3,4,5}:/O!
--------------------------------------------------------------------------------
-EN:Ciprofloxacin;MW:331.347
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Ciprofloxacin;MW:331.347
 +
 <30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,@1,\,|,?6,1:N,4:NH
--------------------------------------------------------------------------------
-EN:Danofloxacin;MW:357.385
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Danofloxacin;MW:357.385
 +
 <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:*/_
--------------------------------------------------------------------------------
-EN:Marbofloxacin;MW:362.361
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Marbofloxacin;MW:362.361
 +
 <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!
--------------------------------------------------------------------------------
-EN:Ofloxacin;MW:361.373
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Ofloxacin;MW:361.373
 +
 <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:/_
--------------------------------------------------------------------------------
-EN:Ormetoprim;MW:274.324
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Ormetoprim;MW:274.324
 +
 <30,Ph,{1,5}:N,{2,6}:/NH2,@3,\,!,|,Ph,2:/_,{4,5}:/O!
--------------------------------------------------------------------------------
-EN:Amoxicillin;MW:365.4042
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Amoxicillin;MW:365.4042
 +
 <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
--------------------------------------------------------------------------------
-EN:Ampicillin;MW:349.405
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Ampicillin;MW:349.405
 +
 <45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??, 
  @4,*\^15,NH,!,//O,!,/*NH2,!,Ph       
--------------------------------------------------------------------------------
-EN:Benzyl-Penicillin;MW:334.4
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Benzyl-Penicillin;MW:334.4
 +
 <45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
  @4,*\^15,NH,!,//O,!,!,Ph
--------------------------------------------------------------------------------
-EN:Mecillinam;MW:325.4264
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Mecillinam;MW:325.4264
 +
 <45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
  @4,*\^15,N,!!,!,?7,-7:N
--------------------------------------------------------------------------------
-EN:Nafcillin;MW:414.4748
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Nafcillin;MW:414.4748
 +
 <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  
--------------------------------------------------------------------------------
-EN:Oxacillin;MW:401.4363
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Oxacillin;MW:401.4363
 +
 <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
--------------------------------------------------------------------------------
-EN:Cloxacillin;MW:435.8813
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Cloxacillin;MW:435.8813
 +
 <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
--------------------------------------------------------------------------------
-EN:Dicloxacillin;MW:470.3264
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Dicloxacillin;MW:470.3264
 +
 <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
--------------------------------------------------------------------------------
-EN:Cefalexin;MW:347.3889
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Cefalexin;MW:347.3889
 +
 <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
--------------------------------------------------------------------------------
-EN:Cefalonium;MW:458.5107
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Cefalonium;MW:458.5107
 +
 <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
--------------------------------------------------------------------------------
-EN:Cefazorin;MW:454.51
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Cefazorin;MW:454.51
 +
 <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
--------------------------------------------------------------------------------
-EN:Cefquinome;MW:528.6
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Cefquinome;MW:528.6
 +
 <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
--------------------------------------------------------------------------------
-EN:Ceftiofur;MW:523.5626
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Ceftiofur;MW:523.5626
 +
 <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
--------------------------------------------------------------------------------
-EN:Cefuroxime;MW:424.3852
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Cefuroxime;MW:424.3852
 +
 <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
--------------------------------------------------------------------------------
-EN:Apramycin;MW:539.58
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Apramycin;MW:539.58
 +
 <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
--------------------------------------------------------------------------------
-EN:Gentamycin;MW:477.596
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Gentamycin;MW:477.596
 +
 <-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!)
--------------------------------------------------------------------------------
-EN:Kanamycin;MW:484.499
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Kanamycin;MW:484.499
 +
 <-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
--------------------------------------------------------------------------------
-EN:DihydroStreptmycin;MW:583.574
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:DihydroStreptmycin;MW:583.574
 +
 <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
--------------------------------------------------------------------------------
-EN:Fradiomycin;MW:614.644
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Fradiomycin;MW:614.644
 +
 <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
--------------------------------------------------------------------------------
-EN:Streptmycin;MW:581.574
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Streptmycin;MW:581.574
 +
 <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
--------------------------------------------------------------------------------
-EN:Neospiramycin;MW:698.9
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Neospiramycin;MW:698.9
 +
 <-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
--------------------------------------------------------------------------------
-EN:Emamectine;MW:886.133
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Emamectine;MW:886.133
 +
 <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,
@@ -509,16 +509,16 @@ EN:Emamectine;MW:886.133
   {-1,-6}:O,-3:*/_,@-2,\,*/_,!2,
   17:/_,19:/*_,@18,\,O,!,?6`.8,-1:O,-2:*/_,-4:*/O!,
   @-3,\,O,60,?6`.8,-5:O,-4:*/_,-3:/*NH!,-2:*/O!
--------------------------------------------------------------------------------
-EN:Spinosad;MW:731.968
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Spinosad;MW:731.968
 +
 <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^25,7^-25}://O,1:/!,
  @-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?!
--------------------------------------------------------------------------------
-EN:Spiramycin;MW:843.1
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Spiramycin;MW:843.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,
@@ -526,16 +526,16 @@ EN:Spiramycin;MW:843.1
  @7,\*,O,0~wb,?6`.7,-5:O,-2:*/N?!,-1:/*OH,-4:*/_,
    @-3,\*`1,O,60~wb`1.5,?6`.7,-5:O,{-2^35,-3}:*/OH,{-2^-35,-4}:/*_,
  @8,\*,!,!!,O
--------------------------------------------------------------------------------
-EN:Natamycin;MW:665.733
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Natamycin;MW:665.733
 +
 <-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],##,
  {2,4,6,8,20}=dl,11=zb,23:O,-2:/*OH,-3:*/COOH,
  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:/*_
--------------------------------------------------------------------------------
-EN:Tylocin;MW:916.10
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Tylocin;MW:916.10
 +
 <-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:/_,
@@ -543,208 +543,208 @@ EN:Tylocin;MW:916.10
  @7,\*,O,0~wb,?6`.7,-5:O,-2:*/N?!,-1:/*OH,-4:*/_,
    @-3,\*`1,O,60~wb`1.5,?6`.7,-5:O,{-2^35,-3}:*/OH,{-2^-35,-4}:/*_,
  @8,\*,!,!!,O
--------------------------------------------------------------------------------
-EN:Tilmicosin;MW:869.133
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Tilmicosin;MW:869.133
 +
 <-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:/_,
  @-1,*\,-60,O,0~zb,?6`.7,-5:O,{-1,-2}:*/O!,-3:*/OH,-4:/*_,
  @7,\*,O,0,?6`.7,-5:O,-2:*/N?!,{-1,-3}:/*OH,-4:*/_,
  @8,\*,!2,?6`.7,-6:N,{-2,-4}:*/_
--------------------------------------------------------------------------------
-EN:Chlortetracyclin;MW:478.88
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Chlortetracyclin;MW:478.88
 +
 <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
--------------------------------------------------------------------------------
-EN:Oxytetracyclin;MW:460.434
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Oxytetracyclin;MW:460.434
 +
 <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
--------------------------------------------------------------------------------
-EN:Tetracyclin;MW:444.435
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Tetracyclin;MW:444.435
 +
 <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
--------------------------------------------------------------------------------
-EN:Doxycyclin;MW:444.43
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Doxycyclin;MW:444.43
 +
 <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
--------------------------------------------------------------------------------
-EN:Tiamulin;MW:493.74
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Tiamulin;MW:493.74
 +
 <-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
--------------------------------------------------------------------------------
-EN:Rifampicin;MW:822.94
++------------------------------------------------------------------------------
+Cat:antibiotics;EN:Rifampicin;MW:822.94
 +
 <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),
  -4:/*O!,@-6,-30,O,!,//O,!,@$11,\,!!,N,!,|,?6,1:N,4:N!
--------------------------------------------------------------------------------
-EN:Trenbolone;MW:270.37
++------------------------------------------------------------------------------
+Cat:biological;EN:Trenbolone;MW:270.37
 +
 <30,?6,{3,10}=?6,13=?5,{2,11,15}=dl,1://O,12:*/_^60,-1:/*OH,9:*/H^60,11:/*H^-60
--------------------------------------------------------------------------------
-EN:Luciferin;MW:280.33
++------------------------------------------------------------------------------
+Cat:biological;EN:Luciferin;MW:280.33
 +
 <30,Ph,3=?5,@8,\,?5,{9,16}=dl,{9,14}:N,{7,11}:S,1:/OH,-2:*/COOH
--------------------------------------------------------------------------------
-EN:Chlorophyll a;MW:893.509
++------------------------------------------------------------------------------
+Cat:biological;EN:Chlorophyll a;MW:893.509
 +
 <-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}:/_
--------------------------------------------------------------------------------
-EN:Quercetin;MW:302.24
++------------------------------------------------------------------------------
+Cat:biological;EN:Quercetin;MW:302.24
 +
 <30,Ph,3=?6,@9,\,Ph,9=dl,10:O,7://O,{2,6,8,13,14}:/OH
--------------------------------------------------------------------------------
-EN:Limonin;MW:470.518
++------------------------------------------------------------------------------
+Cat:biological;EN:Limonin;MW:470.518
 +
 <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
--------------------------------------------------------------------------------
-EN:Cromolyn;MW:468.37
++------------------------------------------------------------------------------
+Cat:biological;EN:Cromolyn;MW:468.37
 +
 <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
--------------------------------------------------------------------------------
-EN:Emetine;MW:480.649
++------------------------------------------------------------------------------
+Cat:biological;EN:Emetine;MW:480.649
 +
 <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! 
--------------------------------------------------------------------------------
-EN:Acronycine;MW:321.376
++------------------------------------------------------------------------------
+Cat:biological;EN:Acronycine;MW:321.376
 +
 <30,Ph,|,-4=?6,1:N!,4://O,-3=Ph2,-1:/O!,|,-4=?6,2=dl,4:O,3:??
--------------------------------------------------------------------------------
-EN:Piperine;MW:285.343
++------------------------------------------------------------------------------
+Cat:biological;EN:Piperine;MW:285.343
 +
 <30,Ph,|,-1=?5,{1,3}:O,@$4,\,!!,!,!!,!,//O,!,|,?6,1:N
--------------------------------------------------------------------------------
-EN:Febrifugine;MW:301.346
++------------------------------------------------------------------------------
+Cat:biological;EN:Febrifugine;MW:301.346
 +
 <30,Ph,|,-4=?6,2=dl,{1,3}:N,4://O,@$9,\,!,//O,!,!~zf,|,?6,2:NH,-1:*/OH
--------------------------------------------------------------------------------
-EN:Mitomycine C;MW:334.332
++------------------------------------------------------------------------------
+Cat:biological;EN:Mitomycine C;MW:334.332
 +
 <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
--------------------------------------------------------------------------------
-EN:Podophyllotoxin;MW:414.41
++------------------------------------------------------------------------------
+Cat:biological;EN:Podophyllotoxin;MW:414.41
 +
 <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  
--------------------------------------------------------------------------------
-EN:Warfarin;MW:308.333
++------------------------------------------------------------------------------
+Cat:biological;EN:Warfarin;MW:308.333
 +
 <30,Ph,3=?6,8=dl,10:O,7:/OH,9://O,@8,\,/Ph`1,60,!,//O,!
--------------------------------------------------------------------------------
-EN:Genistein;MW:270.24
++------------------------------------------------------------------------------
+Cat:biological;EN:Genistein;MW:270.24
 +
 <30,Ph,3=?6,9=dl,10:O,{2,6}:/OH,7://O,@8,\,Ph,-3:/OH
--------------------------------------------------------------------------------
-EN:Baicalein;MW:270.24
++------------------------------------------------------------------------------
+Cat:biological;EN:Baicalein;MW:270.24
 +
 <30,Ph,3=?6,9=dl,10:O,{1,2,6}:/OH,7://O,@8,\,Ph
--------------------------------------------------------------------------------
-EN:Reserpine;MW:608.688
++------------------------------------------------------------------------------
+Cat:biological;EN:Reserpine;MW:608.688
 +
 <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  
--------------------------------------------------------------------------------
-EN:Rotenone;MW:394.423
++------------------------------------------------------------------------------
+Cat:biological;EN:Rotenone;MW:394.423
 +
 <-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,*\,/_,!! 
--------------------------------------------------------------------------------
-EN:Pyrethrin I;MW:328.452
++------------------------------------------------------------------------------
+Cat:biological;EN:Pyrethrin I;MW:328.452
 +
 <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
--------------------------------------------------------------------------------
-EN:Oseltamivir;MW:312.40
++------------------------------------------------------------------------------
+Cat:biological;EN:Oseltamivir;MW:312.40
 +
 <30,?6,3=dl,6:*/NH2,@1,\*,NH,!,//O,!,@2,*\,O,!,/!,!2,@4,\,//O,!,O,!2
--------------------------------------------------------------------------------
-EN:Paclitaxel;MW:853.918
++------------------------------------------------------------------------------
+Cat:biological;EN:Paclitaxel;MW:853.918
 +
 ?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
--------------------------------------------------------------------------------
-EN:Mevastatin;MW:390.52
++------------------------------------------------------------------------------
+Cat:biological;EN:Mevastatin;MW:390.52
 +
 <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 
--------------------------------------------------------------------------------
-EN:Sesamine;MW:354.35
++------------------------------------------------------------------------------
+Cat:biological;EN:Sesamine;MW:354.35
 +
 <54,?5,1=?5,{4,7}:O,{1^-54,2^54}:*/H,{5,8}:*/'(Ph,4=?5,7:O,9:O)^-12
--------------------------------------------------------------------------------
-EN:Morphine;MW:285.343
++------------------------------------------------------------------------------
+Cat:biological;EN:Morphine;MW:285.343
 +
 <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
--------------------------------------------------------------------------------
-EN:Quinine;MW:324.424
++------------------------------------------------------------------------------
+Cat:biological;EN:Quinine;MW:324.424
 +
 <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
--------------------------------------------------------------------------------
-EN:Atoropin;MW:289.375
++------------------------------------------------------------------------------
+Cat:biological;EN:Atoropin;MW:289.375
 +
 <30,O,!,//O,!,!,Ph,@$1,\~zb^-60,|,?7`1.1,@6,*\^190`1.25,N!,&3~wb,$3:/!OH~wv 
--------------------------------------------------------------------------------
-EN:Colchicine;MW:399.443
++------------------------------------------------------------------------------
+Cat:biological;EN:Colchicine;MW:399.443
 +
 <30,Ph,{1,2,6}:/O!,-4=?7,-5=?7,{-1,-4,-6}=dl,-2://O,-3:/O!,9:/NHCO!
--------------------------------------------------------------------------------
-EN:Lycorine;MW:287.315
++------------------------------------------------------------------------------
+Cat:biological;EN:Lycorine;MW:287.315
 +
 <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
--------------------------------------------------------------------------------
-EN:Ibotenic acid;MW:158.113
++------------------------------------------------------------------------------
+Cat:biological;EN:Ibotenic acid;MW:158.113
 +
 <18,?5,4=dl,3:O,2:NH,1://O,@4,-24,/NH2,!,COOH
--------------------------------------------------------------------------------
-EN:illudin S;MW:264.3
++------------------------------------------------------------------------------
+Cat:biological;EN:illudin S;MW:264.3
 +
 <30,?6,3=?5,6:**?3,{4,7}=dl,2://O,5:/_,
  {1^35,8^35}:*/_,1:/*OH^-35,9:*/OH,8:/*!OH^-35
--------------------------------------------------------------------------------
-EN:Muscarine;MW:174.26
++------------------------------------------------------------------------------
+Cat:biological;EN:Muscarine;MW:174.26
 +
 <18,?5,2:O,1:*/_,5:/*OH,@3,*\,48,N,??,p_^180,!
--------------------------------------------------------------------------------
-EN:Psilocybin;MW:284.248
++------------------------------------------------------------------------------
+Cat:biological;EN:Psilocybin;MW:284.248
 +
 <30,Ph,3=?5,8=dl,9:NH,@2,\,O,-60,P,//O^-45,/OH^45,90,OH,@7,\,!,-60,N?!
--------------------------------------------------------------------------------
-EN:Tetrodotoxine;MW:319.27
++------------------------------------------------------------------------------
+Cat:biological;EN:Tetrodotoxine;MW:319.27
 +
 #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
--------------------------------------------------------------------------------
-EN:Aflatoxin B1;MW:312.27
++------------------------------------------------------------------------------
+Cat:biological;EN:Aflatoxin B1;MW:312.27
 +
 <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
--------------------------------------------------------------------------------
++------------------------------------------------------------------------------
 %==============================================================================
 % other molecular data
 %==============================================================================
-EN:Vancomycin;MW:1449.25
+Cat:antibiotics;EN:Vancomycin;MW:1449.25
 +
 <-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,
@@ -754,8 +754,8 @@ EN:Vancomycin;MW:1449.25
   @10,*\^-60,60,//O,!,NH2,@13,*\,NH,!,//O,!,/??!,*/H^60,!~zf,NH,!,
   @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
--------------------------------------------------------------------------------
-EN:Maitotoxin;MW:3425.86
++------------------------------------------------------------------------------
+Cat:biological;EN:Maitotoxin;MW:3425.86
 +
 <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,
@@ -773,11 +773,11 @@ EN:Maitotoxin;MW:3425.86
            @6,\,O,30,SOO,30,"O{Na}",
   @$36,-45~zf,O,30,SOO,30,"O{Na}",
   @$150,\,|,!7,{1,2}:/*OH,4:*/_,5:/*_,7=dl
--------------------------------------------------------------------------------
-EN:Okadaic acid;MW:805.00
++------------------------------------------------------------------------------
+Cat:biological;EN:Okadaic acid;MW:805.00
 +
 <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,
   3=wb,11=dl,15=dr,17=wf,19=wf,38=wb,{5,7,16,24,25,33,42}:O,
   32:*/H^60,10:/Me,{12,31}:*/_,27://_,37:/*_,28:/OH,{3,29}:/*OH
--------------------------------------------------------------------------------
++------------------------------------------------------------------------------
diff --git a/graphics/mcf2graph/mcf_exa_soc.mf b/graphics/mcf2graph/mcf_exa_soc.mf
index 74676e16c8..581833d27b 100644
--- a/graphics/mcf2graph/mcf_exa_soc.mf
+++ b/graphics/mcf2graph/mcf_exa_soc.mf
@@ -1,62 +1,50 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format for mcf_example.tex   by Akira Yamaji  2021.04.04
+% Molecular Coding Format for mcf_example.tex   by Akira Yamaji  2021.04.18
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf;   %%% it must be version 4.62
-message "* mcf_exa_soc 2021.04.04";
+input mcf2graph.mf;   %%% it must be version 4.63
+message "* mcf_exa_soc 2021.04.18";
 message "";
 %------------------------------------------------------------------------------
 fsize:=(35mm,24mm);
 max_blength:=4.5mm;
 %------------------------------------------------------------------------------
-%%%%sw_aux_out:=1;
 %%%%sw_fframe:=1;
-%%%%sw_aframe:=1;
-%%%%sw_mframe:=1;
-%%%%sw_expand:=1;
 tag1:="J"; tag2:="C"; tag3:="fm"; tag4:="mw"; tag5:="EN"; tag6:="MW";
-%%%%tag5:="mi";
-%%%%tag6:="w1";
-%%%%tag7:="h1";
-%%%% sw_rep_out:=1;
-%%%% sw_mol_out:=1;
 %%%% atomfont:="uhvb8r";
 %%%% atomfont:="cmtt8";
-%%%% atomfont:="cmvtt10";
 %%%% outputformat:="png"; hppp:=vppp:=0.1; outputtemplate:="%j-%3c.png";
-%------------------------------------------------------------------------------
-%%%% ext(nA:=10mm; pickup pencircle scaled 0.1pt;
-%%%%     draw(0,0)--(w,0)--(w,h)--(0,h)--cycle;
-%%%%     for i=nA step nA until w: draw(i,0)--(i,h); endfor
-%%%%     for i=nA step nA until h: draw(0,i)--(w,i); endfor );
-%------------------------------------------------------------------------------
 %%ext(defaultfont:="uhvr8r"; defaultscale:=.6; label.lrt(inf_EN,(-2bp,1.5bp));)
+%------------------------------------------------------------------------------
+if f_MP=0: input mcf_exa_soc-mf.aux; % (metafont) make aux file before typeset
+else:                                % mpost -s ahlength=7 mcf_exa_soc.mf
 %******************************************************************************
-beginfont("f:mcf_data_base","t:EN","v:Adenine")           % select EN=Adenine
+beginfont("f:mcf_data_base","t:EN","v:Adenine")         % select EN=Adenine
   if check(mc)=0: MC(scantokens(mc)) fi
 endfont
 %******************************************************************************
-beginfont("f:mcf_data_base","t:EN","v:Guanine")           % select EN=Guanine
+beginfont("f:mcf_data_base","t:EN","v:Guanine")         % select EN=Guanine
   if check(mc)=0: MC(scantokens(mc)) fi
 endfont
 %******************************************************************************
-beginfont("f:mcf_data_base","t:EN","v:Cytosine")          % select EN=Cytosine
+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
 %******************************************************************************
-sw_file_open:=1;                                          % keep file open
-%******************************************************************************
-beginfont("f:mcf_data_base","t:n","v:5")                  % v:5 select No.5
-  if check(mc)=0: MC(scantokens(mc)) fi
+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
 %******************************************************************************
-for i=6 upto 155:                                         % No.6 - No.155
-  beginfont("f:mcf_data_base","t:n","v:0")                % v:0 no selection
-    if check(mc)=0: MC(scantokens(mc)) fi
-  endfont
+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:0' no selection
+  endfont                                               %
+  exitif f_EOF=1;                                       % exit if file end
 endfor
 %******************************************************************************
+fi
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 bye
diff --git a/graphics/mcf2graph/mcf_example.pdf b/graphics/mcf2graph/mcf_example.pdf
index 9ea4f8d046..e29e57298f 100644
Binary files a/graphics/mcf2graph/mcf_example.pdf and b/graphics/mcf2graph/mcf_example.pdf differ
diff --git a/graphics/mcf2graph/mcf_example.tex b/graphics/mcf2graph/mcf_example.tex
index 5d1dfa40e2..b6ea719116 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.04.04
+% Example of MCF typeset by LaTeX   mcf_examples.tex   by A.Yamaji  2021.04.18
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass[a4paper]{article}
 \usepackage{graphicx}
@@ -8,6 +8,9 @@
 \edef\jobname{mcf_exa_soc}%
 \usepackage{mcf_setup}
 %--------------------------------
+\pdfpkresolution=1200
+%--------------------------------
+%%%%\edef\f@ext{pk}%
 \edef\f@ext{mps}%
 %--------------------------------
 \pagestyle{empty}
diff --git a/graphics/mcf2graph/mcf_man_soc.mf b/graphics/mcf2graph/mcf_man_soc.mf
index 871a24aea1..f2f874ee85 100644
--- a/graphics/mcf2graph/mcf_man_soc.mf
+++ b/graphics/mcf2graph/mcf_man_soc.mf
@@ -1,14 +1,12 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format file for mcf_manual.tex  by Akira.Yamaji 2021.04.04
+% Molecular Coding Format file for mcf_manual.tex  by Akira.Yamaji 2021.04.18
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf;   %% it must be version 4.62
+input mcf2graph.mf;   %% it must be version 4.63
 % ** use data base file 'mcf_data_base.mcf'
-message "mcf_man_soc 2021.04.04"; message "";
+message "mcf_man_soc 2021.04.18"; message "";
 %------------------------------------------------------------------------
 sw_mframe:=0;
 sw_expand:=0;
-%%%%sw_aux_out:=0;
-%%%%sw_rep_out:=1;
 %%%%ext(defaultscale:=.5; label.bot(decimal(char_num)&":"&inf_EN,(.5w,0));)
 %%%%ext(defaultscale:=.5; label.bot(mc,(.5w,0));)
 %***********************************************************************
diff --git a/graphics/mcf2graph/mcf_manual.pdf b/graphics/mcf2graph/mcf_manual.pdf
index 536e4cc0f4..34896448cd 100644
Binary files a/graphics/mcf2graph/mcf_manual.pdf and b/graphics/mcf2graph/mcf_manual.pdf differ
diff --git a/graphics/mcf2graph/mcf_manual.tex b/graphics/mcf2graph/mcf_manual.tex
index 6356d34094..f96a5357cf 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.04.04
+%  Molecular Coding Format manual                by  Akira Yamaji 2021.04.18
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass[a4paper]{article}
 \usepackage[pdftex]{graphicx}
@@ -48,7 +48,7 @@
 \edef\file@name{\MCFjobname-\z@num\fnum.\fext}%
 \setbox\fbox=\hbox{\@strufont\char\fnum}%
 \includegraphics[width=\wd\fbox,height=\ht\fbox]{\file@name}%
-%%%%%%%\includegraphics{\file@name}%
+%%%%%%\includegraphics{\file@name}%
 \fi%
 \global\advance\fnum\@ne\relax%
 }%
@@ -1469,7 +1469,7 @@ endfont
 \section{Example to use mcf2graph}
 \subsection{Metafont/Metapost souce file}
 \index{mcf2graph.mf}%
-\index{sw\_aux\_out}%
+\index{sw\_output}%
 \index{sw\_file\_open}%
 \index{tag}%
 \index{var}%
@@ -1477,14 +1477,14 @@ endfont
 %-------------------------------------------------------------------------
 input mcf2graph.mf;                                     > input main macro
 %-------------------------------------------------------------------------
-sw_aux_out:=1;        % aux(information) file output on > global setting
+sw_output:=Info1;     % aux(information) file output on > global setting
+%%%% sw_output:=Report;                                 > report output
+%%%% sw_output:=MOL2k;                                  > MOL file output
 fsize:=(60mm,40mm);   %  (font width,font height)       >
 tag1:="J";                                              > jobname
 tag2:="C";                                              > char No
 tag3:="mw";           % calculated molecular weight     > 
 tag4:="fm";           % calculated molecular formula    >
-%%%% sw_rep_out:=1;                                     > report output
-%%%% sw_mol_out:=1;                                     > MOL file output
 outputformat:="png"; hppp:=vppp:=0.1;                   > PNG output
 outputtemplate:="%j-%3c.png";                           >
 %-------------------------------------------------------------------------
@@ -1492,7 +1492,7 @@ beginfont("EN:Ampicillin","MW:349.405")                 > information
   MC(<45,?4,-3=?5,2:N,7:S,                              > immediately compile
     3^45:/*H,1://O^15,5:/*COOH^-18,6:??,                >
     @4,*\^15,NH,!,//O,!,/*NH2,!,Ph)                     >
-endfont                                                 > end font
+endfont                                                 >
 %------------------------------------------------------------------------
 beginfont("EN:Cholesterol","MW:386.65",                 >information
   %----------------------------------------             >
@@ -1502,7 +1502,7 @@ beginfont("EN:Cholesterol","MW:386.65",                 >information
   ": @-1,18,/*_,-60,!3,?!               ")              > mc4
   %----------------------------------------             >
   if check(mc)=0: MC(scantokens(mc)) fi                 > mc=mc1 - mc4
-endfont                                                 > end font
+endfont                                                 >
 %------------------------------------------------------------------------------
 beginfont("f:mcf_data_base","t:EN","v:Adenine")         > from mcf_data_base.mcf
   if check(mc)=0: MC(scantokens(mc)) fi                 > select EN="Adenine"
@@ -1516,16 +1516,14 @@ beginfont("f:mcf_data_base","t:EN","v:Cytosine")        > from mcf_data_base.mcf
   if check(mc)=0: MC(scantokens(mc)) fi                 > select EN="Cytosine"
 endfont                                                 >
 %------------------------------------------------------------------------------
-sw_file_open:=1;                     > keep file open  **default sw_file_open=0
-%------------------------------------------------------------------------------
-beginfont("f:mcf_data_base","t:n","v:4")                > from mcf_data_base.mcf
+beginfont("f+:mcf_data_base","t:n","v:4")               > from mcf_data_base.mcf
   if check(mc)=0: MC(scantokens(mc)) fi                 > v:4 select No.4
-endfont                                                 >
+endfont                                                 > 'f+' keep file open
 %------------------------------------------------------------------------------
 for i=5 upto 155:                                       > from mcf_data_base.mcf
-  beginfont("f:mcf_data_base","t:n","v:0")              > v:0 no selection
+  beginfont("f+:mcf_data_base","v:*")                   > v:* no selection
     if check(mc)=0: MC(scantokens(mc)) fi               > No.5 - No.155
-  endfont                                               >
+  endfont                                               > 'f+' keep file open
 endfor                                                  >
 %------------------------------------------------------------------------------
 bye
@@ -1536,66 +1534,65 @@ bye
 \subsection{Molecular data base file}
 \begin{verbatim}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% molecular data base file mcf_data_base.mcf  by Akira Yamaji  2021.04.04
+% molecular data base file mcf_data_base.mcf  by Akira Yamaji  2021.04.18
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %  tag1:var1;tag2:var2;tag3:var3 ....
 %  first character of line '%' comment out
-%  first character of line '+' begin molecular definition
-%  first character of line '-' end molecular definition
-%---------------------------------------------------------------------------
-EN:Cytosine;MW:111.10
+%  first character of line '+' begin MCF , end MCF
+%------------------------------------------------------------------------------
+Cat:biological;EN:Adenine;MW:135.13
++
+<30,?6,3=?5,{1,3,5,9}=dl,{2,6,9}:N,5:/NH2,7:NH
++------------------------------------------------------------------------------
+Cat:biological;EN:Guanine;MW:151.13
++
+<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
 +
 <30,?6,{4,6}=dl,4:N,3://O,2:NH,5:/NH2
-----------------------------------------------------------------------------
-EN:Thymine;MW:126.11
++------------------------------------------------------------------------------
+Cat:biological;EN:Thymine;MW:126.11
 +
 <30,?6,3=dl,{2,6}:NH,{1,5}://O,4:/_
-----------------------------------------------------------------------------
-EN:Uracil;MW:112.09
++------------------------------------------------------------------------------
+Cat:biological;EN:Uracil;MW:112.09
 +
 <30,?6,6=dl,{3,5}://O,{2,4}:NH
-----------------------------------------------------------------------------
-EN:Geraniol;MW:154.25
++------------------------------------------------------------------------------
+Cat:biological;EN:Geraniol;MW:154.25
 +
 <30,!8,OH,{2,6}=dr,{2,6}:/_
-----------------------------------------------------------------------------
-EN:Limonene;MW:136.24
++------------------------------------------------------------------------------
+Cat:biological;EN:Limonene;MW:136.24
 +
 <30,?6,2=dl,2:/_,@5,*\,/_,!!
-----------------------------------------------------------------------------
-EN:l-Menthol;MW:156.27
++------------------------------------------------------------------------------
+Cat:biological;EN:l-Menthol;MW:156.27
 +
 <30,?6,2:/*?!,5:*/_,3:*/OH
-----------------------------------------------------------------------------
-EN:Vanillin;MW:152.15
++------------------------------------------------------------------------------
+Cat:biological;EN:Vanillin;MW:152.15
 +
 <30,Ph,2:/OH,3:/O!,5:/CHO
-+----------------------------------------------------------------------------
-EN:Allicin;MW:162.28
++------------------------------------------------------------------------------
+Cat:biological;EN:Allicin;MW:162.28
 +
 <-30,!!,!2,SO,!,S,!2,!!
-----------------------------------------------------------------------------
-EN:Stearic acid;MW:284.48;
++------------------------------------------------------------------------------
+Cat:biological;EN:Stearic acid;MW:284.48
 +
 <30,!17,COOH
-----------------------------------------------------------------------------
-EN:Linoleic acid;MW:280.45
++------------------------------------------------------------------------------
+Cat:biological;EN:Linoleic acid;MW:280.45
 +
 <30,!5,-30,-30,!,-30,-30,!7,COOH,{6,9}=dr
-----------------------------------------------------------------------------
-EN:Sphingosine;MW:299.50
-+
-<30,!18,OH,14=dr,-3:*/OH,-2:/*NH2
-----------------------------------------------------------------------------
-EN:Tocopherol;MW:430.717
-+
-<30,Ph,3=?6,7:O,{1,2,5}:/_,8:/*_^60,6:/OH,@8,\,|,!12,{4,8}:/*_,12:/_
-----------------------------------------------------------------------------
++------------------------------------------------------------------------------
 \end{verbatim}
-%------------------------------------------------------------------------
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \noindent%
 \newpage
-\subsection{Information auxfile output}
+\subsection{Information aux file output}
 \paragraph{(Insert option parameter setting)}
 \index{J}%
 \index{C}%
@@ -1612,14 +1609,13 @@ EN:Tocopherol;MW:430.717
 \index{w}%
 \index{h}%
 \begin{verbatim}
-  sw_aux_out=1 : tag1:var1;tag2:var2
-  sw_aux_out=2 : tag1;tag2 var1;var2
-  ** default : sw_aux_out=0
+  sw_output:=Info1;    % tag1:var1;tag2:var2
+  sw_output:=Info2;    % tag1;tag2 var1;var2
 \end{verbatim}
 \paragraph{(Command line)}
 \begin{verbatim}
-  >mpost -s ahlength=1 FILENAME  (sw_aux_out=1)
-  >mpost -s ahlength=2 FILENAME  (sw_aux_out=2)
+  >mpost -s ahlength=1 FILENAME  (sw_output=Info1)
+  >mpost -s ahlength=2 FILENAME  (sw_output=Info2)
 \end{verbatim}
 \paragraph{(Sourse)}
 \begin{verbatim}
@@ -1635,13 +1631,13 @@ tag1:="J"; tag2:="C"; tag3:="mw"; tag4:="fm"; tag5:="EN";
 \paragraph{(Output)}
 \index{aux\_delimiter}%
 \begin{verbatim}
-(sw_aux_out=1)
+(sw_output=Info1)
 F:mcf_man_soc;C:1;mw:349.40462;fm:C16H19N3O4S;EN:Ampicillin
 F:mcf_man_soc;C:2;mw:386.6532;fm:C27H46O;EN:Cholesterol
 F:mcf_exa_soc;C:3;mw:470.5113;fm:C26H30O8;EN:Limonin
 F:mcf_exa_soc;C:4;mw:536.8722;fm:C40H56;EN:beta-Carotene
 
-(sw_aux_out=2)
+(sw_output=Info2)
 F;C;mw;fm
 mcf_man_soc;1;349.40462;C16H19N3O4S;Ampicillin
 mcf_man_soc;2;386.6532;C27H46O;Cholesterol
@@ -1672,14 +1668,76 @@ w   : font width
 h   : font height
 \end{verbatim}
 %------------------------------------------------------------------------
+\noindent%
+\newpage
+\subsection{Metafont aux file output}
+\paragraph{(Insert option parameter setting)}
+\begin{verbatim}
+  sw_output:=Mfont;
+\end{verbatim}
+\paragraph{(Command line)}
+\begin{verbatim}
+  >mpost -s ahlength=7 FILENAME  (sw_output=Mfont)
+\end{verbatim}
+\paragraph{(Output)}
+\begin{verbatim}
+beginfont("Cat:biological","EN:Adenine","MW:135.13",
+": <30,?6,3=?5,{1,3,5,9}=dl,{2,6,9}:N,5:/NH2,7:NH")
+if check(mc)=0: MC(scantokens(mc)) fi
+endfont
+beginfont("Cat:biological","EN:Guanine","MW:151.13",
+": <30,?6,3=?5,{1,3,9}=dl,{2,9}:N,{6,7}:NH,5://O,1:/NH2")
+if check(mc)=0: MC(scantokens(mc)) fi
+endfont
+beginfont("Cat:biological","EN:Cytosine","MW:111.10",
+": <30,?6,{4,6}=dl,4:N,3://O,2:NH,5:/NH2")
+if check(mc)=0: MC(scantokens(mc)) fi
+endfont
+beginfont("Cat:biological","EN:Thymine","MW:126.11",
+": <30,?6,3=dl,{2,6}:NH,{1,5}://O,4:/_")
+if check(mc)=0: MC(scantokens(mc)) fi
+endfont
+beginfont("Cat:biological","EN:Adenine","MW:135.13",
+": <30,?6,3=?5,{1,3,5,9}=dl,{2,6,9}:N,5:/NH2,7:NH")
+if check(mc)=0: MC(scantokens(mc)) fi
+endfont
+beginfont("Cat:biological","EN:Guanine","MW:151.13",
+": <30,?6,3=?5,{1,3,9}=dl,{2,9}:N,{6,7}:NH,5://O,1:/NH2")
+if check(mc)=0: MC(scantokens(mc)) fi
+endfont
+beginfont("Cat:biological","EN:Cytosine","MW:111.10",
+": <30,?6,{4,6}=dl,4:N,3://O,2:NH,5:/NH2")
+if check(mc)=0: MC(scantokens(mc)) fi
+endfont
+beginfont("Cat:biological","EN:Thymine","MW:126.11",
+": <30,?6,3=dl,{2,6}:NH,{1,5}://O,4:/_")
+if check(mc)=0: MC(scantokens(mc)) fi
+endfont
+beginfont("Cat:biological","EN:Uracil","MW:112.09",
+": <30,?6,6=dl,{3,5}://O,{2,4}:NH")
+if check(mc)=0: MC(scantokens(mc)) fi
+endfont
+beginfont("Cat:biological","EN:Geraniol","MW:154.25",
+": <30,!8,OH,{2,6}=dr,{2,6}:/_")
+if check(mc)=0: MC(scantokens(mc)) fi
+endfont
+beginfont("Cat:biological","EN:Limonene","MW:136.24",
+": <30,?6,2=dl,2:/_,@5,*\,/_,!!")
+if check(mc)=0: MC(scantokens(mc)) fi
+endfont
+beginfont("Cat:biological","EN:l-Menthol","MW:156.27",
+": <30,?6,2:/*?!,5:*/_,3:*/OH")
+if check(mc)=0: MC(scantokens(mc)) fi
+endfont
+\end{verbatim}
+%------------------------------------------------------------------------
 \newpage
 \noindent%
 \subsection{Report output}
 \paragraph{(Insert option parameter setting)}
-\index{sw\_rep\_out}%
+\index{sw\_output}%
 \begin{verbatim}
-  sw_rep_out:=1;
-  ** default : sw_rep_out=0
+  sw_output:=Report;
 \end{verbatim}
 \paragraph{(Command line)}
 \begin{verbatim}
@@ -1739,11 +1797,10 @@ h   : font height
 \noindent%
 \subsection{MOL file output}
 \paragraph{(Insert option parameter setting)}
-\index{sw\_mol\_out}%
+\index{sw\_output}%
 \begin{verbatim}
-  sw_mol_out:=1;     % MOL(V2000)
-  sw_mol_out:=2;     % MOL(V3000)
-  ** default : sw_mol_out=0
+  sw_output:=MOL2k;     % MOL(V2000)
+  sw_output:=MOL3k;     % MOL(V3000)
 \end{verbatim}
 \paragraph{(Command line)}
 \begin{verbatim}
@@ -1802,7 +1859,7 @@ M  END
 \mplibnumbersystem{double}%
 \everymplib{%
   if unknown Ph1: input mcf2graph.mf; fi
-  sw_calc:=1;  sw_fframe:=4;  max_blength:=4.5mm;
+  sw_output:=None;  sw_fframe:=4;  max_blength:=4.5mm;
   defaultfont:="uhvr8r"; defaultsize:=8bp; defaultscale:=1;
 }%
 \begin{document}
diff --git a/graphics/mcf2graph/mcf_mplib_exa.pdf b/graphics/mcf2graph/mcf_mplib_exa.pdf
index 15f27386b6..8c6aaac13a 100644
Binary files a/graphics/mcf2graph/mcf_mplib_exa.pdf and b/graphics/mcf2graph/mcf_mplib_exa.pdf differ
diff --git a/graphics/mcf2graph/mcf_mplib_exa.tex b/graphics/mcf2graph/mcf_mplib_exa.tex
index 364d4b12f8..71f5f26909 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.04.04
+% Example of  MCF typest with LuaLaTeX(luamplib)     by A.Yamaji    2021.04.18
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% ** mcf2graph.mf must be version 4.62
+% ** mcf2graph.mf must be version 4.63
 % ** use mcf_data_base.mcf
 \documentclass{article}
 %------------------------------------------------------------------------------
@@ -13,7 +13,7 @@
 \mplibnumbersystem{double}%
 \everymplib{%
   if unknown Ph1: input mcf2graph.mf; fi
-  sw_calc:=1;
+  sw_output:=None;
   sw_fframe:=4;
   max_blength:=4.5mm;
   defaultfont:="uhvr8r";
@@ -216,7 +216,7 @@ EN:Vancomycin;MW:1449.25
   @10,*\^-60,60,//O,!,NH2,@13,*\,NH,!,//O,!,/??!,*/H^60,!~zf,NH,!,
   @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
--------------------------------------------------------------------------------
++------------------------------------------------------------------------------
 \end{verbatim}
 %----------------------------------------------------------------------------
 \begin{mplibcode}
@@ -255,7 +255,7 @@ EN:Maitotoxin;MW:3425.86
            @6,\,O,30,SOO,30,"O{Na}",
   @$36,-45~zf,O,30,SOO,30,"O{Na}",
   @$150,\,|,!7,{1,2}:/*OH,4:*/_,5:/*_,7=dl
--------------------------------------------------------------------------------
++------------------------------------------------------------------------------
 \end{verbatim}
 %--------------------------------------------------------------------------------
 \begin{mplibcode}
diff --git a/macros/latex/contrib/easybook/doc/chapter1.tex b/macros/latex/contrib/easybook/doc/chapter1.tex
index d6c964f4eb..99e06cc2d2 100644
--- a/macros/latex/contrib/easybook/doc/chapter1.tex
+++ b/macros/latex/contrib/easybook/doc/chapter1.tex
@@ -1,111 +1,70 @@
 % Chapter 1
 
-\chapter{常用环境}
+\chapter{多彩盒子}
 
-\section{公式}
-\index{g@公式}
-\zhlipsum*[42][name = aspirin]
-\begin{equation}\label{eq:matrix}
-  \bm{A} = \left[
-    \begin{matrix}
-      a_{11} & a_{12} & \cdots & a_{1n} \\
-      a_{21} & a_{22} & \cdots & a_{2n} \\
-      \vdots & \vdots & \ddots & \vdots \\
-      a_{m1} & a_{m2} & \cdots & a_{mn} \\
-    \end{matrix}
-  \right] = \left[
-    \begin{matrix}
-      \bm{a}_1 & \bm{a}_2 & \cdots & \bm{a}_n
-    \end{matrix}
-  \right]
-\end{equation}
-可以通过添加标签在正文中引用公式，如带有中文括号的引用\ref{eq:matrix}。
+\begin{outline}
+\index{zhaiyao@摘要盒子}
+  \item 这是一个摘要盒子。
+  \item 它的标题是可选参数，默认标题是摘要。
+\end{outline}
 
-\zhlipsum*[56][name = aspirin]
-\begin{equation}
-  \begin{split}
-    \iint_{A}E\rho(\bm{v}\cdot\bm{n})\mathrm{d}A + \frac{\partial}{\partial t}\iiint_{V}E\rho \mathrm{d}V &= \frac{\delta Q}{\mathrm{d}t} - \frac{\delta W}{\mathrm{d}t}
-    \\
-    \iint_{A}\left(U + \frac{v^{2}}{2} + gz + \frac{P}{\rho}\right)\rho(\bm{v}\cdot\bm{n})\mathrm{d}A + \frac{\partial}{\partial t}\iiint_{V}E\rho\mathrm{d}V &= \frac{\delta Q}{\mathrm{d}t} - \frac{\delta W_{s}}{\mathrm{d}t}
-  \end{split}
-\end{equation}
+\section{定理}
+\index{d@定理}
+\begin{theorem}[（中文定理\footnote{选自鲁迅的祝福\ref{theorem:gauss formula}。}）]
+\label{theorem:gauss formula}
+\index{d@定理!g@中文定理}
+\zhlipsum*[31][name = zhufu]
+\end{theorem}
 
-\zhlipsum*[42][name = aspirin]
-\begin{subnumcases}{y =}
-  C_1e^{r_1x} + C_2e^{r_2x} & \quad $p^2 - 4q > 0$
-  \\
-  \left(C_1 + C_2\right)e^{r_1x} & \quad $p^2 - 4q = 0$
-  \\
-  e^{\alpha x}\left(C_1\cos\beta x + C_2\sin\beta x\right) & \quad $p^2 - 4q < 0$
-\end{subnumcases}
+\begin{definition}[(English definition)]
+\index{d@定理!s@English definition}
+\lipsum*[19]
+\end{definition}
 
-\zhlipsum*[57][name = aspirin]
+\begin{lemma}
+这是一个引理。
+\end{lemma}
 
-\clearpage
-\section{插图}
-\index{c@插图}
-当我们需要排列一组子图共享标题的图片时，可以使用依赖于 \lstinline{caption} 宏包的 \lstinline{subcaption} 宏包的功能，效果见\ref{fig:example}。
-\begin{figure}[htbp]
-  \centering
-  \subcaptionbox{并排子图1}
-    {\includegraphics[width = 0.4\textwidth]{example-image-4x3}}
-  \hspace{1.2em}
-  \subcaptionbox{并排子图2}
-    {\includegraphics[width = 0.4\textwidth]{example-image-4x3}}
-  \bicaption[使用 subcaption 排版子图]{使用 subcaption 宏包的 subcaptionbox 命令排版子图}[Use subcaption to typeset subgraphs]{Use the subcaptionbox command of the subcaption package to typeset sub-pictures}\label{fig:example}
-\end{figure} 
+\begin{corollary}
+这是一个推论。
+\end{corollary}
 
-\section{表格}
-\index{b@表格}
-合并表格列使用 \lstinline{\multicolumn} 命令，合并行可以使用 \lstinline{multirow} 宏包的 \lstinline{\multirow} 命令。当插入的表格内容过长以至于一行放不下的情况可以使用 \lstinline{tabularx} 环境，文档类设置了\textsf{L、C和R}三个列对齐选项，一个例子如\ref{tab:example} 所示。
-\begin{table}[htbp]
-  \centering
-  \bicaption{使用 tabularx 创建内容过长表格}{Use tabularx to create a table with too long content}\label{tab:example}\small
-  \begin{tabularx}{0.87\textwidth}{@{}llL@{}}
-    \toprule
-    Aliquam & Integer & Pellentesque tincidunt purus
-    vel magna. \\
-    \midrule
-    viverra & \multirow[c]{3}*{metus} & Nulla malesuada porttitor diam. Vestibulum lectus. Proin mauris. Proin eu nunc eu urna hendrerit faucibus. \\
-    semper & & Nullam elementum, urna vel imperdiet sodales, elit ipsum pharetra ligula, ac pretium ante justo a nulla. Curabitur tristique arcu eu metus. \\
-    \multicolumn{2}{c}{\multirow{3}*[0ex]{convallis}} & Nunc elementum fermentum wisi. Aenean placerat. Ut imperdiet, enim sed gravida sollicitudin, felis odio placerat quam, ac pulvinar elit purus eget enim. \\
-    \bottomrule
-  \end{tabularx}
-\end{table}
+\begin{proposition}
+这是一个性质。
+\end{proposition}
 
 \clearpage
-\section{列表}
-\index{l@列表}
+\begin{example}
+这是一个例。
+\end{example}
+
+\begin{remark}
+这是一个注。
+\end{remark}
+
+\begin{proof}
+这是一个证明，末尾自动添加证明结束符。
+\end{proof}
+
+\begin{easybox}[DarkCyan](An introduction to aspirin on Wikipedia)
+\index{z@自定义盒子}
+  \zhlipsum*[59][name = aspirin]
+  \tcblower
+  \zhlipsum*[59][name = aspirin]
+\end{easybox}
 
-\subsection{排序列表}
-\index{l@列表!p@排序列表}
-\begin{enumerate}
-  \item \zhlipsum[41-42][name = aspirin]
-  \begin{enumerate}
-    \item \zhlipsum*[42][name = aspirin]
-    \begin{enumerate}
-      \item \zhlipsum*[42][name = aspirin]
-    \end{enumerate}
-  \end{enumerate}
-\end{enumerate}
+\begin{ebparbox}*[Teal](阿司匹林)
+  \zhlipsum*[59][name = aspirin]
+\end{ebparbox}
 
-\subsection{常规列表}
-\index{l@列表!c@常规列表}
-\begin{itemize}
-  \item \zhlipsum[41-42][name = aspirin]
-  \begin{itemize}
-    \item \zhlipsum*[42][name = aspirin]
-    \begin{itemize}
-      \item \zhlipsum*[42][name = aspirin]
-    \end{itemize}
-  \end{itemize}
-\end{itemize}
+\begin{ebparbox}
+  \zhlipsum*[59][name = aspirin]
+\end{ebparbox}
 
-\subsection{主题列表}
-\index{l@列表!z@主题列表}
-\begin{description}
-  \item[主题一] \zhlipsum*[42][name = aspirin]
-  \begin{description}
-    \item[主题二] \zhlipsum*[42][name = aspirin]
-  \end{description}
-\end{description}
\ No newline at end of file
+\begin{exercise}[LightYellow][1.](习题)
+\index{x@习题环境}
+  \item \zhlipsum*[20][name = zhufu]
+    \begin{tasks}
+      \task \zhlipsum*[20][name = zhufu]
+    \end{tasks}
+\end{exercise}
\ No newline at end of file
diff --git a/macros/latex/contrib/easybook/doc/chapter2.tex b/macros/latex/contrib/easybook/doc/chapter2.tex
index d72ee6424a..a6bb1afb5d 100644
--- a/macros/latex/contrib/easybook/doc/chapter2.tex
+++ b/macros/latex/contrib/easybook/doc/chapter2.tex
@@ -1,80 +1,111 @@
 % Chapter 2
 
-\chapter{定理盒子}
+\chapter{常用环境}
 
-\begin{outline}
-\index{zhaiyao@摘要盒子}
-  \item 这是一个摘要盒子。
-  \item 它的标题是可选参数，默认标题是摘要。
-\end{outline}
+\section{公式}
+\index{g@公式}
+\zhlipsum*[42][name = aspirin]
+\begin{equation}\label{eq:matrix}
+  \bm{A} = \left[
+    \begin{matrix}
+      a_{11} & a_{12} & \cdots & a_{1n} \\
+      a_{21} & a_{22} & \cdots & a_{2n} \\
+      \vdots & \vdots & \ddots & \vdots \\
+      a_{m1} & a_{m2} & \cdots & a_{mn} \\
+    \end{matrix}
+  \right] = \left[
+    \begin{matrix}
+      \bm{a}_1 & \bm{a}_2 & \cdots & \bm{a}_n
+    \end{matrix}
+  \right]
+\end{equation}
+可以通过添加标签在正文中引用公式，如带有中文括号的引用\ref{eq:matrix}。
 
-\section{定理}
-\index{d@定理}
-\begin{theorem}[（高斯公式\footnote{选自高等数学公式。}）]
-\label{theorem:gauss formula}
-\index{d@定理!g@高斯公式}
-设空间闭区域$\Omega$是由分片光滑的闭曲面$\Sigma$围成，若函数$P(x,y,z)$，$Q(x,y,z)$，$R(x,y,z)$在$\Omega$上具有一节连续偏导数，则有
-\begin{align}
-  \iiint_\Omega\left(\frac{\partial P}{\partial x} + \frac{\partial Q}{\partial y} + \frac{\partial R}{\partial x}\right)\mathrm{d}V & =\oiint_\Sigma P\mathrm{d}y\mathrm{d}z + Q\mathrm{d}z\mathrm{d}x + R\mathrm{d}x\mathrm{d}y
-  \\
-  & =\oiint_\Sigma \left(P\cos\alpha + Q\cos\beta + R\cos\gamma\right)\mathrm{d}S
-\end{align}
-这里$\Sigma$是整个边界曲面$\Omega$的外侧，$\cos\alpha,\cos\beta,\cos\gamma$是$\Sigma$在点$(x,y,z)$处的法向量的方向余弦。引用这个公式如\ref{theorem:gauss formula}。
-\end{theorem}
+\zhlipsum*[56][name = aspirin]
+\begin{equation}
+  \begin{split}
+    \iint_{A}E\rho(\bm{v}\cdot\bm{n})\mathrm{d}A + \frac{\partial}{\partial t}\iiint_{V}E\rho \mathrm{d}V &= \frac{\delta Q}{\mathrm{d}t} - \frac{\delta W}{\mathrm{d}t}
+    \\
+    \iint_{A}\left(U + \frac{v^{2}}{2} + gz + \frac{P}{\rho}\right)\rho(\bm{v}\cdot\bm{n})\mathrm{d}A + \frac{\partial}{\partial t}\iiint_{V}E\rho\mathrm{d}V &= \frac{\delta Q}{\mathrm{d}t} - \frac{\delta W_{s}}{\mathrm{d}t}
+  \end{split}
+\end{equation}
 
-\begin{definition}[(Stokes formula)]
-\index{d@定理!s@Stokes formula}
-Let $\Gamma$ be a piecewise smooth directed closed curve, $\Sigma$ is a piecewise smooth directed surface bounded by $\Gamma$, the side of $\Gamma$ and the positive direction of $\Sigma$ According to the right-hand rule, if the function $P(x,y,z)$, $Q(x,y,z)$, $R(x,y,z)$ has a first-order continuous deviation on the curve $\Sigma$ Derivative, then
-\begin{multline}
-  \iint_\Sigma\left(\frac{\partial R}{\partial y} - \frac{\partial Q}{\partial z}\right)\mathrm{d}y\mathrm{d}z + \left(\frac{\partial P}{\partial z} - \frac{\partial R}{\partial x}\right)\mathrm{d}z\mathrm{d}x
+\zhlipsum*[42][name = aspirin]
+\begin{subnumcases}{y =}
+  C_1e^{r_1x} + C_2e^{r_2x} & \quad $p^2 - 4q > 0$
   \\
-  + \left(\frac{\partial Q}{\partial x} - \frac{\partial P}{\partial y}\right)\mathrm{d}x\mathrm{d}y = \oint_\Gamma P\mathrm{d}x + Q\mathrm{d}y + R\mathrm{d}z
-\end{multline}
-The Stokes formula is an extension of the basic calculus formula in the case of surface integration. It is also an extension of the Green formula. This formula gives the second type of surface integral on the surface block and the second type of curve on the boundary curve  Link between points.
-\end{definition}
-
-\clearpage
-\begin{lemma}
-定理环境的边框和习题标题盒子可使用 \lstinline{thmbox = false} 关闭。
-\end{lemma}
+  \left(C_1 + C_2\right)e^{r_1x} & \quad $p^2 - 4q = 0$
+  \\
+  e^{\alpha x}\left(C_1\cos\beta x + C_2\sin\beta x\right) & \quad $p^2 - 4q < 0$
+\end{subnumcases}
 
-\begin{corollary}
-这是一个推论。
-\end{corollary}
+\zhlipsum*[57][name = aspirin]
 
-\begin{proposition}
-这是一个性质。
-\end{proposition}
+\clearpage
+\section{插图}
+\index{c@插图}
+当我们需要排列一组子图共享标题的图片时，可以使用依赖于 \lstinline{caption} 宏包的 \lstinline{subcaption} 宏包的功能，效果见\ref{fig:example}。
+\begin{figure}[htbp]
+  \centering
+  \subcaptionbox{并排子图1}
+    {\includegraphics[width = 0.4\textwidth]{example-image-4x3}}
+  \hspace{1.2em}
+  \subcaptionbox{并排子图2}
+    {\includegraphics[width = 0.4\textwidth]{example-image-4x3}}
+  \bicaption[使用 subcaption 排版子图]{使用 subcaption 宏包的 subcaptionbox 命令排版子图}[Use subcaption to typeset subgraphs]{Use the subcaptionbox command of the subcaption package to typeset sub-pictures}\label{fig:example}
+\end{figure} 
 
-\begin{example}
-这是一个例。
-\end{example}
+\section{表格}
+\index{b@表格}
+合并表格列使用 \lstinline{\multicolumn} 命令，合并行可以使用 \lstinline{multirow} 宏包的 \lstinline{\multirow} 命令。当插入的表格内容过长以至于一行放不下的情况可以使用 \lstinline{tabularx} 环境，文档类设置了\textsf{L、C和R}三个列对齐选项，一个例子如\ref{tab:example} 所示。
+\begin{table}[htbp]
+  \centering
+  \bicaption{使用 tabularx 创建内容过长表格}{Use tabularx to create a table with too long content}\label{tab:example}\small
+  \begin{tabularx}{0.87\textwidth}{@{}llL@{}}
+    \toprule
+    Aliquam & Integer & Pellentesque tincidunt purus
+    vel magna. \\
+    \midrule
+    viverra & \multirow[c]{3}*{metus} & Nulla malesuada porttitor diam. Vestibulum lectus. Proin mauris. Proin eu nunc eu urna hendrerit faucibus. \\
+    semper & & Nullam elementum, urna vel imperdiet sodales, elit ipsum pharetra ligula, ac pretium ante justo a nulla. Curabitur tristique arcu eu metus. \\
+    \multicolumn{2}{c}{\multirow{3}*[0ex]{convallis}} & Nunc elementum fermentum wisi. Aenean placerat. Ut imperdiet, enim sed gravida sollicitudin, felis odio placerat quam, ac pulvinar elit purus eget enim. \\
+    \bottomrule
+  \end{tabularx}
+\end{table}
 
-\begin{remark}
-这是一个注。
-\end{remark}
+\clearpage
+\section{列表}
+\index{l@列表}
 
-\begin{proof}
-这是一个证明，末尾自动添加证明结束符。
-\end{proof}
+\subsection{排序列表}
+\index{l@列表!p@排序列表}
+\begin{enumerate}
+  \item \zhlipsum[41-42][name = aspirin]
+  \begin{enumerate}
+    \item \zhlipsum*[42][name = aspirin]
+    \begin{enumerate}
+      \item \zhlipsum*[42][name = aspirin]
+    \end{enumerate}
+  \end{enumerate}
+\end{enumerate}
 
-\begin{easybox}*[MintCream](Aspirin)
-\index{z@自定义盒子}
-  \zhlipsum*[3][name = aspirin]
-  \tcblower
-  \zhlipsum*[8][name = aspirin]
-\end{easybox}
+\subsection{常规列表}
+\index{l@列表!c@常规列表}
+\begin{itemize}
+  \item \zhlipsum[41-42][name = aspirin]
+  \begin{itemize}
+    \item \zhlipsum*[42][name = aspirin]
+    \begin{itemize}
+      \item \zhlipsum*[42][name = aspirin]
+    \end{itemize}
+  \end{itemize}
+\end{itemize}
 
-\zhlipsum*[3][name = aspirin]
-\begin{exercise}[LightYellow][1.](习题)
-\index{x@习题环境}
-  \item 设$w = f(x + y + z,xyz)$，$f$具有二阶连续偏导数，求$\dfrac{\partial w}{\partial x}$和$\dfrac{\partial ^2 w}{\partial x\partial z}$。
-  \item 已知$y = y(x)$在任意点$x$处的增量$\Delta y = \dfrac{y\Delta x}{1 + x^2} + \alpha$，其中$\alpha$是$\Delta x$的高阶无穷小（$\Delta x\to 0$时），$y(0) = \pi$，则$y(1) = \uline{\mbox{\hspace{2em}}}$。
-  \item 设函数$f(x)$在$(-\infty,+\infty)$上有定义，则下述命题中正确的是 \mbox{(\hspace{1.5em})}
-    \begin{tasks}
-      \task 若$f(x)$在$(-\infty,+\infty)$上可导且单调增加，则对一切$x\in (-\infty,+\infty)$，都有$f'(x) > 0$。
-      \task 若$f(x)$在点$x_0$处取得极值，则$f'(x_0) = 0$。
-      \task 若$f''(x_0) = 0$，则$(x_0,f(x_0))$是曲线$y = f(x)$的拐点坐标。
-      \task 若$f'(x_0) = 0$, $f''(x_0) = 0$,$f'''(x_0)\ne 0$，则$x_0$一定不是$f(x)$的极值点。
-    \end{tasks}
-\end{exercise}
\ No newline at end of file
+\subsection{主题列表}
+\index{l@列表!z@主题列表}
+\begin{description}
+  \item[主题一] \zhlipsum*[42][name = aspirin]
+  \begin{description}
+    \item[主题二] \zhlipsum*[42][name = aspirin]
+  \end{description}
+\end{description}
\ No newline at end of file
diff --git a/macros/latex/contrib/easybook/doc/chapter3.tex b/macros/latex/contrib/easybook/doc/chapter3.tex
index 252551e7dc..d7630a59f4 100644
--- a/macros/latex/contrib/easybook/doc/chapter3.tex
+++ b/macros/latex/contrib/easybook/doc/chapter3.tex
@@ -9,13 +9,10 @@
 \begin{lstlisting}[language = Python,caption = python 程序练习题]
 #!/usr/bin/python
 # -*- coding: UTF-8 -*-
-    
-if __name__ == '__main__':
-    ptr = []
-    for i in range(5):
-        num = int(raw_input('please input a number:\n'))
-        ptr.append(num)
-    print ptr    
+
+i = ['a','b']
+l = [1,2]
+print dict([i,l])
 \end{lstlisting}
 
 \section{物理量}
@@ -47,8 +44,4 @@ if __name__ == '__main__':
 
 \subsection{参考文献}
 \index{y@引用!c@参考文献}
-这是一个参考文献引用的范例\cite{1979Prospect}。引用多个文献，将引用标号中的多个文献序号按升序排列，若其中有2个以上的连续序号，则改用范围序号，例如\cite{1979Prospect,1989The,2010An}。
-
-\section{行内盒子}
-\index{h@行内盒子}
-阿司匹林及其复方制剂都能有效治疗某几种头痛，但对另外几 \concise[Aqua]{concise}[fontupper = \rmfamily] 种则效果不明。因其他疾病或创伤导致的 \fuzzy[DarkSeaGreen]{fuzzy}[fontupper = \ttfamily,colupper = black] 继发性头痛需要及时在医疗机构接受治疗。
\ No newline at end of file
+这是一个参考文献引用的范例\cite{1979Prospect}。引用多个文献，将引用标号中的多个文献序号按升序排列，若其中有2个以上的连续序号，则改用范围序号，例如\cite{1979Prospect,1989The,2010An}。
\ No newline at end of file
diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.pdf b/macros/latex/contrib/easybook/doc/easybook-demo.pdf
index 9d626ff452..4dd19a04ce 100644
Binary files a/macros/latex/contrib/easybook/doc/easybook-demo.pdf and b/macros/latex/contrib/easybook/doc/easybook-demo.pdf differ
diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.tex b/macros/latex/contrib/easybook/doc/easybook-demo.tex
index 8940bd758d..a98428c288 100644
--- a/macros/latex/contrib/easybook/doc/easybook-demo.tex
+++ b/macros/latex/contrib/easybook/doc/easybook-demo.tex
@@ -24,7 +24,7 @@
     link =
       {
         hyperlink = various,
-        linkcolor = skyblue,
+        linkcolor = navyblue,
         linktoc = all
       },
     spread =
@@ -63,9 +63,9 @@
         % headrule = {},
         head-foot =
           {
-            \easyhead[EC]{\color{SeaGreen}\kaishu\leftmark}
-            \easyhead[OC]{\color{SeaGreen}\kaishu\rightmark}
-            \easyhead[EL,OR]{\color{SeaGreen}\thepage}
+            \easyhead[EC]{\color{DarkOrchid}\kaishu\leftmark}
+            \easyhead[OC]{\color{DarkOrchid}\kaishu\rightmark}
+            \easyhead[EL,OR]{\color{DarkOrchid}\thepage}
           }
       },
     tocset =
@@ -94,7 +94,7 @@
     % tocdepth = 2
   }
 
-\usepackage{zhlipsum,bicaption,tasks,tcolorbox,imakeidx}
+\usepackage{lipsum,zhlipsum,bicaption,tasks,tcolorbox,imakeidx}
 
 \begin{document}
 \title{\sffamily easybook 书籍文档类}
@@ -104,7 +104,7 @@
     \url{https://latexstudio.net} \\
     \url{https://gitee.com/texl3/easybook}\thanks{Gitee为项目的主要发布地址。}
   }
-\date{2021/04/17\hskip\ccwd\relax v1.24m}
+\date{2021/04/18\hskip\ccwd\relax v1.24n}
 
 \frontmatter[roman]
 \maketitle
diff --git a/macros/latex/contrib/easybook/doc/easybook.pdf b/macros/latex/contrib/easybook/doc/easybook.pdf
index 07582b235b..e840fa99d3 100644
Binary files a/macros/latex/contrib/easybook/doc/easybook.pdf and b/macros/latex/contrib/easybook/doc/easybook.pdf differ
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 09fa1194ae..e031600dbb 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -55,7 +55,7 @@ The latest version of this license is in
 %
 % \title{\sffamily easybook 书籍文档类}
 % \author{瞿毅}
-% \date{2021/04/17\hskip\ccwd\relax v1.24m\thanks{\url{https://gitee.com/texl3/easybook}}}
+% \date{2021/04/18\hskip\ccwd\relax v1.24n\thanks{\url{https://gitee.com/texl3/easybook}}}
 % \maketitle
 % \begin{abstract}
 %   \cls{easybook} 是基于 \cls{ctexbook} 书籍文档类创建以极简为风格的模板，可以看作对 \cls{ctexbook} 的进一步包装。虽然\CTeX 文档类提供了较好的中文支持，但想实现个性化功能一般需要在其基础上载入更多宏包来定制。\cls{easybook} 考虑了一些细节并载入一些常用宏包实现一般的排版需求，它适用于排版中英文书籍或笔记，甚至可稍加调整成为学位论文模板。
@@ -174,7 +174,7 @@ The latest version of this license is in
 % \end{syntax}
 % \opt{multoc} 与 \opt{style/multoc} 选项具有相同的效果，但是具有优先性且可单独设置不同目录是否双栏排版。已经预置了中英文的目录标题，可以使用 \opt{title} 选项更改目录标题的名称。\opt{book} 选项使目录标题按照 \opt{chapter} 级别输出，\opt{article} 选项使目录标题按照 \opt{article} 级别输出，默认为 \opt{chapter} 级别。
 % \changes{v1.23}{2021/03/15}{为几个目录增加键值列表的选项，可设置标题输出级别以及是否加入主目录。}
-% \changes{v1.24m}{2021/04/04}{目录命令的可选参数增加标题键值。}
+% \changes{v1.24n}{2021/04/04}{目录命令的可选参数增加标题键值。}
 % \end{function}
 %
 % \section{接口选项}
@@ -255,17 +255,17 @@ The latest version of this license is in
 %
 % \subsection{超链接}
 % \label{subsec:hyperlinks}
-% \begin{function}[EXP,added = 2021-01-05,updated = 2021-04-11]{hyperlink,linkcolor,linkcol-all,linktoc}
+% \begin{function}[EXP,added = 2021-01-05,updated = 2021-04-18]{hyperlink,linkcolor,linkcol-all,linktoc}
 % \begin{syntax}
 %   hyperlink = <(edge)|various|none>
-%   linkcolor = <(fresh)|cutepink|skyblue|crimson>
+%   linkcolor = <fresh|cutepink|(navyblue)|crimson>
 %   linkcol-all = <HTML颜色代码>
 %   linktoc = <none|section|page|(all)>
 % \end{syntax}
 % \ding{229} 以上选项路径为 \opt{link/...} \\
 % \opt{link} 将超链接选项（包括以上选项）交给 \pkg{hyperref} 处理，除了一些关于 pdf 书签的选项可能会失效，其它由键值选项命令 \tn{hypersetup} 支持的多数选项可用。
 % \changes{v1.10}{2021/01/08}{修复了 \opt{linktopage} 选项关闭时目录中标题编号无超链接的问题。}
-% \changes{v1.24m}{2021/04/05}{增加 \pkg{hyperref} 超链接选项完整的支持。}
+% \changes{v1.24n}{2021/04/05}{增加 \pkg{hyperref} 超链接选项完整的支持。}
 % \end{function}
 %
 % \begin{optdesc}
@@ -342,7 +342,7 @@ The latest version of this license is in
 % \ding{229} 以上选项路径为 \opt{bibset/...}
 % \changes{v1.21}{2021/01/11}{增加 \opt{bibset} 选项，可以使用 \hologo{BibTeX} 或 \hologo{biber} 编译参考文献。}
 % \changes{v1.23}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。}
-% \changes{v1.24m}{2021/04/09}{可以不载入参考文献包手动配置参考文献格式。}
+% \changes{v1.24n}{2021/04/09}{可以不载入参考文献包手动配置参考文献格式。}
 % \end{function}
 %
 % \begin{optdesc}
@@ -490,7 +490,7 @@ The latest version of this license is in
 % \changes{v1.21}{2021/01/13}{增加配置页眉页脚的选项。}
 % \changes{v1.23}{2021/03/08}{优化页眉页脚设置，增加 \opt{chap-mark} 和 \opt{sec-mark} 标志选项。}
 % \changes{v1.23}{2021/03/14}{可以手动绘制页眉、页脚和脚注的横线。}
-% \changes{v1.24m}{2021/04/09}{增加 \opt{subsec-mark} 标志选项，仅在 \opt{article} 模式生效。}
+% \changes{v1.24n}{2021/04/09}{增加 \opt{subsec-mark} 标志选项，仅在 \opt{article} 模式生效。}
 % \end{function}
 %
 % \begin{function}[added = 2021-01-13,updated = 2021-03-14]{\easyhead,\easyfoot}
@@ -560,8 +560,8 @@ The latest version of this license is in
 %   line-align = <(true)|false>
 % \end{syntax}
 % \opt{lolskip} 是代码目录中章之间的代码标题的距离，与\CTeX 的表格目录和图片目录中章之间的标题距离选项 \opt{lotskip} 和 \opt{lofskip} 类似，它们的值均默认0.8 pc，在 \opt{article} 模式中此选项失效。目录标签整体使用 \opt{tocline} 设置，也可使用小节 \ref{subsec:page margins} 的 \opt{list-labelsep} 选项只设置编号与标题的间距。在图表标签的参数中，\#1与\#2分别代表编号和标题，代码标签的编号和标题则是 \tn{thelstlisting} 和 \tn{lstcaption}，标签中还可包含标签名称，默认标签名称与图、表和代码环境的标题名称一致。下面举个设置标签的例子
-% \changes{v1.24m}{2021/04/05}{可以设置图、表和代码目录的标签。}
-% \changes{v1.24m}{2021/04/06}{增加目录引导线右边对齐方式。}
+% \changes{v1.24n}{2021/04/05}{可以设置图、表和代码目录的标签。}
+% \changes{v1.24n}{2021/04/06}{增加目录引导线右边对齐方式。}
 % \end{function}
 %
 % \begin{ctexexam}
@@ -594,7 +594,7 @@ The latest version of this license is in
 %   \tn{end}\marg{环境名}
 % \end{syntax}
 % \pkg{enumitem} 宏包为系统预置的列表环境 \env{enumerate}、\env{itemize}和 \env{description} 提供了更灵活的标签以及间距的控制，可使用 \tn{setlist} 命令设置原有的三种列表格式。已为三种列表预置了三个级别的格式可相互嵌套，默认标签与 \cls{book} 文档类相同，若自定义标签可例如
-% \changes{v1.24m}{2021/04/08}{重新优化列表环境的配置。}
+% \changes{v1.24n}{2021/04/08}{重新优化列表环境的配置。}
 % \end{function}
 %
 % \begin{ctexexam}
@@ -667,7 +667,7 @@ The latest version of this license is in
 %
 % \subsection{盒子}
 % \label{subsec:box}
-% 使用盒子以及小节 \ref{subsec:exercise} 中的 \env{exercise} 环境需要在导言区\textbf{手动载入} \pkg{tcolorbox} 宏包，它们的配置的选项同样由 \pkg{tcolorbox} 提供支持，具体选项可见宏包文档的 Option Keys 一节，可以进行边距、字体及背景颜色等各种个性化设置，一些配置会覆盖之前预置的设置。
+% 使用盒子以及小节 \ref{subsec:exercise} 中的 \env{exercise} 环境需要在导言区\textbf{手动载入} \pkg{tcolorbox} 宏包，它们的配置选项同样由 \pkg{tcolorbox} 提供支持，具体选项可见宏包文档的 Option Keys 一节，可以进行边距、字体及背景颜色等各种个性化设置，一些配置会覆盖之前预置的设置。
 %
 % \subsubsection{摘要盒子}
 % \begin{function}[added = 2021-01-05,updated = 2021-03-19]{outline}
@@ -687,13 +687,13 @@ The latest version of this license is in
 % \end{ctexexam}
 %
 % \subsubsection{段落盒子}
-% \begin{function}[added = 2021-01-05,updated = 2021-03-19]{easybox}
+% \begin{function}[added = 2021-01-05,updated = 2021-04-18]{easybox}
 % \begin{syntax}
-%   \tn{begin}\marg{easybox}\oarg{颜色名|(MintCream)}\parg{段落标题}\oarg{配置选项}
+%   \tn{begin}\marg{easybox}*\oarg{颜色名|(DarkCyan)}\parg{段落标题}\oarg{配置选项}
 %   \  <盒子内容>
 %   \tn{end}\marg{easybox}
 % \end{syntax}
-% 环境 \opt{easybox} 创建一个段落盒子，可以添加可选参数的标题，否则无标题框。当使用带有星号的环境时 \oarg{颜色名} 选项生效，可以自定义背景颜色，否则无背景颜色。
+% 环境 \env{easybox} 创建一个带有三个可选参数的扁平盒子。使用带有星号的环境时给盒子添加边框，\oarg{颜色名} 选项设置背景颜色，\parg{段落标题} 选项可以设置标题，默认无标题。
 % \end{function}
 %
 % \begin{ctexexam}
@@ -704,6 +704,15 @@ The latest version of this license is in
 %   \end{easybox}
 % \end{ctexexam}
 %
+% \begin{function}[added = 2021-04-18]{ebparbox}
+% \begin{syntax}
+%   \tn{begin}\marg{ebparbox}*\oarg{颜色名|(Purple)}\parg{段落标题}\oarg{配置选项}
+%   \  <盒子内容>
+%   \tn{end}\marg{ebparbox}
+% \end{syntax}
+% 环境 \env{ebparbox} 与 \env{easybox} 类似，同样带有三个可选参数。当使用带有星号的环境时盒子左边带有一条竖线，\oarg{颜色名} 选项可以自定义竖线颜色，使用不带有星号的环境则盒子带有竖线颜色的浅色背景。\parg{段落标题} 选项可以设置标题，默认无标题。
+% \end{function}
+%
 % \subsubsection{行内盒子}
 % \begin{function}[added = 2021-03-13]{\concise,\fuzzy}
 % \begin{syntax}
@@ -760,7 +769,7 @@ The latest version of this license is in
 %   \tn{labelformat}\marg{计数器}\marg{标签引用格式}
 % \end{syntax}
 % 使用 \tn{ref} 命令进行引用将会自动检测环境并添加相应的前缀，\tn{labelformat} 可以设置标签引用格式，第二个参数中\#1代表 \tn{the}\meta{计数器}，可以设置引用序号的前缀和后缀。
-% \changes{v1.24m}{2021/04/11}{取消载入 \pkg{cleveref} 宏包来交叉引用。}
+% \changes{v1.24n}{2021/04/11}{取消载入 \pkg{cleveref} 宏包来交叉引用。}
 % \end{function}
 %
 % \subsubsection{索引}
@@ -870,7 +879,7 @@ The latest version of this license is in
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplClass{easybook}{2021/04/17}{1.24m}{beta}
+\ProvidesExplClass{easybook}{2021/04/18}{1.24n}{beta}
 
 \cs_generate_variant:Nn \__ctex_define:nn {nx}
 \cs_generate_variant:Nn \int_to_arabic:n {v}
@@ -1342,8 +1351,8 @@ The latest version of this license is in
     \bool_if:NT \l__eb_draft_bool
       {
         \bool_if:NTF \l__eb_page_twoside_bool
-          {\easyfoot[C]{\color{gray!60}\sffamily\today}}
-          {\easyhead[C]{\color{gray!60}\sffamily\today}}
+          {\easyfoot[C]{\color{SlateGray}\sffamily\today}}
+          {\easyhead[C]{\color{SlateGray}\sffamily\today}}
         \geometry{showframe}
       }
   }
@@ -1992,7 +2001,7 @@ The latest version of this license is in
             enhanced~jigsaw,pad~at~break* = 3pt,
             opacityback = 0,
             colframe = ctex@emph,
-            left = .2pc,right = .2pc,top = .5pc,bottom = .5pc,middle= .5pc,
+            left = 6pt,right = 6pt,top = 8pt,bottom = 8pt,middle= 8pt,
             arc = 0pt
           },
         tc-outline/.style =
@@ -2004,21 +2013,20 @@ The latest version of this license is in
             fonttitle = \large\sffamily,fontupper = \itshape,
             boxed~title~style = {size = normal,opacityframe = 0,boxrule = 0pt},
             attach~boxed~title~to~top~center = {yshift = -\tcboxedtitleheight/2},
-            arc = 3pt,
+            arc = 3pt,boxsep = 5pt,
             after~skip = 3ex,
-            left = 1.5pc,right = 1.5pc,top = 1pc,bottom = 0.5pc,
-            boxsep = 5pt
+            left = 1.5pc,right = 1.5pc,top = 1pc,bottom = 0.5pc
           },
         tc-exercise/.style =
           {
             enhanced,on~line,
-            arc = 5pt,
             fontupper = \sffamily\Large,
-            boxrule = 1pt,boxsep = 0pt,
+            boxrule = 1pt,arc = 5pt,
             left = 6pt,right = 6pt,top = 3.5pt,bottom = 3.5pt,
             before~skip = 4ex,after~skip = 2.25ex
           },
         breakable,
+        boxsep = 0pt,
         boxrule = \l__eb_rule_width_dim
       }
     \NewDocumentEnvironment{outline}{D(){\abstractname}o+b}
@@ -2065,20 +2073,44 @@ The latest version of this license is in
           #6
         \end{enumerate}
       }{}
-    \DeclareTColorBox{easybox}{sO{MintCream}d()O{}}
+    \DeclareTColorBox{easybox}{sO{DarkCyan}d()O{}}
       {
         enhanced~jigsaw,pad~at~break* = 3pt,
-        IfBooleanTF = {#1}{colback = #2}{opacityback = 0,colframe = ctex@emph},
+        IfBooleanTF = {#1}
+          {toptitle = 8pt,top = 8pt}
+          {frame~hidden,boxrule = 0pt,toptitle = 8pt,top = 0pt},
         IfValueT = {#3}{title = #3},
-        coltitle = black,colbacktitle = white,
+        colback = #2!8!white,colbacktitle = #2!8!white,
+        coltitle = black,colframe = black,
         fonttitle = \sffamily,
-        left = .2pc,right = .2pc,top = .5pc,bottom = .5pc,middle= .5pc,
-        arc = 0pt,
-        toptitle = 2pt,bottomtitle = 2pt,
-        beforeafter~skip=2ex,
+        left = 6pt,right = 6pt,bottom = 8pt,middle= 8pt,
+        bottomtitle = 8pt,arc = 0pt,
+        beforeafter~skip = 2ex,
         halign~upper = left,halign~lower = left,
         center~title,#4
       }
+    \DeclareTColorBox{ebparbox}{sO{Purple}d()O{}}
+      {
+        frame~hidden,
+        enhanced~jigsaw,pad~at~break* = 3pt,
+        boxrule = 0pt,
+        borderline~west = {3pt}{0pt}{#2},
+        IfBooleanTF = {#1}
+          {
+            colback = white,
+            IfValueT = {#3}{title = #3},
+            top = 0pt,bottom = 0pt,toptitle = 0pt
+          }{
+            colback = #2!8!white,colbacktitle = #2!8!white,
+            IfValueTF = {#3}{title = #3,top = 0pt}{top = 8pt},
+            bottom = 8pt,toptitle = 8pt
+          },
+        left = 8pt,right = 8pt,middle= 8pt,
+        bottomtitle = 8pt,arc = 0pt,
+        beforeafter~skip = 1.5ex,
+        colframe = #2,coltitle = #2,
+        fonttitle = \sffamily,#4
+      }
     \DeclareTotalTCBox{\fuzzy}{O{DarkSeaGreen}vO{}}
       {
         nobeforeafter,tcbox~raise~base,
@@ -2249,6 +2281,7 @@ The latest version of this license is in
   }
 \__eb_patch_cmd:Nnn \@makefnmark
   {\normalfont}{\l__eb_font_footnote_tl}
+\cs_gset:Npn \thempfootnote{\int_to_alph:n {\c@mpfootnote}}
 
 \lstdefinestyle{easy-lst-sty}
   {
@@ -2285,7 +2318,7 @@ The latest version of this license is in
     framesep = 3pt,
     frame = single,
     rulecolor = \color{ctex@frame},
-    commentstyle = \color{gray},
+    commentstyle = \color{SlateGray},
     emphstyle = \color{ctex@emph},
     emph = {caption,multirow,subcaption,tabularx},
     morekeywords =
@@ -2376,12 +2409,12 @@ The latest version of this license is in
       {
         {fresh,     62d71f,0000B2,005752},
         {cutepink,  ff69b4,9d5196,57b5e5},
-        {skyblue,   0000ff,004986,eb6877},
+        {navyblue,  000080,004986,eb6877},
         {crimson,   dc143c,00c1c9,afcd20}
       }
       \__eb_linkcolor_set:n
-    linkcolor         .default:n = fresh,
-    linkcolor         .initial:n = fresh,
+    linkcolor         .default:n = navyblue,
+    linkcolor         .initial:n = navyblue,
     linkcol-all       .code:n = \__eb_define_linkcolor:n {\exp_not:n {#1}},
 
     linktoc           .choice:,
@@ -2406,7 +2439,7 @@ The latest version of this license is in
     \clist_map_function:nN
       {
         {none,      000000,000000,000000},
-        {seaside,   4682B4,004986,2E8B57},
+        {seaside,   4169e1,708090,9932cc},
         {energy,    f39800,00a0e9,893895},
         {cyberpunk, 601986,eb6877,a4005b}
       }
diff --git a/macros/latex/contrib/fontsize/fontsize.dtx b/macros/latex/contrib/fontsize/fontsize.dtx
index cde1960fad..9c9c7fdeb5 100644
--- a/macros/latex/contrib/fontsize/fontsize.dtx
+++ b/macros/latex/contrib/fontsize/fontsize.dtx
@@ -56,7 +56,7 @@ This work has the LPPL maintenance status "author-maintained".
 %<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<package>\ProvidesPackage{fontsize}
 %<*package>
-  [2021/04/17 v0.8.2 'fontsize' package. Set main font sizes (Ivan Valbusa)]
+  [2021/04/18 v0.8.3 'fontsize' package. Set main font sizes (Ivan Valbusa)]
 %</package>
 %<*driver>
 \documentclass[12pt]{ltxdoc}
@@ -268,7 +268,7 @@ This work has the LPPL maintenance status "author-maintained".
 %</driver>
 % \fi
 %
-% \CheckSum{3067}
+% \CheckSum{3068}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -287,9 +287,11 @@ This work has the LPPL maintenance status "author-maintained".
 %   Right brace   \}     Tilde         \~}
 %
 %
+% \changes{v0.8.3}{2021/04/18}{Corrected a bug in the \cmd{parindent} option. 
+% Updated documentation.}
 % \changes{v0.8.2}{2021/04/17}{New \cmd{parindent} option. Updated documentation.}
 % \changes{v0.8.1}{2021/03/14}{New \cmd{sampletext} command. 
- % Some lengths are now defined via \sty{xfp} package. Removed \cmd{headheight} definition. Updated documentation.}
+% Some lengths are now defined via \sty{xfp} package. Removed \cmd{headheight} definition. Updated documentation.}
 % \changes{v0.8}{2021/03/04}{Corrected a bug occuring when the line spacing is grater than \SI{163.84}{pt}.}
 % \changes{v0.7}{2021/02/10}{New font sizing commands \cmd{HUGE}, \cmd{HUGEr}, \cmd{HUGErr}, \cmd{HUGErrr}. Changed default name for the \file{.clo} file to \opt{fontsize}. Updated documentation.}
 % \changes{v0.6}{2021/02/06}{New font sizing commands from \cmd{small} down. Updated documentation.}
@@ -451,14 +453,34 @@ This work has the LPPL maintenance status "author-maintained".
 % You can use any unit recognized by \TeX\ and you can 
 % omit the unit as well (in which case it defaults to \texttt{pt}).
 %
-%^^A \begin{footnotesize}
+% \begin{footnotesize}
 %
-%^^A As \sty{fontsize} takes effect after the class is loaded, you should 
-%^^A set a font size class option (if available) that comes close to the one 
-%^^A loaded by the package. For example,
-%^^A if you set \opt{fontsize=12.2pt} you should load the class option \opt{12pt}.
+% Note that \sty{fontsize} does not redefine some commands of the standard 
+% \textit{.clo} files such as those related to the page layout and few others. 
+% For example the \opt{12pt} class option redefine \cmd{Huge} (via |\let\Huge=\huge|) 
+% which is not redefined by \opt{fontsize=12pt}. For these reasons, if possible, you 
+% should always set a font size class option that comes close to the one 
+% loaded by the package. For example with \opt{fontsize=12.2pt} 
+% you should load the \opt{12pt} class option.
 %
-%^^A \end{footnotesize}
+% \end{footnotesize}
+% 
+% \optitem[1.5\meta{fontsize}]{parindent}{\meta{dimen}}
+%
+% Sets the value of \cmd{parindent}. You can use any unit recognized by 
+% \TeX\ but for consistency it is preferable to use a
+% font-dependent unit such as em. 
+%
+% \begin{footnotesize}
+%
+% Note that the "em" is simply an arbitrary unit that comes with a particular font.
+% The value of \cmd{parindent} given in ems depends on both the font used and 
+% on how or where it is set: whether before or after
+% |\begin{document}|. For this reason, don't expect \SI{1}{em} to always be equivalent 
+% to the currently specified \meta{fontsize}. If you don't like this behavior, 
+% use absolute units such as pt, cm or mm.
+%
+% \end{footnotesize}
 % 
 % \optitem[fontsize]{cloname}{\meta{name}}
 %  
@@ -473,12 +495,6 @@ This work has the LPPL maintenance status "author-maintained".
 %^^A \file{fontsize-std11pt.clo} or 
 %^^A \file{fontsize-std11pt.clo} will be used, 
 %
-% \optitem[1.5em]{parindent}{\meta{dimen}}
-%
-% Sets the value of \cmd{parindent}. You can use any unit recognized by 
-% \TeX\ but for consistency it is preferable to use a
-% font-dependent unit such as em.
-% 
 % \end{optionlist*}
 %
 %^^A---------------------------------------------------------------------
@@ -607,7 +623,7 @@ This work has the LPPL maintenance status "author-maintained".
 %   \tcmd{HUGErrr}         & \HUGErrr          \fshw
 %  \end{tabular}
 % }
-%\medskip
+%\bigskip
 %
 %\alert  If you want these commands to work as expected, the font must be 
 % smoothly scalable. 
@@ -754,13 +770,14 @@ This work has the LPPL maintenance status "author-maintained".
 % while the \sty{xfp} package \parencite{xfp} provides the \cmd{fpeval} command 
 % to use instead of \cmd{dimexpr} for some size calculations. 
 % Only two new package options, called \opt{cloname} and \opt{parindent} 
-% are defined. 
+% are defined.
+%
 % \baddition
 %    \begin{macrocode}
 \@ifpackageloaded{xkeyval}{}{\RequirePackage{xkeyval}}
 \@ifpackageloaded{xfp}{}{\RequirePackage{xfp}}
 \DeclareOptionX{cloname}[fontsize]{\def\@fontsizefilebase{#1}}
-\DeclareOptionX{parindent}[1.5em]{\def\@fontsizeparindent{#1}}
+\DeclareOptionX{parindent}[1.5\@tempdimb]{\def\@fontsizeparindent{#1}}
 %    \end{macrocode}
 % \eaddition
 %
@@ -1270,11 +1287,7 @@ This work has the LPPL maintenance status "author-maintained".
 %    \end{macrocode}
 % The KOMA files do not define \cmd{parindent} and other lengths that are
 % are strictly linked to the font rather than to the dimensions of the page
-% and the text. So we first define \cmd{parindent}. 
-% The value of \cmd{@fontsizeparindent} is controlled by the
-% \opt{parindent} option which defaults to 
-% \SI{1.5}{em} and corresponds approximately to the values adopted 
-% in the \file{bk*.clo} files for one-column documents:
+% and the text. So we first define \cmd{parindent} which defaults to 1.5\meta{fontsize}:
 % \baddition
 %    \begin{macrocode}
 \setlength\parindent{\@fontsizeparindent}%
diff --git a/macros/latex/contrib/fontsize/fontsize.pdf b/macros/latex/contrib/fontsize/fontsize.pdf
index 5afc85d3dc..7dd7a0d45b 100644
Binary files a/macros/latex/contrib/fontsize/fontsize.pdf and b/macros/latex/contrib/fontsize/fontsize.pdf differ
diff --git a/macros/latex/contrib/huawei/README.md b/macros/latex/contrib/huawei/README.md
new file mode 100644
index 0000000000..ddb9d7db34
--- /dev/null
+++ b/macros/latex/contrib/huawei/README.md
@@ -0,0 +1,29 @@
+Disclaimer: This is **NOT** a product of Huawei Technologies Co., Ltd.
+This package is created in order to help some people working
+with Huawei or inside Huawei to render some documents in LaTeX format.
+You are welcome to use it at your own risk.
+
+You can use this [`huawei.cls`](huawei.cls) LaTeX style just by copying it to some local
+directory and then mentioning it in the preamble of all your documents 
+(on my laptop it's called `/code/huawei.cls`):
+
+```tex
+\documentclass[landscape]{/code/huawei}
+\author{Yegor Bugayenko}
+\title{An Interesting Document About Something}
+\begin{document}
+Hello, world!
+\end{document}
+```
+
+Find more examples in the [`samples/`](/samples) directory.
+
+If you need more formatting options, 
+[submit an issue](https://github.com/cqfn/huawei-latex/issues), 
+I'll implement them.
+
+If you want to contribute yourself, make a fork, then create a branch, 
+then run `make` in the root directory.
+It should compile everything without errors. If not, submit an issue and wait.
+Otherwise, make your changes and then run `make` again. If the build is
+still clean, submit a pull request.
diff --git a/macros/latex/contrib/huawei/huawei.cls b/macros/latex/contrib/huawei/huawei.cls
new file mode 100644
index 0000000000..7ea0170c9c
--- /dev/null
+++ b/macros/latex/contrib/huawei/huawei.cls
@@ -0,0 +1,311 @@
+% (The MIT License)
+%
+% Copyright (c) 2021 Yegor Bugayenko
+%
+% 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, including without limitation the rights
+% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+% copies of the Software, and to permit persons to whom the Software is
+% furnished to do so, subject to the following conditions:
+%
+% The above copyright notice and this permission notice shall be included in all
+% copies or substantial portions of the Software.
+%
+% THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+% SOFTWARE.
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{huawei}[17/4/2021 0.1.0 Template for Huawei documents]
+\newif\ifnosecurity
+\DeclareOption{nosecurity}{\nosecuritytrue}
+\newif\ifnobrand
+\DeclareOption{nobrand}{\nobrandtrue}
+\newif\ifnodate
+\DeclareOption{nodate}{\nodatetrue}
+\newif\ifnopaging
+\DeclareOption{nopaging}{\nopagingtrue}
+\newif\iflandscape
+\DeclareOption{landscape}{\landscapetrue}
+\newif\ifanonymous
+\DeclareOption{anonymous}{\anonymoustrue}
+\ProcessOptions\relax
+\LoadClass[12pt]{article}
+\RequirePackage{geometry}
+\iflandscape
+  \geometry{paperwidth=16in, paperheight=9in, left=4in, right=2in, top=1.5in, bottom=1.5in}
+\else
+  \geometry{a4paper, left=1.5in, right=1in, top=1.2in, bottom=1.2in}
+\fi
+\RequirePackage[T1]{fontenc}
+\RequirePackage[utf8]{inputenc}
+\RequirePackage{CJKutf8}
+\RequirePackage{tabularx}
+\RequirePackage{multicol}
+\RequirePackage[mmddyyyy,iso,hhmmss]{datetime}
+\RequirePackage[tt=false,type1=true]{libertine}
+\RequirePackage{paralist}
+\RequirePackage{makecell}
+\RequirePackage[para]{footmisc}
+  \setlength{\footnotemargin}{2pt}
+  \setlength{\footnotesep}{2pt}
+\RequirePackage{minted}
+  \setminted{breaklines}
+  \usemintedstyle{bw}
+  \renewcommand{\theFancyVerbLine}{\textcolor{gray}{\tiny\oldstylenums{\ttfamily\arabic{FancyVerbLine}}}}
+  \setminted{firstnumber=last,linenos,numbersep=2pt,framesep=6pt,framerule=1pt,rulecolor=gray,frame=leftline,escapeinside=||,mathescape,samepage}
+\RequirePackage{graphicx}
+\RequirePackage{array}
+\RequirePackage[abspath]{currfile}
+\RequirePackage{enumitem}
+  \setlist{nosep}
+\RequirePackage{microtype}
+\RequirePackage{wrapfig}
+\RequirePackage{lastpage}
+\RequirePackage{xfp} % for \setrelativestretch
+\RequirePackage{setspace}
+  \setstretch{1.08}
+  \newcommand{\setrelativestretch}[1]{%
+    \begingroup\edef\x{\endgroup%
+      \noexpand\setstretch{\fpeval{(#1)*(\baselinestretch)}}%
+    }\x%
+  }
+\RequirePackage[table]{xcolor}
+  \definecolor{huawei-red}{HTML}{CF0A2C}
+  \definecolor{huawei-black}{HTML}{232527}
+\RequirePackage{tikz}
+\RequirePackage{tabularx}
+\RequirePackage{titling}
+\RequirePackage{fancyhdr}
+  \pagestyle{empty}
+\RequirePackage{everypage}
+\RequirePackage{svg}
+\RequirePackage[normalem]{ulem}
+\RequirePackage[hidelinks]{hyperref}
+  \makeatletter\begingroup
+    \catcode`\$=6 %
+    \catcode`\#=12 %
+    \gdef\href@split$1#$2#$3\\$4{%
+      \hyper@@link{$1}{$2}{\uline{$4}}%
+      \endgroup
+    }%
+  \endgroup\makeatother
+\RequirePackage[absolute]{textpos}\TPGrid{16}{16}
+
+\newcommand\LeftHuaweiBar{%
+  \begin{textblock}{1}[0,0](0,0)%
+    \tikz \node[fill=huawei-red,minimum width=\TPHorizModule,minimum height=16\TPVertModule] {};%
+  \end{textblock}%
+}
+
+% Our custom commands to redefine:
+\renewcommand\title[1]{\renewcommand\thetitle{#1}}
+\newcommand\thetitle{Untitled}
+\newcommand*\thecompany{Huawei Technologies Co., Ltd.}
+\newcommand\thesubtitle{}
+\renewcommand\author[1]{\renewcommand\theauthor{#1}}
+\newcommand\theauthor{Unknown}
+\newcommand*\thesecurity{Confidential}
+\newcommand*\theid{}
+
+% Custom commands
+\newcommand\nospell[1]{#1}
+\newcommand\headers[1]{{\small\sffamily\color{gray}#1}}
+\newcommand\tbd[1]{{\color{red}#1}}
+\newcommand\crumb[2]{\begin{minipage}{\columnwidth}\raggedright\textsc{#1}:\\#2\end{minipage}\vspace{4pt}}
+\RequirePackage{tcolorbox}
+  \newtcbox{\codebox}{nobeforeafter,colframe=gray!80!white,colback=gray!5!white,boxrule=0.1pt,arc=1pt,
+  boxsep=1.2pt,left=0.5pt,right=0.5pt,top=0.2pt,bottom=0.2pt,tcbox raise base}
+\newcommand{\ff}[1]{\codebox{\vrule height 6pt depth 1pt width 0pt\texttt{#1}}}
+
+\AtBeginDocument{%
+  \raggedbottom%
+  \setlength{\topskip}{0mm}%
+  \setlength{\parindent}{0pt}%
+  \setlength{\parskip}{6pt}%
+  \setlength{\columnsep}{32pt}%
+  \def\arraystretch{1.5}%
+}
+
+\newcommand\PrintFirstPage[1]{
+  \LeftHuaweiBar{}
+  \def\param{#1}%
+  \ifx\param\empty
+    % nothing
+  \else
+    \includegraphics[height=2in]{#1}
+  \fi
+  \vspace*{0.5in}
+  \maketitle
+}
+
+\AddEverypageHook{%
+  \LeftHuaweiBar{}
+  \ifnobrand%
+    % nothing here
+  \else%
+    \begin{textblock}{8}[0,0](1.2,0.2)%
+      \begin{tikzpicture}[y=0.80pt, x=0.80pt, yscale=-1, inner sep=0pt, outer sep=0pt]
+        \begin{scope}[even odd rule,line width=0.800pt]
+          \begin{scope}[shift={(0,-0.00024)}]
+            \path[fill=huawei-black] (10.9375,30.2240) -- (10.9375,33.6097) .. controls (10.9375,34.5713) and (10.4603,35.0845) .. (9.5932,35.0845) .. controls (8.7212,35.0845) and (8.2411,34.5565) .. (8.2411,33.5686) -- (8.2411,30.2278) -- (7.0415,30.2278) -- (7.0415,33.6097) .. controls (7.0415,35.2737) and (7.9658,36.2272) .. (9.5774,36.2272) .. controls (11.2041,36.2272) and (12.1371,35.2554) .. (12.1371,33.5609) -- (12.1371,30.2240) -- (10.9375,30.2240) -- cycle;
+            \path[fill=huawei-black] (15.3511,30.2240) -- (12.7456,36.1351) -- (13.9702,36.1351) -- (14.4731,34.9903) -- (14.5091,34.9045) -- (17.2158,34.9045) -- (17.7467,36.1351) -- (19.0045,36.1351) -- (16.4233,30.2590) -- (16.4001,30.2240) -- cycle;
+            \path[fill=huawei-black] (22.4840,30.2240) -- (21.1414,34.2912) -- (19.8344,30.2271) -- (18.5578,30.2271) -- (20.6186,36.1388) -- (21.6120,36.1388) -- (22.9573,32.2553) -- (24.3016,36.1388) -- (25.3034,36.1388) -- (27.3592,30.2271) -- (26.1152,30.2271) -- (24.8055,34.2912) -- (23.4626,30.2240) -- cycle;
+            \path[fill=huawei-black] (34.2236,30.2240) -- (34.2236,36.1300) -- (35.4074,36.1300) -- (35.4074,30.2240) -- cycle;
+            \path[fill=huawei-black] (0.2686,30.2244) -- (0.2686,36.1384) -- (1.4686,36.1384) -- (1.4686,33.7365) -- (4.1780,33.7365) -- (4.1780,36.1384) -- (5.3783,36.1384) -- (5.3783,30.2244) -- (4.1780,30.2244) -- (4.1780,32.6102) -- (1.4686,32.6102) -- (1.4686,30.2244) -- cycle;
+            \path[fill=huawei-black] (28.3267,30.2284) -- (28.3267,36.1344) -- (32.7928,36.1344) -- (32.7928,35.0575) -- (29.5105,35.0575) -- (29.5105,33.5931) -- (31.6931,33.5931) -- (31.6931,32.5160) -- (29.5105,32.5160) -- (29.5105,31.3052) -- (32.6785,31.3052) -- (32.6785,30.2284) -- cycle;
+            \path[fill=white] (15.8594,31.7207) -- (16.7149,33.7008) -- (16.7119,33.7008) -- (16.7701,33.8374) -- (14.9552,33.8374) -- (15.0127,33.7008) -- (15.0117,33.7008) -- cycle;
+            \path[fill=huawei-red] (15.2113,0.0001) .. controls (14.7353,0.0422) and (13.4491,0.3349) .. (13.4491,0.3349) -- (13.4486,0.3349) .. controls (10.5495,1.0843) and (9.8643,3.7151) .. (9.8643,3.7151) .. controls (9.7227,4.1575) and (9.6584,4.6109) .. (9.6395,5.0380) -- (9.6395,5.6194) .. controls (9.6780,6.5176) and (9.8777,7.1883) .. (9.8777,7.1883) .. controls (10.8461,11.4823) and (15.6075,18.5379) .. (16.6308,20.0200) .. controls (16.7034,20.0920) and (16.7615,20.0660) .. (16.7615,20.0660) .. controls (16.8720,20.0355) and (16.8633,19.9296) .. (16.8633,19.9296) -- (16.8654,19.9301) .. controls (18.4416,4.1760) and (15.2113,0.0001) .. (15.2113,0.0001) -- (15.2113,0.0001) -- cycle;
+            \path[fill=huawei-red] (20.4192,0.0000) .. controls (20.4192,0.0000) and (17.1748,4.1782) .. (18.7521,19.9415) -- (18.7542,19.9415) .. controls (18.7664,20.0416) and (18.8374,20.0624) .. (18.8374,20.0624) .. controls (18.9430,20.1033) and (18.9971,20.0019) .. (18.9971,20.0019) -- (18.9976,20.0029) .. controls (20.0472,18.4829) and (24.7814,11.4657) .. (25.7455,7.1882) .. controls (25.7455,7.1882) and (26.2683,5.1179) .. (25.7636,3.7150) .. controls (25.7636,3.7150) and (25.0470,1.0434) .. (22.1442,0.3375) .. controls (22.1442,0.3375) and (21.3077,0.1251) .. (20.4193,0.0000) -- (20.4192,0.0000) -- cycle;
+            \path[fill=huawei-red] (5.4542,4.7294) .. controls (5.4542,4.7294) and (2.6920,7.3513) .. (2.5547,10.1307) -- (2.5558,10.1307) -- (2.5558,10.5519) .. controls (2.5579,10.5836) and (2.5595,10.6157) .. (2.5615,10.6480) .. controls (2.6804,12.8893) and (4.3665,14.2157) .. (4.3665,14.2157) .. controls (7.0831,16.8634) and (13.6611,20.2062) .. (15.1896,20.9647) .. controls (15.2110,20.9727) and (15.2900,20.9985) .. (15.3364,20.9399) .. controls (15.3364,20.9399) and (15.3605,20.9216) .. (15.3715,20.8887) -- (15.3715,20.8189) .. controls (15.3704,20.8149) and (15.3683,20.8109) .. (15.3663,20.8065) -- (15.3669,20.8065) .. controls (11.1809,11.6620) and (5.4543,4.7294) .. (5.4543,4.7294) -- (5.4542,4.7294) -- cycle;
+            \path[fill=huawei-red] (30.1695,4.7294) .. controls (30.1695,4.7294) and (24.4602,11.6403) .. (20.2761,20.7662) -- (20.2777,20.7657) .. controls (20.2777,20.7657) and (20.2283,20.8715) .. (20.3082,20.9399) .. controls (20.3082,20.9399) and (20.3320,20.9579) .. (20.3650,20.9652) -- (20.4229,20.9652) .. controls (20.4333,20.9622) and (20.4444,20.9582) .. (20.4554,20.9507) -- (20.4554,20.9517) .. controls (22.0255,20.1724) and (28.5525,16.8516) .. (31.2563,14.2162) .. controls (31.2563,14.2162) and (32.9686,12.8412) .. (33.0583,10.6334) .. controls (33.2560,7.5672) and (30.1696,4.7294) .. (30.1696,4.7294) -- (30.1695,4.7294) -- cycle;
+            \path[fill=huawei-red] (35.3082,13.8080) .. controls (35.3082,13.8080) and (26.0003,18.8031) .. (21.1876,22.0494) -- (21.1882,22.0499) -- (21.1893,22.0509) .. controls (21.1893,22.0509) and (21.1019,22.1081) .. (21.1324,22.2106) .. controls (21.1324,22.2106) and (21.1781,22.2933) .. (21.2446,22.2933) -- (21.2446,22.2938) .. controls (22.9684,22.2968) and (29.4914,22.3041) .. (29.6549,22.2736) .. controls (29.6549,22.2736) and (30.4983,22.2399) .. (31.5406,21.8395) .. controls (31.5406,21.8395) and (33.8608,21.1019) .. (35.0659,18.4677) .. controls (35.0659,18.4677) and (35.6166,17.3662) .. (35.6246,15.8187) -- (35.6246,15.7531) .. controls (35.6206,15.1563) and (35.5365,14.4957) .. (35.3083,13.8080) -- (35.3082,13.8080) -- cycle;
+            \path[fill=huawei-red] (0.3129,13.8313) .. controls (-0.5339,16.4531) and (0.6062,18.5656) .. (0.6080,18.5690) .. controls (1.7962,21.0795) and (4.0641,21.8401) .. (4.0641,21.8401) .. controls (5.1112,22.2703) and (6.1586,22.3000) .. (6.1586,22.3000) .. controls (6.3221,22.3300) and (12.6713,22.3030) .. (14.3725,22.2950) .. controls (14.4445,22.2945) and (14.4842,22.2221) .. (14.4842,22.2221) .. controls (14.4892,22.2142) and (14.4936,22.2062) .. (14.4955,22.1989) -- (14.4955,22.1333) .. controls (14.4814,22.0893) and (14.4439,22.0584) .. (14.4439,22.0584) -- (14.4450,22.0578) .. controls (9.6347,18.8126) and (0.3130,13.8315) .. (0.3130,13.8315) -- (0.3129,13.8313) -- cycle;
+            \path[fill=huawei-red] (14.1782,23.1010) -- (3.2285,23.4850) .. controls (4.4160,25.6018) and (6.4158,27.2469) .. (8.4990,26.7416) .. controls (9.9366,26.3822) and (13.1935,24.1105) .. (14.2687,23.3429) -- (14.2651,23.3399) .. controls (14.3487,23.2648) and (14.3188,23.2045) .. (14.3188,23.2045) .. controls (14.2913,23.1062) and (14.1783,23.1063) .. (14.1783,23.1063) -- (14.1782,23.1010) -- cycle;
+            \path[fill=huawei-red] (21.4305,23.1090) -- (21.4294,23.1130) .. controls (21.4294,23.1130) and (21.3333,23.1252) .. (21.3064,23.1972) .. controls (21.3064,23.1972) and (21.2831,23.2956) .. (21.3478,23.3445) -- (21.3467,23.3455) .. controls (22.3950,24.0973) and (25.5729,26.3191) .. (27.1039,26.7505) .. controls (27.1039,26.7505) and (27.3359,26.8294) .. (27.7246,26.8435) -- (27.9581,26.8435) .. controls (28.9839,26.8075) and (30.7708,26.2805) .. (32.3946,23.4907) -- (21.4305,23.1090) -- cycle;
+          \end{scope}%
+        \end{scope}%
+      \end{tikzpicture}%
+    \end{textblock}%
+  \fi%
+  \begin{textblock}{8}[1,0](15.8,0.2)%
+    \raggedleft\headers{%
+      \ifnosecurity%
+        % nothing here
+      \else%
+        \thesecurity
+      \fi%
+    }%
+  \end{textblock}%
+  \begin{textblock}{8}[0,1](1.2,15.8)%
+    \headers{%
+      \ifanonymous%
+        % nothing here
+      \else%
+        \theauthor%
+        \ifnosecurity%
+          % nothing here
+        \else,
+          \theid
+        \fi%
+        \ifnobrand%
+          % nothing here
+        \else%
+          \\[2pt]
+        \fi%
+      \fi%
+      \ifnobrand%
+        % nothing here
+      \else%
+        \thecompany{}
+      \fi%
+    }%
+  \end{textblock}%
+  \begin{textblock}{8}[1,1](15.8,15.8)%
+    \raggedleft\headers{%
+      \ifnopaging%
+        % nothing here
+      \else%
+        Page \#\thepage{} of \pageref*{LastPage}
+        \ifnodate%
+          % nothing here
+        \else%
+          \\[2pt]
+        \fi%
+      \fi%
+      \ifnodate%
+        % nothing here
+      \else%
+        \today{} \currenttime
+      \fi%
+    }%
+  \end{textblock}%
+}
+
+\renewcommand\maketitle{%
+\vspace*{18pt}
+{\bfseries{\Huge\thetitle}}
+\\[6pt]
+\ifx\thesubtitle\empty\else%
+  {\color{gray!50!black}\large\thesubtitle}
+\fi
+\\[18pt]
+\ifx\theauthor\empty\else%
+  {\scshape\theauthor}\\
+\fi
+\ifx\theauthor\empty\else%
+  {\theid}
+\fi
+\vspace{2em}
+}
+
+\newcommand\PrintThankYouPage{
+  \newpage
+  \vspace*{\fill}
+  \begin{center}
+  {\Huge\color{huawei-red}\textbf{Thank you!}}
+  \end{center}
+  \vspace*{\fill}
+}
+
+\newcommand\PrintDisclaimer{%
+  \vspace*{\fill}\setrelativestretch{0.55}{{\sffamily\scriptsize\color{gray!50!black}%
+  \textbf{Disclaimer}: The opinions expressed in this document are in good faith and
+  while every care has been taken in preparing it,
+  \ifnobrand%
+    the author%
+  \else%
+    \thecompany{}%
+  \fi
+  makes no representations and gives no warranties of whatever
+  nature in respect of these documents, including but not limited to the
+  accuracy or completeness of any information, facts and/or opinions contained therein.
+  \ifnobrand%
+    The author%
+  \else%
+    \thecompany{}%
+  \fi,
+  its subsidiaries, the directors, employees and agents
+  cannot be held liable for the use of and reliance of the opinions, estimates, forecasts and
+  findings in these documents.}}}
+
+\newcommand\PrintLastPage{
+  \newpage
+  \vspace*{1in}
+  \begin{center}
+  \begin{minipage}{0.6\columnwidth}\raggedright
+  \setlength{\parskip}{6pt}
+  {\Huge\color{huawei-red}\textbf{Thank you!}}
+
+  \vspace{0.5in}
+
+  \begin{CJK}{UTF8}{gbsn}
+  把数字世界带入每个人、每个家庭、
每个组织，构建万物互联的智能世界。
+  \end{CJK}
+
+  Bring digital to every person, home and
+  organization for a fully connected,
+  intelligent world.
+
+  \textbf{Copyright \copyright{} \the\year{} \thecompany{}\\
+  All Rights Reserved.}
+
+  The information in this document may contain predictive
+  statements including, without limitation, statements regarding
+  the future financial and operating results, future product
+  portfolio, new technology, etc. There are a number of factors that
+  could cause actual results and developments to differ materially
+  from those expressed or implied in the predictive statements.
+  Therefore, such information is provided for reference purpose
+  only and constitutes neither an offer nor an acceptance. \thecompany{}
+  may change the information at any time without notice.
+  \end{minipage}
+  \end{center}%
+}
+
+\endinput
\ No newline at end of file
diff --git a/macros/latex/contrib/huawei/huawei.pdf b/macros/latex/contrib/huawei/huawei.pdf
new file mode 100644
index 0000000000..d0341ad561
Binary files /dev/null and b/macros/latex/contrib/huawei/huawei.pdf differ
diff --git a/macros/latex/contrib/huawei/huawei.tex b/macros/latex/contrib/huawei/huawei.tex
new file mode 100644
index 0000000000..adacc3b092
--- /dev/null
+++ b/macros/latex/contrib/huawei/huawei.tex
@@ -0,0 +1,223 @@
+\documentclass[nobrand,nosecurity]{./huawei}
+\renewcommand*\thetitle{\LaTeX{} Class \ff{huawei}}
+\renewcommand*\thesubtitle{User's Guide}
+\renewcommand*\theauthor{\nospell{Yegor Bugayenko}}
+\begin{document}
+\maketitle
+
+\ff{Version 0.1.0}
+
+\section{Overview}
+
+The provided class \ff{huawei} helps you design your work
+documents and presentations keeping the code short and the
+style elegant enough both for management and technical
+papers. To use the class you simply mention its name
+in the preamble:
+
+\begin{minted}{text}
+\documentclass{huawei}
+\begin{document}
+Hello, world!
+\end{document}
+\end{minted}
+
+The document rendered from this \LaTeX{} code will look similar
+to the document you are reading now. We recommend you to use
+\ff{latexmk} to compile your \ff{.tex} files to \ff{.pdf}.
+The simplest setup will require a few files staying next to your
+\ff{.tex} file, in the same directory (``story'' is the name
+of your project here):
+
+\begin{minted}{text}
+story\
+  .latexmkrc
+  .gitignore
+  Makefile
+  story.tex
+\end{minted}
+
+The content of your \ff{.latexmkrc} file would be this:
+
+\begin{minted}{text}
+$pdflatex = 'pdflatex %O --shell-escape %S';
+\end{minted}
+
+Make sure the \ff{.gitignore} file lists all the files generated
+by \ff{pdflatex} during the compilation. You don't need to commit
+them to your repository, since they are temporary and will
+be generated again when you compile your document.
+
+The recommended content of the \ff{Makefile} would be this:
+
+\begin{minted}{text}
+TEXS=$(wildcard *.tex)
+PDFS=$(TEXS:.tex=.pdf)
+all: $(PDFS)
+%.pdf: %.tex
+  latexmk -pdf $<
+\end{minted}
+
+In order to compile the document, just say \ff{make} on the command line.
+
+\section{Layout Options}
+
+There are a few class options, provided in square brackets after the
+\ff{\textbackslash{}documentclass}, which can help you fine-tune
+the layout of your document:
+
+\ff{landscape}
+  makes the document in landscape format, also changing the size
+  of the paper to 16x9 inches (the default page size is
+  \href{https://en.wikipedia.org/wiki/Paper_size}{A4}),
+  making it perfect for presentations.
+
+\ff{anonymous}
+  removes the name of the author everywhere, including the bottom
+  of the page, where the author's name stays next to the name of the
+  company.
+
+\ff{nobrand}
+  avoid mentioning the brand of Huawei anywhere
+  in the document and removes the logo too.
+
+\ff{nosecurity}
+  avoids mentioning the level of security at the right top
+  corner of the document and also avoids showing the ID of the author
+  where it usually is visible.
+
+\ff{nodate}
+  don't show the date and time at the bottom of each page,
+  where they usually are rendered in ISO~8601 format.
+
+\ff{nopaging}
+  avoids page numbers at the bottom of each page.
+
+\section{Preamble}
+
+In the preamble you can specify meta information about the document,
+such as its title or author's name, here is how:
+
+\begin{minted}{text}
+\documentclass{huawei}
+\renewcommand*\thetitle{Making Compression 15% Faster}
+\renewcommand*\thesubtitle{Technical Report}
+\renewcommand*\theauthor{Yegor Bugayenko}
+\begin{document}
+\maketitle
+Hello, world!
+\end{document}
+\end{minted}
+
+It's recommended to use \ff{\textbackslash{}renewcommand*} instead of
+\ff{\textbackslash{}renewcommand} in order to let \LaTeX{} catch you
+if by mistake a new line gets into the content.
+
+The following meta commands are defined:
+
+\ff{\textbackslash{}thetitle} is the main title of the document
+  to be used in the text and in the properties of the PDF document.
+
+\ff{\textbackslash{}thesubtitle} is the subtitle to be
+  printed under the title.
+
+\ff{\textbackslash{}theauthor} is the author of the document
+  in ``first-name last-name'' format.
+
+\ff{\textbackslash{}theid} is the internal ID of the author, if
+  it's applicable.
+
+\ff{\textbackslash{}thesecurity} is the level of security of
+  the document, which is usually printed at the top right
+  corner of it; usual values are ``Internal,''
+  ''Confidential,'' or ``Secret.''
+
+Default values of all these commands are empty. If you don't
+renew them in your document, nothing will be printed.
+
+\section{Custom Commands}
+
+There is a number of supplementary commands for better text formatting,
+which we introduced:
+
+\ff{\textbackslash{}ff\{text\}}
+  makes the text fixed-font with a nice border around.
+
+\ff{\textbackslash{}tbd\{text\}}
+  highlights the text, which is expected to be improved later
+  (tbd stands for ``To Be Determined''), like \tbd{this one}.
+
+Inside the document body you can use these commands:
+
+\ff{\textbackslash{}PrintFirstPage\{front-image\}}
+  prints the first page of a project charter or a similar landscape documents,
+  placing the image \ff{front-image.pdf} on the front (the file should be present
+  in the current dir. If you don't have the front image file, just leave
+  the first argument empty.
+
+\ff{\textbackslash{}PrintLastPage\{\}}
+  prints the last page of a project charter or a similar landscape document.
+
+\ff{\textbackslash{}PrintThankYouPage\{\}}
+  prints the last page with a "Thank You" message in the center.
+
+\ff{\textbackslash{}PrintDisclaimer\{\}}
+  prints a paragraph at the bottom of the page with a standard disclaimer.
+
+\section{Best Practices}
+
+You are free to design your documents any way you want. However,
+it would be convenient for yourself and for your readers, if you follow
+the convention we have for business and technical documents.
+The \ff{samples} directory contains a number of sample documents, which
+we suggest you to use as templates when you start making new documents.
+
+The rule of thumb is simple: try \emph{not} to format your documents.
+Instead, let the class designed by us do this work for you. Just type
+the content without changing the layout, adding colors, changing fonts,
+etc. The less you modify the look-and-feel, the better your documents
+will be perceived by your readers.
+
+\subsection{Two Columns}
+
+In the landscape format it's recommended to use two columns, for better
+readability of the text. Here is how:
+
+\begin{minted}{text}
+\documentclass{huawei}
+\begin{document}
+\newpage
+\begin{multicols}{2}
+\section*{First}
+Here goes the first column content.
+\columnbreak
+\section*{Second}
+Here goes the second column content.
+\end{multicols}
+\end{document}
+\end{minted}
+
+A more complete example is in the\ff{samples/charter.tex}.
+
+\subsection{Crumbs}
+
+When you need to put many small information pieces into one page,
+we recommend you to use ``crumbs'':
+
+\begin{minted}{text}
+\documentclass{huawei}
+\begin{document}
+\newpage
+\section*{Project Details}
+\begin{multicols}{2}
+\raggedright
+\crumb{Budget}{\$100K}
+
+\crumb{Duration}{5 months}
+\end{multicols}
+\end{document}
+\end{minted}
+
+A more complete example is in the\ff{samples/charter.tex}.
+
+\end{document}
\ No newline at end of file
diff --git a/macros/latex/contrib/runcode/runcode.pdf b/macros/latex/contrib/runcode/runcode.pdf
index 1a8d909f4c..13fcdea4da 100644
Binary files a/macros/latex/contrib/runcode/runcode.pdf and b/macros/latex/contrib/runcode/runcode.pdf differ
diff --git a/macros/latex/contrib/runcode/runcode.sty b/macros/latex/contrib/runcode/runcode.sty
index 0059a17b86..6737fd213f 100644
--- a/macros/latex/contrib/runcode/runcode.sty
+++ b/macros/latex/contrib/runcode/runcode.sty
@@ -14,6 +14,11 @@
 \mintedtrue
 \DeclareOption{nominted}{\mintedfalse}
 
+% Some editors terminate all child processes after LaTeX compiling such as Emacs with Auctex. For this case, use the nohup option. It set the variable notnohup to be false, and the server will not be terminated by the parent process.
+\newif\ifnotnohup
+\notnohuptrue
+\DeclareOption{nohup}{\notnohupfalse}
+
 \DeclareOption{R}{
   % create a configuration file for R server if it does not exist.
   \IfFileExists{R.config}{}{
@@ -27,9 +32,11 @@
   }
   % Start the server. Need to run just once. Can comment out after the first
   % compilation, but remember to terminate the server
-  \immediate\write18{python3 -c 'from talk2stat.talk2stat import server,client; server("./","R") if not client("./","R","``` ```") else print("server is already running")'}
-  % Some editors terminate all child processes after LaTeX compiling such as Emacs with Auctex. For this case, use the following line instead of the above line.
-  % \immediate\write18{nohup python3 -c 'from talk2stat.talk2stat import server,client; server("./","R") if not client("./","R","``` ```") else print("server is already running")' &}
+  \ifnotnohup
+  {\immediate\write18{python3 -c 'from talk2stat.talk2stat import server,client; server("./","R") if not client("./","R","``` ```") else print("server is already running")'}}
+  \else
+  {\immediate\write18{nohup python3 -c 'from talk2stat.talk2stat import server,client; server("./","R") if not client("./","R","``` ```") else print("server is already running")' &}}
+  \fi  
 }
 
 \DeclareOption{julia}{
@@ -45,8 +52,11 @@
   }
   % Start the server. Need to run just once. Can comment out after the first
   % compilation, but remember to terminate the server
-  \immediate\write18{python3 -c 'from talk2stat.talk2stat import server,client; server("./","julia") if not client("./","julia","``` ```") else print("server is already running")'}
-  % \immediate\write18{nohup python3 -c 'from talk2stat.talk2stat import server,client; server("./","julia") if not client("./","julia","``` ```") else print("server is already running")' &}
+  \ifnotnohup
+  {\immediate\write18{python3 -c 'from talk2stat.talk2stat import server,client; server("./","julia") if not client("./","julia","``` ```") else print("server is already running")'}}
+  \else
+  {\immediate\write18{nohup python3 -c 'from talk2stat.talk2stat import server,client; server("./","julia") if not client("./","julia","``` ```") else print("server is already running")' &}}
+  \fi  
 }
 
 \DeclareOption{matlab}{
@@ -62,8 +72,11 @@
   }
   % Start the server. Need to run just once. Can comment out after the first
   % compilation, but remember to terminate the server
-  \immediate\write18{python3 -c 'from talk2stat.talk2stat import server,client; server("./","matlab") if not client("./","matlab","``` ```") else print("server is already running")'}
-  % \immediate\write18{nohup python3 -c 'from talk2stat.talk2stat import server,client; server("./","matlab") if not client("./","matlab","``` ```") else print("server is already running")' &}
+  \ifnotnohup
+  {\immediate\write18{python3 -c 'from talk2stat.talk2stat import server,client; server("./","matlab") if not client("./","matlab","``` ```") else print("server is already running")'}}
+  \else
+  {\immediate\write18{nohup python3 -c 'from talk2stat.talk2stat import server,client; server("./","matlab") if not client("./","matlab","``` ```") else print("server is already running")' &}}
+  \fi  
 }
 
 \DeclareOption{stopserver}{
@@ -76,6 +89,7 @@
 
 \ProcessOptions*
 
+\usepackage{morewrites}               % allow more than 16 \write
 \usepackage[many]{tcolorbox}            % to put boxes around text
 \usepackage{xcolor}               % for highlighting
 \usepackage[utf8x]{inputenc}
@@ -132,19 +146,24 @@
 % Args #3 and #4 are the first and last line to show (optional).
 
 \NewDocumentCommand{\showCode}{m m O{} O{}}{% \-\\
-  \ifthenelse{\isempty{#3}}{
+  \IfFileExists{#2}{
+    \ifthenelse{\isempty{#3}}{
     \ifminted
     \inputminted[fontsize=\footnotesize,linenos, frame=single, bgcolor=bg, breaklines=true]{#1}{#2}
     \else
-    \VerbatimInput[fontsize=\footnotesize,frame=single,breaklines]{#2}
+    \VerbatimInput[fontsize=\footnotesize,linenos=true,frame=single,breaklines]{#2}
     \fi
   }{
     \ifminted
     \inputminted[fontsize=\footnotesize,linenos,frame=single, bgcolor=bg, breaklines=true, firstline=#3, lastline=#4, firstnumber=1]{#1}{#2}
     \else
-    \VerbatimInput[fontsize=\footnotesize,frame=single,breaklines, firstline=#3, lastline=#4, firstnumber=1]{#2}
+    \VerbatimInput[fontsize=\footnotesize,linenos=true,frame=single,breaklines, firstline=#3, lastline=#4, firstnumber=1]{#2}
     \fi
+  } 
+  }{
+    \textcolor{red}{\textbf{showCode: File #2 does not exist!}}
   }
+
 }
 
 
@@ -158,6 +177,7 @@
 %        to \runcode; run = force the code to run; cache or anything else =
 %        use cache)
 \NewDocumentCommand{\runExtCode}{m m m O{}}{
+  \IfFileExists{#2}{
   \stepcounter{codeOutput}
   \ifthenelse{\isempty{#3}}
     { \setvalue{\tmpname}{tmp/\jobname_tmp\thecodeOutput.tex} }
@@ -170,6 +190,9 @@
       }{
         \ifstrequal{#4}{run}{\immediate\write18{#1 #2 > \tmpname }}{}
       }
+  }{
+    \textcolor{red}{\textbf{runExtCode: File #2 does not exist!}}
+  }
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -200,9 +223,15 @@
       {\input{\tmpname}}}}
   % if code execution disabled, and no cache:
   {\begin{tcolorbox}
-      Code execution disabled (cache not available).
+      \textbf{Output file \tmpname~ not found}. Check the file name (it may be that the file name was given with the suffix .tex. If so, remove it). If the file name is correct the problem may be because code execution is disabled and no cache is available. If so, force the code to run again (using the [run] option).
     \end{tcolorbox}}}
 
+
+\NewDocumentCommand{\checkZeroBytes}{m}{
+  \immediate\write18{python3 -c 'import os; print("ZERO BYTES IN OUTPUT", file=open("#1", "a")) if os.path.getsize("#1") == 0 else True'}
+}
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % \inln{Arg #1}{Arg #2}[Arg #3] is used to execute short source code
 % and embed resulting output.
@@ -223,7 +252,7 @@
     \immediate\write18{#1 \tmpname.txt > \tmpname.tex}\unskip
     \fi}
   \IfFileExists{\tmpname.tex}
-  {\unskip
+  {\checkZeroBytes{\tmpname.tex}\unskip
     \ifstrequal{#3}{vbox}
         {\begin{tcolorbox}[breakable,colback=red!5!white,colframe=red!75!black]
         \ifminted\unskip
@@ -233,7 +262,7 @@
         \fi
       \end{tcolorbox}}
     {\unskip\input{\tmpname.tex}\unskip}}
-    {\textcolor{red}{notrun}}}
+    {\textcolor{red}{\textbf{Output file \tmpname~ not found}}}}
 
 \NewDocumentCommand{\runR}{O{python3 -c 'from talk2stat.talk2stat import client; client("./","R","#2")'} m m O{}}
 { 
diff --git a/macros/latex/contrib/runcode/runcode.tex b/macros/latex/contrib/runcode/runcode.tex
index 5d99475739..977a41bc24 100644
--- a/macros/latex/contrib/runcode/runcode.tex
+++ b/macros/latex/contrib/runcode/runcode.tex
@@ -1,6 +1,6 @@
-    % LaTeX Package: runcode  v1.0 2020/10/04
+    % LaTeX Package: runcode  v1.1 2021/04/17
     %
-    % Copyright (C) 2020 by Haim Bar and HaiYing Wang
+    % Copyright (C) 2021 by Haim Bar and HaiYing Wang
     %
     % This file may be distributed and/or modified under the
     % conditions of the LaTeX Project Public License, either
@@ -15,9 +15,9 @@
 \documentclass{ltxdoc}
 \usepackage[hyphens]{url}
 %\usepackage{runcode}
-\ProvidesPackage{runcode}[2020/10/04 runcode v1.0]
+\ProvidesPackage{runcode}[2021/04/17 runcode v1.1]
 \begin{document}
-    \title{The \textsf{runcode} package\thanks{This document  corresponds to \textsf{runcode}~v1.0, dated~2020/10/04.}}
+    \title{The \textsf{runcode} package\thanks{This document  corresponds to \textsf{runcode}~v1.1, dated~2021/04/17.}}
     \author{Haim Bar and HaiYing Wang \\ \texttt{haim.bar@uconn.edu}, \texttt{haiying.wang@uconn.edu}}
     \maketitle
 
@@ -25,7 +25,7 @@
 
 It is recommended to use this package in the server-mode together with the Python talk2stat package. Currently, the server-mode supports Julia, MatLab, Python, and R. More languages will be added.
 
-For more details and usage examples, refer to the package's github repository, at
+For more details and usage examples and troubleshooting, refer to the package's github repository, at
 \url{https://github.com/Ossifragus/runcode}.
 }
 
@@ -49,6 +49,7 @@ Available options are:
 \item  \texttt{run}: run source code, and store results in cache files.
 \item  \texttt{cache}: use cached results.
 \item  \texttt{stopserver}: stop the \textit{talk2stat} server(s) when the pdf compilation is done.
+\item  \texttt{nohup}:  when using the server-mode, some editors terminate all child processes after LaTeX compiling such as Emacs with Auctex. For this case, use the nohup option. It set the variable notnohup to be false, and the server will not be terminated by the parent process.
 \item  \texttt{nominted}: use the \textit{fvextra} package [\url{https://ctan.org/pkg/fvextra}] instead of the \textit{minted}  package [\url{https://ctan.org/pkg/minted}] to show code (\textit{fvextra} does not require Python's pygments package [\url{https://pygments.org/}], but it does not provide syntax highlights).
 \end{itemize}
 * Requires the Python package \textit{talk2stat} to be installed.
@@ -140,6 +141,11 @@ Available options are:
 \end{itemize}
 
 
+\section{Revisions}
+\begin{itemize}
+\item v1.1, April 17, 2021: Added a nohup option; improved error handling (missing code files, zero bytes in output files.)
+\end{itemize}
+
 %
 \section{Contributing}
 We welcome your contributions to this package by opening issues on GitHub and/or making a pull request. We also appreciate more example documents written using \textsf{runcode}.
diff --git a/macros/latex/contrib/siunitx/2.8 b/macros/latex/contrib/siunitx/2.8
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md
index 32afac61f6..356f70b030 100644
--- a/macros/latex/contrib/siunitx/CHANGELOG.md
+++ b/macros/latex/contrib/siunitx/CHANGELOG.md
@@ -7,6 +7,12 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
 
 ## [Unreleased]
 
+## [v2.8e] - 2021-04-17
+
+### Fixed
+
+- Missing setting in emulation of v1 option `repeatunits`
+
 ## [v2.8d] - 2021-04-09
 
 ### Changed
diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx
index b909fbd219..0125c29569 100644
--- a/macros/latex/contrib/siunitx/siunitx.dtx
+++ b/macros/latex/contrib/siunitx/siunitx.dtx
@@ -5225,7 +5225,7 @@ This work consists of the file  siunitx.dtx
 %
 % The usual preliminaries.
 %    \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2021-04-09} {2.8d}
+\ProvidesExplPackage {siunitx} {2021-04-17} {2.8e}
   {A comprehensive (SI) units package}
 %    \end{macrocode}
 %
@@ -16682,7 +16682,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-version-1.cfg} {2021-04-09} {2.8d}
+\ProvidesExplFile {siunitx-version-1.cfg} {2021-04-17} {2.8e}
   {siunitx: Version 1 settings}
 %    \end{macrocode}
 %
@@ -17057,18 +17057,21 @@ This work consists of the file  siunitx.dtx
       {
         multi-part-units      = single,
         product-units         = single,
+        range-units           = single
       },
   repeatunits /
     power        .meta:n    =
       {
         multi-part-units      = repeat,
         product-units         = power,
+        range-units           = repeat
       },
   repeatunits /
     true        .meta:n       =
       {
         multi-part-units      = repeat,
         product-units         = repeat,
+        range-units           = repeat
       },
   repeatunits    .default:n = { true                                  },
   retainplus     .meta:n    = { retain-explicit-plus    = #1          },
@@ -17624,7 +17627,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2021-04-09} {2.8d}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2021-04-17} {2.8e}
   {siunitx: Abbreviated units}
 %    \end{macrocode}
 %
@@ -17808,7 +17811,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-binary.cfg} {2021-04-09} {2.8d}
+\ProvidesExplFile {siunitx-binary.cfg} {2021-04-17} {2.8e}
   {siunitx: Binary units}
 %    \end{macrocode}
 %
diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf
index 44f8a6c5f8..84e23eb006 100644
Binary files a/macros/latex/contrib/siunitx/siunitx.pdf and b/macros/latex/contrib/siunitx/siunitx.pdf differ
diff --git a/macros/latex/contrib/smflatex/README b/macros/latex/contrib/smflatex/README
index d6a6f94e27..be2435f9ba 100644
--- a/macros/latex/contrib/smflatex/README
+++ b/macros/latex/contrib/smflatex/README
@@ -1,3 +1,9 @@
+********************************************************************************
+* smflatex package version 1.6-20210418
+* Copyright (c) Société mathématique de France, 1999-2021
+* LaTeX Project Public License (version 1.3c).
+********************************************************************************
+
 The Société mathématique de France provides 
 a set of classes, packages and bibtex styles
 that are used in its publications.
@@ -11,21 +17,29 @@ in two languages (altabstract, alttitle, altkeywords)
    3. if necessary, use of babel (option french) and desactivation
 of some features of french.
 
-The following files are included.
+The following files are provided in the package (once unpacked)
 
   smfart.cls
-  smfbook.cls   classes for articles and books
+  smfbook.cls	classes for articles and books
 
-  smfenum.sty   package for new alignment style of enumerations
-  smfthm.sty    package for simplified definition of theorems
+  smfenum.sty	package for new alignment style of enumerations
+  smfthm.sty	package for simplified definition of theorems
 
   smfplain.bst
-  smfalpha.bst  BibTeX styles 
+  smfalpha.bst	BibTeX styles 
+
+Are also included:
+
+  smf-edoc.tex	documentation and advices (in english)
+  smf-edoc.pdf
+  smf-fdoc.tex	documentation et conseils (in french)
+  smf-fdoc.pdf
 
-  e-doc.tex     documentation and advices (in english)
-  f-doc.tex     documentation et conseils (in french)
+The present distribution is version 1.6-20210418
+It consists in minor updates of the 1.5 version and in modifications
+of the file names (systematic addition of a smf- prefix) 
+in order to be fullfill the requirements of the TeXLive distribution.
 
-The present distribution is version 1.5
 The documentation files are slightly outdated.
 
 INSTALLATION : 
@@ -35,13 +49,16 @@ INSTALLATION :
   move .bst files to $TEXMF/bibtex/bst/smflatex
   move .tex and .pdf  files to $TEXMF/doc/latex/smflatex
  
+Some additional classes, reserved for internal use of SMF, can be
+installed as well,  by manually setting \smftrue in smflatex.ins
+
 This work is subject to the LaTeX Project Public License (version 1.3c).
 
+Maintainer : Antoine Chambert-Loir <antoine.chambert-loir@u-paris.fr>
 --
 Société mathématique de France
 Institut Henri Poincaré
 11 rue Pierre et Marie Curie, F-75231 Paris cedex 05
-
-Email : revues@smf.ens.fr
+Email : revues@smf.emath.fr
 Url : http://smf.emath.fr
 
diff --git a/macros/latex/contrib/smflatex/e-doc.pdf b/macros/latex/contrib/smflatex/e-doc.pdf
deleted file mode 100644
index 8d62465e98..0000000000
Binary files a/macros/latex/contrib/smflatex/e-doc.pdf and /dev/null differ
diff --git a/macros/latex/contrib/smflatex/e-doc.tex b/macros/latex/contrib/smflatex/e-doc.tex
deleted file mode 100644
index af18072a6b..0000000000
--- a/macros/latex/contrib/smflatex/e-doc.tex
+++ /dev/null
@@ -1,674 +0,0 @@
-\documentclass[11pt,english]{smfart}
-
-\usepackage[T1]{fontenc}
-\usepackage[english,francais]{babel}
-
-\usepackage{amssymb,url,xspace,smfthm}
-
-\def\meta#1{$\langle${\it #1}$\rangle$}
-\newcommand{\myast}{($\star$)\ }
-\makeatletter
-    \def\ps@copyright{\ps@empty
-    \def\@oddfoot{\hfil\small\copyright 1997, \SMF}}
-\makeatother
-
-\newcommand{\SmF}{Soci\'et\'e ma\-th\'e\-ma\-ti\-que de France}
-\newcommand{\SMF}{Soci\'et\'e Ma\-th\'e\-Ma\-ti\-que de France}
-\newcommand{\BibTeX}{{\scshape Bib}\kern-.08em\TeX}
-\newcommand{\T}{\S\kern .15em\relax }
-\newcommand{\AMS}{$\mathcal{A}$\kern-.1667em\lower.5ex\hbox
-        {$\mathcal{M}$}\kern-.125em$\mathcal{S}$}
-\newcommand{\resp}{\emph{resp}.\xspace}
-
-\tolerance 400
-\pretolerance 200
-
-
-\title{Advice to authors}
-\date {English version 5, dated October 2000}
-\author{Soci\'et\'e Ma\-th\'e\-ma\-ti\-que de France}
-
-\address{Institut Henri Poincar\'e\\
-11 rue Pierre et Marie Curie, F-75231 Paris cedex 05}
-\email{revues@smf.ens.fr}
-\urladdr{http://smf.emath.fr/}
-\keywords{\LaTeXe, SMF, typesetting}
-
-\begin{document}
-\def\smfbyname{}
-
-\begin{abstract}
-The classes \texttt{smfbook} and \texttt{smfart} are intended to help the preparation in \LaTeX\ of the monographs and articles to be published by the \SmF. They require \LaTeXe\ and the \AMS-\LaTeX\ packages.\par
-This paper exhibits the main features of these classes.
-\end{abstract}
-
-\begin{altabstract}
-Les classes \texttt{smfbook} et \texttt{smfart} sont destin\'ees \`a la composition en \LaTeX\ des monographies et articles \'edit\'es par la \SmF. Elles n\'ecessitent \LaTeXe\ ainsi que les macros \LaTeX\ de l'AMS.\par
-Ce document en pr\'esente l'utilisation.
-\end{altabstract}
-\maketitle
-
-\tableofcontents
-
-\section{Introduction}
-The \SmF\ provides the authors of its publications with \LaTeXe\ ``document classes'' (\texttt{smfbook} for monographs and \texttt{smfart} for articles). The authors should submit their articles as \LaTeXe\ files prepared using these classes or with the \AMS-\LaTeX\ classes (\texttt{amsbook} or \texttt{amsart}) provided by the AMS (see \T\ref{sec:compatible} for the compatibility between these classes).
-
-This text contains a user's guide to these classes as well as some elementary typographical rules that the authors should read thoroughly before preparing their manuscript as a \LaTeXe\ file: sending a file prepared with the SMF classes following these rules will reduce the number of errors introduced by the editing process and will save the author proofreading time. This will hence minimize the time needed for the article to reach its printed form (and reduce the publishing costs).
-
-
-\section{Typographical hygiene}
-The file sent by the author will be adapted to the style of the journal where it will be published by the editorial board of the \SmF. It is therefore {\em important} that the \LaTeXe\ file is prepared in a very standard way, in particular by a {\em systematic} use of theorem- and proof-like environments (see \T\ref{sec:presentationthm}), of \verb|\label| and \verb|\ref| commands for referring to the corresponding numbers, and of \verb|\cite| for bibliographical references. Moreover, ``home'' macros must be clearly written in the preamble. {\em No} ``home'' macro will be used in the title, the address, the abstracts (French and English), the keywords.
-
-\Subsection{Horizontal and vertical spacing}
-
-\begin{itemize}
-\item
-Delete all spacing commands like \verb|\,| or \verb|\;| or \verb|\!|
-{\em before or after} mathematical symbols, parentheses,
-punctuation marks, etc. Horizontal spaces (in mathematical mode in particular) are handled automatically by \TeX, the author should not add any.
-\item
-On the other hand, the author may impose indivisible spaces in places where she/he does not want a carriage return, e.g.
-\verb|Tintin~\cite{RG3}| instead of \verb|Tintin \cite{RG3}|.
-
-\item
-The author should not type any space or carriage return \emph{before}
-punctuation marks. However, such a space or carriage return \emph{always} comes after punctuation marks
-
-\item
-No space \emph{before} a closing parentheses or bracket,
-as well as \emph{after} an opening parentheses or bracket.
-
-\item
-Do not use any \verb|\linebreak|, \verb|\\|, \verb|\pagebreak|, \verb|\newpage|, etc.\ in the text.
-
-\item
-Avoid commands as \verb|\hskip|, \verb|\hspace|
-or \verb|\vskip|, \verb|\vspace| in the text.
-\end{itemize}
-
-\Subsection{Punctuation marks}
-
-\begin{itemize}
-\item
-Do not put {\em any} punctuation marks at the end of any title:
-\begin{itemize}
-\item
-\verb|\section{Introduction}| and not \verb|\section{Introduction.}|
-\item
-\verb|\begin{remark}| and not \verb|\begin{remark.}|
-\item etc.
-\end{itemize}
-
-\item
-In text mode, punctuation marks are typed \emph{outside of} the mathematical mode. Write for example:
-
-``\dots\ \verb|the level $\eta_0$:  $$ A=B.$$|''
-
-\noindent and not
-
-``\dots\ \verb|the level $\eta_0:$ $$A=B.$$|''
-
-\item
-Concerning points of suspension:
-\begin{itemize}
-\item
-replace \verb|...| with \verb|\ldots\ | in the text (in English);
-\item
-replace \verb|...| or \verb|\ldots| with \verb|\cdots|
-between operators (as in, for instance,
-$A<\cdots<B$, $A+\cdots+B$ or $A=\cdots=B$)
-and with \verb|\dots| or \verb|\ldots| for mathematical punctuation (for instance $i=1, \dots ,n$);
-\item
-suppress \verb|...| after ``etc.''.
-\end{itemize}
-\item
-For a product, use \verb|\cdot| and not \verb|.|;
-In the same way, rewrite formulas like $h(.)$ or $(.,.)$ as $h(\cdot)$ or
-$(\cdot,\cdot)$.
-
-\item
-Replace explicit hyphenation (as in \verb|presenta-tion|)
-with optional hyphenation \verb|\-| (as in \verb|presenta\-tion|).
-Of course, ordinary hyphens are kept for compound words.
-\end{itemize}
-
-\subsection{Titles}
-
-Titles begin with an upper case letter and are typed in {\em lower case letters}.
-When necessary, \LaTeX\ will produce an upper case output.
-No punctuation marks should be inserted at the end of titles (see above).
-
-\subsection{Language}
-
-The author should follow the rules of the language she/he uses, in particular when typing numbers:
-in French, one should write ``deux nombres \'egaux \`a $2$'' and in the file one should type
-
-\verb|deux nombres \'egaux \`a $2$|.
-
-\noindent
-On the other hand, recall that French upper case letters take accents as do lower case letters.
-
-\Subsection{Numbering}
-
-\begin{itemize}
-\item
-Use as much as possible the automatic numbering and the corresponding \LaTeXe\ commands \verb|\label|, \verb|\ref|. To this end, keep {\em a consistent numbering convention}. Do not \og ask\fg\ commands such as
-\verb|\section| or \verb|\begin{theoreme}| to produce a complicated output. Recall that the final output will be done by the editorial board of the \SmF: please, try to help the secretary in her/his task.
-
-\item
-Use a simple logic for internal references:
-\begin{itemize}
-\item
-\verb|\label{sec:1}| for the first section,
-
-\item
-\verb|\label{th:invfunct}| for the inverse function theorem,
-
-\item
-\verb|\label{rem:stupid}| for an interesting remark.
-\end{itemize}
-
-\item
-Do not number equations which are not referred to in the text.
-\end{itemize}
-
-\Subsection{The mathematical mode}
-
-\begin{itemize}
-\item
-Do not put pieces of text between \verb|$ $| to change their style.
-The mathematical mode should only be used for writing mathematical formulas.
-
-\item
-The numbers written as digits should be typed in mathematical mode, even if this does not appear to be necessary.
-
-\item
-Do not add horizontal spaces in mathematical formulas.
-When necessary, the editorial board will do it.
-
-\item
-Use the right mathematical \TeX\ or \LaTeX\ symbol at the right place: for instance, the symbols \verb|<| and \verb|>| should not be used for making a bracket $\langle,\rangle$; this bracket is obtained with
-\verb|$\langle,\rangle$|.
-
-\item
-Please, before using your own solution, check all available \AMS-\LaTeX\ capabilities to place and cut mathematical formulas in display style (see \cite{amslatex}).
-\end{itemize}
-
-\Subsection{The bibliography}
-\begin{itemize}
-\item
-Make a uniform bibliography and do not change the convention according to the entry (use {\BibTeX} for instance).
-\item
-{\em Systematically} use the \verb|\cite| command to cite the entries of the bibliography.
-\end{itemize}
-
-\section{The environment}
-
-The \SmF\ (SMF) provides authors with the following files:
-\begin{itemize}
-\item
-two class files \texttt{smfbook.cls} (for monographs) and \texttt{smfart.cls} (for articles),
-\item
-two {\BibTeX} style files:
-\begin{itemize}
-\item
-\texttt{smfplain.bst} (for numerical citations) and 
-\item
-\texttt{smfalpha.bst} (for alphabetical citations),
-\end{itemize}
-\item
-a supplementary package \texttt{smfthm.sty} described in \T\ref{sec:smfthm},
-\item
-a supplementary package \texttt{smfenum.sty} for enumerations in the French style,
-\item
-a supplementary package \texttt{bull.sty} for articles submitted to the \textsl{Bulletin}.
-\end{itemize}
-They may be obtained on the web site of the SMF:
-
-\texttt{http://smf.emath.fr/}
-
-\noindent under the heading \verb|Publications/Formats|.
-
-\smallskip
-These classes have been written to remain compatible
-with the \texttt{amsbook} and \texttt{amsart} classes developped
-by the American Mathematical Society (AMS). To use them, you need:
-\begin{itemize}
-\item \LaTeXe, preferebly some recent version. The class
-doesn't work with the old \LaTeX 2.09 version which has been obsolete for years;
-\item the various packages furnished by the American Mathematical
-Society; it is better to have the November 1996 version
-although it should work with the 1995 one.
-\item
-To typeset an index, it is better to have the
-\texttt{multicol.sty} {\em package} available.
-\end{itemize}
-The file \texttt{smfbook.cls} (\resp \texttt{smfart.cls}) is used instead of  \texttt{amsbook.cls} (\resp \texttt{amsart.cls}) and has to be put in the directory containing \TeX\ inputs. In order to use the package \texttt{smfthm} (see \T\ref{sec:smfthm}) or \texttt{bull.sty}, one should put the files \texttt{smfthm.sty} or \texttt{bull.sty} in the same directory.
-
-Many standard packages add capabilities to \LaTeXe. In this respect, we suggest using
-\begin{itemize}
-\item \texttt{epsfig.sty}, \cite{epsfig}, for the inclusion of (encapsulated) {\scshape PostScript} pictures;
-\item \texttt{graphics.sty} or \texttt{graphicx.sty}, \cite{graphics,graphicx}, in order to include pictures drawn by \LaTeX;
-\item \texttt{babel.sty}, \cite{babel}, for a text written in various languages (hyphenation, \ldots);
-\item \texttt{xypic.sty}, 
-\cite{xypic}, for the diagrams;
-\item {\BibTeX}, \cite[Appendix B]{lamport94} or \cite{hypatia},
-for the bibliography.
-\end{itemize}
-
-\section{Structure of the document}\label{sec:struct}
-
-A document typeset with one of the classes 
-\texttt{smfbook} or \texttt{smfart} has the following structure.
-Fields within brackets are optional.
-
-\begin{verse}
-\verb|\documentclass[|\meta{options}\verb|]{smfbook| or \verb|smfart}|\\
-Preamble (packages, macros, theoremlike environments, \ldots) e.g.\\
-{\advance\leftskip 1.5em
-\verb|\usepackage[francais,english]{babel}| \\
-\verb|\usepackage{smfthm}|\\
-\verb|\usepackage{bull}|\quad (for articles submitted to the \textsl{Bulletin})\\
-\verb|\theoremstyle{plain} \newtheorem{scholie}{Scholie}|\\
-}
-\smallskip
-\verb|\author[|\meta{short name}\verb|]{|\meta{Firstname Lastname}\verb|}| \\
-\verb|\address{|\meta{line 1}\verb|\\ |\meta{line 2}\verb|\\ |\dots
-\meta{line $n$}\verb|}| \\
-\verb|\email{|\meta{email address}\verb|}| \\
-\verb|\urladdr{|\meta{WWW address}\verb|}|\\
-\smallskip
-\verb|\title[|\meta{short title}\verb|]{|\meta{title of text}\verb|}| \\
-\verb|\alttitle{|\meta{title in the other language
-    (French or English)}\verb|}| \\
-\smallskip
-\verb|\begin{document}|\\
-\verb|\frontmatter|\\
-\smallskip
-\verb|\begin{abstract}|\par\nopagebreak\noindent
-\quad\meta{Abstract in the main language of text}\par\nopagebreak\noindent
-\verb|\end{abstract}|\\ \smallskip 
-\verb|\begin{altabstract}|\\
-\quad\meta{Abstract in the other language (French or English)}\\
-\verb|\end{altabstract}| \\
-\smallskip
-\verb|\subjclass{|\meta{AMS classification}\verb|}| \\
-\verb|\keywords{|\meta{Key words}\verb|}| \\
-\verb|\altkeywords{|\meta{Mots-clefs in the other language (French or English)}\verb|}| \\
-\smallskip
-\quad \verb|\translator{|\meta{Firstname Lastname}\verb|}|\\
-\quad \verb|\thanks{|\meta{Grants}\verb|}|\\
-\quad \verb|\dedicatory{|\meta{dedication}\verb|}|\\
-\smallskip
-\verb|\maketitle|\\
-\quad \verb|\tableofcontents |\meta{if needed}\verb||\\
-\smallskip
-\verb|\mainmatter|\\
-Main body of the text\\
-\smallskip
-\verb|\backmatter|\\
-Bibliography, index, etc.\\
-\verb|\end{document}|
-\end{verse}
-
-\Subsection*{Remarks}
-\begin{itemize}
-\item
-If there are many authors, or if an author has more than one address,
-one may type as many \par
-\begin{verse} \rm
-\verb|\author{|\meta{author}\verb|}| \\
-\verb|\address{|\meta{address}\verb|}| \\
-\verb|\email{|\meta{email address}\verb|}| \\
-\verb|\urladdr{|\meta{WWW address}\verb|}|
-\end{verse}
-commands as needed, in the right order of course.
-\item
-All data introduced before the \verb|\maketitle| command will be used for different purposes: back cover, advertisement, electronic abstracts, data banks. It is therefore important that {no personal macro} is used in the corresponding fields.
-\item
-Do not hesitate to be prolix when filling the field \verb|\subjclass|. One may consult for instance the web site
-
-\url|http://www.ams.org/msc/|
-\end{itemize}
-
-\section{Class options}
-These options are entered the following way:
-\begin{verse}
-\verb|\documentclass[|\meta{option1,option2,...}%
-\verb|]{smfbook| or \verb|smfart}|
-\end{verse}
-Default options are indicated with a star.
-
-\Subsection{Usual options}
-\begin{itemize}
-\item {\tt \myast a4paper},
-    A4 printing
-\item {\tt letterpaper},
-    US Letter printing, to make easier the typesetting of documents
-    in the United States
-\item {\tt draft},
-    preliminary draft, {\em overfull hbox}es are shown by black rules;
-\item {\tt \myast leqno},
-     equation numbers on the left
-\item {\tt reqno},
-    equation numbers on the right
-\item {\tt \myast 10pt},
-    normal character size = 10 points
-\item {\tt 11pt},
-    normal character size = 11 points
-\item {\tt 12pt},
-    normal character size = 12 points
-\end{itemize}
-
-\Subsection{Language of the text}
-
-\begin{itemize}
-\item {\tt \myast francais},
-    if the main language of the text is French
-\item {\tt english},
-    if it is English.
-\end{itemize}
-
-\subsection{Remark}
-Do not mix up the {\tt francais} or {\tt english} options of the SMF class with the {\tt francais} or {\tt english} options of {\tt babel}: the latter has to be entered as indicated in the example of \T\ref{sec:struct}.
-
-
-\section{Sectioning commands}
-As in any \LaTeXe{} class, some commands are devoted to the sectioning of
-the document:
-\begin{center}
-\begin{tabular}{ll}
-\verb|\part| \\
-\verb|\chapter|      & \texttt{smfbook} only \\
-\verb|\section| \\
-\verb|\subsection| \\
-\verb|\subsubsection| \\
-\verb|\paragraph| \\
-\verb|\subparagraph| 
-\end{tabular}
-\end{center}
-
-\noindent
-The table of contents is inserted automatically with 
-\verb|\tableofcontents|.
-
-\noindent
-The macro \par
-\verb|\appendix| \par\noindent
-starts the appendix.
-
-The bibliography is entered as usual,
-\begin{verse}
-\verb|\begin{thebibliography}{|\meta{longest label}\verb|}| \\
-\meta{Bibliography entries} \\
-\verb|\end{thebibliography}|
-\end{verse}
-The use of {\BibTeX} is recommended,
-see for example~\cite[Appendix B]{lamport94}
-and~\cite{hypatia} for an introduction.
-The {\BibTeX} styles \texttt{smfplain.bst} and \texttt{smfalpha.bst} may be obtained on the web site \url|http://smf.emath.fr/|\  of the SMF. The bibliography is then entered as follows
-\begin{verse}
-\verb|\bibliographystyle{smfplain| or \verb|smfalpha}| \\
-\verb|\bibliography{myfile.bib}|
-\end{verse}
-if \verb|myfile.bib| is the {\BibTeX} data file.
-
-\section{Presentation of theorems}\label{sec:presentationthm}
-
-Theorems are typeset thanks to the package {\tt amsthm}. For details, we refer to its documentation~\cite{amslatex}. One should use such environments in a {\em systematic} way for statements and proofs.
-
-
-\subsection{Theorem styles}\label{subsec:thm}
-
-Three styles of theorems are defined: {\tt plain},
-{\tt definition} and {\tt remark}. The two last are identical
-and only differ from the first one in that the text of the statement
-is in straight letters instead of italics. All \verb|\newtheorem|($*$) commands should be introduced clearly in the preamble.
-
-The \verb|\newtheorem| command creates or uses some counter in order to define the numbering of the corresponding environment.
-
-Use the \verb|\newtheorem*| command to get nonnumbered theoremlike environments, e.g.
-
-\verb|\newtheorem*{curveselectionlemma}{Curve Selection Lemma}|
-
-\medskip
-Different kinds of numberings may also be introduced in the preamble, e.g. for propositions numbered alphabetically:
-
-\verb|\newtheorem{theoremalph}{Proposition}|
-
-\verb|\def\thetheoremalph{\Alph{theoremalph}}|.
-
-
-\subsection{Proof environment}\label{subsec:proof}
-
-The proof environment \par
-\verb|\begin{proof}| \dots \verb|\end{proof}|\par\noindent
-allows a standard presentation of proofs, beginning with
-``Proof'' and ending with the traditional small box $\qedsymbol$.
-
-It is possible to change the word ``Proof'' as in:\par
-\verb|\begin{proof}[Idea of proof]| \dots \verb|\end{proof}| \par\noindent
-which shows
-\begin{proof}[Idea of proof]
-Exercise for the interested reader.
-\end{proof}
-
-\section{The \texttt{smfthm.sty} package}\label{sec:smfthm}
-
-This section describes the \texttt{smfthm.sty} package. Its use is not mandatory.
-
-\subsection{Theoremlike environments}
-
-Some theoremlike environments are defined. They use one and the same counter.
-\par\nobreak
-\begin{center}\begin{tabular}{lccc}
-\noalign{\hrule height .08em\vskip.65ex}
-Style & {\tt Macro} \LaTeX & Nom fran\c{c}ais & English name\quad \\
-\noalign{\vskip .4ex \hrule height 0.05em\vskip.65ex}
-\it plain & \tt theo & Th\'eor\`eme & \it Theorem \\
- & \tt prop & Proposition & \it Proposition \\
- & \tt conj & Conjecture & \it Conjecture \\
- & \tt coro & Corollaire & \it Corollary \\
- & \tt lemm & Lemme & \it Lemma \\
-\noalign{\vskip .4ex \hrule height 0.05em\vskip.65ex}
-\it definition & \tt defi & D\'efinition & \it Definition \\
-\noalign{\vskip .4ex \hrule height 0.05em\vskip.65ex}
-\it remark & \tt rema & Remarque & \it Remark \\
- & \tt exem & Exemple & \it Example \\
-\noalign{\vskip .4ex \hrule height 0.08em\vskip.65ex}
-\end{tabular}\end{center}
-One uses them e.g. as follows:
-\begin{verse}
-\verb|\begin{theo}[Wiles]| \\
-\verb|If $n\geq 3$ and if $x$, $y$, $z$ are integers| \\
-\verb|such that $x^n+y^n=z^n$, then $xyz=0$.|\\
-\verb|\end{theo}|
-\end{verse}
-\begin{theo}[Wiles]
-If $n\geq 3$ and if $x$, $y$, $z$ are integers such that
-$x^n+y^n=z^n$, then $xyz=0$.
-\end{theo}
-
-\subsection{Fixing the choice of the numbering}
-The way of numbering the statements is defined by the following commands,
-which have to been entered {\em before\/} the %\par\noindent
-\verb|\begin{document}|:
-\begin{itemize}
-\item
-\verb|\NumberTheoremsIn{|\meta{counter name}\verb|}|,
-    indicates the level
-    at which the statement numbers are reset to zero,
-    (\verb|section| for instance); the counter {\tt smfthm} is then defined;
-\item
-\verb|\NumberTheoremsAs{|\meta{counter name}\verb|}|,
-    allows the statement coun\-ter to be one of the usual sectioning counters
-    (e.g. \verb|section|, \verb|subsection|, \verb|paragraph|, etc.);
-\item
-\verb|\SwapTheoremNumbers|,
-    to put the statement number before the statement name,
-    as in ``1.4.~Theorem''
-\item
-\verb|\NoSwapTheoremNumbers|, 
-    the converse, e.g. ``Theorem~3.1''
-\end{itemize}
-
-\smallskip
-The default options of the package are\par
-\verb|\NumberTheoremsIn{section}\NoSwapTheoremNumbers| \par\noindent
-which means that the counter {\tt smfthm} is defined and reset at the beginning of every section and that the statement numbers, which take the form
-
-{\tt section number.value of the counter smfthm}
-
-\noindent are written after the statement name.
-
-
-\subsection{Generic statement}
-
-The {\tt enonce} environment allows one to typeset a generic theorem
-whose name changes on demand, e.g.:\par
-\begin{verse}
-\verb|\begin{enonce}{Assumption}|\\
-\meta\dots \\
-\verb|\end{enonce}|
-\end{verse}
-typesets an `Assumption', numbered as it should be.
-
-The {\tt enonce} environment uses the {\it plain} theorem style, but one can change this style by putting another style inside brakets, e.g.:
-\begin{verse}
-\verb|\begin{enonce}[remark]{Key remark}|\\
-\meta\dots \\
-\verb|\end{enonce}|
-\end{verse}
-
-Finally, there exists a corresponding \verb|enonce*| environment.
-
-\subsection{Other statements}
-The author may introduce other kinds of theoremlike environments as explained in \T\ref{subsec:thm}. Notice, however, that in order to introduce environments numbered as the ones of {\tt smfthm.sty}, one uses {\tt enonce}:
-
-\verb|\newenvironment{scholie}{\begin{enonce}{Scholie}}{\end{enonce}}|
-
-\noindent which should be entered \emph{after} \verb|\begin{document}|.
-
-
-\section{Adapting a manuscript from another dialect}\label{sec:compatible}
-If you already have typed your manuscript  in \textsc{Plain} \TeX,
-or in \LaTeX 2.09, or in \LaTeXe, but with another class,
-and if you want to adapt it to the SMF classes, this paragraph
-will give you some hints.
-
-\subsection{From another \LaTeXe\ class}
-If it is an AMS class, you'll have very little to do: for an article written in English for instance, replace
-
-\verb|\documentstyle[12pt,leqno]{amsart}|
-
-\noindent with
-
-\verb|\documentstyle[leqno,english]{smfart}|
-
-\noindent
-
-You'll need to enter another abstract
-(\texttt{altabstract}) and another title (\texttt{alttitle}), 
-in French if your text is in English and in English otherwise.
-
-The inverse transformation (SMF $\rightarrow$ AMS) can be done in a similar way.
-
-\medskip
-If it is a standard class (\texttt{article} ou \texttt{book}),
-things are a bit more complicated. Be careful to type the abstracts
-{\em before} the \verb|\maketitle|; some mathematical formulas might
-not work properly, but the AMS packages offer such a variety of
-uses, that it should not be very difficult to do.
-
-\subsection{From \LaTeX2.09}
-In this case, you'll have to make the adjustments described
-in the previous paragraph, and also those needed by the
-\LaTeX2.09--\LaTeXe\ mutation.
-A priori, it should mostly concern the font faces commands
-and the conforming to 
-the {\em New Font Selection Scheme} (NFSS).
-
-\subsection{From {P\smaller[3]LAIN} \TeX}
-In this case, you have to take up your manuscript again,
-and replace title, theorems, sectioning and bibliographical commands, by the adequate ones, refering to the \LaTeXe\ user's guide and the recommendations above. We bring your attention
-to the automatic numbering of paragraphs and theoremlike environments: it might differ from the original one. Pay similar attention to your references.
-The macros \textsc{Plain} \TeX{} uses to change the typefaces
-are most often ineffective in \LaTeXe, so you'll have to adapt
-them too. Concerning mathematics, few changes are needed, except
-for aligned equations and matrices.
-
-
-
-\def\refname{L\MakeLowercase{iterature and sources}}
-\begin{thebibliography}{99}
-\bibitem {lamport94}
-  {\sc L.\ Lamport.} ---
-  {\it LaTeX: A Document Preparation System.}
-  Second edition. Addison-Wesley, 1994.
-
-\bibitem {goossens93}
-  {\sc M.\ Goossens, F.\ Mittelbach, A.\ Samarin.} ---
-  {\it The LaTeX Companion.}
-  Addison-Wesley, 1993.
-
-\bibitem {goossens96}
-  {\sc M.\ Goossens, S.\ Rahtz and F.\ Mittelbach.} ---
-  {\it The LaTeX Graphics Companion: Illustrating Documents With TeX and
-       Postscript.}
-  Tools and Techniques for Computer Typesetting Series,
-  Addison-Wesley, 1996.
-
-\bibitem {short}
-{\it The Not So Short Introduction to LaTeX2e,} {\scshape T.\ Oetiker,
-H.\ Partl, I.\ Hyna, E.\ Schlegl,}
-\url|http://www.loria.fr/tex/general/flshort2e.dvi|
-
-\bibitem {amslatex}
-{\it AMS-LaTeX version 1.2 User's Guide},
-\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/amslatex/amsldoc.dvi|
-
-\bibitem{babel}
-{\it Babel, a multilingual package for use with \LaTeX's standard document
-classes,}
-{\scshape J.\ Braams,}
-\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/babel/babel.dvi|
-
-\bibitem{epsfig}
-{\it The \texttt{epsfig} package,}
-{\scshape S.\ Rahtz,}
-\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/graphics/epsfig.dvi|
-
-\bibitem{graphics}
-{\it The \texttt{graphics} package,}
-{\scshape D.\ Carlisle, S.\ Rahtz,}
-\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/graphics/graphics.dvi|
-
-\bibitem{graphicx}
-{\it The \texttt{graphicx} package,}
-{\scshape D.\ Carlisle, S.\ Rahtz,}
-\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/graphics/graphicx.dvi|
-
-\bibitem {hypatia}
-{\it Hypatia's Guide to BibTeX,}
-\url|http://hypatia.dcs.qmw.ac.uk/html/bibliography.html|
-
-\bibitem{xypic}
-{\it Xy-pic User's Guide,}
-{\scshape K.\ Rose, R.\ Moore,}
-\url{http://www.loria.fr/tex/graph-pack/doc-xypic/xyguide.dvi}
-\end{thebibliography}
-
-
-The most recent versions of macros files and of their documentations 
-are also available by anonymous \texttt{ftp} on the CTAN sites
-({\em Comprehensive TeX Archive Network\/})
-In the United States, one may use the address \texttt{ftp.shsu.edu};
-the sites 
-\texttt{ftp.loria.fr} or \verb|ftp.jussieu.fr| in France,
-\texttt{ftp.tex.ac.uk} in England, and 
-\texttt{ftp.dante.de} in Germany also
-hold the archive.
-
-\end{document}
-
-
diff --git a/macros/latex/contrib/smflatex/f-doc.pdf b/macros/latex/contrib/smflatex/f-doc.pdf
deleted file mode 100644
index 50539b7413..0000000000
Binary files a/macros/latex/contrib/smflatex/f-doc.pdf and /dev/null differ
diff --git a/macros/latex/contrib/smflatex/f-doc.tex b/macros/latex/contrib/smflatex/f-doc.tex
deleted file mode 100644
index 25b5e85ae4..0000000000
--- a/macros/latex/contrib/smflatex/f-doc.tex
+++ /dev/null
@@ -1,753 +0,0 @@
-\documentclass[11pt,francais]{smfart}
-
-\usepackage[T1]{fontenc}
-\usepackage[english,francais]{babel}
-
-\usepackage{amssymb,url,xspace,smfthm}
-
-\def\meta#1{$\langle${\it #1}$\rangle$}
-\newcommand{\myast}{($\star$)\ }
-\makeatletter
-    \def\ps@copyright{\ps@empty
-    \def\@oddfoot{\hfil\small\copyright 1997, \SMF}}
-\makeatother
-
-\newcommand{\SmF}{Soci\'et\'e ma\-th\'e\-ma\-ti\-que de France}
-\newcommand{\SMF}{Soci\'et\'e Ma\-th\'e\-Ma\-ti\-que de France}
-\newcommand{\BibTeX}{{\scshape Bib}\kern-.08em\TeX}
-\newcommand{\T}{\S\kern .15em\relax }
-\newcommand{\AMS}{$\mathcal{A}$\kern-.1667em\lower.5ex\hbox
-        {$\mathcal{M}$}\kern-.125em$\mathcal{S}$}
-\newcommand{\resp}{\emph{resp}.\xspace}
-
-\tolerance 400
-\pretolerance 200
-
-
-\title{Recommandations aux auteurs}
-\date {Version 5, octobre 2000}
-\author{Soci\'et\'e Ma\-th\'e\-ma\-ti\-que de France}
-
-\address{Institut Henri Poincar\'e\\
-11 rue Pierre et Marie Curie, F-75231 Paris cedex 05}
-\email{revues@smf.ens.fr}
-\urladdr{http://smf.emath.fr/}
-\keywords{\LaTeXe, SMF, composition, format}
-
-\begin{document}
-\def\smfbyname{}
-
-\begin{abstract}
-Les classes \texttt{smfbook} et \texttt{smfart} sont destin\'ees \`a la composition en \LaTeX\ des monographies et articles \'edit\'es par la \SmF. Elles n\'ecessitent \LaTeXe\ ainsi que les macros \LaTeX\ de l'AMS.\par
-Ce document en pr\'esente l'utilisation.
-\end{abstract}
-
-\begin{altabstract}
-The classes \texttt{smfbook} and \texttt{smfart} are intended to help the preparation in \LaTeX\ of the monographs and articles to be published by the \SmF. They require \LaTeXe\ and the \AMS-\LaTeX\ packages.\par
-This paper exhibits the main features of these classes.
-\end{altabstract}
-\maketitle
-
-\tableofcontents
-
-\section{Introduction}
-La \SmF\ met \`a la disposition des auteurs de ses publications un format
-\LaTeXe\ (\texttt{smfbook} pour les monographies et \texttt{smfart} pour
-les articles). Elle invite les auteurs \`a soumettre leurs articles dans ce
-format, ou, \`a d\'efaut, au format {\AMS-\LaTeX} (\texttt{amsbook} ou
-\texttt{amsart}) d\'evelopp\'e par l'American Mathematical Society (voir le
-\T\ref{sec:compatible} \`a propos des compatibilit\'es entre les deux).
-
-\smallskip
-Ce texte contient un mode d'emploi du format ainsi que certaines r\`egles
-d'hygi\`ene typographique dont les auteurs voudront bien prendre
-connaissance avant de taper ou transformer leur fichier \LaTeX: envoyer un
-fichier au format SMF en suivant ces quelques r\`egles \'el\'ementaires
-minimisera l'introduction d'erreurs au cours de la composition ainsi que le
-temps pass\'e aux fastidieuses relectures multiples qui en d\'ecoulent, et
-diminuera de ce fait les d\'elais de parution (de m\^eme que le co\^ut de
-publication).
-
-\section{Hygi\`ene typographique: quelques r\`egles}
-
-Le fichier envoy\'e par l'auteur est mis au format de la revue dans
-laquelle il doit para\^\i tre par le secr\'etariat de r\'edaction de la
-\SmF. Il est donc {\em important} que la composition \LaTeXe\ soit le plus
-standard possible, notamment par l'utilisation {\em syst\'ematique} des
-environnements d'\'enonc\'e et de d\'emonstration (voir le
-\T\ref{sec:presentationthm}), par celle de \verb|\label| et
-\verb|\ref| pour les r\'ef\'erences aux num\'eros correspondants et par celle de
-\verb|\cite| pour les citations bibliographiques. De plus, les macros \og maison\fg\ doivent \^etre \'ecrites clairement dans le pr\'eambule. {\em Aucune} macro personnelle ne doit \^etre utilis\'ee dans le titre, l'adresse, les r\'esum\'es (fran\c cais et anglais), mots-cl\'es.
-
-\Subsection{Les espacements horizontaux et verticaux}
-
-\begin{itemize}
-\item
-Supprimer tous les espacements du type \verb|\,| ou \verb|\;| ou \verb|\!|
-{\em devant ou derri\`ere} les symboles math\'ematiques, les parenth\`eses,
-les signes de ponctuation, etc. Les espacements sont g\'er\'es par \TeX,
-l'auteur n'en impose \emph{aucun}.
-\item
-En revanche, l'auteur peut mettre des blancs ins\'ecables aux endroits ou il ne
-d\'esire pas de coupure, par exemple
-\verb|Tintin~\cite{RG3}| au lieu de \verb|Tintin \cite{RG3}|.
-
-\item
-Il vaut mieux ne mettre {\em aucun} espace ou retour chariot \emph{avant}
-un signe de ponctuation. Par contre on met toujours un blanc ou un retour
-chariot \emph{apr\`es}.
-
-\item
-Ne mettre aucun espace ni \emph{avant} une parenth\`ese ou un crochet fermant,
-ni \emph{apr\`es} une parenth\`ese ou un crochet ouvrant.
-
-\item
-Ne mettre aucune coupure de ligne (\verb|\linebreak| ou \verb|\\|)
-dans les phrases, aucune coupure de page
-(\verb|\pagebreak|, \verb|\newpage| ou autres).
-
-\item
-\'Eviter d'introduire des \verb|\hskip|, \verb|\hspace|
-ou \verb|\vskip|, \verb|\vspace|.
-\end{itemize}
-
-
-\Subsection{La ponctuation}
-
-\begin{itemize}
-\item
-Ne mettre de ponctuation finale dans \emph{aucun} titre:
-\begin{itemize}
-\item
-\verb|\section{Introduction}| et non \verb|\section{Introduction.}|
-\item
-\verb|\begin{remarque}| et non \verb|\begin{remarque.}|
-\item etc.
-\end{itemize}
-
-\item
-Les signes de ponctuation du texte en ligne sont \`a l'\emph{ext\'erieur} du mode math\'ematique.
-On \'ecrit par exemple:
-
-\og\dots\ \verb|le seuil $\eta_0$:  $$ A=B.$$|\fg
-
-\noindent et non
-
-\og\dots\ \verb|le seuil $\eta_0:$ $$A=B.$$|\fg
-
-\item
-En ce qui concerne les points de suspension:
-\begin{itemize}
-\item
-remplacer \verb|...| par \verb|\ldots\ | dans les phrases (en anglais);
-\item
-remplacer \verb|...| ou \verb|\ldots| par \verb|\cdots|
-entre des op\'erateurs (comme dans, par exemple,
-$A<\cdots<B$, $A+\cdots+B$ ou $A=\cdots=B$)
-et par \verb|\dots| ou \verb|\ldots| comme signe de ponctuation
-math\'ematique (par exemple $i=1, \dots ,n$);
-\item
-supprimer \verb|...| apr\`es \og etc.\fg.
-\end{itemize}
-\item
-Remplacer les points \verb|.| de multiplication par des \verb|\cdot|;
-remplacer aussi les formules du type $h(.)$ ou $(.,.)$ par $h(\cdot)$ ou
-$(\cdot,\cdot)$.
-
-\item
-Remplacer les tirets de c\'esure explicite (comme \verb|pr\'esenta-tion|)
-par le tiret de c\'esure optionnel \verb|\-|
-(comme dans \verb|pr\'esenta\-tion|).
-Bien entendu, on garde les tirets pour les mots compos\'es.
-\end{itemize}
-
-\subsection{Les titres}
-
-Tous les titres d\'ebutent par une majuscule et sont \'ecrits
-en {\em minuscules}.
-Si certains titres doivent appara\^\i tre en majuscules,
-c'est \LaTeX\ qui se chargera de le faire.
-Pas de ponctuation finale dans les titres (voir ci-dessus).
-
-\subsection{La langue}
-
-Il faut respecter les r\`egles propres \`a chaque langue,
-notamment en ce qui concerne l'\'ecriture des nombres:
-en fran\c cais, on \'ecrit \og deux nombres \'egaux \`a $2$\fg\ et
-dans le fichier on tape
-
-\verb|deux nombres \'egaux \`a $2$|.
-
-\noindent
-D'autre part, on rappelle que les majuscules fran\c caises s'accentuent
-tout autant que les minuscules.
-
-\Subsection{La num\'erotation}
-
-\begin{itemize}
-\item
-Utiliser au maximum la num\'erotation automatique et les commandes
-\verb|\label|, \verb|\ref|. \`A cette fin, garder {\em un type de
-num\'erotation homog\`ene}. Ne pas \og forcer\fg\ les commandes de type
-\verb|\section| ou \verb|\begin{theoreme}| pour qu'elles fassent des choses
-compliqu\'ees. Il faut se rappeler que la mise en page finale est du
-ressort du secr\'etariat de r\'edaction de la \SmF: autant lui faciliter le
-travail.
-
-\item
-Utiliser une logique simple pour les r\'ef\'erences internes:
-\begin{itemize}
-\item
-\verb|\label{sec:1}| pour la premi\`ere section,
-
-\item
-\verb|\label{th:invloc}| pour le th\'eor\`eme d'inversion locale,
-
-\item
-\verb|\label{rem:stupide}| pour une remarque int\'eressante.
-\end{itemize}
-
-\item
-Ne pas num\'eroter les \'equations auxquelles
-il n'est pas fait r\'ef\'erence dans le texte.
-\end{itemize}
-
-\Subsection{Le mode math\'ematique}
-
-\begin{itemize}
-\item
-Ne pas mettre entre \verb|$ $| des parties de texte pour changer leur style.
-Le mode math\'ematique sert uniquement \`a \'ecrire des
-formules math\'emati\-ques.
-
-\item
-Les nombres \'ecrits en chiffres doivent \^etre entr\'es
-en mode math\'ematique, m\^eme si ceci ne semble pas toujours n\'ecessaire.
-
-\item
-Ne pas ajouter d'espacement dans les formules.
-Si n\'ecessaire, le secr\'eta\-riat de r\'edaction s'en chargera.
-
-\item
-Utiliser les symboles math\'ematiques \TeX\ ou \LaTeX\ \`a bon escient: par
-exemple, les symboles \verb|<| et \verb|>| ne sont pas faits pour fabriquer
-un crochet $\langle,\rangle$; ce crochet est en effet obtenu \`a l'aide de
-\verb|$\langle,\rangle$|.
-
-\item
-Ne pas se priver des facilit\'es d'\AMS-\LaTeX\ pour positionner
-et couper des formules (voir \cite{amslatex}).
-\end{itemize}
-
-\Subsection{La bibliographie}
-\begin{itemize}
-\item
-Faire une bibliographie uniforme et ne pas changer de convention suivant
-les entr\'ees (utiliser {\BibTeX} par exemple).
-\item
-Utiliser {\em syst\'ematiquement} la commande \verb|\cite| pour citer les
-r\'ef\'erences bibliographiques.
-\end{itemize}
-
-\section{L'environnement}
-
-La \SmF\ fournit aux auteurs les fichiers suivants:
-\begin{itemize}
-\item
-deux fichiers de classe \texttt{smfbook.cls} (pour les monographies) et \texttt{smfart.cls} (pour les articles),
-\item
-deux fichiers de style {\BibTeX} \texttt{smfplain.bst} (pour les
-citations num\'eriques) and \texttt{smfalpha.bst} (pour les citations
-alphab\'etiques),
-\item
-un paquet \texttt{smfenum.sty} permettant de pr\'esenter les 
-\'enum\'erations dans un style fran\c cais,
-\item
-un paquet suppl\'ementaire \texttt{smfthm.sty} d\'ecrit au \T\ref{sec:smfthm},
-\item
-un paquet additionnel \texttt{bull.sty} pour les articles soumis au \textsl{Bulletin}.
-\end{itemize}
-Ils sont disponible sur le serveur de la SMF:
-
-\texttt{http://smf.emath.fr/}
-
-\noindent sous la rubrique \verb|Publications/Formats|.
-
-\smallskip
-L'environnement n\'ecessaire \`a l'utilisation des classes de la \SmF\ est
-{\em le m\^eme} que pour les classes {\AMS-\LaTeX}. Il faut disposer: 
-\begin{itemize}
-\item de \LaTeXe, si possible une version r\'ecente. La classe
-ne fonctionne pas avec l'ancienne version \LaTeX 2.09,
-obsol\`ete depuis plusieurs ann\'ees;
-\item des divers {\em package}s {\AMS-\LaTeX} fournis par l'AMS;
-il est pr\'ef\'erable de disposer de la version de novembre 1996,
-mais cela devrait fonctionner avec celle de 1995;
-\item
-Pour mettre en page un \'eventuel index,
-il est de plus souhaitable de disposer du {\em package}
-\texttt{multicol.sty}.
-\end{itemize}
-A la place du fichier \texttt{amsbook.cls} (\resp \texttt{amsart.cls}) on
-utilisera le fichier \texttt{smfbook.cls} (\resp \texttt{smfart.cls}) qui
-doit \^etre plac\'e dans le m\^eme dossier. Si l'auteur utilise les macros
-\texttt{smfthm} (voir le \T\ref{sec:smfthm}), \texttt{smfenum.sty} ou \texttt{bull.sty}, il y placera aussi les fichier \texttt{smfthm.sty} ou \texttt{bull.sty}. 
-
-\smallskip
-De nombreux {\em package}s standard apportent
-de nouvelles fonctionnalit\'es \`a \LaTeXe. Nous sugg\'erons ainsi
-d'utiliser:
-\begin{itemize}
-\item \texttt{epsfig.sty}, \cite{epsfig},
-pour l'inclusion de dessins r\'ealis\'es
-en {\scshape PostScript} (encapsul\'e);
-\item \texttt{graphics.sty} ou \texttt{graphicx.sty},
-\cite{graphics} et~\cite{graphicx}, pour
-l'inclusion de dessins r\'ealis\'es par \LaTeX{};
-\item \texttt{babel.sty}, \cite{babel},
-qui permet des documents multilingues (c\'esure, etc.);
-\item \texttt{xypic.sty},
-\cite{xypic}, pour les diagrammes;
-\item {\BibTeX}, \cite[Appendix B]{lamport94} ou \cite{hypatia},
- pour g\'erer la bibliographie.
-\end{itemize}
-
-
-\section{Structure du document}\label{sec:struct}
-
-Un fichier mis en page avec l'une des classes \texttt{smfbook}
-ou \texttt{smfart} a la structure suivante.
-Les champs entre crochets sont optionnels.
-
-\begin{verse}
-\verb|\documentclass[|\meta{options}\verb|]{smfbook| ou \verb|smfart}|\\
-Pr\'eambule (packages, macros, environnements d'\'enonc\'es\dots), par
-exemple: \\
-{\advance\leftskip 1.5em
-\verb|\usepackage[francais,english]{babel}| \\
-\verb|\usepackage{smfthm}|\\
-\verb|\usepackage{bull}|\quad (pour les articles soumis au \textsl{Bulletin})\\
-\verb|\theoremstyle{plain} \newtheorem{scholie}{Scholie}|\\
-}
-\smallskip
-\verb|\author[|\meta{nom raccourci}\verb|]{|\meta{Pr\'enom Nom}\verb|}| \\
-\verb|\address{|\meta{ligne 1}\verb|\\ |\meta{ligne 2}\verb|\\ |\dots
-\meta{ligne $n$}\verb|}| \\
-\verb|\email{|\meta{adresse m\'el}\verb|}| \\
-\verb|\urladdr{|\meta{adresse WWW}\verb|}|\\
-\smallskip
-\verb|\title[|\meta{titre court}\verb|]{|\meta{titre dans la langue de
-    l'article}\verb|}| \\
-\verb|\alttitle{|\meta{titre dans l'autre langue
-    (fran\c{c}ais ou anglais)}\verb|}| \\
-\bigskip
-\verb|\begin{document}|\\
-\verb|\frontmatter|\\
-\smallskip
-\verb|\begin{abstract}|\\
-\quad\meta{R\'esum\'e dans la langue de l'article}\\
-\verb|\end{abstract}|\\
-\smallskip
-\verb|\begin{altabstract}|\\
-\quad\meta{R\'esum\'e dans l'autre langue (fran\c{c}ais ou anglais)}\\
-\verb|\end{altabstract}| \\
-\smallskip
-\verb|\subjclass{|\meta{classification}\verb|}| \\
-\verb|\keywords{|\meta{Mots-clefs dans la langue de l'article}\verb|}| \\
-\verb|\altkeywords{|\meta{Mots-clefs dans l'autre langue (fran\c{c}ais ou anglais)}\verb|}| \\
-\smallskip
-\quad \verb|\translator{|\meta{Pr\'enom Nom}\verb|}|\\
-\quad \verb|\thanks{|\meta{Subventions}\verb|}|\\
-\quad \verb|\dedicatory{|\meta{D\'edicace}\verb|}|\\
-\smallskip
-\verb|\maketitle|\\
-\quad \verb|\tableofcontents |\meta{si n\'ecessaire}\verb||\\
-\smallskip
-\verb|\mainmatter|\\
-Corps de l'ouvrage\\
-\smallskip
-\verb|\backmatter|\\
-Bibliographie, index, etc.\\
-\verb|\end{document}|
-\end{verse}
-
-\Subsection*{Remarques}
-\begin{itemize}
-\item
-S'il y a plusieurs auteurs, ou si un auteur a plusieurs adresses, entrer
-tout simplement autant de commandes \par
-\begin{verse} \rm
-\verb|\author{|\meta{auteur}\verb|}| \\
-\verb|\address{|\meta{adresse}\verb|}| \\
-\verb|\email{|\meta{adresse m\'el}\verb|}| \\
-\verb|\urladdr{|\meta{adresse WWW}\verb|}|
-\end{verse}
-qu'il le faut, dans l'ordre bien entendu.
-\item
-Toutes les donn\'ees intervenant avant \verb|\maketitle| sont aussi utilis\'ees pour les pages de couverture, la publicit\'e, les r\'esum\'es \'electroniques, les bases de donn\'ees. Aussi, {\em aucune macro personnelle} ne doit y figurer. L'auteur fournira une {\em traduction anglaise du titre} si celui-ci est en fran\c cais.
-\item
-Ne pas h\'esiter \`a \^etre prolixe sur le contenu de \verb|\subjclass|. On pourra consulter \`a ce propos
-
-\url|http://www-mathdoc.ujf-grenoble.fr/MSC2000/msc.html|
-\end{itemize}
-
-\section{Options de la classe}
-Ces options s'introduisent de la mani\`ere suivante:
-\begin{verse}
-\verb|\documentclass[|\meta{option1,option2,\dots}%
-\verb|]{smfbook| ou \verb|smfart}|
-\end{verse}
-Les options marqu\'ees d'une \'etoile sont s\'electionn\'ees par
-d\'efaut.
-
-
-\Subsection{Options usuelles}
-\begin{itemize}
-\item {\tt \myast a4paper}:
- Impression sur du papier A4
-\item {\tt letterpaper}:
- Impression sur du papier \og US Letter\fg, pour
- faciliter l'utilisation de cette classe aux \'Etats-Unis,
- lors de la mise au point du texte.
-\item {\tt draft}:
- Version pr\'eliminaire, les {\em overfull hbox\,}es sont marqu\'ees d'un trait noir.
-\item {\tt \myast leqno}:
- Num\'eros d'\'equations \`a gauche
-\item {\tt reqno}:
- Num\'eros d'\'equations \`a droite
-\item {\tt \myast 10pt}:
- Taille normale des caract\`eres = 10 points
-\item {\tt 11pt}:
- Taille normale des caract\`eres = 11 points
-\item {\tt 12pt}:
- Taille normale des caract\`eres = 12 points
-\end{itemize}
-
-
-\Subsection{Langue du texte}
-
-\begin{itemize}
-\item {\tt \myast francais}:
- pour un texte en fran\c{c}ais
-\item {\tt english}:
- pour un texte en anglais
-\end{itemize}
-
-\subsection{Remarque}
-Ne pas confondre l'option {\tt francais} ou {\tt english} de la classe SMF avec l'option {\tt francais} ou {\tt english} de {\tt babel}, qui, elle, doit \^etre introduite comme indiqu\'e dans l'exemple du \T\ref{sec:struct}.
-
-
-\section{D\'ecoupage du texte}
-Comme dans toutes les classes \LaTeXe, des commandes permettent de
-sectionner le document (voir \cite{lamport94,goossens93,short} pour une information pr\'ecise):
-\begin{center}
-\begin{tabular}{ll}
-\verb|\part| \\
-\verb|\chapter| & \texttt{smfbook} uniquement \\
-\verb|\section| \\
-\verb|\subsection| \\
-\verb|\subsubsection| \\
-\verb|\paragraph| \\
-\verb|\subparagraph|
-\end{tabular}
-\end{center}
-
-\noindent
-La table des mati\`eres est ins\'er\'ee automatiquement avec \par
-\verb|\tableofcontents|.
-
-\noindent
-La commande \par
-\verb|\appendix| \par\noindent
-permet de d\'ebuter les appendices.
-
-La bibliographie est entr\'ee comme d'habitude en \LaTeX,
-\begin{verse}
-\verb|\begin{thebibliography}{|\meta{label le plus long}\verb|}| \\
-\meta{Entr\'ees de bibliographies} \\
-\verb|\end{thebibliography}|
-\end{verse}
-Il est possible, bien s\^ur, d'utiliser {\BibTeX}, voir par exemple~\cite[Appendix~B]{lamport94} et~\cite{hypatia} pour une introduction.
-Les styles \texttt{smfplain.bst} et \texttt{smfalpha.bst} pour la pr\'esentation automatique avec {\BibTeX} des bibliographies est disponible sur le serveur \url|http://smf.emath.fr/|\ de la SMF. On entre alors la bibliographie comme suit:
-\begin{verse}
-\verb|\bibliographystyle{smfplain| ou \verb|smfalpha}| \\
-\verb|\bibliography{myfile.bib}|
-\end{verse}
-si \verb|myfile.bib| est le fichier de donn\'ees bibliographique {\BibTeX}.
-
-
-\section{Pr\'esentation des th\'eor\`emes}\label{sec:presentationthm}
-
-Les th\'eor\`emes sont mis en page gr\^ace au {\em package} {\tt amsthm}.
-Nous renvoyons \`a la documentation~\cite{amslatex}
-de celui-ci pour plus de d\'etails. Il est recommand\'e d'utiliser {\em syst\'ematiquement} les environnements d'\'enonc\'e et de d\'emonstration.
-
-
-\subsection{Styles de th\'eor\`emes}\label{subsec:thm}
-
-Sont d\'efinis trois styles de th\'eor\`emes: {\tt plain},
-{\tt definition} et {\tt remark}. Ces deux derniers sont identiques
-et diff\`erent du premier par le fait que le texte de l'\'enonc\'e
-est en caract\`eres droits et non en italique.
-
-Les environnements sont introduits par la commande \verb|\newtheorem| dans le pr\'eambule, qui cr\'ee ou utilise un compteur pour les num\'eroter automatiquement.
-
-Les \'enonc\'es non num\'erot\'es sont obtenus par la commande \verb|\newtheorem*| dans le pr\'eambule: par exemple
-
-\verb|\newtheorem*{lemmepetitchemin}{Lemme des petits chemins}|
-
-\medskip
-Les \'enonc\'es num\'erot\'es suivant une num\'erotation sp\'eciale sont introduits s\'epar\'ement dans le pr\'eambule, par exemple, pour des propositions num\'erot\'ees alphab\'etiquement:
-
-\verb|\newtheorem{theoremalph}{Proposition}|
-
-\verb|\def\thetheoremalph{\Alph{theoremalph}}|.
-
-\subsection{Environnement de d\'emonstration}
-\label{subsec:proof}
-
-L'environnement de preuve \par
-\verb|\begin{proof}| \dots \verb|\end{proof}|\par\noindent
-permet une pr\'esentation standard d'une d\'emonstration, d\'ebutant
-par {\og D\'e\-mons\-tra\-tion\fg} et se terminant par le traditionnel
-petit carr\'e $\qedsymbol$.
-
-\smallskip
-Il est possible de changer le terme {\og D\'emonstration\fg} en fournissant
-un argument suppl\'ementaire, comme dans: \par
-\verb|\begin{proof}[Id\'ee de la d\'emonstration]| \dots
-\verb|\end{proof}| \par\noindent
-qui affiche
-\begin{proof}[Id\'ee de la d\'emonstration]
-Laiss\'ee au lecteur.
-\end{proof}
-
-\section{Le {\em package} \texttt{smfthm.sty}}\label{sec:smfthm}
-Dans un article ou une monographie pour lequel la num\'erotation des \'enonc\'es est homog\`ene, l'auteur peut utiliser le {\em package} \texttt{smfthm.sty} (et y ajouter ses propres environnements si besoin).
-Cette section d\'ecrit les fonctionnalit\'es apport\'ees par ce
-{\em package} \texttt{smfthm.sty}. Son utilisation
-{\em n'est pas obligatoire}.
-
-\subsection{Environnements de th\'eor\`emes}
-
-Un certain nombre d'environnements de type th\'eor\`eme sont pr\'e-d\'efinis. Ils utilisent un seul et m\^eme compteur.
-\par\nobreak
-\begin{center}\begin{tabular}{lccc}
-\noalign{\hrule height .08em\vskip.65ex}
-Style & {\tt Macro} \LaTeX & Nom fran\c{c}ais & English name\quad \\
-\noalign{\vskip .4ex \hrule height 0.05em\vskip.65ex}
-\it plain & \tt theo & Th\'eor\`eme & \it Theorem \\
- & \tt prop & Proposition & \it Proposition \\
- & \tt conj & Conjecture & \it Conjecture \\
- & \tt coro & Corollaire & \it Corollary \\
- & \tt lemm & Lemme & \it Lemma \\
-\noalign{\vskip .4ex \hrule height 0.05em\vskip.65ex}
-\it definition & \tt defi & D\'efinition & \it Definition \\
-\noalign{\vskip .4ex \hrule height 0.05em\vskip.65ex}
-\it remark & \tt rema & Remarque & \it Remark \\
- & \tt exem & Exemple & \it Example \\
-\noalign{\vskip .4ex \hrule height 0.08em\vskip.65ex}
-\end{tabular}\end{center}
-On les utilise par exemple comme suit:
-\begin{verse}
-\verb|\begin{conj}[Fermat]| \\
-\verb|Si $n\geq 3$ et si $x$, $y$, $z$ sont trois| \\
-\verb|entiers naturels tels que $x^n+y^n=z^n$,|\\
-\verb|alors $xyz=0$.| \\
-\verb|\end{conj}|
-\end{verse}
-\begin{conj}[Fermat]
-Si $n\geq 3$ et si $x$, $y$, $z$ sont trois entiers
-naturels tels que $x^n+y^n=z^n$, alors $xyz=0$.
-\end{conj}
-
-\subsection{Choix de la num\'erotation}
-Le type de num\'erotation de \'enonc\'es est d\'efini par les commandes
-suivantes, qui doivent \^etre entr\'ees dans le pr\'eambule,
-c'est-\`a-dire {\em avant\/} le %\par\noindent
-\verb|\begin{document}|:
-\begin{itemize}
-\item
-\verb|\NumberTheoremsIn{|\meta{nom de compteur}\verb|}|:
- pr\'ecise le niveau de profondeur auquel les num\'eros d'\'enonc\'es sont remis \`a z\'ero
- (\verb|section| par exemple); ces num\'eros utilisent alors le compteur {\tt smfthm};
-\item
-\verb|\NumberTheoremsAs{|\meta{nom de compteur}\verb|}|:
- utilise un d\'ecoupage qui s'int\`egre dans celui donn\'e par un compteur d\'ej\`a d\'efini (par exemple \verb|section|, \verb|subsection|, \verb|paragraph|, etc.);
-\item
-\verb|\SwapTheoremNumbers|:
- met le num\'ero avant le type d'\'enonc\'e, comme dans {\og 1.~Th\'eor\`eme\fg};
-\item
-\verb|\NoSwapTheoremNumbers|:
- met le type d'\'enonc\'e avant son num\'ero, par exem\-ple: \og Th\'eor\`eme 1\fg.
-\end{itemize}
-
-Sans autres pr\'ecisions, la classe utilise \par
-\verb|\NumberTheoremsIn{section}\NoSwapTheoremNumbers| \par\noindent
-ce qui signifie que les th\'eor\`emes sont remis \`a z\'ero au d\'ebut de chaque
-section et que les num\'eros d'\'enonc\'es, qui apparaissent sous la forme
-
-{\tt num\'ero de section.valeur du compteur smfthm}
-
-\noindent sont plac\'es apr\`es le nom de l'environnement.
-
-\subsection{\'Enonc\'e g\'en\'erique}
-
-L'environnement \texttt{enonce} est un environnement
-de th\'eor\`emes dont
-le nom change \`a la demande, par exemple:\par
-\begin{verse}
-\verb|\begin{enonce}{Formulaire}|\\
-\meta\dots \\
-\verb|\end{enonce}|
-\end{verse}
-provoque l'affichage d'un \og Formulaire\fg, num\'erot\'e comme les \'enonc\'es du tableau ci-dessus.
-
-\smallskip
-Par d\'efaut, l'{\tt enonce} est dans le style de th\'eor\`eme {\it plain},
-mais il est possible de faire autrement en indiquant entre crochets le
-style voulu, par exemple:\par
-\begin{verse}
-\verb|\begin{enonce}[remark]{Remarque clef}|\\
-\meta\dots \\
-\verb|\end{enonce}|
-\end{verse}
-
-Enfin, on dispose de l'environnement non num\'erot\'e \verb|enonce*| qui lui correspond.
-
-\subsection{Autres \'enonc\'es}
-
-L'auteur peut introduire d'autres \'enonc\'es comme il est expliqu\'e au \T\ref{subsec:thm}. Pour introduire un \'enonc\'e num\'erot\'e comme ceux de {\tt smfthm.sty}, on utilise {\tt enonce}:
-
-\verb|\newenvironment{scholie}{\begin{enonce}{Scholie}}{\end{enonce}}|
-
-\noindent que l'on saisit \emph{apr\`es} \verb|\begin{document}|.
-
-\section{Adapter un manuscrit depuis un autre dialecte}
-\label{sec:compatible}
-
-Ce paragraphe donne quelques indications pour mettre au format SMF un manuscrit tap\'e en \textsc{Plain} \TeX, ou bien
-en \LaTeX 2.09, ou bien en \LaTeXe, mais avec une autre classe.
-
-\subsection{Depuis une classe \LaTeXe}
-S'il s'agit d'une classe AMS, tr\`es peu de travail suffit: remplacer par exemple (pour un article \'ecrit en anglais):
-
-\verb|\documentstyle[12pt,leqno]{amsart}|
-
-\noindent par
-
-\verb|\documentstyle[leqno,english]{smfart}|
-
-\noindent
-Il faudra aussi entrer un r\'esum\'e (\texttt{altabstract}) et un titre (\texttt{alttitle}), en fran\c{c}ais si le texte est en anglais et en anglais sinon.
-
-L'op\'eration inverse (SMF $\rightarrow$ AMS) est bien s\^ur possible de la m\^eme mani\`ere.
-
-\medskip
-S'il s'agit d'une classe standard (\texttt{article} ou \texttt{book}),
-les choses seront \`a peine plus compliqu\'ees. Penser \`a taper
-les r\'esum\'es avant le \verb|\maketitle|; quelques formules math\'ematiques
-pourraient ne plus marcher, mais les {\em package}s AMS offrent
-une telle souplesse d'utilisation qu'il ne devrait pas \^etre tr\`es
-difficile de faire la transition.
-
-\subsection{Depuis \LaTeX2.09}
-Dans ce cas, il faudra faire les adaptations d\'e\-cri\-tes
-au paragraphe pr\'ec\'edent, ainsi que celles contraintes par la mutation
-\LaTeX2.09--\LaTeXe. A priori, celles-ci concernent surtout les polices
-de caract\`eres et l'utilisation de NFSS ({\em New Font Selection Scheme,}
-nouveau sch\'ema de s\'election de polices).
-
-
-\subsection{Depuis {P\smaller[3]LAIN} \TeX}
-Dans ce cas, il faut reprendre tout votre tapuscrit
-et remplacer vos commandes de titres, de th\'eor\`emes, de bibliographie,
-par les commandes {\em ad hoc,} en vous r\'ef\'erant \`a la documention
-qui pr\'ec\`ede.
-
-Nous attirons l'attention sur la num\'erotation automatique
-des paragraphes et des \'enonc\'es: elle peut diff\'erer de la num\'erotation
-manuelle; faire donc attention aux r\'ef\'erences d'\'enonc\'es.
-
-Les commandes de changement de polices utilis\'ees avec \textsc{Plain} \TeX{}
-sont souvent inop\'erantes en \LaTeXe, il faudra aussi les adapter.
-Concernant les math\'ematiques, il y a peu de changements \`a faire,
-\`a l'exception notamment des \'equations align\'ees et (parfois) des matrices.
-
-\def\refname{D\MakeLowercase{ocumentation et sources}}
-\begin{thebibliography}{99}
-\bibitem {lamport94}
- {\sc L.\ Lamport.} ---
- {\it \LaTeX: A Document Preparation System.}
- Second edition. Addison-Wesley, 1994.
-
-\bibitem {goossens93}
- {\sc M.\ Goossens, F.\ Mittelbach, A.\ Samarin.} ---
- {\it The \LaTeX\ Companion.}
- Addison-Wesley, 1993.
-
-\bibitem {goossens96}
- {\sc M.\ Goossens, S.\ Rahtz and F.\ Mittelbach.} ---
- {\it The \LaTeX\ Graphics Companion: Illustrating Documents With TeX and
- Postscript.}
- Tools and Techniques for Computer Typesetting Series,
- Addison-Wesley, 1996.
-
-\bibitem {short}
-{\it Une courte (?) introduction a \LaTeX2e,} {\scshape T.\ Oetiker,
- H.\ Partl, I.\ Hyna, E.\ Schlegl,} traduit de
- l'allemand par {\scshape M.\ Herrb,}
-\url|http://www.loria.fr/tex/general/flshort2e.dvi|
-
-\bibitem {amslatex}
-{\it \AMS-\LaTeX\ version 1.2 User's Guide},
-\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/amslatex/amsldoc.dvi|
-
-\bibitem{babel}
-{\it Babel, a multilingual package for use with \LaTeX's standard document
-classes,}
-{\scshape J.\ Braams,}
-\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/babel/babel.dvi|
-
-\bibitem{epsfig}
-{\it The \texttt{epsfig} package,}
-{\scshape S.\ Rahtz,}
-\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/graphics/epsfig.dvi|
-
-\bibitem{graphics}
-{\it The \texttt{graphics} package,}
-{\scshape D.\ Carlisle, S.\ Rahtz,}
-\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/graphics/graphics.dvi|
-
-\bibitem{graphicx}
-{\it The \texttt{graphicx} package,}
-{\scshape D.\ Carlisle, S.\ Rahtz,}
-\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/graphics/graphicx.dvi|
-
-\bibitem {hypatia}
-{\it Hypatia's Guide to \BibTeX,}
-\url|http://hypatia.dcs.qmw.ac.uk/html/bibliography.html|
-
-\bibitem{xypic}
-{\it Xy-pic User's Guide,}
-{\scshape K.\ Rose, R.\ Moore,}
-\url{http://www.loria.fr/tex/graph-pack/doc-xypic/xyguide.dvi}
-\end{thebibliography}
-
-
-Les fichiers de macros et leur documentation
-sont aussi disponibles dans leur derni\`ere mise \`a jour
-par \texttt{ftp} anonyme sur les sites CTAN ({\em Comprehensive TeX Archive
-Network,} archive structur\'ee de documents pour {\TeX} et ses d\'eriv\'es).
-En France, on peut utiliser les adresses \texttt{ftp.loria.fr}
-ou \verb|ftp.jussieu.fr|;
-les adresses \texttt{ftp.tex.ac.uk} en Grande-Bretagne,
-\texttt{ftp.dante.de} en Allemagne con\-ti\-en\-nent aussi l'archive.
-
-\end{document}
-
-
-
-
-
-
diff --git a/macros/latex/contrib/smflatex/smf-edoc.pdf b/macros/latex/contrib/smflatex/smf-edoc.pdf
new file mode 100644
index 0000000000..ef375ac5a1
Binary files /dev/null and b/macros/latex/contrib/smflatex/smf-edoc.pdf differ
diff --git a/macros/latex/contrib/smflatex/smf-edoc.tex b/macros/latex/contrib/smflatex/smf-edoc.tex
new file mode 100644
index 0000000000..af18072a6b
--- /dev/null
+++ b/macros/latex/contrib/smflatex/smf-edoc.tex
@@ -0,0 +1,674 @@
+\documentclass[11pt,english]{smfart}
+
+\usepackage[T1]{fontenc}
+\usepackage[english,francais]{babel}
+
+\usepackage{amssymb,url,xspace,smfthm}
+
+\def\meta#1{$\langle${\it #1}$\rangle$}
+\newcommand{\myast}{($\star$)\ }
+\makeatletter
+    \def\ps@copyright{\ps@empty
+    \def\@oddfoot{\hfil\small\copyright 1997, \SMF}}
+\makeatother
+
+\newcommand{\SmF}{Soci\'et\'e ma\-th\'e\-ma\-ti\-que de France}
+\newcommand{\SMF}{Soci\'et\'e Ma\-th\'e\-Ma\-ti\-que de France}
+\newcommand{\BibTeX}{{\scshape Bib}\kern-.08em\TeX}
+\newcommand{\T}{\S\kern .15em\relax }
+\newcommand{\AMS}{$\mathcal{A}$\kern-.1667em\lower.5ex\hbox
+        {$\mathcal{M}$}\kern-.125em$\mathcal{S}$}
+\newcommand{\resp}{\emph{resp}.\xspace}
+
+\tolerance 400
+\pretolerance 200
+
+
+\title{Advice to authors}
+\date {English version 5, dated October 2000}
+\author{Soci\'et\'e Ma\-th\'e\-ma\-ti\-que de France}
+
+\address{Institut Henri Poincar\'e\\
+11 rue Pierre et Marie Curie, F-75231 Paris cedex 05}
+\email{revues@smf.ens.fr}
+\urladdr{http://smf.emath.fr/}
+\keywords{\LaTeXe, SMF, typesetting}
+
+\begin{document}
+\def\smfbyname{}
+
+\begin{abstract}
+The classes \texttt{smfbook} and \texttt{smfart} are intended to help the preparation in \LaTeX\ of the monographs and articles to be published by the \SmF. They require \LaTeXe\ and the \AMS-\LaTeX\ packages.\par
+This paper exhibits the main features of these classes.
+\end{abstract}
+
+\begin{altabstract}
+Les classes \texttt{smfbook} et \texttt{smfart} sont destin\'ees \`a la composition en \LaTeX\ des monographies et articles \'edit\'es par la \SmF. Elles n\'ecessitent \LaTeXe\ ainsi que les macros \LaTeX\ de l'AMS.\par
+Ce document en pr\'esente l'utilisation.
+\end{altabstract}
+\maketitle
+
+\tableofcontents
+
+\section{Introduction}
+The \SmF\ provides the authors of its publications with \LaTeXe\ ``document classes'' (\texttt{smfbook} for monographs and \texttt{smfart} for articles). The authors should submit their articles as \LaTeXe\ files prepared using these classes or with the \AMS-\LaTeX\ classes (\texttt{amsbook} or \texttt{amsart}) provided by the AMS (see \T\ref{sec:compatible} for the compatibility between these classes).
+
+This text contains a user's guide to these classes as well as some elementary typographical rules that the authors should read thoroughly before preparing their manuscript as a \LaTeXe\ file: sending a file prepared with the SMF classes following these rules will reduce the number of errors introduced by the editing process and will save the author proofreading time. This will hence minimize the time needed for the article to reach its printed form (and reduce the publishing costs).
+
+
+\section{Typographical hygiene}
+The file sent by the author will be adapted to the style of the journal where it will be published by the editorial board of the \SmF. It is therefore {\em important} that the \LaTeXe\ file is prepared in a very standard way, in particular by a {\em systematic} use of theorem- and proof-like environments (see \T\ref{sec:presentationthm}), of \verb|\label| and \verb|\ref| commands for referring to the corresponding numbers, and of \verb|\cite| for bibliographical references. Moreover, ``home'' macros must be clearly written in the preamble. {\em No} ``home'' macro will be used in the title, the address, the abstracts (French and English), the keywords.
+
+\Subsection{Horizontal and vertical spacing}
+
+\begin{itemize}
+\item
+Delete all spacing commands like \verb|\,| or \verb|\;| or \verb|\!|
+{\em before or after} mathematical symbols, parentheses,
+punctuation marks, etc. Horizontal spaces (in mathematical mode in particular) are handled automatically by \TeX, the author should not add any.
+\item
+On the other hand, the author may impose indivisible spaces in places where she/he does not want a carriage return, e.g.
+\verb|Tintin~\cite{RG3}| instead of \verb|Tintin \cite{RG3}|.
+
+\item
+The author should not type any space or carriage return \emph{before}
+punctuation marks. However, such a space or carriage return \emph{always} comes after punctuation marks
+
+\item
+No space \emph{before} a closing parentheses or bracket,
+as well as \emph{after} an opening parentheses or bracket.
+
+\item
+Do not use any \verb|\linebreak|, \verb|\\|, \verb|\pagebreak|, \verb|\newpage|, etc.\ in the text.
+
+\item
+Avoid commands as \verb|\hskip|, \verb|\hspace|
+or \verb|\vskip|, \verb|\vspace| in the text.
+\end{itemize}
+
+\Subsection{Punctuation marks}
+
+\begin{itemize}
+\item
+Do not put {\em any} punctuation marks at the end of any title:
+\begin{itemize}
+\item
+\verb|\section{Introduction}| and not \verb|\section{Introduction.}|
+\item
+\verb|\begin{remark}| and not \verb|\begin{remark.}|
+\item etc.
+\end{itemize}
+
+\item
+In text mode, punctuation marks are typed \emph{outside of} the mathematical mode. Write for example:
+
+``\dots\ \verb|the level $\eta_0$:  $$ A=B.$$|''
+
+\noindent and not
+
+``\dots\ \verb|the level $\eta_0:$ $$A=B.$$|''
+
+\item
+Concerning points of suspension:
+\begin{itemize}
+\item
+replace \verb|...| with \verb|\ldots\ | in the text (in English);
+\item
+replace \verb|...| or \verb|\ldots| with \verb|\cdots|
+between operators (as in, for instance,
+$A<\cdots<B$, $A+\cdots+B$ or $A=\cdots=B$)
+and with \verb|\dots| or \verb|\ldots| for mathematical punctuation (for instance $i=1, \dots ,n$);
+\item
+suppress \verb|...| after ``etc.''.
+\end{itemize}
+\item
+For a product, use \verb|\cdot| and not \verb|.|;
+In the same way, rewrite formulas like $h(.)$ or $(.,.)$ as $h(\cdot)$ or
+$(\cdot,\cdot)$.
+
+\item
+Replace explicit hyphenation (as in \verb|presenta-tion|)
+with optional hyphenation \verb|\-| (as in \verb|presenta\-tion|).
+Of course, ordinary hyphens are kept for compound words.
+\end{itemize}
+
+\subsection{Titles}
+
+Titles begin with an upper case letter and are typed in {\em lower case letters}.
+When necessary, \LaTeX\ will produce an upper case output.
+No punctuation marks should be inserted at the end of titles (see above).
+
+\subsection{Language}
+
+The author should follow the rules of the language she/he uses, in particular when typing numbers:
+in French, one should write ``deux nombres \'egaux \`a $2$'' and in the file one should type
+
+\verb|deux nombres \'egaux \`a $2$|.
+
+\noindent
+On the other hand, recall that French upper case letters take accents as do lower case letters.
+
+\Subsection{Numbering}
+
+\begin{itemize}
+\item
+Use as much as possible the automatic numbering and the corresponding \LaTeXe\ commands \verb|\label|, \verb|\ref|. To this end, keep {\em a consistent numbering convention}. Do not \og ask\fg\ commands such as
+\verb|\section| or \verb|\begin{theoreme}| to produce a complicated output. Recall that the final output will be done by the editorial board of the \SmF: please, try to help the secretary in her/his task.
+
+\item
+Use a simple logic for internal references:
+\begin{itemize}
+\item
+\verb|\label{sec:1}| for the first section,
+
+\item
+\verb|\label{th:invfunct}| for the inverse function theorem,
+
+\item
+\verb|\label{rem:stupid}| for an interesting remark.
+\end{itemize}
+
+\item
+Do not number equations which are not referred to in the text.
+\end{itemize}
+
+\Subsection{The mathematical mode}
+
+\begin{itemize}
+\item
+Do not put pieces of text between \verb|$ $| to change their style.
+The mathematical mode should only be used for writing mathematical formulas.
+
+\item
+The numbers written as digits should be typed in mathematical mode, even if this does not appear to be necessary.
+
+\item
+Do not add horizontal spaces in mathematical formulas.
+When necessary, the editorial board will do it.
+
+\item
+Use the right mathematical \TeX\ or \LaTeX\ symbol at the right place: for instance, the symbols \verb|<| and \verb|>| should not be used for making a bracket $\langle,\rangle$; this bracket is obtained with
+\verb|$\langle,\rangle$|.
+
+\item
+Please, before using your own solution, check all available \AMS-\LaTeX\ capabilities to place and cut mathematical formulas in display style (see \cite{amslatex}).
+\end{itemize}
+
+\Subsection{The bibliography}
+\begin{itemize}
+\item
+Make a uniform bibliography and do not change the convention according to the entry (use {\BibTeX} for instance).
+\item
+{\em Systematically} use the \verb|\cite| command to cite the entries of the bibliography.
+\end{itemize}
+
+\section{The environment}
+
+The \SmF\ (SMF) provides authors with the following files:
+\begin{itemize}
+\item
+two class files \texttt{smfbook.cls} (for monographs) and \texttt{smfart.cls} (for articles),
+\item
+two {\BibTeX} style files:
+\begin{itemize}
+\item
+\texttt{smfplain.bst} (for numerical citations) and 
+\item
+\texttt{smfalpha.bst} (for alphabetical citations),
+\end{itemize}
+\item
+a supplementary package \texttt{smfthm.sty} described in \T\ref{sec:smfthm},
+\item
+a supplementary package \texttt{smfenum.sty} for enumerations in the French style,
+\item
+a supplementary package \texttt{bull.sty} for articles submitted to the \textsl{Bulletin}.
+\end{itemize}
+They may be obtained on the web site of the SMF:
+
+\texttt{http://smf.emath.fr/}
+
+\noindent under the heading \verb|Publications/Formats|.
+
+\smallskip
+These classes have been written to remain compatible
+with the \texttt{amsbook} and \texttt{amsart} classes developped
+by the American Mathematical Society (AMS). To use them, you need:
+\begin{itemize}
+\item \LaTeXe, preferebly some recent version. The class
+doesn't work with the old \LaTeX 2.09 version which has been obsolete for years;
+\item the various packages furnished by the American Mathematical
+Society; it is better to have the November 1996 version
+although it should work with the 1995 one.
+\item
+To typeset an index, it is better to have the
+\texttt{multicol.sty} {\em package} available.
+\end{itemize}
+The file \texttt{smfbook.cls} (\resp \texttt{smfart.cls}) is used instead of  \texttt{amsbook.cls} (\resp \texttt{amsart.cls}) and has to be put in the directory containing \TeX\ inputs. In order to use the package \texttt{smfthm} (see \T\ref{sec:smfthm}) or \texttt{bull.sty}, one should put the files \texttt{smfthm.sty} or \texttt{bull.sty} in the same directory.
+
+Many standard packages add capabilities to \LaTeXe. In this respect, we suggest using
+\begin{itemize}
+\item \texttt{epsfig.sty}, \cite{epsfig}, for the inclusion of (encapsulated) {\scshape PostScript} pictures;
+\item \texttt{graphics.sty} or \texttt{graphicx.sty}, \cite{graphics,graphicx}, in order to include pictures drawn by \LaTeX;
+\item \texttt{babel.sty}, \cite{babel}, for a text written in various languages (hyphenation, \ldots);
+\item \texttt{xypic.sty}, 
+\cite{xypic}, for the diagrams;
+\item {\BibTeX}, \cite[Appendix B]{lamport94} or \cite{hypatia},
+for the bibliography.
+\end{itemize}
+
+\section{Structure of the document}\label{sec:struct}
+
+A document typeset with one of the classes 
+\texttt{smfbook} or \texttt{smfart} has the following structure.
+Fields within brackets are optional.
+
+\begin{verse}
+\verb|\documentclass[|\meta{options}\verb|]{smfbook| or \verb|smfart}|\\
+Preamble (packages, macros, theoremlike environments, \ldots) e.g.\\
+{\advance\leftskip 1.5em
+\verb|\usepackage[francais,english]{babel}| \\
+\verb|\usepackage{smfthm}|\\
+\verb|\usepackage{bull}|\quad (for articles submitted to the \textsl{Bulletin})\\
+\verb|\theoremstyle{plain} \newtheorem{scholie}{Scholie}|\\
+}
+\smallskip
+\verb|\author[|\meta{short name}\verb|]{|\meta{Firstname Lastname}\verb|}| \\
+\verb|\address{|\meta{line 1}\verb|\\ |\meta{line 2}\verb|\\ |\dots
+\meta{line $n$}\verb|}| \\
+\verb|\email{|\meta{email address}\verb|}| \\
+\verb|\urladdr{|\meta{WWW address}\verb|}|\\
+\smallskip
+\verb|\title[|\meta{short title}\verb|]{|\meta{title of text}\verb|}| \\
+\verb|\alttitle{|\meta{title in the other language
+    (French or English)}\verb|}| \\
+\smallskip
+\verb|\begin{document}|\\
+\verb|\frontmatter|\\
+\smallskip
+\verb|\begin{abstract}|\par\nopagebreak\noindent
+\quad\meta{Abstract in the main language of text}\par\nopagebreak\noindent
+\verb|\end{abstract}|\\ \smallskip 
+\verb|\begin{altabstract}|\\
+\quad\meta{Abstract in the other language (French or English)}\\
+\verb|\end{altabstract}| \\
+\smallskip
+\verb|\subjclass{|\meta{AMS classification}\verb|}| \\
+\verb|\keywords{|\meta{Key words}\verb|}| \\
+\verb|\altkeywords{|\meta{Mots-clefs in the other language (French or English)}\verb|}| \\
+\smallskip
+\quad \verb|\translator{|\meta{Firstname Lastname}\verb|}|\\
+\quad \verb|\thanks{|\meta{Grants}\verb|}|\\
+\quad \verb|\dedicatory{|\meta{dedication}\verb|}|\\
+\smallskip
+\verb|\maketitle|\\
+\quad \verb|\tableofcontents |\meta{if needed}\verb||\\
+\smallskip
+\verb|\mainmatter|\\
+Main body of the text\\
+\smallskip
+\verb|\backmatter|\\
+Bibliography, index, etc.\\
+\verb|\end{document}|
+\end{verse}
+
+\Subsection*{Remarks}
+\begin{itemize}
+\item
+If there are many authors, or if an author has more than one address,
+one may type as many \par
+\begin{verse} \rm
+\verb|\author{|\meta{author}\verb|}| \\
+\verb|\address{|\meta{address}\verb|}| \\
+\verb|\email{|\meta{email address}\verb|}| \\
+\verb|\urladdr{|\meta{WWW address}\verb|}|
+\end{verse}
+commands as needed, in the right order of course.
+\item
+All data introduced before the \verb|\maketitle| command will be used for different purposes: back cover, advertisement, electronic abstracts, data banks. It is therefore important that {no personal macro} is used in the corresponding fields.
+\item
+Do not hesitate to be prolix when filling the field \verb|\subjclass|. One may consult for instance the web site
+
+\url|http://www.ams.org/msc/|
+\end{itemize}
+
+\section{Class options}
+These options are entered the following way:
+\begin{verse}
+\verb|\documentclass[|\meta{option1,option2,...}%
+\verb|]{smfbook| or \verb|smfart}|
+\end{verse}
+Default options are indicated with a star.
+
+\Subsection{Usual options}
+\begin{itemize}
+\item {\tt \myast a4paper},
+    A4 printing
+\item {\tt letterpaper},
+    US Letter printing, to make easier the typesetting of documents
+    in the United States
+\item {\tt draft},
+    preliminary draft, {\em overfull hbox}es are shown by black rules;
+\item {\tt \myast leqno},
+     equation numbers on the left
+\item {\tt reqno},
+    equation numbers on the right
+\item {\tt \myast 10pt},
+    normal character size = 10 points
+\item {\tt 11pt},
+    normal character size = 11 points
+\item {\tt 12pt},
+    normal character size = 12 points
+\end{itemize}
+
+\Subsection{Language of the text}
+
+\begin{itemize}
+\item {\tt \myast francais},
+    if the main language of the text is French
+\item {\tt english},
+    if it is English.
+\end{itemize}
+
+\subsection{Remark}
+Do not mix up the {\tt francais} or {\tt english} options of the SMF class with the {\tt francais} or {\tt english} options of {\tt babel}: the latter has to be entered as indicated in the example of \T\ref{sec:struct}.
+
+
+\section{Sectioning commands}
+As in any \LaTeXe{} class, some commands are devoted to the sectioning of
+the document:
+\begin{center}
+\begin{tabular}{ll}
+\verb|\part| \\
+\verb|\chapter|      & \texttt{smfbook} only \\
+\verb|\section| \\
+\verb|\subsection| \\
+\verb|\subsubsection| \\
+\verb|\paragraph| \\
+\verb|\subparagraph| 
+\end{tabular}
+\end{center}
+
+\noindent
+The table of contents is inserted automatically with 
+\verb|\tableofcontents|.
+
+\noindent
+The macro \par
+\verb|\appendix| \par\noindent
+starts the appendix.
+
+The bibliography is entered as usual,
+\begin{verse}
+\verb|\begin{thebibliography}{|\meta{longest label}\verb|}| \\
+\meta{Bibliography entries} \\
+\verb|\end{thebibliography}|
+\end{verse}
+The use of {\BibTeX} is recommended,
+see for example~\cite[Appendix B]{lamport94}
+and~\cite{hypatia} for an introduction.
+The {\BibTeX} styles \texttt{smfplain.bst} and \texttt{smfalpha.bst} may be obtained on the web site \url|http://smf.emath.fr/|\  of the SMF. The bibliography is then entered as follows
+\begin{verse}
+\verb|\bibliographystyle{smfplain| or \verb|smfalpha}| \\
+\verb|\bibliography{myfile.bib}|
+\end{verse}
+if \verb|myfile.bib| is the {\BibTeX} data file.
+
+\section{Presentation of theorems}\label{sec:presentationthm}
+
+Theorems are typeset thanks to the package {\tt amsthm}. For details, we refer to its documentation~\cite{amslatex}. One should use such environments in a {\em systematic} way for statements and proofs.
+
+
+\subsection{Theorem styles}\label{subsec:thm}
+
+Three styles of theorems are defined: {\tt plain},
+{\tt definition} and {\tt remark}. The two last are identical
+and only differ from the first one in that the text of the statement
+is in straight letters instead of italics. All \verb|\newtheorem|($*$) commands should be introduced clearly in the preamble.
+
+The \verb|\newtheorem| command creates or uses some counter in order to define the numbering of the corresponding environment.
+
+Use the \verb|\newtheorem*| command to get nonnumbered theoremlike environments, e.g.
+
+\verb|\newtheorem*{curveselectionlemma}{Curve Selection Lemma}|
+
+\medskip
+Different kinds of numberings may also be introduced in the preamble, e.g. for propositions numbered alphabetically:
+
+\verb|\newtheorem{theoremalph}{Proposition}|
+
+\verb|\def\thetheoremalph{\Alph{theoremalph}}|.
+
+
+\subsection{Proof environment}\label{subsec:proof}
+
+The proof environment \par
+\verb|\begin{proof}| \dots \verb|\end{proof}|\par\noindent
+allows a standard presentation of proofs, beginning with
+``Proof'' and ending with the traditional small box $\qedsymbol$.
+
+It is possible to change the word ``Proof'' as in:\par
+\verb|\begin{proof}[Idea of proof]| \dots \verb|\end{proof}| \par\noindent
+which shows
+\begin{proof}[Idea of proof]
+Exercise for the interested reader.
+\end{proof}
+
+\section{The \texttt{smfthm.sty} package}\label{sec:smfthm}
+
+This section describes the \texttt{smfthm.sty} package. Its use is not mandatory.
+
+\subsection{Theoremlike environments}
+
+Some theoremlike environments are defined. They use one and the same counter.
+\par\nobreak
+\begin{center}\begin{tabular}{lccc}
+\noalign{\hrule height .08em\vskip.65ex}
+Style & {\tt Macro} \LaTeX & Nom fran\c{c}ais & English name\quad \\
+\noalign{\vskip .4ex \hrule height 0.05em\vskip.65ex}
+\it plain & \tt theo & Th\'eor\`eme & \it Theorem \\
+ & \tt prop & Proposition & \it Proposition \\
+ & \tt conj & Conjecture & \it Conjecture \\
+ & \tt coro & Corollaire & \it Corollary \\
+ & \tt lemm & Lemme & \it Lemma \\
+\noalign{\vskip .4ex \hrule height 0.05em\vskip.65ex}
+\it definition & \tt defi & D\'efinition & \it Definition \\
+\noalign{\vskip .4ex \hrule height 0.05em\vskip.65ex}
+\it remark & \tt rema & Remarque & \it Remark \\
+ & \tt exem & Exemple & \it Example \\
+\noalign{\vskip .4ex \hrule height 0.08em\vskip.65ex}
+\end{tabular}\end{center}
+One uses them e.g. as follows:
+\begin{verse}
+\verb|\begin{theo}[Wiles]| \\
+\verb|If $n\geq 3$ and if $x$, $y$, $z$ are integers| \\
+\verb|such that $x^n+y^n=z^n$, then $xyz=0$.|\\
+\verb|\end{theo}|
+\end{verse}
+\begin{theo}[Wiles]
+If $n\geq 3$ and if $x$, $y$, $z$ are integers such that
+$x^n+y^n=z^n$, then $xyz=0$.
+\end{theo}
+
+\subsection{Fixing the choice of the numbering}
+The way of numbering the statements is defined by the following commands,
+which have to been entered {\em before\/} the %\par\noindent
+\verb|\begin{document}|:
+\begin{itemize}
+\item
+\verb|\NumberTheoremsIn{|\meta{counter name}\verb|}|,
+    indicates the level
+    at which the statement numbers are reset to zero,
+    (\verb|section| for instance); the counter {\tt smfthm} is then defined;
+\item
+\verb|\NumberTheoremsAs{|\meta{counter name}\verb|}|,
+    allows the statement coun\-ter to be one of the usual sectioning counters
+    (e.g. \verb|section|, \verb|subsection|, \verb|paragraph|, etc.);
+\item
+\verb|\SwapTheoremNumbers|,
+    to put the statement number before the statement name,
+    as in ``1.4.~Theorem''
+\item
+\verb|\NoSwapTheoremNumbers|, 
+    the converse, e.g. ``Theorem~3.1''
+\end{itemize}
+
+\smallskip
+The default options of the package are\par
+\verb|\NumberTheoremsIn{section}\NoSwapTheoremNumbers| \par\noindent
+which means that the counter {\tt smfthm} is defined and reset at the beginning of every section and that the statement numbers, which take the form
+
+{\tt section number.value of the counter smfthm}
+
+\noindent are written after the statement name.
+
+
+\subsection{Generic statement}
+
+The {\tt enonce} environment allows one to typeset a generic theorem
+whose name changes on demand, e.g.:\par
+\begin{verse}
+\verb|\begin{enonce}{Assumption}|\\
+\meta\dots \\
+\verb|\end{enonce}|
+\end{verse}
+typesets an `Assumption', numbered as it should be.
+
+The {\tt enonce} environment uses the {\it plain} theorem style, but one can change this style by putting another style inside brakets, e.g.:
+\begin{verse}
+\verb|\begin{enonce}[remark]{Key remark}|\\
+\meta\dots \\
+\verb|\end{enonce}|
+\end{verse}
+
+Finally, there exists a corresponding \verb|enonce*| environment.
+
+\subsection{Other statements}
+The author may introduce other kinds of theoremlike environments as explained in \T\ref{subsec:thm}. Notice, however, that in order to introduce environments numbered as the ones of {\tt smfthm.sty}, one uses {\tt enonce}:
+
+\verb|\newenvironment{scholie}{\begin{enonce}{Scholie}}{\end{enonce}}|
+
+\noindent which should be entered \emph{after} \verb|\begin{document}|.
+
+
+\section{Adapting a manuscript from another dialect}\label{sec:compatible}
+If you already have typed your manuscript  in \textsc{Plain} \TeX,
+or in \LaTeX 2.09, or in \LaTeXe, but with another class,
+and if you want to adapt it to the SMF classes, this paragraph
+will give you some hints.
+
+\subsection{From another \LaTeXe\ class}
+If it is an AMS class, you'll have very little to do: for an article written in English for instance, replace
+
+\verb|\documentstyle[12pt,leqno]{amsart}|
+
+\noindent with
+
+\verb|\documentstyle[leqno,english]{smfart}|
+
+\noindent
+
+You'll need to enter another abstract
+(\texttt{altabstract}) and another title (\texttt{alttitle}), 
+in French if your text is in English and in English otherwise.
+
+The inverse transformation (SMF $\rightarrow$ AMS) can be done in a similar way.
+
+\medskip
+If it is a standard class (\texttt{article} ou \texttt{book}),
+things are a bit more complicated. Be careful to type the abstracts
+{\em before} the \verb|\maketitle|; some mathematical formulas might
+not work properly, but the AMS packages offer such a variety of
+uses, that it should not be very difficult to do.
+
+\subsection{From \LaTeX2.09}
+In this case, you'll have to make the adjustments described
+in the previous paragraph, and also those needed by the
+\LaTeX2.09--\LaTeXe\ mutation.
+A priori, it should mostly concern the font faces commands
+and the conforming to 
+the {\em New Font Selection Scheme} (NFSS).
+
+\subsection{From {P\smaller[3]LAIN} \TeX}
+In this case, you have to take up your manuscript again,
+and replace title, theorems, sectioning and bibliographical commands, by the adequate ones, refering to the \LaTeXe\ user's guide and the recommendations above. We bring your attention
+to the automatic numbering of paragraphs and theoremlike environments: it might differ from the original one. Pay similar attention to your references.
+The macros \textsc{Plain} \TeX{} uses to change the typefaces
+are most often ineffective in \LaTeXe, so you'll have to adapt
+them too. Concerning mathematics, few changes are needed, except
+for aligned equations and matrices.
+
+
+
+\def\refname{L\MakeLowercase{iterature and sources}}
+\begin{thebibliography}{99}
+\bibitem {lamport94}
+  {\sc L.\ Lamport.} ---
+  {\it LaTeX: A Document Preparation System.}
+  Second edition. Addison-Wesley, 1994.
+
+\bibitem {goossens93}
+  {\sc M.\ Goossens, F.\ Mittelbach, A.\ Samarin.} ---
+  {\it The LaTeX Companion.}
+  Addison-Wesley, 1993.
+
+\bibitem {goossens96}
+  {\sc M.\ Goossens, S.\ Rahtz and F.\ Mittelbach.} ---
+  {\it The LaTeX Graphics Companion: Illustrating Documents With TeX and
+       Postscript.}
+  Tools and Techniques for Computer Typesetting Series,
+  Addison-Wesley, 1996.
+
+\bibitem {short}
+{\it The Not So Short Introduction to LaTeX2e,} {\scshape T.\ Oetiker,
+H.\ Partl, I.\ Hyna, E.\ Schlegl,}
+\url|http://www.loria.fr/tex/general/flshort2e.dvi|
+
+\bibitem {amslatex}
+{\it AMS-LaTeX version 1.2 User's Guide},
+\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/amslatex/amsldoc.dvi|
+
+\bibitem{babel}
+{\it Babel, a multilingual package for use with \LaTeX's standard document
+classes,}
+{\scshape J.\ Braams,}
+\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/babel/babel.dvi|
+
+\bibitem{epsfig}
+{\it The \texttt{epsfig} package,}
+{\scshape S.\ Rahtz,}
+\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/graphics/epsfig.dvi|
+
+\bibitem{graphics}
+{\it The \texttt{graphics} package,}
+{\scshape D.\ Carlisle, S.\ Rahtz,}
+\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/graphics/graphics.dvi|
+
+\bibitem{graphicx}
+{\it The \texttt{graphicx} package,}
+{\scshape D.\ Carlisle, S.\ Rahtz,}
+\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/graphics/graphicx.dvi|
+
+\bibitem {hypatia}
+{\it Hypatia's Guide to BibTeX,}
+\url|http://hypatia.dcs.qmw.ac.uk/html/bibliography.html|
+
+\bibitem{xypic}
+{\it Xy-pic User's Guide,}
+{\scshape K.\ Rose, R.\ Moore,}
+\url{http://www.loria.fr/tex/graph-pack/doc-xypic/xyguide.dvi}
+\end{thebibliography}
+
+
+The most recent versions of macros files and of their documentations 
+are also available by anonymous \texttt{ftp} on the CTAN sites
+({\em Comprehensive TeX Archive Network\/})
+In the United States, one may use the address \texttt{ftp.shsu.edu};
+the sites 
+\texttt{ftp.loria.fr} or \verb|ftp.jussieu.fr| in France,
+\texttt{ftp.tex.ac.uk} in England, and 
+\texttt{ftp.dante.de} in Germany also
+hold the archive.
+
+\end{document}
+
+
diff --git a/macros/latex/contrib/smflatex/smf-fdoc.pdf b/macros/latex/contrib/smflatex/smf-fdoc.pdf
new file mode 100644
index 0000000000..0135ab15ff
Binary files /dev/null and b/macros/latex/contrib/smflatex/smf-fdoc.pdf differ
diff --git a/macros/latex/contrib/smflatex/smf-fdoc.tex b/macros/latex/contrib/smflatex/smf-fdoc.tex
new file mode 100644
index 0000000000..25b5e85ae4
--- /dev/null
+++ b/macros/latex/contrib/smflatex/smf-fdoc.tex
@@ -0,0 +1,753 @@
+\documentclass[11pt,francais]{smfart}
+
+\usepackage[T1]{fontenc}
+\usepackage[english,francais]{babel}
+
+\usepackage{amssymb,url,xspace,smfthm}
+
+\def\meta#1{$\langle${\it #1}$\rangle$}
+\newcommand{\myast}{($\star$)\ }
+\makeatletter
+    \def\ps@copyright{\ps@empty
+    \def\@oddfoot{\hfil\small\copyright 1997, \SMF}}
+\makeatother
+
+\newcommand{\SmF}{Soci\'et\'e ma\-th\'e\-ma\-ti\-que de France}
+\newcommand{\SMF}{Soci\'et\'e Ma\-th\'e\-Ma\-ti\-que de France}
+\newcommand{\BibTeX}{{\scshape Bib}\kern-.08em\TeX}
+\newcommand{\T}{\S\kern .15em\relax }
+\newcommand{\AMS}{$\mathcal{A}$\kern-.1667em\lower.5ex\hbox
+        {$\mathcal{M}$}\kern-.125em$\mathcal{S}$}
+\newcommand{\resp}{\emph{resp}.\xspace}
+
+\tolerance 400
+\pretolerance 200
+
+
+\title{Recommandations aux auteurs}
+\date {Version 5, octobre 2000}
+\author{Soci\'et\'e Ma\-th\'e\-ma\-ti\-que de France}
+
+\address{Institut Henri Poincar\'e\\
+11 rue Pierre et Marie Curie, F-75231 Paris cedex 05}
+\email{revues@smf.ens.fr}
+\urladdr{http://smf.emath.fr/}
+\keywords{\LaTeXe, SMF, composition, format}
+
+\begin{document}
+\def\smfbyname{}
+
+\begin{abstract}
+Les classes \texttt{smfbook} et \texttt{smfart} sont destin\'ees \`a la composition en \LaTeX\ des monographies et articles \'edit\'es par la \SmF. Elles n\'ecessitent \LaTeXe\ ainsi que les macros \LaTeX\ de l'AMS.\par
+Ce document en pr\'esente l'utilisation.
+\end{abstract}
+
+\begin{altabstract}
+The classes \texttt{smfbook} and \texttt{smfart} are intended to help the preparation in \LaTeX\ of the monographs and articles to be published by the \SmF. They require \LaTeXe\ and the \AMS-\LaTeX\ packages.\par
+This paper exhibits the main features of these classes.
+\end{altabstract}
+\maketitle
+
+\tableofcontents
+
+\section{Introduction}
+La \SmF\ met \`a la disposition des auteurs de ses publications un format
+\LaTeXe\ (\texttt{smfbook} pour les monographies et \texttt{smfart} pour
+les articles). Elle invite les auteurs \`a soumettre leurs articles dans ce
+format, ou, \`a d\'efaut, au format {\AMS-\LaTeX} (\texttt{amsbook} ou
+\texttt{amsart}) d\'evelopp\'e par l'American Mathematical Society (voir le
+\T\ref{sec:compatible} \`a propos des compatibilit\'es entre les deux).
+
+\smallskip
+Ce texte contient un mode d'emploi du format ainsi que certaines r\`egles
+d'hygi\`ene typographique dont les auteurs voudront bien prendre
+connaissance avant de taper ou transformer leur fichier \LaTeX: envoyer un
+fichier au format SMF en suivant ces quelques r\`egles \'el\'ementaires
+minimisera l'introduction d'erreurs au cours de la composition ainsi que le
+temps pass\'e aux fastidieuses relectures multiples qui en d\'ecoulent, et
+diminuera de ce fait les d\'elais de parution (de m\^eme que le co\^ut de
+publication).
+
+\section{Hygi\`ene typographique: quelques r\`egles}
+
+Le fichier envoy\'e par l'auteur est mis au format de la revue dans
+laquelle il doit para\^\i tre par le secr\'etariat de r\'edaction de la
+\SmF. Il est donc {\em important} que la composition \LaTeXe\ soit le plus
+standard possible, notamment par l'utilisation {\em syst\'ematique} des
+environnements d'\'enonc\'e et de d\'emonstration (voir le
+\T\ref{sec:presentationthm}), par celle de \verb|\label| et
+\verb|\ref| pour les r\'ef\'erences aux num\'eros correspondants et par celle de
+\verb|\cite| pour les citations bibliographiques. De plus, les macros \og maison\fg\ doivent \^etre \'ecrites clairement dans le pr\'eambule. {\em Aucune} macro personnelle ne doit \^etre utilis\'ee dans le titre, l'adresse, les r\'esum\'es (fran\c cais et anglais), mots-cl\'es.
+
+\Subsection{Les espacements horizontaux et verticaux}
+
+\begin{itemize}
+\item
+Supprimer tous les espacements du type \verb|\,| ou \verb|\;| ou \verb|\!|
+{\em devant ou derri\`ere} les symboles math\'ematiques, les parenth\`eses,
+les signes de ponctuation, etc. Les espacements sont g\'er\'es par \TeX,
+l'auteur n'en impose \emph{aucun}.
+\item
+En revanche, l'auteur peut mettre des blancs ins\'ecables aux endroits ou il ne
+d\'esire pas de coupure, par exemple
+\verb|Tintin~\cite{RG3}| au lieu de \verb|Tintin \cite{RG3}|.
+
+\item
+Il vaut mieux ne mettre {\em aucun} espace ou retour chariot \emph{avant}
+un signe de ponctuation. Par contre on met toujours un blanc ou un retour
+chariot \emph{apr\`es}.
+
+\item
+Ne mettre aucun espace ni \emph{avant} une parenth\`ese ou un crochet fermant,
+ni \emph{apr\`es} une parenth\`ese ou un crochet ouvrant.
+
+\item
+Ne mettre aucune coupure de ligne (\verb|\linebreak| ou \verb|\\|)
+dans les phrases, aucune coupure de page
+(\verb|\pagebreak|, \verb|\newpage| ou autres).
+
+\item
+\'Eviter d'introduire des \verb|\hskip|, \verb|\hspace|
+ou \verb|\vskip|, \verb|\vspace|.
+\end{itemize}
+
+
+\Subsection{La ponctuation}
+
+\begin{itemize}
+\item
+Ne mettre de ponctuation finale dans \emph{aucun} titre:
+\begin{itemize}
+\item
+\verb|\section{Introduction}| et non \verb|\section{Introduction.}|
+\item
+\verb|\begin{remarque}| et non \verb|\begin{remarque.}|
+\item etc.
+\end{itemize}
+
+\item
+Les signes de ponctuation du texte en ligne sont \`a l'\emph{ext\'erieur} du mode math\'ematique.
+On \'ecrit par exemple:
+
+\og\dots\ \verb|le seuil $\eta_0$:  $$ A=B.$$|\fg
+
+\noindent et non
+
+\og\dots\ \verb|le seuil $\eta_0:$ $$A=B.$$|\fg
+
+\item
+En ce qui concerne les points de suspension:
+\begin{itemize}
+\item
+remplacer \verb|...| par \verb|\ldots\ | dans les phrases (en anglais);
+\item
+remplacer \verb|...| ou \verb|\ldots| par \verb|\cdots|
+entre des op\'erateurs (comme dans, par exemple,
+$A<\cdots<B$, $A+\cdots+B$ ou $A=\cdots=B$)
+et par \verb|\dots| ou \verb|\ldots| comme signe de ponctuation
+math\'ematique (par exemple $i=1, \dots ,n$);
+\item
+supprimer \verb|...| apr\`es \og etc.\fg.
+\end{itemize}
+\item
+Remplacer les points \verb|.| de multiplication par des \verb|\cdot|;
+remplacer aussi les formules du type $h(.)$ ou $(.,.)$ par $h(\cdot)$ ou
+$(\cdot,\cdot)$.
+
+\item
+Remplacer les tirets de c\'esure explicite (comme \verb|pr\'esenta-tion|)
+par le tiret de c\'esure optionnel \verb|\-|
+(comme dans \verb|pr\'esenta\-tion|).
+Bien entendu, on garde les tirets pour les mots compos\'es.
+\end{itemize}
+
+\subsection{Les titres}
+
+Tous les titres d\'ebutent par une majuscule et sont \'ecrits
+en {\em minuscules}.
+Si certains titres doivent appara\^\i tre en majuscules,
+c'est \LaTeX\ qui se chargera de le faire.
+Pas de ponctuation finale dans les titres (voir ci-dessus).
+
+\subsection{La langue}
+
+Il faut respecter les r\`egles propres \`a chaque langue,
+notamment en ce qui concerne l'\'ecriture des nombres:
+en fran\c cais, on \'ecrit \og deux nombres \'egaux \`a $2$\fg\ et
+dans le fichier on tape
+
+\verb|deux nombres \'egaux \`a $2$|.
+
+\noindent
+D'autre part, on rappelle que les majuscules fran\c caises s'accentuent
+tout autant que les minuscules.
+
+\Subsection{La num\'erotation}
+
+\begin{itemize}
+\item
+Utiliser au maximum la num\'erotation automatique et les commandes
+\verb|\label|, \verb|\ref|. \`A cette fin, garder {\em un type de
+num\'erotation homog\`ene}. Ne pas \og forcer\fg\ les commandes de type
+\verb|\section| ou \verb|\begin{theoreme}| pour qu'elles fassent des choses
+compliqu\'ees. Il faut se rappeler que la mise en page finale est du
+ressort du secr\'etariat de r\'edaction de la \SmF: autant lui faciliter le
+travail.
+
+\item
+Utiliser une logique simple pour les r\'ef\'erences internes:
+\begin{itemize}
+\item
+\verb|\label{sec:1}| pour la premi\`ere section,
+
+\item
+\verb|\label{th:invloc}| pour le th\'eor\`eme d'inversion locale,
+
+\item
+\verb|\label{rem:stupide}| pour une remarque int\'eressante.
+\end{itemize}
+
+\item
+Ne pas num\'eroter les \'equations auxquelles
+il n'est pas fait r\'ef\'erence dans le texte.
+\end{itemize}
+
+\Subsection{Le mode math\'ematique}
+
+\begin{itemize}
+\item
+Ne pas mettre entre \verb|$ $| des parties de texte pour changer leur style.
+Le mode math\'ematique sert uniquement \`a \'ecrire des
+formules math\'emati\-ques.
+
+\item
+Les nombres \'ecrits en chiffres doivent \^etre entr\'es
+en mode math\'ematique, m\^eme si ceci ne semble pas toujours n\'ecessaire.
+
+\item
+Ne pas ajouter d'espacement dans les formules.
+Si n\'ecessaire, le secr\'eta\-riat de r\'edaction s'en chargera.
+
+\item
+Utiliser les symboles math\'ematiques \TeX\ ou \LaTeX\ \`a bon escient: par
+exemple, les symboles \verb|<| et \verb|>| ne sont pas faits pour fabriquer
+un crochet $\langle,\rangle$; ce crochet est en effet obtenu \`a l'aide de
+\verb|$\langle,\rangle$|.
+
+\item
+Ne pas se priver des facilit\'es d'\AMS-\LaTeX\ pour positionner
+et couper des formules (voir \cite{amslatex}).
+\end{itemize}
+
+\Subsection{La bibliographie}
+\begin{itemize}
+\item
+Faire une bibliographie uniforme et ne pas changer de convention suivant
+les entr\'ees (utiliser {\BibTeX} par exemple).
+\item
+Utiliser {\em syst\'ematiquement} la commande \verb|\cite| pour citer les
+r\'ef\'erences bibliographiques.
+\end{itemize}
+
+\section{L'environnement}
+
+La \SmF\ fournit aux auteurs les fichiers suivants:
+\begin{itemize}
+\item
+deux fichiers de classe \texttt{smfbook.cls} (pour les monographies) et \texttt{smfart.cls} (pour les articles),
+\item
+deux fichiers de style {\BibTeX} \texttt{smfplain.bst} (pour les
+citations num\'eriques) and \texttt{smfalpha.bst} (pour les citations
+alphab\'etiques),
+\item
+un paquet \texttt{smfenum.sty} permettant de pr\'esenter les 
+\'enum\'erations dans un style fran\c cais,
+\item
+un paquet suppl\'ementaire \texttt{smfthm.sty} d\'ecrit au \T\ref{sec:smfthm},
+\item
+un paquet additionnel \texttt{bull.sty} pour les articles soumis au \textsl{Bulletin}.
+\end{itemize}
+Ils sont disponible sur le serveur de la SMF:
+
+\texttt{http://smf.emath.fr/}
+
+\noindent sous la rubrique \verb|Publications/Formats|.
+
+\smallskip
+L'environnement n\'ecessaire \`a l'utilisation des classes de la \SmF\ est
+{\em le m\^eme} que pour les classes {\AMS-\LaTeX}. Il faut disposer: 
+\begin{itemize}
+\item de \LaTeXe, si possible une version r\'ecente. La classe
+ne fonctionne pas avec l'ancienne version \LaTeX 2.09,
+obsol\`ete depuis plusieurs ann\'ees;
+\item des divers {\em package}s {\AMS-\LaTeX} fournis par l'AMS;
+il est pr\'ef\'erable de disposer de la version de novembre 1996,
+mais cela devrait fonctionner avec celle de 1995;
+\item
+Pour mettre en page un \'eventuel index,
+il est de plus souhaitable de disposer du {\em package}
+\texttt{multicol.sty}.
+\end{itemize}
+A la place du fichier \texttt{amsbook.cls} (\resp \texttt{amsart.cls}) on
+utilisera le fichier \texttt{smfbook.cls} (\resp \texttt{smfart.cls}) qui
+doit \^etre plac\'e dans le m\^eme dossier. Si l'auteur utilise les macros
+\texttt{smfthm} (voir le \T\ref{sec:smfthm}), \texttt{smfenum.sty} ou \texttt{bull.sty}, il y placera aussi les fichier \texttt{smfthm.sty} ou \texttt{bull.sty}. 
+
+\smallskip
+De nombreux {\em package}s standard apportent
+de nouvelles fonctionnalit\'es \`a \LaTeXe. Nous sugg\'erons ainsi
+d'utiliser:
+\begin{itemize}
+\item \texttt{epsfig.sty}, \cite{epsfig},
+pour l'inclusion de dessins r\'ealis\'es
+en {\scshape PostScript} (encapsul\'e);
+\item \texttt{graphics.sty} ou \texttt{graphicx.sty},
+\cite{graphics} et~\cite{graphicx}, pour
+l'inclusion de dessins r\'ealis\'es par \LaTeX{};
+\item \texttt{babel.sty}, \cite{babel},
+qui permet des documents multilingues (c\'esure, etc.);
+\item \texttt{xypic.sty},
+\cite{xypic}, pour les diagrammes;
+\item {\BibTeX}, \cite[Appendix B]{lamport94} ou \cite{hypatia},
+ pour g\'erer la bibliographie.
+\end{itemize}
+
+
+\section{Structure du document}\label{sec:struct}
+
+Un fichier mis en page avec l'une des classes \texttt{smfbook}
+ou \texttt{smfart} a la structure suivante.
+Les champs entre crochets sont optionnels.
+
+\begin{verse}
+\verb|\documentclass[|\meta{options}\verb|]{smfbook| ou \verb|smfart}|\\
+Pr\'eambule (packages, macros, environnements d'\'enonc\'es\dots), par
+exemple: \\
+{\advance\leftskip 1.5em
+\verb|\usepackage[francais,english]{babel}| \\
+\verb|\usepackage{smfthm}|\\
+\verb|\usepackage{bull}|\quad (pour les articles soumis au \textsl{Bulletin})\\
+\verb|\theoremstyle{plain} \newtheorem{scholie}{Scholie}|\\
+}
+\smallskip
+\verb|\author[|\meta{nom raccourci}\verb|]{|\meta{Pr\'enom Nom}\verb|}| \\
+\verb|\address{|\meta{ligne 1}\verb|\\ |\meta{ligne 2}\verb|\\ |\dots
+\meta{ligne $n$}\verb|}| \\
+\verb|\email{|\meta{adresse m\'el}\verb|}| \\
+\verb|\urladdr{|\meta{adresse WWW}\verb|}|\\
+\smallskip
+\verb|\title[|\meta{titre court}\verb|]{|\meta{titre dans la langue de
+    l'article}\verb|}| \\
+\verb|\alttitle{|\meta{titre dans l'autre langue
+    (fran\c{c}ais ou anglais)}\verb|}| \\
+\bigskip
+\verb|\begin{document}|\\
+\verb|\frontmatter|\\
+\smallskip
+\verb|\begin{abstract}|\\
+\quad\meta{R\'esum\'e dans la langue de l'article}\\
+\verb|\end{abstract}|\\
+\smallskip
+\verb|\begin{altabstract}|\\
+\quad\meta{R\'esum\'e dans l'autre langue (fran\c{c}ais ou anglais)}\\
+\verb|\end{altabstract}| \\
+\smallskip
+\verb|\subjclass{|\meta{classification}\verb|}| \\
+\verb|\keywords{|\meta{Mots-clefs dans la langue de l'article}\verb|}| \\
+\verb|\altkeywords{|\meta{Mots-clefs dans l'autre langue (fran\c{c}ais ou anglais)}\verb|}| \\
+\smallskip
+\quad \verb|\translator{|\meta{Pr\'enom Nom}\verb|}|\\
+\quad \verb|\thanks{|\meta{Subventions}\verb|}|\\
+\quad \verb|\dedicatory{|\meta{D\'edicace}\verb|}|\\
+\smallskip
+\verb|\maketitle|\\
+\quad \verb|\tableofcontents |\meta{si n\'ecessaire}\verb||\\
+\smallskip
+\verb|\mainmatter|\\
+Corps de l'ouvrage\\
+\smallskip
+\verb|\backmatter|\\
+Bibliographie, index, etc.\\
+\verb|\end{document}|
+\end{verse}
+
+\Subsection*{Remarques}
+\begin{itemize}
+\item
+S'il y a plusieurs auteurs, ou si un auteur a plusieurs adresses, entrer
+tout simplement autant de commandes \par
+\begin{verse} \rm
+\verb|\author{|\meta{auteur}\verb|}| \\
+\verb|\address{|\meta{adresse}\verb|}| \\
+\verb|\email{|\meta{adresse m\'el}\verb|}| \\
+\verb|\urladdr{|\meta{adresse WWW}\verb|}|
+\end{verse}
+qu'il le faut, dans l'ordre bien entendu.
+\item
+Toutes les donn\'ees intervenant avant \verb|\maketitle| sont aussi utilis\'ees pour les pages de couverture, la publicit\'e, les r\'esum\'es \'electroniques, les bases de donn\'ees. Aussi, {\em aucune macro personnelle} ne doit y figurer. L'auteur fournira une {\em traduction anglaise du titre} si celui-ci est en fran\c cais.
+\item
+Ne pas h\'esiter \`a \^etre prolixe sur le contenu de \verb|\subjclass|. On pourra consulter \`a ce propos
+
+\url|http://www-mathdoc.ujf-grenoble.fr/MSC2000/msc.html|
+\end{itemize}
+
+\section{Options de la classe}
+Ces options s'introduisent de la mani\`ere suivante:
+\begin{verse}
+\verb|\documentclass[|\meta{option1,option2,\dots}%
+\verb|]{smfbook| ou \verb|smfart}|
+\end{verse}
+Les options marqu\'ees d'une \'etoile sont s\'electionn\'ees par
+d\'efaut.
+
+
+\Subsection{Options usuelles}
+\begin{itemize}
+\item {\tt \myast a4paper}:
+ Impression sur du papier A4
+\item {\tt letterpaper}:
+ Impression sur du papier \og US Letter\fg, pour
+ faciliter l'utilisation de cette classe aux \'Etats-Unis,
+ lors de la mise au point du texte.
+\item {\tt draft}:
+ Version pr\'eliminaire, les {\em overfull hbox\,}es sont marqu\'ees d'un trait noir.
+\item {\tt \myast leqno}:
+ Num\'eros d'\'equations \`a gauche
+\item {\tt reqno}:
+ Num\'eros d'\'equations \`a droite
+\item {\tt \myast 10pt}:
+ Taille normale des caract\`eres = 10 points
+\item {\tt 11pt}:
+ Taille normale des caract\`eres = 11 points
+\item {\tt 12pt}:
+ Taille normale des caract\`eres = 12 points
+\end{itemize}
+
+
+\Subsection{Langue du texte}
+
+\begin{itemize}
+\item {\tt \myast francais}:
+ pour un texte en fran\c{c}ais
+\item {\tt english}:
+ pour un texte en anglais
+\end{itemize}
+
+\subsection{Remarque}
+Ne pas confondre l'option {\tt francais} ou {\tt english} de la classe SMF avec l'option {\tt francais} ou {\tt english} de {\tt babel}, qui, elle, doit \^etre introduite comme indiqu\'e dans l'exemple du \T\ref{sec:struct}.
+
+
+\section{D\'ecoupage du texte}
+Comme dans toutes les classes \LaTeXe, des commandes permettent de
+sectionner le document (voir \cite{lamport94,goossens93,short} pour une information pr\'ecise):
+\begin{center}
+\begin{tabular}{ll}
+\verb|\part| \\
+\verb|\chapter| & \texttt{smfbook} uniquement \\
+\verb|\section| \\
+\verb|\subsection| \\
+\verb|\subsubsection| \\
+\verb|\paragraph| \\
+\verb|\subparagraph|
+\end{tabular}
+\end{center}
+
+\noindent
+La table des mati\`eres est ins\'er\'ee automatiquement avec \par
+\verb|\tableofcontents|.
+
+\noindent
+La commande \par
+\verb|\appendix| \par\noindent
+permet de d\'ebuter les appendices.
+
+La bibliographie est entr\'ee comme d'habitude en \LaTeX,
+\begin{verse}
+\verb|\begin{thebibliography}{|\meta{label le plus long}\verb|}| \\
+\meta{Entr\'ees de bibliographies} \\
+\verb|\end{thebibliography}|
+\end{verse}
+Il est possible, bien s\^ur, d'utiliser {\BibTeX}, voir par exemple~\cite[Appendix~B]{lamport94} et~\cite{hypatia} pour une introduction.
+Les styles \texttt{smfplain.bst} et \texttt{smfalpha.bst} pour la pr\'esentation automatique avec {\BibTeX} des bibliographies est disponible sur le serveur \url|http://smf.emath.fr/|\ de la SMF. On entre alors la bibliographie comme suit:
+\begin{verse}
+\verb|\bibliographystyle{smfplain| ou \verb|smfalpha}| \\
+\verb|\bibliography{myfile.bib}|
+\end{verse}
+si \verb|myfile.bib| est le fichier de donn\'ees bibliographique {\BibTeX}.
+
+
+\section{Pr\'esentation des th\'eor\`emes}\label{sec:presentationthm}
+
+Les th\'eor\`emes sont mis en page gr\^ace au {\em package} {\tt amsthm}.
+Nous renvoyons \`a la documentation~\cite{amslatex}
+de celui-ci pour plus de d\'etails. Il est recommand\'e d'utiliser {\em syst\'ematiquement} les environnements d'\'enonc\'e et de d\'emonstration.
+
+
+\subsection{Styles de th\'eor\`emes}\label{subsec:thm}
+
+Sont d\'efinis trois styles de th\'eor\`emes: {\tt plain},
+{\tt definition} et {\tt remark}. Ces deux derniers sont identiques
+et diff\`erent du premier par le fait que le texte de l'\'enonc\'e
+est en caract\`eres droits et non en italique.
+
+Les environnements sont introduits par la commande \verb|\newtheorem| dans le pr\'eambule, qui cr\'ee ou utilise un compteur pour les num\'eroter automatiquement.
+
+Les \'enonc\'es non num\'erot\'es sont obtenus par la commande \verb|\newtheorem*| dans le pr\'eambule: par exemple
+
+\verb|\newtheorem*{lemmepetitchemin}{Lemme des petits chemins}|
+
+\medskip
+Les \'enonc\'es num\'erot\'es suivant une num\'erotation sp\'eciale sont introduits s\'epar\'ement dans le pr\'eambule, par exemple, pour des propositions num\'erot\'ees alphab\'etiquement:
+
+\verb|\newtheorem{theoremalph}{Proposition}|
+
+\verb|\def\thetheoremalph{\Alph{theoremalph}}|.
+
+\subsection{Environnement de d\'emonstration}
+\label{subsec:proof}
+
+L'environnement de preuve \par
+\verb|\begin{proof}| \dots \verb|\end{proof}|\par\noindent
+permet une pr\'esentation standard d'une d\'emonstration, d\'ebutant
+par {\og D\'e\-mons\-tra\-tion\fg} et se terminant par le traditionnel
+petit carr\'e $\qedsymbol$.
+
+\smallskip
+Il est possible de changer le terme {\og D\'emonstration\fg} en fournissant
+un argument suppl\'ementaire, comme dans: \par
+\verb|\begin{proof}[Id\'ee de la d\'emonstration]| \dots
+\verb|\end{proof}| \par\noindent
+qui affiche
+\begin{proof}[Id\'ee de la d\'emonstration]
+Laiss\'ee au lecteur.
+\end{proof}
+
+\section{Le {\em package} \texttt{smfthm.sty}}\label{sec:smfthm}
+Dans un article ou une monographie pour lequel la num\'erotation des \'enonc\'es est homog\`ene, l'auteur peut utiliser le {\em package} \texttt{smfthm.sty} (et y ajouter ses propres environnements si besoin).
+Cette section d\'ecrit les fonctionnalit\'es apport\'ees par ce
+{\em package} \texttt{smfthm.sty}. Son utilisation
+{\em n'est pas obligatoire}.
+
+\subsection{Environnements de th\'eor\`emes}
+
+Un certain nombre d'environnements de type th\'eor\`eme sont pr\'e-d\'efinis. Ils utilisent un seul et m\^eme compteur.
+\par\nobreak
+\begin{center}\begin{tabular}{lccc}
+\noalign{\hrule height .08em\vskip.65ex}
+Style & {\tt Macro} \LaTeX & Nom fran\c{c}ais & English name\quad \\
+\noalign{\vskip .4ex \hrule height 0.05em\vskip.65ex}
+\it plain & \tt theo & Th\'eor\`eme & \it Theorem \\
+ & \tt prop & Proposition & \it Proposition \\
+ & \tt conj & Conjecture & \it Conjecture \\
+ & \tt coro & Corollaire & \it Corollary \\
+ & \tt lemm & Lemme & \it Lemma \\
+\noalign{\vskip .4ex \hrule height 0.05em\vskip.65ex}
+\it definition & \tt defi & D\'efinition & \it Definition \\
+\noalign{\vskip .4ex \hrule height 0.05em\vskip.65ex}
+\it remark & \tt rema & Remarque & \it Remark \\
+ & \tt exem & Exemple & \it Example \\
+\noalign{\vskip .4ex \hrule height 0.08em\vskip.65ex}
+\end{tabular}\end{center}
+On les utilise par exemple comme suit:
+\begin{verse}
+\verb|\begin{conj}[Fermat]| \\
+\verb|Si $n\geq 3$ et si $x$, $y$, $z$ sont trois| \\
+\verb|entiers naturels tels que $x^n+y^n=z^n$,|\\
+\verb|alors $xyz=0$.| \\
+\verb|\end{conj}|
+\end{verse}
+\begin{conj}[Fermat]
+Si $n\geq 3$ et si $x$, $y$, $z$ sont trois entiers
+naturels tels que $x^n+y^n=z^n$, alors $xyz=0$.
+\end{conj}
+
+\subsection{Choix de la num\'erotation}
+Le type de num\'erotation de \'enonc\'es est d\'efini par les commandes
+suivantes, qui doivent \^etre entr\'ees dans le pr\'eambule,
+c'est-\`a-dire {\em avant\/} le %\par\noindent
+\verb|\begin{document}|:
+\begin{itemize}
+\item
+\verb|\NumberTheoremsIn{|\meta{nom de compteur}\verb|}|:
+ pr\'ecise le niveau de profondeur auquel les num\'eros d'\'enonc\'es sont remis \`a z\'ero
+ (\verb|section| par exemple); ces num\'eros utilisent alors le compteur {\tt smfthm};
+\item
+\verb|\NumberTheoremsAs{|\meta{nom de compteur}\verb|}|:
+ utilise un d\'ecoupage qui s'int\`egre dans celui donn\'e par un compteur d\'ej\`a d\'efini (par exemple \verb|section|, \verb|subsection|, \verb|paragraph|, etc.);
+\item
+\verb|\SwapTheoremNumbers|:
+ met le num\'ero avant le type d'\'enonc\'e, comme dans {\og 1.~Th\'eor\`eme\fg};
+\item
+\verb|\NoSwapTheoremNumbers|:
+ met le type d'\'enonc\'e avant son num\'ero, par exem\-ple: \og Th\'eor\`eme 1\fg.
+\end{itemize}
+
+Sans autres pr\'ecisions, la classe utilise \par
+\verb|\NumberTheoremsIn{section}\NoSwapTheoremNumbers| \par\noindent
+ce qui signifie que les th\'eor\`emes sont remis \`a z\'ero au d\'ebut de chaque
+section et que les num\'eros d'\'enonc\'es, qui apparaissent sous la forme
+
+{\tt num\'ero de section.valeur du compteur smfthm}
+
+\noindent sont plac\'es apr\`es le nom de l'environnement.
+
+\subsection{\'Enonc\'e g\'en\'erique}
+
+L'environnement \texttt{enonce} est un environnement
+de th\'eor\`emes dont
+le nom change \`a la demande, par exemple:\par
+\begin{verse}
+\verb|\begin{enonce}{Formulaire}|\\
+\meta\dots \\
+\verb|\end{enonce}|
+\end{verse}
+provoque l'affichage d'un \og Formulaire\fg, num\'erot\'e comme les \'enonc\'es du tableau ci-dessus.
+
+\smallskip
+Par d\'efaut, l'{\tt enonce} est dans le style de th\'eor\`eme {\it plain},
+mais il est possible de faire autrement en indiquant entre crochets le
+style voulu, par exemple:\par
+\begin{verse}
+\verb|\begin{enonce}[remark]{Remarque clef}|\\
+\meta\dots \\
+\verb|\end{enonce}|
+\end{verse}
+
+Enfin, on dispose de l'environnement non num\'erot\'e \verb|enonce*| qui lui correspond.
+
+\subsection{Autres \'enonc\'es}
+
+L'auteur peut introduire d'autres \'enonc\'es comme il est expliqu\'e au \T\ref{subsec:thm}. Pour introduire un \'enonc\'e num\'erot\'e comme ceux de {\tt smfthm.sty}, on utilise {\tt enonce}:
+
+\verb|\newenvironment{scholie}{\begin{enonce}{Scholie}}{\end{enonce}}|
+
+\noindent que l'on saisit \emph{apr\`es} \verb|\begin{document}|.
+
+\section{Adapter un manuscrit depuis un autre dialecte}
+\label{sec:compatible}
+
+Ce paragraphe donne quelques indications pour mettre au format SMF un manuscrit tap\'e en \textsc{Plain} \TeX, ou bien
+en \LaTeX 2.09, ou bien en \LaTeXe, mais avec une autre classe.
+
+\subsection{Depuis une classe \LaTeXe}
+S'il s'agit d'une classe AMS, tr\`es peu de travail suffit: remplacer par exemple (pour un article \'ecrit en anglais):
+
+\verb|\documentstyle[12pt,leqno]{amsart}|
+
+\noindent par
+
+\verb|\documentstyle[leqno,english]{smfart}|
+
+\noindent
+Il faudra aussi entrer un r\'esum\'e (\texttt{altabstract}) et un titre (\texttt{alttitle}), en fran\c{c}ais si le texte est en anglais et en anglais sinon.
+
+L'op\'eration inverse (SMF $\rightarrow$ AMS) est bien s\^ur possible de la m\^eme mani\`ere.
+
+\medskip
+S'il s'agit d'une classe standard (\texttt{article} ou \texttt{book}),
+les choses seront \`a peine plus compliqu\'ees. Penser \`a taper
+les r\'esum\'es avant le \verb|\maketitle|; quelques formules math\'ematiques
+pourraient ne plus marcher, mais les {\em package}s AMS offrent
+une telle souplesse d'utilisation qu'il ne devrait pas \^etre tr\`es
+difficile de faire la transition.
+
+\subsection{Depuis \LaTeX2.09}
+Dans ce cas, il faudra faire les adaptations d\'e\-cri\-tes
+au paragraphe pr\'ec\'edent, ainsi que celles contraintes par la mutation
+\LaTeX2.09--\LaTeXe. A priori, celles-ci concernent surtout les polices
+de caract\`eres et l'utilisation de NFSS ({\em New Font Selection Scheme,}
+nouveau sch\'ema de s\'election de polices).
+
+
+\subsection{Depuis {P\smaller[3]LAIN} \TeX}
+Dans ce cas, il faut reprendre tout votre tapuscrit
+et remplacer vos commandes de titres, de th\'eor\`emes, de bibliographie,
+par les commandes {\em ad hoc,} en vous r\'ef\'erant \`a la documention
+qui pr\'ec\`ede.
+
+Nous attirons l'attention sur la num\'erotation automatique
+des paragraphes et des \'enonc\'es: elle peut diff\'erer de la num\'erotation
+manuelle; faire donc attention aux r\'ef\'erences d'\'enonc\'es.
+
+Les commandes de changement de polices utilis\'ees avec \textsc{Plain} \TeX{}
+sont souvent inop\'erantes en \LaTeXe, il faudra aussi les adapter.
+Concernant les math\'ematiques, il y a peu de changements \`a faire,
+\`a l'exception notamment des \'equations align\'ees et (parfois) des matrices.
+
+\def\refname{D\MakeLowercase{ocumentation et sources}}
+\begin{thebibliography}{99}
+\bibitem {lamport94}
+ {\sc L.\ Lamport.} ---
+ {\it \LaTeX: A Document Preparation System.}
+ Second edition. Addison-Wesley, 1994.
+
+\bibitem {goossens93}
+ {\sc M.\ Goossens, F.\ Mittelbach, A.\ Samarin.} ---
+ {\it The \LaTeX\ Companion.}
+ Addison-Wesley, 1993.
+
+\bibitem {goossens96}
+ {\sc M.\ Goossens, S.\ Rahtz and F.\ Mittelbach.} ---
+ {\it The \LaTeX\ Graphics Companion: Illustrating Documents With TeX and
+ Postscript.}
+ Tools and Techniques for Computer Typesetting Series,
+ Addison-Wesley, 1996.
+
+\bibitem {short}
+{\it Une courte (?) introduction a \LaTeX2e,} {\scshape T.\ Oetiker,
+ H.\ Partl, I.\ Hyna, E.\ Schlegl,} traduit de
+ l'allemand par {\scshape M.\ Herrb,}
+\url|http://www.loria.fr/tex/general/flshort2e.dvi|
+
+\bibitem {amslatex}
+{\it \AMS-\LaTeX\ version 1.2 User's Guide},
+\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/amslatex/amsldoc.dvi|
+
+\bibitem{babel}
+{\it Babel, a multilingual package for use with \LaTeX's standard document
+classes,}
+{\scshape J.\ Braams,}
+\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/babel/babel.dvi|
+
+\bibitem{epsfig}
+{\it The \texttt{epsfig} package,}
+{\scshape S.\ Rahtz,}
+\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/graphics/epsfig.dvi|
+
+\bibitem{graphics}
+{\it The \texttt{graphics} package,}
+{\scshape D.\ Carlisle, S.\ Rahtz,}
+\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/graphics/graphics.dvi|
+
+\bibitem{graphicx}
+{\it The \texttt{graphicx} package,}
+{\scshape D.\ Carlisle, S.\ Rahtz,}
+\url|http://www.loria.fr/tex/ctan-doc/macros/latex/packages/graphics/graphicx.dvi|
+
+\bibitem {hypatia}
+{\it Hypatia's Guide to \BibTeX,}
+\url|http://hypatia.dcs.qmw.ac.uk/html/bibliography.html|
+
+\bibitem{xypic}
+{\it Xy-pic User's Guide,}
+{\scshape K.\ Rose, R.\ Moore,}
+\url{http://www.loria.fr/tex/graph-pack/doc-xypic/xyguide.dvi}
+\end{thebibliography}
+
+
+Les fichiers de macros et leur documentation
+sont aussi disponibles dans leur derni\`ere mise \`a jour
+par \texttt{ftp} anonyme sur les sites CTAN ({\em Comprehensive TeX Archive
+Network,} archive structur\'ee de documents pour {\TeX} et ses d\'eriv\'es).
+En France, on peut utiliser les adresses \texttt{ftp.loria.fr}
+ou \verb|ftp.jussieu.fr|;
+les adresses \texttt{ftp.tex.ac.uk} en Grande-Bretagne,
+\texttt{ftp.dante.de} en Allemagne con\-ti\-en\-nent aussi l'archive.
+
+\end{document}
+
+
+
+
+
+
diff --git a/macros/latex/contrib/smflatex/smflatex.dtx b/macros/latex/contrib/smflatex/smflatex.dtx
index b75c6db84c..855de2b4c6 100644
--- a/macros/latex/contrib/smflatex/smflatex.dtx
+++ b/macros/latex/contrib/smflatex/smflatex.dtx
@@ -1,6 +1,7 @@
 % \iffalse meta-comment
 %
-% Copyright (c) 1999-2015 Societe mathematique de France
+% smflatex package version 1.6-20210418
+% Copyright (c) 1999-2021 Societe mathematique de France
 %
 % Ce fichier contient classes, paquetages et documentation pour
 % les publications de la Societe mathematique de France (SMF).
@@ -12,13 +13,7 @@
 % la classe.
 %
 % \fi
-% \CheckSum{11820}
-%%
-%%  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  %% Classes, paquetages pour les publications de la SMF %%
-%%  %% (c) 1999-2014 Societe mathematique de France        %%
-%%  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
+% \CheckSum{11858}
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -70,6 +65,12 @@
 % \changes{v1.5a}{2012/09/29}{Modifications supplémentaires en lien avec hyperref}
 % \changes{v1.5b}{2014/01/11}{Réparation d'un bug ayant fait disparaître les titres de sections dans les titres courants}
 % \changes{v1.5c}{2015/09/02}{Réparation d'un petit bug dans les environnements de théorèmes}
+% \changes{v1.5d}{2018/05/30}{Ajout de option 14pt}
+% \changes{v1.5e}{2019/07/11}{Ajout de appendixname (détecté par @KpanRambles)}
+% \changes{v1.5f}{2020/11/05}{Remplacement de latin1 par utf8 et réparation de GetFileInfo}
+% \changes{v1.6}[2021/03/28]{Ajout de préfixes smf aux noms de fichiers}
+% \changes{v1.6}[2021/03/28]{Incorporation de upitparen dans smfgen}
+% \changes{v1.6}[2021/04/18]{Correction de smfhyperref (backref)}
 %
 %
 % \DoNotIndex{\@,\@@par,\@beginparpenalty,\@empty}
@@ -128,12 +129,13 @@
 %    \begin{macrocode}
 %<*doc>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{smfdoc.tex}[2012/09/26 v1.4
+\ProvidesFile{smfdoc.tex}[2020/11/05 v1.5f
    Documentation LaTeX pour les classes et styles SMF]
 \documentclass{ltxdoc}
+\GetFileInfo{smfdoc.tex}
 \usepackage{amssymb,amstext}
 \usepackage[T1]{fontenc}
-\usepackage[latin1]{inputenc}
+\usepackage[utf8]{inputenc}
 \usepackage[frenchb]{babel}
 %    \end{macrocode}
 % On veut un index avec les num\'eros de ligne
@@ -160,7 +162,6 @@ les endroits o\`u l'entr\'ee est utilis\'ee.}
 %    \end{macrocode}
 %</doc>
 % \fi
-% % \GetFileInfo{smflatex.dtx}
 %
 % \title{Classes \LaTeXe\ pour les publications de la SMF}
 % \author{A.\ Chambert-Loir \&\ SMF}
@@ -243,12 +244,12 @@ les endroits o\`u l'entr\'ee est utilis\'ee.}
 %    \begin{macrocode}
 %<article|book>\NeedsTeXFormat{LaTeX2e}
 %<*article>
-\ProvidesClass{smfart}[2015/09/02 v1.5c
+\ProvidesClass{smfart}[2021/03/28 v1.6
   Classe LaTeX pour les articles publies par la SMF]
 \def\@classname{smfart}
 %</article>
 %<*book>
-\ProvidesClass{smfbook}[2015/09/02 v1.5c
+\ProvidesClass{smfbook}[2021/03/28 v1.6
   Classe LaTeX pour les monographies editees par la SMF]
 \def\@classname{smfbook}
 %</book>
@@ -735,8 +736,9 @@ les endroits o\`u l'entr\'ee est utilis\'ee.}
 % \subsection{Options de tailles de caract\`eres}
 % Pour l'instant, l'option par d\'efaut est d'imprimer en 10 points mais il
 % est possible de revenir \`a 11 ou 12 points, voire de laisser le choix
-% \`a l'auteur.
+% \`a l'auteur. Il y a aussi une option 14 points.
 %    \begin{macrocode}
+\def\@xxxpt{29.86}
 \DeclareOption{10pt}{\def\@mainsize{10}\def\@ptsize{0}%
   \normaltopskip=10pt \relax
   \def\@typesizes{%
@@ -761,7 +763,16 @@ les endroits o\`u l'entr\'ee est utilis\'ee.}
     \or{7}{8}\or{8}{10}\or{9}{11}\or{10}{12}\or{\@xipt}{13}%
     \or{\@xiipt}{14}% normalsize
     \or{\@xivpt}{17}\or{\@xviipt}{20}\or{\@xxpt}{24}%
-    \or{\@xxvpt}{30}\or{\@xxvpt}{30}}%
+    \or{\@xxvpt}{30}\or{\@xxxpt}{36}}%
+  \normalsize \linespacing=\baselineskip }
+
+\DeclareOption{14pt}{\def\@mainsize{14}\def\@ptsize{3}%
+  \normaltopskip=14pt \relax
+  \def\@typesizes{%
+    \or{8}{10}\or{9}{11}\or{10}{12}\or{\@xipt}{13}%
+    \or{\@xiipt}{14}\or{\@xivpt}{17}% normalsize
+    \or{\@xviipt}{20}\or{\@xxpt}{24}%
+    \or{\@xxvpt}{30}\or{\@xxxpt}{36}\or{\@xxxpt}{36}}%
   \normalsize \linespacing=\baselineskip }
 
 \DeclareOption{8pt}{\def\@mainsize{8}\def\@ptsize{8}%
@@ -2009,14 +2020,14 @@ les endroits o\`u l'entr\'ee est utilis\'ee.}
 % apr\`es\dots
 %    \begin{macrocode}
 \AtBeginDocument{%
-  \@for\@tempa:=-1,0,1,2,3,4,5\do{%
+  \@for\@tempa:=-1,0,1,2,3,4,5,10000\do{%
     \@ifundefined{r@tocindent\@tempa}{%
       \@xp\gdef\csname r@tocindent\@tempa\endcsname{0pt}}{}%
   }%
 }
 \def\@writetocindents{%
   \begingroup
-  \@for\@tempa:=-1,0,1,2,3,4,5\do{%
+  \@for\@tempa:=-1,0,1,2,3,4,5,10000\do{%
     \immediate\write\@auxout{%
       \string\newlabel{tocindent\@tempa}{%
         \csname r@tocindent\@tempa\endcsname}}%
@@ -2415,7 +2426,7 @@ les endroits o\`u l'entr\'ee est utilis\'ee.}
 % et modifier l'environnement |\@trivlist| pour qu'il s'en serve.
 %    \begin{macrocode}
 \newif\ifsmf@thmnewline
-\def\thmnewline{\newline\indent\global\smf@thmnewlinetrue}
+\def\thmnewline{\newline\global\smf@thmnewlinetrue}
 \def\@begintheorem#1#2[#3]{%
   \global\smf@thmnewlinefalse
   \def\@theoremhead{\the\thm@headfont \thm@indent
@@ -2430,7 +2441,7 @@ les endroits o\`u l'entr\'ee est utilis\'ee.}
   \ifsmf@skippt\else
     {\thm@headpunct{.}\sbox\@labels{\@theoremhead}%
     \ifdim\wd\@labels>.7\linewidth\skippointrait\fi}\fi
-  \ifsmf@skippt\def\thmheadnl{\thmnewline\indent}\fi
+  \ifsmf@skippt\def\thmheadnl{\newline\indent\global\smf@thmnewlinetrue}\fi
   \deferred@thm@head{\@theoremhead}%
   \ignorespaces}
 %    \end{macrocode}
@@ -2457,7 +2468,9 @@ les endroits o\`u l'entr\'ee est utilis\'ee.}
 \renewenvironment{proof}[1][\proofname]{\par
   \ifx@pushQED \pushQED{\qed}\fi
   \normalfont
-  \topsep6\p@\@plus6\p@ \trivlist \itemindent\z@ %% \normalparindent
+% \topsep6\p@\@plus6\p@
+  \topsep0pt
+  \trivlist \itemindent\z@ %% \normalparindent
   \def\@proofhead{\normalfont\itshape #1}%
   \sbox\@tempboxa{\@proofhead}%
   \ifdim\wd\@tempboxa>0.7\linewidth \smf@skippttrue\fi
@@ -2475,6 +2488,7 @@ les endroits o\`u l'entr\'ee est utilis\'ee.}
   \MakeQed
   \endtrivlist
   \@endpefalse
+  \medskip
 }
 \def\MakeQed{\ifsmf@qed
      \ifx@pushQED\popQED\else\qed\fi
@@ -2488,7 +2502,7 @@ les endroits o\`u l'entr\'ee est utilis\'ee.}
   \let\thm@indent\noindent
   \thm@headfont{\bfseries\smf@boldmath\itshape}%
   \thm@notefont{\bfseries\smf@boldmath\upshape}%
-  \thm@preskip.5\linespacing \@plus .5\linespacing
+  \thm@preskip 0pt %% was: .5\linespacing \@plus .5\linespacing
   \thm@postskip\thm@preskip
   \thm@headpunct{\MakePointrait}
   \itshape }
@@ -2511,6 +2525,7 @@ les endroits o\`u l'entr\'ee est utilis\'ee.}
  \def\bibname{Bibliography}%
  \def\indexname{Index}%
  \def\altabstractname{R\'esum\'e}%
+ \def\appendixname{Appendix}%
  \def\tablename{Table}%
  \def\listtableename{List of tables}%
  \def\figurename{Figure}%
@@ -2690,7 +2705,7 @@ les endroits o\`u l'entr\'ee est utilis\'ee.}
 % \section{Pour qu'\texttt{hyperref} fonctionne}
 %<*hyperref>
 %   \begin{macrocode}
-\ProvidesPackage{smfhyperref}[2012/09/29 v1.0
+\ProvidesPackage{smfhyperref}[2021/04/18 v1.6
   Adaptations pour faire cohabiter hyperref et les classes smf]
 %    \end{macrocode}
 % Redéfinition des macros d'index.
@@ -2769,24 +2784,6 @@ les endroits o\`u l'entr\'ee est utilis\'ee.}
     \ignorespaces
   }%
 }{}
-\@ifpackageloaded{backref}{%
-\def\BR@@lbibitem[#1]#2#3\par{%
-  \smf@lbibitem[#1]{#2}#3
-  \newblock
-  \backref{\csname br@#2\endcsname}%
-  \par
-}%
-\def\BR@@bibitem#1#2\par{%
-  \smf@bibitem{#1}#2
-  \newblock
-  \backref{\csname br@#1\endcsname}%
-  \par
-}
-\def\thebibliography{%
-  % \@starttoc{brf}{}%
-  \BRorg@thebibliography
-}%
-}
 %    \end{macrocode}
 %</hyperref>
 % \section{Package de th\'eor\`emes}
@@ -3127,7 +3124,38 @@ les endroits o\`u l'entr\'ee est utilis\'ee.}
 % Cela a une cons\'equence sur les |\catcode| et on doit y faire attention
 % plus tard au chargement de~\paquet{xy}.
 %    \begin{macrocode}
-  \ifsmf@upitparen \RequirePackage{upitparen}\fi
+  \ifsmf@upitparen 
+\declare@shorthand{french}{;}{%
+    \ifhmode
+      \ifdim\lastskip>\z@\unskip\penalty\@M\thinspace\else\FDP@thinspace\fi
+    \fi
+    \ifmmode\string;\else\textup{\string;}\fi}
+\declare@shorthand{french}{!}{%
+    \ifhmode
+      \ifdim\lastskip>\z@\unskip\penalty\@M\thinspace\else\FDP@thinspace\fi
+    \fi
+    \ifmmode\string!\else\textup{\string!}\fi}
+\declare@shorthand{french}{?}{%
+    \ifhmode
+      \ifdim\lastskip>\z@\unskip\penalty\@M\thinspace\else\FDP@thinspace\fi
+    \fi
+    \ifmmode\string?\else \textup{\string?}\fi}
+\declare@shorthand{french}{:}{%
+    \ifhmode
+      \ifdim\lastskip>\z@\unskip\penalty\@M\Fcolonspace\else\FDP@colonspace\fi
+    \fi
+    \ifmmode\string:\else\textup{\string:}\fi}
+\initiate@active@char{(}
+\initiate@active@char{)}
+\declare@shorthand{french}{(}{%
+    \ifmmode\string(\else\textup{\string(}\penalty\@M\fi}
+\declare@shorthand{french}{)}{%
+    \ifmmode\string)\else\penalty\@M\textup{\string)}\fi}
+\declare@shorthand{system}{(}{\string(}
+\declare@shorthand{system}{)}{\string)}
+\addto\extrasfrench{\bbl@activate{(}\bbl@activate{)}}
+\addto\noextrasfrench{\bbl@deactivate{(}\bbl@deactivate{)}}
+  \fi
 %    \end{macrocode}
 % On charge enfin plus ou moins automatiquement \paquet{xy}.
 % Normalement, la red\'efinition de |\xymatrixcompile|  permet de compiler
@@ -3758,7 +3786,7 @@ editorial board of the SMF or from the  web site of the SMF.}
 % \subsection{Ast\'erisque}
 %    \begin{macrocode}
 %<*asterisque>
-\ProvidesPackage{asterisque}[2001/01/05 v1.4
+\ProvidesPackage{smfasterisque}[2001/01/05 v1.4
   Fichier additionnel pour Asterisque]
 \RequirePackageWithOptions{smfgen}
 \def\smf@plaintitre{asterisque}
@@ -3829,7 +3857,7 @@ topic, chosen, in principle, from the whole spectrum of mathematics.}
 % \subsection{Bulletin de la SMF}
 %    \begin{macrocode}
 %<*bulletin>
-\ProvidesPackage{bulletin}[2002/02/07 v1.6b
+\ProvidesPackage{smfbulletin}[2002/02/07 v1.6b
   Fichier additionnel pour le Bulletin de la SMF]
 \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{smfgen}}
 \DeclareOption{master}{\PassOptionsToPackage{master}{smfmulti}}
@@ -4279,7 +4307,7 @@ editorial board of the SMF or from the  web site of the SMF.}
 % \subsection{Bulletin (fichier pour les auteurs)}
 %    \begin{macrocode}
 %<*bull>
-\ProvidesPackage{bull}[2001/10/17 v1.0c
+\ProvidesPackage{smfbull}[2001/10/17 v1.0c
   Fichier additionnel pour la soumission des articles au Bulletin]
 
 \let\ps@copyright\ps@empty
@@ -4377,7 +4405,7 @@ editorial board of the SMF or from the  web site of the SMF.}
 % \subsection{Cours Sp\'ecialis\'es}
 %    \begin{macrocode}
 %<*courspe>
-\ProvidesPackage{courspe}[2002/09/01 v1.4
+\ProvidesPackage{smfcourspe}[2002/09/01 v1.4
   Fichier additionnel pour les Cours Specialises]
 \RequirePackageWithOptions{smfgen}
 \RequirePackage[courspe]{smfvar}
@@ -4588,7 +4616,7 @@ usually rely on lectures given in a graduate course.}
 % \subsection{M\'emoires de la SMF}
 %    \begin{macrocode}
 %<*memoires>
-\ProvidesPackage{memoires}[2003/08/28 v1.4
+\ProvidesPackage{smfmemoires}[2003/08/28 v1.4
   Fichier additionnel pour les Memoires de la SMF]
 \RequirePackageWithOptions{smfgen}
 \def\smf@plaintitre{memoires}
@@ -4652,7 +4680,7 @@ approximately 100-150 pages long.}
 % \subsection{Cours Sp\'ecialis\'es (version EDP Sciences)}
 %    \begin{macrocode}
 %<*courspeedp>
-\ProvidesPackage{courspeedp}[2000/02/27 v1.3
+\ProvidesPackage{smfcourspeedp}[2000/02/27 v1.3
   Fichier additionnel pour les Cours Specialises (EDP Sciences)]
 \PassOptionsToPackage{ptmbf}{smfgen}
 \RequirePackageWithOptions{smfgen}
@@ -4800,7 +4828,7 @@ usually rely on lectures given in a graduate course.}
 % \subsection{Documents math\'ematiques}
 %    \begin{macrocode}
 %<*documents>
-\ProvidesPackage{documents}[2000/10/12 v1.3b
+\ProvidesPackage{smfdocuments}[2000/10/12 v1.3b
   Fichier additionnel pour Documents]
 \RequirePackageWithOptions{smfgen}
 \def\smf@plaintitre{documents}
@@ -4921,7 +4949,7 @@ usually rely on lectures given in a graduate course.}
 % \subsection{S\'eminaires et congr\`es}
 %    \begin{macrocode}
 %<*seminaires>
-\ProvidesPackage{seminaires}[2000/10/12 v1.3b
+\ProvidesPackage{smfseminaires}[2000/10/12 v1.3b
   Fichier additionnel pour Seminaires et Congres]
 \RequirePackageWithOptions{smfgen}
 \def\smf@plaintitre{seminaires}
@@ -4986,7 +5014,7 @@ not make up more than one third of the volume.}
 % \subsection{Panoramas et synth\`ese}
 %    \begin{macrocode}
 %<*panoramas>
-\ProvidesPackage{panoramas}[2000/10/13 v1.3b
+\ProvidesPackage{smfpanoramas}[2000/10/13 v1.3b
   Fichier additionnel pour Panoramas et Syntheses]
 \RequirePackageWithOptions{smfgen}
 \def\smf@plaintitre{panoramas}
@@ -5582,7 +5610,7 @@ should be accessible to graduate students.}
 %    \end{macrocode}
 % Ent\^ete.
 %    \begin{macrocode}
-\ProvidesClass{bourbaki}
+\ProvidesClass{smfbourbaki}
      [2003/02/21 v2.1c 
      Classe LaTeX pour les seminaires Bourbaki 
      (Asterisque ou Brochure)]
@@ -6151,7 +6179,7 @@ J'ignore l'option brochure.}%
 \addto\noextrasfrench{\bbl@deactivate{(}\bbl@deactivate{)}}
 %    \end{macrocode}
 %</upitparen>
-% \section{Style \BibTeX alphabétique}
+% \section{Style \BibTeX\ alphabétique}
 %<*smfalpha>
 %    \begin{macrocode}
 %%  @BibTeX-style-file{"smfalpha.bst"
@@ -7403,7 +7431,7 @@ FUNCTION {end.bib}
 EXECUTE {end.bib}
 %    \end{macrocode}
 %</smfalpha>
-% \section{Style \BibTeX numérique}
+% \section{Style \BibTeX\ numérique}
 %<*smfplain>
 %    \begin{macrocode}
 %%  @BibTeX-style-file{"smfplain.bst"
diff --git a/macros/latex/contrib/smflatex/smflatex.ins b/macros/latex/contrib/smflatex/smflatex.ins
index 433556c0a8..e3ecc4d02c 100644
--- a/macros/latex/contrib/smflatex/smflatex.ins
+++ b/macros/latex/contrib/smflatex/smflatex.ins
@@ -1,19 +1,25 @@
 \NeedsTeXFormat{LaTeX2e}% LaTeX June 94 or later required
 \def\batchfile{smflatex.ins}
-\def\smffileversion{v1.5d}
-\def\smffiledate{2018/05/30}
+\def\smffileversion{v1.6}
+\def\smffiledate{2021/05/01}
 %%
 %% This is the installation file for the smflatex bundle
 %% Run LaTeX on this file
 %%
-%% (c) 1999-2018 Societe mathematique de France
+%% (c) 1999-2021 Societe mathematique de France
 %%
 \input docstrip.tex
+%%
+%% The package contains some files 
+%% which are only intendedfor internal use of SMF
+%% To unpack them as well, replace \smffalse with \smftrue
+\newif\ifsmf \smffalse
+
 \preamble
 
- This is smflatex \smffileversion (\smffiledate)
+ This is smflatex \smffileversion (released \smffiledate)
  LaTeX bundle for the SMF publications
- (c) 1999-2018 Societe mathematique de France
+ (c) 1999-2021 Société mathématique de France
 
 \endpreamble
 \declarepreamble\bstfilepreamble
@@ -39,24 +45,28 @@ BibTeX style for the smflatex bundle, version \smffileversion
     \dofile{smfhyperref.sty}{hyperref}
 %  Package de theoremes
     \dofile{smfthm.sty}{smfthm}
-% Package pour la ponctuation haute
+\ifsmf
+% Package pour la ponctuation haute incorpore dans smfgen
     \dofile{upitparen.sty}{upitparen}
+\fi
 % Package de listes
     \dofile{smfenum.sty}{smfenum}
 %  Fichiers de configuration SMF
     \dofile{smfgen.sty}{smfgen}
 %  Fichiers pour les revues
-    \dofile{asterisque.sty}{asterisque}
-    \dofile{bulletin.sty}{bulletin}
-    \dofile{bull.sty}{bull}
-    \dofile{courspe.sty}{courspe}
-    \dofile{courspeedp.sty}{courspeedp}
-    \dofile{documents.sty}{documents}
-    \dofile{memoires.sty}{memoires}
-    \dofile{panoramas.sty}{panoramas}
-    \dofile{seminaires.sty}{seminaires}
-% Bourbaki (Brochure/Ast�risque)
-    \dofile{bourbaki.cls}{asterki}
+    \dofile{smfbull.sty}{bull}
+\ifsmf
+    \dofile{smfaster.sty}{asterisque}
+    \dofile{smfbulletin.sty}{bulletin}
+    \dofile{smfcourspe.sty}{courspe}
+    \dofile{smfcourspeedp.sty}{courspeedp}
+    \dofile{smfdocuments.sty}{documents}
+    \dofile{smfmemoires.sty}{memoires}
+    \dofile{smfpanoramas.sty}{panoramas}
+    \dofile{smfseminaires.sty}{seminaires}
+% Bourbaki (Brochure/Astérisque)
+    \dofile{smfbourbaki.cls}{asterki}
+\fi
 %  Package multi
     \dofile{smfmulti.sty}{multi}
 % Package smfbib
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 6c147953b0..8af26041b2 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,11 +26,11 @@ depend container_split_src_files/1
 depend frozen/0
 depend minrelease/2016
 depend release/2021
-depend revision/58898
+depend revision/58911
 
 name 00texlive.image
 category TLCore
-revision 58897
+revision 58910
 shortdesc TeX Live files only in the source repository
 longdesc The files here are not copied by the installer and containers
 longdesc are not built for them; they exist only in the source
@@ -2058,6 +2058,7 @@ runfiles size=13859
  tlpkg/tlpsrc/hrefhide.tlpsrc
  tlpkg/tlpsrc/hrlatex.tlpsrc
  tlpkg/tlpsrc/hu-berlin-bundle.tlpsrc
+ tlpkg/tlpsrc/huawei.tlpsrc
  tlpkg/tlpsrc/hulipsum.tlpsrc
  tlpkg/tlpsrc/hustthesis.tlpsrc
  tlpkg/tlpsrc/hvarabic.tlpsrc
@@ -3613,6 +3614,7 @@ runfiles size=13859
  tlpkg/tlpsrc/smartdiagram.tlpsrc
  tlpkg/tlpsrc/smartref.tlpsrc
  tlpkg/tlpsrc/smartunits.tlpsrc
+ tlpkg/tlpsrc/smflatex.tlpsrc
  tlpkg/tlpsrc/snapshot.tlpsrc
  tlpkg/tlpsrc/snotez.tlpsrc
  tlpkg/tlpsrc/songbook.tlpsrc
@@ -66843,7 +66845,7 @@ containerchecksum 0568a3251d71fb3106fbb3961427200419ae1df22d39b5e72c608e2d94fc35
 
 name collection-latexextra
 category Collection
-revision 58877
+revision 58907
 shortdesc LaTeX additional packages
 relocated 1
 longdesc A very large collection of add-on packages for LaTeX.
@@ -67447,6 +67449,7 @@ depend hletter
 depend hobsub
 depend hpsdiss
 depend hrefhide
+depend huawei
 depend hvindex
 depend hvqrurl
 depend hypdestopt
@@ -68212,8 +68215,8 @@ depend ziffer
 depend zref
 depend zwgetfdate
 depend zwpagelayout
-containersize 6328
-containerchecksum 0d46f6eed9615eaa1540cc13a4ba05a5082b6a58c1c869f219ed5de86097f8403f00f072c3b53f74fb0d5663d192f10a90cc985c9ece9b5d2c7c642e7dd1ce00
+containersize 6332
+containerchecksum 63a15145bdaa1e5302d066b36330c0842f0291d8d4f68798414fec91032bce64ea38b473cf1f69a5f991fffda077eafd6d1fc3dc8e61f53485f0d30a72c3e17a
 
 name collection-latexrecommended
 category Collection
@@ -69150,7 +69153,7 @@ containerchecksum 653143f95761352dc349c66f618b01a77650b20bf8b2cf45137e72b2f05ba3
 
 name collection-publishers
 category Collection
-revision 57312
+revision 58910
 shortdesc Publisher styles, theses, etc.
 relocated 1
 depend IEEEconf
@@ -69325,6 +69328,7 @@ depend seuthesis
 depend seuthesix
 depend shortmathj
 depend shtthesis
+depend smflatex
 depend soton
 depend sphdthesis
 depend spie
@@ -69393,8 +69397,8 @@ depend xmuthesis
 depend yathesis
 depend yazd-thesis
 depend york-thesis
-containersize 1536
-containerchecksum 22a96671004c2a06fd5935793ee274ec06f3801b18ad6b3af8181667ba37eead921b84e4e1d1206f213a5ea4ccdaaa7082e8fa3b8923c266389bbda4d34e3da4
+containersize 1544
+containerchecksum 76446566ffd13ea030a5d44aa37afa6e21b1dc201ccbb6f1461b6561c46c94d3c098cdfc60112e08098bbee136162cc7f3be7f3d576498a8de0f9cb865c1340a
 
 name collection-texworks
 category Collection
@@ -98420,16 +98424,16 @@ catalogue-topics notes editorial
 
 name easybook
 category Package
-revision 58894
+revision 58905
 shortdesc Typeset Chinese books or notes
 relocated 1
 longdesc Easybook is a minimalist style template based on the ctexbook
 longdesc book document class.
-containersize 11664
-containerchecksum a9ecd943f99a134e8b1f41a504d2fe02c29e5aa653a3bff59264848e8fd544702d16daf3763df6560901bafdaf8902ae264425b0efaeda3df5c55190cde2bd38
-doccontainersize 712576
-doccontainerchecksum 0766d4c974e20df3f9a3073fa523a367e192d880937802d3100630780f60b164b93a5cf92013f4a3f70510d6bfb34a3c44908a6e74581d64459a71aa6f482c14
-docfiles size=183
+containersize 11796
+containerchecksum 19c044e75cb061301b214456d7a6dd0930099f72d8df4f877cbeb61744f36715c93152e82f9809e709d28563ec31ed8408c3af67922b0d18ec65ad9de8dfa5d8
+doccontainersize 722240
+doccontainerchecksum fd1ac995bea72d3369d410a2bbe47c93134734dcfd507706b79a00bb0c2f279d83246f5ef90d614e29384ec706947b7e56d96b509e3f2e041dd150cd4a687915
+docfiles size=185
  RELOC/doc/latex/easybook/README.md details="Readme"
  RELOC/doc/latex/easybook/appendix.tex
  RELOC/doc/latex/easybook/chapter1.tex
@@ -98439,18 +98443,18 @@ docfiles size=183
  RELOC/doc/latex/easybook/easybook-demo.tex
  RELOC/doc/latex/easybook/easybook.pdf details="Package documentation" language="zh"
  RELOC/doc/latex/easybook/refs.bib
-srccontainersize 24836
-srccontainerchecksum 35b393afa2a71d03787a8d7f90522cf7f227d26b9b510b1cc15555571d9679e4b99015f65b32a473fcd15fe814bfb27a672febcfcd050279e8bb47d752800629
-srcfiles size=25
+srccontainersize 25084
+srccontainerchecksum 3790c238269db66bbd5898a83e708626881da6e0adf3e9381c19c5cb40a9c2d3b0935f54575c07c3dabac3fe66f48885815be1a0c7612557122d376bf2850dfd
+srcfiles size=26
  RELOC/source/latex/easybook/easybook.dtx
-runfiles size=13
+runfiles size=14
  RELOC/tex/latex/easybook/easybook.cls
 catalogue-also ctex
 catalogue-contact-repository https://gitee.com/texl3/easybook
 catalogue-ctan /macros/latex/contrib/easybook
 catalogue-license cc-by-4
 catalogue-topics book-pub class chinese expl3
-catalogue-version 1.24m
+catalogue-version 1.24n
 
 name easyfig
 category Package
@@ -107646,18 +107650,18 @@ catalogue-version 1.115
 
 name erewhon-math
 category Package
-revision 56703
+revision 58903
 shortdesc Utopia based OpenType Math font
 relocated 1
 longdesc Erewhon Math is an OpenType math font meant to be used together
 longdesc with Erewhon text fonts in LuaLaTeX or XeLaTeX documents. Like
 longdesc Fourier-GUTenberg, it is Utopia based and has been designed as
 longdesc a replacement of Fourier-GUTenberg for Unicode engines.
-containersize 231492
-containerchecksum 1e1bbdf2bf030e8b8c09c955ced895a93117eeb6c6a6f784ccb62c65d7e3fd6c5f536b23ea86eab3f306f0734fe3c805e22e61dedb5a5a06f41b74b8e89efdde
-doccontainersize 1471676
-doccontainerchecksum e422d287b0fa687e1bf54dc96f8adf1e979c8d2b6cfff2a5ad2e9d3ff8fde95ace136e2317235f6ad6144fe359385401569ec7aa75c273d48c3b7134b4273e74
-docfiles size=381
+containersize 224324
+containerchecksum 3ba23274d2036657d24fff1bdb1de3f76269360ca58ac7e4439b574a43d7bbf5ca5bacb346d63024ad9cc8fb5eeaae96374147c99acb8983abe6b42708f977a6
+doccontainersize 1472044
+doccontainerchecksum 2191adc4137255c3105b3e0191eb8562bb8beb968b81d91cff50a400efdcf7787b3e41a139b8c3372568a2267b81789d60e4101474b2223579c18d24067ac15d
+docfiles size=380
  RELOC/doc/fonts/erewhon-math/Erewhon-Math.ltx
  RELOC/doc/fonts/erewhon-math/Erewhon-Math.pdf details="Package documentation"
  RELOC/doc/fonts/erewhon-math/README.md details="Readme"
@@ -107669,7 +107673,7 @@ runfiles size=92
 catalogue-ctan /fonts/erewhon-math
 catalogue-license ofl lppl1.3
 catalogue-topics font font-proportional font-otf font-supp font-maths
-catalogue-version 0.45
+catalogue-version 0.46
 
 name errata
 category Package
@@ -122385,29 +122389,29 @@ catalogue-version 1.009
 
 name fontsize
 category Package
-revision 58508
+revision 58906
 shortdesc A small package to set arbitrary sizes for the main font of the document
 relocated 1
 longdesc The package allows you to set arbitrary sizes for the main font
 longdesc of the document, through the fontsize=<size> option.
-containersize 4960
-containerchecksum 844d0b06f0192a9d2a4e1334815f11581450ce29ae03d25955fe3421d6c3532fe0b53ba8496a4eb3c9c55bb5cea191f5ad59412ac37763738c0ddbf1b63a25e8
-doccontainersize 391868
-doccontainerchecksum 5b7c2abc87e808ca33f5b1c6ff1abbb02a4e5b9987f6a44dbe5778ead77ac218def325ce9184b3d300524fe9d0d43c78112c92700b0dcd4a413cba489c6dd248
-docfiles size=100
+containersize 4976
+containerchecksum 1f5f7af5b0ea951753d982a6f2ebf3b159b8a5a8ee993fdef4241e9608ba2ca6956691ff6c811a82303a5d69384008de1885ca525eb702ff7b8d23b49967ad7e
+doccontainersize 398936
+doccontainerchecksum e0fc34a2aa013ba211fd47caf98829dececd830f11ae867498e445c66424a048312132f37a1ac7a9c3154003e852c000371d6f7e8db6117f167816d74306e8be
+docfiles size=102
  RELOC/doc/latex/fontsize/README details="Readme"
  RELOC/doc/latex/fontsize/fontsize.bib
  RELOC/doc/latex/fontsize/fontsize.pdf details="Package documentation"
-srccontainersize 14484
-srccontainerchecksum 1084802e6bdfadff2cd373d69544bc906ef5f3f076e1cd8bffe9b85912fd1202b02a3e43eb0ed0115e1915f78d07d7f5847beabbfbe2cb4d31f17ae75cfb6179
-srcfiles size=18
+srccontainersize 14868
+srccontainerchecksum 184993572d347c963cdcdfcf56598863a0905bba6639092d6eca0b79f1e26a2630bbb1dafd6749f33709d4439ee6fcc2f6926b6d33ff2415012fd1010075bdf7
+srcfiles size=19
  RELOC/source/latex/fontsize/fontsize.dtx
 runfiles size=10
  RELOC/tex/latex/fontsize/fontsize.sty
 catalogue-ctan /macros/latex/contrib/fontsize
 catalogue-license lppl1.3
 catalogue-topics font-supp-misc
-catalogue-version 0.8.1
+catalogue-version 0.8.3
 
 name fontspec
 category Package
@@ -137002,6 +137006,31 @@ catalogue-license lppl1.3c gpl2 bsd3
 catalogue-topics class letter luatex
 catalogue-version 1.1.1
 
+name huawei
+category Package
+revision 58907
+shortdesc Template for Huawei documents
+relocated 1
+longdesc This unofficial package provides a class for creating documents
+longdesc for people working with Huawei Technologies Co., Ltd..
+containersize 5668
+containerchecksum d6aba70a005d5902c55cdcee90f903d11f8ff337f0fec8966add4a5ed0e03f72b466542b7e40422a83016569d808cf1ec5c04ee1e729b96492140ff356ca9a95
+doccontainersize 366952
+doccontainerchecksum 8131787a0f84aa0b54072f1a20f0c397b5e48c0168a4df993b9ee542e2444db40b4a1cb2c4da7263c492db511a74f03d858f47b287f9db803d997553f88885ed
+docfiles size=92
+ RELOC/doc/latex/huawei/README.md details="Readme"
+ RELOC/doc/latex/huawei/huawei.pdf details="Package documentation"
+ RELOC/doc/latex/huawei/huawei.tex
+runfiles size=4
+ RELOC/tex/latex/huawei/huawei.cls
+catalogue-contact-bugs http://github.com/yegor256/huawei.cls/issues
+catalogue-contact-home http://github.com/yegor256/huawei.cls
+catalogue-contact-repository http://github.com/yegor256/huawei.cls
+catalogue-ctan /macros/latex/contrib/huawei
+catalogue-license mit
+catalogue-topics class
+catalogue-version 0.1.0
+
 name hulipsum
 category Package
 revision 56848
@@ -183758,10 +183787,10 @@ binfiles arch=amd64-netbsd size=2711
 
 name luahbtex.armhf-linux
 category TLCore
-revision 58502
+revision 58911
 shortdesc armhf-linux files of luahbtex
-containersize 1848160
-containerchecksum 128f85b6bd73eeb1ebbbb77e67e1d13f1b6c845f50f4dff7a0d18683c0bfd89d7668315a52460415e3ef2f5e3e485a718c4605f3d4bc7dd498ac34f9ff51ada3
+containersize 1847732
+containerchecksum 05374239fe5f4b0656e6cdc227ab63b8c8b87b5435fa840f73ad7470f6cbd5a3614c7c14719b45611955a38506648ccc939ac7f3c802716aa09ac8565d4734df
 binfiles arch=armhf-linux size=1653
  bin/armhf-linux/luahbtex
 
@@ -184286,10 +184315,10 @@ binfiles arch=amd64-netbsd size=4877
 
 name luajittex.armhf-linux
 category TLCore
-revision 58502
+revision 58911
 shortdesc armhf-linux files of luajittex
-containersize 2134536
-containerchecksum 3bc41d58940d0e583f711f124c12b80946240d439cdb058f17c541d81234acfe83ad2445232d80211b89287014271cc2318d07496bce812e770b1452744348b9
+containersize 2124236
+containerchecksum fa97e1e66981f2e348c4476b87d91e3615a465ec0b8bb706ce6c21413c986977a88b681401bfac4ca9004ebbb73f7ae3a7b6aa37d2550587eccd1fc994bbcc82
 binfiles arch=armhf-linux size=3131
  bin/armhf-linux/luajithbtex
  bin/armhf-linux/luajittex
@@ -185231,10 +185260,10 @@ binfiles arch=amd64-netbsd size=1966
 
 name luatex.armhf-linux
 category TLCore
-revision 58502
+revision 58911
 shortdesc armhf-linux files of luatex
-containersize 1490788
-containerchecksum 2ebead0aec9b97f080efe76d82308b1351ed8a8a4547b0267c6da039e1b82a6886c3ecf113777c0e347db11db5649c94a3fa9e93524612623cebc4d10bf76c87
+containersize 1470796
+containerchecksum 9c4c7fe24f79515985b6092ca6ced3b91474522eb436d5575e23bf80e77e9f9a4c1fc92e0c699a614b4b64224e48005fe1756e4354e2945bc99f06f26060da40
 binfiles arch=armhf-linux size=1398
  bin/armhf-linux/dviluatex
  bin/armhf-linux/luatex
@@ -191695,16 +191724,16 @@ catalogue-version 0.4
 
 name mcf2graph
 category Package
-revision 58756
+revision 58904
 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 23136
-containerchecksum 2aa95a3df195a72ccba635278db0ac7aea1d382db3aa7bc913734405abbba9b4e98d62991178e3706e6b940caede95a6225ea5535e52a4308e57611e86a02fd9
-doccontainersize 916140
-doccontainerchecksum e778964cdb0d280df0b3341b4259c40032188c8af2125720cb7d0adaacdc9dbdba03513a419338875b97449901f615db25f2397071776e551d039cdb86ed6e52
+containersize 23192
+containerchecksum 71cb1991dbd119d6a87e05c64918cf6e902208c1e70f209940e6d8032b2364182e060597d5c68046237d9701436ff3e8aae91816b161a21048ab2b27581d4356
+doccontainersize 917548
+doccontainerchecksum 09ee57a13e7c9b19ed908b5473e6672c51f77d20e3dc0cf5765bffa36b4eb8ac93d1329b7ec02633a8532590033096b7678de27a871b895325e51b2f839308dd
 docfiles size=265
  RELOC/doc/metapost/mcf2graph/CHANGELOG
  RELOC/doc/metapost/mcf2graph/README details="Readme"
@@ -191717,13 +191746,13 @@ docfiles size=265
  RELOC/doc/metapost/mcf2graph/mcf_manual.tex
  RELOC/doc/metapost/mcf2graph/mcf_mplib_exa.pdf details="MCF Example for LuaLaTeX"
  RELOC/doc/metapost/mcf2graph/mcf_mplib_exa.tex
-runfiles size=26
+runfiles size=27
  RELOC/metapost/mcf2graph/mcf2graph.mf
  RELOC/tex/latex/mcf2graph/mcf_setup.sty
 catalogue-ctan /graphics/mcf2graph
 catalogue-license mit
 catalogue-topics graphics graphics-mpost chemistry
-catalogue-version 4.62
+catalogue-version 4.63
 
 name mcite
 category Package
@@ -194760,10 +194789,10 @@ binfiles arch=amd64-netbsd size=1297
 
 name metapost.armhf-linux
 category Package
-revision 57957
+revision 58911
 shortdesc armhf-linux files of metapost
-containersize 729776
-containerchecksum f873993024443e6153abdfc2132143c1d5facef221fb3694150574807f421426464cb2b2718ae4cb43487f5f56971cd9ea03e532470bfd9ca614746561abe521
+containersize 729772
+containerchecksum 13e6f079bfc7616c5433b8e36a9a492231459cf066d690f71bd237d6a756b06aff78803ca45845086ce754283f087b1bf070e28a499615e8d2ec10051745f3c7
 binfiles arch=armhf-linux size=478
  bin/armhf-linux/dvitomp
  bin/armhf-linux/mfplain
@@ -256176,10 +256205,10 @@ binfiles arch=amd64-netbsd size=1958
 
 name ptex.armhf-linux
 category Package
-revision 58428
+revision 58911
 shortdesc armhf-linux files of ptex
-containersize 1147108
-containerchecksum 54845dcbf0a7fbd5ae6eea312c12dc00b8456138da924c609095367e6db9fdf22848e40ef7f7aed4163d70ccde01678d3025a87cb8df8e3a6204b98e42d2fdbf
+containersize 1147188
+containerchecksum 066e639c213a4a7cd0fb84ba16737d151182901581ecf472f22cca5b10f16258cca341ff2750e80b74e8993fab0c5562f75aff0206fbaa577dcfd472da88c887
 binfiles arch=armhf-linux size=958
  bin/armhf-linux/eptex
  bin/armhf-linux/makejvf
@@ -266738,7 +266767,7 @@ catalogue-version 1
 
 name runcode
 category Package
-revision 56594
+revision 58908
 shortdesc Execute foreign source code and embed the result in the pdf file
 relocated 1
 longdesc This LaTeX package executes programming source codes (including
@@ -266751,10 +266780,10 @@ longdesc the Python talk2stat package. Currently, this server-mode
 longdesc supports Julia, MatLab, Python, and R. More languages will be
 longdesc added. For more details and usage examples, refer to the
 longdesc package's github repository.
-containersize 3256
-containerchecksum f7f9aa70a4a7201841eeb20e173c8f550ede9716d4608c5c2e762c03945fa8b279da9b2081ca1fa1a15ae19a75860507a51c78bcb13cef48d2ff37a1d9d169da
-doccontainersize 172436
-doccontainerchecksum eb9d3cb287e94da44d921c471e429d3ab0e70e74df2a7f7b19fe4efe514641d58f8fe5a74facbcccfd6b4c45ab2af95121912980d61e57e3ef6a3ddabc861359
+containersize 3568
+containerchecksum d3ea947106e824d697e15f82466a36e36215a6a3b5c954cfd6250cb3a896e2de2ba6163cf9be5510bf4250a57809d27ae8c06915d9f601057608e7d57e08ea1e
+doccontainersize 174012
+doccontainerchecksum 48e8847f7a50e14c809b08244cb9851c25a367799aa3ad673472a8e1b66aad2e4dc0ceaedc56fe2fb106c610f4fc825c10b05665a385ef7347bdc87a85338a0d
 docfiles size=46
  RELOC/doc/latex/runcode/README details="Readme"
  RELOC/doc/latex/runcode/runcode.pdf details="Package documentation"
@@ -266765,7 +266794,7 @@ catalogue-contact-repository https://github.com/Ossifragus/runcode
 catalogue-ctan /macros/latex/contrib/runcode
 catalogue-license lppl1.3c
 catalogue-topics exec-foreign callback
-catalogue-version 1.0
+catalogue-version 1.1
 
 name russ
 category Package
@@ -273213,7 +273242,7 @@ catalogue-version 1.0
 
 name siunitx
 category Package
-revision 58802
+revision 58909
 shortdesc A comprehensive (SI) units package
 relocated 1
 longdesc Typesetting values with units requires care to ensure that the
@@ -273238,16 +273267,16 @@ longdesc The package relies on LaTeX 3 support from the l3kernel and
 longdesc l3packages bundles.
 depend l3kernel
 depend l3packages
-containersize 34720
-containerchecksum cd66a8d26f45f899ce1737639ba9eecd82ce767d6e38ebc495ca6245332dd64ed88b7763a3c839c0a83d6948b212974ccffef9a9ce9101387d2628db9dadec88
-doccontainersize 636944
-doccontainerchecksum 0f4bac97e46a1ffcd644ddd8d2451e81d56609555237d638e8708ef66bcbbfba5f0111926e25c109a5254105536b1da2b2d06c6068babc042118798ce520caee
+containersize 34728
+containerchecksum 1b5766cf67cfafc1179570b4463812274cbb8d3c54e09e707907d57d697599832080a52027e7d459047fb084dedaaa6774eca8af0f68090fa1cf3c16f125402b
+doccontainersize 636932
+doccontainerchecksum a12c9311581f1096c052d9fdce7d987e9b3a559369a5d0c0a07778e1d5ca8669617620bfc81e54c05f30f329b0f7040b159bd3144197ec0ca5b69e2a04772039
 docfiles size=166
  RELOC/doc/latex/siunitx/CHANGELOG.md
  RELOC/doc/latex/siunitx/README.md details="Readme"
  RELOC/doc/latex/siunitx/siunitx.pdf details="User manual"
 srccontainersize 103384
-srccontainerchecksum 4c516af226fab1e9dc9efb4de41e8e654faaa255f304bd368d63c4c424ed338e4e5eb67712fe8d1111815e7a8b0138c3e52452d469c7018e1bdc516774b5d3f3
+srccontainerchecksum 83ad306d973ff33ca327bb5f35ef019471967d3798f341bf5ae384244b448729afcf6602291cc94f56ec0b8ee2b52e32e3023e4b4c049537b5a7f254f5e78dd9
 srcfiles size=151
  RELOC/source/latex/siunitx/siunitx.dtx
 runfiles size=78
@@ -273261,7 +273290,7 @@ catalogue-contact-repository https://github.com/josephwright/siunitx
 catalogue-ctan /macros/latex/contrib/siunitx
 catalogue-license lppl1.3c
 catalogue-topics units scientific-docs expl3
-catalogue-version 2.8d
+catalogue-version 2.8e
 
 name skak
 category Package
@@ -273993,6 +274022,53 @@ catalogue-license lppl1.3
 catalogue-topics units misc-conv
 catalogue-version 1.2
 
+name smflatex
+category Package
+revision 58910
+shortdesc Classes for Societe mathematique de France publications
+relocated 1
+longdesc The Societe mathematique de France provides a set of classes,
+longdesc packages and BibTeX styles that are used in its publications.
+longdesc They are based on AMS classes (whose code is sometimes
+longdesc recopied) and mainly 'upward-compatible'. Their main features
+longdesc are: quite different design; new environments for typesetting
+longdesc some information in two languages (altabstract, alttitle,
+longdesc altkeywords); if necessary, use of babel (option frenchb) and
+longdesc deactivation of some features of frenchb. Includes smfart.cls,
+longdesc smfbook.cls, smfplain.bst, smfalpha.bst, amongst others.
+containersize 28272
+containerchecksum 3723047537c97c42f23eaf15dd95941092300a86a5072cf261c2d9a4fdc09d17e3c09cefc6a1f632996b45300cfc5e3266dba4130decf4f6d33063b0b7f45d0f
+doccontainersize 828572
+doccontainerchecksum a0ead1f76c26126c3cf00bd735ae8002648ac874511de92a73b756197328af3d81d66697c0fb3d210047570dd267b5c975b26a7c6e42b0fa61b9b77a29bbf113
+docfiles size=273
+ RELOC/doc/latex/smflatex/README details="Readme"
+ RELOC/doc/latex/smflatex/smf-edoc.pdf details="Readme"
+ RELOC/doc/latex/smflatex/smf-edoc.tex
+ RELOC/doc/latex/smflatex/smf-fdoc.pdf details="Readme" language="fr"
+ RELOC/doc/latex/smflatex/smf-fdoc.tex
+ RELOC/doc/latex/smflatex/smfdoc.tex
+srccontainersize 51112
+srccontainerchecksum 99a45d290c450301108b032830b02c81d3487ebb281f19f17826df8ed267dada23b5bb039874f97de29850c1d33bb775097d53d7e4d8d4373de9143219aa57aa
+srcfiles size=64
+ RELOC/source/latex/smflatex/smflatex.dtx
+ RELOC/source/latex/smflatex/smflatex.ins
+runfiles size=53
+ RELOC/bibtex/bst/smflatex/smfalpha.bst
+ RELOC/bibtex/bst/smflatex/smfplain.bst
+ RELOC/tex/latex/smflatex/smfart.cls
+ RELOC/tex/latex/smflatex/smfbib.sty
+ RELOC/tex/latex/smflatex/smfbook.cls
+ RELOC/tex/latex/smflatex/smfbull.sty
+ RELOC/tex/latex/smflatex/smfenum.sty
+ RELOC/tex/latex/smflatex/smfgen.sty
+ RELOC/tex/latex/smflatex/smfhyperref.sty
+ RELOC/tex/latex/smflatex/smfmulti.sty
+ RELOC/tex/latex/smflatex/smfthm.sty
+catalogue-ctan /macros/latex/contrib/smflatex
+catalogue-license lppl1.3c
+catalogue-topics journalpub french
+catalogue-version 1.6
+
 name snapshot
 category Package
 revision 56735
@@ -289603,7 +289679,7 @@ binfiles arch=x86_64-solaris size=1
 
 name tex4ht
 category Package
-revision 58887
+revision 58902
 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
@@ -289618,10 +289694,10 @@ longdesc restricted-syntax systems such as hyperlatex and gellmu. Note
 longdesc that CTAN no longer holds the definitive sources of the
 longdesc package: see the 'Readme' file.
 depend tex4ht.ARCH
-containersize 906116
-containerchecksum d088b936a48d40c1da34b47d3207e49a6beefb39878cc09a5ec591520ba50a3058b18239aabfeaba401eaf459f7c507b03d98e6c1f704a9ff4daf58fa6d0c6d3
+containersize 906248
+containerchecksum 60a74a788a434c40adc4bdb1f0c37d7363585152dd2b232a9a25121f65431463cb704edbdb650e3d3d009ec99f4dd1f3444449a8da0cfa2cb1a8496b0482f946
 doccontainersize 136156
-doccontainerchecksum cde522ebfe54109582d75255c2458c91805474f5177e59ee91b639ddef31c7a45545333fd45e27106c943ccaff2a8f254b9cffd3d0366c634172aedbd00db256
+doccontainerchecksum ed470c364d3dd1a878ee27f0808d8ab9b3c3d1d3bb265bb9b957298dbe87eb2469ed711ed2bad2a243dd6e98841f420428620cf71a4daceebe4a46fc97212357
 docfiles size=259
  texmf-dist/doc/generic/tex4ht/Makefile
  texmf-dist/doc/generic/tex4ht/TeX4ht-doc.tex
@@ -298496,15 +298572,15 @@ docfiles size=619
 
 name texlive-docindex
 category TLCore
-revision 58881
+revision 58900
 shortdesc top-level TeX Live doc.html, etc.
 longdesc These files are regenerated as needed, which is often, so we
 longdesc make them a separate package. See the tl-update-auto script for
 longdesc the process.
-containersize 388
-containerchecksum 6698d43e6ef884265d833968c5c337945850f4edb3322ec11dd188cf53eba278341200784b388d72a77db37acafa543f346432eddee730dbbaecfe130265e4e1
-doccontainersize 174440
-doccontainerchecksum 352d303d196bcac2315dd700dbd3944215056dee568d8561ba67c8e213247b2112a0b27671a721dc4126f83f3429b5775f61c7ebe59e9f5ff593081e39d85161
+containersize 392
+containerchecksum be50ba043298c2a19a8b640086ea9c3a516a990b454ae8f8fc0cdd3ceb11425ac87b0514510a19eb766a92320a6109698a5e19e7e39ab089c7fd3791bc8b6844
+doccontainersize 174484
+doccontainerchecksum 023e4e37919c290532b31d4ea906429d14527fb52ccad5d2c0eff5dd9bfb1e9f873682218f3c876eec4b698b8e1374e9a4ef1028bf386a0a299ff04d4592766f
 docfiles size=347
  doc.html
 
@@ -322654,10 +322730,10 @@ binfiles arch=amd64-netbsd size=7093
 
 name uptex.armhf-linux
 category Package
-revision 58428
+revision 58911
 shortdesc armhf-linux files of uptex
-containersize 6761436
-containerchecksum d36b792e93b89e35133269194068ee8a0e75db36c8962a4e5073b7b134d7aaa04117808900eec8f4e12dd959d83cf4030ccff1043cbaa89e2fe3d1b66142f179
+containersize 6761520
+containerchecksum 76c20859dedea96a450de572c4c30477bf16aab4c77e255e1e985d700c8c44796f2fd8552065bd41e407b6b27b31a8fe68a4fedd7e8b98697a6c3c243db7ed7e
 binfiles arch=armhf-linux size=5936
  bin/armhf-linux/euptex
  bin/armhf-linux/r-upmpost
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 56ce8e2720..5a0889ceec 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-03ca674d532d326c3bb094ff730b4ef9  texlive.tlpdb
+6d2da71f589aedd1838cbb8da57671f3  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 0ed8660ebb..ee9bd808c8 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-96f95e02553cea0bd03d8d93ca60418105be733a6a6f321e00a931f79a271b09d75ffa8674eaf4152de57ed58ee44f07970258b9e6783b9127348c4d250716e8  texlive.tlpdb
+fd7f2db218892b4f212945973a220b340df696599fbfe7b8385d561ee5c689acec61fc01b7a7ecbdf9e6fc0e72dc1fa2f2d7eec3f5a4706337bfd5dccb502810  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index ee4a25eb77..3c8c08d727 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-----
 
-iQEcBAEBCgAGBQJge3TWAAoJEEzhh34ZQ4xwVFcH/1OO2D59iE0Sa/aqs3apo21i
-kEszpFjgAIJE7qvvNAuPzJIpgGG/Fbhi5x3Zo/UwGmnhVrb2h2CJ5dInIhXyJKmS
-tkO+cgw8jkxOjfbzb93Z4T394c9Zvh5C2ei+WuclHNjkHBgUtKZxioIkix4ojjRr
-SNgsg2NcYX5RsbDACj9NPR1K45DRkBdBDaawSIgSQOLPyn/mhQAuwyvZeDMlDOIr
-F/DRGyI4Agc4FxfJ5CADuXbt3EDi4VRyjtsIrWr6ZuDbJlZU2MNyY9MWnmJpGwM4
-qPbx+Emk2XirUwL6aCBGEx1a0uKyp2fIFlS0BOCr0Muo++uGEeO2j53/zP+YBdM=
-=NuZS
+iQEcBAEBCgAGBQJgfMZVAAoJEEzhh34ZQ4xwSpIH/A/Erj9YNN4qozbe3n4WCDJe
+1tFFTOrmmy5C3nOrZLFyKHUQp1Q6hROCasJEF+kBFeNe2//7kiZM9sW1TL1Qc5gc
+Ki14GJfVbq7z+q3AVLo27G1agXR5EzGotHyqghCxxFaf0Kjd5VvrWzv7i6Z7GGDQ
+/G1d0VH6ZZ/yj3rspRuJIUowxGh1iSpOGq5LBKONMyC1nF4ymIkoX8f8G4iE40vw
+mDJspPlUgSRwbdErWWoWQchIHH2gI0AjsL0Ko3N6wn8sqv1LQetZZNkwWgmicaDy
+cRuXgL4mdrk92FNeZgNF8MqtjnTyNUBLwpHe2hFsj70EZtjeYyrOm3BRcb5cdJU=
+=P/8u
 -----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 27e71986ba..6c9450db9b 100644
Binary files a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz and b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz differ
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index fee66c643d..267945dc3f 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=1618690462
+date=1618776865
 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=ad85dbe2f19e2737caca96caad68222c
+lstdigest=6aaa6ba607ab849ef8ae876d90f7b009
 numpkg=4087
 relstate=next
-version=7777
+version=7778
 
 ;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
 ;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: VFnNMWZJJrkykR+gqY/R8PtZIZU2B2w8NAW72EKCyRG62rUyw/DqFGUyZ/EmSdupQIywUS6Y2dxGpff1+1hKc8PICFHLZsFrEZdy8q0pdqa4wWpMLsgt5mVCFdq1t5KxaO2DknvZU9YZrETxnVbY7deQMcKEC6MVNYpLS3Qu5dM5x6oyoQ3Rl4Kg6KTgL3kxMhNayVQjqxJL7W1qlJfV71GbFFw4Em7jRFr3ryPRsSvY8Sg5frfIgHSIJd3CZ/Yk2/LEp8RFTavwE+maO/xdKv3erFiwOaNDuO4o+StYN/Jbkd3LezqHsglha011QwqMxgwnDaS3u9uWVMuk6Ezf5w==
+;;;; signature/miktex: OQAaU6mRqtYo/gdfQkAWIwGTBCES3qlExjk1CrcECN7wNOC2L2ph1xCAZBFLYG7aaaoCmDqhpnmGOnXdoHk0xuRnV58T2H81dxZ9/r9Pj/3qEbfAh0KV37AvmlhA1kD6bcXwGsX2c5ysk/wzTIkJVRBntlG0hdaSJU9GWOD0BFt0IDwl+157sKzS6gKRehCL0G0Wy9QC0zGC3SvGS/PO7UXvXyBKNI6FbNOtO3LJ7EoOUx8bm52/c9KqCUTQW75Y4Le39BhHpJz4l+CZ+4xggOqG5Jmo8xO+anEIlzCjFys/UBXsUE2o39tTw4I5wm/ncRltVOM9OjmqzlgWWUwwOA==
 ;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index 58fd6d0e3a..bdb567c0a3 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
 
 [repository]
-date=1618690280
+date=1618776674
 lastupd=acmart aomart apa7 babel babel-serbian babel-serbianc de-macro easybook expkv expkv-cs expkv-def haranoaji-extra langsci lwarp mathtools nicematrix nimbus15 ninecolors polexpr polyglossia
-lstdigest=fc0ab7c92b82668fcaa0be5d57fc37b4
+lstdigest=84b483515c14a569c59a857dd273bdfa
 numpkg=4087
 relstate=stable
-version=7777
+version=7778
 
 ;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
 ;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: cfj01dD8QSHu+o5CNAuJf9zTwwFaNuZlF6VKgLnuqI+arfkUCKDE2+mD+ZTqynACyMb22qvU/NoIP5DurHMIrmEtpT2hF1hO6vWvZypTd4cFy0fz56KQs7M8B7TIjL3dscXMnJNTI7gh4wqL5VznTU209xAS5Jh/W6+BdfAByAAXXMXke74tGeiWPz4CHVVzgPnqklqjKJnEZOtyyn1CGVwll6iRotEq901YUdPh1ObPSVfv9tiLpuPw27HXGGM/42uT4qj9q677w8SEj2GXEuJCFkZ3GhYbXoatTK7Lpc4Nu4l4iwDcsNkO1RxMELH7hIpQOh+/W4ophnwWAJoCHw==
+;;;; signature/miktex: kidNPzbJHk1uNsvDxE7x9UY7BUwzSq42IUzrJVgrZK82jo1Haq5UTPe68TPGSlbxrE+JfTKEt1Ki1OWjcpKnHlpDgma37d34H6sK0bYOO4ovvjVkk9HRxaM++IyhMfM2W1LXZm6kz0TPcHKBxVN6nk5tQPKGefEKthSmHr3qlJXI/ftZPx4XU5iFRio6Gs/1PLo262vPhpIP5ts3HHUV1kW88DT7Ham1k7+V9KoZ1lBjM+oRwKWc6WWnGIgMJoIjEIXhL13r376ooS4u5JOv9qVAknftCFWNF9afqAh/a9ylPSzbmqneDoGKWFnyvubTMpo42gYcinXRLSlBBWhO7A==
 ;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/w32tex/ChangeLog b/systems/win32/w32tex/ChangeLog
index 6ae17a6a14..c946896b1b 100644
--- a/systems/win32/w32tex/ChangeLog
+++ b/systems/win32/w32tex/ChangeLog
@@ -1,5 +1,9 @@
                    W32TeX (x86 & x64) ChangeLog
 
+[2021/04/18]
+(01) ltxpkgs.tar.xz
+     Update fontsize.
+
 [2021/04/17]
 (01) cweb-w32.tar.xz
      Update cweb.
diff --git a/timestamp b/timestamp
index aac6d1becb..047047ee3c 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-04-18-02-02
+2021-04-19-02-02
-- 
cgit v1.2.3