81 files changed, 5142 insertions, 6916 deletions

diff --git a/FILES.byname b/FILES.byname
index a7341bc8c4..92bee14a20 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -5001,7 +5001,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
-2020/05/20 |     130813 | FILES.last07days
+2020/05/21 |     134945 | FILES.last07days
 2018/06/27 |      99883 | fonts/academicons/academicons.pdf
 2018/06/27 |      10779 | fonts/academicons/academicons.sty
 2018/06/27 |       5774 | fonts/academicons/academicons.tex
@@ -160596,18 +160596,15 @@
 2010/07/14 |      96489 | info/latex-samples/TitlePages/titlepages.tex
 2010/07/14 |     904779 | info/latex-samples/TitlePages.zip
 2012/10/03 |    1341215 | info/latex-sciences-humaines.pdf
-2016/08/12 |        175 | info/latex-veryshortguide/MANIFEST
-2016/08/12 |     191788 | info/latex-veryshortguide/menno-a.png
-2016/08/12 |       6368 | info/latex-veryshortguide/README.md
-2016/08/12 |     525535 | info/latex-veryshortguide/veryshortguide-A4-imposed.pdf
-2016/08/12 |       1161 | info/latex-veryshortguide/veryshortguide.bib
-2016/08/12 |     523320 | info/latex-veryshortguide/veryshortguide-Legal-imposed.pdf
-2016/08/12 |     285593 | info/latex-veryshortguide/veryshortguide.pdf
-2016/08/12 |      17261 | info/latex-veryshortguide/veryshortguide.tex
-2016/08/12 |      84531 | info/latex-veryshortguide/vsg.dtx
-2016/08/12 |       1700 | info/latex-veryshortguide/vsg.ins
-2016/08/12 |     642032 | info/latex-veryshortguide/vsg.pdf
-2016/08/12 |    1318103 | info/latex-veryshortguide.zip
+2020/05/21 |        142 | info/latex-veryshortguide/MANIFEST
+2020/05/21 |      30525 | info/latex-veryshortguide/menno-a.jpg
+2020/05/21 |       7288 | info/latex-veryshortguide/README.md
+2020/05/21 |         41 | info/latex-veryshortguide/VERSION
+2020/05/21 |     623361 | info/latex-veryshortguide/veryshortguide-A4-imposed.pdf
+2020/05/21 |      82915 | info/latex-veryshortguide/veryshortguide.dtx
+2020/05/21 |       2571 | info/latex-veryshortguide/veryshortguide.ins
+2020/05/21 |     134527 | info/latex-veryshortguide/veryshortguide.pdf
+2020/05/21 |     548808 | info/latex-veryshortguide.zip
 2019/12/26 |        953 | info/latex-via-exemplos/changelog.txt
 2019/12/19 |       3738 | info/latex-via-exemplos/latex-via-exemplos.bib
 2019/07/16 |       2713 | info/latex-via-exemplos/latex-via-exemplos-certificado.tex
@@ -163145,7 +163142,7 @@
 2019/03/20 |    7942984 | install/macros/latex/contrib/stex.tds.zip
 2011/12/21 |     204538 | install/macros/latex/contrib/storebox.tds.zip
 2019/11/30 |     800764 | install/macros/latex/contrib/stringenc.tds.zip
-2020/02/24 |    1488593 | install/macros/latex/contrib/suftesi.tds.zip
+2020/05/21 |    1492577 | install/macros/latex/contrib/suftesi.tds.zip
 2012/05/06 |     463336 | install/macros/latex/contrib/svn-multi.tds.zip
 2010/04/24 |     261363 | install/macros/latex/contrib/svn-prov.tds.zip
 2014/05/20 |     721827 | install/macros/latex/contrib/sympytexpackage.tds.zip
@@ -176084,16 +176081,15 @@
 2015/05/22 |       6015 | macros/generic/catcodes/use/catchdq.sty
 2012/11/07 |       4853 | macros/generic/catcodes/use/stacklet.sty
 2015/11/15 |     557118 | macros/generic/catcodes.zip
-2020/04/27 |    1087404 | macros/generic/chemfig/chemfig-en.pdf
-2020/04/27 |     185808 | macros/generic/chemfig/chemfig-en.tex
-2020/04/27 |    1115715 | macros/generic/chemfig/chemfig-fr.pdf
-2020/04/27 |     200049 | macros/generic/chemfig/chemfig-fr.tex
-2020/04/27 |     109562 | macros/generic/chemfig/chemfigold.tex
-2020/04/27 |        371 | macros/generic/chemfig/chemfig.sty
-2020/04/27 |     119798 | macros/generic/chemfig/chemfig.tex
-2020/04/27 |       1125 | macros/generic/chemfig/README
-2020/04/27 |        200 | macros/generic/chemfig/t-chemfig.tex
-2020/04/27 |    2353941 | macros/generic/chemfig.zip
+2020/05/21 |    1088180 | macros/generic/chemfig/chemfig-en.pdf
+2020/05/21 |     186187 | macros/generic/chemfig/chemfig-en.tex
+2020/05/21 |    1116252 | macros/generic/chemfig/chemfig-fr.pdf
+2020/05/21 |     200455 | macros/generic/chemfig/chemfig-fr.tex
+2020/05/21 |        371 | macros/generic/chemfig/chemfig.sty
+2020/05/21 |     119994 | macros/generic/chemfig/chemfig.tex
+2020/05/21 |       1125 | macros/generic/chemfig/README
+2020/05/21 |        200 | macros/generic/chemfig/t-chemfig.tex
+2020/05/21 |    2330082 | macros/generic/chemfig.zip
 1996/04/17 |      17290 | macros/generic/code128/code128.tex
 1996/04/17 |        716 | macros/generic/code128/README
 1996/04/17 |       4503 | macros/generic/code128/test128.tex
@@ -180416,10 +180412,10 @@
 2013/05/20 |       4934 | macros/latex/contrib/babel-contrib/irish/irish.ins
 2013/05/20 |     109823 | macros/latex/contrib/babel-contrib/irish/irish.pdf
 2014/02/26 |     113763 | macros/latex/contrib/babel-contrib/irish.zip
-2019/11/16 |      72773 | macros/latex/contrib/babel-contrib/italian/italian.dtx
-2019/11/16 |     446223 | macros/latex/contrib/babel-contrib/italian/italian.pdf
-2019/11/16 |       1729 | macros/latex/contrib/babel-contrib/italian/README.txt
-2019/12/04 |     468294 | macros/latex/contrib/babel-contrib/italian.zip
+2020/05/21 |      74190 | macros/latex/contrib/babel-contrib/italian/italian.dtx
+2020/05/21 |     446180 | macros/latex/contrib/babel-contrib/italian/italian.pdf
+2020/05/21 |       1729 | macros/latex/contrib/babel-contrib/italian/README.txt
+2020/05/21 |     468758 | macros/latex/contrib/babel-contrib/italian.zip
 2019/04/03 |      21457 | macros/latex/contrib/babel-contrib/japanese/japanese.dtx
 2019/04/03 |       1297 | macros/latex/contrib/babel-contrib/japanese/japanese.ins
 2019/04/03 |     139680 | macros/latex/contrib/babel-contrib/japanese/japanese.pdf
@@ -185715,12 +185711,13 @@
 2011/06/05 |       1577 | macros/latex/contrib/decimal/decimal.ins
 2011/06/05 |     187033 | macros/latex/contrib/decimal/decimal.pdf
 2011/06/05 |     165517 | macros/latex/contrib/decimal.zip
-2011/08/02 |      38919 | macros/latex/contrib/decorule/decorule.dtx
-2011/08/02 |       1325 | macros/latex/contrib/decorule/decorule.ins
-2011/08/02 |     423349 | macros/latex/contrib/decorule/decorule.pdf
-2011/08/02 |         83 | macros/latex/contrib/decorule/MANIFEST
-2011/08/02 |       2785 | macros/latex/contrib/decorule/README
-2011/08/07 |     418645 | macros/latex/contrib/decorule.zip
+2020/05/21 |      56004 | macros/latex/contrib/decorule/decorule.dtx
+2020/05/21 |       2186 | macros/latex/contrib/decorule/decorule.ins
+2020/05/21 |     396165 | macros/latex/contrib/decorule/decorule.pdf
+2020/05/21 |         66 | macros/latex/contrib/decorule/MANIFEST
+2020/05/21 |       7204 | macros/latex/contrib/decorule/README.md
+2020/05/21 |         41 | macros/latex/contrib/decorule/VERSION
+2020/05/21 |     414015 | macros/latex/contrib/decorule.zip
 1998/06/05 |       1291 | macros/latex/contrib/deleq/00readme.dlq
 1998/06/05 |      40255 | macros/latex/contrib/deleq/deleq.dtx
 1998/06/05 |       2369 | macros/latex/contrib/deleq/deleq.ins
@@ -203324,11 +203321,11 @@
 2006/03/25 |       2275 | macros/latex/contrib/sudoku/sudoku.ins
 2006/03/25 |      67384 | macros/latex/contrib/sudoku/sudoku.pdf
 2006/03/25 |      60808 | macros/latex/contrib/sudoku.zip
-2020/02/24 |       1680 | macros/latex/contrib/suftesi/README
-2020/02/24 |     192005 | macros/latex/contrib/suftesi/suftesi.dtx
-2020/02/24 |     758153 | macros/latex/contrib/suftesi/suftesi.pdf
-2020/02/24 |     680672 | macros/latex/contrib/suftesi/templates.zip
-2020/02/24 |    1473062 | macros/latex/contrib/suftesi.zip
+2020/05/21 |       1680 | macros/latex/contrib/suftesi/README
+2020/05/21 |     202383 | macros/latex/contrib/suftesi/suftesi.dtx
+2020/05/21 |     762256 | macros/latex/contrib/suftesi/suftesi.pdf
+2020/05/21 |     681686 | macros/latex/contrib/suftesi/templates.zip
+2020/05/21 |    1476771 | macros/latex/contrib/suftesi.zip
 2020/02/02 |        856 | macros/latex/contrib/supertabular/CATALOG
 2020/02/02 |      13567 | macros/latex/contrib/supertabular/ChangeLog
 2020/01/24 |        502 | macros/latex/contrib/supertabular/MANIFEST
@@ -210223,90 +210220,91 @@
 2017/10/17 |     704910 | macros/luatex/latex/wallcalendar/wallcalendar-layouts.png
 2017/10/17 |    2896302 | macros/luatex/latex/wallcalendar/wallcalendar.pdf
 2017/10/21 |    9209120 | macros/luatex/latex/wallcalendar.zip
-2020/05/05 |       5863 | macros/luatex/optex/base/alloc.opm
-2020/04/16 |       3569 | macros/luatex/optex/base/basic-macros.opm
-2020/04/26 |      35186 | macros/luatex/optex/base/bib-iso690.opm
-2020/03/19 |       6491 | macros/luatex/optex/base/bib-simple.opm
-2020/04/26 |      11754 | macros/luatex/optex/base/cite-bib.opm
-2020/04/26 |      17894 | macros/luatex/optex/base/colors.opm
-2020/05/06 |       9792 | macros/luatex/optex/base/doc.opm
-2020/04/19 |        650 | macros/luatex/optex/base/f-adventor.opm
-2020/04/20 |       5106 | macros/luatex/optex/base/fams-ini.opm
-2020/04/19 |       1137 | macros/luatex/optex/base/f-antt.opm
-2020/04/19 |        646 | macros/luatex/optex/base/f-baskerville.opm
-2020/04/19 |        672 | macros/luatex/optex/base/f-bonum.opm
-2020/04/19 |        639 | macros/luatex/optex/base/f-cursor.opm
-2020/04/19 |        564 | macros/luatex/optex/base/f-gfsbodoni.opm
-2020/04/21 |       8073 | macros/luatex/optex/base/f-heros.opm
-2020/04/19 |       2367 | macros/luatex/optex/base/f-libertine.opm
-2020/04/19 |       2154 | macros/luatex/optex/base/f-libertine-s.opm
-2020/04/19 |       1527 | macros/luatex/optex/base/f-lido.opm
-2020/04/21 |       8457 | macros/luatex/optex/base/f-lmfonts.opm
-2020/05/05 |       8162 | macros/luatex/optex/base/fnotes.opm
-2020/03/19 |       4303 | macros/luatex/optex/base/fonts-catalog.opm
-2020/05/05 |       6715 | macros/luatex/optex/base/fonts-opmac.opm
-2020/04/21 |       1606 | macros/luatex/optex/base/fonts-preload.opm
-2020/05/05 |      13881 | macros/luatex/optex/base/fonts-resize.opm
-2020/05/05 |      28728 | macros/luatex/optex/base/fonts-select.opm
-2020/04/19 |        687 | macros/luatex/optex/base/f-pagella.opm
-2020/04/19 |        683 | macros/luatex/optex/base/f-schola.opm
-2020/04/19 |       1102 | macros/luatex/optex/base/f-technika.opm
-2020/04/19 |        677 | macros/luatex/optex/base/f-termes.opm
-2020/04/19 |        743 | macros/luatex/optex/base/f-xcharter.opm
-2020/05/05 |      18876 | macros/luatex/optex/base/graphics.opm
-2020/05/05 |       2761 | macros/luatex/optex/base/hisyntax-c.opm
-2020/04/06 |       1001 | macros/luatex/optex/base/hisyntax-html.opm
-2020/05/05 |       9530 | macros/luatex/optex/base/hi-syntax.opm
-2020/05/05 |       3014 | macros/luatex/optex/base/hisyntax-python.opm
-2020/05/05 |       1562 | macros/luatex/optex/base/hisyntax-tex.opm
-2020/05/05 |       6959 | macros/luatex/optex/base/hyperlinks.opm
-2020/05/05 |       8624 | macros/luatex/optex/base/hyphen-lan.opm
-2020/05/05 |       9765 | macros/luatex/optex/base/if-macros.opm
-2020/05/05 |       5482 | macros/luatex/optex/base/languages.opm
-2020/05/05 |       4394 | macros/luatex/optex/base/lists.opm
-2020/05/05 |       2426 | macros/luatex/optex/base/logos.opm
-2020/05/05 |       7412 | macros/luatex/optex/base/luatex-ini.opm
-2020/05/05 |      19070 | macros/luatex/optex/base/makeindex.opm
-2020/05/05 |       5154 | macros/luatex/optex/base/maketoc.opm
-2020/04/22 |       3633 | macros/luatex/optex/base/margins.opm
-2020/02/18 |      13569 | macros/luatex/optex/base/mathclass.opm
-2020/05/05 |      38129 | macros/luatex/optex/base/math-macros.opm
-2020/05/06 |       9398 | macros/luatex/optex/base/math-preload.opm
-2020/05/06 |       9587 | macros/luatex/optex/base/math-unicode.opm
-2020/05/06 |      10214 | macros/luatex/optex/base/more-macros.opm
-2020/04/23 |       4719 | macros/luatex/optex/base/multicolumns.opm
-2020/05/06 |       3927 | macros/luatex/optex/base/optex.ini
-2020/05/05 |       3117 | macros/luatex/optex/base/others.opm
-2020/05/05 |       4311 | macros/luatex/optex/base/outlines.opm
-2020/05/05 |      10567 | macros/luatex/optex/base/output.opm
-2020/05/05 |      23032 | macros/luatex/optex/base/parameters.opm
-2020/05/05 |       3066 | macros/luatex/optex/base/pdfuni-string.opm
-2020/05/05 |      13397 | macros/luatex/optex/base/plain-macros.opm
-2020/05/06 |      11646 | macros/luatex/optex/base/prefixed.opm
-2020/05/05 |       3367 | macros/luatex/optex/base/references.opm
-2020/05/05 |       5574 | macros/luatex/optex/base/ref-file.opm
-2020/05/05 |      17716 | macros/luatex/optex/base/sections.opm
-2020/05/05 |       8587 | macros/luatex/optex/base/slides.opm
-2020/04/26 |       3742 | macros/luatex/optex/base/styles.opm
-2020/05/05 |      10368 | macros/luatex/optex/base/table.opm
-2020/04/29 |     121745 | macros/luatex/optex/base/uni-lcuc.opm
-2020/05/06 |      15717 | macros/luatex/optex/base/unimath-codes.opm
-2020/02/18 |     241265 | macros/luatex/optex/base/unimath-table.opm
-2020/05/05 |      13909 | macros/luatex/optex/base/usebib.opm
-2020/05/05 |      11189 | macros/luatex/optex/base/verbatim.opm
-2020/03/19 |       3514 | macros/luatex/optex/demo/op-demo.tex
-2020/05/06 |       1188 | macros/luatex/optex/demo/op-letter.tex
-2020/03/17 |     512984 | macros/luatex/optex/demo/op-ring.png
-2020/05/06 |       8894 | macros/luatex/optex/demo/op-slides.tex
-2020/03/17 |      62385 | macros/luatex/optex/demo/slides-bg.png
-2020/02/17 |       1460 | macros/luatex/optex/doc/optex.1
-2020/05/06 |    1172140 | macros/luatex/optex/doc/optex-doc.pdf
-2020/05/06 |       3889 | macros/luatex/optex/doc/optex-doc.tex
-2020/05/06 |       6717 | macros/luatex/optex/doc/optex-techdoc.tex
-2020/05/06 |      74087 | macros/luatex/optex/doc/optex-userdoc.tex
-2020/05/05 |      85028 | macros/luatex/optex/pkg/qrcode.opm
-2020/05/06 |       2666 | macros/luatex/optex/README
-2020/05/06 |    2028886 | macros/luatex/optex.zip
+2020/05/17 |       5935 | macros/luatex/optex/base/alloc.opm
+2020/05/16 |       3569 | macros/luatex/optex/base/basic-macros.opm
+2020/05/17 |      35186 | macros/luatex/optex/base/bib-iso690.opm
+2020/05/17 |       6492 | macros/luatex/optex/base/bib-simple.opm
+2020/05/17 |      11755 | macros/luatex/optex/base/cite-bib.opm
+2020/05/17 |      17896 | macros/luatex/optex/base/colors.opm
+2020/05/17 |       9867 | macros/luatex/optex/base/doc.opm
+2020/05/16 |        650 | macros/luatex/optex/base/f-adventor.opm
+2020/05/17 |       5120 | macros/luatex/optex/base/fams-ini.opm
+2020/05/16 |       1137 | macros/luatex/optex/base/f-antt.opm
+2020/05/16 |        646 | macros/luatex/optex/base/f-baskerville.opm
+2020/05/16 |        672 | macros/luatex/optex/base/f-bonum.opm
+2020/05/16 |        639 | macros/luatex/optex/base/f-cursor.opm
+2020/05/16 |        564 | macros/luatex/optex/base/f-gfsbodoni.opm
+2020/05/16 |       8073 | macros/luatex/optex/base/f-heros.opm
+2020/05/16 |       2367 | macros/luatex/optex/base/f-libertine.opm
+2020/05/16 |       2154 | macros/luatex/optex/base/f-libertine-s.opm
+2020/05/16 |       1527 | macros/luatex/optex/base/f-lido.opm
+2020/05/16 |       8457 | macros/luatex/optex/base/f-lmfonts.opm
+2020/05/16 |       8162 | macros/luatex/optex/base/fnotes.opm
+2020/05/16 |       4303 | macros/luatex/optex/base/fonts-catalog.opm
+2020/05/16 |       6715 | macros/luatex/optex/base/fonts-opmac.opm
+2020/05/16 |       1606 | macros/luatex/optex/base/fonts-preload.opm
+2020/05/16 |      13881 | macros/luatex/optex/base/fonts-resize.opm
+2020/05/16 |      28728 | macros/luatex/optex/base/fonts-select.opm
+2020/05/16 |        687 | macros/luatex/optex/base/f-pagella.opm
+2020/05/16 |        683 | macros/luatex/optex/base/f-schola.opm
+2020/05/16 |       1102 | macros/luatex/optex/base/f-technika.opm
+2020/05/16 |        677 | macros/luatex/optex/base/f-termes.opm
+2020/05/16 |        743 | macros/luatex/optex/base/f-xcharter.opm
+2020/05/17 |      18877 | macros/luatex/optex/base/graphics.opm
+2020/05/17 |       2762 | macros/luatex/optex/base/hisyntax-c.opm
+2020/05/16 |       1001 | macros/luatex/optex/base/hisyntax-html.opm
+2020/05/17 |       9526 | macros/luatex/optex/base/hi-syntax.opm
+2020/05/16 |       3014 | macros/luatex/optex/base/hisyntax-python.opm
+2020/05/16 |       1562 | macros/luatex/optex/base/hisyntax-tex.opm
+2020/05/16 |       6959 | macros/luatex/optex/base/hyperlinks.opm
+2020/05/17 |       8625 | macros/luatex/optex/base/hyphen-lan.opm
+2020/05/20 |       9854 | macros/luatex/optex/base/if-macros.opm
+2020/05/18 |       5483 | macros/luatex/optex/base/languages.opm
+2020/05/16 |       4394 | macros/luatex/optex/base/lists.opm
+2020/05/16 |       2426 | macros/luatex/optex/base/logos.opm
+2020/05/16 |       7412 | macros/luatex/optex/base/luatex-ini.opm
+2020/05/16 |      19070 | macros/luatex/optex/base/makeindex.opm
+2020/05/16 |       5154 | macros/luatex/optex/base/maketoc.opm
+2020/05/16 |       3633 | macros/luatex/optex/base/margins.opm
+2020/05/16 |      13569 | macros/luatex/optex/base/mathclass.opm
+2020/05/17 |      40652 | macros/luatex/optex/base/math-macros.opm
+2020/05/17 |       9400 | macros/luatex/optex/base/math-preload.opm
+2020/05/16 |       9587 | macros/luatex/optex/base/math-unicode.opm
+2020/05/17 |      10222 | macros/luatex/optex/base/more-macros.opm
+2020/05/16 |       4719 | macros/luatex/optex/base/multicolumns.opm
+2020/05/17 |       3927 | macros/luatex/optex/base/optex.ini
+2020/05/17 |       3291 | macros/luatex/optex/base/others.opm
+2020/05/16 |       4311 | macros/luatex/optex/base/outlines.opm
+2020/05/17 |      10649 | macros/luatex/optex/base/output.opm
+2020/05/20 |      24027 | macros/luatex/optex/base/parameters.opm
+2020/05/16 |       3066 | macros/luatex/optex/base/pdfuni-string.opm
+2020/05/16 |      13397 | macros/luatex/optex/base/plain-macros.opm
+2020/05/17 |      11646 | macros/luatex/optex/base/prefixed.opm
+2020/05/16 |       3367 | macros/luatex/optex/base/references.opm
+2020/05/17 |       5575 | macros/luatex/optex/base/ref-file.opm
+2020/05/17 |      17717 | macros/luatex/optex/base/sections.opm
+2020/05/16 |       8587 | macros/luatex/optex/base/slides.opm
+2020/05/16 |       3742 | macros/luatex/optex/base/styles.opm
+2020/05/20 |      21738 | macros/luatex/optex/base/table.opm
+2020/05/16 |     121745 | macros/luatex/optex/base/uni-lcuc.opm
+2020/05/17 |      15718 | macros/luatex/optex/base/unimath-codes.opm
+2020/05/16 |     241265 | macros/luatex/optex/base/unimath-table.opm
+2020/05/17 |      13910 | macros/luatex/optex/base/usebib.opm
+2020/05/17 |      11190 | macros/luatex/optex/base/verbatim.opm
+2020/05/07 |       3514 | macros/luatex/optex/demo/op-demo.tex
+2020/05/18 |       1188 | macros/luatex/optex/demo/op-letter-cs.tex
+2020/05/18 |        569 | macros/luatex/optex/demo/op-letter-en.tex
+2020/05/16 |     512984 | macros/luatex/optex/demo/op-ring.png
+2020/05/17 |      62385 | macros/luatex/optex/demo/op-slides-bg.png
+2020/05/17 |       8900 | macros/luatex/optex/demo/op-slides.tex
+2020/05/16 |       1460 | macros/luatex/optex/doc/optex.1
+2020/05/20 |    1206961 | macros/luatex/optex/doc/optex-doc.pdf
+2020/05/17 |       3889 | macros/luatex/optex/doc/optex-doc.tex
+2020/05/19 |       6809 | macros/luatex/optex/doc/optex-techdoc.tex
+2020/05/20 |      77091 | macros/luatex/optex/doc/optex-userdoc.tex
+2020/05/16 |      85028 | macros/luatex/optex/pkg/qrcode.opm
+2020/05/20 |       2950 | macros/luatex/optex/README
+2020/05/21 |    2067960 | macros/luatex/optex.zip
 1993/02/12 |       2330 | macros/mathematica/CHANGES
 1993/02/12 |       7699 | macros/mathematica/README
 1993/02/12 |      40574 | macros/mathematica/tex-mma-j.ps.gz
@@ -255658,9 +255656,9 @@
 2020/02/05 |       1844 | systems/texlive/tlnet/archive/classics.r53671.tar.xz
 2019/02/28 |     521304 | systems/texlive/tlnet/archive/classicthesis.doc.r48041.tar.xz
 2019/02/28 |       8944 | systems/texlive/tlnet/archive/classicthesis.r48041.tar.xz
-2019/02/28 |     355320 | systems/texlive/tlnet/archive/classpack.doc.r33101.tar.xz
-2019/02/28 |       1340 | systems/texlive/tlnet/archive/classpack.r33101.tar.xz
-2019/02/28 |      34876 | systems/texlive/tlnet/archive/classpack.source.r33101.tar.xz
+2020/05/20 |     143968 | systems/texlive/tlnet/archive/classpack.doc.r55218.tar.xz
+2020/05/20 |       2292 | systems/texlive/tlnet/archive/classpack.r55218.tar.xz
+2020/05/20 |      21084 | systems/texlive/tlnet/archive/classpack.source.r55218.tar.xz
 2019/06/27 |     904536 | systems/texlive/tlnet/archive/cleanthesis.doc.r51472.tar.xz
 2019/06/27 |       6756 | systems/texlive/tlnet/archive/cleanthesis.r51472.tar.xz
 2020/03/24 |     198492 | systems/texlive/tlnet/archive/clearsans.doc.r54512.tar.xz
@@ -255694,9 +255692,9 @@
 2019/08/24 |        352 | systems/texlive/tlnet/archive/clojure-pamphlet.x86_64-linuxmusl.r51944.tar.xz
 2019/08/24 |        352 | systems/texlive/tlnet/archive/clojure-pamphlet.x86_64-linux.r51944.tar.xz
 2019/08/24 |        348 | systems/texlive/tlnet/archive/clojure-pamphlet.x86_64-solaris.r51944.tar.xz
-2019/02/28 |     222748 | systems/texlive/tlnet/archive/cloze.doc.r41531.tar.xz
-2019/02/28 |       4276 | systems/texlive/tlnet/archive/cloze.r41531.tar.xz
-2019/02/28 |      15292 | systems/texlive/tlnet/archive/cloze.source.r41531.tar.xz
+2020/05/20 |     242292 | systems/texlive/tlnet/archive/cloze.doc.r55221.tar.xz
+2020/05/20 |       5004 | systems/texlive/tlnet/archive/cloze.r55221.tar.xz
+2020/05/20 |      17268 | systems/texlive/tlnet/archive/cloze.source.r55221.tar.xz
 2019/02/28 |     289968 | systems/texlive/tlnet/archive/clrdblpg.doc.r47511.tar.xz
 2019/02/28 |       1256 | systems/texlive/tlnet/archive/clrdblpg.r47511.tar.xz
 2019/02/28 |       2740 | systems/texlive/tlnet/archive/clrdblpg.source.r47511.tar.xz
@@ -262847,13 +262845,13 @@
 2019/02/28 |        344 | systems/texlive/tlnet/archive/ptex2pdf.amd64-freebsd.r29335.tar.xz
 2019/02/28 |        344 | systems/texlive/tlnet/archive/ptex2pdf.amd64-netbsd.r30191.tar.xz
 2019/02/28 |        340 | systems/texlive/tlnet/archive/ptex2pdf.armhf-linux.r30015.tar.xz
-2020/03/09 |       8640 | systems/texlive/tlnet/archive/ptex2pdf.doc.r54191.tar.xz
+2020/05/20 |       8640 | systems/texlive/tlnet/archive/ptex2pdf.doc.r55219.tar.xz
 2019/02/28 |        340 | systems/texlive/tlnet/archive/ptex2pdf.i386-cygwin.r29335.tar.xz
 2019/02/28 |        344 | systems/texlive/tlnet/archive/ptex2pdf.i386-freebsd.r29335.tar.xz
 2019/02/28 |        344 | systems/texlive/tlnet/archive/ptex2pdf.i386-linux.r29335.tar.xz
 2019/02/28 |        340 | systems/texlive/tlnet/archive/ptex2pdf.i386-netbsd.r30191.tar.xz
 2019/02/28 |        344 | systems/texlive/tlnet/archive/ptex2pdf.i386-solaris.r29335.tar.xz
-2020/03/09 |       7712 | systems/texlive/tlnet/archive/ptex2pdf.r54191.tar.xz
+2020/05/20 |       7832 | systems/texlive/tlnet/archive/ptex2pdf.r55219.tar.xz
 2019/02/28 |        684 | systems/texlive/tlnet/archive/ptex2pdf.win32.r29335.tar.xz
 2019/02/28 |        344 | systems/texlive/tlnet/archive/ptex2pdf.x86_64-cygwin.r33557.tar.xz
 2019/02/28 |        352 | systems/texlive/tlnet/archive/ptex2pdf.x86_64-darwinlegacy.r43871.tar.xz
@@ -264187,13 +264185,13 @@
 2020/03/02 |     109508 | systems/texlive/tlnet/archive/tex4ht.amd64-freebsd.r53999.tar.xz
 2020/03/02 |      87376 | systems/texlive/tlnet/archive/tex4ht.amd64-netbsd.r53995.tar.xz
 2020/03/04 |      72564 | systems/texlive/tlnet/archive/tex4ht.armhf-linux.r54033.tar.xz
-2020/05/18 |      61192 | systems/texlive/tlnet/archive/tex4ht.doc.r55208.tar.xz
+2020/05/20 |      61192 | systems/texlive/tlnet/archive/tex4ht.doc.r55223.tar.xz
 2020/03/17 |      51108 | systems/texlive/tlnet/archive/tex4ht.i386-cygwin.r54350.tar.xz
 2020/03/02 |      90676 | systems/texlive/tlnet/archive/tex4ht.i386-freebsd.r53999.tar.xz
 2020/03/02 |      89232 | systems/texlive/tlnet/archive/tex4ht.i386-linux.r53999.tar.xz
 2020/03/06 |      76276 | systems/texlive/tlnet/archive/tex4ht.i386-netbsd.r54104.tar.xz
 2020/03/02 |      83968 | systems/texlive/tlnet/archive/tex4ht.i386-solaris.r53999.tar.xz
-2020/05/18 |     867336 | systems/texlive/tlnet/archive/tex4ht.r55208.tar.xz
+2020/05/20 |     867632 | systems/texlive/tlnet/archive/tex4ht.r55223.tar.xz
 2020/03/02 |      57708 | systems/texlive/tlnet/archive/tex4ht.win32.r53994.tar.xz
 2020/03/14 |      57932 | systems/texlive/tlnet/archive/tex4ht.x86_64-cygwin.r54274.tar.xz
 2020/03/02 |      85024 | systems/texlive/tlnet/archive/tex4ht.x86_64-darwinlegacy.r53999.tar.xz
@@ -264371,8 +264369,8 @@
 2020/03/24 |        280 | systems/texlive/tlnet/archive/texlive-cz.r54496.tar.xz
 2020/03/29 |    1338300 | systems/texlive/tlnet/archive/texlive-de.doc.r54604.tar.xz
 2020/03/29 |        272 | systems/texlive/tlnet/archive/texlive-de.r54604.tar.xz
-2020/05/18 |     162124 | systems/texlive/tlnet/archive/texlive-docindex.doc.r55196.tar.xz
-2020/05/18 |        388 | systems/texlive/tlnet/archive/texlive-docindex.r55196.tar.xz
+2020/05/20 |     162208 | systems/texlive/tlnet/archive/texlive-docindex.doc.r55216.tar.xz
+2020/05/20 |        392 | systems/texlive/tlnet/archive/texlive-docindex.r55216.tar.xz
 2020/04/16 |    1891392 | systems/texlive/tlnet/archive/texlive-en.doc.r54755.tar.xz
 2020/04/16 |        272 | systems/texlive/tlnet/archive/texlive-en.r54755.tar.xz
 2020/03/22 |    3090144 | systems/texlive/tlnet/archive/texlive-es.doc.r54465.tar.xz
@@ -264956,9 +264954,9 @@
 2019/02/28 |     363444 | systems/texlive/tlnet/archive/topletter.doc.r48182.tar.xz
 2019/02/28 |       2552 | systems/texlive/tlnet/archive/topletter.r48182.tar.xz
 2019/02/28 |       6292 | systems/texlive/tlnet/archive/topletter.source.r48182.tar.xz
-2019/07/26 |    6205416 | systems/texlive/tlnet/archive/toptesi.doc.r51743.tar.xz
-2019/07/26 |      19836 | systems/texlive/tlnet/archive/toptesi.r51743.tar.xz
-2019/07/26 |      93680 | systems/texlive/tlnet/archive/toptesi.source.r51743.tar.xz
+2020/05/20 |    6315844 | systems/texlive/tlnet/archive/toptesi.doc.r55220.tar.xz
+2020/05/20 |      20384 | systems/texlive/tlnet/archive/toptesi.r55220.tar.xz
+2020/05/20 |      96464 | systems/texlive/tlnet/archive/toptesi.source.r55220.tar.xz
 2019/02/28 |     286576 | systems/texlive/tlnet/archive/totcount.doc.r21178.tar.xz
 2019/02/28 |       2272 | systems/texlive/tlnet/archive/totcount.r21178.tar.xz
 2019/02/28 |       6680 | systems/texlive/tlnet/archive/totcount.source.r21178.tar.xz
@@ -265768,9 +265766,9 @@
 2019/02/28 |       1716 | systems/texlive/tlnet/archive/xellipsis.r47546.tar.xz
 2019/02/28 |       7092 | systems/texlive/tlnet/archive/xellipsis.source.r47546.tar.xz
 2020/05/18 |     987500 | systems/texlive/tlnet/archive/xepersian.doc.r55194.tar.xz
-2020/05/14 |     478644 | systems/texlive/tlnet/archive/xepersian-hm.doc.r55123.tar.xz
-2020/05/14 |       5016 | systems/texlive/tlnet/archive/xepersian-hm.r55123.tar.xz
-2020/05/14 |       6028 | systems/texlive/tlnet/archive/xepersian-hm.source.r55123.tar.xz
+2020/05/20 |     479288 | systems/texlive/tlnet/archive/xepersian-hm.doc.r55222.tar.xz
+2020/05/20 |       5076 | systems/texlive/tlnet/archive/xepersian-hm.r55222.tar.xz
+2020/05/20 |       6100 | systems/texlive/tlnet/archive/xepersian-hm.source.r55222.tar.xz
 2020/05/18 |      58564 | systems/texlive/tlnet/archive/xepersian.r55194.tar.xz
 2020/05/18 |      74624 | systems/texlive/tlnet/archive/xepersian.source.r55194.tar.xz
 2019/08/20 |     614800 | systems/texlive/tlnet/archive/xesearch.doc.r51908.tar.xz
@@ -266080,7 +266078,7 @@
 2020/01/24 |     138180 | systems/texlive/tlnet/archive/zxjatype.doc.r53500.tar.xz
 2020/01/24 |       8760 | systems/texlive/tlnet/archive/zxjatype.r53500.tar.xz
 2020/05/18 |     107860 | systems/texlive/tlnet/install-tl
-2020/05/20 |    5500520 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2020/05/20 |    5500512 | systems/texlive/tlnet/install-tl-unx.tar.gz
 2020/05/20 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
 2020/05/20 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
 2020/03/17 |       4641 | systems/texlive/tlnet/install-tl-windows.bat
@@ -266145,12 +266143,12 @@
 2020/05/17 |      20322 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
 2020/05/03 |       4786 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
 2017/11/14 |      27560 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2020/05/20 |   16444311 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2020/05/20 |   16444044 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
 2020/05/20 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
 2020/05/13 |      86417 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
 2020/05/20 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
 2020/05/20 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2020/05/20 |    2202288 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2020/05/20 |    2202452 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
 2020/04/15 |      58761 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
 2020/03/20 |      41736 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
 2020/05/11 |      15010 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -270559,7 +270557,7 @@
 2020/02/04 |     281488 | 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
-2020/05/20 |     535403 | systems/win32/miktex/tm/packages/files.csv.lzma
+2020/05/21 |     535403 | 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
@@ -271706,9 +271704,9 @@
 2018/01/12 |     157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
 2020/05/17 |      39207 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
 2020/05/17 |      42854 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2020/05/20 |     199905 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2020/05/20 |    1196353 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2020/05/20 |    1116130 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2020/05/21 |     199843 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2020/05/21 |    1196820 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2020/05/21 |    1115755 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
 2020/05/17 |      13031 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
 2020/05/17 |      14067 | 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
@@ -271860,183 +271858,183 @@
 2018/04/09 |     400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
 2011/09/19 |     101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
 2019/09/11 |     231430 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2020/05/20 |     534816 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2020/05/20 |      58558 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2020/05/20 |      66563 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2020/05/20 |     941127 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2020/05/20 |    1049744 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2020/05/20 |      28575 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2020/05/20 |      30785 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2020/05/20 |      29323 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2020/05/20 |      34939 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2020/05/20 |      49729 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2020/05/20 |      57270 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2020/05/20 |      84828 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2020/05/20 |      94351 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2020/05/20 |      62074 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2020/05/20 |      69345 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2020/05/20 |      26646 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2020/05/20 |      30215 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2020/05/20 |     328738 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2020/05/20 |     391509 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2020/05/20 |      32321 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2020/05/20 |      36418 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2020/05/20 |      71324 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2020/05/20 |      77909 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2020/05/20 |     203216 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2020/05/20 |     222870 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2020/05/20 |     169537 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2020/05/20 |     184301 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2020/05/20 |      52239 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2020/05/20 |      58598 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2020/05/20 |      20787 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2020/05/20 |      23005 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2020/05/20 |     460504 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma
-2020/05/20 |      41134 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2020/05/20 |      45952 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2020/05/20 |     273336 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2020/05/20 |     311645 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2020/05/20 |      40793 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2020/05/20 |      45081 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2020/05/20 |     115755 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2020/05/20 |     130481 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2020/05/20 |    1257175 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2020/05/20 |    1388764 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2020/05/20 |      95266 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2020/05/20 |     110121 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2020/05/20 |      43426 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2020/05/20 |      47996 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2020/05/20 |      45696 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2020/05/20 |      50764 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2020/05/20 |      56655 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2020/05/20 |      61713 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2020/05/20 |     133092 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2020/05/20 |     152146 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2020/05/20 |      69820 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2020/05/20 |      73062 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2020/05/20 |      68635 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2020/05/20 |      77413 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2020/05/20 |     246433 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2020/05/20 |     281648 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2020/05/20 |      25393 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2020/05/20 |      28793 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2020/05/20 |     100562 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2020/05/20 |     116882 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2020/05/20 |      63245 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2020/05/20 |      72577 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2020/05/20 |      94370 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2020/05/20 |     110965 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2020/05/20 |      57980 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2020/05/20 |      64578 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2020/05/20 |     457707 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2020/05/20 |     545600 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2020/05/20 |     137121 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2020/05/20 |     150094 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2020/05/20 |      92919 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2020/05/20 |     108823 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2020/05/20 |      15946 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2020/05/20 |      17730 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2020/05/20 |      27753 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2020/05/20 |      29755 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2020/05/20 |     615390 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2020/05/20 |     670000 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2020/05/20 |     498732 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2020/05/20 |     561638 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2020/05/20 |     539212 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2020/05/20 |     574786 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2020/05/20 |      93575 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2020/05/20 |     102531 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2020/05/20 |    1736493 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2020/05/20 |    2009804 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2020/05/20 |      67263 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2020/05/20 |      73609 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2020/05/20 |      26947 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2020/05/20 |      31349 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2020/05/20 |       7505 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2020/05/20 |       8476 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2020/05/20 |     170202 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2020/05/20 |     185809 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2020/05/20 |     247776 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2020/05/20 |     281420 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2020/05/20 |      86978 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2020/05/20 |      92143 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2020/05/20 |      78094 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2020/05/20 |      86705 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2020/05/20 |     164997 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2020/05/20 |     185138 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2020/05/20 |     148866 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2020/05/20 |     168385 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2020/05/20 |     194862 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2020/05/20 |     177526 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2020/05/20 |      81386 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2020/05/20 |      92922 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2020/05/20 |      30991 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2020/05/20 |      34807 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2020/05/20 |      55803 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2020/05/20 |      63015 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2020/05/20 |      63188 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2020/05/20 |      69172 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2020/05/20 |      45646 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2020/05/20 |      52077 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2020/05/20 |     189235 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2020/05/20 |     206534 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2020/05/20 |     323367 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2020/05/20 |     358101 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2020/05/20 |     186845 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2020/05/20 |     193878 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2020/05/20 |     207039 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2020/05/20 |     242999 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2020/05/20 |      78170 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2020/05/20 |      87188 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2020/05/20 |     932280 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2020/05/20 |    1042743 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2020/05/20 |      19891 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2020/05/20 |      23525 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2020/05/20 |      31151 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2020/05/20 |      36658 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2020/05/20 |      63367 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2020/05/20 |      71649 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2020/05/20 |      42621 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2020/05/20 |      50939 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2020/05/20 |    1150838 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2020/05/20 |    1286408 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2020/05/20 |      41931 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2020/05/20 |      50918 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2020/05/20 |      74460 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma
-2020/05/20 |      82295 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma
-2020/05/20 |      26752 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2020/05/20 |      29035 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2020/05/20 |      16118 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2020/05/20 |      17827 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2020/05/20 |      63166 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2020/05/20 |      69252 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2020/05/20 |     149713 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2020/05/20 |     163962 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2020/05/20 |      74811 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2020/05/20 |      84877 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2020/05/20 |      91545 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2020/05/20 |      96602 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2020/05/20 |    2555485 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2020/05/20 |    2686056 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2020/05/20 |      54978 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2020/05/20 |      61451 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2020/05/20 |      26504 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2020/05/20 |      32351 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2020/05/20 |      61700 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2020/05/20 |      65266 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2020/05/20 |     248465 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2020/05/20 |     278139 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2020/05/20 |     591010 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2020/05/20 |     630128 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2020/05/20 |      39168 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2020/05/20 |      42926 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2020/05/20 |     199901 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2020/05/20 |    1196545 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2020/05/20 |    1117169 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2020/05/20 |      13050 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2020/05/20 |      14038 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2020/05/21 |     534816 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2020/05/21 |      58558 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2020/05/21 |      66564 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2020/05/21 |     941128 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2020/05/21 |    1049745 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2020/05/21 |      28575 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2020/05/21 |      30784 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2020/05/21 |      29322 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2020/05/21 |      34938 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2020/05/21 |      49727 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2020/05/21 |      57270 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2020/05/21 |      84827 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2020/05/21 |      94351 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2020/05/21 |      62072 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2020/05/21 |      69344 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2020/05/21 |      26646 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2020/05/21 |      30215 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2020/05/21 |     328737 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2020/05/21 |     391508 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2020/05/21 |      32320 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2020/05/21 |      36418 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2020/05/21 |      71323 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2020/05/21 |      77909 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2020/05/21 |     203218 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2020/05/21 |     222869 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2020/05/21 |     169534 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2020/05/21 |     184300 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2020/05/21 |      52237 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2020/05/21 |      58598 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2020/05/21 |      20787 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2020/05/21 |      23006 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2020/05/21 |     460504 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma
+2020/05/21 |      41134 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2020/05/21 |      45950 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2020/05/21 |     273337 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2020/05/21 |     311643 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2020/05/21 |      40793 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2020/05/21 |      45080 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2020/05/21 |     115756 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2020/05/21 |     130481 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2020/05/21 |    1257175 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2020/05/21 |    1388764 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2020/05/21 |      95264 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2020/05/21 |     110121 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2020/05/21 |      43424 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2020/05/21 |      47995 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2020/05/21 |      45695 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2020/05/21 |      50763 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2020/05/21 |      56656 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2020/05/21 |      61713 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2020/05/21 |     133092 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2020/05/21 |     152147 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2020/05/21 |      69819 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2020/05/21 |      73060 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2020/05/21 |      68635 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2020/05/21 |      77413 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2020/05/21 |     246433 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2020/05/21 |     281650 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2020/05/21 |      25394 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2020/05/21 |      28791 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2020/05/21 |     100563 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2020/05/21 |     116879 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2020/05/21 |      63242 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2020/05/21 |      72575 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2020/05/21 |      94368 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2020/05/21 |     110962 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2020/05/21 |      57978 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2020/05/21 |      64577 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2020/05/21 |     457707 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2020/05/21 |     545600 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2020/05/21 |     137121 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2020/05/21 |     150094 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2020/05/21 |      92918 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2020/05/21 |     108821 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2020/05/21 |      15947 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2020/05/21 |      17730 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2020/05/21 |      27754 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2020/05/21 |      29754 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2020/05/21 |     615388 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2020/05/21 |     669999 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2020/05/21 |     498732 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2020/05/21 |     561639 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2020/05/21 |     539210 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2020/05/21 |     574787 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2020/05/21 |      93574 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2020/05/21 |     102530 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2020/05/21 |    1736495 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2020/05/21 |    2009803 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2020/05/21 |      67262 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2020/05/21 |      73607 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2020/05/21 |      26946 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2020/05/21 |      31347 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2020/05/21 |       7505 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2020/05/21 |       8475 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2020/05/21 |     170202 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2020/05/21 |     185810 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2020/05/21 |     247775 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2020/05/21 |     281420 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2020/05/21 |      86976 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2020/05/21 |      92144 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2020/05/21 |      78096 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2020/05/21 |      86704 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2020/05/21 |     164996 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2020/05/21 |     185137 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2020/05/21 |     148865 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2020/05/21 |     168384 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2020/05/21 |     194860 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2020/05/21 |     177527 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2020/05/21 |      81387 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2020/05/21 |      92923 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2020/05/21 |      30990 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2020/05/21 |      34807 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2020/05/21 |      55803 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2020/05/21 |      63016 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2020/05/21 |      63188 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2020/05/21 |      69172 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2020/05/21 |      45646 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2020/05/21 |      52077 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2020/05/21 |     189235 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2020/05/21 |     206533 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2020/05/21 |     323364 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2020/05/21 |     358098 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2020/05/21 |     186845 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2020/05/21 |     193879 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2020/05/21 |     207039 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2020/05/21 |     242998 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2020/05/21 |      78168 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2020/05/21 |      87186 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2020/05/21 |     932283 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2020/05/21 |    1042741 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2020/05/21 |      19892 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2020/05/21 |      23524 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2020/05/21 |      31150 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2020/05/21 |      36657 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2020/05/21 |      63366 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2020/05/21 |      71647 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2020/05/21 |      42621 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2020/05/21 |      50939 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2020/05/21 |    1150838 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2020/05/21 |    1286407 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2020/05/21 |      41931 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2020/05/21 |      50917 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2020/05/21 |      74457 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma
+2020/05/21 |      82295 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma
+2020/05/21 |      26752 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2020/05/21 |      29033 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2020/05/21 |      16117 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2020/05/21 |      17827 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2020/05/21 |      63165 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2020/05/21 |      69250 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2020/05/21 |     149712 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2020/05/21 |     163962 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2020/05/21 |      74810 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2020/05/21 |      84877 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2020/05/21 |      91543 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2020/05/21 |      96600 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2020/05/21 |    2555485 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2020/05/21 |    2686058 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2020/05/21 |      54978 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2020/05/21 |      61449 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2020/05/21 |      26505 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2020/05/21 |      32351 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2020/05/21 |      61700 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2020/05/21 |      65265 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2020/05/21 |     248465 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2020/05/21 |     278139 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2020/05/21 |     591010 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2020/05/21 |     630128 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2020/05/21 |      39168 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2020/05/21 |      42926 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2020/05/21 |     199878 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2020/05/21 |    1197186 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2020/05/21 |    1116254 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2020/05/21 |      13049 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2020/05/21 |      14038 | 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
-2020/05/20 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2020/05/21 |       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
@@ -272352,7 +272350,7 @@
 2008/11/07 |      35981 | systems/win32/miktex/tm/packages/prettyref.tar.lzma
 2017/07/26 |     201385 | systems/win32/miktex/tm/packages/preview.tar.lzma
 2019/06/20 |     375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
-2020/05/20 |        965 | systems/win32/miktex/tm/packages/pr.ini
+2020/05/21 |        965 | 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
@@ -273491,7 +273489,7 @@
 2020/05/16 |    4915928 | systems/win32/w32tex/aleph-w32.tar.xz
 2020/05/10 |   66192764 | systems/win32/w32tex/biblatex-biber.tar.xz
 2016/12/13 |   65971452 | systems/win32/w32tex/cbfonts.tar.xz
-2020/05/19 |     652223 | systems/win32/w32tex/ChangeLog
+2020/05/20 |     652703 | 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
@@ -273514,13 +273512,13 @@
 2020/05/16 |   41515180 | systems/win32/w32tex/latex-dev.tar.xz
 2020/04/03 |   29248268 | systems/win32/w32tex/latex.tar.xz
 2020/04/28 |     996756 | systems/win32/w32tex/lcdf-typetools-w32.tar.xz
-2020/05/11 |  392945940 | systems/win32/w32tex/ltxpkgdocs.tar.xz
-2020/05/18 |   34536284 | systems/win32/w32tex/ltxpkgs.tar.xz
+2020/05/20 |  393337096 | systems/win32/w32tex/ltxpkgdocs.tar.xz
+2020/05/20 |   34535656 | systems/win32/w32tex/ltxpkgs.tar.xz
 2020/05/18 |    3861188 | systems/win32/w32tex/luajittex-dev-w32.tar.xz
-2020/05/18 |    3817060 | systems/win32/w32tex/luajittex-exp-w32.tar.xz
+2020/05/20 |    3814284 | systems/win32/w32tex/luajittex-exp-w32.tar.xz
 2020/05/18 |    3858928 | systems/win32/w32tex/luajittex-w32.tar.xz
 2020/05/18 |   18102324 | systems/win32/w32tex/luatex-dev-w32.tar.xz
-2020/05/18 |   17920432 | systems/win32/w32tex/luatex-exp-w32.tar.xz
+2020/05/20 |   17913476 | systems/win32/w32tex/luatex-exp-w32.tar.xz
 2020/05/18 |   69194124 | systems/win32/w32tex/luatexja.tar.xz
 2020/05/18 |   17887932 | systems/win32/w32tex/luatex-w32.tar.xz
 2020/05/10 |    1663268 | systems/win32/w32tex/makeindex-w32.tar.xz
@@ -273541,7 +273539,7 @@
 2020/05/02 |  274450768 | systems/win32/w32tex/pstricks.tar.xz
 2020/04/28 |     517756 | systems/win32/w32tex/psutils-w32.tar.xz
 2020/05/18 |    6463772 | systems/win32/w32tex/ptex-ng-w32.tar.xz
-2020/05/16 |   10500812 | systems/win32/w32tex/ptex-w32.tar.xz
+2020/05/20 |   10479532 | systems/win32/w32tex/ptex-w32.tar.xz
 2020/04/10 |    1784316 | systems/win32/w32tex/qpdf-w32.tar.xz
 2019/04/15 |     499188 | systems/win32/w32tex/sam2p-w32.tar.xz
 2020/01/24 |   24929772 | systems/win32/w32tex/t1fonts.tar.xz
@@ -273582,10 +273580,10 @@
 2019/11/11 |       2568 | systems/win32/w32tex/win64/latex-dev-w64.tar.xz
 2020/04/28 |     800220 | systems/win32/w32tex/win64/lcdf-typetools-w64.tar.xz
 2020/05/18 |    3455756 | systems/win32/w32tex/win64/luajittex-dev-w64.tar.xz
-2020/05/18 |    3433424 | systems/win32/w32tex/win64/luajittex-exp-w64.tar.xz
+2020/05/20 |    3433696 | systems/win32/w32tex/win64/luajittex-exp-w64.tar.xz
 2020/05/18 |    3452916 | systems/win32/w32tex/win64/luajittex-w64.tar.xz
 2020/05/18 |    3108596 | systems/win32/w32tex/win64/luatex-dev-w64.tar.xz
-2020/05/18 |    3125888 | systems/win32/w32tex/win64/luatex-exp-w64.tar.xz
+2020/05/20 |    3126328 | systems/win32/w32tex/win64/luatex-exp-w64.tar.xz
 2020/05/18 |    3108460 | systems/win32/w32tex/win64/luatex-w64.tar.xz
 2020/05/10 |    1140264 | systems/win32/w32tex/win64/makeindex-w64.tar.xz
 2020/04/28 |     431044 | systems/win32/w32tex/win64/mftools-w64.tar.xz
@@ -273705,7 +273703,7 @@
 2004/06/04 |        404 | tds/tds.sed
 2004/06/23 |      65418 | tds/tds.tex
 2019/05/29 |     304264 | tds.zip
-2020/05/21 |        186 | timestamp
+2020/05/22 |        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 6509b25fae..babd581459 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
diff --git a/FILES.last07days b/FILES.last07days
index 717d75f8a5..5fd2244fe0 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,268 +1,336 @@
+2020/05/21 |      96600 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2020/05/21 |        965 | systems/win32/miktex/tm/packages/pr.ini
+2020/05/21 |      95264 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2020/05/21 |      94368 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2020/05/21 |      94351 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2020/05/21 |     941128 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2020/05/21 |      93574 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2020/05/21 |     932283 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2020/05/21 |      92923 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2020/05/21 |      92918 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2020/05/21 |      92144 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2020/05/21 |      91543 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2020/05/21 |      87186 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2020/05/21 |      86976 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2020/05/21 |      86704 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2020/05/21 |      84877 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2020/05/21 |      84827 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2020/05/21 |       8475 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2020/05/21 |      82915 | info/latex-veryshortguide/veryshortguide.dtx
+2020/05/21 |      82295 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma
+2020/05/21 |      81387 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2020/05/21 |      78168 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2020/05/21 |      78096 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2020/05/21 |      77909 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2020/05/21 |      77413 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2020/05/21 |     762256 | macros/latex/contrib/suftesi/suftesi.pdf
+2020/05/21 |       7505 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2020/05/21 |      74810 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2020/05/21 |      74457 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma
+2020/05/21 |      74190 | macros/latex/contrib/babel-contrib/italian/italian.dtx
+2020/05/21 |      73607 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2020/05/21 |      73060 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2020/05/21 |       7288 | info/latex-veryshortguide/README.md
+2020/05/21 |      72575 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2020/05/21 |       7204 | macros/latex/contrib/decorule/README.md
+2020/05/21 |      71647 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2020/05/21 |      71323 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2020/05/21 |      69819 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2020/05/21 |      69344 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2020/05/21 |      69250 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2020/05/21 |      69172 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2020/05/21 |      68635 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2020/05/21 |     681686 | macros/latex/contrib/suftesi/templates.zip
+2020/05/21 |      67262 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2020/05/21 |         66 | macros/latex/contrib/decorule/MANIFEST
+2020/05/21 |     669999 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2020/05/21 |      66564 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2020/05/21 |      65265 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2020/05/21 |      64577 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2020/05/21 |      63366 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2020/05/21 |      63242 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2020/05/21 |      63188 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2020/05/21 |      63165 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2020/05/21 |      63016 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2020/05/21 |     630128 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2020/05/21 |     623361 | info/latex-veryshortguide/veryshortguide-A4-imposed.pdf
+2020/05/21 |      62072 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2020/05/21 |      61713 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2020/05/21 |      61700 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2020/05/21 |     615388 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2020/05/21 |      61449 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2020/05/21 |     591010 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2020/05/21 |      58598 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2020/05/21 |      58558 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2020/05/21 |      57978 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2020/05/21 |     574787 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2020/05/21 |      57270 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2020/05/21 |      56656 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2020/05/21 |     561639 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2020/05/21 |      56004 | macros/latex/contrib/decorule/decorule.dtx
+2020/05/21 |      55803 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2020/05/21 |      54978 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2020/05/21 |     548808 | info/latex-veryshortguide.zip
+2020/05/21 |     545600 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2020/05/21 |     539210 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2020/05/21 |     535403 | systems/win32/miktex/tm/packages/files.csv.lzma
+2020/05/21 |     534816 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2020/05/21 |      52237 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2020/05/21 |      52077 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2020/05/21 |      50939 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2020/05/21 |      50917 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2020/05/21 |      50763 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2020/05/21 |     498732 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2020/05/21 |      49727 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2020/05/21 |      47995 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2020/05/21 |     468758 | macros/latex/contrib/babel-contrib/italian.zip
+2020/05/21 |     460504 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma
+2020/05/21 |      45950 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2020/05/21 |     457707 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2020/05/21 |      45695 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2020/05/21 |      45646 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2020/05/21 |      45080 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2020/05/21 |     446180 | macros/latex/contrib/babel-contrib/italian/italian.pdf
+2020/05/21 |      43424 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2020/05/21 |      42926 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2020/05/21 |      42621 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2020/05/21 |         41 | macros/latex/contrib/decorule/VERSION
+2020/05/21 |         41 | info/latex-veryshortguide/VERSION
+2020/05/21 |      41931 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2020/05/21 |     414015 | macros/latex/contrib/decorule.zip
+2020/05/21 |      41134 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2020/05/21 |      40793 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2020/05/21 |     396165 | macros/latex/contrib/decorule/decorule.pdf
+2020/05/21 |      39168 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2020/05/21 |     391508 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2020/05/21 |        371 | macros/generic/chemfig/chemfig.sty
+2020/05/21 |      36657 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2020/05/21 |      36418 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2020/05/21 |     358098 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2020/05/21 |      34938 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2020/05/21 |      34807 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2020/05/21 |     328737 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2020/05/21 |      32351 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2020/05/21 |     323364 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2020/05/21 |      32320 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2020/05/21 |      31347 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2020/05/21 |     311643 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2020/05/21 |      31150 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2020/05/21 |      30990 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2020/05/21 |      30784 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2020/05/21 |      30525 | info/latex-veryshortguide/menno-a.jpg
+2020/05/21 |      30215 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2020/05/21 |      29754 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2020/05/21 |      29322 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2020/05/21 |      29033 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2020/05/21 |      28791 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2020/05/21 |      28575 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2020/05/21 |     281650 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2020/05/21 |     281420 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2020/05/21 |     278139 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2020/05/21 |      27754 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2020/05/21 |     273337 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2020/05/21 |      26946 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2020/05/21 |    2686058 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2020/05/21 |      26752 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2020/05/21 |      26646 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2020/05/21 |      26505 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2020/05/21 |       2571 | info/latex-veryshortguide/veryshortguide.ins
+2020/05/21 |    2555485 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2020/05/21 |      25394 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2020/05/21 |     248465 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2020/05/21 |     247775 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2020/05/21 |     246433 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2020/05/21 |     242998 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2020/05/21 |      23524 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2020/05/21 |    2330082 | macros/generic/chemfig.zip
+2020/05/21 |      23006 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2020/05/21 |     222869 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2020/05/21 |       2186 | macros/latex/contrib/decorule/decorule.ins
+2020/05/21 |      20787 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2020/05/21 |     207039 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2020/05/21 |    2067960 | macros/luatex/optex.zip
+2020/05/21 |     206533 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2020/05/21 |     203218 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2020/05/21 |     202383 | macros/latex/contrib/suftesi/suftesi.dtx
+2020/05/21 |        200 | macros/generic/chemfig/t-chemfig.tex
+2020/05/21 |    2009803 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2020/05/21 |     200455 | macros/generic/chemfig/chemfig-fr.tex
+2020/05/21 |     199878 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2020/05/21 |     199843 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2020/05/21 |      19892 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2020/05/21 |     194860 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2020/05/21 |     193879 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2020/05/21 |     189235 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2020/05/21 |     186845 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2020/05/21 |     186187 | macros/generic/chemfig/chemfig-en.tex
+2020/05/21 |     185810 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2020/05/21 |     185137 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2020/05/21 |     184300 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2020/05/21 |      17827 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2020/05/21 |     177527 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2020/05/21 |      17730 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2020/05/21 |    1736495 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2020/05/21 |       1729 | macros/latex/contrib/babel-contrib/italian/README.txt
+2020/05/21 |     170202 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2020/05/21 |     169534 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2020/05/21 |     168384 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2020/05/21 |       1680 | macros/latex/contrib/suftesi/README
+2020/05/21 |     164996 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2020/05/21 |     163962 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2020/05/21 |      16117 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2020/05/21 |      15947 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2020/05/21 |     152147 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2020/05/21 |     150094 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2020/05/21 |     149712 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2020/05/21 |    1492577 | install/macros/latex/contrib/suftesi.tds.zip
+2020/05/21 |     148865 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2020/05/21 |    1476771 | macros/latex/contrib/suftesi.zip
+2020/05/21 |        142 | info/latex-veryshortguide/MANIFEST
+2020/05/21 |      14038 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2020/05/21 |    1388764 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2020/05/21 |     137121 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2020/05/21 |     134527 | info/latex-veryshortguide/veryshortguide.pdf
+2020/05/21 |     133092 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2020/05/21 |      13049 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2020/05/21 |     130481 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2020/05/21 |    1286407 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2020/05/21 |    1257175 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2020/05/21 |     119994 | macros/generic/chemfig/chemfig.tex
+2020/05/21 |    1197186 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2020/05/21 |    1196820 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2020/05/21 |     116879 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2020/05/21 |     115756 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2020/05/21 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2020/05/21 |    1150838 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2020/05/21 |       1125 | macros/generic/chemfig/README
+2020/05/21 |    1116254 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2020/05/21 |    1116252 | macros/generic/chemfig/chemfig-fr.pdf
+2020/05/21 |    1115755 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2020/05/21 |     110962 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2020/05/21 |     110121 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2020/05/21 |     108821 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2020/05/21 |    1088180 | macros/generic/chemfig/chemfig-en.pdf
+2020/05/21 |    1049745 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2020/05/21 |    1042741 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2020/05/21 |     102530 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2020/05/21 |     100563 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
 2020/05/20 |      99111 | systems/win32/miktex/tm/packages/helmholtz-ellis-ji-notation.tar.lzma
-2020/05/20 |      96602 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2020/05/20 |        965 | systems/win32/miktex/tm/packages/pr.ini
-2020/05/20 |      95266 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2020/05/20 |      94370 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2020/05/20 |      94351 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2020/05/20 |     941127 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2020/05/20 |      93575 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2020/05/20 |     932280 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2020/05/20 |      92922 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2020/05/20 |      92919 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2020/05/20 |      92143 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2020/05/20 |       9854 | macros/luatex/optex/base/if-macros.opm
+2020/05/20 |      96464 | systems/texlive/tlnet/archive/toptesi.source.r55220.tar.xz
 2020/05/20 |       9174 | macros/latex/contrib/toptesi/README.txt
 2020/05/20 |      91743 | macros/xetex/latex/xepersian-hm/kashida-glyph-example.pdf
-2020/05/20 |      91545 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
 2020/05/20 |      90701 | macros/xetex/latex/xepersian-hm/kashida-hrule-example.pdf
-2020/05/20 |      87188 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2020/05/20 |      86978 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2020/05/20 |      86705 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2020/05/20 |     867632 | systems/texlive/tlnet/archive/tex4ht.r55223.tar.xz
+2020/05/20 |       8640 | systems/texlive/tlnet/archive/ptex2pdf.doc.r55219.tar.xz
 2020/05/20 |        859 | macros/xetex/latex/xepersian-hm/README.txt
-2020/05/20 |      84877 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2020/05/20 |      84828 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2020/05/20 |       8476 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
 2020/05/20 |    8394106 | macros/latex/contrib/toptesi.zip
-2020/05/20 |      82295 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma
 2020/05/20 |       8201 | support/classpack/README.md
-2020/05/20 |      81386 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
 2020/05/20 |      78693 | macros/xetex/latex/xepersian-hm/kashida-xep-XB-example.pdf
 2020/05/20 |      78536 | systems/texlive/tlnet/archive/helmholtz-ellis-ji-notation.doc.r55213.tar.xz
-2020/05/20 |      78170 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2020/05/20 |      78094 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2020/05/20 |      77909 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2020/05/20 |      77413 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2020/05/20 |       7832 | systems/texlive/tlnet/archive/ptex2pdf.r55219.tar.xz
+2020/05/20 |      77091 | macros/luatex/optex/doc/optex-userdoc.tex
 2020/05/20 |      76926 | macros/luatex/latex/cloze/cloze.dtx
 2020/05/20 |     767306 | macros/xetex/latex/xepersian-hm.zip
-2020/05/20 |       7505 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2020/05/20 |      74811 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2020/05/20 |      74460 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma
 2020/05/20 |       7369 | graphics/euflag/README.md
-2020/05/20 |      73609 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2020/05/20 |      73062 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2020/05/20 |      72577 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2020/05/20 |      71649 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2020/05/20 |      71324 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
 2020/05/20 |         69 | support/classpack/MANIFEST
-2020/05/20 |      69820 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2020/05/20 |      69345 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2020/05/20 |      69252 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2020/05/20 |      69172 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
 2020/05/20 |      69146 | support/classpack/classpack.dtx
 2020/05/20 |      69077 | systems/win32/miktex/tm/packages/plantuml.tar.lzma
-2020/05/20 |      68635 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2020/05/20 |      67263 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2020/05/20 |     670000 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2020/05/20 |      66563 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
 2020/05/20 |      66536 | systems/texlive/tlnet/archive/plantuml.doc.r55214.tar.xz
 2020/05/20 |       6622 | language/japanese/ptex2pdf/README.md
 2020/05/20 |      65545 | macros/xetex/latex/xepersian-hm/doc-samples-xep.pdf
-2020/05/20 |      65266 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2020/05/20 |     652703 | systems/win32/w32tex/ChangeLog
 2020/05/20 |    6503156 | systems/win32/miktex/tm/packages/newtx.tar.lzma
-2020/05/20 |      64578 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
 2020/05/20 |      63436 | macros/xetex/latex/xepersian-hm/doc-samples-glyph.pdf
-2020/05/20 |      63367 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2020/05/20 |      63245 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2020/05/20 |      63188 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2020/05/20 |      63166 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2020/05/20 |      63015 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2020/05/20 |     630128 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2020/05/20 |    6315844 | systems/texlive/tlnet/archive/toptesi.doc.r55220.tar.xz
 2020/05/20 |      62967 | macros/xetex/latex/xepersian-hm/doc-samples-hrule.pdf
-2020/05/20 |      62074 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2020/05/20 |      61713 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2020/05/20 |      61700 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2020/05/20 |     615390 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2020/05/20 |      61451 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
 2020/05/20 |       6144 | systems/texlive/tlnet/archive/parskip.source.r55212.tar.xz
+2020/05/20 |      61192 | systems/texlive/tlnet/archive/tex4ht.doc.r55223.tar.xz
+2020/05/20 |       6100 | systems/texlive/tlnet/archive/xepersian-hm.source.r55222.tar.xz
 2020/05/20 |         60 | graphics/euflag/MANIFEST
 2020/05/20 |      60334 | graphics/euflag/euflag.dtx
-2020/05/20 |     591010 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2020/05/20 |      58598 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2020/05/20 |      58558 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
 2020/05/20 |      58016 | macros/xetex/latex/xepersian-hm/xepersian-hm.pdf
-2020/05/20 |      57980 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2020/05/20 |     574786 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2020/05/20 |      57270 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2020/05/20 |      56655 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2020/05/20 |     561638 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2020/05/20 |      55803 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2020/05/20 |    5500520 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2020/05/20 |      54978 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2020/05/20 |     545600 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2020/05/20 |     539212 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2020/05/20 |     535403 | systems/win32/miktex/tm/packages/files.csv.lzma
-2020/05/20 |     534816 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2020/05/20 |      52239 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2020/05/20 |      52077 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2020/05/20 |      50939 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2020/05/20 |      50918 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2020/05/20 |      50764 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2020/05/20 |     498732 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2020/05/20 |      49729 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2020/05/20 |    5500512 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2020/05/20 |       5076 | systems/texlive/tlnet/archive/xepersian-hm.r55222.tar.xz
+2020/05/20 |       5004 | systems/texlive/tlnet/archive/cloze.r55221.tar.xz
 2020/05/20 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2020/05/20 |      47996 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2020/05/20 |     460504 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma
-2020/05/20 |      45952 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2020/05/20 |     457707 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2020/05/20 |      45696 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2020/05/20 |      45646 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2020/05/20 |     479288 | systems/texlive/tlnet/archive/xepersian-hm.doc.r55222.tar.xz
 2020/05/20 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
 2020/05/20 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
 2020/05/20 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
 2020/05/20 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
-2020/05/20 |      45081 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2020/05/20 |      43426 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2020/05/20 |      42926 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2020/05/20 |      42621 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
 2020/05/20 |       4244 | systems/texlive/tlnet/archive/helmholtz-ellis-ji-notation.source.r55213.tar.xz
 2020/05/20 |         41 | support/classpack/VERSION
 2020/05/20 |         41 | graphics/euflag/VERSION
-2020/05/20 |      41931 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2020/05/20 |      41134 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2020/05/20 |      40793 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
 2020/05/20 |    3988491 | systems/win32/miktex/tm/packages/l3experimental.tar.lzma
-2020/05/20 |      39168 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2020/05/20 |     391509 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2020/05/20 |  393337096 | systems/win32/w32tex/ltxpkgdocs.tar.xz
+2020/05/20 |        392 | systems/texlive/tlnet/archive/texlive-docindex.r55216.tar.xz
+2020/05/20 |    3814284 | systems/win32/w32tex/luajittex-exp-w32.tar.xz
 2020/05/20 |       3691 | macros/xetex/latex/xepersian-hm/kashida-glyph-example.tex
-2020/05/20 |      36658 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
 2020/05/20 |       3647 | macros/xetex/latex/xepersian-hm/kashida-hrule-example.tex
-2020/05/20 |      36418 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2020/05/20 |     358101 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
 2020/05/20 |    3528482 | systems/win32/miktex/tm/packages/luatexja.tar.lzma
-2020/05/20 |      34939 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2020/05/20 |      34807 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2020/05/20 |     328738 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2020/05/20 |      32351 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2020/05/20 |     323367 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2020/05/20 |      32321 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2020/05/20 |   34535656 | systems/win32/w32tex/ltxpkgs.tar.xz
+2020/05/20 |    3433696 | systems/win32/w32tex/win64/luajittex-exp-w64.tar.xz
 2020/05/20 |     321743 | systems/win32/miktex/tm/packages/parskip.tar.lzma
-2020/05/20 |      31349 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2020/05/20 |    3126328 | systems/win32/w32tex/win64/luatex-exp-w64.tar.xz
 2020/05/20 |     312628 | systems/texlive/tlnet/archive/parskip.doc.r55212.tar.xz
-2020/05/20 |     311645 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2020/05/20 |      31151 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2020/05/20 |      30991 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2020/05/20 |      30785 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2020/05/20 |      30215 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2020/05/20 |      29755 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2020/05/20 |      29323 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2020/05/20 |      29035 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2020/05/20 |      28793 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2020/05/20 |      28575 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2020/05/20 |       2950 | macros/luatex/optex/README
 2020/05/20 |       2852 | systems/texlive/tlnet/archive/parskip.r55212.tar.xz
-2020/05/20 |     281648 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2020/05/20 |     281420 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2020/05/20 |     278139 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2020/05/20 |      27753 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2020/05/20 |     273336 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2020/05/20 |      26947 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2020/05/20 |    2686056 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
 2020/05/20 |      26760 | macros/xetex/latex/xepersian-hm/xepersian-hm.dtx
-2020/05/20 |      26752 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2020/05/20 |      26646 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2020/05/20 |      26504 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
 2020/05/20 |     264837 | macros/xetex/latex/xepersian-hm/xepersian-hm-doc.pdf
 2020/05/20 |     259293 | macros/luatex/latex/cloze.zip
 2020/05/20 |     257712 | macros/luatex/latex/cloze/cloze.pdf
-2020/05/20 |    2555485 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2020/05/20 |      25393 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2020/05/20 |     248465 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2020/05/20 |     247776 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2020/05/20 |     246433 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2020/05/20 |     242999 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
 2020/05/20 |   24269851 | systems/texlive/tlnet/install-tl.zip
-2020/05/20 |      23525 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2020/05/20 |      23005 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2020/05/20 |     242292 | systems/texlive/tlnet/archive/cloze.doc.r55221.tar.xz
+2020/05/20 |      24027 | macros/luatex/optex/base/parameters.opm
+2020/05/20 |       2292 | systems/texlive/tlnet/archive/classpack.r55218.tar.xz
 2020/05/20 |       2244 | macros/luatex/latex/cloze/cloze.ins
 2020/05/20 |    2240228 | systems/win32/miktex/tm/packages/newcomputermodern.tar.lzma
-2020/05/20 |     222870 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
 2020/05/20 |       2206 | support/classpack/classpack.ins
 2020/05/20 |       2204 | systems/texlive/tlnet/archive/plantuml.r55214.tar.xz
-2020/05/20 |    2202288 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2020/05/20 |    2202452 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
 2020/05/20 |       2183 | graphics/euflag/euflag.ins
-2020/05/20 |      20787 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2020/05/20 |     207039 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2020/05/20 |     206534 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2020/05/20 |     203216 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2020/05/20 |      21738 | macros/luatex/optex/base/table.opm
+2020/05/20 |      21084 | systems/texlive/tlnet/archive/classpack.source.r55218.tar.xz
+2020/05/20 |      20384 | systems/texlive/tlnet/archive/toptesi.r55220.tar.xz
 2020/05/20 |    2028082 | systems/win32/miktex/tm/packages/miktex-luatex-bin-x64-2.9.tar.lzma
 2020/05/20 |    2014922 | systems/win32/miktex/tm/packages/newpx.tar.lzma
-2020/05/20 |    2009804 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2020/05/20 |     199905 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2020/05/20 |     199901 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2020/05/20 |      19891 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2020/05/20 |     194862 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2020/05/20 |     193878 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
 2020/05/20 |   19380339 | systems/texlive/tlnet/install-tl-windows.exe
 2020/05/20 |       1937 | macros/xetex/latex/xepersian-hm/xepersian-hm.ins
-2020/05/20 |     189235 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2020/05/20 |     186845 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2020/05/20 |     185809 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2020/05/20 |     185138 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2020/05/20 |     184301 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
 2020/05/20 |      18092 | language/japanese/ptex2pdf/COPYING
-2020/05/20 |      17827 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2020/05/20 |     177526 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2020/05/20 |      17730 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2020/05/20 |   17913476 | systems/win32/w32tex/luatex-exp-w32.tar.xz
 2020/05/20 |    1750602 | systems/win32/miktex/tm/packages/miktex-luatex-bin-2.9.tar.lzma
-2020/05/20 |    1736493 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2020/05/20 |     170202 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2020/05/20 |     169537 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2020/05/20 |      17268 | systems/texlive/tlnet/archive/cloze.source.r55221.tar.xz
 2020/05/20 |      16848 | systems/texlive/tlnet/archive/helmholtz-ellis-ji-notation.r55213.tar.xz
-2020/05/20 |     168385 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
 2020/05/20 |     166549 | support/classpack.zip
-2020/05/20 |     164997 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2020/05/20 |   16444311 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2020/05/20 |     163962 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2020/05/20 |      16118 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2020/05/20 |      15946 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2020/05/20 |   16444044 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2020/05/20 |     162208 | systems/texlive/tlnet/archive/texlive-docindex.doc.r55216.tar.xz
 2020/05/20 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
 2020/05/20 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2020/05/20 |     152146 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2020/05/20 |     150094 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2020/05/20 |     149713 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2020/05/20 |     148866 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
 2020/05/20 |     148774 | support/classpack/classpack.pdf
 2020/05/20 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
 2020/05/20 |       1459 | macros/xetex/latex/xepersian-hm/kashida-xep-XB-example.tex
 2020/05/20 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2020/05/20 |     143968 | systems/texlive/tlnet/archive/classpack.doc.r55218.tar.xz
 2020/05/20 |      14356 | language/japanese/ptex2pdf.zip
 2020/05/20 |       1428 | systems/texlive/tlnet/archive/collection-mathscience.r55213.tar.xz
 2020/05/20 |     141272 | systems/texlive/tlnet/archive/texlive-msg-translations.r55211.tar.xz
 2020/05/20 |      14066 | language/japanese/ptex2pdf/ptex2pdf.lua
-2020/05/20 |      14038 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
-2020/05/20 |    1388764 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2020/05/20 |     137121 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
 2020/05/20 |       1349 | macros/luatex/latex/cloze/README
-2020/05/20 |     133092 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
 2020/05/20 |      13119 | macros/xetex/latex/xepersian-hm/doc-ligature-xephm.pdf
-2020/05/20 |      13050 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2020/05/20 |     130481 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
 2020/05/20 |    1286773 | systems/win32/miktex/tm/packages/miktex-runtime-bin-x64-2.9.tar.lzma
-2020/05/20 |    1286408 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2020/05/20 |    1257175 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
 2020/05/20 |     124484 | graphics/euflag.zip
 2020/05/20 |      12376 | macros/xetex/latex/xepersian-hm/xepersian-hm-doc.ltx
-2020/05/20 |    1196545 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2020/05/20 |    1196353 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2020/05/20 |     116882 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2020/05/20 |     115755 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2020/05/20 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
-2020/05/20 |    1150838 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2020/05/20 |    1206961 | macros/luatex/optex/doc/optex-doc.pdf
 2020/05/20 |    1150804 | systems/win32/miktex/tm/packages/miktex-runtime-bin-2.9.tar.lzma
-2020/05/20 |    1117169 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2020/05/20 |    1116130 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2020/05/20 |     110965 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2020/05/20 |     110121 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
 2020/05/20 |       1097 | macros/xetex/latex/xepersian-hm/INSTALL.txt
-2020/05/20 |     108823 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
 2020/05/20 |     106973 | graphics/euflag/euflag.pdf
-2020/05/20 |    1049744 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2020/05/20 |    1042743 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2020/05/20 |     102531 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2020/05/20 |   10479532 | systems/win32/w32tex/ptex-w32.tar.xz
 2020/05/20 |      10115 | macros/xetex/latex/xepersian-hm/doc-ligature-xep.pdf
-2020/05/20 |     100562 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
 2020/05/19 |      80047 | fonts/helmholtz-ellis-ji-notation/helmholtz-ellis-ji-notation.pdf
 2020/05/19 |      70541 | macros/luatex/latex/plantuml.zip
 2020/05/19 |      69754 | systems/win32/miktex/tm/packages/miktex-bibtex-bin-x64-2.9.tar.lzma
-2020/05/19 |     652223 | systems/win32/w32tex/ChangeLog
+2020/05/19 |       6809 | macros/luatex/optex/doc/optex-techdoc.tex
 2020/05/19 |        636 | macros/luatex/latex/plantuml/example-component-diagram.tex
 2020/05/19 |      62236 | systems/win32/miktex/tm/packages/miktex-bibtex-bin-2.9.tar.lzma
 2020/05/19 |        572 | macros/luatex/latex/plantuml/example-class-relations--svg.tex
@@ -312,7 +380,6 @@
 2020/05/18 |      87165 | systems/texlive/tlnet/tlpkg/translations/uk.po
 2020/05/18 |      87098 | systems/texlive/tlnet/tlpkg/translations/cs.po
 2020/05/18 |      86973 | fonts/newcomputermodern/newcomputermodern-sample.pdf
-2020/05/18 |     867336 | systems/texlive/tlnet/archive/tex4ht.r55208.tar.xz
 2020/05/18 |      86136 | systems/texlive/tlnet/tlpkg/translations/es.po
 2020/05/18 |      85180 | systems/texlive/tlnet/archive/l3experimental.source.r55205.tar.xz
 2020/05/18 |       8508 | systems/texlive/tlnet/archive/context-vim.r55204.tar.xz
@@ -345,7 +412,6 @@
 2020/05/18 |     625771 | macros/latex/contrib/l3experimental/l3draw-code.pdf
 2020/05/18 |      62084 | systems/texlive/tlnet/archive/lua-uni-algos.doc.r55206.tar.xz
 2020/05/18 |       6184 | macros/latex/contrib/l3experimental/l3draw-state.dtx
-2020/05/18 |      61192 | systems/texlive/tlnet/archive/tex4ht.doc.r55208.tar.xz
 2020/05/18 |       6096 | systems/texlive/tlnet/archive/collection-latexextra.r55190.tar.xz
 2020/05/18 |         58 | systems/mac/mactex/MacTeXtras-20200518.zip.md5
 2020/05/18 |      58685 | systems/texlive/tlnet/tlpkg/translations/messages.pot
@@ -353,9 +419,11 @@
 2020/05/18 |      58435 | macros/latex/contrib/l3experimental/xgalley.dtx
 2020/05/18 |        580 | fonts/newtx/vf/ntxbexa.vf
 2020/05/18 |        576 | fonts/newtx/vf/ntxexa.vf
+2020/05/18 |        569 | macros/luatex/optex/demo/op-letter-en.tex
 2020/05/18 |       5667 | macros/latex/contrib/l3experimental/l3draw-layers.dtx
 2020/05/18 |    5577652 | systems/texlive/tlnet/archive/newtx.r55202.tar.xz
 2020/05/18 |        548 | fonts/newpx/vf/zplbexa.vf
+2020/05/18 |       5483 | macros/luatex/optex/base/languages.opm
 2020/05/18 |        544 | fonts/newpx/vf/zplexa.vf
 2020/05/18 |       5384 | systems/texlive/tlnet/archive/lua-uni-algos.r55206.tar.xz
 2020/05/18 |     533068 | fonts/newcomputermodern/NewCMMono10-BoldOblique.otf
@@ -375,14 +443,12 @@
 2020/05/18 |      42831 | macros/pdftex/mptopdf/tex/context/base/mkii/supp-mpe.mkii
 2020/05/18 |      41372 | macros/latex/contrib/l3experimental/l3draw.dtx
 2020/05/18 |    3975524 | systems/win32/miktex/tm/packages/bidi.tar.lzma
-2020/05/18 |        388 | systems/texlive/tlnet/archive/texlive-docindex.r55196.tar.xz
 2020/05/18 |    3875956 | systems/texlive/tlnet/archive/l3experimental.doc.r55205.tar.xz
 2020/05/18 |     386128 | macros/latex/contrib/l3experimental/l3galley.pdf
 2020/05/18 |    3861188 | systems/win32/w32tex/luajittex-dev-w32.tar.xz
 2020/05/18 |    3858928 | systems/win32/w32tex/luajittex-w32.tar.xz
 2020/05/18 |       3852 | macros/latex/contrib/l3experimental/CHANGELOG.md
 2020/05/18 |    3837359 | macros/luatex/generic/luatexja.zip
-2020/05/18 |    3817060 | systems/win32/w32tex/luajittex-exp-w32.tar.xz
 2020/05/18 |      38013 | systems/mac/mactex/ExtrasFolder.pdf
 2020/05/18 |  373922309 | systems/mac/mactex/MacTeXtras-20200518.zip
 2020/05/18 |    3737268 | systems/texlive/tlnet/archive/bidi.doc.r55193.tar.xz
@@ -396,10 +462,8 @@
 2020/05/18 |     350289 | macros/latex/contrib/l3experimental/l3color.pdf
 2020/05/18 |      34924 | fonts/newtx/README
 2020/05/18 |    3455756 | systems/win32/w32tex/win64/luajittex-dev-w64.tar.xz
-2020/05/18 |   34536284 | systems/win32/w32tex/ltxpkgs.tar.xz
 2020/05/18 |    3452916 | systems/win32/w32tex/win64/luajittex-w64.tar.xz
 2020/05/18 |     345275 | macros/latex/contrib/l3experimental/l3str-format.pdf
-2020/05/18 |    3433424 | systems/win32/w32tex/win64/luajittex-exp-w64.tar.xz
 2020/05/18 |     337933 | macros/latex/contrib/l3experimental/l3cctab.pdf
 2020/05/18 |    3261120 | systems/texlive/tlnet/archive/luatexja.doc.r55207.tar.xz
 2020/05/18 |      32522 | macros/latex/contrib/l3experimental/l3draw-paths.dtx
@@ -407,7 +471,6 @@
 2020/05/18 |    3176514 | fonts/newcomputermodern.zip
 2020/05/18 |     314627 | macros/latex/contrib/l3experimental/l3benchmark.pdf
 2020/05/18 |      31359 | macros/latex/contrib/l3experimental/l3draw-points.dtx
-2020/05/18 |    3125888 | systems/win32/w32tex/win64/luatex-exp-w64.tar.xz
 2020/05/18 |     312114 | macros/latex/contrib/l3experimental/l3sys-shell.pdf
 2020/05/18 |    3108596 | systems/win32/w32tex/win64/luatex-dev-w64.tar.xz
 2020/05/18 |    3108460 | systems/win32/w32tex/win64/luatex-w64.tar.xz
@@ -440,7 +503,6 @@
 2020/05/18 |     182528 | systems/texlive/tlnet/archive/luatexja.r55207.tar.xz
 2020/05/18 |   18102324 | systems/win32/w32tex/luatex-dev-w32.tar.xz
 2020/05/18 |      17934 | macros/latex/contrib/l3experimental/l3cctab.dtx
-2020/05/18 |   17920432 | systems/win32/w32tex/luatex-exp-w32.tar.xz
 2020/05/18 |   17887932 | systems/win32/w32tex/luatex-w32.tar.xz
 2020/05/18 |      17815 | macros/latex/contrib/l3experimental/l3benchmark.dtx
 2020/05/18 |       1780 | systems/mac/mactex/Licenses.txt
@@ -451,7 +513,6 @@
 2020/05/18 |      16674 | fonts/newpx/README
 2020/05/18 |     166356 | systems/texlive/tlnet/archive/readablecv.doc.r55190.tar.xz
 2020/05/18 |       1630 | macros/latex/contrib/l3experimental/xgalley.ins
-2020/05/18 |     162124 | systems/texlive/tlnet/archive/texlive-docindex.doc.r55196.tar.xz
 2020/05/18 |       1600 | fonts/newpx/tfm/zplbsym.tfm
 2020/05/18 |       1596 | fonts/newtx/tfm/ntxbsym.tfm
 2020/05/18 |       1575 | macros/latex/contrib/l3experimental/xcoffins.ins
@@ -475,6 +536,7 @@
 2020/05/18 |     132476 | systems/texlive/tlnet/archive/texlive-scripts.r55199.tar.xz
 2020/05/18 |     124664 | systems/texlive/tlnet/archive/glossaries-nynorsk.doc.r55189.tar.xz
 2020/05/18 |     123452 | systems/texlive/tlnet/archive/circuitikz.r55203.tar.xz
+2020/05/18 |       1188 | macros/luatex/optex/demo/op-letter-cs.tex
 2020/05/18 |    1175333 | systems/win32/miktex/tm/packages/circuitikz.tar.lzma
 2020/05/18 |     116328 | systems/texlive/tlnet/archive/bidi.r55193.tar.xz
 2020/05/18 |      11409 | macros/latex/contrib/l3experimental/l3sys-shell.dtx
@@ -490,14 +552,17 @@
 2020/05/18 |       1040 | fonts/newpx/tfm/zplbsyc.tfm
 2020/05/18 |       1028 | fonts/newtx/tfm/ntxsyc.tfm
 2020/05/18 |       1028 | fonts/newpx/tfm/zplsyc.tfm
+2020/05/17 |       9867 | macros/luatex/optex/base/doc.opm
 2020/05/17 |      98036 | systems/texlive/tlnet/archive/hyperref.r55161.tar.xz
 2020/05/17 |     978781 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
 2020/05/17 |      97107 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
 2020/05/17 |      96537 | systems/win32/miktex/tm/packages/miktex-texware-bin-x64-2.9.tar.lzma
+2020/05/17 |       9526 | macros/luatex/optex/base/hi-syntax.opm
 2020/05/17 |      95225 | systems/win32/miktex/tm/packages/miktex-epstopdf-bin-2.9.tar.lzma
 2020/05/17 |      94289 | systems/win32/miktex/tm/packages/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
 2020/05/17 |      94175 | systems/win32/miktex/tm/packages/miktex-gregorio-bin-2.9.tar.lzma
 2020/05/17 |     940583 | systems/win32/miktex/tm/packages/miktex-asymptote-bin-2.9.tar.lzma
+2020/05/17 |       9400 | macros/luatex/optex/base/math-preload.opm
 2020/05/17 |       9395 | macros/context/contrib/context-vim/tex/context/third/vim/t-vim.tex
 2020/05/17 |        938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex
 2020/05/17 |      93605 | systems/win32/miktex/tm/packages/miktex-lua53-bin-2.9.tar.lzma
@@ -509,11 +574,13 @@
 2020/05/17 |      91483 | systems/win32/miktex/tm/packages/miktex-texware-bin-2.9.tar.lzma
 2020/05/17 |        896 | macros/luatex/generic/luatexja/tool/otf-KozMinPr6N-Regular.txt
 2020/05/17 |       8919 | macros/luatex/generic/luatexja/src/ltj-otf.lua
+2020/05/17 |       8900 | macros/luatex/optex/demo/op-slides.tex
 2020/05/17 |      87171 | systems/win32/miktex/tm/packages/miktex-png-bin-x64-2.9.tar.lzma
 2020/05/17 |       8715 | macros/luatex/generic/lua-uni-algos/lua-uni-normalize.lua
 2020/05/17 |      86854 | systems/win32/miktex/tm/packages/miktex-mfware-bin-2.9.tar.lzma
 2020/05/17 |      86726 | systems/win32/miktex/tm/packages/miktex-mkfntmap-bin-x64-2.9.tar.lzma
 2020/05/17 |      86400 | systems/texlive/tlnet/archive/ctex.source.r55162.tar.xz
+2020/05/17 |       8625 | macros/luatex/optex/base/hyphen-lan.opm
 2020/05/17 |       8607 | macros/luatex/generic/luatexja/src/ltjltxdoc.dtx
 2020/05/17 |      86000 | systems/texlive/tlnet/archive/garamond-libre.doc.r55166.tar.xz
 2020/05/17 |       8550 | macros/context/contrib/context-vim/tex/context/third/vim/t-syntax-highlight.mkii
@@ -571,6 +638,7 @@
 2020/05/17 |        664 | systems/texlive/tlnet/archive/collection-luatex.r55158.tar.xz
 2020/05/17 |      66485 | systems/win32/miktex/tm/packages/miktex-arctrl-bin-x64-2.9.tar.lzma
 2020/05/17 |      65208 | systems/win32/miktex/tm/packages/miktex-web-bin-x64-2.9.tar.lzma
+2020/05/17 |       6492 | macros/luatex/optex/base/bib-simple.opm
 2020/05/17 |      64594 | systems/win32/miktex/tm/packages/miktex-gsf2pk-bin-x64-2.9.tar.lzma
 2020/05/17 |      63289 | systems/win32/miktex/tm/packages/miktex-ps2pk-bin-2.9.tar.lzma
 2020/05/17 |      63257 | systems/win32/miktex/tm/packages/miktex-graphite2-bin-2.9.tar.lzma
@@ -579,6 +647,7 @@
 2020/05/17 |      63000 | systems/win32/miktex/tm/packages/miktex-mthelp-bin-x64-2.9.tar.lzma
 2020/05/17 |     629596 | systems/win32/miktex/tm/packages/miktex-yap-bin-x64-2.9.tar.lzma
 2020/05/17 |        623 | macros/latex/contrib/exercises/README.md
+2020/05/17 |      62385 | macros/luatex/optex/demo/op-slides-bg.png
 2020/05/17 |        617 | macros/luatex/generic/luatexja/src/patches/lltjp-array.sty
 2020/05/17 |      61715 | systems/win32/miktex/tm/packages/miktex-fmt-bin-x64-2.9.tar.lzma
 2020/05/17 |      61698 | systems/win32/miktex/tm/packages/miktex-web-bin-2.9.tar.lzma
@@ -590,6 +659,7 @@
 2020/05/17 |      60487 | macros/luatex/generic/lua-uni-algos/lua-uni-algos.pdf
 2020/05/17 |       6047 | macros/luatex/generic/luatexja/src/patches/lltjdefs.sty
 2020/05/17 |        596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-linuxmusl.r55172.tar.xz
+2020/05/17 |       5935 | macros/luatex/optex/base/alloc.opm
 2020/05/17 |        592 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-solaris.r55172.tar.xz
 2020/05/17 |        592 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-linux.r55172.tar.xz
 2020/05/17 |        592 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r55172.tar.xz
@@ -615,6 +685,7 @@
 2020/05/17 |       5681 | macros/luatex/generic/luatexja/src/patches/lltjp-tascmac.sty
 2020/05/17 |      56650 | systems/win32/miktex/tm/packages/miktex-fmt-bin-2.9.tar.lzma
 2020/05/17 |     560711 | systems/win32/miktex/tm/packages/miktex-libressl-bin-x64-2.9.tar.lzma
+2020/05/17 |       5575 | macros/luatex/optex/base/ref-file.opm
 2020/05/17 |      55699 | systems/win32/miktex/tm/packages/miktex-mthelp-bin-2.9.tar.lzma
 2020/05/17 |        551 | macros/luatex/generic/luatexja/tool/jfm-readable.rb
 2020/05/17 |      55024 | systems/win32/miktex/tm/packages/miktex-ttf2pk2-bin-2.9.tar.lzma
@@ -627,6 +698,7 @@
 2020/05/17 |      52192 | systems/win32/miktex/tm/packages/miktex-m-tx-bin-x64-2.9.tar.lzma
 2020/05/17 |      51978 | systems/win32/miktex/tm/packages/miktex-cweb-bin-2.9.tar.lzma
 2020/05/17 |     514092 | macros/luatex/generic/luatexja/doc/luatexja.dtx
+2020/05/17 |       5120 | macros/luatex/optex/base/fams-ini.opm
 2020/05/17 |     510096 | systems/win32/miktex/doc/2.9/miktex.pdf
 2020/05/17 |      50928 | systems/win32/miktex/tm/packages/miktex-synctex-bin-x64-2.9.tar.lzma
 2020/05/17 |      50894 | systems/win32/miktex/tm/packages/miktex-psutils-bin-x64-2.9.tar.lzma
@@ -667,14 +739,17 @@
 2020/05/17 |      41107 | systems/win32/miktex/tm/packages/miktex-dvicopy-bin-2.9.tar.lzma
 2020/05/17 |       4093 | macros/luatex/generic/luatexja/src/ltj-compat.lua
 2020/05/17 |       4071 | macros/context/contrib/context-vim/tex/context/third/vim/t-syntax-groups.tex
+2020/05/17 |      40652 | macros/luatex/optex/base/math-macros.opm
 2020/05/17 |      40525 | systems/win32/miktex/tm/packages/miktex-dvipng-bin-2.9.tar.lzma
 2020/05/17 |     403539 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty
 2020/05/17 |     393856 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty
 2020/05/17 |    3937538 | macros/xetex/latex/bidi.zip
+2020/05/17 |       3927 | macros/luatex/optex/base/optex.ini
 2020/05/17 |     392691 | macros/luatex/generic/luatexja/doc/ltjclasses.pdf
 2020/05/17 |      39207 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
 2020/05/17 |     391653 | systems/win32/miktex/tm/packages/miktex-cairo-bin-x64-2.9.tar.lzma
 2020/05/17 |      38984 | systems/texlive/tlnet/tlpkg/TeXLive/TLWinGoo.pm
+2020/05/17 |       3889 | macros/luatex/optex/doc/optex-doc.tex
 2020/05/17 |      38750 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
 2020/05/17 |      38608 | macros/luatex/generic/luatexja/doc/luatexja-ruby.tex
 2020/05/17 |        385 | macros/luatex/generic/luatexja/src/ltjsclasses.ins
@@ -692,6 +767,7 @@
 2020/05/17 |     358290 | systems/win32/miktex/tm/packages/miktex-pdftex-bin-x64-2.9.tar.lzma
 2020/05/17 |        355 | macros/luatex/generic/luatexja/tool/otf-AdobeMingStd-Light.txt
 2020/05/17 |        355 | macros/luatex/generic/luatexja/doc/luatexja.ins
+2020/05/17 |      35186 | macros/luatex/optex/base/bib-iso690.opm
 2020/05/17 |      34903 | systems/win32/miktex/tm/packages/miktex-axohelp-bin-x64-2.9.tar.lzma
 2020/05/17 |      34805 | systems/win32/miktex/tm/packages/miktex-mspack-bin-x64-2.9.tar.lzma
 2020/05/17 |      33991 | macros/latex/contrib/exercises/exercises.dtx
@@ -699,6 +775,7 @@
 2020/05/17 |      33458 | macros/luatex/generic/luatexja/src/addons/luatexja-ajmacros.sty
 2020/05/17 |       3311 | macros/luatex/generic/luatexja/tool/ltj-unicode-ccfix_make2.pl
 2020/05/17 |    3311500 | systems/texlive/tlnet/archive/hyperref.doc.r55161.tar.xz
+2020/05/17 |       3291 | macros/luatex/optex/base/others.opm
 2020/05/17 |     328787 | systems/win32/miktex/tm/packages/miktex-cairo-bin-2.9.tar.lzma
 2020/05/17 |        326 | macros/luatex/generic/luatexja/tool/otf-AdobeMyungjoStd-Medium.txt
 2020/05/17 |     324251 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
@@ -734,6 +811,7 @@
 2020/05/17 |        280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex
 2020/05/17 |      27831 | systems/win32/miktex/tm/packages/miktex-lacheck-bin-2.9.tar.lzma
 2020/05/17 |     278244 | systems/win32/miktex/tm/packages/miktex-xetex-bin-x64-2.9.tar.lzma
+2020/05/17 |       2762 | macros/luatex/optex/base/hisyntax-c.opm
 2020/05/17 |     273119 | systems/win32/miktex/tm/packages/miktex-dvipdfmx-bin-2.9.tar.lzma
 2020/05/17 |      27028 | systems/win32/miktex/tm/packages/miktex-makeindex-bin-2.9.tar.lzma
 2020/05/17 |    2687457 | systems/win32/miktex/tm/packages/miktex-texworks-bin-x64-2.9.tar.lzma
@@ -794,6 +872,7 @@
 2020/05/17 |      18950 | macros/luatex/generic/luatexja/src/ltj-adjust.lua
 2020/05/17 |     189433 | macros/luatex/generic/luatexja/src/ltjsclasses.dtx
 2020/05/17 |     188969 | systems/win32/miktex/tm/packages/miktex-omegaware-bin-2.9.tar.lzma
+2020/05/17 |      18877 | macros/luatex/optex/base/graphics.opm
 2020/05/17 |       1875 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex
 2020/05/17 |     187140 | systems/win32/miktex/tm/packages/miktex-pixman-bin-2.9.tar.lzma
 2020/05/17 |     185702 | systems/win32/miktex/tm/packages/miktex-metafont-bin-x64-2.9.tar.lzma
@@ -803,11 +882,13 @@
 2020/05/17 |    1834846 | graphics/pgf/contrib/circuitikz.zip
 2020/05/17 |       1832 | macros/luatex/generic/luatexja/src/luatexja.sty
 2020/05/17 |      18036 | macros/luatex/generic/luatexja/src/ltj-kinsoku_make.tex
+2020/05/17 |      17896 | macros/luatex/optex/base/colors.opm
 2020/05/17 |      17822 | systems/win32/miktex/tm/packages/miktex-tex2xindy-bin-x64-2.9.tar.lzma
 2020/05/17 |    1780968 | systems/texlive/tlnet/archive/l3packages.doc.r55157.tar.xz
 2020/05/17 |      17750 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
 2020/05/17 |     177388 | systems/win32/miktex/tm/packages/miktex-mpfr-bin-x64-2.9.tar.lzma
 2020/05/17 |      17725 | systems/win32/miktex/tm/packages/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2020/05/17 |      17717 | macros/luatex/optex/base/sections.opm
 2020/05/17 |     176639 | macros/luatex/generic/luatexja/src/ltjclasses.dtx
 2020/05/17 |       1749 | macros/luatex/generic/luatexja/src/ltj-inputbuf.lua
 2020/05/17 |     173289 | macros/xetex/latex/bidi/bidi-doc.pdf
@@ -823,6 +904,7 @@
 2020/05/17 |      16095 | systems/win32/miktex/tm/packages/miktex-tex2xindy-bin-2.9.tar.lzma
 2020/05/17 |      15950 | systems/win32/miktex/tm/packages/miktex-kpathsea-bin-2.9.tar.lzma
 2020/05/17 |      15839 | macros/luatex/generic/luatexja/src/addons/luatexja-fontspec-27c.sty
+2020/05/17 |      15718 | macros/luatex/optex/base/unimath-codes.opm
 2020/05/17 |       1536 | macros/luatex/generic/luatexja/COPYING
 2020/05/17 |     152732 | systems/texlive/tlnet/archive/l3kernel.r55157.tar.xz
 2020/05/17 |     152194 | systems/win32/miktex/tm/packages/miktex-fontconfig-bin-x64-2.9.tar.lzma
@@ -838,6 +920,7 @@
 2020/05/17 |      14053 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
 2020/05/17 |       1397 | macros/luatex/generic/luatexja/tool/ivslist.tex
 2020/05/17 |    1391820 | systems/win32/miktex/tm/packages/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2020/05/17 |      13910 | macros/luatex/optex/base/usebib.opm
 2020/05/17 |     137173 | systems/win32/miktex/tm/packages/miktex-hunspell-bin-2.9.tar.lzma
 2020/05/17 |     137131 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
 2020/05/17 |      13431 | macros/luatex/generic/luatexja/src/jfm-ujis.lua
@@ -859,8 +942,10 @@
 2020/05/17 |       1224 | macros/luatex/generic/luatexja/tool/chars2defcharrange.rb
 2020/05/17 |     121032 | systems/texlive/tlnet/archive/etoc.source.r55156.tar.xz
 2020/05/17 |         11 | macros/context/contrib/context-vim/VERSION
+2020/05/17 |      11755 | macros/luatex/optex/base/cite-bib.opm
 2020/05/17 |      11755 | macros/luatex/generic/luatexja/src/ltj-base.lua
 2020/05/17 |     116676 | systems/win32/miktex/tm/packages/miktex-gd-bin-x64-2.9.tar.lzma
+2020/05/17 |      11646 | macros/luatex/optex/base/prefixed.opm
 2020/05/17 |     115839 | systems/win32/miktex/tm/packages/miktex-dvips-bin-2.9.tar.lzma
 2020/05/17 |       1137 | macros/luatex/generic/lua-uni-algos/README.md
 2020/05/17 |      11337 | macros/luatex/generic/luatexja/src/jfm-ujisv.lua
@@ -868,6 +953,7 @@
 2020/05/17 |    1133296 | systems/texlive/tlnet/archive/etbb.r55160.tar.xz
 2020/05/17 |       1130 | macros/luatex/generic/luatexja/tool/function_uax50.lua
 2020/05/17 |    1119500 | systems/texlive/tlnet/archive/etoc.doc.r55156.tar.xz
+2020/05/17 |      11190 | macros/luatex/optex/base/verbatim.opm
 2020/05/17 |     111850 | info/tex-nutshell/tex-nutshell.tex
 2020/05/17 |     110996 | systems/win32/miktex/tm/packages/miktex-gregorio-bin-x64-2.9.tar.lzma
 2020/05/17 |    1109921 | macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
@@ -878,66 +964,104 @@
 2020/05/17 |       1080 | macros/xetex/latex/xepersian/README
 2020/05/17 |      10758 | macros/luatex/generic/luatexja/src/patches/lltjcore.sty
 2020/05/17 |    1070920 | systems/texlive/tlnet/archive/ctex.doc.r55162.tar.xz
+2020/05/17 |      10649 | macros/luatex/optex/base/output.opm
 2020/05/17 |      10548 | systems/texlive/tlnet/archive/etoc.r55156.tar.xz
 2020/05/17 |    1047390 | systems/win32/miktex/tm/packages/miktex-asymptote-bin-x64-2.9.tar.lzma
 2020/05/17 |    1042962 | systems/win32/miktex/tm/packages/miktex-poppler-bin-x64-2.9.tar.lzma
 2020/05/17 |     102588 | systems/win32/miktex/tm/packages/miktex-lua53-bin-x64-2.9.tar.lzma
+2020/05/17 |      10222 | macros/luatex/optex/base/more-macros.opm
 2020/05/17 |       1018 | macros/xetex/latex/bidi/README
 2020/05/17 |   10092196 | systems/texlive/tlnet/archive/l3kernel.doc.r55157.tar.xz
 2020/05/17 |     100608 | systems/win32/miktex/tm/packages/miktex-gd-bin-2.9.tar.lzma
 2020/05/16 |        994 | macros/latex/contrib/hyperref/doc/manual4.html
 2020/05/16 |        979 | macros/latex/contrib/readablecv/README.md
+2020/05/16 |       9587 | macros/luatex/optex/base/math-unicode.opm
 2020/05/16 |      94148 | macros/latex/contrib/readablecv/ReadableCV.pdf
 2020/05/16 |     894586 | macros/xetex/latex/bidi/bidi.dtx
 2020/05/16 |        892 | macros/latex/contrib/hyperref/doc/manual2.html
 2020/05/16 |        861 | macros/latex/contrib/vcell/README.md
+2020/05/16 |       8587 | macros/luatex/optex/base/slides.opm
+2020/05/16 |      85028 | macros/luatex/optex/pkg/qrcode.opm
 2020/05/16 |    8484016 | systems/win32/w32tex/uptex-w32.tar.xz
+2020/05/16 |       8457 | macros/luatex/optex/base/f-lmfonts.opm
+2020/05/16 |       8162 | macros/luatex/optex/base/fnotes.opm
+2020/05/16 |       8073 | macros/luatex/optex/base/f-heros.opm
 2020/05/16 |     761651 | macros/xetex/latex/bidi/gull.jpg
 2020/05/16 |        759 | macros/latex/contrib/hyperref/doc/manual3.html
 2020/05/16 |        756 | macros/latex/contrib/hyperref/doc/manual7.html
 2020/05/16 |        756 | macros/latex/contrib/hyperref/doc/manual6.html
 2020/05/16 |        756 | macros/latex/contrib/hyperref/doc/manual5.html
+2020/05/16 |        743 | macros/luatex/optex/base/f-xcharter.opm
+2020/05/16 |       7412 | macros/luatex/optex/base/luatex-ini.opm
 2020/05/16 |      71647 | macros/xetex/latex/xepersian/xepersian-doc-basics.ltx
+2020/05/16 |       6959 | macros/luatex/optex/base/hyperlinks.opm
+2020/05/16 |        687 | macros/luatex/optex/base/f-pagella.opm
+2020/05/16 |        683 | macros/luatex/optex/base/f-schola.opm
+2020/05/16 |        677 | macros/luatex/optex/base/f-termes.opm
+2020/05/16 |        672 | macros/luatex/optex/base/f-bonum.opm
+2020/05/16 |       6715 | macros/luatex/optex/base/fonts-opmac.opm
+2020/05/16 |        650 | macros/luatex/optex/base/f-adventor.opm
+2020/05/16 |        646 | macros/luatex/optex/base/f-baskerville.opm
+2020/05/16 |        639 | macros/luatex/optex/base/f-cursor.opm
 2020/05/16 |       6101 | macros/xetex/latex/bidi/bidi-doc-latex-pkgsupport.ltx
 2020/05/16 |       6039 | language/chinese/ctex/README.md
 2020/05/16 |       5939 | macros/xetex/latex/bidi/bidi-doc-plain-basics.ltx
 2020/05/16 |      57513 | systems/win32/miktex/tm/packages/beamerappendixnote.tar.lzma
 2020/05/16 |       5736 | macros/latex/contrib/hyperref/xr-hyper.sty
+2020/05/16 |        564 | macros/luatex/optex/base/f-gfsbodoni.opm
 2020/05/16 |       5453 | macros/xetex/latex/xepersian/xepersian-doc-envcs.ltx
 2020/05/16 |        534 | macros/xetex/latex/bidi/bidi-doc.ltx
+2020/05/16 |       5154 | macros/luatex/optex/base/maketoc.opm
+2020/05/16 |     512984 | macros/luatex/optex/demo/op-ring.png
 2020/05/16 |      50972 | macros/latex/contrib/hyperref/hluatex.dtx
 2020/05/16 |        495 | macros/latex/contrib/glossaries-nynorsk/README
 2020/05/16 |    4915928 | systems/win32/w32tex/aleph-w32.tar.xz
 2020/05/16 |       4886 | macros/latex/contrib/readablecv/ReadableCV.tex
 2020/05/16 |       4886 | macros/latex/contrib/glossaries-nynorsk/glossaries-nynorsk.dtx
 2020/05/16 |     478964 | macros/latex/contrib/hyperref/doc/manual.html
+2020/05/16 |       4719 | macros/luatex/optex/base/multicolumns.opm
 2020/05/16 |       4701 | macros/latex/contrib/hyperref/README.md
 2020/05/16 |        454 | macros/xetex/latex/xepersian/xepersian-doc.ltx
 2020/05/16 |       4547 | macros/xetex/latex/bidi/bidi-doc-latex-pkgs.ltx
 2020/05/16 |       4497 | macros/xetex/latex/bidi/bidi-doc-latex-programming.ltx
+2020/05/16 |       4394 | macros/luatex/optex/base/lists.opm
 2020/05/16 |     438507 | language/chinese/ctex/ctex.dtx
+2020/05/16 |       4311 | macros/luatex/optex/base/outlines.opm
+2020/05/16 |       4303 | macros/luatex/optex/base/fonts-catalog.opm
 2020/05/16 |   41515180 | systems/win32/w32tex/latex-dev.tar.xz
 2020/05/16 |       4149 | macros/xetex/latex/xepersian/xepersian-doc-preamble.ltx
 2020/05/16 |    4136794 | install/macros/latex/contrib/hyperref.tds.zip
 2020/05/16 |        410 | macros/xetex/latex/xepersian/xepersian-doc-boolean.ltx
 2020/05/16 |    3996505 | macros/latex/contrib/hyperref.zip
 2020/05/16 |      38725 | macros/xetex/latex/xepersian/ftxe-0.12.py
+2020/05/16 |       3742 | macros/luatex/optex/base/styles.opm
+2020/05/16 |       3633 | macros/luatex/optex/base/margins.opm
 2020/05/16 |       3596 | macros/xetex/latex/bidi/bidi-doc-preamble.ltx
+2020/05/16 |       3569 | macros/luatex/optex/base/basic-macros.opm
+2020/05/16 |       3367 | macros/luatex/optex/base/references.opm
 2020/05/16 |     333535 | macros/xetex/latex/xepersian/xepersian.dtx
 2020/05/16 |       3099 | macros/xetex/latex/xepersian/xepersian-doc-captions.ltx
+2020/05/16 |       3066 | macros/luatex/optex/base/pdfuni-string.opm
+2020/05/16 |       3014 | macros/luatex/optex/base/hisyntax-python.opm
 2020/05/16 |     295940 | macros/latex/contrib/hyperref/doc/manual.pdf
 2020/05/16 |      29475 | language/chinese/ctex/ctxdoc.cls
 2020/05/16 |       2936 | macros/xetex/latex/bidi/bidi-bibitem.pdf
+2020/05/16 |      28728 | macros/luatex/optex/base/fonts-select.opm
 2020/05/16 |    2857443 | fonts/etbb.zip
 2020/05/16 |       2738 | macros/latex/contrib/vcell/vcell.sty
 2020/05/16 |      25947 | macros/xetex/latex/xepersian/xepersian-doc-pkgs.ltx
 2020/05/16 |       2510 | macros/xetex/latex/xepersian/xepersian-doc-intro.ltx
 2020/05/16 |    2454006 | macros/latex/contrib/hyperref/doc/hyperref.pdf
+2020/05/16 |       2426 | macros/luatex/optex/base/logos.opm
+2020/05/16 |     241265 | macros/luatex/optex/base/unimath-table.opm
 2020/05/16 |      23945 | macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx
+2020/05/16 |       2367 | macros/luatex/optex/base/f-libertine.opm
+2020/05/16 |       2154 | macros/luatex/optex/base/f-libertine-s.opm
 2020/05/16 |     212976 | macros/latex/contrib/hyperref/doc/backref.pdf
 2020/05/16 |    2126880 | systems/win32/w32tex/win64/context-w64.tar.xz
 2020/05/16 |   20741596 | systems/win32/w32tex/pdftex-w32.tar.xz
 2020/05/16 |       1961 | macros/xetex/latex/bidi/bidi-doc-plain-programming.ltx
+2020/05/16 |      19070 | macros/luatex/optex/base/makeindex.opm
 2020/05/16 |     189481 | macros/latex/contrib/hyperref/doc/nameref.pdf
 2020/05/16 |    1870359 | systems/win32/miktex/tm/packages/l3packages.tar.lzma
 2020/05/16 |      18304 | macros/xetex/latex/xepersian/img/ireland.jpg
@@ -945,27 +1069,37 @@
 2020/05/16 |       1769 | macros/xetex/latex/xepersian/xepersian-doc-title.ltx
 2020/05/16 |     170439 | macros/latex/contrib/readablecv.zip
 2020/05/16 |       1693 | macros/xetex/latex/bidi/picture.jpg
+2020/05/16 |       1606 | macros/luatex/optex/base/fonts-preload.opm
 2020/05/16 |      15976 | macros/xetex/latex/xepersian/dkun-0.3.py
 2020/05/16 |      15867 | macros/xetex/latex/xepersian/dkun-0.4.py
 2020/05/16 |    1570520 | install/language/chinese/ctex.tds.zip
+2020/05/16 |       1562 | macros/luatex/optex/base/hisyntax-tex.opm
+2020/05/16 |       1527 | macros/luatex/optex/base/f-lido.opm
 2020/05/16 |     147086 | macros/latex/contrib/vcell/vcell.pdf
 2020/05/16 |      14616 | macros/xetex/latex/xepersian/img/weather/rain.jpg
+2020/05/16 |       1460 | macros/luatex/optex/doc/optex.1
 2020/05/16 |      14298 | macros/latex/contrib/hyperref/doc/manual.css
+2020/05/16 |      13881 | macros/luatex/optex/base/fonts-resize.opm
 2020/05/16 |      13804 | macros/xetex/latex/xepersian/undk-0.6.py
 2020/05/16 |      13749 | macros/latex/contrib/readablecv/ReadableCV.cls
+2020/05/16 |      13569 | macros/luatex/optex/base/mathclass.opm
 2020/05/16 |       1341 | macros/xetex/latex/bidi/bidi-doc-intro.ltx
+2020/05/16 |      13397 | macros/luatex/optex/base/plain-macros.opm
 2020/05/16 |      13088 | macros/xetex/latex/xepersian/img/weather/clouds.jpg
 2020/05/16 |     125312 | macros/latex/contrib/glossaries-nynorsk.zip
 2020/05/16 |    1242211 | systems/win32/miktex/tm/packages/etoc.tar.lzma
 2020/05/16 |      12348 | macros/xetex/latex/xepersian/unldk-0.2.py
 2020/05/16 |       1232 | macros/latex/contrib/glossaries-nynorsk/glossaries-nynorsk.ins
 2020/05/16 |     122934 | macros/latex/contrib/glossaries-nynorsk/glossaries-nynorsk.pdf
+2020/05/16 |     121745 | macros/luatex/optex/base/uni-lcuc.opm
 2020/05/16 |    1185608 | language/chinese/ctex.zip
+2020/05/16 |       1137 | macros/luatex/optex/base/f-antt.opm
 2020/05/16 |    1107269 | language/chinese/ctex/ctex.pdf
+2020/05/16 |       1102 | macros/luatex/optex/base/f-technika.opm
 2020/05/16 |      10896 | macros/xetex/latex/xepersian/img/weather/sun.jpg
 2020/05/16 |   10694587 | systems/win32/miktex/tm/packages/l3kernel.tar.lzma
-2020/05/16 |   10500812 | systems/win32/w32tex/ptex-w32.tar.xz
 2020/05/16 |      10166 | macros/latex/contrib/vcell/vcell.tex
+2020/05/16 |       1001 | macros/luatex/optex/base/hisyntax-html.opm
 2020/05/15 |       9772 | macros/latex/contrib/l3kernel/l3docstrip.dtx
 2020/05/15 |     969446 | macros/latex/contrib/toptesi/toptesi.pdf
 2020/05/15 |       9656 | macros/latex/contrib/l3kernel/l3unicode.dtx
@@ -1026,7 +1160,6 @@
 2020/05/15 |       6352 | fonts/etbb/tfm/ETbb-Regular-lf-sc-ot1.tfm
 2020/05/15 |       6332 | fonts/etbb/tfm/ETbb-Regular-tosf-sc-ot1.tfm
 2020/05/15 |       6332 | fonts/etbb/tfm/ETbb-Regular-tlf-sc-ot1.tfm
-2020/05/15 |    6291248 | systems/win32/w32tex/win64/pdftex-w64.tar.xz
 2020/05/15 |       6267 | macros/latex/contrib/l3kernel/l3syntax-changes.tex
 2020/05/15 |       6236 | macros/latex/contrib/l3kernel/l3alloc.dtx
 2020/05/15 |     622143 | macros/latex/contrib/etoc/etoc.pdf
@@ -1739,49 +1872,3 @@
 2020/05/15 |     105108 | macros/latex/contrib/l3kernel/l3news05.pdf
 2020/05/15 |     100320 | fonts/etbb/opentype/ETbb-Italic.otf
 2020/05/15 |     100071 | macros/latex/contrib/l3packages/xtemplate.dtx
-2020/05/14 |     989448 | systems/texlive/tlnet/archive/hyperxmp.doc.r55130.tar.xz
-2020/05/14 |       6028 | systems/texlive/tlnet/archive/xepersian-hm.source.r55123.tar.xz
-2020/05/14 |     517016 | dviware/dvidvi/configure.texk
-2020/05/14 |       5016 | systems/texlive/tlnet/archive/xepersian-hm.r55123.tar.xz
-2020/05/14 |     478644 | systems/texlive/tlnet/archive/xepersian-hm.doc.r55123.tar.xz
-2020/05/14 |     454256 | systems/texlive/tlnet/archive/antanilipsum.doc.r55129.tar.xz
-2020/05/14 |      43658 | dviware/dvidvi/Makefile.in
-2020/05/14 |        432 | systems/texlive/tlnet/archive/collection-langitalian.r55129.tar.xz
-2020/05/14 |     431926 | macros/latex/contrib/toptesi/toptesi-it.tex
-2020/05/14 |     389740 | systems/texlive/tlnet/archive/lwarp.source.r55122.tar.xz
-2020/05/14 |     381532 | systems/texlive/tlnet/archive/anonymous-acm.doc.r55121.tar.xz
-2020/05/14 |      37004 | systems/texlive/tlnet/archive/tikztosvg.doc.r55132.tar.xz
-2020/05/14 |     354268 | systems/texlive/tlnet/archive/erewhon.doc.r55128.tar.xz
-2020/05/14 |        344 | systems/texlive/tlnet/archive/tikztosvg.x86_64-darwinlegacy.r55132.tar.xz
-2020/05/14 |        340 | systems/texlive/tlnet/archive/tikztosvg.x86_64-linuxmusl.r55132.tar.xz
-2020/05/14 |        336 | systems/texlive/tlnet/archive/tikztosvg.x86_64-solaris.r55132.tar.xz
-2020/05/14 |        336 | systems/texlive/tlnet/archive/tikztosvg.x86_64-linux.r55132.tar.xz
-2020/05/14 |        336 | systems/texlive/tlnet/archive/tikztosvg.x86_64-darwin.r55132.tar.xz
-2020/05/14 |        336 | systems/texlive/tlnet/archive/tikztosvg.x86_64-cygwin.r55132.tar.xz
-2020/05/14 |        336 | systems/texlive/tlnet/archive/tikztosvg.i386-solaris.r55132.tar.xz
-2020/05/14 |        336 | systems/texlive/tlnet/archive/tikztosvg.i386-netbsd.r55132.tar.xz
-2020/05/14 |        336 | systems/texlive/tlnet/archive/tikztosvg.i386-linux.r55132.tar.xz
-2020/05/14 |        336 | systems/texlive/tlnet/archive/tikztosvg.i386-freebsd.r55132.tar.xz
-2020/05/14 |        336 | systems/texlive/tlnet/archive/tikztosvg.i386-cygwin.r55132.tar.xz
-2020/05/14 |        336 | systems/texlive/tlnet/archive/tikztosvg.armhf-linux.r55132.tar.xz
-2020/05/14 |        336 | systems/texlive/tlnet/archive/tikztosvg.amd64-netbsd.r55132.tar.xz
-2020/05/14 |        336 | systems/texlive/tlnet/archive/tikztosvg.amd64-freebsd.r55132.tar.xz
-2020/05/14 |        336 | systems/texlive/tlnet/archive/tikztosvg.aarch64-linux.r55132.tar.xz
-2020/05/14 |    2614276 | systems/texlive/tlnet/archive/lwarp.doc.r55122.tar.xz
-2020/05/14 |    2422672 | systems/texlive/tlnet/archive/erewhon.r55128.tar.xz
-2020/05/14 |    2110208 | systems/texlive/tlnet/archive/luajittex.win32.r55133.tar.xz
-2020/05/14 |        209 | macros/latex/contrib/beamer-contrib/beamerappendixnote/example-basic.tex
-2020/05/14 |    1822160 | systems/texlive/tlnet/archive/luatex.win32.r55133.tar.xz
-2020/05/14 |     175164 | systems/texlive/tlnet/archive/lwarp.r55122.tar.xz
-2020/05/14 |     173436 | systems/texlive/tlnet/archive/emojicite.doc.r55131.tar.xz
-2020/05/14 |    1550700 | systems/texlive/tlnet/archive/luahbtex.win32.r55133.tar.xz
-2020/05/14 |       1528 | systems/texlive/tlnet/archive/anonymous-acm.r55121.tar.xz
-2020/05/14 |       1500 | systems/texlive/tlnet/archive/collection-publishers.r55121.tar.xz
-2020/05/14 |      14528 | systems/texlive/tlnet/archive/antanilipsum.source.r55129.tar.xz
-2020/05/14 |     144924 | systems/texlive/tlnet/archive/hyperxmp.source.r55130.tar.xz
-2020/05/14 |       1440 | systems/texlive/tlnet/archive/tikztosvg.r55132.tar.xz
-2020/05/14 |       1360 | systems/texlive/tlnet/archive/collection-pictures.r55132.tar.xz
-2020/05/14 |       1328 | systems/texlive/tlnet/archive/emojicite.r55131.tar.xz
-2020/05/14 |      10788 | systems/texlive/tlnet/archive/hyperxmp.r55130.tar.xz
-2020/05/14 |      10737 | macros/latex/contrib/beamer-contrib/beamerappendixnote/example-basic.pdf
-2020/05/14 |      10376 | systems/texlive/tlnet/archive/antanilipsum.r55129.tar.xz
diff --git a/info/latex-veryshortguide/MANIFEST b/info/latex-veryshortguide/MANIFEST
index 954e96f210..434366a6f3 100644
--- a/info/latex-veryshortguide/MANIFEST
+++ b/info/latex-veryshortguide/MANIFEST
@@ -1,11 +1,10 @@
-README.md
 MANIFEST
-vsg.dtx
-vsg.ins
-vsg.pdf
-veryshortguide.tex
-veryshortguide.bib
-veryshortguide.pdf
+menno-a.jpg
+README.md
+VERSION
 veryshortguide-A4-imposed.pdf
-veryshortguide-Legal-imposed.pdf
-menno-a.png
+veryshortguide.dtx
+veryshortguide.ins
+veryshortguide.pdf
+vsg.bib
+vsg.tex
diff --git a/info/latex-veryshortguide/README.md b/info/latex-veryshortguide/README.md
index c8f95f6735..34ece73ba1 100644
--- a/info/latex-veryshortguide/README.md
+++ b/info/latex-veryshortguide/README.md
@@ -1,108 +1,169 @@
 
-#vsg
+[//]: # (veryshortguide LaTeX class)
 
-This is the README.md file for the vsg LaTeX class.
+# veryshortguide
 
-##Summary
+This is the README.md file for the veryshortguide LaTeX class v0.7 (2020-04-16)
+generated by ClassPack v.1.19 (2020-05-19) on 21 May 2020 at 11:55:35 
 
-This is a document class derived from the original Very Short Guide to LaTeX, a 4pp folder designed as an aide-mémoire for people who have just done a course in LaTeX and need something by them on their desk the next day to refresh their memories. It is __not__ intended as a substitute for full documentation.
+## Summary
 
-This class is designed for this document only, but adds parameterisation to allow reformatting tweaks for different paper sizes (A4 and Legal) to allow it to be printed two-sided as a 4pp folder.
+This is the document class originally designed for the _Very Short Guide
+to LaTeX_, a 4pp folder designed as an aide-mémoire for people who have
+just done a course in LaTeX and need something by them on their desk the
+next day to refresh their memories. It is _not_ intended as a substitute
+for full documentation.
 
-Please do not complain that there is no math here. It won't fit. Someone else can do a math leaflet. IANAM.
+Please do not complain that there is no math here. It won't fit. Someone
+else can do a math leaflet. IANAM.
 
 
-##Normal installation
+## Automated installation
 
-This class is distributed from CTAN in a zip file which allows it to be installed automatically by the TeX Live update manager _tlmgr_ and similar automated installers. If you are using automated package installation, no further action is required.
+If this class is distributed from CTAN, it should be in a zip file which
+allows it to be installed automatically by the TeX Live Manager (tlmgr)
+and similar automated installers.
 
+If you are using automated LaTeX package installation, no further action
+is required: the package will be installed the first time you use it in
+a LaTeX document.
 
-##TDS installation
+If you are using the TeX Live Manager (_tlmgr_) program manually, you
+can install this package with the command:
 
-This class is also available as a `.tds.zip` file. TDS is the TeX Directory Structure, the standard layout for a modern TeX installation. This enables the class to be unzipped directly into your Personal TeX Directory (see below for what this is and how to create one on your system).
 
-  *  Install it on any TDS-compliant personal system (laptop, desktop, workstation, table, smartphone, PDA, etc) by unzipping it straight into your Personal TeX Directory (folder). This will put all the files into the right places, so you can start using them immediately.
+## TDS installation
 
-  *  If you haven't yet created a personal TeX directory, see below for details of what one is, and how to create it.
+This class is also available as a TeX Directory System (TDS) zip file
+(`.tds.zip`). This is the standard directory layout for a modern TeX
+installation which enables the class to be unzipped directly into your
+Personal TeX Directory without the need to use _tlmgr_. If you haven’t
+yet created a Personal TeX Directory, see below for details of what one
+is, and how to create it.
+  *  You can install this class on any TDS-compliant personal system (laptop,
+desktop, workstation, table, smartphone, PDA, etc) by unzipping it
+straight into your Personal TeX Directory. This will put all the files
+into the right places, so you can start using them immediately.
+  *  On a shared (multiuser) system like a server, the administrator can
+unzip it into the `$TEXMFLOCAL` directory instead (see below), and run
+your TeX directory-indexing program (eg _texhash_, _mktexlsr_, etc) so
+that everyone can use it.
+  *  If you are using an old non-TDS-compliant system, see below under Manual
+Installation.
 
-  *  On a shared (multiuser) system like a server, unzip it into the $TEXMFLOCAL directory instead (see below), and run your TeX directory-indexing program (eg _texhash__mktexlsr_, etc) so that everyone can use it.
+### Your Personal TeX Directory
 
-  *  If you are using an old non-TDS-compliant system, see below under Manual Installation.
+This is a directory (folder) where you should put all local manual
+modifications (updates, additions such as new or updated classes,
+packages, and fonts) that are _not_ handled automatically by _tlmgr_.
+The name and location are fixed (for all practical purposes):
+  *  Apple Mac OS X
 
-###Your Personal TeX Directory
+    ~/Library/texmf
+  *  Unix and GNU/Linux
 
-This is a directory (folder) on single-user systems where you should put all your local manual modifications (updates, and additions such as new or updated classes, packages, and fonts) that are __not__ handled automatically by the TeX Live update manager (_tlmgr_). The name and location are fixed:
+    ~/texmf
+  *  MS-Windows 95/XP/NT
 
-<dl>
-  <dt>Apple Mac OS X</dt>
-  <dd>`~/Library/texmf`</dd>
-  <dt>Unix and GNU/Linux</dt>
-  <dd>`~/texmf`</dd>
-  <dt>MS-Windows 95/XP</dt>
-  <dd>`C:\texmf`</dd>
-  <dt>MS-Windows 2007 and above</dt>
-  <dd>`Computer\System\YOURNAME\texmf`</dd>
-</dl>
+    C:\texmf
+  *  MS-Windows 2007 and above
 
-Create that folder now if it does not already exist. Put (or unzip) all additions to your system that are not handled by _tlmgr_ into this directory, following __exactly__ the subdirectory structure that is used in your main TeX distribution (unzipping a TDS file does this for you). This is what enables LaTeX to find stuff automatically.
+    Computer\System\YOURNAME\texmf
 
-> #### If you are a Windows user running _MiKTeX_ ####
-> 
-> When you create the folder, you must add it to _MiKTeX_'s list of supported folders. Run the _MiKTeX Maintenance/Settings_ program, select the `Roots` tab, and add the folder. You only have to do this once.
-> 
-> Each time you add or remove software in your personal TeX folder, you __must__ also click on the `Update FNDB` button in the `General` tab.
+Create that folder now if it does not already exist. Put (or unzip) all
+additions to your system that are _not_ handled by _tlmgr_ into this
+directory, following _exactly_ the subdirectory structure that is used
+in your main TeX distribution (unzipping a TDS file does this for you).
+This is what enables LaTeX to find stuff automatically.
+
+
+> ####  If you are a Windows user running _MiKTeX_
+> When you create the folder for your Personal TeX Directory, you MUST add it to _MiKTeX_ ’s list of supported folders. Run the _MiKTeX Maintenance/Settings_ program, select the `Roots` tab, and add the folder. You only have to do this once.
+> > Each time you add or remove software in your Personal TeX Directory, you MUST then click on the `Update FNDB` button in the `General` tab of the _MiKTeX Maintenance/Settings_ program, otherwise _MiKTeX_ will not find them and nothing will work!
 > 
 
-Unix (Mac and GNU/Linux) users do not need to (indeed, should not) run their filename database indexer (_mktexlsr_ or _texhash_) for files put in your personal TeX directory.
+Unix (Mac and GNU/Linux) users do not need to (indeed, should not) run
+their filename database indexer program (_mktexlsr_ or _texhash_) for
+files put into a personal TeX directory.
 
 
-##Installation on shared systems
+## Installation on shared systems
 
-On multi-user systems (Unix-based), identify the shared local directory tree with the command
+On multi-user systems (Unix-based), identify the shared local directory
+tree with the command
 
-    kpsewhich -expand-var
-          '$TEXMFLOCAL'
+    kpsewhich -expand-var '$TEXMFLOCAL'
 
-This will give you the location of the shared `texmf` directory into which you must install these files.
+This will give you the location of the shared `texmf` directory into
+which you must unzip these files.
 
-Do not forget to run the _texhash_ or _mktexlsr_ (filename indexer) program after installation, otherwise the files will not be found by LaTeX and nothing will work!
+Do not forget to run your local TeX filename database indexer program
+(_texhash_ or _mktexlsr_) after installation, otherwise the files will
+not be found by LaTeX and nothing will work!
 
 
-##Manual installation (non-TDS systems)
+## Manual installation (non-TDS systems)
 
-To install this software manually, unzip the zip file into a temporary directory and move the `vsg.cls` file from the `tex/latex/veryshortguide` directory to a location (directory/folder) where LaTeX will find it on your system. This is referred to in some documentation as “the TEXINPUTS directory”, although it may be called something else on your system.
+To install this software manually, download and unzip the _non-_TDS zip
+file into a temporary directory and move the class and/or package
+file[s] and other files to the proper locations where LaTeX will find
+them on your system. This is referred to in some documentation as “the
+`TEXINPUTS` directory”, although it may be called something else on your
+system.
 
-__It is your responsibility to know where this location is.__ See the question in the TeX FAQ at http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-wlcf for more information. If you do not know, or cannot find it, or do not have access to it, your TeX system may be out of date and need replacing.
+_It is your responsibility to know where this location is._ See the
+question in the TeX FAQ at https://texfaq.org/FAQ-inst-wlcf.html for
+more information. If you do not know, or cannot find it, or do not have
+access to it, your TeX system may be out of date and may need replacing.
 
 
-##Last resort
 
-In an emergency, or as a last resort on unmanageable systems, it is possible simply to put the `vsg.cls` file in your current working directory (the same folder as your `.tex` file[s]).
+## Online systems and “last resort” systems
 
-While this may work, it is not supported, and may lead to other resources (packages, fonts, etc) not being found.
+Some online LaTeX systems use CTAN, so a package from there should be
+available on demand. For other online LaTeX systems where you do not
+have access to the file system, unzip the _non-_TDS zip file into a
+temporary directory and upload the files to the online system. Follow
+their instructions for where to put them.
 
+In an emergency, or as a last resort on unmanageable systems, it is
+possible simply to put the class and/or package file[s] into your
+current working directory (the same folder as your `.tex` file[s]).
 
-##Usage
+While this may work, it is not supported, and may lead to other
+resources (packages, fonts, images etc) not being found.
 
-Make this the first line of your LaTeX document:
 
-    \documentclass[options]{vsg}
+## Usage
 
-Read the documentation for the options available. The documentation is distributed as a PDF document in the zip file. You can also regenerate it by typesetting the `vsg.dtx` file with LaTeX (and BibTeX/_biber_ and _makeindex_) in the normal way.
+Include the line shown below in the Preamble of your LaTeX document; a
+`\documentclass` line should be at the top; a `\usepackage` command
+normally goes anywhere in the Preamble:
 
+    \documentclass[options]{veryshortguide}
 
-##Bugs and TODO
+(similarly for other classes or packages if more than one is supplied
+with this package). Read the documentation for the options available, if
+any. The documentation is distributed as a PDF document in the zip file.
+You can also regenerate it by typesetting the `veryshortguide.dtx` file
+with `xelatex` (and `` and _makeindex_) in the normal way.
+
+
+## Bugs and TODO
 
 No outstanding reported bugs at the time of this version.
 
+For TODO items, see the PDF documentation.
 
-##Copyright
+
+## Copyright
 
 The following statement is included in the source code:
 
-     Transformed from vsg.xml by ClassPack db2dtx.xsl
-     version 16.00 (Makefile with XeLaTeX) on Friday 12 August 2016 at 10:42:12
-     vsg.cls is copyright © 2009-2016 by Peter Flynn <peter@silmaril.ie>
+     Transformed from veryshortguide.xml by ClassPack db2dtx.xsl
+     version 1.19 (2020-05-19) on Thursday 21 May 2020 at 11:55:35
+    
+     veryshortguide.cls is copyright © 2009-2020 by Peter Flynn <peter@silmaril.ie>
     
      This work may be distributed and/or modified under the
      conditions of the LaTeX Project Public License, either
@@ -114,12 +175,12 @@ The following statement is included in the source code:
      and version 1.3 or later is part of all distributions of
      LaTeX version 2005/12/01 or later.
     
-     This work has the LPPL maintenance status `maintained'.
+     This work has the LPPL maintenance status ‘maintained’.
      
      The current maintainer of this work is Peter Flynn <peter@silmaril.ie>
     
-     This work consists of the files vsg.dtx and vsg.ins,
-     the derived file vsg.cls, and any ancillary files listed
-     in the MANIFEST.
+     This work consists of the files veryshortguide.dtx and veryshortguide.ins,
+     the derived file , 
+     and any other ancillary files listed in the MANIFEST.
     
 
diff --git a/info/latex-veryshortguide/VERSION b/info/latex-veryshortguide/VERSION
new file mode 100644
index 0000000000..e84fd2e00f
--- /dev/null
+++ b/info/latex-veryshortguide/VERSION
@@ -0,0 +1 @@
+Date of most recent change is 2020-04-16
diff --git a/info/latex-veryshortguide/menno-a.jpg b/info/latex-veryshortguide/menno-a.jpg
new file mode 100644
index 0000000000..43a6d2685a
--- /dev/null
+++ b/info/latex-veryshortguide/menno-a.jpg
diff --git a/info/latex-veryshortguide/menno-a.png b/info/latex-veryshortguide/menno-a.png
deleted file mode 100644
index 62be297167..0000000000
--- a/info/latex-veryshortguide/menno-a.png
+++ /dev/null
diff --git a/info/latex-veryshortguide/veryshortguide-A4-imposed.pdf b/info/latex-veryshortguide/veryshortguide-A4-imposed.pdf
index 32f1a8d6a9..74ab218624 100644
--- a/info/latex-veryshortguide/veryshortguide-A4-imposed.pdf
+++ b/info/latex-veryshortguide/veryshortguide-A4-imposed.pdf
diff --git a/info/latex-veryshortguide/veryshortguide-Legal-imposed.pdf b/info/latex-veryshortguide/veryshortguide-Legal-imposed.pdf
deleted file mode 100644
index 91c859a7d4..0000000000
--- a/info/latex-veryshortguide/veryshortguide-Legal-imposed.pdf
+++ /dev/null
diff --git a/info/latex-veryshortguide/veryshortguide.bib b/info/latex-veryshortguide/veryshortguide.bib
deleted file mode 100644
index cbd4ee07e7..0000000000
--- a/info/latex-veryshortguide/veryshortguide.bib
+++ /dev/null
@@ -1,34 +0,0 @@
-The bibliography for the Very Short Guide to Typesetting with \LaTeX{}
-@book{fi,
-  title = {{Formatting Information}},
-  author = {Peter Flynn},
-  publisher = {Silmaril},
-  url = {http://latex.silmaril.ie/},
-  year = {2016}}
-
-@InProceedings{adams,
-  author =       {Paul Adams},
-  title =        {{Linguistic Chaos in Montreal}},
-  booktitle =    {{Chaos and the City miniconference}},
-  year =         2002,
-  month =        {Nov},
-  url =          {http://www.utexas.edu/depts/grg/adams/chaos.ppt},
-  organization = {University of Texas School of Architecture}}
-
-@Manual{bibtex,
-  title =        {{BIB\TeX ing}},
-  author =       {Oren Patashnik},
-  organization = {\TeX\ Users Group},
-  address =      {Portland, RI},
-  url = {http://ftp.heanet.ie/pub/CTAN/tex/biblio/bibtex/base/btxdoc.pdf},
-  year =         1988}
-
-@Manual{sherington,
-  author =       {Sherington, J},
-  title =        {{Informative Presentation of Graphs and Statistics}},
-  organization = {Statistical Services Centre, University of Reading},
-  year =         1998,
-  url =          {http://www.reading.ac.uk/ssc/publications/guides/toptgs.htm},
-  note =         {4.2, example table}
-}
-
diff --git a/info/latex-veryshortguide/vsg.dtx b/info/latex-veryshortguide/veryshortguide.dtx
index 995766a066..e4e96d588b 100644
--- a/info/latex-veryshortguide/vsg.dtx
+++ b/info/latex-veryshortguide/veryshortguide.dtx
@@ -1,8 +1,9 @@
 % \iffalse meta-comment
 %
-% Transformed from vsg.xml by ClassPack db2dtx.xsl
-% version 16.00 (Makefile with XeLaTeX) on Friday 12 August 2016 at 10:42:12
-% vsg.dtx is copyright © 2009-2016 by Peter Flynn <peter@silmaril.ie>
+% Transformed from veryshortguide.xml by ClassPack db2dtx.xsl
+% version 1.19 (2020-05-19) on Thursday 21 May 2020 at 11:55:35
+%
+% veryshortguide.dtx is copyright © 2009-2020 by Peter Flynn <peter@silmaril.ie>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -14,31 +15,30 @@
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
-% This work has the LPPL maintenance status `maintained'.
+% This work has the LPPL maintenance status ‘maintained’.
 % 
 % The current maintainer of this work is Peter Flynn <peter@silmaril.ie>
 %
-% This work consists of the files vsg.dtx and vsg.ins,
-% the derived file vsg.cls, and any ancillary files listed
-% in the MANIFEST.
+% This work consists of the files veryshortguide.dtx and veryshortguide.ins,
+% the derived file , 
+% and any other ancillary files listed in the MANIFEST.
 %
 % \fi
 % \iffalse
 %<*driver>
-\ProvidesFile{vsg.dtx}
+\ProvidesFile{veryshortguide.dtx}
 %</driver>
 %<class>\NeedsTeXFormat{LaTeX2e}[2015/01/01]
-%<class>\ProvidesClass{vsg}[2016/08/12 v0.6
-%<class> The Very Short Guide to LaTeX]
+%<class>\ProvidesClass{veryshortguide}[2020/04/16 v0.7
+%<class>  The Very Short Guide to LaTeX]
 %<*driver>
 \RequirePackage{fix-cm}% included by default.
-\PassOptionsToPackage{svgnames}{xcolor}% xcolor or hyperref in use
-\PassOptionsToPackage{hyphens}{url}% url, hyperref, biblatex, or metadata detected
+\PassOptionsToPackage{svgnames}{xcolor}% xcolor/dox/hyperref implied
 \documentclass[12pt]{ltxdoc}
 %%
 %% Packages added for documentation
 %%
-\usepackage{dox}% included by default. (0)
+\usepackage{dox}% used by default. (0)%
   \makeatletter
   \doxitem[idxtype=attribute]{Attribute}{CPK@attribute}{attributes}
   \makeatother
@@ -67,6 +67,15 @@
   \doxitem[idxtype=error]{Error}{CPK@error}{errors}
   \makeatother
   \makeatletter
+  \doxitem[idxtype=field]{Field}{CPK@field}{fields}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=file]{File}{CPK@file}{files}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=font]{Font}{CPK@font}{fonts}
+  \makeatother
+  \makeatletter
   \doxitem[idxtype=function]{Function}{CPK@function}{functions}
   \makeatother
   \makeatletter
@@ -85,6 +94,12 @@
   \doxitem[idxtype=package]{Package}{CPK@package}{packages}
   \makeatother
   \makeatletter
+  \doxitem[idxtype=variable]{Variable}{CPK@variable}{variables}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=parameter]{Parameter}{CPK@parameter}{parameters}
+  \makeatother
+  \makeatletter
   \doxitem[macrolike,idxtype=switch]{Switch}{CPK@switch}{switches}
   \makeatother
   \makeatletter
@@ -94,11 +109,11 @@
   \doxitem[idxtype=typeface]{Typeface}{CPK@typeface}{typefaces}
   \makeatother
   \makeatletter
-  \doxitem[idxtype=font]{Font}{CPK@font}{fonts}
+  \doxitem[macrolike,idxtype=box]{Box}{CPK@box}{boxes}
   \makeatother
   \newcommand{\LabelFont}[2][\relax]{\strut
     {\fontencoding\encodingdefault
-     \fontfamily{lmtt}\fontseries{lc}#1\selectfont#2}\space}
+	    \fontfamily{lmtt}\fontseries{lc}#1\selectfont#2}\space}
   \makeatletter
   \let\CPK@macro\macro\let\CPK@endmacro\endmacro
   \makeatother
@@ -126,27 +141,52 @@
   \def\PrintPackageName#1{\LabelFont[\fontfamily{lmss}]{#1}}
   \def\PrintSwitchName#1{\LabelFont{#1}}
   \def\PrintTemplateName#1{\LabelFont[\bfseries]{#1}}
-%% inputenc omitted: conflicts with fontspec (3)
-%% fontenc omitted: conflicts with fontspec (5)
-\usepackage{fontspec}% a part/@conformance='xelatex' was detected. (6)
-\usepackage{mflogo}% included by default. (28)
-\usepackage[british]{babel}% included by default. (33)
-\usepackage{array}% use of 'tgroup' was detected (37)
-\usepackage{calc}% included by default. (39)
-\usepackage{ccaption}% included by default. (41)
+  \def\PrintVariableName#1{\LabelFont[\ttfamily]{#1}}
+  \def\PrintParameterName#1{\LabelFont[\ttfamily]{#1}}
+  \def\PrintFieldName#1{\LabelFont[\ttfamily]{#1}}
+%% fontenc omit: conflict: fontspec (3)
+%% inputenc omit: conflict: fontspec (6)
+\usepackage{fontspec}% part/@conformance=xelatex detected. (7)%
+\usepackage{mflogo}% used by default. (35)%
+\usepackage[british]{babel}% used by default. (40)%
+\usepackage{array}% use of 'tgroup' detected (46)%
+\usepackage{calc}% used by default. (49)%
+  \makeatletter
+  {\scriptsize
+	    \global\advance\@totalleftmargin by1em
+	    \global\advance\MacroIndent by.5em}
+  \makeatother
+\usepackage{ccaption}% used by default. (52)%
   \captionnamefont{\bfseries}
   \captionstyle{\raggedright}
-\usepackage[inline]{enumitem}% use of 'variablelist' was detected (45)
+\usepackage[inline]{enumitem}% use of 'variablelist' detected (56)%
   \setlist[description]{style=unboxed}
-\usepackage{fancybox}% use of 'note' was detected (46)
-\usepackage{fancyvrb}% use of 'bibliography' was detected (49)
-\usepackage{textcase}% included by default. (55)
+  \setlist[itemize]{leftmargin=2em}
+  \setlist[enumerate]{leftmargin=2em}
+  \newlist{inlineenum}{enumerate*}{1}
+  \setlist[inlineenum,1]{label=\emph{\alph*}),
+	    itemjoin={{; }},itemjoin*={{; and }}}
+\usepackage{fancybox}% use of 'note' detected (57)%
+\usepackage{fancyvrb}% use of 'bibliography' detected (60)%
+\usepackage{relsize}% use of 'acronym' detected (64)%
+\usepackage{textcase}% used by default. (67)%
+\usepackage{float}% used by default. (69)%
+  \renewcommand{\topfraction}{.85}
+  \renewcommand{\bottomfraction}{.7}
+  \renewcommand{\textfraction}{.15}
+  \renewcommand{\floatpagefraction}{.66}
+  \renewcommand{\dbltopfraction}{.66}
+  \renewcommand{\dblfloatpagefraction}{.66}
+  \setcounter{topnumber}{9}
+  \setcounter{bottomnumber}{9}
+  \setcounter{totalnumber}{20}
+  \setcounter{dbltopnumber}{9}
 \usepackage[a4paper,left=30mm,top=25mm,
-  textwidth=150mm,textheight=225mm]{geometry}% included by default. (58)
-\usepackage{listings}% use of 'programlisting' was detected (67)
+  textwidth=150mm,textheight=225mm,headheight=15pt]{geometry}% used by default. (71)%
+\usepackage{graphicx}% part/@conformance=xelatex detected. (76)%
+\usepackage{listings}% use of 'programlisting' detected (83)%
   \lstdefinelanguage{dummy}
 	    {morekeywords={dummy}}
-	  
   \lstdefinelanguage{Makefile}
 	  {otherkeywords={.PHONY,.DEFAULT},%
 	    morekeywords={PHONY,DEFAULT,shell,ifeq,else,endif},%
@@ -177,7 +217,8 @@
   \lstdefinelanguage{bash}
 	    {morestring=[s]{[]},morekeywords={exit,logout,yes,no,@,
 	    password,ssh,URL,cd,dvips,latex,ls,makeindex,man,mkdir,
-	    pdflatex,sudo,texconfig,texdoc,updmap,xelatex}} 
+	    pdflatex,sudo,texconfig,texdoc,updmap,xelatex,biber,
+	    latexmk,bibtex}} 
 	  
   \makeatother
   \lstdefinelanguage{APA}[]{XML}
@@ -264,6 +305,7 @@
 	    rulecolor=\color{LightSteelBlue},framerule=1pt}
 	  
   \lstloadlanguages{LaTeXe,DocBook,XML,XSLT2,bash}
+  \lstdefinelanguage{XMLFRAG}{tag=**[s]<>}[html]
   \lstnewenvironment{listingsdoc}
 	    {\lstset{language={[LaTeX]TeX}}}
 	    {}
@@ -294,10 +336,15 @@
 	    {ö}{{\"o}}1
 	    {ú}{{\'u}}1
 	    {ü}{{\"u}}1
+	    {¹}{{\textsuperscript1}}1
+            {²}{{\textsuperscript2}}1
+            {³}{{\textsuperscript3}}1
 	    {ı}{{\i}}1
 	    {—}{{---}}1
 	    {’}{{'}}1
 	    {…}{{\dots}}1
+	    {➝}{{$leftarrow$}}1
+            {⮠}{{$\hookleftarrow$}}1
 	    {␣}{{\textvisiblespace}}1,
 	    keywordstyle=\color{DarkGreen}\bfseries,
 	    identifierstyle=\color{DarkRed},
@@ -307,20 +354,19 @@
 	    showstringspaces=false,
 	    columns=fullflexible,
 	    keepspaces=true}
-\usepackage{makeidx}% included by default. (68)
+\usepackage{makeidx}% used by default. (85)%
   \makeindex
-\usepackage{nicefrac}% included by default. (73)
+\usepackage{nicefrac}% used by default. (91)%
   \def\textonehalf{\ensuremath{\nicefrac12}}
-\usepackage{parskip}% requested by author (75)
-\usepackage{pdfpages}% a imagedata/@format='pdf' was detected. (76)
-\usepackage{sectsty}% included by default. (78)
-  \allsectionsfont{\sffamily}
+\usepackage{parskip}% requested by author (93)%
+\usepackage{sectsty}% used by default. (96)%
+  \allsectionsfont{\sffamily\raggedright}
   \renewcommand*{\descriptionlabel}[1]{\hspace\labelsep
 	    \sffamily\bfseries #1}
-\usepackage[normalem]{ulem}% use of 'link' was detected (84)
-\usepackage{url}% use of 'ulink' was detected (85)
+\usepackage[normalem]{ulem}% use of 'link' detected (103)%
+\usepackage{url}% use of 'ulink' detected (104)%
   \AtBeginDocument{\urlstyle{tt}}
-\usepackage{varioref}% use of 'xref' was detected (88)
+\usepackage{varioref}% use of 'xref' detected (107)%
   \vrefwarning
   \labelformat{appendix}{Appendix~#1}
   \makeatletter
@@ -337,118 +383,125 @@
 	    page}
   \def\reftextafter{on the
 	    \reftextvario{next}{following} page}
-\usepackage{xcolor}% included by default. (90)
+\usepackage{xcolor}% used by default. (115)%
   \makeatletter
   \@ifundefined{T}{%
-	    \newcommand{\T}[2]{{\fontencoding{T1}\selectfont#2}}}{}
+	    \newcommand{\T}[2]{{\fontencoding{T1}%
+	      \selectfont#2}}}{}
   \makeatother
-\usepackage{menukeys}% use of 'guimenu' was detected (92)
+\usepackage{menukeys}% use of 'guimenu' detected (118)%
   \renewmenumacro{\menu}[>]{roundedmenus}
   \renewmenumacro{\directory}[/]{hyphenatepathswithfolder}
   \renewmenumacro{\keys}{shadowedroundedkeys}
-\usepackage{classpack}% included by default. (93)
+\usepackage{classpack}[2020/05/19]% used by default. (120)%
 \newcommand{\classorpackage}{class}
 %
 %%
-%% Settings for docstrip and latexdoc 
+%% Settings for docstrip and ltxdoc 
 %%
 \EnableCrossrefs
 \CodelineIndex
 \RecordChanges
 \begin{document}
-  \DocInput{vsg.dtx}
+  \DocInput{veryshortguide.dtx}
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{1031}
+% \CheckSum{253}
 %
 % \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
 %   Digits        \0\1\2\3\4\5\6\7\8\9
-%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%   Dollar        \$     Percent       \%     Ampersand     \&
-%   Acute accent  \'     Left paren    \(     Right paren   \)
-%   Asterisk      \*     Plus          \+     Comma         \,
-%   Minus         \-     Point         \.     Solidus       \/
-%   Colon         \:     Semicolon     \;     Less than     \<
-%   Equals        \=     Greater than  \>     Question mark \?
-%   Commercial at \@     Left bracket  \[     Backslash     \\
-%   Right bracket \]     Circumflex    \^     Underscore    \_
-%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%   Right brace   \}     Tilde         \~}
+%   Exclamation   \!  Double quote  \"  Hash (number) \#
+%   Dollar        \$  Percent       \%  Ampersand     \&
+%   Acute accent  \'  Left paren    \(  Right paren   \)
+%   Asterisk      \*  Plus          \+  Comma         \,
+%   Minus         \-  Point         \.  Solidus       \/
+%   Colon         \:  Semicolon     \;  Less than     \<
+%   Equals        \=  Greater than  \>  Question mark \?
+%   Commercial at \@  Left bracket  \[  Backslash     \\
+%   Right bracket \]  Circumflex    \^  Underscore    \_
+%   Grave accent  \`  Left brace    \{  Vertical bar  \|
+%   Right brace   \}  Tilde         \~}
 % 
-% \changes{v0.6}{2016/08/12}{Fixed bug in imposition: Added -sPAPERSIZE to the reconversion to PDF. Thanks to Bruno Le Floch for spotting this..}
-% \changes{v0.5}{2016/08/10}{Started documenting actual text: Trying to explain why I wrote what I wrote. This is unfinished at the moment..}
+% \changes{v0.7}{2020/04/16}{Regression release: 1) Updated to ClassPack 1.19; 2) Switched all conformance attributes on revision dates to YYYY-MM-DD; 3) Fixed some minor typos.}
+% \changes{v0.6}{2020/03/20}{Maintenance release: 1) Updated to ClassPack 1.18 ready for new release; 2) Replaced all conformance attributes on revision dates with YYYY-MM-DD as per changes to ClassPack.}
+% \changes{v0.5}{2017/12/24}{Maintenance release: Updated ClassPack, changed fonts to Plex.}
 % \changes{v0.4}{2016/06/14}{Moved into ClassPack: Added parameterisation for A4 and Legal.}
 % \changes{v0.3}{2016/06/04}{Updated to \XeLaTeX{}: Changed fonts again, switched to biber.}
 % \changes{v0.2}{2013/01/22}{Reissue: Fixed typos and changed font.}
 % \changes{v0.1}{2009/10/01}{Reworked from 2006 original: Changed to 4pp A4.}
 %
-% \GetFileInfo{vsg.dtx}
+% \GetFileInfo{veryshortguide.dtx}
 %
 % \DoNotIndex{\@,\@@par,\@beginparpenalty,\@empty}
-% \DoNotIndex{\@flushglue,\@gobble,\@input}
-% \DoNotIndex{\@makefnmark,\@makeother,\@maketitle}
-% \DoNotIndex{\@namedef,\@ne,\@spaces,\@tempa}
-% \DoNotIndex{\@tempb,\@tempswafalse,\@tempswatrue}
-% \DoNotIndex{\@thanks,\@thefnmark,\@topnum}
-% \DoNotIndex{\@@,\@elt,\@forloop,\@fortmp,\@gtempa,\@totalleftmargin}
-% \DoNotIndex{\",\/,\@ifundefined,\@nil,\@verbatim,\@vobeyspaces}
-% \DoNotIndex{\|,\~,\ ,\active,\advance,\aftergroup,\begingroup,\bgroup}
-% \DoNotIndex{\mathcal,\csname,\def,\documentstyle,\dospecials,\edef}
-% \DoNotIndex{\egroup}
-% \DoNotIndex{\else,\endcsname,\endgroup,\endinput,\endtrivlist}
-% \DoNotIndex{\expandafter,\fi,\fnsymbol,\futurelet,\gdef,\global}
-% \DoNotIndex{\hbox,\hss,\if,\if@inlabel,\if@tempswa,\if@twocolumn}
-% \DoNotIndex{\ifcase}
-% \DoNotIndex{\ifcat,\iffalse,\ifx,\ignorespaces,\index,\input,\item}
-% \DoNotIndex{\jobname,\kern,\leavevmode,\leftskip,\let,\llap,\lower}
-% \DoNotIndex{\m@ne,\next,\newpage,\nobreak,\noexpand,\nonfrenchspacing}
-% \DoNotIndex{\obeylines,\or,\protect,\raggedleft,\rightskip,\rm,\sc}
-% \DoNotIndex{\setbox,\setcounter,\small,\space,\string,\strut}
-% \DoNotIndex{\strutbox}
-% \DoNotIndex{\thefootnote,\thispagestyle,\topmargin,\trivlist,\tt}
-% \DoNotIndex{\twocolumn,\typeout,\vss,\vtop,\xdef,\z@}
-% \DoNotIndex{\,,\@bsphack,\@esphack,\@noligs,\@vobeyspaces,\@xverbatim}
-% \DoNotIndex{\`,\catcode,\end,\escapechar,\frenchspacing,\glossary}
-% \DoNotIndex{\hangindent,\hfil,\hfill,\hskip,\hspace,\ht,\it,\langle}
-% \DoNotIndex{\leaders,\long,\makelabel,\marginpar,\markboth,\mathcode}
-% \DoNotIndex{\mathsurround,\mbox,\newcount,\newdimen,\newskip}
-% \DoNotIndex{\nopagebreak}
-% \DoNotIndex{\parfillskip,\parindent,\parskip,\penalty,\raise,\rangle}
-% \DoNotIndex{\section,\setlength,\TeX,\topsep,\underline,\unskip,\verb}
-% \DoNotIndex{\vskip,\vspace,\widetilde,\\,\%,\@date,\@defpar}
-% \DoNotIndex{\[,\{,\},\]}
-% \DoNotIndex{\count@,\ifnum,\loop,\today,\uppercase,\uccode}
-% \DoNotIndex{\baselineskip,\begin,\tw@}
-% \DoNotIndex{\a,\b,\c,\d,\e,\f,\g,\h,\i,\j,\k,\l,\m,\n,\o,\p,\q}
-% \DoNotIndex{\r,\s,\t,\u,\v,\w,\x,\y,\z,\A,\B,\C,\D,\E,\F,\G,\H}
-% \DoNotIndex{\I,\J,\K,\L,\M,\N,\O,\P,\Q,\R,\S,\T,\U,\V,\W,\X,\Y,\Z}
-% \DoNotIndex{\1,\2,\3,\4,\5,\6,\7,\8,\9,\0}
-% \DoNotIndex{\!,\#,\$,\&,\',\(,\),\+,\.,\:,\;,\<,\=,\>,\?,\_}
-% \DoNotIndex{\discretionary,\immediate,\makeatletter,\makeatother}
-% \DoNotIndex{\meaning,\newenvironment,\par,\relax,\renewenvironment}
-% \DoNotIndex{\repeat,\scriptsize,\selectfont,\the,\undefined}
-% \DoNotIndex{\arabic,\do,\makeindex,\null,\number,\show,\write,\@ehc}
-% \DoNotIndex{\@author,\@ehc,\@ifstar,\@sanitize,\@title,\everypar}
-% \DoNotIndex{\if@minipage,\if@restonecol,\ifeof,\ifmmode}
-% \DoNotIndex{\lccode,\newtoks,\onecolumn,\openin,\p@,\SelfDocumenting}
-% \DoNotIndex{\settowidth,\@resetonecoltrue,\@resetonecolfalse,\bf}
-% \DoNotIndex{\clearpage,\closein,\lowercase,\@inlabelfalse}
-% \DoNotIndex{\selectfont,\mathcode,\newmathalphabet,\rmdefault}
-% \DoNotIndex{\bfdefault,\DeclareRobustCommand}
+% \DoNotIndex{\@flushglue,\@gobble,\@input,\@makefnmark}
+% \DoNotIndex{\@makeother,\@maketitle,\@namedef,\@ne}
+% \DoNotIndex{\@spaces,\@tempa,\@tempb,\@tempswafalse}
+% \DoNotIndex{\@tempswatrue,\@thanks,\@thefnmark,\@topnum}
+% \DoNotIndex{\@@,\@elt,\@forloop,\@fortmp,\@gtempa}
+% \DoNotIndex{\@totalleftmargin,\",\/,\@ifundefined,\@nil}
+% \DoNotIndex{\@verbatim,\@vobeyspaces,\|,\~,\ ,\active}
+% \DoNotIndex{\advance,\aftergroup,\begingroup,\bgroup}
+% \DoNotIndex{\mathcal,\csname,\def,\documentstyle}
+% \DoNotIndex{\dospecials,\edef,\egroup,\else,\endcsname}
+% \DoNotIndex{\endgroup,\endinput,\endtrivlist}
+% \DoNotIndex{\expandafter,\fi,\fnsymbol,\futurelet,\gdef}
+% \DoNotIndex{\global,\hbox,\hss,\if,\if@inlabel}
+% \DoNotIndex{\if@tempswa,\if@twocolumn,\ifcase,\ifcat}
+% \DoNotIndex{\iffalse,\ifx,\ignorespaces,\index,\input}
+% \DoNotIndex{\item,\jobname,\kern,\leavevmode,\leftskip}
+% \DoNotIndex{\let,\llap,\lower,\m@ne,\next,\newpage}
+% \DoNotIndex{\nobreak,\noexpand,\nonfrenchspacing}
+% \DoNotIndex{\obeylines,\or,\protect,\raggedleft}
+% \DoNotIndex{\rightskip,\rm,\sc,\setbox,\setcounter}
+% \DoNotIndex{\small,\space,\string,\strut,\strutbox}
+% \DoNotIndex{\thefootnote,\thispagestyle,\topmargin}
+% \DoNotIndex{\trivlist,\tt,\twocolumn,\typeout,\vss,\vtop}
+% \DoNotIndex{\xdef,\z@,\,,\@bsphack,\@esphack,\@noligs}
+% \DoNotIndex{\@vobeyspaces,\@xverbatim,\`,\catcode,\end}
+% \DoNotIndex{\escapechar,\frenchspacing,\glossary}
+% \DoNotIndex{\hangindent,\hfil,\hfill,\hskip,\hspace,\ht}
+% \DoNotIndex{\it,\langle,\leaders,\long,\makelabel}
+% \DoNotIndex{\marginpar,\markboth,\mathcode,\mathsurround}
+% \DoNotIndex{\mbox,\newcount,\newdimen,\newskip}
+% \DoNotIndex{\nopagebreak,\parfillskip,\parindent}
+% \DoNotIndex{\parskip,\penalty,\raise,\rangle,\section}
+% \DoNotIndex{\setlength,\TeX,\topsep,\underline,\unskip}
+% \DoNotIndex{\verb,\vskip,\vspace,\widetilde,\\,\%,\@date}
+% \DoNotIndex{\@defpar,\[,\{,\},\],\count@,\ifnum,\loop}
+% \DoNotIndex{\today,\uppercase,\uccode,\baselineskip}
+% \DoNotIndex{\begin,\tw@,\a,\b,\c,\d,\e,\f,\g,\h,\i,\j,\k}
+% \DoNotIndex{\l,\m,\n,\o,\p,\q,\r,\s,\t,\u,\v,\w,\x,\y,\z}
+% \DoNotIndex{\A,\B,\C,\D,\E,\F,\G,\H,\I,\J,\K,\L,\M,\N,\O}
+% \DoNotIndex{\P,\Q,\R,\S,\T,\U,\V,\W,\X,\Y,\Z,\1,\2,\3,\4}
+% \DoNotIndex{\5,\6,\7,\8,\9,\0,\!,\#,\$,\&,\',\(,\)}
+% \DoNotIndex{\+,\.,\:,\;,\<,\=,\>,\?,\_,\discretionary}
+% \DoNotIndex{\immediate,\makeatletter,\makeatother}
+% \DoNotIndex{\meaning,\newenvironment,\par,\relax}
+% \DoNotIndex{\renewenvironment,\repeat,\scriptsize}
+% \DoNotIndex{\selectfont,\the,\undefined,\arabic,\do}
+% \DoNotIndex{\makeindex,\null,\number,\show,\write,\@ehc}
+% \DoNotIndex{\@author,\@ehc,\@ifstar,\@sanitize,\@title}
+% \DoNotIndex{\everypar,\if@minipage,\if@restonecol,\ifeof}
+% \DoNotIndex{\ifmmode,\lccode,\newtoks,\onecolumn,\openin}
+% \DoNotIndex{\p@,\SelfDocumenting,\settowidth}
+% \DoNotIndex{\@resetonecoltrue,\@resetonecolfalse,\bf}
+% \DoNotIndex{\clearpage,\closein,\lowercase}
+% \DoNotIndex{\@inlabelfalse,\selectfont,\mathcode}
+% \DoNotIndex{\newmathalphabet,\rmdefault,\bfdefault}
+% \DoNotIndex{\DeclareRobustCommand}
 % \DoNotIndex{\classorpackage}
 % \DoNotIndex{\centering}
 % \DoNotIndex{\descriptionlabel}
-% \DoNotIndex{\author}
 %
-% \def\fileversion{0.6}
-% \def\filedate{2016/08/12}
-% \title{The  \textsf{vsg} \LaTeXe\ document class\thanks{%
-% This document corresponds to \textsf{vsg}
-% \textit{v.}\ \fileversion $\beta$, dated \filedate.}
+% \def\fileversion{0.7}
+% \def\filedate{2020/04/16}
+% \title{The  \textsf{veryshortguide} \LaTeXe\ document class\thanks{%
+% This document corresponds to \textsf{veryshortguide}
+% \textit{v.}\ \fileversion p, dated \filedate.}
 % \\[1em]\Large 
 % The Very Short Guide to \LaTeX{}}
 % \author{Peter Flynn\\\normalsize Silmaril Consultants\\[-.25ex]\normalsize \\\normalsize(\url{peter@silmaril.ie})}
@@ -458,17 +511,13 @@
 % \parskip=0.5\baselineskip
 % \advance\parskip by 0pt plus 2pt
 % \parindent=0pt% \noindent
-% This is a document class derived from the original
+% This is the document class originally designed for the
 % \emph{Very Short Guide to \LaTeX{}}, a 4pp
 % folder designed as an aide-mémoire for people who have just
 % done a course in \LaTeX{} and need something by them on their
 % desk the next day to refresh their memories. It is
 % \emph{not} intended as a substitute for full
 % documentation.\par
-% This class is designed for this document only, but adds
-% parameterisation to allow reformatting tweaks for different
-% paper sizes (A4 and Legal) to allow it to be printed two-sided
-% as a 4pp folder.\par
 % Please do not complain that there is no math here. It
 % won't fit. Someone else can do a math leaflet. IANAM.\par
 % \end{abstract}
@@ -476,39 +525,42 @@
 % \tableofcontents
 % \clearpage
 % \section*{Latest changes}
-% \subsection*{v.0.6 (2016-08-12)}
-% \paragraph*{Fixed bug in imposition}
+% \subsection*{v.0.7 (2020-04-16)}
+% \paragraph*{Regression release}
 % \begin{itemize}
-% \item Added \texttt{-sPAPERSIZE} to the reconversion
-%       to \textsc{pdf}. Thanks to Bruno Le Floch for
-%       spotting this.
+% \item Updated to \emph{ClassPack}
+% 1.19\par
+% \item Switched all \texttt{@conformance} attributes on
+% revision dates to \texttt{@YYYY-MM-DD}\par
+% \item Fixed some minor typos\par
 % \end{itemize}
-% \subsection*{v.0.5 (2016-08-10)}
-% \paragraph*{Started documenting actual text}
+% \subsection*{v.0.6 (2020-03-20)}
+% \paragraph*{Maintenance release}
 % \begin{itemize}
-% \item Trying to explain why I wrote what I wrote. This
-%       is unfinished at the moment.
+% \item Updated to ClassPack 1.18 ready for new release\par
+% \item Replaced all \texttt{@conformance} attributes on
+% revision dates with \texttt{@YYYY-MM-DD} as per changes to
+% \emph{ClassPack}\par
 % \end{itemize}
-% \subsection*{v.0.4 (2016-06-14)}
-% \paragraph*{Moved into ClassPack}
+% \subsection*{v.0.5 (2017-12-24)}
+% \paragraph*{Maintenance release}
 % \begin{itemize}
-% \item Added parameterisation for A4 and Legal
+% \item Updated ClassPack, changed fonts to Plex\par
 % \end{itemize}
-% \subsection*{v.0.3 (2016-06-04)}
-% \paragraph*{Updated to \XeLaTeX{}}
+% \subsection*{v.0.4 (2016-06-14)}
+% \paragraph*{Moved into ClassPack}
 % \begin{itemize}
-% \item Changed fonts again, switched to
-% \emph{biber}
+% \item Added parameterisation for A4 and Legal\par
 % \end{itemize}
-% See p.\thinspace\pageref{changehistory} for details of earlier changes.
+% See p.\thinspace\pageref{changehistory} for earlier changes.
 % \clearpage
 % \section{Acknowledgements}
 % Thanks to all those on c.t.t whose suggestions made this
 % version more useful.\par
 % Alan Munn for the distinction between base font and font
-% package and for suggesting ``expected functionality'' packages
-% on sectioning, long tables, headers, and double spacing, and
-% links to FAQ and CTAN.\par
+% package and for suggesting `expected
+%   functionality' packages on sectioning, long tables,
+% headers, and double spacing, and links to FAQ and CTAN.\par
 % Lars Madsen, Will Robertson, Robin Fairbairns and others
 % for asking for the center environment in tables and figures to
 % be replaced with the {\ttfamily{}\textbackslash{}centering} command (I
@@ -517,257 +569,179 @@
 % Rob Felty and Domink Wass for pointing me at Winston
 % Chang's excellent \emph{LaTeX Cheat Sheet}
 % summary.\par
+% \StopEventually{\label{endcode}%
+%   \clearpage
+%   \newgeometry{left=3cm}%
+%   \addcontentsline{toc}{section}{Change History}%
+%   \label{changehistory}%
+%   \PrintChanges
+%   \clearpage
+%   \label{codeindex}%
+%   \addcontentsline{toc}{section}{Index}%
+%   \PrintIndex}
+% \addtolength{\CPKrevmarg}{\widthof{\LabelFont{descriptionlabel}}}
+% \newgeometry{left=\CPKrevmarg}
+% \message{Margin reset to \the\CPKrevmarg, to fit <descriptionlabel>}
+% \iffalse
+%<*class>
+% \fi
 % \clearpage
-% \section{Usage}
-% The document class is designed solely for the Very Short
-%       Guide, and it is not envisaged that it would be of any use for
-%       other types of document except similar short guides.\par
-% \subsection{Options}
-% The only available options are:\par
-% \begin{description}[style=unboxed]
-% \item[\textbf{\texttt{a5paper}}\thinspace:](the default) formats it as four pages of A5, suitable
-% for imposition two-up on A4 for double-sided printing.
-% \item[\textbf{\texttt{legalpaper}}\thinspace:]format it as four pages each half the size of a
-% sheet of US Legal (8.5x14in) so that the
-% same imposition can be used to print on Legal paper.
-% \end{description}
-% \par\begingroup\fboxsep1em\centering
-%   \fbox{\begin{minipage}{0.8\columnwidth}\sffamily
-%  \raggedright\parindent0pt\parskip=.5\baselineskip
-% \subsubsection*{\sffamily Warning}
-% A lot of stuff is faked up in the document, because
-%     we're combining incompatible things for the sake of showing
-%     examples which would not normally occur in a normal
-%     document, let alone one as small as this. The demands of
-%     space mean that there is far more manual adjustment needed
-%     than would be seen in a standard continuous-text document.
-%     Live with it.\par
-% \end{minipage}}\par\endgroup
-% \subsection{Printing}
-% To impose for printing, use the
-%   \emph{pdf2ps} utility to convert the
-%   \textsc{pdf} output to \textsc{ps}. Pass
-%   it through the \emph{pstops} utility to
-%   perform imposition, and then use
-%   \emph{ps2pdf} to convert the output back
-%   to \textsc{pdf}. For each format generated, this
-%   means:\par
+% \section{Implementation}\label{veryshortguide}
+% This was originally laid out for A5 pages with margins
+% optimised for a HP K8600 so that I can impose two pages per
+% A4 sheet and print double-sided. It was not tested at
+% letterpaper size (and may not fit) as it makes more sense to
+% do it for half of a Legal sheet (8.5 x 14.0 in) for the US.\par
+% WARNING: a lot of stuff is faked up in the document,
+% because we're combining incompatible things for the sake of
+% showing examples which would not normally occur in the same
+% document (eg both scientific and humanities-style
+% bibliographic references in the same document). The demands of
+% space also mean that there is far more manual adjustment
+% needed than would be seen in a normal continuous-text
+% document. Live with it.\par
+% Printing was prepared with:\par
 % \iffalse
 %<*ignore>
 % \fi
-\begin{lstlisting}[language=bash]
-pdf2ps veryshortguide.pdf - |\
-  pstops -pa4 -b \
-    "4:-3L(21cm,0mm)+0L(21cm,14.85cm),1L(21cm,0mm)+-2L(21cm,14.85cm)" |\
-  ps2pdf -sPAPERSIZE=a4 - veryshortguide-A4-imposed.pdf
-
-pdf2ps veryshortguide.pdf - |\
-  pstops -plegal -b \
-    "4:-3L(8.5in,0in)+0L(8.5in,7in),1L(8.5in,0in)+-2L(8.5in,7in)" |\
-  ps2pdf -sPAPERSIZE=legal - veryshortguide-Legal-imposed.pdf
-\end{lstlisting}
+% \begingroup\advance\hsize by-1em
+% \begin{Verbatim}[frame=single,framesep=1em,
+%  fontsize=\small]
+pdf2ps vsg.pdf - | pstops -pa4 -b \
+"4:-3L(21cm,5mm)+0L(21cm,14.35cm),1L(21cm,5mm)+-2L(21cm,14.35cm)" |\
+ps2pdf - veryshortguide-A4-imposed.pdf
+% \end{Verbatim}
+% \endgroup
 % \iffalse
 %</ignore>
 % \fi
-% Pages are referenced from zero (the first page). This
-%   outputs page 3 (p.4) and page 0 (p.1) on the first side. The
-%   21cm or 8.5in places the reference point (top left corner)
-%   at that distance \emph{up} (\(y\)-axis, the short side of a piece of
-%   landscape paper), and 0mm/0in to the
-%   \emph{right} (\(x\)-axis, the long side) for p.4, and half the
-%   paper-length (14.85mm or 7in) to the right for p.1.\par
-% The verso is produced by the second expression,
-%   outputting page 1 (p.2) and page 2 (p.3) in exactly the same
-%   way.\par
-% You may need to adjust these dimensions if your printer
-%   cannot print all the way to the edge of the sheet. Normally,
-%   there would be no horizontal adjustment, but because my
-%   printer cannot print the bottom 12mm of a sheet (the last
-%   edge to emerge from the printer), if I print 2–up A5 pages
-%   on an A4 sheet like this, I need to allow for the fact that
-%   one edge of two of the pages must have a 12mm margin, so
-%   I have to add 5mm to the horizontal offset to make it
-%   symmetrical. If your printer can bleed off the trailing
-%   edge, then you can adjust the horizontal dimensions
-%   accordingly.\par
-% When printing from Acrobat Reader, it generates the
-%   \emph{lpr}\thinspace(1) command that it
-%   will use. The example below is from my own system:\par
+% On some printers you may need to modify the positioning,
+%       eg\par
 % \iffalse
 %<*ignore>
 % \fi
-\begin{lstlisting}[language={[LaTeX]TeX}]
-lpr -P \
-  Officejet-Pro-K8600 -o PageSize=A6.SM -o PageRegion=A4 \
-  -o Duplex=DuplexTumble -o InputSlot=Auto -o ColorModel=RGB \
-  -o MediaType=Automatic -o OutputMode=Normal -o OptionDuplex=True
-\end{lstlisting}
+% \begingroup\advance\hsize by-1em
+% \begin{Verbatim}[frame=single,framesep=1em,
+%  fontsize=\small]
+pdf2ps veryshortguide.pdf - | pstops -pa4 -b \
+"4:-3L(21cm,7mm)+0L(21cm,14.35cm),1L(21cm,7mm)+-2L(21cm,14.35cm)" |\
+ps2pdf - veryshortguide-A4-imposed.pdf
+% \end{Verbatim}
+% \endgroup
 % \iffalse
 %</ignore>
 % \fi
-% \clearpage
-% \begin{figure}[p]\small\sffamily\centering
-% \caption{Effect of imposition (A4 version) above: front and
-%   back; below: inside.}\medskip
-% \includepdf[pages=1,scale=0.6,angle=270,offset=-5mm 7.2cm,frame]{veryshortguide-A4-imposed.pdf}
-% \par
-% \includepdf[pages=2,scale=0.6,angle=270,offset=-5mm -4.2cm,frame]{veryshortguide-A4-imposed.pdf}
-% \end{figure}
-% \clearpage
-% \StopEventually{\label{endcode}
-%   \clearpage
-%   \newgeometry{left=3cm}
-%   \addcontentsline{toc}{section}{Change History}
-%   \label{changehistory}
-%   \PrintChanges
-%   \clearpage
-%   \label{codeindex}
-%   \addcontentsline{toc}{section}{Index}
-%   \PrintIndex}
-% \addtolength{\revmarg}{\widthof{\LabelFont{descriptionlabel}}}
-% \newgeometry{left=\revmarg}
+% The 7mm margin was needed because my printer cannot print
+% the bottom 7mm of a sheet, so if I print 2-up A5 pages on an
+% A4 sheet, I need to allow for the fact that the trailing edge
+% must have a 7mm margin. For the HP K8600 this meant an
+% [Acrobat-generated] array of parameters:\par
 % \iffalse
-%<*class>
+%<*ignore>
 % \fi
-% \section{Auto-initialisation}
+% \begingroup\advance\hsize by-1em
+% \begin{Verbatim}[frame=single,framesep=1em,
+%  fontsize=\small]
+lpr -P OJPK8600 \
+	-o PageSize=A6.SM \
+	-o PageRegion=A4 \
+	-o Duplex=DuplexTumble \
+	-o InputSlot=Auto \
+	-o ColorModel=RGB \
+	-o MediaType=Automatic \
+	-o OutputMode=Normal \
+	-o OptionDuplex=True
+% \end{Verbatim}
+% \endgroup
+% \iffalse
+%</ignore>
+% \fi
+% \subsection{Auto-initialisation}\label{veryshortguide:autoinit}
 % This section is added automatically by \textit{ClassPack} 
-% as a preamble to all classes. The \textsf{fixltx2e}
-% package is no longer preloaded, as all its
-% features are now a part of the latest \LaTeX\ kernel.\par
+% as a preamble to all classes and style packages. 
+% The \textsf{fixltx2e} package, which used to be included
+% automatically, is no longer preloaded, as its
+% features are now a part of the latest \LaTeXe\ kernel.\par
+% The code starts with identity and requirements which are 
+% generated automatically as needed by the Doc\TeX\ system.
+% For details see the \textsf{ltxdoc} package documentation.
+% \par\smallskip
+% \begingroup\color{DarkRed}\tabcolsep3pt\footnotesize
+% \begin{tabular}{>{\refstepcounter{CodelineNo}\tiny\theCodelineNo}r@{\enspace}l}
+% &\verb`\NeedsTeXFormat{LaTeX2e}[2015/01/01]`\\
+% &\verb`\ProvidesClass{veryshortguide}[2020/04/16 v0.7`\\
+% &\verb`  The Very Short Guide to \LaTeX{}]`
+% \end{tabular}\endgroup
+% \setcounter{CodelineNo}{3}
 % \begin{CPK@package}{fix-cm}
-% Preloaded functions to override the default \LaTeX\ step-size font
-% sizes (which can still be used, but are no longer restrictions).\par
+% Preloaded functions to override the default \LaTeX\
+% step-size font sizes (which can still be used,
+% but are no longer restrictions).\par
 %    \begin{macrocode}
 \RequirePackage{fix-cm}
 %    \end{macrocode}
 % \end{CPK@package}
 % \begin{CPK@option}{svgnames}
-% Pass the \textbf{\texttt{svgnames}} option to the \textsf{xcolor}
-% package if that gets loaded later. This avoids a conflict with 
-% whatever other packages (eg \textsf{hyperref}) use as their own 
-% default is when they load \textsf{xcolor}.\par
+% Pass the \textbf{\texttt{svgnames}} option to the
+% \textsf{xcolor} package if that gets loaded later.
+% This avoids a conflict with any other packages
+% (eg \textsf{hyperref}) which use their own default
+% is when they load \textsf{xcolor}.\par
 %    \begin{macrocode}
-\PassOptionsToPackage{svgnames}{xcolor}
-\PassOptionsToPackage{hyphens}{url}
+  \PassOptionsToPackage{svgnames}{xcolor}
 %    \end{macrocode}
 % \end{CPK@option}
-% \clearpage
-% \section{Implementation}\label{imp}
-% \subsection{Define the paper-size options:}
-% \begin{CPK@switch}{\iflegal}
-% To make the selection persist so we can us it later,
-%   we define two \TeX{} conditionals, one for Legal paper;\par
-%    \begin{macrocode}
-\newif\iflegal
-%    \end{macrocode}
-% \end{CPK@switch}
-% \begin{CPK@switch}{\ifafive}
-% and
-%   one for A5:\par
-%    \begin{macrocode}
-\newif\ifafive
-%    \end{macrocode}
-% \end{CPK@switch}
-% \begin{CPK@macro}{\afivetrue}
-% and set the A5 one as the default\par
-%    \begin{macrocode}
-\afivetrue
-%    \end{macrocode}
-% \end{CPK@macro}
-% \begin{CPK@macro}{\VSG@papersize}
-% Now parameterise the options with macros to hold the
-%     paper size:\par
-%    \begin{macrocode}
-\gdef\VSG@papersize{a5paper}
-%    \end{macrocode}
-% \end{CPK@macro}
-% \begin{CPK@macro}{\VSG@margins}
-% and the appropriate margins for the
-%     \textsf{geometry} package (later):\par
-%    \begin{macrocode}
-\gdef\VSG@margins{margin=12mm,bottom=10mm}
-%    \end{macrocode}
-% \end{CPK@macro}
-% \begin{CPK@option}{a5paper}
-% Then define the A5 option to set the paper size and
-%   margins and set its switch to true (and the other to false):\par
-%    \begin{macrocode}
-\DeclareOption{a5paper}{%
-  \gdef\VSG@papersize{a5paper}%
-  \gdef\VSG@margins{margin=12mm,bottom=10mm}
-  \afivetrue\legalfalse}
-%    \end{macrocode}
-% \end{CPK@option}
-% \begin{CPK@option}{legalpaper}
-% And repeat for the Legal option:\par
-%    \begin{macrocode}
-\DeclareOption{legalpaper}{%
-  \gdef\VSG@papersize{papersize={7in,8.5in}}%
-  \gdef\VSG@margins{margin=15mm,bottom=15mm}
-  \legaltrue\afivefalse}
-%    \end{macrocode}
-% \end{CPK@option}
-% \subsection{Load the base document class}\label{classload}
+% \subsection{Load the document base class}\label{classload}
+% \iffalse
+%% 
+%% ****************************************************************** 
+%% 
+%% Load the document base class
+% \fi
 % This class is based on the standard \LaTeX{}
-%   \textsf{article} class, with no special
+%   \DescribeClass{report}\textsf{report} class, with no special
 %   options.\par
 %    \begin{macrocode}
 \DeclareOption*{%
   \PassOptionsToClass{%
-    \CurrentOption}{article}}
+    \CurrentOption}{report}}
 \ProcessOptions\relax
-\LoadClass{article}
+\LoadClass[oneside]{report}
 %    \end{macrocode}
 %\iffalse
 %%
-%% Packages required
+%% Packages required for the class or package
 %% 
 % \fi
 % \subsection{Packages required for the class}\label{clspackages}
 % \begin{CPK@package}{geometry}
 % Package for establishing margins and text area.
-% Use the paper size and margins that were specified when the relevant option was selected by the used (or the A5 default). ()
 % \iffalse
 %% Package for establishing margins and text area.
 % \fi
 %    \begin{macrocode}
-\RequirePackage[nohead,\VSG@papersize,
-  \VSG@margins]{geometry}
+\RequirePackage[margin=12mm,top=10mm,
+  bottom=10mm,nohead]{geometry}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{fontspec}
 % Font specification setup for use with \XeLaTeX{}.
 % \iffalse
 %% Font specification setup for use with \XeLaTeX{}.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{fontspec}
+\RequirePackage{fontspec}%
 %    \end{macrocode}
-%  \end{CPK@package}
-% \begin{CPK@package}{caladea}
-% Caladea family of fonts, designed by Carolina Giovagnoli
-% and Andres Torresi of the Huerta Tipografica foundry and
-% adopted by Google for ChromeOS as a font-metric compatible
-% replacement for Cambria.
-% \iffalse
-%% Caladea family of fonts, designed by Carolina Giovagnoli and Andres Torresi of the Huerta Tipografica foundry and adopted by Google for ChromeOS as a font-metric compatible replacement for Cambria.
-% \fi
-%    \begin{macrocode}
-\RequirePackage{caladea}
-%    \end{macrocode}
-%  \end{CPK@package}
-% \begin{CPK@package}{raleway}
-% The current Raleway family is an extension of the original
-% Raleway Thin by Matt McInerney. The family has been extended
-% by Impallari, for more information see the impallari website
-% \url{http://www.impallari.com/projects/overview/matt-mcinerneys-raleway-family}.
+% \end{CPK@package}
+% \begin{CPK@package}{libertine}
+% Linux Libertine and Biolinum fonts;
 % \iffalse
-%% The current Raleway family is an extension of the original Raleway Thin by Matt McInerney. The family has been extended by Impallari, for more information see the impallari website http://www.impallari.com/projects/overview/matt-mcinerneys-raleway-family.
+%% Linux Libertine and Biolinum fonts
 % \fi
 %    \begin{macrocode}
-\RequirePackage[scale=.9]{raleway}
+\RequirePackage{libertine}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{graphicx}
 % Provide for graphics (PNG, JPG, or PDF format (only) for
 % pdflatex; EPS format (only) for standard \LaTeX{}).
@@ -775,84 +749,90 @@ lpr -P \
 %% Provide for graphics (PNG, JPG, or PDF format (only) for pdflatex; EPS format (only) for standard \LaTeX{}).
 % \fi
 %    \begin{macrocode}
-\RequirePackage{graphicx}
+\RequirePackage{graphicx}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{url}
 % Handling of URI formatting.
 % \iffalse
 %% Handling of URI formatting.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{url}
+\RequirePackage{url}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{fancybox}
 % This provides round-cornered and drop-shadow boxes.
 % \iffalse
 %% This provides round-cornered and drop-shadow boxes.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{fancybox}
+\RequirePackage{fancybox}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{enumitem}
-% List variants: inline and compact. Note that this replaces
-% the earlier defaults of \textsf{paralist} and
+% List variants: inline and compact.
+% Note that this replaces	the earlier defaults of
+% \textsf{paralist} and 
 % \textsf{mdwlist}.
 % \iffalse
 %% List variants: inline and compact. Note that this replaces the earlier defaults of paralist and mdwlist.
 % \fi
 %    \begin{macrocode}
-\RequirePackage[inline]{enumitem}
+\RequirePackage[inline]{enumitem}%
   \setlist[description]{style=unboxed}
+  \setlist[itemize]{leftmargin=2em}
+  \setlist[enumerate]{leftmargin=2em}
+  \newlist{inlineenum}{enumerate*}{1}
+  \setlist[inlineenum,1]{label=\emph{\alph*}),
+	    itemjoin={{; }},itemjoin*={{; and }}}
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{fix-cm}
 % Allow infinitely-variable font scaling.
 % \iffalse
 %% Allow infinitely-variable font scaling.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{fix-cm}
+\RequirePackage{fix-cm}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{multicol}
 % Provides multi-column typesetting.
 % \iffalse
 %% Provides multi-column typesetting.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{multicol}
+\RequirePackage{multicol}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{nicefrac}
 % Slanted fractions, even in math mode.
 % \iffalse
 %% Slanted fractions, even in math mode.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{nicefrac}
+\RequirePackage{nicefrac}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{fancyvrb}
 % Add more robust verbatim facilities.
 % \iffalse
 %% Add more robust verbatim facilities.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{fancyvrb}
+\RequirePackage{fancyvrb}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{bbding}
 % Karel Horak's dingbats symbols.
 % \iffalse
 %% Karel Horak's dingbats symbols.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{bbding}
+\RequirePackage{bbding}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{parskip}
 % Creates paragraphs separated by white-space with no
 % indentation.
@@ -860,18 +840,18 @@ lpr -P \
 %% Creates paragraphs separated by white-space with no indentation.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{parskip}
+\RequirePackage{parskip}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{ragged2e}
 % Allow hyphenation in ragged setting.
 % \iffalse
 %% Allow hyphenation in ragged setting.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{ragged2e}
+\RequirePackage{ragged2e}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{calc}
 % Required for calculations involving lengths or counters,
 % such as changes to widths for margin adjustment.
@@ -879,9 +859,9 @@ lpr -P \
 %% Required for calculations involving lengths or counters, such as changes to widths for margin adjustment.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{calc}
+\RequirePackage{calc}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{ifthen}
 % Package to enable if--then--else conditional
 %       processing.
@@ -889,37 +869,37 @@ lpr -P \
 %% Package to enable if--then--else conditional processing.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{ifthen}
+\RequirePackage{ifthen}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{textcomp}
 % Additional commands for common symbols and punctuation.
 % \iffalse
 %% Additional commands for common symbols and punctuation.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{textcomp}
+\RequirePackage{textcomp}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{array}
-% Additional column formatting for tables.
+% Additional column formatting types for tables.
 % \iffalse
-%% Additional column formatting for tables.
+%% Additional column formatting types for tables.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{array}
+\RequirePackage{array}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{relsize}
 % Provides size-relative font size changes (smaller, larger,
-%       etc).
+% etc).
 % \iffalse
 %% Provides size-relative font size changes (smaller, larger, etc).
 % \fi
 %    \begin{macrocode}
-\RequirePackage{relsize}
+\RequirePackage{relsize}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{textcase}
 % Provides a more sophisticated casing function than the
 %       default.
@@ -927,9 +907,9 @@ lpr -P \
 %% Provides a more sophisticated casing function than the default.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{textcase}
+\RequirePackage{textcase}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{flexlogo}
 % Allows user-programmable changes to the positioning of
 %       letters in the \TeX{}-related logos on a per-font basis.
@@ -937,9 +917,9 @@ lpr -P \
 %% Allows user-programmable changes to the positioning of letters in the \TeX{}-related logos on a per-font basis.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{flexlogo}
+\RequirePackage{flexlogo}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{ulem}
 % Underlining as an option (\emph{not}
 % automatically replacing italics).
@@ -947,20 +927,27 @@ lpr -P \
 %% Underlining as an option (not automatically replacing italics).
 % \fi
 %    \begin{macrocode}
-\RequirePackage[normalem]{ulem}
+\RequirePackage[normalem]{ulem}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{xcolor}
 % Provide color.
 % \iffalse
 %% Provide color.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{xcolor}
+\RequirePackage{xcolor}%
   \@ifundefined{T}{%
-	    \newcommand{\T}[2]{{\fontencoding{T1}\selectfont#2}}}{}
+	    \newcommand{\T}[2]{{\fontencoding{T1}%
+	      \selectfont#2}}}{}
 %    \end{macrocode}
-%  \end{CPK@package}
+% There seems to be a bug in the T1 encoding of some package
+% (unidentified, but possibly \textsf{xcolor}) which
+% uses the command {\ttfamily{}\textbackslash{}T1}, which is an
+% impossibility (no digits allowed in command names). So we fake
+% it here to stop \LaTeX{} complaining, by dropping the first
+% argument on the floor.
+% \end{CPK@package}
 % \begin{CPK@package}{babel}
 % Add language, cultural changes, and H\&J support for many
 % languages.
@@ -968,94 +955,123 @@ lpr -P \
 %% Add language, cultural changes, and H\&J support for many languages.
 % \fi
 %    \begin{macrocode}
-\RequirePackage[british]{babel}
+\RequirePackage[british]{babel}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{biblatex}
-% Use \textsf{biblatex} instead of \BibTeX{}
+% Use \textsf{biblatex} instead of \BibTeX{};
 % \iffalse
 %% Use biblatex instead of \BibTeX{}
 % \fi
 %    \begin{macrocode}
 \RequirePackage[backend=biber,doi=true,
-  isbn=true,url=true,uniquename=false,style=apa]{biblatex}
-  \AtBeginDocument{\setlength{\bibitemsep}{1ex}
-	  \defbibheading{shortbib}[Bibliography]{\section{#1}}}
-	    \@ifpackagewith{babel}{british}{%
-	    \DeclareLanguageMapping{british}{british-apa}}{\relax}
+  isbn=true,url=true,uniquename=false,style=apa]{biblatex}%
+  \AtBeginDocument{%
+	    \setlength{\bibitemsep}{1ex}%
+	    \setlength{\bibnamesep}{1.5\itemsep}%
+	    \defbibheading{shortbib}[References]%
+	      {\section{#1}}}
+	  \@ifpackagewith{babel}{british}{%
+	    \DeclareLanguageMapping{british}%
+	      {british-apa}}{\relax}
+  \providetoggle{blx@skipbiblist}
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{csquotes}
 % Adds correct curly quotes for cited titles when using
-% \textsf{biblatex}
+% \textsf{biblatex};
 % \iffalse
 %% Adds correct curly quotes for cited titles when using biblatex
 % \fi
 %    \begin{macrocode}
-\RequirePackage{csquotes}
+\RequirePackage{csquotes}%
 %    \end{macrocode}
-%  \end{CPK@package}
+% \end{CPK@package}
 % \begin{CPK@package}{menukeys}
 % Graphical representations of menus, directories, and keys.
 % \iffalse
 %% Graphical representations of menus, directories, and keys.
 % \fi
 %    \begin{macrocode}
-\RequirePackage{menukeys}
+\RequirePackage{menukeys}%
   \renewmenumacro{\menu}[>]{roundedmenus}
   \renewmenumacro{\directory}[/]{hyphenatepathswithfolder}
   \renewmenumacro{\keys}{shadowedroundedkeys}
 %    \end{macrocode}
-%  \end{CPK@package}
+% Graphical representations of menus, directories, and keys.
+% \end{CPK@package}
 % 
-% \subsection{Additions and changes to package defaults}\label{packagemods}
-% As we're using \XeLaTeX{}, the first thing to do is add
-% any non-package fonts, then everything else.\par
-% \begin{CPK@font}{zcoN}
-% This is the Nimbus–15 Narrow replacement for Courier.\par
+% \subsection{Font loading}\label{fontloads}
+% \iffalse
+%% 
+%% ****************************************************************** 
+%% 
+%% Font loading
+% \fi
+% The \textsf{fontspec} package provides a way
+% to scale the sans and mono fonts to match the roman.\par
 %    \begin{macrocode}
+\setmainfont{Linux Libertine O}
+\setsansfont[Scale=MatchLowercase]{Raleway}
 \setmonofont[Scale=MatchLowercase]{zcoN}
 %    \end{macrocode}
-% \end{CPK@font}
-% \begin{CPK@macro}{\labelitemi}
-% Use a pointy pencil from the bbding package for
-%     itemized lists.\par
+% \subsection{Changes to package defaults}\label{packagemods}
+% \iffalse
+%% 
+%% ****************************************************************** 
+%% 
+%% Changes to package defaults
+% \fi
+% \par
+% \begin{CPK@macro}{\labelitemi}\label{macro--labelitemi}
+% Use a pointy pencil from the \textsf{bbding}
+%     package for itemized lists.\par
 %    \begin{macrocode}
 \renewcommand{\labelitemi}{%
   \raisebox{-.5ex}{\textcolor{Purple}{\PencilRight}}}
-\setlength{\leftmargini}{18pt}% don't waste margin space in lists
+\setlength{\leftmargini}{18pt}% don't waste margin space
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\example}
+% \begin{CPK@macro}{\example}\label{macro--example}
 % Provide commands for distinguishing examples and their
 %     output.\par
 %    \begin{macrocode}
 \newcommand{\example}{%
-  \color{DarkGreen}\textsf{\bfseries Example:} \color{MediumBlue}}
+    \color{DarkGreen}\textsf{\bfseries Example:}
+    \color{MediumBlue}}
 \def\endexample{\color{black}}
 \newcommand{\gives}[1]{%
   \thinspace\color{DarkGreen}\raisebox{-.4ex}
     {\ArrowBoldRightStrobe}~\color{DarkRed}{\rmfamily
      #1}\color{black}}
-\newcommand{\nobox}{~\raisebox{-.25ex}{%
-  \footnotesize\Square\llap\XSolidBrush}}
-\newcommand{\yesbox}{~\raisebox{-.25ex}{%
-  \footnotesize\Square\llap\CheckmarkBold}}
+\newcommand{\nobox}{~\raisebox{-.25ex}{\footnotesize
+    \Square\llap\XSolidBrush}}
+\newcommand{\yesbox}{~\raisebox{-.25ex}{\footnotesize
+    \Square\llap\CheckmarkBold}}
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\comment}
-% In fancyverb's Verbatim, allow rubric embedded as
-%   marked text in red \par
+% \begin{CPK@macro}{\comment}\label{macro--comment}
+% In \textsf{fancyverb}'s Verbatim, allow
+%     rubric embedded as marked text in red \par
 %    \begin{macrocode}
-\newcommand{\comment}[1]{\ifthenelse{\equal{#1}{ }}{}{#1}\normalfont
-  \itshape\footnotesize\color{DarkRed}}
+\newcommand{\comment}[1]{%
+    \ifthenelse{\equal{#1}{ }}{}{#1}\normalfont
+    \itshape\footnotesize\color{DarkRed}}
 % Allow notification of newly-added material
 \newcommand{\added}{\color{MediumBlue}}
 % This reverts rubric back to normal, to avoid embedded spaces
 \newcommand{\revert}{\ttfamily\upshape\color{black}}
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\monthdate}
+% \begin{CPK@environment}{note}\label{environment--note}
+% The \texttt{note} environment is for notes which
+%     are in the page body, not footnotes.\par
+%    \begin{macrocode}
+\newenvironment{note}{\begingroup\small\textbf{\sffamily Note:}}
+    {\par\endgroup}
+%    \end{macrocode}
+% \end{CPK@environment}
+% \begin{CPK@macro}{\monthdate}\label{macro--monthdate}
 % Define a month-year date European way round.\par
 %    \begin{macrocode}
 \newcommand{\monthdate}{\ifcase\month\or January\or
@@ -1063,7 +1079,7 @@ lpr -P \
   September\or October\or November\or December\fi\space\number\year}
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\hyphenation}
+% \begin{CPK@macro}{\hyphenation}\label{macro--hyphenation}
 % There's something odd about the hyphenation...these
 %     were broken:\par
 %    \begin{macrocode}
@@ -1071,7 +1087,7 @@ lpr -P \
   docu-men-tation statis-ti-cal}
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\maketitle}
+% \begin{CPK@macro}{\maketitle}\label{macro--maketitle}
 %    \begin{macrocode}
 \renewcommand{\maketitle}{%
   \hbox to\textwidth{%
@@ -1086,7 +1102,7 @@ lpr -P \
 }
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\section}
+% \begin{CPK@macro}{\section}\label{macro--section}
 % Pack headings together more tightly.\par
 %    \begin{macrocode}
 \renewcommand\section{\@startsection{subsection}{1}{\z@}%
@@ -1098,8 +1114,8 @@ lpr -P \
   {1pt \@plus .2ex}%
   {\sffamily\large\bfseries}}
 \renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
-  {-.5ex\@plus -1ex \@minus -.2ex}%
-  {.25ex \@plus .2ex}%
+  {-0pt\@plus -1ex \@minus -.2ex}%
+  {1pt \@plus .2ex}%
   {\sffamily\normalsize\bfseries}}
 \renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
   {1ex \@plus1ex \@minus.2ex}%
@@ -1111,7 +1127,7 @@ lpr -P \
 \renewcommand{\thesubsubsection}{\arabic{subsubsection}}
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\DeclareTeXLogo}
+% \begin{CPK@macro}{\DeclareTeXLogo}\label{macro--DeclareTeXLogo}
 %    \begin{macrocode}
 \DeclareTeXLogo{Caladea(0)}{m}{n}{.1667}{.125}[.4]
 \DeclareTeXLogo{Caladea(0)}{m}{it}{.1667}{.08}[.4]
@@ -1123,75 +1139,468 @@ lpr -P \
 \DeclareLaTeXLogo{Raleway(0)}{b}{n}{.27}{.15}[.1]
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\footnoterule}
+% \begin{CPK@macro}{\footnoterule}\label{macro--footnoterule}
 % Adjust footnote fence.\par
 %    \begin{macrocode}
 \renewcommand{\footnoterule}{\kern-3pt
   \hrule height.2pt width.25\columnwidth\kern 2.8pt}
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\pagestyle}
+% \begin{CPK@macro}{\pagestyle}\label{macro--pagestyle}
 % No page numbers, we're faking it; and let text go very
 %     sloppy to fit.\par
 %    \begin{macrocode}
 \pagestyle{empty}
-\spaceskip=4pt plus4pt minus3pt
+\spaceskip=4pt plus3pt minus2pt
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\textsc}
+% \begin{CPK@macro}{\textsc}\label{macro--textsc}
 % Cater for some fonts not having small caps.\par
 %    \begin{macrocode}
 \renewcommand{\textsc}[1]{{\smaller\MakeTextUppercase{#1}}}
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\ff}
+% \begin{CPK@macro}{\ff}\label{macro--ff}
 % Abbreviate changes of font.\par
 %    \begin{macrocode}
 \newcommand{\ff}[2][T1]{\fontencoding{#1}\fontfamily{#2}\selectfont}
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@macro}{\descriptionlabel}
+% \begin{CPK@macro}{\descriptionlabel}\label{macro--descriptionlabel}
 % Stop the {\ttfamily{}\textbackslash{}descriptionlabel}command
 %     reverting to the serif font.\par
 %    \begin{macrocode}
-\renewcommand{\descriptionlabel}[1]{%
-  \hspace\labelsep{\sffamily\bfseries #1}}
+\renewcommand{\descriptionlabel}[1]{\hspace\labelsep{\sffamily\bfseries #1}}
 %    \end{macrocode}
 % \end{CPK@macro}
-% \begin{CPK@environment}{note}
-% A trivial environment for notes\par
-%    \begin{macrocode}
-\newenvironment{note}{\small\textbf{Note.}\quad}{\par}
-%    \end{macrocode}
-% \end{CPK@environment}
 % \iffalse
 %</class>
 % \fi
 % \appendix
+% \newgeometry{left=3cm}
+% \clearpage
+% \section{The \LaTeX{} Project Public License (v\thinspace{}1.3c)}\label{LPPL}
+% \begin{quotation}\small\sffamily\parindent0pt
+%   \parskip.5\baselineskip
+%   \color{DarkBlue}\noindent
+% Everyone is allowed to distribute verbatim copies of this
+%       license document, but modification of it is not allowed.\par
+% \end{quotation}
+% \subsection{Preamble}\label{Preamble}
+% The \LaTeX{} Project Public License ({\smaller LPPL})
+%       is the primary license under which the \LaTeX{} kernel and the
+%       base \LaTeX{} packages are distributed.\par
+% You may use this license for any work of which you hold the
+%       copyright and which you wish to distribute.  This license may be
+%       particularly suitable if your work is \TeX{}-related (such as a
+%       \LaTeX{} package), but it is written in such a way that you can
+%       use it even if your work is unrelated to \TeX{}.\par
+% The section “Whether and How to Distribute Works under This
+%       License”, below, gives instructions, examples, and
+%       recommendations for authors who are considering distributing
+%       their works under this license.\par
+% This license gives conditions under which a work may be
+%       distributed and modified, as well as conditions under which
+%       modified versions of that work may be distributed.\par
+% We, the \LaTeX{3} Project, believe that the conditions below
+%       give you the freedom to make and distribute modified versions of
+%       your work that conform with whatever technical specifications
+%       you wish while maintaining the availability, integrity, and
+%       reliability of that work.  If you do not see how to achieve your
+%       goal while meeting these conditions, then read the document
+%       {\ttfamily{}cfgguide.tex} and {\ttfamily{}modguide.tex} in the base \LaTeX{}
+%       distribution for suggestions.\par
+% \subsection{Definitions}\label{Definitions}
+% In this license document the following terms are used:\par
+% \begin{description}[style=unboxed]
+% \item[Work\thinspace:]Any work being distributed under this License.\par
+% \item[Derived Work\thinspace:]Any work that under any applicable law is derived from
+%     the Work.\par
+% \item[Modification\thinspace:]Any procedure that produces a Derived Work under any
+%     applicable law~--- for example, the production of a file
+%     containing an original file associated with the Work or a
+%     significant portion of such a file, either verbatim or
+%     with modifications and/or translated into another
+%     language.\par
+% \item[Modify\thinspace:]To apply any procedure that produces a Derived Work
+%     under any applicable law.\par
+% \item[Distribution\thinspace:]Making copies of the Work available from one person to
+%     another, in whole or in part.  Distribution includes (but
+%     is not limited to) making any electronic components of the
+%     Work accessible by file transfer protocols such as
+%     {\smaller FTP} or {\smaller HTTP} or by
+%     shared file systems such as Sun's Network File System
+%     ({\smaller NFS}).\par
+% \item[Compiled Work\thinspace:]A version of the Work that has been processed into a
+%     form where it is directly usable on a computer system.
+%     This processing may include using installation facilities
+%     provided by the Work, transformations of the Work, copying
+%     of components of the Work, or other activities.  Note that
+%     modification of any installation facilities provided by
+%     the Work constitutes modification of the Work.\par
+% \item[Current Maintainer\thinspace:]A person or persons nominated as such within the Work.
+%     If there is no such explicit nomination then it is the
+%     `Copyright Holder' under any applicable
+%     law.\par
+% \item[Base Interpreter\thinspace:]A program or process that is normally needed for
+%     running or interpreting a part or the whole of the
+%     Work.\par
+% A Base Interpreter may depend on external components
+%     but these are not considered part of the Base Interpreter
+%     provided that each external component clearly identifies
+%     itself whenever it is used interactively.  Unless
+%     explicitly specified when applying the license to the
+%     Work, the only applicable Base Interpreter is a
+%     `\LaTeX{}-Format' or in the case of files
+%     belonging to the `\LaTeX{}-format' a program
+%     implementing the `\TeX{} language'.\par
+% \end{description}
+% \subsection{Conditions on Distribution and Modification}\label{Conditions}
+% \begin{enumerate}
+% \item Activities other than distribution and/or modification
+%   of the Work are not covered by this license; they are
+%   outside its scope. In particular, the act of running the
+%   Work is not restricted and no requirements are made
+%   concerning any offers of support for the Work.\par
+% \item \label{item-distribute}You may distribute a complete, unmodified copy of the
+%   Work as you received it.  Distribution of only part of the
+%   Work is considered modification of the Work, and no right to
+%   distribute such a Derived Work may be assumed under the
+%   terms of this clause.\par
+% \item You may distribute a Compiled Work that has been
+%   generated from a complete, unmodified copy of the Work as
+%   distributed under Clause~item~\ref{item-distribute} above above, as
+%   long as that Compiled Work is distributed in such a way that
+%   the recipients may install the Compiled Work on their system
+%   exactly as it would have been installed if they generated a
+%   Compiled Work directly from the Work.\par
+% \item \label{item-currmaint}If you are the Current Maintainer of the Work, you may,
+%   without restriction, modify the Work, thus creating a
+%   Derived Work.  You may also distribute the Derived Work
+%   without restriction, including Compiled Works generated from
+%   the Derived Work.  Derived Works distributed in this manner
+%   by the Current Maintainer are considered to be updated
+%   versions of the Work.\par
+% \item If you are not the Current Maintainer of the Work, you
+%   may modify your copy of the Work, thus creating a Derived
+%   Work based on the Work, and compile this Derived Work, thus
+%   creating a Compiled Work based on the Derived Work.\par
+% \item \label{item-conditions}If you are not the Current Maintainer of the Work, you
+%   may distribute a Derived Work provided the following
+%   conditions are met for every component of the Work unless
+%   that component clearly states in the copyright notice that
+%   it is exempt from that condition.  Only the Current
+%   Maintainer is allowed to add such statements of exemption to
+%   a component of the Work.\par
+% \begin{enumerate}
+% \item If a component of this Derived Work can be a direct
+%       replacement for a component of the Work when that
+%       component is used with the Base Interpreter, then,
+%       wherever this component of the Work identifies itself to
+%       the user when used interactively with that Base
+%       Interpreter, the replacement component of this Derived
+%       Work clearly and unambiguously identifies itself as a
+%       modified version of this component to the user when used
+%       interactively with that Base Interpreter.\par
+% \item Every component of the Derived Work contains
+%       prominent notices detailing the nature of the changes to
+%       that component, or a prominent reference to another file
+%       that is distributed as part of the Derived Work and that
+%       contains a complete and accurate log of the
+%       changes.\par
+% \item No information in the Derived Work implies that any
+%       persons, including (but not limited to) the authors of
+%       the original version of the Work, provide any support,
+%       including (but not limited to) the reporting and
+%       handling of errors, to recipients of the Derived Work
+%       unless those persons have stated explicitly that they do
+%       provide such support for the Derived Work.\par
+% \item You distribute at least one of the following with
+%       the Derived Work:\par
+% \begin{enumerate}
+% \item A complete, unmodified copy of the Work; if your
+%   distribution of a modified component is made by
+%   offering access to copy the modified component from
+%   a designated place, then offering equivalent access
+%   to copy the Work from the same or some similar place
+%   meets this condition, even though third parties are
+%   not compelled to copy the Work along with the
+%   modified component;\par
+% \item Information that is sufficient to obtain a
+%   complete, unmodified copy of the Work.\par
+% \end{enumerate}
+% \end{enumerate}
+% \item If you are not the Current Maintainer of the Work, you
+%   may distribute a Compiled Work generated from a Derived
+%   Work, as long as the Derived Work is distributed to all
+%   recipients of the Compiled Work, and as long as the
+%   conditions of Clause~item~\ref{item-conditions} above, above, are met
+%   with regard to the Derived Work.\par
+% \item The conditions above are not intended to prohibit, and
+%   hence do not apply to, the modification, by any method, of
+%   any component so that it becomes identical to an updated
+%   version of that component of the Work as it is distributed
+%   by the Current Maintainer under Clause~item~\ref{item-currmaint} above, above.\par
+% \item Distribution of the Work or any Derived Work in an
+%   alternative format, where the Work or that Derived Work (in
+%   whole or in part) is then produced by applying some process
+%   to that format, does not relax or nullify any sections of
+%   this license as they pertain to the results of applying that
+%   process.\par
+% \item % \begin{enumerate}
+% \item A Derived Work may be distributed under a different
+%       license provided that license itself honors the
+%       conditions listed in Clause~item~\ref{item-conditions} in the list on p.\thinspace\pageref{item-conditions} above, in
+%       regard to the Work, though it does not have to honor the
+%       rest of the conditions in this license.\par
+% \item If a Derived Work is distributed under a different
+%       license, that Derived Work must provide sufficient
+%       documentation as part of itself to allow each recipient
+%       of that Derived Work to honor the restrictions in
+%       Clause~item~\ref{item-conditions} in the list on p.\thinspace\pageref{item-conditions} above, concerning
+%       changes from the Work.\par
+% \end{enumerate}
+% \item This license places no restrictions on works that are
+%   unrelated to the Work, nor does this license place any
+%   restrictions on aggregating such works with the Work by any
+%   means.\par
+% \item Nothing in this license is intended to, or may be used
+%   to, prevent complete compliance by all parties with all
+%   applicable laws.\par
+% \end{enumerate}
+% \subsection{No Warranty}\label{Warranty}
+% There is no warranty for the Work.  Except when otherwise
+%       stated in writing, the Copyright Holder provides the Work
+%       `as is', without warranty of any kind, either
+%       expressed or implied, including, but not limited to, the implied
+%       warranties of merchantability and fitness for a particular
+%       purpose.  The entire risk as to the quality and performance of
+%       the Work is with you.  Should the Work prove defective, you
+%       assume the cost of all necessary servicing, repair, or
+%       correction.\par
+% In no event unless required by applicable law or agreed to
+%       in writing will The Copyright Holder, or any author named in the
+%       components of the Work, or any other party who may distribute
+%       and/or modify the Work as permitted above, be liable to you for
+%       damages, including any general, special, incidental or
+%       consequential damages arising out of any use of the Work or out
+%       of inability to use the Work (including, but not limited to,
+%       loss of data, data being rendered inaccurate, or losses
+%       sustained by anyone as a result of any failure of the Work to
+%       operate with any other programs), even if the Copyright Holder
+%       or said author or said other party has been advised of the
+%       possibility of such damages.\par
+% \subsection{Maintenance of The Work}\label{Maintenance}
+% The Work has the status `author-maintained'
+%       if the Copyright Holder explicitly and prominently states near
+%       the primary copyright notice in the Work that the Work can only
+%       be maintained by the Copyright Holder or simply that it is
+%       `author-maintained'.\par
+% The Work has the status `maintained' if there
+%       is a Current Maintainer who has indicated in the Work that they
+%       are willing to receive error reports for the Work (for example,
+%       by supplying a valid e-mail address). It is not required for the
+%       Current Maintainer to acknowledge or act upon these error
+%       reports.\par
+% The Work changes from status `maintained' to
+%       `unmaintained' if there is no Current Maintainer,
+%       or the person stated to be Current Maintainer of the work cannot
+%       be reached through the indicated means of communication for a
+%       period of six months, and there are no other significant signs
+%       of active maintenance.\par
+% You can become the Current Maintainer of the Work by
+%       agreement with any existing Current Maintainer to take over this
+%       role.\par
+% If the Work is unmaintained, you can become the Current
+%       Maintainer of the Work through the following steps:\par
+% \begin{enumerate}
+% \item Make a reasonable attempt to trace the Current
+%   Maintainer (and the Copyright Holder, if the two differ)
+%   through the means of an Internet or similar search.\par
+% \item If this search is successful, then enquire whether the
+%   Work is still maintained.\par
+% \begin{enumerate}
+% \item If it is being maintained, then ask the Current
+%       Maintainer to update their communication data within one
+%       month.\par
+% \item \label{item-intention}If the search is unsuccessful or no action to resume
+%       active maintenance is taken by the Current Maintainer,
+%       then announce within the pertinent community your
+%       intention to take over maintenance.  (If the Work is a
+%       \LaTeX{} work, this could be done, for example, by
+%       posting to \url{news:comp.text.tex}.)\par
+% \end{enumerate}
+% \item % \begin{enumerate}
+% \item If the Current Maintainer is reachable and agrees to
+%       pass maintenance of the Work to you, then this takes
+%       effect immediately upon announcement.\par
+% \item \label{item-announce}If the Current Maintainer is not reachable and the
+%       Copyright Holder agrees that maintenance of the Work be
+%       passed to you, then this takes effect immediately upon
+%       announcement.\par
+% \end{enumerate}
+% \item \label{item-change}If you make an `intention announcement'
+%   as described in~item~\ref{item-intention} in the list on p.\thinspace\pageref{item-intention} above and after three
+%   months your intention is challenged neither by the Current
+%   Maintainer nor by the Copyright Holder nor by other people,
+%   then you may arrange for the Work to be changed so as to
+%   name you as the (new) Current Maintainer.\par
+% \item If the previously unreachable Current Maintainer becomes
+%   reachable once more within three months of a change
+%   completed under the terms of~item~\ref{item-announce} in the list on p.\thinspace\pageref{item-announce}
+%   or~item~\ref{item-change} above, then that
+%   Current
+%   Maintainer must become or remain the Current Maintainer upon
+%   request provided they then update their communication data
+%   within one month.\par
+% \end{enumerate}
+% A change in the Current Maintainer does not, of itself,
+%       alter the fact that the Work is distributed under the
+%       {\smaller LPPL} license.\par
+% If you become the Current Maintainer of the Work, you should
+%       immediately provide, within the Work, a prominent and
+%       unambiguous statement of your status as Current Maintainer.  You
+%       should also announce your new status to the same pertinent
+%       community as in~item~\ref{item-intention} in the list on p.\thinspace\pageref{item-intention}
+%       above.\par
+% \subsection{Whether and How to Distribute Works under This
+%       License}\label{Distribute}
+% This section contains important instructions, examples, and
+%       recommendations for authors who are considering distributing
+%       their works under this license.  These authors are addressed as
+%       `you' in this section.\par
+% \subsubsection{Choosing This License or Another License}\label{Choosing}
+% If for any part of your work you want or need to use
+% \emph{distribution} conditions that differ
+% significantly from those in this license, then do not refer to
+% this license anywhere in your work but, instead, distribute
+% your work under a different license. You may use the text of
+% this license as a model for your own license, but your license
+% should not refer to the {\smaller LPPL} or otherwise
+% give the impression that your work is distributed under the
+% {\smaller LPPL}.\par
+% The document {\ttfamily{}modguide.tex} in the base \LaTeX{}
+% distribution explains the motivation behind the conditions of
+% this license.  It explains, for example, why distributing
+% \LaTeX{} under the {\smaller GNU} General Public
+% License ({\smaller GPL}) was considered inappropriate.
+% Even if your work is unrelated to \LaTeX{}, the discussion in
+% {\ttfamily{}modguide.tex} may still be
+% relevant, and authors intending to distribute their works
+% under any license are encouraged to read it.\par
+% \subsubsection{A Recommendation on Modification Without
+% Distribution}\label{WithoutDistribution}
+% It is wise never to modify a component of the Work, even
+% for your own personal use, without also meeting the above
+% conditions for distributing the modified component.  While you
+% might intend that such modifications will never be
+% distributed, often this will happen by accident~--- you may
+% forget that you have modified that component; or it may not
+% occur to you when allowing others to access the modified
+% version that you are thus distributing it and violating the
+% conditions of this license in ways that could have legal
+% implications and, worse, cause problems for the community. It
+% is therefore usually in your best interest to keep your copy
+% of the Work identical with the public one.  Many works provide
+% ways to control the behavior of that work without altering any
+% of its licensed components.\par
+% \subsubsection{How to Use This License}\label{HowTo}
+% To use this license, place in each of the components of
+% your work both an explicit copyright notice including your
+% name and the year the work was authored and/or last
+% substantially modified.  Include also a statement that the
+% distribution and/or modification of that component is
+% constrained by the conditions in this license.\par
+% Here is an example of such a notice and statement:\par
 % \iffalse
-%<*veryshortguide>
+%<*ignore>
 % \fi
-% \clearpage
-% \section{The Very Short Guide to Typesetting with \LaTeX{}}\label{veryshortguide}
+\begin{lstlisting}[language={[LaTeX]TeX}]
+%%% pig.dtx
+%%% Copyright 2005 M. Y. Name
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%% 
+%% The Current Maintainer of this work is M. Y. Name.
+%%
+%% This work consists of the files pig.dtx and pig.ins
+%% and the derived file pig.sty.
+\end{lstlisting}
 % \iffalse
-%% The Very Short Guide to Typesetting with \LaTeX{}
+%</ignore>
 % \fi
-% This is the base text for the Very Short Guide. The
-%       default layout is for A4 paper\par
-%    \begin{macrocode}
-\documentclass[a5paper]{vsg}
-%    \end{macrocode}
-% \subsection{Preamble}
-% The \BibTeX{} file is generated from \vref{vsg-bib} (a future version should probably do this
-%   via \textsc{xml} too). To save space, we compress
-%   the space between entries.\par
-%    \begin{macrocode}
-\addbibresource{veryshortguide.bib}
-\setlength{\bibnamesep}{-\itemsep}
-%    \end{macrocode}
-% Titling is standard except for the additional material
-%   in the {\ttfamily{}\textbackslash{}author}.\par
-%    \begin{macrocode}
+% Given such a notice and statement in a file, the
+% conditions given in this license document would apply, with
+% the `Work' referring to the three files
+% {\ttfamily{}pig.dtx}, {\ttfamily{}pig.ins}, and {\ttfamily{}pig.sty} (the last being generated
+% from {\ttfamily{}pig.dtx} using {\ttfamily{}pig.ins}), the `Base
+%   Interpreter' referring to any
+% `\LaTeX{}-Format', and both `Copyright
+%   Holder' and `Current Maintainer'
+% referring to the person
+% M.~Y.~Name\index{!}.\par
+% If you do not want the Maintenance section of
+% {\smaller LPPL} to apply to your Work, change
+% `maintained' above into
+% `author-maintained'. However, we recommend that
+% you use `maintained' as the Maintenance
+% section was added in order to ensure that your Work remains
+% useful to the community even when you can no longer maintain
+% and support it yourself.\par
+% \subsubsection{Derived Works That Are Not Replacements}\label{NotReplacements}
+% Several clauses of the {\smaller LPPL} specify
+% means to provide reliability and stability for the user
+% community. They therefore concern themselves with the case
+% that a Derived Work is intended to be used as a (compatible or
+% incompatible) replacement of the original Work. If this is not
+% the case (e.g., if a few lines of code are reused for a
+% completely different task), then clauses 6b and 6d shall not
+% apply.\par
+% \subsubsection{Important Recommendations}\label{Recommendations}
+% \paragraph[Defining What Constitutes the Work]{Defining What Constitutes the Work :}
+% The {\smaller LPPL} requires that distributions
+%   of the Work contain all the files of the Work.  It is
+%   therefore important that you provide a way for the licensee
+%   to determine which files constitute the Work.  This could,
+%   for example, be achieved by explicitly listing all the files
+%   of the Work near the copyright notice of each file or by
+%   using a line such as:\par
+% \iffalse
+%<*ignore>
+% \fi
+\begin{lstlisting}[language={[LaTeX]TeX}]
+%% This work consists of all files listed in manifest.txt.
+\end{lstlisting}
+% \iffalse
+%</ignore>
+% \fi
+% in that place.  In the absence of an unequivocal list it
+%   might be impossible for the licensee to determine what is
+%   considered by you to comprise the Work and, in such a case,
+%   the licensee would be entitled to make reasonable
+%   conjectures as to which files comprise the Work.\par
+% \iffalse
+%<*vsg>
+%<<COMMENT
+% !TEX TS-program = xelatex
+% !TEX encoding = UTF-8 Unicode
+% !BIB TS-program = biber
+%COMMENT
+      
+%</vsg>
+% \fi
+% \iffalse
+%<*vsg>
+\documentclass[a5paper]{veryshortguide}
+\addbibresource{vsg.bib}
 \begin{document}
 \title{The very short guide to typesetting with~\LaTeX}
 \author{Silmaril Consultants\\
@@ -1199,104 +1608,78 @@ lpr -P \
   \protect\url{http://latex.silmaril.ie}}
 \date{\monthdate}
 \maketitle
-%    \end{macrocode}
-% \subsection{Introduction on front page}
-% The introduction needs to get across  \begin{enumerate*}[label=\emph{\alph*})]
-% \item what \LaTeX{} is
-% \item what it’s for
-% \item where you can get it
-% \end{enumerate*}\par
-%    \begin{macrocode}
 \subsection*{What's this all about? What's \LaTeX?}
-\LaTeX\ is a document preparation system which uses the \TeX\
-typesetting program. It enables you to produce
-publication-quality documents with great accuracy and
-consistency. \LaTeX\ works on any computer and produces
-industry-standard PDF. It is available both in free (open-source)
-and commercial implementations. \LaTeX\ can be used for any kind
-of document, but it is especially suited to those with complex
-structures, repetitive formatting, or notations like
-mathematics\footnote{For reasons of space this guide does not
-cover details of mathematics typesetting.}; or where technical
-stability, dimensional accuracy, or a persistent and
-non-proprietary file format are needed. Install the software from
+
+\LaTeX\ is a document preparation system which uses the \TeX\ typesetting
+program. It enables you to produce publication-quality documents with
+great accuracy and consistency. \LaTeX\ works on any computer and
+produces industry-standard PDF. It is available both
+in free (open-source) and commercial implementations. \LaTeX\ can be
+used for any kind of document, but it is especially suited to those
+with complex structures, repetitive formatting, or notations like
+mathematics\footnote{For reasons of space this guide does not cover
+  details of mathematics typesetting.}; or where technical stability,
+dimensional accuracy, or a persistent and non-proprietary file format
+are needed. Install the software from
 \url{www.tug.org/texlive/} or buy a commercially-supported
-version from one of the vendors (see the list on
-p.\thinspace\pageref{comm}).
-%    \end{macrocode}
-% Summarise the process: show that it’s simple.\par
-%    \begin{macrocode}
+version from one of the vendors (see the list on p.\thinspace\pageref{comm}).
+
 \subsection*{Creating and typesetting your document}
+
 \begin{enumerate}[noitemsep]\setlength{\fboxsep}{1pt}
-   \item Create your document using any suitable plain-text
-     editor with \LaTeX\ controls, eg \textit{\TeX shop}
-     (Mac), \textit{\TeX Maker} (Win), \textit{Kile}
-     (Linux), \textit{Emacs} (all), even
-     \textit{vi}\thinspace!
+   \item Create your document using any suitable plain-text editor
+     with \LaTeX\ controls, eg \textit{\TeX shop} (Mac), \textit{\TeX
+       Maker} (Win), \textit{Kile} (Linux), \textit{Emacs} (all),
+     even \textit{vi}\thinspace!
    \item Save the file with a name ending in \verb+.tex+
      (\emph{never} use spaces in filenames!);
-   \item Use the {\small\keys{Build}} or
-     {\small\keys{Compile}} toolbar button or menu item in
-     your editor to typeset and display the
-     document;\label{typeset}
-   \item Make any changes needed in your original document
-     and repeat step \ref{typeset}.
+   \item Use the {\small\keys{Build}} or {\small\keys{Compile}}
+     toolbar button or menu item in your editor to typeset and display
+     the document;\label{typeset}
+   \item Make any changes needed in your original document and repeat
+     step \ref{typeset}. 
 \end{enumerate}
-%    \end{macrocode}
-% And summarise the syntax to demystify it.\par
-%    \begin{macrocode}
-\subsection*{Syntax (how to type \LaTeX\ commands --- these
-  are the rules)}
+
+
+\subsection*{Syntax (how to type \LaTeX\ commands --- these are the rules)}
+
 \begin{itemize}[noitemsep]
-  \item \textbf{All \LaTeX\ commands begin with a
-    backslash}.\\ \example
-    \verb+\tableofcontents+\endexample
-  \item \textbf{If a command needs text to work with, it
-    goes in curly braces}.\\ \example
-    \verb+\title{Irisches Tagebuch}\author{Heinrich Böll}+\endexample
-  \item \textbf{If options are used, they go in square
-    brackets before the curly braces}.\\ \example
-    \verb+\documentclass[a4paper,11pt]{book}+\endexample
-  \item \textbf{Spaces after commands \emph{without} braces
-    get suppressed}.\\ \example
-    \verb+Copyright \copyright␣+\texttt{\number\year}
-    \gives{Copyright ©\number\year} \nobox\\ To prevent
-    this, put empty curly braces after the
-    command:\\ \example
-    \verb+Copyright \copyright{}␣+\texttt{\number\year}
+  \item \textbf{All \LaTeX\ commands begin with a backslash}.\\
+    \example \verb+\tableofcontents+\endexample
+  \item \textbf{If a command needs text to work
+    with, it goes in curly braces}.\\
+    \example \verb+\title{Irisches Tagebuch}\author{Heinrich Böll}+\endexample
+  \item \textbf{If options are used, they go in square brackets 
+  before the curly braces}.\\
+    \example \verb+\documentclass[a4paper,11pt]{book}+\endexample
+  \item \textbf{Spaces after commands \emph{without} braces get suppressed}.\\
+    \example \verb+Copyright \copyright␣+\texttt{\number\year} 
+    \gives{Copyright ©\number\year} \nobox\\
+    To prevent this, put empty curly braces after the command:\\
+    \example \verb+Copyright \copyright{}␣+\texttt{\number\year} 
     \gives{Copyright ©~\number\year} \yesbox
-  \item \textbf{Curly braces are also used to restrict the
-    scope of effects inside them}.\\ \example
-    \verb+Some {\tiny little} word+ \gives{Some {\tiny
-        little} word}
+  \item \textbf{Curly braces are also used to restrict the scope of
+    effects inside them}.\\
+    \example \verb+Some {\tiny little} word+ \gives{Some {\tiny little} word}
 \end{itemize}
-%    \end{macrocode}
-% Point readers at sources of information. If they read
-%   nothing else but the front page, at least they now know what
-%   they’re dealing with.\par
-%    \begin{macrocode}
 \begin{note}
-This guide shows only a tiny fraction of \LaTeX's power. For
-more information, visit the \TeX\ Users Group site
-(\url{www.tug.org}). For help, see the FAQ
-(\url{www.tex.ac.uk/faq}), StackExchange
+This guide shows only a tiny fraction of \LaTeX's power. For more
+information, visit the \TeX\ Users Group site (\url{www.tug.org}). For
+help, see the FAQ (\url{www.tex.ac.uk/faq}), StackExchange
 (\url{tex.stackexchange.com}), or the Usenet newsgroup
 \url{comp.text.tex}. For packages (plugins), use CTAN, the
-Comprehensive \TeX\ Archive Network
-(\url{www.ctan.org}). For further details, see
-\citetitle{fi} \parencite{fi} and other online resources.
+Comprehensive \TeX\ Archive Network (\url{www.ctan.org}). For
+further details, see \citetitle{fi}
+\parencite{fi} and other online resources.
 \end{note}
-%    \end{macrocode}
-% \subsection{Getting started with a short document}
-% Now we start the meat: a skeleton document structure
-%   that shows the document class, Preamble, and where you put
-%   the text.\par
-%    \begin{macrocode}
+
 \begin{multicols}{2}\small\parskip4pt
 \subsection*{Writing a \LaTeX\ document}
 \subsubsection{Basic document structure}
+
 Here's the skeleton of a \LaTeX\ document. These three lines are
 \textsc{compulsory}: your document will not work without them:
+
 \begin{Verbatim}[frame=single,fontsize=\small,commandchars=!<>]
 !added\documentclass[11pt]{article}
 !comment your Preamble goes here (extra setups, if any)
@@ -1305,24 +1688,20 @@ Here's the skeleton of a \LaTeX\ document. These three lines are
 !added\end{document}
 \end{Verbatim}
 \vspace*{-.5\baselineskip}
-{\fontsize67\selectfont\sffamily New material in each example is 
-shown in {\ttfamily\added blue}; material from previous examples 
-is in black. Comments and mnemonics are in 
-\textcolor{DarkRed}{red}.\par}
-%    \end{macrocode}
-% Explain the rubrication.\par
-%    \begin{macrocode}
+{\fontsize67\selectfont\sffamily New material in each example is shown 
+in {\ttfamily\added blue}; material from previous examples is in
+black. Comments are in \textcolor{DarkRed}{red}.\par}
+
 \begin{itemize}[noitemsep]
-  \item The document class name \textsc{must} be one of the
-    standard \verb+book+, \verb+article+, or \verb+report+,
-    or one of the many others preinstalled or downloadable
-    (eg \verb+thesis+, \verb+memoir+, etc);
-  \item There are body type size options \verb+10pt+ (the
-    default), \verb+11pt+, and \verb+12pt+;
-  \item There are paper size options including
-    \verb+a4paper+ (210\thinspace mm$\times$297\thinspace
-    mm) and \verb+letterpaper+ (8½$''\times$11$''$) [see
-      below].
+  \item The document class name \textsc{must} be one of the standard
+    \verb+book+, \verb+article+, or \verb+report+, or one of the many
+    others preinstalled or downloadable (eg \verb+thesis+,
+    \verb+memoir+, etc);
+  \item There are body type size options \verb+10pt+ (the default),
+    \verb+11pt+, and \verb+12pt+;
+  \item There are paper size options including \verb+a4paper+
+    (210\thinspace mm$\times$297\thinspace mm) and \verb+letterpaper+
+    (8½$''\times$11$''$) [see below].
 \end{itemize}
 
 \subsubsection{Front matter}
@@ -1363,6 +1742,7 @@ Sections get numbered automatically in bold type, and get included in
 the Table of Contents (if you use it). Numbering can be turned off
 selectively. Section heading layout can be modified with the
 \textsf{sectsty}, \mbox{\textsf{titlesec}}, and other packages.
+%Use the \textsf{babel} package for other languages.
 
 \begin{Verbatim}[frame=single,fontsize=\small,commandchars=!<>]
 !comment (Preamble, titling, and abstract as above)
@@ -1452,23 +1832,23 @@ For help, see the links on the front and back pages. There is a
 summary of common commands at\\
 \url{www.stdout.org/~winston/latex/latexsheet.pdf}
 and a comprehensive list at
-\url{www.eeng.dcu.ie/local-docs/latex-help/}~.
+\url{www.eeng.dcu.ie/local-docs/latex-help/}~. 
 \end{minipage}}
-\columnbreak
+
 \paragraph{Tables and figures:}
 These environments \textbf{float} (to fit
 available space). They have \verb+\caption+ and \verb+\label+ commands.
 
 \begin{Verbatim}[frame=single,fontsize=\footnotesize,commandchars=!<>]
 !added\begin{figure} !comment(see below)
-\caption{Swiss and Dutch Mennonite
+\caption{Swiss and Dutch Mennonite 
  migrations of the 1700s and 1800s}
 \label{lmig}
 !added\centering !comment(centre the contents)
 !added\includegraphics[width=.8\columnwidth]
 !added {menno-a}\\ !comment(double backslash for linebreak)
-!added\scriptsize!revert Courtesy of Paul C. Adams,
- Department of Geography and the
+!added\scriptsize!revert Courtesy of Paul C. Adams, 
+ Department of Geography and the 
  Environment, University of Texas at
  Austin.
 !added\cite{adams}\end{figure}
@@ -1479,11 +1859,11 @@ or PDF for pdf\LaTeX.
 
 \begin{Verbatim}[frame=single,fontsize=\footnotesize,commandchars=!<>]
 !added\begin{table}
- !added\caption{Mean growth rate and intakes
- !added of supplement, milk, and water for 4
+ !added\caption{Mean growth rate and intakes 
+ !added of supplement, milk, and water for 4 
  !added diets (after Sherington, J, undated)}
  \label{dietgrowth}
- \centering
+ \centering 
  !added\begin{tabular}{|l|r|r|r|r|}
  !added\hline !comment(horizontal line between rows)
   !added&Growth&Supplement&Milk&Water
@@ -1491,31 +1871,34 @@ or PDF for pdf\LaTeX.
  !added Supplement&rate&intake&intake&intake
   !added\\\hline
   !added&(g/day)&(g/day)&(ml/kg$^{0.75}$)&
-  !added (ml/kg$^{0.75}$)\\\hline
- !added Lucerne &145&450&10.5&144\\\hline
- !added Sesbania&132&476& 9.2&128\\\hline
- !added Leucaena&128&364& 8.9&121\\\hline
- !added None    & 89&  0& 9.8&108\\\hline
+  !added (ml/kg$^{0.75}$)\\\hline 
+ !added Lucerne &145&450&10.5&144\\\hline 
+ !added Sesbania&132&476& 9.2&128\\\hline 
+ !added Leucaena&128&364& 8.9&121\\\hline 
+ !added None    & 89&  0& 9.8&108\\\hline 
  !added\end{tabular}
 !added\end{table}
 \end{Verbatim}
 
+% fake it
 \begin{center}\sffamily
+%  \fontencoding{T1}%
+%  \fontfamily{cmss}%
   \fontsize78\selectfont
 \setlength{\tabcolsep}{2pt}
 \setlength{\arrayrulewidth}{.2pt}
 \begin{tabular}{@{}|>{\vrule height1em width0pt}l|r|r|r|r|@{}}
-\multicolumn5l{\textbf{Table 2}: \textit{Mean growth rate and intakes
+\multicolumn5l{\textbf{Table 2}: \textit{Mean growth rate and intakes 
 of supplement,}}\\
 \multicolumn5l{\textit{milk, and water for four diets} (after
     Sherington, J, undated)}\\[6pt]\hline
 \vrule height1.1em width0pt&Growth&Supplement&Milk&Water\\[-1pt]
 Supplement&rate&intake&intake&intake\\[-1pt]
-&(g/day)&(g/day)&(ml/kg\textsuperscript{\fontsize34\selectfont 0.75})&(ml/kg\textsuperscript{\fontsize34\selectfont 0.75})\\[3pt]\hline
-Lucerne &145&450&10.5&144\\\hline
-Sesbania&132&476& 9.2&128\\\hline
-Leucaena&128&364& 8.9&121\\\hline
-None    & 89&  0& 9.8&108\\\hline
+&(g/day)&(g/day)&(ml/kg\textsuperscript{\fontsize34\selectfont 0.75})&(ml/kg\textsuperscript{\fontsize34\selectfont 0.75})\\[3pt]\hline 
+Lucerne &145&450&10.5&144\\\hline 
+Sesbania&132&476& 9.2&128\\\hline 
+Leucaena&128&364& 8.9&121\\\hline 
+None    & 89&  0& 9.8&108\\\hline 
 \end{tabular}
 \end{center}
 Packages like \textsf{longtable} and \textsf{array} can help
@@ -1524,18 +1907,18 @@ with more complex table formats.
 \end{multicols}
 
 \begin{center}\sffamily
+%  \fontencoding{T1}%
+%  \fontfamily{cmss}\selectfont
   \textbf{Figure 1}: \textit{Swiss and Dutch Mennonite migrations of the
     1700s and 1800s}\\[3pt]
-  \ifafive\includegraphics[width=.8\columnwidth]{menno-a}\fi
-  \iflegal\includegraphics[width=.7\columnwidth]{menno-a}\fi
-  \\\scriptsize
+  \includegraphics[width=.8\columnwidth]{menno-a}\\\scriptsize
   Courtesy of Paul C. Adams, Department of Geography
   and the Environment, University of Texas at Austin. [1]
 \end{center}
 
 \begin{multicols}{2}\small\parskip4pt
 \paragraph{Typefaces:}
-{\ff{lrm}\selectfont The default typeface in \LaTeX\ is Computer
+{\fontfamily{lrm}\selectfont The default typeface in \LaTeX\ is Computer
   Modern, like this.}
 
 {\footnotesize\tabcolsep4pt
@@ -1582,15 +1965,15 @@ Monospace&tt&\ttfamily\\
 \end{tabular}}
 
 \begingroup\small
-\example\verb+\textit{\textbf{\textsf+\ifafive\linebreak\fi
-\verb+{bold+ \iflegal\linebreak\fi\verb+italic sans}}}+
+\example\verb+\textit{\textbf{\textsf+\linebreak
+\verb+{bold italic sans}}}+
 \gives{\ff{cmss}\textit{\textbf{bold italic sans}}}
 \par\endgroup
 
-Sizes for titles, headings, footnotes, etc are automatic, but
-there are some step-sizes:
+Font sizing is automatic for titles, headings, and footnotes. There
+are named step-size commands if you need them:
 
-{\scriptsize\centering
+{\scriptsize
 \begin{tabular}{>{\ttfamily\char'134}lrrr}
 normalsize&10&11&12\\\hline\vrule height1.1em width0pt
 tiny&5&6&7\\
@@ -1605,10 +1988,10 @@ Huge&20\rlap*&24\rlap*&28\rlap*\\
 \end{tabular}
 \quad
 \rotatebox[origin=c]{90}{\tiny* sizes rounded here to save space}
-\par}
+}
 
 For other sizes, add the special command
-{\added\verb+\RequirePackage{fix-cm}+}\iflegal\linebreak\fi \emph{before} the
+{\added\verb+\RequirePackage{fix-cm}+} \emph{before} the 
 \verb+\documentclass+ line and use
 {\added\verb+\fontsize{+\texttt{\uline{pp}}\verb+}{+\texttt{\uline{bb}}\verb+}\selectfont+}
 for the point-size (\textit{pp}) and baseline
@@ -1622,27 +2005,29 @@ For double or 1½ line-spacing (eg in theses) use the \textsf{setspace}
 package.
 
 You can use colour palettes in the RGB, CMYK, HTML, and other
-colourspaces with \iflegal\\\fi the \textsf{xcolor} \ifafive\\\fi
-package and the\hfil 
-\smash{\raisebox{0ex}{\sffamily\bfseries\Huge\iflegal\quad\else\enspace\fi
+colourspaces with the 
+\textsf{xcolor} \\package and the\hfil 
+\smash{\raisebox{-2ex}{\sffamily\bfseries\Huge\qquad
 \textcolor[HTML]{2F50AD}{G}%
-\textcolor[HTML]{B32F17}{o}%
+\textcolor[HTML]{B32F17}{o}% 
 \textcolor[HTML]{F3C20B}{o}%
-\textcolor[HTML]{2F50AD}{g}%
+\textcolor[HTML]{2F50AD}{g}% 
 \textcolor[HTML]{48C847}{l}%
 \textcolor[HTML]{B32F17}{e}}}%
+% web colour for l was 567122
+% web colour for o2 was CAB340
 \\\verb+\color{+\texttt{\textit{name}}\verb+}+ command.
 
 For verbatim text, use the \verb+\verb+ command or the
 \textsf{verbatim} environment, or (better) the \textsf{listings} or
-\textsf{fancyvrb} packages.
+\textsf{fancyvrb} packages, which allow context-sensitive formatting.
 
-\paragraph{Footnotes:}
-You do footnotes with \iflegal\\\fi \verb+\footnote(like this}+.\footnote{Like
+\paragraph{Footnotes}\setcounter{footnote}{0} 
+You can do footnotes with \verb+\footnote(like this}+.\footnote{Like
   this.} Endnotes too.
 
 \paragraph{Cross-references:}\label{blah} Use the command
-\verb+\label{...}+ to label the target, and \verb+\ref{...}+ or
+\verb+\label{...}+ to add a label to the target, and \verb+\ref{...}+ or
 \verb+\pageref{...}+ to refer to it. Make up the labels yourself.
 
 \begingroup\small
@@ -1653,7 +2038,8 @@ You do footnotes with \iflegal\\\fi \verb+\footnote(like this}+.\footnote{Like
 
 \paragraph{Citation and reference:} Create your bibliographic database
 in BIB\TeX\ format \parencite{bibtex} using \emph{JabRef} or
-similar. Each entry \textsc{must} have a unique label (here `\verb+fi+'):
+similar. Each entry \textsc{must} have a unique label
+(here `\verb+fi+'):\par\vspace{-\parskip}
 \begin{Verbatim}[frame=single,fontsize=\scriptsize,commandchars=!<>]
 !added@book{fi,
 !added  title = {Formatting Information},
@@ -1661,13 +2047,15 @@ similar. Each entry \textsc{must} have a unique label (here `\verb+fi+'):
 !added  publisher = {Silmaril},
 !added  year = {2016}}
 \end{Verbatim}
+\par\vspace{-\parskip}
 Use the
 \textsf{biblatex} package to specify the style, and give
-the filename of your database:
+the filename of your database:\par\vspace{-\parskip}
 \begin{Verbatim}[frame=single,fontsize=\footnotesize,commandchars=!<>]
 !added\usepackage[style=apa]{biblatex}
 !added\addbibresource{myrefs.bib}
 \end{Verbatim}
+\par\vspace{-\parskip}
 To cite, use \verb+\cite{...}+ (or
 \verb+\textcite+ or \verb+\parencite+) with the relevant label:\\ \example{\verb+\textcite{fi}+}\gives{\textcite{fi}}.
 
@@ -1686,33 +2074,26 @@ Silmaril at \url{latex@silmaril.ie}
 \end{minipage}}%
 \end{multicols}
 \end{document}
-%    \end{macrocode}
-% \iffalse
-%</veryshortguide>
+      
+%</vsg>
 % \fi
 % \iffalse
-%<*vsg-bib>
-% \fi
-% \clearpage
-% \section{The bibliography for the Very Short Guide to Typesetting with \LaTeX{}}\label{vsg-bib}
-% \iffalse
-The bibliography for the Very Short Guide to Typesetting with \LaTeX{}
-% \fi
-% This is the bibliography for the Very Short Guide.\par
-%    \begin{macrocode}
+%<*docbib>
 @book{fi,
   title = {{Formatting Information}},
+  subtitle = {{Online {and} {PDF}}},
   author = {Peter Flynn},
   publisher = {Silmaril},
+  address = {Cork, Ireland},
   url = {http://latex.silmaril.ie/},
-  year = {2016}}
+  year = {2018}}
 
 @InProceedings{adams,
   author =       {Paul Adams},
   title =        {{Linguistic Chaos in Montreal}},
   booktitle =    {{Chaos and the City miniconference}},
   year =         2002,
-  month =        {Nov},
+  month =        {11},
   url =          {http://www.utexas.edu/depts/grg/adams/chaos.ppt},
   organization = {University of Texas School of Architecture}}
 
@@ -1724,7 +2105,6 @@ The bibliography for the Very Short Guide to Typesetting with \LaTeX{}
   url = {http://ftp.heanet.ie/pub/CTAN/tex/biblio/bibtex/base/btxdoc.pdf},
   year =         1988}
 
-
 @Manual{sherington,
   author =       {Sherington, J},
   title =        {{Informative Presentation of Graphs and Statistics}},
@@ -1733,417 +2113,19 @@ The bibliography for the Very Short Guide to Typesetting with \LaTeX{}
   url =          {http://www.reading.ac.uk/ssc/publications/guides/toptgs.htm},
   note =         {4.2, example table}
 }
-%    \end{macrocode}
-% \iffalse
-%</vsg-bib>
-% \fi
-% \newgeometry{left=3cm}
-% \clearpage
-% \section{The \LaTeX{} Project Public License}\label{LPPL:LPPL}
-% \begin{quotation}\small\noindent
-% Everyone is allowed to distribute verbatim copies of this
-%       license document, but modification of it is not allowed.
-% \end{quotation}
-% \subsection{Preamble}\label{LPPL:Preamble}
-% The \LaTeX{} Project Public License (\textsc{lppl})
-%       is the primary license under which the \LaTeX{} kernel and the
-%       base \LaTeX{} packages are distributed.\par
-% You may use this license for any work of which you hold the
-%       copyright and which you wish to distribute.  This license may be
-%       particularly suitable if your work is \TeX{}-related (such as a
-%       \LaTeX{} package), but it is written in such a way that you can
-%       use it even if your work is unrelated to \TeX{}.\par
-% The section \emph{Whether and How to Distribute Works under This
-%       License}, below, gives instructions, examples, and
-%       recommendations for authors who are considering distributing
-%       their works under this license.\par
-% This license gives conditions under which a work may be
-%       distributed and modified, as well as conditions under which
-%       modified versions of that work may be distributed.\par
-% We, the \LaTeX{3} Project, believe that the conditions below
-%       give you the freedom to make and distribute modified versions of
-%       your work that conform with whatever technical specifications
-%       you wish while maintaining the availability, integrity, and
-%       reliability of that work.  If you do not see how to achieve your
-%       goal while meeting these conditions, then read the document
-%       {\ttfamily{}cfgguide.tex} and {\ttfamily{}modguide.tex} in the base \LaTeX{}
-%       distribution for suggestions.\par
-% \subsection{Definitions}\label{LPPL:Definitions}
-% In this license document the following terms are used:\par
-% \begin{description}[style=unboxed]
-% \item[Work\thinspace:]Any work being distributed under this License.
-% \item[Derived Work\thinspace:]Any work that under any applicable law is derived from
-%     the Work.
-% \item[Modification\thinspace:]Any procedure that produces a Derived Work under any
-%     applicable law~--- for example, the production of a file
-%     containing an original file associated with the Work or a
-%     significant portion of such a file, either verbatim or
-%     with modifications and/or translated into another
-%     language.
-% \item[Modify\thinspace:]To apply any procedure that produces a Derived Work
-%     under any applicable law.
-% \item[Distribution\thinspace:]Making copies of the Work available from one person to
-%     another, in whole or in part.  Distribution includes (but
-%     is not limited to) making any electronic components of the
-%     Work accessible by file transfer protocols such as
-%     \textsc{ftp} or \textsc{http} or by
-%     shared file systems such as Sun's Network File System
-%     (\textsc{nfs}).
-% \item[Compiled Work\thinspace:]A version of the Work that has been processed into a
-%     form where it is directly usable on a computer system.
-%     This processing may include using installation facilities
-%     provided by the Work, transformations of the Work, copying
-%     of components of the Work, or other activities.  Note that
-%     modification of any installation facilities provided by
-%     the Work constitutes modification of the Work.
-% \item[Current Maintainer\thinspace:]A person or persons nominated as such within the Work.
-%     If there is no such explicit nomination then it is the
-%     `Copyright Holder' under any applicable
-%     law.
-% \item[Base Interpreter\thinspace:]A program or process that is normally needed for
-%     running or interpreting a part or the whole of the
-%     Work.\par
-% A Base Interpreter may depend on external components
-%     but these are not considered part of the Base Interpreter
-%     provided that each external component clearly identifies
-%     itself whenever it is used interactively.  Unless
-%     explicitly specified when applying the license to the
-%     Work, the only applicable Base Interpreter is a
-%     `\LaTeX{}-Format' or in the case of files
-%     belonging to the `\LaTeX{}-format' a program
-%     implementing the `\TeX{} language'.
-% \end{description}
-% \subsection{Conditions on Distribution and Modification}\label{LPPL:Conditions}
-% \begin{enumerate}
-% \item Activities other than distribution and/or modification
-%   of the Work are not covered by this license; they are
-%   outside its scope. In particular, the act of running the
-%   Work is not restricted and no requirements are made
-%   concerning any offers of support for the Work.
-% \item \label{LPPL:item:distribute}You may distribute a complete, unmodified copy of the
-%   Work as you received it.  Distribution of only part of the
-%   Work is considered modification of the Work, and no right to
-%   distribute such a Derived Work may be assumed under the
-%   terms of this clause.
-% \item You may distribute a Compiled Work that has been
-%   generated from a complete, unmodified copy of the Work as
-%   distributed under Clause~item~\ref{LPPL:item:distribute} above above, as
-%   long as that Compiled Work is distributed in such a way that
-%   the recipients may install the Compiled Work on their system
-%   exactly as it would have been installed if they generated a
-%   Compiled Work directly from the Work.
-% \item \label{LPPL:item:currmaint}If you are the Current Maintainer of the Work, you may,
-%   without restriction, modify the Work, thus creating a
-%   Derived Work.  You may also distribute the Derived Work
-%   without restriction, including Compiled Works generated from
-%   the Derived Work.  Derived Works distributed in this manner
-%   by the Current Maintainer are considered to be updated
-%   versions of the Work.
-% \item If you are not the Current Maintainer of the Work, you
-%   may modify your copy of the Work, thus creating a Derived
-%   Work based on the Work, and compile this Derived Work, thus
-%   creating a Compiled Work based on the Derived Work.
-% \item \label{LPPL:item:conditions}If you are not the Current Maintainer of the Work, you
-%   may distribute a Derived Work provided the following
-%   conditions are met for every component of the Work unless
-%   that component clearly states in the copyright notice that
-%   it is exempt from that condition.  Only the Current
-%   Maintainer is allowed to add such statements of exemption to
-%   a component of the Work.
-% \begin{enumerate}
-% \item If a component of this Derived Work can be a direct
-%       replacement for a component of the Work when that
-%       component is used with the Base Interpreter, then,
-%       wherever this component of the Work identifies itself to
-%       the user when used interactively with that Base
-%       Interpreter, the replacement component of this Derived
-%       Work clearly and unambiguously identifies itself as a
-%       modified version of this component to the user when used
-%       interactively with that Base Interpreter.
-% \item Every component of the Derived Work contains
-%       prominent notices detailing the nature of the changes to
-%       that component, or a prominent reference to another file
-%       that is distributed as part of the Derived Work and that
-%       contains a complete and accurate log of the
-%       changes.
-% \item No information in the Derived Work implies that any
-%       persons, including (but not limited to) the authors of
-%       the original version of the Work, provide any support,
-%       including (but not limited to) the reporting and
-%       handling of errors, to recipients of the Derived Work
-%       unless those persons have stated explicitly that they do
-%       provide such support for the Derived Work.
-% \item You distribute at least one of the following with
-%       the Derived Work:
-% \begin{enumerate}
-% \item A complete, unmodified copy of the Work; if your
-%   distribution of a modified component is made by
-%   offering access to copy the modified component from
-%   a designated place, then offering equivalent access
-%   to copy the Work from the same or some similar place
-%   meets this condition, even though third parties are
-%   not compelled to copy the Work along with the
-%   modified component;
-% \item Information that is sufficient to obtain a
-%   complete, unmodified copy of the Work.
-% \end{enumerate}
-% \end{enumerate}
-% \item If you are not the Current Maintainer of the Work, you
-%   may distribute a Compiled Work generated from a Derived
-%   Work, as long as the Derived Work is distributed to all
-%   recipients of the Compiled Work, and as long as the
-%   conditions of Clause~item~\ref{LPPL:item:conditions} above, above, are met
-%   with regard to the Derived Work.
-% \item The conditions above are not intended to prohibit, and
-%   hence do not apply to, the modification, by any method, of
-%   any component so that it becomes identical to an updated
-%   version of that component of the Work as it is distributed
-%   by the Current Maintainer under Clause~item~\ref{LPPL:item:currmaint} above, above.
-% \item Distribution of the Work or any Derived Work in an
-%   alternative format, where the Work or that Derived Work (in
-%   whole or in part) is then produced by applying some process
-%   to that format, does not relax or nullify any sections of
-%   this license as they pertain to the results of applying that
-%   process.
-% \item % \begin{enumerate}
-% \item A Derived Work may be distributed under a different
-%       license provided that license itself honors the
-%       conditions listed in Clause~item~\ref{LPPL:item:conditions} above above, in
-%       regard to the Work, though it does not have to honor the
-%       rest of the conditions in this license.
-% \item If a Derived Work is distributed under a different
-%       license, that Derived Work must provide sufficient
-%       documentation as part of itself to allow each recipient
-%       of that Derived Work to honor the restrictions in
-%       Clause~item~\ref{LPPL:item:conditions} above above, concerning
-%       changes from the Work.
-% \end{enumerate}
-% \item This license places no restrictions on works that are
-%   unrelated to the Work, nor does this license place any
-%   restrictions on aggregating such works with the Work by any
-%   means.
-% \item Nothing in this license is intended to, or may be used
-%   to, prevent complete compliance by all parties with all
-%   applicable laws.
-% \end{enumerate}
-% \subsection{No Warranty}\label{LPPL:Warranty}
-% There is no warranty for the Work.  Except when otherwise
-%       stated in writing, the Copyright Holder provides the Work
-%       `as is', without warranty of any kind, either
-%       expressed or implied, including, but not limited to, the implied
-%       warranties of merchantability and fitness for a particular
-%       purpose.  The entire risk as to the quality and performance of
-%       the Work is with you.  Should the Work prove defective, you
-%       assume the cost of all necessary servicing, repair, or
-%       correction.\par
-% In no event unless required by applicable law or agreed to
-%       in writing will The Copyright Holder, or any author named in the
-%       components of the Work, or any other party who may distribute
-%       and/or modify the Work as permitted above, be liable to you for
-%       damages, including any general, special, incidental or
-%       consequential damages arising out of any use of the Work or out
-%       of inability to use the Work (including, but not limited to,
-%       loss of data, data being rendered inaccurate, or losses
-%       sustained by anyone as a result of any failure of the Work to
-%       operate with any other programs), even if the Copyright Holder
-%       or said author or said other party has been advised of the
-%       possibility of such damages.\par
-% \subsection{Maintenance of The Work}\label{LPPL:Maintenance}
-% The Work has the status `author-maintained'
-%       if the Copyright Holder explicitly and prominently states near
-%       the primary copyright notice in the Work that the Work can only
-%       be maintained by the Copyright Holder or simply that it is
-%       `author-maintained'.\par
-% The Work has the status `maintained' if there
-%       is a Current Maintainer who has indicated in the Work that they
-%       are willing to receive error reports for the Work (for example,
-%       by supplying a valid e-mail address). It is not required for the
-%       Current Maintainer to acknowledge or act upon these error
-%       reports.\par
-% The Work changes from status `maintained' to
-%       `unmaintained' if there is no Current Maintainer,
-%       or the person stated to be Current Maintainer of the work cannot
-%       be reached through the indicated means of communication for a
-%       period of six months, and there are no other significant signs
-%       of active maintenance.\par
-% You can become the Current Maintainer of the Work by
-%       agreement with any existing Current Maintainer to take over this
-%       role.\par
-% If the Work is unmaintained, you can become the Current
-%       Maintainer of the Work through the following steps:\par
-% \begin{enumerate}
-% \item Make a reasonable attempt to trace the Current
-%   Maintainer (and the Copyright Holder, if the two differ)
-%   through the means of an Internet or similar search.
-% \item If this search is successful, then enquire whether the
-%   Work is still maintained.
-% \begin{enumerate}
-% \item If it is being maintained, then ask the Current
-%       Maintainer to update their communication data within one
-%       month.
-% \item \label{LPPL:item:intention}If the search is unsuccessful or no action to resume
-%       active maintenance is taken by the Current Maintainer,
-%       then announce within the pertinent community your
-%       intention to take over maintenance.  (If the Work is a
-%       \LaTeX{} work, this could be done, for example, by
-%       posting to \url{news:comp.text.tex}.)
-% \end{enumerate}
-% \item % \begin{enumerate}
-% \item If the Current Maintainer is reachable and agrees to
-%       pass maintenance of the Work to you, then this takes
-%       effect immediately upon announcement.
-% \item \label{LPPL:item:announce}If the Current Maintainer is not reachable and the
-%       Copyright Holder agrees that maintenance of the Work be
-%       passed to you, then this takes effect immediately upon
-%       announcement.
-% \end{enumerate}
-% \item \label{LPPL:item:change}If you make an `intention announcement'
-%   as described in~item~\ref{LPPL:item:intention} above above and after three
-%   months your intention is challenged neither by the Current
-%   Maintainer nor by the Copyright Holder nor by other people,
-%   then you may arrange for the Work to be changed so as to
-%   name you as the (new) Current Maintainer.
-% \item If the previously unreachable Current Maintainer becomes
-%   reachable once more within three months of a change
-%   completed under the terms of~item~\ref{LPPL:item:announce} above
-%   or~item~\ref{LPPL:item:change} above, then that
-%   Current
-%   Maintainer must become or remain the Current Maintainer upon
-%   request provided they then update their communication data
-%   within one month.
-% \end{enumerate}
-% A change in the Current Maintainer does not, of itself,
-%       alter the fact that the Work is distributed under the
-%       \textsc{lppl} license.\par
-% If you become the Current Maintainer of the Work, you should
-%       immediately provide, within the Work, a prominent and
-%       unambiguous statement of your status as Current Maintainer.  You
-%       should also announce your new status to the same pertinent
-%       community as in~item~\ref{LPPL:item:intention} above
-%       above.\par
-% \subsection{Whether and How to Distribute Works under This
-%       License}\label{LPPL:Distribute}
-% This section contains important instructions, examples, and
-%       recommendations for authors who are considering distributing
-%       their works under this license.  These authors are addressed as
-%       `you' in this section.\par
-% \subsubsection{Choosing This License or Another License}\label{LPPL:Choosing}
-% If for any part of your work you want or need to use
-% \emph{distribution} conditions that differ
-% significantly from those in this license, then do not refer to
-% this license anywhere in your work but, instead, distribute
-% your work under a different license. You may use the text of
-% this license as a model for your own license, but your license
-% should not refer to the \textsc{lppl} or otherwise
-% give the impression that your work is distributed under the
-% \textsc{lppl}.\par
-% The document {\ttfamily{}modguide.tex} in the base \LaTeX{}
-% distribution explains the motivation behind the conditions of
-% this license.  It explains, for example, why distributing
-% \LaTeX{} under the \textsc{gnu} General Public
-% License (\textsc{gpl}) was considered inappropriate.
-% Even if your work is unrelated to \LaTeX{}, the discussion in
-% {\ttfamily{}modguide.tex} may still be
-% relevant, and authors intending to distribute their works
-% under any license are encouraged to read it.\par
-% \subsubsection{A Recommendation on Modification Without
-% Distribution}\label{LPPL:WithoutDistribution}
-% It is wise never to modify a component of the Work, even
-% for your own personal use, without also meeting the above
-% conditions for distributing the modified component.  While you
-% might intend that such modifications will never be
-% distributed, often this will happen by accident~--- you may
-% forget that you have modified that component; or it may not
-% occur to you when allowing others to access the modified
-% version that you are thus distributing it and violating the
-% conditions of this license in ways that could have legal
-% implications and, worse, cause problems for the community. It
-% is therefore usually in your best interest to keep your copy
-% of the Work identical with the public one.  Many works provide
-% ways to control the behavior of that work without altering any
-% of its licensed components.\par
-% \subsubsection{How to Use This License}\label{LPPL:HowTo}
-% To use this license, place in each of the components of
-% your work both an explicit copyright notice including your
-% name and the year the work was authored and/or last
-% substantially modified.  Include also a statement that the
-% distribution and/or modification of that component is
-% constrained by the conditions in this license.\par
-% Here is an example of such a notice and statement:\par
-% \iffalse
-%<*ignore>
-% \fi
-\begin{lstlisting}[language={[LaTeX]TeX}]
-%%% pig.dtx
-%%% Copyright 2005 M. Y. Name
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
-%% This work has the LPPL maintenance status `maintained'.
-%% 
-%% The Current Maintainer of this work is M. Y. Name.
-%%
-%% This work consists of the files pig.dtx and pig.ins
-%% and the derived file pig.sty.
-\end{lstlisting}
-% \iffalse
-%</ignore>
-% \fi
-% Given such a notice and statement in a file, the
-% conditions given in this license document would apply, with
-% the `Work' referring to the three files
-% {\ttfamily{}pig.dtx}, {\ttfamily{}pig.ins}, and {\ttfamily{}pig.sty} (the last being generated
-% from {\ttfamily{}pig.dtx} using {\ttfamily{}pig.ins}), the `Base
-%   Interpreter' referring to any
-% `\LaTeX{}-Format', and both `Copyright
-%   Holder' and `Current Maintainer'
-% referring to the person
-% M.~Y.~Name\index{!}.\par
-% If you do not want the Maintenance section of
-% \textsc{lppl} to apply to your Work, change
-% `maintained' above into
-% `author-maintained'. However, we recommend that
-% you use `maintained' as the Maintenance
-% section was added in order to ensure that your Work remains
-% useful to the community even when you can no longer maintain
-% and support it yourself.\par
-% \subsubsection{Derived Works That Are Not Replacements}\label{LPPL:NotReplacements}
-% Several clauses of the \textsc{lppl} specify
-% means to provide reliability and stability for the user
-% community. They therefore concern themselves with the case
-% that a Derived Work is intended to be used as a (compatible or
-% incompatible) replacement of the original Work. If this is not
-% the case (e.g., if a few lines of code are reused for a
-% completely different task), then clauses 6b and 6d shall not
-% apply.\par
-% \subsubsection{Important Recommendations}\label{LPPL:Recommendations}
-% \paragraph{Defining What Constitutes the Work}
-% The \textsc{lppl} requires that distributions
-%   of the Work contain all the files of the Work.  It is
-%   therefore important that you provide a way for the licensee
-%   to determine which files constitute the Work.  This could,
-%   for example, be achieved by explicitly listing all the files
-%   of the Work near the copyright notice of each file or by
-%   using a line such as:\par
-% \iffalse
-%<*ignore>
-% \fi
-\begin{lstlisting}[language={[LaTeX]TeX}]
-%% This work consists of all files listed in manifest.txt.
-\end{lstlisting}
-% \iffalse
-%</ignore>
+
+@TechReport{rfc2119,
+  author =   {Scott Bradner},
+  title =   {{Key words for use in RFCs to Indicate Requirement Levels}},
+  institution =  {Internet Engineering Task Force},
+  year =   1997,
+  number =   {RFC 2119},
+  address =   {Fremont, CA},
+  url =   {http://www.ietf.org/rfc/rfc2119.txt},
+  month =   {3}
+}
+      
+%</docbib>
 % \fi
-% in that place.  In the absence of an unequivocal list it
-%   might be impossible for the licensee to determine what is
-%   considered by you to comprise the Work and, in such a case,
-%   the licensee would be entitled to make reasonable
-%   conjectures as to which files comprise the Work.\par
 % \Finale
 
diff --git a/info/latex-veryshortguide/veryshortguide.ins b/info/latex-veryshortguide/veryshortguide.ins
new file mode 100644
index 0000000000..f49a530395
--- /dev/null
+++ b/info/latex-veryshortguide/veryshortguide.ins
@@ -0,0 +1,62 @@
+% Transformed from veryshortguide.xml by ClassPack db2dtx.xsl
+% version 1.19 (2020-05-19) on Thursday 21 May 2020 at 11:55:35
+%
+% veryshortguide.ins is copyright © 2009-2020 by Peter Flynn <peter@silmaril.ie>
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3 of this license or (at your option) any later
+% version. The latest version of this license is in:
+%
+%     http://www.latex-project.org/lppl.txt
+%
+% and version 1.3 or later is part of all distributions of
+% LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status ‘maintained’.
+% 
+% The current maintainer of this work is Peter Flynn <peter@silmaril.ie>
+%
+% This work consists of the files veryshortguide.dtx and veryshortguide.ins,
+% the derived file 
+% and any other ancillary files listed in the MANIFEST.
+%
+\input docstrip.tex
+\keepsilent
+\usedir{tex/latex/veryshortguide}
+\preamble
+
+This is a generated file.
+
+Copyright © 2006 by Silmaril Consultants
+
+This file was generated from an XML master source.
+Amendments and corrections should be notified to the
+maintainer for inclusion in future versions.
+
+\endpreamble
+\generate{\file{veryshortguide.cls}{\from{veryshortguide.dtx}{class}}
+          \usepreamble\empty\usepostamble\empty
+          \file{vsg.tex}{\from{veryshortguide.dtx}{vsg}}
+          \usepreamble\empty\usepostamble\empty
+          \file{vsg.bib}{\from{veryshortguide.dtx}{docbib}}
+}
+\obeyspaces
+\Msg{********************************************************}
+\Msg{**                                                    **}
+\Msg{** Read the documentation before using this class.    **}
+\Msg{**                                                    **}
+\Msg{** To finish the installation you have to move the    **}
+\Msg{** following files into a directory searched by TeX:  **}
+\Msg{**                                                    **}
+\Msg{**                                                    **}
+\Msg{**     vsg.tex                                       **}
+\Msg{**     vsg.bib                                       **}
+\Msg{**                                                    **}
+\Msg{** To produce the documentation run the file          **}
+\Msg{** veryshortguide.dtx through XeLaTeX and biber        **}
+\Msg{**                                                    **}
+\Msg{** Happy LaTeXing!                                    **}
+\Msg{**                                                    **}
+\Msg{********************************************************}
+\endbatchfile
diff --git a/info/latex-veryshortguide/veryshortguide.pdf b/info/latex-veryshortguide/veryshortguide.pdf
index ea7d931eeb..e02dcbacaf 100644
--- a/info/latex-veryshortguide/veryshortguide.pdf
+++ b/info/latex-veryshortguide/veryshortguide.pdf
diff --git a/info/latex-veryshortguide/veryshortguide.tex b/info/latex-veryshortguide/veryshortguide.tex
deleted file mode 100644
index 698e51ef64..0000000000
--- a/info/latex-veryshortguide/veryshortguide.tex
+++ /dev/null
@@ -1,471 +0,0 @@
-%% The Very Short Guide to Typesetting with \LaTeX{}
-\documentclass[a5paper]{vsg}
-\addbibresource{veryshortguide.bib}
-\setlength{\bibnamesep}{-\itemsep}
-\begin{document}
-\title{The very short guide to typesetting with~\LaTeX}
-\author{Silmaril Consultants\\
-  \textbf{Textual Therapy Division}\\
-  \protect\url{http://latex.silmaril.ie}}
-\date{\monthdate}
-\maketitle
-\subsection*{What's this all about? What's \LaTeX?}
-\LaTeX\ is a document preparation system which uses the \TeX\
-typesetting program. It enables you to produce
-publication-quality documents with great accuracy and
-consistency. \LaTeX\ works on any computer and produces
-industry-standard PDF. It is available both in free (open-source)
-and commercial implementations. \LaTeX\ can be used for any kind
-of document, but it is especially suited to those with complex
-structures, repetitive formatting, or notations like
-mathematics\footnote{For reasons of space this guide does not
-cover details of mathematics typesetting.}; or where technical
-stability, dimensional accuracy, or a persistent and
-non-proprietary file format are needed. Install the software from
-\url{www.tug.org/texlive/} or buy a commercially-supported
-version from one of the vendors (see the list on
-p.\thinspace\pageref{comm}).
-\subsection*{Creating and typesetting your document}
-\begin{enumerate}[noitemsep]\setlength{\fboxsep}{1pt}
-   \item Create your document using any suitable plain-text
-     editor with \LaTeX\ controls, eg \textit{\TeX shop}
-     (Mac), \textit{\TeX Maker} (Win), \textit{Kile}
-     (Linux), \textit{Emacs} (all), even
-     \textit{vi}\thinspace!
-   \item Save the file with a name ending in \verb+.tex+
-     (\emph{never} use spaces in filenames!);
-   \item Use the {\small\keys{Build}} or
-     {\small\keys{Compile}} toolbar button or menu item in
-     your editor to typeset and display the
-     document;\label{typeset}
-   \item Make any changes needed in your original document
-     and repeat step \ref{typeset}.
-\end{enumerate}
-\subsection*{Syntax (how to type \LaTeX\ commands --- these
-  are the rules)}
-\begin{itemize}[noitemsep]
-  \item \textbf{All \LaTeX\ commands begin with a
-    backslash}.\\ \example
-    \verb+\tableofcontents+\endexample
-  \item \textbf{If a command needs text to work with, it
-    goes in curly braces}.\\ \example
-    \verb+\title{Irisches Tagebuch}\author{Heinrich Böll}+\endexample
-  \item \textbf{If options are used, they go in square
-    brackets before the curly braces}.\\ \example
-    \verb+\documentclass[a4paper,11pt]{book}+\endexample
-  \item \textbf{Spaces after commands \emph{without} braces
-    get suppressed}.\\ \example
-    \verb+Copyright \copyright␣+\texttt{\number\year}
-    \gives{Copyright ©\number\year} \nobox\\ To prevent
-    this, put empty curly braces after the
-    command:\\ \example
-    \verb+Copyright \copyright{}␣+\texttt{\number\year}
-    \gives{Copyright ©~\number\year} \yesbox
-  \item \textbf{Curly braces are also used to restrict the
-    scope of effects inside them}.\\ \example
-    \verb+Some {\tiny little} word+ \gives{Some {\tiny
-        little} word}
-\end{itemize}
-\begin{note}
-This guide shows only a tiny fraction of \LaTeX's power. For
-more information, visit the \TeX\ Users Group site
-(\url{www.tug.org}). For help, see the FAQ
-(\url{www.tex.ac.uk/faq}), StackExchange
-(\url{tex.stackexchange.com}), or the Usenet newsgroup
-\url{comp.text.tex}. For packages (plugins), use CTAN, the
-Comprehensive \TeX\ Archive Network
-(\url{www.ctan.org}). For further details, see
-\citetitle{fi} \parencite{fi} and other online resources.
-\end{note}
-\begin{multicols}{2}\small\parskip4pt
-\subsection*{Writing a \LaTeX\ document}
-\subsubsection{Basic document structure}
-Here's the skeleton of a \LaTeX\ document. These three lines are
-\textsc{compulsory}: your document will not work without them:
-\begin{Verbatim}[frame=single,fontsize=\small,commandchars=!<>]
-!added\documentclass[11pt]{article}
-!comment your Preamble goes here (extra setups, if any)
-!added\begin{document}
-!comment your document text goes here
-!added\end{document}
-\end{Verbatim}
-\vspace*{-.5\baselineskip}
-{\fontsize67\selectfont\sffamily New material in each example is
-shown in {\ttfamily\added blue}; material from previous examples
-is in black. Comments and mnemonics are in
-\textcolor{DarkRed}{red}.\par}
-\begin{itemize}[noitemsep]
-  \item The document class name \textsc{must} be one of the
-    standard \verb+book+, \verb+article+, or \verb+report+,
-    or one of the many others preinstalled or downloadable
-    (eg \verb+thesis+, \verb+memoir+, etc);
-  \item There are body type size options \verb+10pt+ (the
-    default), \verb+11pt+, and \verb+12pt+;
-  \item There are paper size options including
-    \verb+a4paper+ (210\thinspace mm$\times$297\thinspace
-    mm) and \verb+letterpaper+ (8½$''\times$11$''$) [see
-      below].
-\end{itemize}
-
-\subsubsection{Front matter}
-
-The \textbf{Preamble} [see above] is where you speci\-fy any
-\textbf{packages} (\LaTeX\ plugins like typefaces or special
-formatting), and where you put any changes to standard features.
-
-\begin{Verbatim}[frame=single,fontsize=\small,commandchars=!<>]
-\documentclass[a4paper,11pt]{book}
-!added\usepackage{charter,graphicx}!revert
-!added\setlength{\parindent}{1em}!revert
-\begin{document}
-!added\title!comment{your document title!revert}
-!added\author!comment{your name!revert}
-!added\date!comment{date of publication!revert}
-!added\maketitle
-!added\begin{abstract}
-!comment the paragraphs of your abstract go here
-!added\end{abstract}
-!added\tableofcontents
-!comment the text of your document goes here
-\end{document}
-\end{Verbatim}
-
-The title, author, and date \textsc{must} be followed by the
-\verb+\maketitle+ command to be formatted correctly.
-
-\subsubsection{Body matter}
-
-\textbf{Leave a blank line between paragraphs} as you type: this
-signals a new paragraph. Spacing is controlled by the
-document class and packages you use. For an unindented,
-line-spaced style, use the \textsf{parskip} package.
-
-\paragraph{Sectioning:}
-Sections get numbered automatically in bold type, and get included in
-the Table of Contents (if you use it). Numbering can be turned off
-selectively. Section heading layout can be modified with the
-\textsf{sectsty}, \mbox{\textsf{titlesec}}, and other packages.
-
-\begin{Verbatim}[frame=single,fontsize=\small,commandchars=!<>]
-!comment (Preamble, titling, and abstract as above)
-\tableofcontents
-!added\chapter!comment{heading of a chapter!revert}
-!comment text for the chapter goes here
-!added...as shown in section \ref{blah}.
-!added\section!comment{heading of a section!revert}
-!added\label{blah} !comment make up name for the label
-!comment text for the section goes here
-!added\chapter!comment{heading of a new chapter!revert}
-!comment text for the new chapter goes here
-\end{document}
-\end{Verbatim}
-
-\paragraph{Lists:}
-There are three types of list: \textbf{itemized} (bulleted), \textbf{enumerated} (numbered
-or lettered), and \textbf{descriptive} (topic-and-explanation
-format).
-
-Like \textsf{document}, these are all \textbf{environments}, using
-\verb+\begin{...}+ and \verb+\end{...}+.
-
-\begingroup\fontsize{4.5}{5.5}\selectfont
-\renewcommand{\labelitemi}{\textbullet}
-\leftmargini=2em
-\setlength{\tabcolsep}{3pt}
-\begin{tabular}{@{}%
-    p{.25\columnwidth}|%
-    p{.32\columnwidth}|%
-    p{.33\columnwidth}@{}}
-\begin{verbatim}
-\begin{itemize}
- \item 1lb Sugar
- \item ½pt Cream
- \item Chocolate
- \item 2oz Butter
-\end{itemize}
-\end{verbatim}
-&
-\begin{verbatim}
-\begin{enumerate}
- \item Mix ingredients
- \item Boil to 112°C
- \item Stir and cool
- \item Pour into dish
-\end{enumerate}
-\end{verbatim}
-&
-\begin{verbatim}
-\begin{description}
- \item[Fudge] is fun...
- \item[Broccoli] sucks...
- \item[Exercise] is good
-  for you if taken daily
-\end{description}
-\end{verbatim}
-\\\hline\scriptsize
-\begin{itemize}[noitemsep]
-\item 1lb Sugar
-\item ½pt Cream
-\item Chocolate
-\item 2oz Butter
-\end{itemize}
-&\fontsize{6.5}{8}\selectfont
-\begin{enumerate}[noitemsep]
-\item Mix ingredients
-\item Boil to 112°C
-\item Stir and cool
-\item Pour into dish
-\end{enumerate}
-&\tiny
-\begin{description}[noitemsep]
-\item[Fudge] is fun but fattening if made too often.
-\item[Broccoli] sucks, period.
-\item[Exercise] is good for you if taken daily and not to extremes.
-\end{description}
-\end{tabular}
-\endgroup
-
-You can nest lists inside each other. Use the \textsf{enumitem}
-package to control list formatting.
-
-\colorbox{LightGrey}{\color{black}\begin{minipage}{.965\columnwidth}%
-\sffamily\scriptsize\bfseries\raggedright
-For help, see the links on the front and back pages. There is a
-summary of common commands at\\
-\url{www.stdout.org/~winston/latex/latexsheet.pdf}
-and a comprehensive list at
-\url{www.eeng.dcu.ie/local-docs/latex-help/}~.
-\end{minipage}}
-\columnbreak
-\paragraph{Tables and figures:}
-These environments \textbf{float} (to fit
-available space). They have \verb+\caption+ and \verb+\label+ commands.
-
-\begin{Verbatim}[frame=single,fontsize=\footnotesize,commandchars=!<>]
-!added\begin{figure} !comment(see below)
-\caption{Swiss and Dutch Mennonite
- migrations of the 1700s and 1800s}
-\label{lmig}
-!added\centering !comment(centre the contents)
-!added\includegraphics[width=.8\columnwidth]
-!added {menno-a}\\ !comment(double backslash for linebreak)
-!added\scriptsize!revert Courtesy of Paul C. Adams,
- Department of Geography and the
- Environment, University of Texas at
- Austin.
-!added\cite{adams}\end{figure}
-\end{Verbatim}
-
-Graphics \textsc{must} be EPS files for standard \LaTeX, but JPG, PNG,
-or PDF for pdf\LaTeX.
-
-\begin{Verbatim}[frame=single,fontsize=\footnotesize,commandchars=!<>]
-!added\begin{table}
- !added\caption{Mean growth rate and intakes
- !added of supplement, milk, and water for 4
- !added diets (after Sherington, J, undated)}
- \label{dietgrowth}
- \centering
- !added\begin{tabular}{|l|r|r|r|r|}
- !added\hline !comment(horizontal line between rows)
-  !added&Growth&Supplement&Milk&Water
-  !added\\\hline !comment(double backslash for new row)
- !added Supplement&rate&intake&intake&intake
-  !added\\\hline
-  !added&(g/day)&(g/day)&(ml/kg$^{0.75}$)&
-  !added (ml/kg$^{0.75}$)\\\hline
- !added Lucerne &145&450&10.5&144\\\hline
- !added Sesbania&132&476& 9.2&128\\\hline
- !added Leucaena&128&364& 8.9&121\\\hline
- !added None    & 89&  0& 9.8&108\\\hline
- !added\end{tabular}
-!added\end{table}
-\end{Verbatim}
-
-\begin{center}\sffamily
-  \fontsize78\selectfont
-\setlength{\tabcolsep}{2pt}
-\setlength{\arrayrulewidth}{.2pt}
-\begin{tabular}{@{}|>{\vrule height1em width0pt}l|r|r|r|r|@{}}
-\multicolumn5l{\textbf{Table 2}: \textit{Mean growth rate and intakes
-of supplement,}}\\
-\multicolumn5l{\textit{milk, and water for four diets} (after
-    Sherington, J, undated)}\\[6pt]\hline
-\vrule height1.1em width0pt&Growth&Supplement&Milk&Water\\[-1pt]
-Supplement&rate&intake&intake&intake\\[-1pt]
-&(g/day)&(g/day)&(ml/kg\textsuperscript{\fontsize34\selectfont 0.75})&(ml/kg\textsuperscript{\fontsize34\selectfont 0.75})\\[3pt]\hline
-Lucerne &145&450&10.5&144\\\hline
-Sesbania&132&476& 9.2&128\\\hline
-Leucaena&128&364& 8.9&121\\\hline
-None    & 89&  0& 9.8&108\\\hline
-\end{tabular}
-\end{center}
-Packages like \textsf{longtable} and \textsf{array} can help
-with more complex table formats.
-
-\end{multicols}
-
-\begin{center}\sffamily
-  \textbf{Figure 1}: \textit{Swiss and Dutch Mennonite migrations of the
-    1700s and 1800s}\\[3pt]
-  \ifafive\includegraphics[width=.8\columnwidth]{menno-a}\fi
-  \iflegal\includegraphics[width=.7\columnwidth]{menno-a}\fi
-  \\\scriptsize
-  Courtesy of Paul C. Adams, Department of Geography
-  and the Environment, University of Texas at Austin. [1]
-\end{center}
-
-\begin{multicols}{2}\small\parskip4pt
-\paragraph{Typefaces:}
-{\ff{lrm}\selectfont The default typeface in \LaTeX\ is Computer
-  Modern, like this.}
-
-{\footnotesize\tabcolsep4pt
-\begin{tabular}{@{}l@{\hspace{6pt}}>{\ttfamily}l|l@{\hspace{6pt}}>{\ttfamily}l@{}}
-\ff{ptm}Times&mathptmx&\ff{pcr}Courier&courier\\
-\ff{ppl}Palatino&mathpazo&\ff{pag}\scriptsize Avant Garde&avant\\
-\ff{pbk}Bookman&bookman&\ff{phv}Helvetica&helvet\\
-\ff{bch}Charter&charter&\ff{pzc}Zapf Chancery&chancery\\
-\ff{put}Utopia&utopia&\ff[OT1]{pnr}Pandora&pandora\\
-\ff{pnc}Century&newcent&\ff[U]{yfrak}Fraktur&oldgerm\\
-\end{tabular}
-}
-
-Dozens of other font packages are available in \TeX\ Live and the \LaTeX\ Font
-Catalogue, including mathematics and decorative fonts. Any
-Postscript Type~1 font can be configured for \LaTeX.
-
-If you use \XeLaTeX\ and the \textsf{fontspec} package, you can also
-use your computer's system fonts as well as those available
-with \TeX\ Live.
-
-\colorbox{LightGrey}{\color{black}\begin{minipage}{.965\columnwidth}%
-\sffamily\scriptsize\raggedright
-Commercial implementations of \TeX\ for Windows with business-level
-support are available from Personal \TeX, Inc (PC\TeX); MacKichan
-Software, Inc (Scientific Word); Micropress, Inc (V\TeX), and
-True\TeX\ Software (True\TeX).\label{comm}
-\end{minipage}}
-
-\columnbreak
-\textsf{Typefaces continued}
-
-To change font for a word or phrase, use these commands (they can be
-nested):
-
-{\small
-\begin{tabular}{l@{\enspace}>{\ttfamily\char'134 text}l<{\char'173
-      Hello\char'175}@{}>{\ \gives\bgroup}l<{Hello\egroup}}
-Italics&it&\itshape\\
-Boldface&bf&\bfseries\\
-Smallcaps&sc&\ff{cmr}\scshape\\
-Sans-serif&sf&\sffamily\\
-Monospace&tt&\ttfamily\\
-\end{tabular}}
-
-\begingroup\small
-\example\verb+\textit{\textbf{\textsf+\ifafive\linebreak\fi
-\verb+{bold+ \iflegal\linebreak\fi\verb+italic sans}}}+
-\gives{\ff{cmss}\textit{\textbf{bold italic sans}}}
-\par\endgroup
-
-Sizes for titles, headings, footnotes, etc are automatic, but
-there are some step-sizes:
-
-{\scriptsize\centering
-\begin{tabular}{>{\ttfamily\char'134}lrrr}
-normalsize&10&11&12\\\hline\vrule height1.1em width0pt
-tiny&5&6&7\\
-scriptsize&6&7&8\\
-footnotesize&7&8&9\\
-small&9&10&11\\
-large&11&12&14\\
-Large&12&14&17\rlap*\\
-LARGE&14&17\rlap*&20\rlap*\\
-huge&17\rlap*&20\rlap*&24\rlap*\\
-Huge&20\rlap*&24\rlap*&28\rlap*\\
-\end{tabular}
-\quad
-\rotatebox[origin=c]{90}{\tiny* sizes rounded here to save space}
-\par}
-
-For other sizes, add the special command
-{\added\verb+\RequirePackage{fix-cm}+}\iflegal\linebreak\fi \emph{before} the
-\verb+\documentclass+ line and use
-{\added\verb+\fontsize{+\texttt{\uline{pp}}\verb+}{+\texttt{\uline{bb}}\verb+}\selectfont+}
-for the point-size (\textit{pp}) and baseline
-(\textit{bb}).
-
-{\sffamily\footnotesize
-  Size commands are all \textbf{unscoped} commands, so enclose them \emph{and}
-the applicable text in curly braces to stop them affecting the rest
-of the document.\par}
-For double or 1½ line-spacing (eg in theses) use the \textsf{setspace}
-package.
-
-You can use colour palettes in the RGB, CMYK, HTML, and other
-colourspaces with \iflegal\\\fi the \textsf{xcolor} \ifafive\\\fi
-package and the\hfil
-\smash{\raisebox{0ex}{\sffamily\bfseries\Huge\iflegal\quad\else\enspace\fi
-\textcolor[HTML]{2F50AD}{G}%
-\textcolor[HTML]{B32F17}{o}%
-\textcolor[HTML]{F3C20B}{o}%
-\textcolor[HTML]{2F50AD}{g}%
-\textcolor[HTML]{48C847}{l}%
-\textcolor[HTML]{B32F17}{e}}}%
-\\\verb+\color{+\texttt{\textit{name}}\verb+}+ command.
-
-For verbatim text, use the \verb+\verb+ command or the
-\textsf{verbatim} environment, or (better) the \textsf{listings} or
-\textsf{fancyvrb} packages.
-
-\paragraph{Footnotes:}
-You do footnotes with \iflegal\\\fi \verb+\footnote(like this}+.\footnote{Like
-  this.} Endnotes too.
-
-\paragraph{Cross-references:}\label{blah} Use the command
-\verb+\label{...}+ to label the target, and \verb+\ref{...}+ or
-\verb+\pageref{...}+ to refer to it. Make up the labels yourself.
-
-\begingroup\small
-\example{...\ttfamily section \verb+\ref{blah}+ on
-  p.\\ \verb+\pageref{blah}+.}\gives{...section \ref{blah} on
-  p.\thinspace\pageref{blah}}.
-\par\endgroup
-
-\paragraph{Citation and reference:} Create your bibliographic database
-in BIB\TeX\ format \parencite{bibtex} using \emph{JabRef} or
-similar. Each entry \textsc{must} have a unique label (here `\verb+fi+'):
-\begin{Verbatim}[frame=single,fontsize=\scriptsize,commandchars=!<>]
-!added@book{fi,
-!added  title = {Formatting Information},
-!added  author = {Peter Flynn},
-!added  publisher = {Silmaril},
-!added  year = {2016}}
-\end{Verbatim}
-Use the
-\textsf{biblatex} package to specify the style, and give
-the filename of your database:
-\begin{Verbatim}[frame=single,fontsize=\footnotesize,commandchars=!<>]
-!added\usepackage[style=apa]{biblatex}
-!added\addbibresource{myrefs.bib}
-\end{Verbatim}
-To cite, use \verb+\cite{...}+ (or
-\verb+\textcite+ or \verb+\parencite+) with the relevant label:\\ \example{\verb+\textcite{fi}+}\gives{\textcite{fi}}.
-
-\subsubsection{Back matter}
-For an index, use the \textsf{makeidx} package and the
-\verb+\makeindex+ command with the \verb+\index{...}+
-and \verb+\printindex+ commands and the \textsf{makeindex} program.
-
-\nocite{*}
-{\defbibheading{shortbib}[References]{\subsection*{#1}}\renewcommand*{\bibfont}{\scriptsize}\setlength{\bibhang}{1em}\urlstyle{tt}\label{refs}\printbibliography[heading=shortbib]}
-
-\colorbox{LightGrey}{\color{black}\begin{minipage}{.965\columnwidth}%
-\sffamily\scriptsize\bfseries\raggedright
-For information about \LaTeX\ training and consutancy, please contact
-Silmaril at \url{latex@silmaril.ie}
-\end{minipage}}%
-\end{multicols}
-\end{document}
-
diff --git a/info/latex-veryshortguide/vsg.ins b/info/latex-veryshortguide/vsg.ins
deleted file mode 100644
index 747ffebaeb..0000000000
--- a/info/latex-veryshortguide/vsg.ins
+++ /dev/null
@@ -1,43 +0,0 @@
-%% Transformed from vsg.xml by ClassPack db2dtx.xsl
-% version 16.00 (Makefile with XeLaTeX) on Friday 12 August 2016 at 10:42:12
-% vsg.ins is copyright © 2009-2016 by Peter Flynn <peter@silmaril.ie>
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either
-% version 1.3 of this license or (at your option) any later
-% version. The latest version of this license is in:
-%
-%     http://www.latex-project.org/lppl.txt
-%
-% and version 1.3 or later is part of all distributions of
-% LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-% 
-% The current maintainer of this work is Peter Flynn <peter@silmaril.ie>
-%
-% This work consists of the files vsg.dtx and vsg.ins,
-% the derived file vsg.cls, and any ancillary files listed
-% in the MANIFEST.
-%
-\input docstrip.tex
-\keepsilent
-\usedir{tex/latex/veryshortguide}
-\preamble
-This file was generated from an XML master source.
-Amendments and corrections should be notified to the
-maintainer for inclusion in future versions.
-\endpreamble
-\generate{\file{vsg.cls}{\from{vsg.dtx}{class}}
-          \usepreamble\empty\usepostamble\empty
-          \file{veryshortguide.tex}{\from{vsg.dtx}{veryshortguide}}
-          \usepreamble\empty\usepostamble\empty
-          \file{veryshortguide.bib}{\from{vsg.dtx}{vsg-bib}}
-}
-\obeyspaces
-\Msg{********************************************************}
-\Msg{**                                                    **}
-\Msg{** Read the documentation before using this class  .  **}
-\Msg{**                                                    **}
-\Msg{********************************************************}
-\endbatchfile
diff --git a/info/latex-veryshortguide/vsg.pdf b/info/latex-veryshortguide/vsg.pdf
deleted file mode 100644
index e1507e64d0..0000000000
--- a/info/latex-veryshortguide/vsg.pdf
+++ /dev/null
diff --git a/macros/generic/chemfig/README b/macros/generic/chemfig/README
index 1068cd4dce..ab9a6ebfd6 100644
--- a/macros/generic/chemfig/README
+++ b/macros/generic/chemfig/README
@@ -2,9 +2,9 @@ ___________________________________
 
                 The
           Chemfig package
-               v1.53
+               v1.54
 
-            2020/04/27
+            2020/05/21
 ___________________________________
 
 Maintainer: Christian Tellechea
diff --git a/macros/generic/chemfig/chemfig-en.pdf b/macros/generic/chemfig/chemfig-en.pdf
index 1e5152ae55..3a3df880ef 100644
--- a/macros/generic/chemfig/chemfig-en.pdf
+++ b/macros/generic/chemfig/chemfig-en.pdf
diff --git a/macros/generic/chemfig/chemfig-en.tex b/macros/generic/chemfig/chemfig-en.tex
index 8d29f8403a..3c6797732b 100644
--- a/macros/generic/chemfig/chemfig-en.tex
+++ b/macros/generic/chemfig/chemfig-en.tex
@@ -217,6 +217,9 @@
 \setitemize{leftmargin=3em,topsep=0pt,parsep=0pt,itemsep=0pt}
 \part{Introduction}
 \section{New in v1.5}
+\subsection{The primitive \texttt{\protect\textbackslash expanded}}
+As of version 1.54, \CF requires a \TeX{} engine that provides the \verb|\expanded| primitive. If this is not available, \CF will not be loaded. It is strongly recommended that you update your \LaTeX{} distribution in order to take advantage of the newer engine that provide for the use of this new primitive.
+
 \subsection{The macro \texttt{\protect\textbackslash charge}}
 Version 1.5 implements the macros \verb|\charge| and \verb|\Charge| (see page~\pageref{charge}) whose purpose is to place arbitrary elements around an atom that can be placed with great precision. These macros will replace the \verb|\lewis| and \verb|\Lewis| macros because they are much more powerful and configurable, even if more verbose. It is therefore important to note that the macros \verb|\lewis| and \verb|\Lewis| \textcolor{red}{\bfseries are no longer documented and will be removed from the \CF package}.
 
diff --git a/macros/generic/chemfig/chemfig-fr.pdf b/macros/generic/chemfig/chemfig-fr.pdf
index fd399ee621..14d02f6fba 100644
--- a/macros/generic/chemfig/chemfig-fr.pdf
+++ b/macros/generic/chemfig/chemfig-fr.pdf
diff --git a/macros/generic/chemfig/chemfig-fr.tex b/macros/generic/chemfig/chemfig-fr.tex
index 392f6dd8f8..e15417157e 100644
--- a/macros/generic/chemfig/chemfig-fr.tex
+++ b/macros/generic/chemfig/chemfig-fr.tex
@@ -217,6 +217,9 @@
 \setitemize{leftmargin=3em,topsep=0pt,parsep=0pt,itemsep=0pt,label=--}
 \part{Introduction}
 \section{Nouveau dans la v1.5}
+\subsection{Primitive \texttt{\protect\textbackslash expanded}}
+À partir de la version 1.54, \CF nécessite un moteur \TeX{} fournissant la primitive \texttt{\string\expanded}. Si ce n'est pas le cas, le package \CF ne sera pas chargé : il est donc vivement conseillé de mettre à jour sa distribution \LaTeX{} afin de profiter d'un moteur récent permettant l'utilisation de cette nouvelle primitive.
+
 \subsection{La macro \texttt{\protect\textbackslash charge}}
 La version 1.5 met en place les macros \verb|\charge| et \verb|\Charge| (voir page~\pageref{charge}) dont le but est de placer atour d'un atome des éléments arbitraires avec une grande précision. Ces macros remplaceront, à terme, les macros \verb|\lewis| et \verb|\Lewis| car elles sont bien plus puissantes et configurables, même si plus verbeuses quant à leur emploi. Il est donc important de noter que les macros \verb|\lewis| et \verb|\Lewis| \textcolor{red}{\bfseries ne sont plus documentées et seront supprimées de l'extension \CF}.
 
diff --git a/macros/generic/chemfig/chemfig.tex b/macros/generic/chemfig/chemfig.tex
index 3764ace94d..69e966ba31 100644
--- a/macros/generic/chemfig/chemfig.tex
+++ b/macros/generic/chemfig/chemfig.tex
@@ -4,9 +4,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                    %
 \def\CFname                    {chemfig}                             %
-\def\CFver                       {1.53}                              %
+\def\CFver                       {1.54}                              %
 %                                                                    %
-\def\CFdate                   {2020/04/27}                           %
+\def\CFdate                   {2020/05/21}                           %
 %                                                                    %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
@@ -33,8 +33,10 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%                       P R � A L A B L E                        %%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\csname CFloadonce\endcsname
+\let\CFloadonce\endinput
 %-------------------------- Annonce package --------------------------
-\ifdefined\ProvidesPackage\else
+\ifdefined\CFfromsty\else
 	\immediate\write -1 {%
 	Package: \CFname\space\CFdate\space\space v\CFver\space\space
 	Draw molecule with an easy syntax (CT)}%
@@ -60,16 +62,16 @@
 	\endgroup
 	\ifx\__tempa\__tempb\else
 		\CF_error{#2}%
-		\def\CF_temp{#3}%
-		\CFrestorecatcode\expandafter\CF_temp
+		\def\CF_temp{\CFrestorecatcode#3}%
+		\expandafter\CF_temp
 	\fi
 }
 \CF_checkprimitive\eTeXversion
 	{You are not using an eTeX engine, \CFname\space cannot work.}
 	{\endinput}%
 \CF_checkprimitive\expanded
-	{the \string\expanded\space primitive is not provided by your TeX engine, \CFname\space v\CFver\space cannot work: loading \CFname\space v1.4}
-	{\input chemfigold.tex\relax\endinput}%
+	{the \string\expanded\space primitive is not provided by your TeX engine, \CFname\space cannot work.}
+	{\endinput}%
 
 %------------------------ Chargement simplekv ------------------------
 \input simplekv.tex
@@ -1751,7 +1753,7 @@
 \def\charge_d#1={%
 	\CF_ifx\CF_quark{#1}%
 		{}
-		{\CF_striplastsp{#1}\charge_e}=%
+		{\CF_striplastsp{#1}\charge_e=}% bugfix 1.54
 }
 \def\charge_e#1={%
 	\CF_ifinstr{#1}[
@@ -3075,4 +3077,8 @@ v1.52       2020/04/14
 v1.53       2020/04/27
     - mise � jour en fonction des nouvelles fonctionnalit�s de
       l'extension simplekv
-    - bug : \CF_ifzerodim interrompt maintenant le trac� dans la \hbox
\ No newline at end of file
+    - bug : \CF_ifzerodim interrompt maintenant le trac� dans la \hbox
+----------------------------------------------------------------------
+v1.54       2020/05/21
+    - chemfig ne peut plus fonctionner sans \expanded
+    - bug : un signe "=" laiss� par erreur dans le flux
\ No newline at end of file
diff --git a/macros/generic/chemfig/chemfigold.tex b/macros/generic/chemfig/chemfigold.tex
deleted file mode 100644
index a7826763ca..0000000000
--- a/macros/generic/chemfig/chemfigold.tex
+++ /dev/null
@@ -1,2835 +0,0 @@
-% !TeX encoding = ISO-8859-1
-% Ce fichier contient le code de l'extension "chemfig"
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                    %
-\def\CFname                    {chemfig}                             %
-\def\CFver                       {1.4}                               %
-%                                                                    %
-\def\CFdate                   {2019/04/18}                           %
-%                                                                    %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%____________________________________________________________________
-% Author     : Christian Tellechea                                   |
-% Status     : Maintained                                            |
-% Email      : unbonpetit@netc.fr                                    |
-% Package URL: https://www.ctan.org/pkg/chemfig                      |
-% Bug tracker: https://framagit.org/unbonpetit/chemfig/issues        |
-% Repository : https://framagit.org/unbonpetit/chemfig/tree/master   |
-% Copyright  : Christian Tellechea 2010-2019                         |
-% Licence    : Released under the LaTeX Project Public License v1.3c |
-%              or later, see http://www.latex-project.org/lppl.txt   |
-% Files      : 1) chemfig.tex                                        |
-%              2) chemfig.sty                                        |
-%              3) t-chemfig.tex                                      |
-%              4) README                                             |
-%              5) chemfig_doc_fr.tex                                 |
-%              6) chemfig_doc_fr.pdf                                 |
-%              7) chemfig_doc_en.tex                                 |
-%              8) chemfig_doc_fr.pdf                                 |
-%--------------------------------------------------------------------
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%                       P R � A L A B L E                        %%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%-------------------------- Annonce package --------------------------
-\ifdefined\ProvidesPackage\else
-	\immediate\write -1 {%
-	Package: \CFname\space\CFdate\space\space v\CFver\space\space
-	Draw molecule with an easy syntax (CT)}%
-\fi
-
-%------------------------- V�rification etex -------------------------
-\begingroup
-	\edef\CFtempa{\meaning\eTeXversion}
-	\edef\CFtempb{\string\eTeXversion}
-	\let\CFtemp\endgroup
-	\unless\ifx\CFtempa\CFtempb
-		\errmessage{Package \CFname\space Error: you are not using an eTeX engine, chemfig cannot work.}%
-		\def\CFtemp{\endgroup\endinput}%
-	\fi
-\CFtemp
-
-%------------------------ Chargement simplekv ------------------------
-\unless\ifdefined\skvname
-	\begingroup\def\CFtemp{\endgroup\input simplekv.tex\relax}%
-	\expandafter\CFtemp
-\fi
-
-%-------------------------- Chargement tikz --------------------------
-\unless\ifdefined\tikzpicture
-	\begingroup\def\CFtemp{\endgroup\input tikz.tex\relax}%
-	\expandafter\CFtemp
-\fi
-\usetikzlibrary{arrows.meta}
-
-%-------------------------- R�gime catcodes --------------------------
-\begingroup
-	\def\X#1{\catcode\number`#1=\number\catcode`#1\relax}
-	\xdef\CFrestorecatcode{\X\[\X\]\X\:\X\(\X\)\X\,\X\-\X\=\X\~\X\!\X\?\X\<\X\>\X\;\X\*\X\|\X\@\X\ \X\_}%
-\endgroup
-\catcode`\[12 \catcode`\]12 \catcode`\:12 \catcode`\(12
-\catcode`\)12 \catcode`\,12 \catcode`\-12 \catcode`\=12
-\catcode`\~12 \catcode`\!12 \catcode`\?12 \catcode`\<12
-\catcode`\>12 \catcode`\;12 \catcode`\*12 \catcode`\|12
-\catcode`\@12 \catcode`\#6  \catcode`\ 10 \catcode`\_11
-
-%--------------------------- Allocations -----------------------------
-\newcount\CF_cntatomgroup
-\newcount\CF_cntgroup
-\newcount\CF_cntatom
-\newcount\CF_cntcycle
-\newcount\CF_cntcompound
-
-\newif\ifCF_incycle
-\newif\ifCF_cyclearc
-\newif\ifCF_definesubmol
-\newif\ifCF_adjustnamedp
-\newif\ifCF_macrofixedbondlength
-\newif\ifCF_lewisoverlay
-
-\newdimen\CF_dim
-\newdimen\CF_arrowsize
-\newdimen\CF_zero \CF_zero=0pt
-
-\newbox\CF_boxlewis
-\newbox\CF_box
-\newbox\CF_boxstuff
-
-\newtoks\CF_substtoks
-
-%-------------------------- Petites macros ---------------------------
-\let\CF_begintikzpicture\tikzpicture
-\let\CF_endtikzpicture  \endtikzpicture
-\def\CF_quark{\CF_quark}
-\def\CF_execfirst#1#2{#1}
-\def\CF_execsecond#1#2{#2}
-\def\CF_id#1{#1}
-\def\CF_gobarg#1{}
-\def\CF_gobtwoargs#1#2{}
-\def\CF_firsttonil#1#2\_nil{#1}
-\def\CF_sanitizelastitem#1,\empty#2\_nil{#1}
-\def\CF_gobtikzinstruction#1;{}
-\def\CF_makeother#1{\catcode`#1=12\relax}
-\def\CF_lettoken#1#2{\let#1= #2}\CF_lettoken\CF_sptoken{ }
-\def\CF_ifx#1#2{\ifx#1#2\expandafter\CF_execfirst\else\expandafter\CF_execsecond\fi}
-\def\CF_ifempty#1{\ifx\empty#1\empty\expandafter\CF_execfirst\else\expandafter\CF_execsecond\fi}
-\def\CF_ifnum#1{\ifnum#1\expandafter\CF_execfirst\else\expandafter\CF_execsecond\fi}
-\def\CF_doifempty#1{\ifx\empty#1\empty\expandafter\CF_id\else\expandafter\CF_gobarg\fi}
-\def\CF_doifnotempty#1{\ifx\empty#1\empty\expandafter\CF_gobarg\else\expandafter\CF_id\fi}
-\def\CF_gobtonil#1\_nil{}
-\edef\CFhash{\string#}
-\begingroup
-	\catcode`\_8
-	\expandafter\gdef\csname CF\string_underscore\endcsname{_}
-\endgroup
-\def\CF_threeea{\expandafter\expandafter\expandafter}
-\def\CF_exptwomacroargs#1#2#3{\CF_expsecond{\CF_expsecond#1{#2}}{#3}}
-\def\CF_expthreemacroargs#1#2#3#4{\CF_expsecond{\CF_exptwomacroargs#1{#2}{#3}}{#4}}
-\def\CF_swaparg#1#2{#2{#1}}
-\def\CF_expsecond#1#2{\expandafter\CF_swaparg\expandafter{#2}{#1}}% \CF_expsecond<{arg1>}{<arg2>} donne "<arg1>{*<arg2>}"
-\def\CF_eexpsecond#1#2{\expandafter\expandafter\expandafter\CF_swaparg\expandafter\expandafter\expandafter{#2}{#1}}% \CF_eexpsecond{<arg1>}{<arg2>} donne "<arg1>{**<arg2>}"
-\def\CF_swapunbrace#1#2{#2#1}
-\def\CF_expafter#1#2{\expandafter\CF_swapunbrace\expandafter{#2}{#1}}% \CF_expafter{<arg1>}{<arg2>} donne "<arg1>*<arg2>"
-\def\CF_eexpafter#1#2{\expandafter\expandafter\expandafter\CF_swapunbrace\expandafter\expandafter\expandafter{#2}{#1}}% \CF_eexpafter{<arg1>}{<arg2>} donne "<arg1>**<arg2>"
-\def\CF_addtomacro#1#2{\CF_expsecond{\def#1}{#1#2}}
-\def\CF_eaddtomacro#1#2{\CF_expsecond{\CF_addtomacro#1}{#2}}
-\def\CF_preaddtomacro#1#2{\CF_expsecond{\CF_preaddtomacroa#1{#2}}#1}
-\def\CF_preaddtomacroa#1#2#3{\def#1{#2#3}}
-\def\CF_addtotoks#1#2{#1\expandafter{\the#1#2}}
-\def\CF_eaddtotoks#1#2{\expandafter\CF_addtotoks\expandafter#1\expandafter{#2}}
-\def\CF_assigntonil#1#2\_nil{\def#1{#2}}
-\def\CF_edefaddtomacro#1#2{%
-	\edef\CF_temp{#2}%
-	\CF_expsecond{\CF_addtomacro#1}{\CF_temp}%
-}
-\def\CF_ifnextchar#1#2#3{%
-	\let\CF_ifnextchartok=#1% <- espace ind�sirable, bugfix v1.31
-	\def\CF_ifnextcharcodetrue{#2}%
-	\def\CF_ifnextcharcodefalse{#3}%
-	\futurelet\CF_temptok\CF_ifnextchara
-}
-\def\CF_ifnextchara{%
-	\CF_ifx\CF_temptok\CF_sptoken
-		{\CF_ifnextcharb
-		}
-		{\CF_ifx\CF_temptok\CF_ifnextchartok
-			\CF_ifnextcharcodetrue
-			\CF_ifnextcharcodefalse
-		}%
-}
-\expandafter\def\expandafter\CF_ifnextcharb\space{\futurelet\CF_temptok\CF_ifnextchara}
-\def\CF_ifstar#1{\CF_ifnextchar*{\CF_execfirst{#1}}}
-\def\CF_testopt#1#2{\CF_ifnextchar[{#1}{#1[{#2}]}}
-\def\CF_error#1{\errmessage{Package \CFname\space Error: #1.}}
-\def\CF_warning#1{\immediate\write-1{Package \CFname\space Warning: #1^^J}}
-\def\CF_ifinteger#1{%
-	\begingroup
-		\afterassignment\CF_afterinteger
-		\CF_cntcycle0#1\relax
-}
-\def\CF_afterinteger#1\relax{%
-	\endgroup
-	\CF_ifempty{#1}%
-}
-\def\CF_iffirsttokmatch#1#2{% est ce que #1 et #2 commencent par les m�mes tokens ?
-	\futurelet\CF_toksa\CF_gobtonil#1\relax\_nil
-	\futurelet\CF_toksb\CF_gobtonil#2\relax\_nil
-	\CF_ifx\CF_toksa\CF_toksb
-}
-\def\CF_iffirsttokin#1{% teste si le token qui commence #1 appartient aux tokens mis dans #2
-	\futurelet\CF_toksa\CF_gobtonil#1\relax\_nil
-	\CF_iffirsttokina
-}
-\def\CF_iffirsttokina#1{%
-	\CF_ifempty{#1}
-		{\CF_execsecond
-		}
-		{\futurelet\CF_toksb\CF_gobtonil#1\relax\_nil
-		\CF_ifx\CF_toksa\CF_toksb
-			{\CF_execfirst}
-			{\CF_expsecond\CF_iffirsttokina{\CF_gobarg#1}}%
-		}%
-}
-\def\CF_ifinstr#1#2{%
-	\def\CF_ifinstra##1#2##2\_nil{%
-		\ifx\empty##2\empty
-			\expandafter\CF_execsecond
-		\else
-			\expandafter\CF_execfirst
-		\fi}%
-	\CF_ifinstra#1\__nil#2\_nil
-}
-\def\CF_afterspace#1 #2\_nil{#2}
-\def\CF_valuetomacro#1[#2]#3{% #1= macro  #2=valeur d�faut  #3=cl�
-	\CF_eexpsecond{\def#1}{\useKV[chemfig]{#3}}%
-	\CF_ifx#1\empty
-		{\def#1{#2}}
-		{}%
-}
-
-%--------------------------- Substitution ----------------------------
-\def\CF_ifstartwith#1#2{% #1=<texte>  #2=<motif>
-	\CF_ifempty{#1}%
-		{\CF_execsecond
-		}
-		{\def\CF_startwithcode{#1}%
-		\def\CF_startwithpattern{#2}%
-		\CF_ifstartwitha
-		}%
-}
-\def\CF_ifstartwitha{%
-	\CF_grabfirstarg\CF_startwithcode\CF_firstargcode
-	\CF_grabfirstarg\CF_startwithpattern\CF_firstargpattern
-	\CF_ifx\CF_firstargcode\CF_firstargpattern
-		{\CF_expsecond\CF_ifempty\CF_startwithpattern
-			{\CF_execfirst
-			}
-			{\CF_expsecond\CF_ifempty\CF_startwithcode
-				\CF_execsecond
-				\CF_ifstartwitha
-			}%
-		}
-		{\CF_execsecond
-		}%
-}
-\def\CF_grabfirstarg#1#2{%
-	\CF_ifx#1\empty
-		{\let#2\empty
-		}
-		{\def\CF_grabmacro{#2}%
-		\CF_expsecond\CF_ifbracefirst#1%
-			{\expandafter\CF_grabbracearg#1\_nil#1}
-			{\CF_expafter{\futurelet\CF_nexttok\CF_grabfirstarga}#1\_nil#1}%
-		}%
-}
-\def\CF_grabfirstarga{%
-	\CF_ifx\CF_nexttok\CF_sptoken
-		\CF_grabspacearg
-		\CF_grabnormalarg
-}
-\def\CF_grabbracearg#1{%
-	\expandafter\def\CF_grabmacro{{#1}}%
-	\CF_grabargassigntonil\relax
-}
-\expandafter\def\expandafter\CF_grabspacearg\space{%
-	\expandafter\def\CF_grabmacro{ }%
-	\CF_grabargassigntonil\relax
-}
-\def\CF_grabnormalarg#1{%
-	\expandafter\def\CF_grabmacro{#1}%
-	\CF_grabargassigntonil\relax
-}
-\def\CF_grabargassigntonil#1\_nil#2{\CF_expsecond{\def#2}{\CF_gobarg#1}}
-\def\CF_ifbracefirst#1{\CF_ifnum{\catcode\CF_threeea`\expandafter\CF_firsttonil\detokenize{#1.}\_nil=1 }}
-\def\CF_substonly#1#2{% #1=entier maxi>0  #2=macro : dans la sc#1, remplace tous les <motif> par <pattern> sauf lorsque le motif est suivi d'un caract�re >#1
-	\def\CF_atendsubstitute{\edef#2{\the\CF_substtoks}}% macro ex�cut�e � la fin
-	\let\CF_substnogroups\CF_substnogrouponly
-	\CF_ifnum{#1>0 }
-		{\let\CF_testifx\empty
-		\foreach\CF_x in {1,...,#1}{\xdef\CF_testifx{\unexpanded\expandafter{\CF_testifx}\unexpanded\expandafter{\expandafter\ifx\CF_x\CF_nexttok1\fi}}}%
-		\let\CF_testif\empty
-		\foreach\CF_x in {1,...,#1}{\xdef\CF_testif{\unexpanded\expandafter{\CF_testif}\unexpanded\expandafter{\expandafter\if\CF_x\CF_nexttok1\fi}}}%
-		\CF_expsecond\CF_substi#2%
-		}
-		{\CF_substall#2%
-		}%
-}
-\def\CF_substnogrouponly{%
-	\CF_exptwomacroargs\CF_ifstartwith\CF_substcode\CF_substsubst
-		{\CF_grabfirstarg\CF_substcode\CF_temp
-		\CF_expafter{\futurelet\CF_nexttok\CF_gobtonil}\CF_substcode\relax\_nil
-		\CF_ifnum{0\CF_testifx=1 }% si le prochain token est \let-�gal � 1...#1
-			{\edef\CF_nexttok{\CF_threeea\CF_firsttonil\expandafter\string\CF_substcode\_nil}% le d�tok�niser
-			\CF_ifnum{0\CF_testif=1 }
-				{\CF_eaddtotoks\CF_substtoks\CF_temp
-				\CF_grabfirstarg\CF_substcode\CF_temp
-				\CF_eaddtotoks\CF_substtoks\CF_temp
-				}
-				{\CF_eaddtotoks\CF_substtoks\CF_substpattern
-				}%
-			}
-			{\CF_eaddtotoks\CF_substtoks\CF_substpattern
-			}%
-		\CF_substgroups
-		}
-		{\CF_expsecond\CF_ifempty\CF_substcode
-			{\CF_atendsubstitute
-			}
-			{\CF_grabfirstarg\CF_substcode\CF_substauxarg
-			\CF_eaddtotoks\CF_substtoks\CF_substauxarg
-			\CF_substgroups
-			}%
-		}%
-}
-\def\CF_substall#1{% #1=macro
-	\def\CF_atendsubstitute{\edef#1{\the\CF_substtoks}}% macro ex�cut�e � la fin
-	\let\CF_substnogroups\CF_substnogroupall
-	\CF_expsecond\CF_substi#1%
-}
-\def\CF_substnogroupall{%
-	\CF_exptwomacroargs\CF_ifstartwith\CF_substcode\CF_substsubst
-		{\CF_eaddtotoks\CF_substtoks\CF_substpattern
-		\CF_grabfirstarg\CF_substcode\CF_temp
-		\CF_substgroups
-		}
-		{\CF_expsecond\CF_ifempty\CF_substcode
-			{\CF_atendsubstitute
-			}
-			{\CF_grabfirstarg\CF_substcode\CF_substauxarg
-			\CF_eaddtotoks\CF_substtoks\CF_substauxarg
-			\CF_substgroups
-			}%
-		}%
-}
-\def\CF_substi#1#2#3{% #1=<texte> #2=<motif> #3=<motif de substi>
-	\def\CF_substcode{#1}\def\CF_substsubst{#2}\def\CF_substpattern{#3}%
-	\CF_substtoks={}%
-	\CF_substgroups
-}
-
-\def\CF_substgroups{%
-	\CF_expsecond\CF_ifbracefirst\CF_substcode
-		{\CF_grabfirstarg\CF_substcode\CF_substauxarg
-		\begingroup
-			\def\CF_atendsubstitute{%
-				\expandafter\endgroup\expandafter\CF_addtotoks\expandafter\CF_substtoks\expandafter{\expandafter{\the\CF_substtoks}}%
-				\CF_substgroups
-			}%
-			\CF_substtoks{}% initialiser � vide
-			\expandafter\def\expandafter\CF_substcode\CF_substauxarg
-			\CF_substgroups
-		}%
-		{\CF_substnogroups
-		}%
-}
-
-%---------------------------- Param�tres -----------------------------
-\def\setchemfig{\setKV[chemfig]}
-\def\resetchemfig{%
-	\setKVdefault[chemfig]{%
-		atom style          ={},% code tikz mis � la fin de every node/.style
-		chemfig style       ={},% code tikz mis � la fin de l'arugment optionnel de \tikzpicture
-		bond join           =false,
-		fixed length        =false,
-		cram rectangle      =false,
-		cram width          =1.5ex,
-		cram dash width     =1pt,
-		cram dash sep       =2pt,
-		atom sep            =3em,
-		bond offset         =2pt,
-		double bond sep     =2pt,
-		angle increment     =45,
-		node style          ={},
-		bond style          ={},
-		lewis | width       =0.3ex,
-		lewis sep           =0.4ex,
-		lewis length        =1.5ex,
-		lewis style         ={},
-		lewis dist          =0.3em,
-		lewis radius        =0.15ex,
-		lewis diag coeff    =1,
-		cycle radius coeff  =0.75,
-		stack sep           =1.5pt,
-		scheme debug        =false,
-		compound style      ={},
-		compound sep        =5em,
-		arrow offset        =4pt,
-		arrow angle         =0,
-		arrow coeff         =1,
-		arrow style         ={},
-		arrow double sep    =2pt,
-		arrow double coeff  =0.6,
-		arrow double harpoon=true,
-		arrow label sep     =3pt,
-		arrow head          =-CF,
-		+ sep left          =0.5em,
-		+ sep right         =0.5em,
-		+ vshift            =0pt,
-	}%
-}
-\resetchemfig
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%               D E S S I N     M O L � C U L E S                %%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\CF_sanitizecatcode{%
-	\CF_makeother\[\CF_makeother\]\CF_makeother\:\CF_makeother\(\CF_makeother\)%
-	\CF_makeother\,\CF_makeother\-\CF_makeother\=\CF_makeother\~\CF_makeother\!%
-	\CF_makeother\?\CF_makeother\<\CF_makeother\>\CF_makeother\;\CF_makeother\*%
-	\CF_makeother\|\CF_makeother\#\CF_makeother\@%
-}
-
-\def\CF_nodecontent{\CF_expsecond\printatom{\csname atom_\number\CF_cntatom\endcsname\CF_nodestrut}}
-
-\def\chemskipalign{%
-	\CF_doifempty\CF_bondoutcontentsaved% sauf si un \chemskipalign a �t� fait � l'atome pr�c�dent
-		{\global\let\CF_bondoutcontentsaved\CF_bondoutcontent}% sauvegarder l'atome d'o� vient la liaison
-	\let\CF_nodestrut\empty
-}
-
-\def\CF_emptynode{{}}
-
-\def\definesubmol{\CF_definesubmoltrue\def_submol}
-\def\redefinesubmol{\CF_definesubmolfalse\def_submol}
-
-\def\def_submol#1{%
-	\CF_cntatomgroup=0 % nombre d'arguments suppos�
-	\def\CF_temp{#1}% nom
-	\futurelet\CF_toksa\CF_submoltestnxttok
-}
-
-\def\CF_submoltestnxttok{%
-	\if[\noexpand\CF_toksa\expandafter\CF_execfirst\else\expandafter\CF_execsecond\fi
-		{\begingroup\CF_sanitizecatcode\CF_expsecond\CF_submolgrabopt{\CF_temp}%
-		}
-		{\afterassignment\CF_submoltestnxttoka% pas d'argument entre crochet
-		\CF_cntatomgroup=0% cherche le nombre d'arguments �ventuels
-		}%
-}
-
-\def\CF_submoltestnxttoka{\futurelet\CF_toksa\CF_submoltestnxttokb}
-
-\def\CF_submoltestnxttokb{%
-	\if[\noexpand\CF_toksa\expandafter\CF_execfirst\else\expandafter\CF_execsecond\fi
-		{\begingroup\CF_sanitizecatcode\CF_expsecond\CF_submolgrabopt{\CF_temp}}
-		{\CF_expsecond{\def_submola}\CF_temp{}}%
-}
-
-\def\CF_submolgrabopt#1[#2]#{\endgroup\def_submola{#1}{#2}}
-
-\def\def_submola#1{% #1 nom
-	\CF_ifnum{0\CF_ifnum{\CF_cntatomgroup<0 }1{\CF_ifnum{\CF_cntatomgroup>9 }10}>0 }
-		{\CF_error{Invalid number of arguments in submol \detokenize\expandafter{\string#1}. Defining it with 0 argument}%
-		\CF_cntatomgroup=0
-		}
-		{}%
-	\ifcat\relax\expandafter\noexpand\CF_firsttonil#1\_nil\expandafter\CF_execfirst\else\expandafter\CF_execsecond\fi% si #1 est une s�quence de contr�le
-		{\expandafter\ifdefined\CF_firsttonil#1\_nil
-			\ifCF_definesubmol
-				\CF_warning{the submol \expandafter\string\CF_firsttonil#1\_nil\space is already defined, the previous definition is lost}%
-			\fi
-		\fi
-		\begingroup
-			\CF_sanitizecatcode
-			\def_submolb{#1}%
-		}
-		{\ifcsname CF__#1\endcsname
-			\ifCF_definesubmol
-				\CF_warning{the submol "#1" is already defined, the previous definition is lost}%
-			\fi
-		\fi
-		\begingroup
-			\CF_sanitizecatcode
-			\expandafter\def_submolb\csname CF__#1\endcsname
-		}%
-}
-
-\def\def_submolb#1#2#3{% #1 nom sous forme de macro, #2 = code si liaison arrive de droite , #3 = code si liaison arrive de gauche, \CF_cntatomgroup = nombre d'arguments
-	\def\CF_tempa{#2}\CF_doifnotempty{#2}{\CF_expsecond{\CF_expsecond\CF_substonly{\number\CF_cntatomgroup}\CF_tempa}{\CFhash}{\CFhash}}%
-	\def\CF_tempb{#3}\CF_expsecond{\CF_expsecond\CF_substonly{\number\CF_cntatomgroup}\CF_tempb}{\CFhash}{\CFhash}%
-	\CF_expsecond{\CF_expsecond{\def_submolc{#1}}\CF_tempa}\CF_tempb
-}
-
-\def\def_submolc#1#2#3{% #1 nom sous forme de macro, #2 = code si liaison arrive de droite , #3 = code si liaison arrive de gauche, \CF_cntatomgroup = nombre d'arguments
-	\endgroup
-	\begingroup
-		\global\toks0{\gdef\CFthesubmol}%
-		\CF_ifnum{\CF_cntatomgroup>0 }
-			{\foreach\CF_x in {1,...,\CF_cntatomgroup}{%
-				\edef\CF_temp{\CFhash\CF_x}%
-				\global\toks0\expandafter\expandafter\expandafter{\expandafter\the\expandafter\toks\expandafter0\CF_temp}%
-				}%
-			}
-			{}%
-		\CF_sanitizecatcode \catcode`\#6 \endlinechar-1 \everyeof{\noexpand}%
-		\CF_ifempty{#2}%
-			{\scantokens\expandafter{\the\toks0{\empty#3}}%
-			}%
-			{\scantokens\expandafter{%
-				\the\toks0{%
-					\romannumeral
-					\csname CF_exec%
-						\ifdim\csname CF_currentangle\endcsname pt>90pt
-							\ifdim\csname CF_currentangle\endcsname pt<270pt
-								first%
-							\else
-								second%
-							\fi
-						\else
-							second%
-						\fi
-					\endcsname
-					{0 #2}{0 #3}%
-					}%
-				}%
-			}%
-	\endgroup
-	\let#1\CFthesubmol
-}
-
-\def\CF_seeknode#1#2#3{% cherche un noeud au d�but de #1 l'assigne dans la sc #2 et met le reste dans #3
-	\let#2\empty
-	\def#3{#1}%
-	\CF_iffirsttokmatch{#1}{ }%
-		{\CF_expsecond\CF_seeknodea{\romannumeral-`\.\noexpand#1}#2#3}% ignore les espaces au d�but du groupe d'atome
-		{\CF_seeknodea{#1}#2#3}%
-}
-
-\def\CF_seeknodea#1#2#3{%
-	\CF_ifempty{#1}%
-		{\let#3\empty
-		}
-		{\futurelet\CF_toksa\CF_gobtonil#1\relax\_nil
-		\CF_ifx\CF_toksa\CF_sptoken
-			{\CF_addtomacro#2{ }%
-			\CF_expsecond\CF_seeknodea{\CF_afterspace#1\_nil}#2#3%
-			}%
-			{\CF_ifx\CF_toksa\bgroup
-				{\CF_eaddtomacro#2{\expandafter{\CF_firsttonil#1\_nil}}%
-				\CF_expsecond\CF_seeknodea{\CF_gobarg#1}#2#3%
-				}%
-				{\CF_iffirsttokina{-=(*<>!~}%
-					{\def#3{#1}%
-					}%
-					{\CF_eaddtomacro#2{\CF_firsttonil#1\_nil}%
-					\CF_expsecond\CF_seeknodea{\CF_gobarg#1}#2#3%
-					}%
-				}%
-			}%
-		}%
-}
-
-% on sait que #1 commence par -,=,~,<,>. On analyse cette liaison
-% #2 re�oit le type de liaisons (1 pour -, 2 pour =, 3 pour ~)
-\def\CF_assignbondcode#1#2{%
-	\futurelet\CF_toksa\CF_gobtonil#1\_nil
-	\edef#2{%
-		\ifx-\CF_toksa1\else
-		\ifx=\CF_toksa2\else
-		\ifx~\CF_toksa3\else
-		\ifx>\CF_toksa4\else
-		\ifx<\CF_toksa5\else0% si 0 --> il y a une erreur non due � l'utilisateur
-		\fi\fi\fi\fi\fi}%
-	\ifnum#2>3 % si c'est une liaison de Cram
-		\CF_expafter{\futurelet\CF_toksa\CF_gobtonil}{\CF_gobarg#1\_nil}% chope le caract�re suivant
-		\CF_ifx:\CF_toksa
-			{\edef#2{\number\numexpr#2+2}% si c 'est un ":", signe du pointill�, ajoute 2
-			}%
-			{\CF_ifx|\CF_toksa% si c 'est un "|", signe du triangle �vid�, ajouter 4
-				{\edef#2{\number\numexpr#2+4}}
-				{}%
-			}%
-	\fi
-}
-
-\def\CF_grabbondoffseta#1,#2\_nil{%
-	\def\CF_startoffset{#1}\def\CF_endoffset{#2}%
-}
-
-\def\CF_grabbondoffset#1(#2)#3\_nil{%
-	\CF_doifnotempty{#2}%
-		{\CF_ifinstr{#2},%
-			{\CF_grabbondoffseta#2\_nil}%
-			{\def\CF_startoffset{#2}}%
-		}%
-	\def\CF_remainafterbond{#3}%
-}
-
-\def\CF_analysebond#1#2{%
-	\CF_assignbondcode{#1}#2%
-	\CF_expsecond{\def\CF_remainafterbond}{\CF_gobarg#1}%mange le premier signe de la liaison
-	\let\CF_doublebondtype\CF_zero
-	\ifnum#2=2 % si c'est une double liaison, regarde s'il y a un + ou - derri�re
-		\CF_expafter{\futurelet\CF_toksa\CF_gobtonil}{\CF_gobarg#1\_nil}%
-		\CF_ifx^\CF_toksa
-			{\def\CF_doublebondtype{1}%
-			\CF_expsecond{\def\CF_remainafterbond}{\CF_gobtwoargs#1}% mange le "^"
-			}
-			{\expandafter\ifx\CF_underscore\CF_toksa
-				\def\CF_doublebondtype{2}%
-				\CF_expsecond{\def\CF_remainafterbond}{\CF_gobtwoargs#1}% mange le "_"
-			\fi
-			}%
-	\else
-		\ifnum#2>5 % si c'est une laision de Cram pointill�e ou triangle �vid�
-			\CF_expsecond{\def\CF_remainafterbond}{\CF_gobtwoargs#1}% mange un caract�re de plus
-		\fi
-	\fi
-	\CF_expsecond\CF_iffirsttokmatch\CF_remainafterbond\CFhash
-		{\CF_eexpsecond\CF_iffirsttokmatch{\expandafter\CF_gobarg\CF_remainafterbond.}(%si parenth�se juste apr�s
-			{\expandafter\CF_grabbondoffset\CF_remainafterbond\_nil}
-			{}%
-		}%
-		{}%
-	\CF_expsecond\CF_iffirsttokmatch\CF_remainafterbond @%
-		{\expandafter\CF_grabmovearg\CF_remainafterbond\_nil}%
-		{}%
-	\CF_expsecond\CF_iffirsttokmatch{\CF_remainafterbond}[%
-		{\expandafter\CF_analyseoptarg\CF_remainafterbond\_nil\CF_remainafterbond
-		}%
-		{\let\CF_currentstringangle\CF_defaultstringangle
-		\let\CF_currentlength\CF_defaultlength
-		\let\CF_currentfromatom\CF_defaultfromatom
-		\let\CF_currenttoatom\CF_defaulttoatom
-		\let\CF_currenttikz\CF_defaulttikz
-		\let\CF_movebondname\empty
-		}%
-	\ifCF_incycle
-		\pgfmathsetmacro\CF_cycleincrementangle{360/\CF_cyclenum+\CF_initcycleangle}%
-		\edef\CF_currentstringangle{::+\CF_cycleincrementangle}%
-		\def\CF_initcycleangle{0}%
-		\let\CF_currentlength\CF_defaultlength% et on ignore la longueur de liaison sp�cifi�e
-	\fi
-	\CF_expsecond\CF_setbondangle{\CF_currentstringangle}\CF_currentangle
-}
-
-\def\CF_setbondangle#1#2{% le code de la direction est contenu dans #1, en sortie, #2 contient l'angle
-	\CF_ifempty{#1}%
-		{\let#2\CF_defaultangle
-		}
-		{\if:\expandafter\noexpand\CF_firsttonil#1\_nil
-			\if:\CF_threeea\noexpand\expandafter\CF_firsttonil\CF_gobarg#1\_nil
-				\pgfmathsetmacro#2{\CF_previousangle+\expandafter\CF_gobarg\CF_gobarg#1}%
-			\else
-				\pgfmathsetmacro#2{\CF_gobarg#1}%
-			\fi
-		\else
-			\pgfmathsetmacro#2{#1*\CF_angleincrement}%
-		\fi% puis normalise l'angle entre 0 et 360
-		\ifdim\ifdim#2pt<0pt -\fi#2pt>360pt
-			\pgfmathsetmacro#2{#2-360*floor(#2/360)}%
-		\fi% si |#2|>360
-		\ifdim#2pt<0pt
-			\pgfmathsetmacro#2{#2+360}%
-		\fi
-		}%
-}
-
-\def\CF_analysemovearg#1,#2\_nil#3{%
-	\def#3{#1}\def\CF_movebondcoeff{#2}%
-}
-
-% Argument limit�s l�gitimes ici car #2 (qui est ce qui suit "@{<nom>}" dans l'argument optionnel) ne DOIT PAS
-% commencer par une accolade.
-\def\CF_grabmovearg @#1#2\_nil{%
-	\CF_ifinstr{#1},%
-		{\CF_analysemovearg#1\_nil\CF_movebondname}%
-		{\def\CF_movebondname{#1}\def\CF_movebondcoeff{0.5}}%
-	\def\CF_remainoptarg{#2}%
-}
-
-\def\CF_testemptyandassign#1#2#3{%
-	\CF_ifempty{#2}
-		{\let#1#3}
-		{\def#1{#2}}%
-}
-
-\def\CF_parseoptlist#1,#2,#3,#4,#5\_nil{%
-	\CF_testemptyandassign\CF_currentstringangle{#1}\CF_defaultstringangle
-	\CF_testemptyandassign\CF_currentlength     {#2}\CF_defaultlength
-	\CF_testemptyandassign\CF_currentfromatom   {#3}\CF_defaultfromatom
-	\CF_testemptyandassign\CF_currenttoatom     {#4}\CF_defaulttoatom
-	\CF_expsecond{\CF_testemptyandassign\CF_currenttikz}{\CF_sanitizelastitem#5,\empty\_nil}\CF_defaulttikz
-}%
-
-\def\CF_analyseoptarg[#1]{%
-	\CF_doifnotempty{#1}%
-		{\CF_iffirsttokmatch{#1}{@}%
-			{\CF_grabmovearg#1\_nil
-			}
-			{\let\CF_movebondname\empty
-			\def\CF_remainoptarg{#1}%
-			}%
-		\expandafter\CF_parseoptlist\CF_remainoptarg,\empty,\empty,\empty,\empty\_nil
-		}%
-	\CF_analyseoptarga\relax
-}
-
-\def\CF_analyseoptarga#1\_nil#2{%
-	\CF_expsecond{\def#2}{\CF_gobarg#1}%
-}
-
-\def\CF_seeksubmol{%
-	\CF_expsecond{\def\CF_molecule}{\romannumeral-`\.\expandafter\noexpand\CF_molecule}%
-	\CF_expsecond\CF_iffirsttokmatch{\CF_molecule}!%
-		{\CF_eexpsecond{\def\CF_molecule}{\expandafter\CF_gobarg\CF_molecule}% enl�ve le "!"
-		\CF_ifx\empty\CF_molecule
-			{\CF_error{no submol name found after "!"}}
-			{}%
-		\ifcat\relax\CF_threeea\noexpand\expandafter\CF_firsttonil\CF_molecule*\_nil
-			\expandafter\CF_seeksubmola\CF_molecule\_nil
-		\else
-			\expandafter\CF_seeksubmolb\CF_molecule\_nil
-		\fi
-		\CF_seeksubmol
-		}%
-		{}%
-}
-
-\def\CF_seeksubmola#1{\CF_seeksubmolc#1\relax}
-
-\def\CF_seeksubmolb#1{\expandafter\CF_seeksubmolc\csname CF__#1\endcsname\relax}% nom de la sous mol�cule
-
-\def\CF_seeksubmolc#1#2\_nil{%#1=macro de la sous mol�cule #2=reste du code commen�ant par \relax
-	\CF_expsecond{\CF_eexpsecond{\def\CF_molecule}}{\expandafter#1\CF_gobarg#2}% supprime le \relax puis ajoute la macro au d�but et la 2-d�veloppe
-}
-
-\def\CF_insertemptygroup#1{% ins�re {} au d�but de la sc #1
-	\CF_expsecond{\def#1}{\expandafter{\expandafter}#1}%
-}
-
-\def\chemfig{\CF_testopt\CF_chemfiga{}}
-
-\def\CF_chemfiga[#1]{%
-	\begingroup
-		\edef\CF_temp{%
-			\unexpanded\expandafter{\CF_begintikzpicture}%
-				[remember picture,%
-				every node/.style={%
-						anchor=base,%
-						inner sep=0pt,%
-						outer sep=0pt,%
-						minimum size=0pt,%
-						\unexpanded\CF_threeea{\useKV[chemfig]{atom style}}%
-					},%
-					baseline,%
-					\unexpanded\CF_threeea{\useKV[chemfig]{chemfig style}}%
-				]%
-			}%
-		\CF_sanitizecatcode
-		\CF_exptwomacroargs\CF_chemfigb\CF_begintikzpicture\CF_endtikzpicture[#1]%
-}
-
-\def\CF_chemfigb#1#2[#3]#4{%
-	\endgroup
-	\begingroup
-		\setchemfig{#3}%
-		\edef\CF_temp{%
-			\unexpanded{#1}[%
-				remember picture,%
-				every node/.style={%
-					anchor=base,%
-					inner sep=0pt,%
-					outer sep=0pt,%
-					minimum size=0pt,%
-					\unexpanded\CF_threeea{\useKV[chemfig]{atom style}}%
-					},%
-				baseline,%
-				\unexpanded\CF_threeea{\useKV[chemfig]{chemfig style}}%
-				]%
-			}%
-		\CF_temp% d�but du tikzpicture
-			\begingroup% \endgroup rajout� en sortie de trac� par \CF_chemfigd
-				\let\CF_hooklist\empty
-				\CF_expsecond\setchemfig{#3}%
-				\ifboolKV[chemfig]{fixed length}
-						{\CF_macrofixedbondlengthtrue}
-						{\CF_macrofixedbondlengthfalse}%
-				\ifboolKV[chemfig]{bond join}
-					{\let\CF_drawaxisbond\CF_drawaxisbondjoin}
-					{\let\CF_drawaxisbond\CF_drawaxisbondnojoin}%
-				\ifboolKV[chemfig]{cram rectangle}
-					{\let\CF_clipcramornot\CF_gobtikzinstruction}
-					{\let\CF_clipcramornot\clip}%
-				\CF_valuetomacro\CF_crambasewidth   [1.5ex]{cram width}%
-				\CF_valuetomacro\CF_cramdashlength  [1pt]{cram dash width}%
-				\CF_valuetomacro\CF_cramdashsep     [2pt]{cram dash sep}%
-				\CF_valuetomacro\CF_atomsep         [3em]{atom sep}% espacement des atomes li�s
-				\CF_valuetomacro\CF_bondoffset      [2pt]{bond offset}%
-				\CF_valuetomacro\CF_doublesep       [2pt]{double bond sep}%
-				\CF_valuetomacro\CF_angleincrement  [45]{angle increment}%
-				\CF_valuetomacro\CF_nodestyle       []{node style}%
-				\CF_valuetomacro\CF_bondstyle       []{bond style}%
-				\CF_valuetomacro\CF_stacksep        [1.5pt]{stack sep}%
-				\CF_valuetomacro\CF_cycleradiuscoeff[0.75]{cycle radius coeff}% coeff multiplicateur du rayon des arcs dans les cycles
-				\CF_incyclefalse
-				\CF_cntgroup0
-				\let\CF_lastaction\CF_zero% 0=d�but du dessin 1=trac� d'un noeud 2=trac� d'une liaison
-				\let\CF_startoffset\empty
-				\let\CF_endoffset\empty
-				\let\CF_bondoutcontentsaved\empty
-				\def\CF_cycleanglecorrection{180/\CF_cyclenum}%
-				\def\CF_defaultangle{0}%
-				\def\CF_defaultstringangle{:0}% angle pris par d�faut si le champ est vide
-				\def\CF_defaultlength{1}%
-				\let\CF_defaultfromatom\empty% numero de l'atome d'o� partent les liaisons par d�faut
-				\let\CF_defaulttoatom\empty% num�ro de l'atome o� arrivent les laisons par d�faut
-				\let\CF_defaulttikz\empty
-				\let\CF_previousbondangle\empty
-				\let\CF_joinbond\CF_zero
-				\let\CF_previoustikz\empty
-				\everyeof{\_nil}\endlinechar-1
-				\CF_sanitizecatcode
-				\expandafter\CF_assigntonil\expandafter\CF_molecule\scantokens{#4}%
-				\CF_expsecond{\CF_substall\CF_molecule}\CFhash\CFhash
-				\CF_expsecond\CF_chemfigc{\CF_molecule}%
-			%\endgroup <-- rajout� par \CF_chemfigd
-		#2% fin du tikzpicture
-	\endgroup
-	\let\CF_flipstate\CF_zero
-}
-
-\def\CF_chemfigc#1{% #1 est le code de la mol�cule
-	\ifnum\CF_lastaction=3
-		\ifCF_incycle
-			\def\CF_defaultangle{0}%
-		\else
-			\ifnum\CF_cntcycle=0 % si c'est le d�but d'un cycle
-				\pgfmathsetmacro\CF_defaultangle{\CF_previousangle+180+\CF_cycleanglecorrection}% on met la liaison � +180� + correction
-			\else
-				\pgfmathsetmacro\CF_defaultangle{\CF_previousangle-90+180/\CF_cyclenum}% sinon � la bissectrice du sommet du cycle
-			\fi
-		\fi
-		\let\CF_defaultstringangle\empty
-	\fi
-	\let\CF_currentangle\CF_defaultangle
-	\def\CF_molecule{#1}%
-	\CF_seeksubmol% alias en premier ?
-	\if[\CF_threeea\noexpand\expandafter\CF_firsttonil\CF_molecule\_nil
-		\expandafter\CF_analyseoptarg\CF_molecule\_nil\CF_molecule
-		\CF_expsecond\CF_setbondangle{\CF_currentstringangle}\CF_currentangle
-		\let\CF_defaultangle\CF_currentangle
-		\let\CF_previousangle\CF_currentangle
-		\CF_doifnotempty\CF_currentstringangle{\let\CF_defaultangle\CF_currentangle}%
-		\CF_doifnotempty\CF_currentlength     {\let\CF_defaultlength\CF_currentlength}%
-		\CF_doifnotempty\CF_currentfromatom   {\let\CF_defaultfromatom\CF_currentfromatom}%
-		\CF_doifnotempty\CF_currenttoatom     {\let\CF_defaulttoatom\CF_currenttoatom}%
-		\CF_doifnotempty\CF_currenttikz       {\let\CF_defaulttikz\CF_currenttikz}%
-		\CF_seeksubmol
-	\fi
-	\edef\CF_defaultstringangle{:\CF_defaultangle}%
-	\let\CF_currentlength\CF_defaultlength
-	\let\CF_currentfromatom\CF_defaultfromatom
-	\let\CF_currenttoatom\CF_defaulttoatom
-	\let\CF_currenttikz\CF_defaulttikz
-	\ifCF_incycle% si on commence un cycle
-		\let\CF_currentangle\CF_previousangle
-		\ifCF_cyclearc% on doit tracer l'arc de cercle dans le cycle ?
-			\pgfmathsetmacro\CF_cyclearcradius{\CF_cycleradiuscoeff*\CF_currentlength*\CF_atomsep/(2*tan(180/\CF_cyclenum))}%
-			\pgfmathsetmacro\CF_cyclearcinitangle{\CF_currentangle+\CF_initcycleangle+180/\CF_cyclenum+90}
-			\pgfmathparse{\CF_currentlength*\CF_atomsep/(2*sin(180/\CF_cyclenum))}%
-			\node[at=(\CF_bondoutnode),shift=(\CF_cyclearcinitangle:\pgfmathresult pt)](arccenter){};% le centre de l'arc
-			\node[at=(arccenter),shift=(\CF_cyclearcstartangle:\CF_cyclearcradius pt)](initarc){};% le d�but de l'arc
-			\CF_expafter{\draw[}\CF_cyclearcdirecttikz](initarc) arc (\CF_cyclearcstartangle:\CF_cyclearcendangle:\CF_cyclearcradius pt);
-		\fi
-	\else
-		\let\CF_currentangle\CF_defaultangle
-	\fi
-	\ifnum\CF_lastaction=0
-		\let\CF_previousangle\CF_defaultangle
-		\node(CF_node){};
-		\CF_expsecond\CF_iffirsttokin{\CF_molecule}{-=(*~?<>}%
-			{\CF_insertemptygroup\CF_molecule}%
-			{}%
-	\fi
-	\CF_chemfigd
-}
-
-\def\CF_chemfigd{%
-	\let\CF_nextaction\CF_chemfigd% � priori, on reboucle
-	\CF_ifx\CF_molecule\empty
-		{\let\CF_nextaction\endgroup
-		}
-		{\CF_seeksubmol
-		\CF_expsecond\CF_seeknode{\CF_molecule}\CF_currentatomgroup\CF_molecule
-		\CF_ifx\empty\CF_currentatomgroup% pas de noeud pour commencer ?
-			{\def\CF_bondoutnode{%
-				n\CF_lastgroupnumber-%
-				\ifx\CF_currentfromatom\empty
-					\ifdim\CF_currentangle pt<90pt
-						\number\CF_cntatomgroup
-					\else
-						\ifdim\CF_currentangle pt>270pt
-							\number\CF_cntatomgroup
-						\else
-							1%
-						\fi
-					\fi
-				\else
-					\CF_currentfromatom
-				\fi}%
-			\CF_expafter{\futurelet\CF_toksa\CF_gobtonil}{\CF_molecule\relax\_nil}%
-			\CF_iffirsttokina{-=<>~}% la suite est une liaison
-				{\ifnum\CF_lastaction=2 % c'est la deuxi�me liaison cons�cutive ?
-					\CF_insertemptygroup\CF_molecule% ins�re un groupe vide
-					\edef\CF_bondoutnode{\CF_bondoutnode}%
-				\else
-					\ifCF_incycle
-						\advance\CF_cntcycle1
-					\fi
-					\CF_expsecond\CF_analysebond{\CF_molecule}\CF_bondtype
-					\edef\CF_bondoutnode{\CF_bondoutnode}%
-					\let\CF_molecule\CF_remainafterbond
-					\ifCF_incycle
-						\ifnum\CF_cntcycle=\CF_cyclenum\relax
-							\CF_threeea\CF_execfirst
-						\else
-							\ifnum\CF_cntcycle=1
-								\let\CF_cyclefirsttikz\CF_currenttikz
-								\CF_doifnotempty\CF_startoffset{\let\CF_cyclejoinlast\CF_zero}%
-							\fi
-							\CF_threeea\CF_execsecond
-						\fi
-					\else
-						\expandafter\CF_execsecond
-					\fi
-						{\let\CF_nextaction\endgroup
-						\CF_drawbond\CF_bondtype{\CF_bondoutnode}{\CF_hookcycle}\CF_previousatomgroup\CF_hookatomgroup
-						}%
-						{\node[at=(\CF_bondoutnode\ifCF_incycle\else\ifCF_macrofixedbondlength.\CF_currentangle\fi\fi),shift=(\ifcase\CF_flipstate\or180-\or-\fi\CF_currentangle:\CF_currentlength*\CF_atomsep)](CF_node){};
-						\let\CF_previousangle\CF_currentangle
-						\def\CF_lastaction{2}%
-						}%
-				\fi
-				\ifcat\relax\detokenize\expandafter{\romannumeral-`\.\expandafter\noexpand\CF_molecule}\relax
-				% s'il ne reste plus rien apr�s la liaison (sans tenir compte de l'espace devant)-> ins�re un groupe vide
-					\CF_insertemptygroup\CF_molecule
-				\fi
-				}%
-				{\edef\CF_bondoutnode{\CF_bondoutnode}% �value le l'atome de d�part de liaison
-				\CF_ifx(\CF_toksa% une parenth�se pour commencer ?
-					{\ifnum\CF_lastaction=2 % il y avait une liaison juste avant ?
-						\CF_insertemptygroup\CF_molecule
-					\else
-						\CF_expsecond\CF_grabsubmol{\CF_molecule}%
-						\begingroup
-							\ifCF_incycle\def\CF_lastaction{3}\fi% on �tait dans un cycle
-							\CF_incyclefalse
-							\aftergroup\CF_chemfigd
-							\def\CF_nextaction{\CF_expsecond\CF_chemfigc{\CF_molinparen}}%
-					\fi
-					}%
-					{\CF_ifx\CF_molecule\empty
-						{\let\CF_nextaction\endgroup
-						}
-						{% ce qui reste apr�s le noeud courant n'est pas vide, ne commence pas par "-=~", ni par une parenth�se
-						\CF_ifx*\CF_toksa% un cycle ?
-							{\ifnum\CF_lastaction=2
-								\CF_insertemptygroup\CF_molecule% ins�re un groupe vide
-							\else
-								\ifCF_incycle
-									\def\CF_lastaction{3}%
-								\fi% on �tait dans un cycle
-								\ifnum\CF_lastaction=3
-									\let\CF_lastcyclenum\CF_cyclenum
-								\fi
-								\CF_eexpsecond\CF_iffirsttokmatch{\expandafter\CF_gobarg\CF_molecule}*%
-									{\CF_eexpsecond{\def\CF_molecule}{\expandafter\CF_gobarg\CF_molecule}% enl�ve la 1er �toile
-									\CF_eexpsecond\CF_iffirsttokmatch{\expandafter\CF_gobarg\CF_molecule}[% un crochet ensuite ?
-										{\expandafter\CF_cycleparsepreamblewithoptarg\CF_molecule\_nil% \begingroup inclus
-										}%
-										{\def\CF_cyclearcstartangle{0}\def\CF_cyclearcendangle{360}%
-										\let\CF_cyclearcdirecttikz\empty
-										\expandafter\CF_cycleparsepreamble\CF_molecule\_nil% \begingroup inclus
-										}%
-									\CF_cyclearctrue
-									}%
-									{\expandafter\CF_cycleparsepreamble\CF_molecule\_nil% \begingroup inclus
-									\CF_cyclearcfalse
-									}%
-								\CF_cntcycle0
-								\edef\CF_hookcycle{\CF_bondoutnode}%
-								\let\CF_hookatomgroup\CF_previousatomgroup
-								\CF_ifx\CF_hookatomgroup\CF_emptynode
-									{\def\CF_cyclejoinlast{1}}% joindre le dernier
-									{\def\CF_cyclejoinlast{0}}
-								\CF_incycletrue
-								\ifnum\CF_lastaction=3
-									\pgfmathsetmacro\CF_initcycleangle{360/\CF_lastcyclenum-180}% c'est un cycle dans un cycle
-								\else
-									\pgfmathsetmacro\CF_initcycleangle{-180/\CF_cyclenum-90+\CF_cycleanglecorrection}%
-								\fi
-								\aftergroup\CF_chemfigd
-								\def\CF_nextaction{\CF_expsecond\CF_chemfigc{\CF_molinparen}}%
-							\fi
-							}%
-							{\CF_error{something went wrong here: \detokenize\expandafter{\CF_molecule}^^JIf you think it's a bug, please, send a Minimal Example to the author}%
-							}%
-						}%
-					}%
-				}%
-			}%
-			{\CF_expthreemacroargs\CF_drawatomgroup\CF_currentangle\CF_currenttoatom\CF_currentatomgroup
-			}%
-		}%
-	\CF_nextaction
-}
-
-\def\CF_cycleparsepreamble*#1#2\_nil{%
-	\ifnum#1<3
-		\CF_error{a cycle must be at least a triangle.^^JThe number following "*" must be 3 or more}%
-	\fi
-	\def\CF_molecule{#2}%
-	\CF_expsecond\CF_grabsubmol{\CF_molecule}%
-	\begingroup
-	\def\CF_cyclenum{#1}%
-}
-
-\def\CF_cycleparsepreamblewithoptarg*[#1]#2#3\_nil{%
-	\CF_cycleparseoptarg#1,\empty,\empty,\empty\_nil
-	\CF_cycleparsepreamble*#2#3\_nil
-}
-
-\def\CF_cycleparseoptarg#1,#2,#3\_nil{%
-	\CF_ifempty{#1}
-		{\def\CF_cyclearcstartangle{0}}
-		{\def\CF_cyclearcstartangle{#1}}%
-	\CF_ifempty{#2}
-		{\def\CF_cyclearcendangle{360}}
-		{\def\CF_cyclearcendangle{#2}}%
-	\CF_expsecond{\def\CF_cyclearcdirecttikz}{\CF_sanitizelastitem#3,\empty\_nil}%
-}
-
-\def\CF_grabsubmol#1{%
-	\begingroup
-		\catcode`(1 \catcode`)2
-		\CF_threeea
-	\endgroup
-	\expandafter\CF_grabsubmola\scantokens{\relax#1}%
-}
-
-\def\CF_grabsubmola#1\_nil{%
-	\expandafter\CF_assigntonil\expandafter\CF_molecule\scantokens\CF_threeea{\expandafter\CF_gobarg    \CF_gobarg#1}%
-	\expandafter\CF_assigntonil\expandafter\CF_molinparen\scantokens\CF_threeea{\expandafter\CF_firsttonil\CF_gobarg#1\_nil}%
-}
-
-\def\CF_ifcarisupperletter#1{%
-	\ifcat\relax\noexpand#1%
-		\let\CF_next\CF_execsecond% faux si c'est une sc
-	\else
-		\ifnum`#1<`A
-			\let\CF_next\CF_execsecond
-		\else
-			\ifnum`#1>`Z
-				\let\CF_next\CF_execsecond
-			\else
-				\let\CF_next\CF_execfirst
-			\fi
-		\fi
-	\fi
-	\CF_next
-}
-
-% Cr�� 4 noeuds au dessus et au dessous des noeuds #1 et #2
-% � une distance de #3 du noeud #1 et #4 du noeud #2
-\def\CF_createnormnodes#1#2#3#4{%
-	\CF_doifnotempty{#3}
-		{\node[shape=coordinate,at=(#1),xshift=#3*\CF_normx,yshift=#3*\CF_normy](#11){};
-		\node[shape=coordinate,at=(#1),xshift=-#3*\CF_normx,yshift=-#3*\CF_normy](#12){};
-		}%
-	\CF_doifnotempty{#4}
-		{\node[shape=coordinate,at=(#2),xshift=#4*\CF_normx,yshift=#4*\CF_normy](#21){};
-		\node[shape=coordinate,at=(#2),xshift=-#4*\CF_normx,yshift=-#4*\CF_normy](#22){};
-		}%
-}
-
-\def\CF_computenodevect#1#2{%
-	\pgfextractx\CF_dim{\pgfpointanchor{#1}{center}}\edef\CF_dimax{\the\CF_dim}%
-	\pgfextracty\CF_dim{\pgfpointanchor{#1}{center}}\edef\CF_dimay{\the\CF_dim}%
-	\pgfextractx\CF_dim{\pgfpointanchor{#2}{center}}\edef\CF_dimbx{\the\CF_dim}%
-	\pgfextracty\CF_dim{\pgfpointanchor{#2}{center}}\edef\CF_dimby{\the\CF_dim}%
-	\pgfmathsetmacro\CF_vectorlen{veclen(\CF_dimbx-\CF_dimax,\CF_dimby-\CF_dimay)}%
-	\pgfmathsetmacro\CF_normx{(\CF_dimay-\CF_dimby)/\CF_vectorlen}%
-	\pgfmathsetmacro\CF_normy{(\CF_dimbx-\CF_dimax)/\CF_vectorlen}%
-}
-
-\def\CF_setoffset#1#2{%
-	\CF_doifempty#1%
-		{\edef#1{%
-			\ifx#2\CF_emptynode
-				0pt%
-			\else
-				\ifx#2\empty
-					0pt%
-				\else
-					\CF_bondoffset
-				\fi
-			\fi}%
-		}%
-}
-
-\def\CF_drawbond#1#2#3#4#5{% #1=type de liaison #2 et #3:nom de noeuds de d�but et fin #4 et #5: contenu des atomes de d�but et fin
-	\CF_setoffset\CF_startoffset#4%
-	\CF_setoffset\CF_endoffset#5%
-	\let\CF_currentbondstyle\CF_bondstyle
-	\CF_doifnotempty\CF_currenttikz{\CF_eaddtomacro\CF_currentbondstyle{\expandafter,\CF_currenttikz}}%
-	\path(#2)--(#3)coordinate[pos=0](#2@)coordinate[pos=1](#3@);%
-	\CF_computenodevect{#2@}{#3@}%
-	\pgfmathsetmacro\CF_startcoeff{\CF_startoffset/\CF_vectorlen}%
-	\pgfmathsetmacro\CF_endcoeff{1-\CF_endoffset/\CF_vectorlen}%
-	\path(#2@)--(#3@)coordinate[pos=\CF_startcoeff](#2@@)coordinate[pos=\CF_endcoeff](#3@@);%
-	\CF_doifnotempty\CF_movebondname% on doit poser un noeud sur la liaison
-		{\path(#2@@)--(#3@@)coordinate[overlay,pos=\CF_movebondcoeff](\CF_movebondname);
-		\let\CF_movebondname\empty
-		}%
-	\ifcase#1\relax
-		\CF_error{unknown bond type, this error should not occur^^JIf you think it's a bug, send a Minimal Example to the author}%
-	\or% 1 = liaison simple
-		\CF_drawaxisbond{#2}{#3}% trace la liaison simple dans l'axe
-	\or% 2 = liaison double
-		\ifCF_incycle
-			\ifnum\CF_doublebondtype=0
-				\def\CF_doublebondtype{1}%
-			\fi
-			\ifnum\CF_flipstate>0
-				\def\CF_doublebondtype{2}%
-			\fi
-			\pgfmathsetmacro\CF_doublebondlengthcorrection{\CF_doublesep*tan(180/\CF_cyclenum)}%
-		\fi
-		\ifcase\CF_doublebondtype
-			\CF_createnormnodes{#2@@}{#3@@}{\CF_doublesep/2}{\CF_doublesep/2}%
-			\CF_drawbonda(#2@@1)--(#3@@1);
-			\CF_drawbonda(#2@@2)--(#3@@2);
-			\let\CF_joinbond\CF_zero
-		\or
-			\CF_createnormnodes{#2@@}{#3@@}\CF_doublesep\CF_doublesep
-			\CF_drawaxisbond{#2}{#3}% trace la liaison simple dans l'axe\CF_drawbonda(#2@@)--(#3@@);
-			\begingroup% ajuste �ventuellement les longueurs des liaisons doubles
-				\ifCF_incycle
-					\ifdim\CF_startoffset=0pt
-						\CF_edefaddtomacro\CF_currentbondstyle{,shorten <=\CF_doublebondlengthcorrection pt}%
-					\fi
-					\ifdim\CF_endoffset=0pt
-						\CF_edefaddtomacro\CF_currentbondstyle{,shorten >=\CF_doublebondlengthcorrection pt}%
-					\fi
-				\fi
-				\CF_drawbonda(#2@@1)--(#3@@1);
-			\endgroup
-		\or
-			\CF_createnormnodes{#2@@}{#3@@}\CF_doublesep\CF_doublesep
-			\CF_drawaxisbond{#2}{#3}% trace la liaison simple dans l'axe\CF_drawbonda(#2@@)--(#3@@);
-			\begingroup% ajuste �ventuellement les longueurs des liaisons doubles
-				\ifCF_incycle
-					\ifdim\CF_startoffset=0pt
-						\CF_edefaddtomacro\CF_currentbondstyle{,shorten \ifnum\CF_flipstate=0 <=-\else>=\fi\CF_doublebondlengthcorrection pt}%
-					\fi
-					\ifdim\CF_endoffset=0pt
-						\CF_edefaddtomacro\CF_currentbondstyle{,shorten \ifnum\CF_flipstate=0 >=-\else<=\fi\CF_doublebondlengthcorrection pt}%
-					\fi
-				\fi
-				\CF_drawbonda(#2@@2)--(#3@@2);
-			\endgroup
-		\fi
-	\or% 3 = liaison triple
-		\CF_createnormnodes{#2@@}{#3@@}\CF_doublesep\CF_doublesep
-		\CF_drawaxisbond{#2}{#3}% trace la liaison simple dans l'axe\CF_drawbonda(#2@@)--(#3@@);
-		\CF_drawbonda(#2@@1)--(#3@@1);
-		\CF_drawbonda(#2@@2)--(#3@@2);
-	\or% 4 = liaison Cram pleine de #2 vers #3
-		\CF_createnormnodes{#2@@}{#3@@}{\CF_crambasewidth/2}{}%
-		\CF_expafter{\filldraw[}\CF_currentbondstyle,line join=bevel](#2@@1)--(#2@@2)--(#3@@)--cycle;
-		\let\CF_joinbond\CF_zero
-	\or% 5 = liaison Cram creuse de #3 vers #2
-		\CF_createnormnodes{#3@@}{#2@@}{\CF_crambasewidth/2}{}%
-		\CF_expafter{\filldraw[}\CF_currentbondstyle,line join=bevel](#3@@1)--(#3@@2)--(#2@@)--cycle;
-		\let\CF_joinbond\CF_zero
-	\or% 6 = liaison Cram pointill�e de #2 vers #3
-		\scope
-			\CF_createnormnodes{#2@@}{#3@@}{\CF_crambasewidth/2}{}%
-			\CF_clipcramornot(#2@@1)--(#2@@2)--(#3@@)--(#2@@1);
-			\CF_expafter{\draw[}\CF_currentbondstyle,dash pattern=on \CF_cramdashlength off \CF_cramdashsep,line width=\CF_crambasewidth](#2@@)--(#3@@);
-		\endscope
-		\let\CF_joinbond\CF_zero
-	\or% 7 = liaison Cram pointill�e de #3 vers #2
-		\scope
-			\CF_createnormnodes{#3@@}{#2@@}{\CF_crambasewidth/2}{}%
-			\CF_clipcramornot(#3@@1)--(#3@@2)--(#2@@)--(#3@@1);
-			\CF_expafter{\draw[}\CF_currentbondstyle,dash pattern=on \CF_cramdashlength off \CF_cramdashsep,line width=\CF_crambasewidth](#3@@)--(#2@@);
-		\endscope
-		\let\CF_joinbond\CF_zero
-	\or% 8 = liaison cram rectangle �vid� de #2 vers #3
-		\CF_createnormnodes{#2@@}{#3@@}{\CF_crambasewidth/2}{}%
-		\CF_expafter{\draw[}\CF_currentbondstyle,line join=bevel](#2@@1)--(#2@@2)--(#3@@)--cycle;
-		\let\CF_joinbond\CF_zero
-	\or% 9 = liaison cram rectangle �vid� de #3 vers #1
-		\CF_createnormnodes{#3@@}{#2@@}{\CF_crambasewidth/2}{}%
-		\CF_expafter{\draw[}\CF_currentbondstyle,line join=bevel](#3@@1)--(#3@@2)--(#2@@)--cycle;
-		\let\CF_joinbond\CF_zero
-	\else
-		\CF_error{unknown bond type, this error should not occur^^JIf you think it's a bug, send a Minimal Example to the author}%
-	\fi
-	\let\CF_startoffset\empty
-	\let\CF_endoffset\empty
-	\let\CF_previoustikz\CF_currenttikz
-	\let\CF_previousbondangle\CF_previousangle
-	\def\CF_previousbond{#1}%
-}
-
-\def\CF_drawaxisbondnojoin#1#2{\CF_drawbonda(#1@@)--(#2@@);}
-
-\def\CF_drawaxisbondjoin#1#2{% dessine une liaison simple dans l'axe avec raccord r�trograde
-	\ifCF_incycle\ifnum\CF_cntcycle=\CF_cyclenum\relax
-		\let\CF_nexttikz\CF_cyclefirsttikz
-	\fi\fi
-	\ifnum\CF_joinbond=0
-		\ifCF_incycle
-			\ifnum\CF_cntcycle=\CF_cyclenum\relax
-				\ifnum\CF_cyclejoinlast=1
-					\CF_drawbonda(#1@@)--(#2@@)--%
-						([shift=(\CF_previousbondangle+2*\CF_cycleincrementangle:.5\pgflinewidth)]#2@@);
-				\else
-					\CF_drawbonda(#1@@)--(#2@@);
-				\fi
-			\else
-				\CF_drawbonda(#1@@)--(#2@@);
-			\fi
-		\else
-			\CF_drawbonda(#1@@)--(#2@@);
-		\fi
-		\def\CF_joinbond{1}%
-	\else
-		\CF_ifx\CF_previoustikz\CF_currenttikz
-			{\def\CF_joinbond{1}%
-			\CF_ifx\CF_previousatomgroup\CF_emptynode
-				{\CF_ifx\CF_previousbondangle\empty% si d�but mol�cule
-					{\CF_drawbonda(#1@@)--(#2@@);
-					}
-					{\ifdim\CF_startoffset=0pt
-						\ifCF_incycle
-							\ifnum\CF_cntcycle=\CF_cyclenum\relax
-								\ifnum\CF_cyclejoinlast=1
-									\CF_ifx\CF_cyclefirsttikz\CF_currenttikz
-										{\CF_drawbonda([shift=(\CF_previousbondangle:-.5\pgflinewidth)]#1@@)--(#1@@)--(#2@@)--%
-										([shift=(\CF_previousbondangle+2*\CF_cycleincrementangle:.5\pgflinewidth)]#2@@);
-										}
-										{\CF_drawbonda([shift=(\CF_previousbondangle:-.5\pgflinewidth)]#1@@)--(#1@@)--(#2@@);
-										}%
-								\else
-									\CF_drawbonda([shift=(\CF_previousbondangle:-.5\pgflinewidth)]#1@@)--(#1@@)--(#2@@);
-								\fi
-							\else
-								\CF_drawbonda([shift=(\CF_previousbondangle:-.5\pgflinewidth)]#1@@)--(#1@@)--(#2@@);
-							\fi
-						\else
-							\CF_drawbonda([shift=(\CF_previousbondangle:-.5\pgflinewidth)]#1@@)--(#1@@)--(#2@@);
-						\fi
-					\else
-						\CF_drawbonda(#1@@)--(#2@@);
-					\fi
-					}%
-				}
-				{\CF_drawbonda(#1@@)--(#2@@);}%
-			}
-			{\ifCF_incycle
-				\ifnum\CF_cntcycle=\CF_cyclenum\relax
-					\ifnum\CF_cyclejoinlast=1
-						\CF_ifx\CF_nexttikz\CF_currenttikz
-							{\CF_drawbonda(#1@@)--(#2@@)--([shift=(\CF_previousbondangle+2*\CF_cycleincrementangle:.5\pgflinewidth)]#2@@);}%
-							{\CF_drawbonda(#1@@)--(#2@@);}%
-					\else
-						\CF_drawbonda(#1@@)--(#2@@);
-					\fi
-				\else
-					\CF_drawbonda(#1@@)--(#2@@);
-				\fi
-			\else
-				\CF_drawbonda(#1@@)--(#2@@);
-			\fi
-			}%
-	\fi
-	\ifdim\CF_endoffset=0pt \else
-		\let\CF_joinbond\CF_zero
-	\fi
-}
-
-\def\CF_drawbonda{\CF_expafter{\draw[}\CF_currentbondstyle]}
-
-\def\CF_hookdrawall{% dessine tous les crochets contenus dans la sc \CF_hookdraw
-	\CF_doifnotempty\CF_hookdrawlist
-		{\expandafter\CF_hookdrawfirst\CF_hookdrawlist\_nil% trace un lien de crochet � crochet
-		\CF_hookdrawall
-		}%
-}
-
-\def\CF_hookdrawfirst[#1,#2,#3]#4#5#6#7#8\_nil{%
-	\def\CF_hookdrawlist{#8}%
-	\begingroup
-		\let\CF_joinbond\CF_zero
-		\def\CF_currenttikz{#3}%
-		\def\CF_hookstartcontent{#6}\def\CF_hookendcontent{#7}%
-		\CF_ifinteger{#2}%
-			{\CF_drawbond{#2}{#4}{#5}\CF_hookstartcontent\CF_hookendcontent
-			}%
-			{\CF_assignbondcode{#2}\CF_bondcurrentnum
-			\CF_drawbond\CF_bondcurrentnum{#4}{#5}\CF_hookstartcontent\CF_hookendcontent
-			}%
-	\endgroup
-}
-
-\def\CF_extractatom#1-#2\_nil{#2}% transforme le bound@outnode en n� de l'atome
-
-\def\CF_gobblemovearg @#1#2\_nil#3{%
-	\expandafter\def\csname atom_\number\CF_cntatom\endcsname{#2}%
-	\CF_ifinstr{#1},%
-		{\CF_analysemovearg#1\_nil#3\let\CF_movebondcoeff\empty}%
-		{\def#3{#1}}%
-	\CF_doifempty{#2}{\let\CF_nodestrut\empty}%
-}%
-
-\def\hflipnext{\def\CF_flipstate{1}}
-
-\def\vflipnext{\def\CF_flipstate{2}}
-\let\CF_flipstate\CF_zero
-
-\def\CF_drawatomgroup#1#2#3{% #1=angle d'arriv�e de la liaison #2=numero atome sur lequel arrive la liaison #3=groupe d'atomes
-	\expandafter\let\expandafter\CF_bondoutcontent% assigne le contenu de l'atome d'o� part la liaison
-		\csname
-			\ifdefined\CF_bondoutnode
-				atom_\expandafter\CF_extractatom\CF_bondoutnode\_nil
-			\else
-				empty%
-			\fi
-		\endcsname
-	\global\advance\CF_cntgroup1
-	\let\CF_currentatom\empty
-	\global\let\CF_hookdrawlist\empty
-	\CF_cntatomgroup0
-	\CF_iffirsttokmatch{#3}?
-		{\CF_drawatomgroupa{{}#3}}
-		{\CF_drawatomgroupa{#3}}%
-	\def\CF_currentatomgroup{#3}%
-	\CF_removemovearg\CF_currentatomgroup% enl�ve les "@{<nom>}"
-	\CF_ifinstr{#3}?%
-		{\CF_removehook\CF_currentatomgroup
-		\ifcat\relax\detokenize\expandafter{\romannumeral-`\.\expandafter\noexpand\CF_currentatomgroup}\relax
-			\let\CF_currentatomgroup\CF_emptynode
-		\fi
-		}%
-		{}%
-	\CF_doifnotempty{#2}
-		{\ifnum#2<1
-			\CF_warning{no atom found at position #2, pershaps you mispelled the optional argument of the bond.}%
-		\else
-			\ifnum#2>\CF_cntatomgroup
-				\CF_error{no atom found at position #2, pershaps you mispelled the optional argument of the bond.}%
-			\fi
-		\fi
-		}%
-	\edef\CF_hookatomnumber{%
-		\CF_ifempty{#2}
-			{\ifdim#1pt>90pt
-				\ifdim#1pt<270pt
-					\number\CF_cntatomgroup
-				\else
-					1%
-				\fi
-			\else
-				1%
-			\fi
-			}
-			{#2%
-			}%
-	}%
-	\CF_cntatom\CF_hookatomnumber
-	\CF_ifx\CF_currentatomgroup\CF_emptynode
-		{\let\CF_nodestrut\empty
-		}
-		{\CF_ifx\empty\CF_bondoutcontentsaved
-			{\def\CF_nodestrut{\vphantom\CF_bondoutcontent}}%
-			{\def\CF_nodestrut{\vphantom\CF_bondoutcontentsaved}}%
-		}%
-	\edef\CF_optstring{anchor=\ifnum\CF_lastaction=0 base\else\ifCF_incycle center\else\ifCF_macrofixedbondlength 180+#1\else center\fi\fi\fi,at=(CF_node),\CF_nodestyle}% premier atome de la mol�cule affich�
-	\loop
-		\unless\ifnum\CF_cntatom>\CF_cntatomgroup
-		\CF_eexpafter
-			{\futurelet\CF_toksa}
-			{\expandafter\expandafter\expandafter\CF_gobtonil\csname atom_\number\CF_cntatom\endcsname\_nil}%
-		\CF_ifx @\CF_toksa% l'atome courant commence par un "@"
-			{\CF_threeea\CF_gobblemovearg\csname atom_\number\CF_cntatom\endcsname\_nil\CF_moveatomname
-			\CF_expafter{\node[}\CF_optstring,overlay](\CF_moveatomname){\phantom{\CF_nodecontent}};%
-			\let\CF_moveatomname\empty
-			}
-			{}%
-		\CF_expafter{\node[}\CF_optstring](n\number\CF_cntgroup-\number\CF_cntatom){\CF_nodecontent};%
-		\let\CF_nodestrut\empty
-		\advance\CF_cntatom1
-		\edef\CF_optstring{anchor=base \ifnum\CF_flipstate=1 east\else west\fi,at=(n\number\CF_cntgroup-\number\numexpr\CF_cntatom-1.base \ifnum\CF_flipstate=1 west\else east\fi),\CF_nodestyle}%
-	\repeat
-	\CF_cntatom\CF_hookatomnumber
-	\ifnum\CF_lastaction=2 % s'il faut tracer une liaison
-		\gdef\CF_cycleanglecorrection{0}% alors c'est qu'un cycle ne peut pas commencer la mol�cule : annulation de la correction d'angle
-		\CF_drawbond\CF_bondtype{\CF_bondoutnode}{n\number\CF_cntgroup-\number\CF_cntatom}\CF_previousatomgroup\CF_currentatomgroup
-	\fi
-	\def\CF_lastaction{1}% met la derni�re action � 1 : affichage d'un noeud
-	\loop
-		\ifnum\CF_cntatom>1
-		\advance\CF_cntatom-1
-		\edef\CF_optstring{anchor=base \ifnum\CF_flipstate=1 west\else east\fi,at=(n\number\CF_cntgroup-\number\numexpr\CF_cntatom+1.base \ifnum\CF_flipstate=1 east\else west\fi),\CF_nodestyle}%
-		\CF_eexpafter
-			{\futurelet\CF_toksa}
-			{\expandafter\expandafter\expandafter\CF_gobtonil\csname atom_\number\CF_cntatom\endcsname\_nil}%
-		\CF_ifx @\CF_toksa% l'atome courant commence par un "@"
-			{\CF_threeea\CF_gobblemovearg\csname atom_\number\CF_cntatom\endcsname\_nil\CF_moveatomname
-			\CF_expafter{\node[}\CF_optstring,overlay](\CF_moveatomname){\phantom{\CF_nodecontent}};%
-			\let\CF_moveatomname\empty
-			}
-			{}%
-		\CF_expafter{\node[}\CF_optstring](n\number\CF_cntgroup-\number\CF_cntatom){\CF_nodecontent};%
-	\repeat
-	\CF_hookdrawall
-	\edef\CF_lastgroupnumber{\number\CF_cntgroup}%
-	\let\CF_previousatomgroup\CF_currentatomgroup
-}
-
-\def\CF_keepmovearg @#1#2\_nil{\def\CF_currentatom{@{#1}}}
-
-\def\CF_drawatomgroupa#1{% transforme #1 en un groupe d'atomes
-	\CF_ifempty{#1}
-		{\expandafter\let\csname atom_\number\CF_cntatomgroup\endcsname\CF_currentatom
-		}
-		{\advance\CF_cntatomgroup1
-		\futurelet\CF_toksa\CF_gobtonil#1\_nil
-		\CF_ifx @\CF_toksa
-			{\CF_keepmovearg#1\_nil
-			\CF_removemovearga#1\_nil\CF_aftermovearg
-			\CF_expsecond\CF_drawatomgroupb{\CF_aftermovearg}%
-			}%
-			{\let\CF_currentatom\empty
-			\CF_drawatomgroupb{#1}%
-			}%
-		}%
-}
-
-\def\CF_drawatomgroupb#1{%
-	\CF_ifempty{#1}
-		{\expandafter\let\csname atom_\number\CF_cntatomgroup\endcsname\CF_currentatom
-		}
-		{\futurelet\CF_toksa\CF_gobtonil#1\_nil
-		\CF_ifx\bgroup\CF_toksa
-			{\CF_eaddtomacro\CF_currentatom{\expandafter{\CF_firsttonil#1\_nil}}%
-			\CF_expsecond\CF_drawatomgroupba{\CF_gobarg#1}%
-			}%
-			{\CF_ifx\CF_sptoken\CF_toksa
-				{\CF_addtomacro\CF_currentatom{ }%
-				\CF_expsecond\CF_drawatomgroupba{\CF_afterspace#1\_nil}%
-				}%
-				{\CF_eaddtomacro\CF_currentatom{\CF_firsttonil#1\_nil}%
-				\CF_expsecond\CF_drawatomgroupba{\CF_gobarg#1}%
-				}%
-			}%
-		}%
-}
-
-% enl�ve tous les "@{nom}" de la sc #1
-\def\CF_removemovearg#1{%
-	\CF_expsecond\CF_ifinstr{#1}@%
-		{\expandafter\CF_removemovearga#1\_nil#1%
-		\CF_removemovearg#1%
-		}%
-		{}%
-}
-
-% enl�ve le premier "@{<nom>}" de l'argument et l'assigne � #2
-\def\CF_removemovearga#1\_nil#2{%
-	\def\CF_removemoveargb##1@{%
-		\CF_expsecond{\def#2}{\CF_gobarg##1}% mange le \relax
-		\CF_removemoveargc\relax
-	}%
-	\def\CF_removemoveargc##1\_nil{\CF_eaddtomacro#2{\CF_gobtwoargs##1}}% mange le \relax et le <nom>
-	\CF_removemoveargb\relax#1\_nil
-}
-
-\def\CF_drawatomgroupba#1{% transforme #1 en un groupe d'atomes
-	\CF_ifempty{#1}
-		{\expandafter\let\csname atom_\number\CF_cntatomgroup\endcsname\CF_currentatom
-		\let\CF_currentatom\empty
-		}
-		{\futurelet\CF_toksa\CF_gobtonil#1\_nil
-		\CF_ifx @\CF_toksa
-			{\expandafter\let\csname atom_\number\CF_cntatomgroup\endcsname\CF_currentatom
-			\let\CF_currentatom\empty
-			\CF_drawatomgroupa{#1}%
-			}%
-			{\CF_ifx|\CF_toksa
-				{\expandafter\let\csname atom_\number\CF_cntatomgroup\endcsname\CF_currentatom
-				\let\CF_currentatom\empty
-				\CF_expsecond\CF_drawatomgroupa{\CF_gobarg#1}%
-				}%
-				{\CF_ifx\CF_sptoken\CF_toksa
-					{\CF_addtomacro\CF_currentatom{ }%
-					\CF_expsecond\CF_drawatomgroupba{\CF_afterspace#1\_nil}%
-					}%
-					{\CF_ifx\bgroup\CF_toksa
-						{\CF_eaddtomacro\CF_currentatom{\expandafter{\CF_firsttonil#1\_nil}}%
-						\CF_expsecond\CF_drawatomgroupba{\CF_gobarg#1}%
-						}%
-						{\CF_expsecond\CF_ifcarisupperletter{\CF_firsttonil#1\_nil}%
-							{\expandafter\let\csname atom_\number\CF_cntatomgroup\endcsname\CF_currentatom
-							\let\CF_currentatom\empty
-							\CF_drawatomgroupa{#1}%
-							}%
-							{\CF_ifx?\CF_toksa
-								{\CF_expsecond\CF_iffirsttokmatch{\CF_gobarg#1}[% un crochet apr�s le "?"
-									{\expandafter\CF_graboptarg\CF_gobarg#1\_nil\CF_afterhook}%
-									{\CF_expafter{\CF_graboptarg[]}{\CF_gobarg#1}\_nil\CF_afterhook}%
-								\CF_exptwomacroargs\CF_ifinstr{\CF_hooklist}{\expandafter(\CF_hookcurrentname)}% crochet d�j� d�fini ?
-									{\CF_expsecond\CF_hookparselist{\CF_hookcurrentname}% chercher les caract�ristiques du crochet sauvegard�
-									\CF_edefaddtomacro\CF_hookdrawlist{%
-										[\CF_hookcurrentname,\CF_hookcurrentlink,\CF_hookcurrenttikz]{\CF_hooksavedcoord}{n\number\CF_cntgroup-\number\CF_cntatomgroup}}%
-									\CF_eaddtomacro\CF_hookdrawlist{\expandafter{\CF_hooksavedcontent}}%
-									\CF_eaddtomacro\CF_hookdrawlist{\expandafter{\CF_currentatom}}% ajoute les 4 arguments � la liste des crochets � tracer
-									\global\let\CF_hookdrawlist\CF_hookdrawlist
-									}%
-									{\CF_edefaddtomacro\CF_hooklist{(\CF_hookcurrentname)|n\number\CF_cntgroup-\number\CF_cntatomgroup|}%
-									\CF_eaddtomacro\CF_hooklist{\CF_currentatom|}%
-									\global\let\CF_hooklist\CF_hooklist
-									}%
-								\CF_expsecond\CF_drawatomgroupba{\CF_afterhook}%
-								}%
-								{\CF_eaddtomacro\CF_currentatom{\CF_firsttonil#1\_nil}%
-								\CF_expsecond\CF_drawatomgroupba{\CF_gobarg#1}%
-								}%
-							}%
-						}%
-					}%
-				}%
-			}%
-		}%
-}
-
-\def\CF_kookdefaultname{a}
-\def\CF_hookdefaultlink{-}
-\def\CF_hookdefaulttikz{}
-
-\def\CF_hookparseoptarg#1,#2,#3\_nil{%
-	\CF_testemptyandassign\CF_hookcurrentname{#1}\CF_kookdefaultname
-	\CF_testemptyandassign\CF_hookcurrentlink{#2}\CF_hookdefaultlink
-	\CF_testemptyandassign\CF_hookcurrenttikz{#3}\CF_hookdefaulttikz
-}
-
-\def\CF_graboptarg[#1]#2\_nil#3{%
-	\CF_hookparseoptarg#1,,\_nil
-	\def#3{#2}%
-}
-
-\def\CF_hookparselist#1{% #1 est le nom du noeud � retrouver
-	\def\CF_hookparselista##1(#1)|##2|##3|##4\_nil{\def\CF_hooksavedcoord{##2}\def\CF_hooksavedcontent{##3}}%
-	\expandafter\CF_hookparselista\CF_hooklist\_nil
-}
-
-\def\CF_removehook#1{%
-	\CF_expsecond\CF_ifinstr{#1}?%
-		{\CF_expafter{\CF_removehooka\relax}#1\_nil#1%
-		\CF_removehook#1%
-		}
-		{}%
-}
-
-\def\CF_removehooka#1?#2\_nil#3{%
-	\CF_iffirsttokmatch{#2}[%
-		{\CF_removehookb#1?#2\_nil#3}
-		{\CF_expsecond{\def#3}{\CF_gobarg#1#2}}%
-}
-
-\def\CF_removehookb#1?[#2]#3\_nil#4{\CF_expsecond{\def#4}{\CF_gobarg#1#3}}
-
-\def\Lewis{%
-	\CF_lewisoverlayfalse
-	\CF_testopt\CF_lewisa{}%
-}
-
-\def\lewis{%
-	\CF_lewisoverlaytrue
-	\CF_testopt\CF_lewisa{}%
-}
-
-\def\CF_lewisa[#1]{%
-	\begingroup
-		\CF_doifnotempty{#1}{\setchemfig{#1}}%
-		\CF_valuetomacro\CF_lewiswidthdouble[0.3ex]{lewis | width}%
-		\CF_valuetomacro\CF_lewisoffset     [0.4ex]{lewis sep}%
-		\CF_valuetomacro\CF_lewislength     [1.5ex]{lewis length}%
-		\CF_valuetomacro\CF_lewisstyle      []{lewis style}%
-		\CF_valuetomacro\CF_lewisdist       [0.3em]{lewis dist}%
-		\CF_valuetomacro\CF_lewisradius     [0.15ex]{lewis radius}%
-		\CF_valuetomacro\CF_lewisdiagcoeff  [1]{lewis diag coeff}%
-		\ifCF_lewisoverlay
-			\CF_addtomacro\CF_lewisstyle{,overlay}%
-		\fi
-		\CF_lewisb
-}
-
-\def\CF_lewisb#1{%
-		\CF_lewisc#1\_nil
-	\endgroup
-}
-
-\def\CF_lewisc#1,#2\_nil{%
-	\setbox\CF_boxlewis\hbox{\printatom{#2}}% mettre en dehors de tikzpicture (si \printatom ne passe pas en mode math)
-	\tikzpicture[every node/.style={anchor=base,inner sep=0pt,outer sep=0pt,minimum size=0pt},baseline]%
-		\CF_makeother;\CF_makeother:%
-		\node(CF_lewis@anchor){};
-		\def\CF_lewisremainpos{#1}%
-		\let\CF_lewispreviouspos\empty
-		\loop
-			\unless\ifx\CF_lewisremainpos\empty
-				\edef\CF_lewiscurrentpos{\expandafter\CF_firsttonil\CF_lewisremainpos\_nil}%
-				\edef\CF_lewisremainpos{\expandafter\CF_gobarg\CF_lewisremainpos}%
-				\pgfmathsetmacro\CF_lewisx{\wd\CF_boxlewis/2+\ifcase\CF_lewiscurrentpos\space1\or1\or0\or-1\or-1\or-1\or0\or1\fi*(\wd\CF_boxlewis/2)}%
-				\pgfmathsetmacro\CF_lewisy{\ht\CF_boxlewis/2+\ifcase\CF_lewiscurrentpos\space0\or1\or1\or1\or0\or-1\or-1\or-1\fi*(\ht\CF_boxlewis/2\ifnum\CF_lewiscurrentpos>4 +\dp\CF_boxlewis\fi)}%
-				\edef\CF_lewisxoffset{\ifcase\CF_lewiscurrentpos\space1\or0.70711\or0\or-0.70711\or-1\or-0.70711\or0\or0.70711\fi}%
-				\edef\CF_lewisyoffset{\ifcase\CF_lewiscurrentpos\space0\or0.70711\or1\or0.70711\or0\or-0.70711\or-1\or-0.70711\fi}%
-				\ifodd\CF_lewiscurrentpos\relax
-					\pgfmathsetmacro\CF_lewiscurrentoffset{\CF_lewisoffset*\CF_lewisdiagcoeff}%%
-				\else
-					\let\CF_lewiscurrentoffset\CF_lewisoffset
-				\fi
-				\if.\expandafter\CF_firsttonil\CF_lewisremainpos\relax\_nil
-					\edef\CF_lewisremainpos{\expandafter\CF_gobarg\CF_lewisremainpos}%
-					\CF_expafter{\draw[fill,black,}{\CF_lewisstyle]}%
-						(\CF_lewisx pt+\CF_lewisxoffset*\CF_lewiscurrentoffset,\CF_lewisy pt+\CF_lewisyoffset*\CF_lewiscurrentoffset)circle(\CF_lewisradius);%
-				\else
-					\if|\expandafter\CF_firsttonil\CF_lewisremainpos\relax\_nil
-						\edef\CF_lewisremainpos{\expandafter\CF_gobarg\CF_lewisremainpos}%
-						\pgfmathsetmacro\CF_lewisx{\CF_lewisx pt+\CF_lewisxoffset*\CF_lewiscurrentoffset}%
-						\pgfmathsetmacro\CF_lewisy{\CF_lewisy pt+\CF_lewisyoffset*\CF_lewiscurrentoffset}%
-						\CF_expafter{\draw[}\CF_lewisstyle]%
-							(\CF_lewisx pt+\CF_lewislength*\CF_lewisyoffset/2 pt,\CF_lewisy-\CF_lewislength*\CF_lewisxoffset/2 pt)--
-							(\CF_lewisx pt+\CF_lewislength*\CF_lewisyoffset/2 pt+\CF_lewisxoffset*\CF_lewiswidthdouble,\CF_lewisy-\CF_lewislength*\CF_lewisxoffset/2 pt+\CF_lewisyoffset*\CF_lewiswidthdouble)--
-							(\CF_lewisx pt-\CF_lewislength*\CF_lewisyoffset/2 pt+\CF_lewisxoffset*\CF_lewiswidthdouble,\CF_lewisy+\CF_lewislength*\CF_lewisxoffset/2 pt+\CF_lewisyoffset*\CF_lewiswidthdouble)--
-							(\CF_lewisx pt-\CF_lewislength*\CF_lewisyoffset/2 pt,\CF_lewisy+\CF_lewislength*\CF_lewisxoffset/2 pt)--cycle;%
-					\else
-						\if:\expandafter\CF_firsttonil\CF_lewisremainpos\relax\_nil
-							\edef\CF_lewisremainpos{\expandafter\CF_gobarg\CF_lewisremainpos}%
-							\pgfmathsetmacro\CF_lewisx{\CF_lewisx pt+\CF_lewisxoffset*\CF_lewiscurrentoffset}%
-							\pgfmathsetmacro\CF_lewisy{\CF_lewisy pt+\CF_lewisyoffset*\CF_lewiscurrentoffset}%
-							\CF_expafter{\draw[fill,black,}{\CF_lewisstyle]}%
-								(\CF_lewisx pt+\CF_lewisdist*\CF_lewisyoffset/2 pt,\CF_lewisy-\CF_lewisdist*\CF_lewisxoffset/2 pt)circle(\CF_lewisradius)%
-								(\CF_lewisx pt-\CF_lewisdist*\CF_lewisyoffset/2 pt,\CF_lewisy+\CF_lewisdist*\CF_lewisxoffset/2 pt)circle(\CF_lewisradius);%
-						\else
-							\pgfmathsetmacro\CF_lewisx{\CF_lewisx pt+\CF_lewisxoffset*\CF_lewiscurrentoffset}%
-							\pgfmathsetmacro\CF_lewisy{\CF_lewisy pt+\CF_lewisyoffset*\CF_lewiscurrentoffset}%
-							\CF_expafter{\draw[}\CF_lewisstyle]%
-								(\CF_lewisx pt+\CF_lewislength*\CF_lewisyoffset/2 pt,\CF_lewisy-\CF_lewislength*\CF_lewisxoffset/2 pt)--%
-								(\CF_lewisx pt-\CF_lewislength*\CF_lewisyoffset/2 pt,\CF_lewisy+\CF_lewislength*\CF_lewisxoffset/2 pt);%
-						\fi
-					\fi
-				\fi
-		\repeat
-		\node[anchor=base west]at(CF_lewis@anchor){\box\CF_boxlewis};%
-	\endtikzpicture
-}
-
-\def\Chembelow{\begingroup\let\CF_temp\CF_gobarg\CF_chembelowa}
-
-\def\chembelow{\begingroup\let\CF_temp\CF_id\CF_chembelowa}
-
-\def\CF_chembelowa{\CF_testopt\CF_chembelowb\CF_stacksep}
-
-\def\CF_chembelowb[#1]#2#3{%
-	\setbox\CF_box\hbox{\printatom{#2}}%
-	\expandafter\vtop\CF_temp{to\ht\CF_box}{%
-		\offinterlineskip
-		\hbox{\printatom{#2}}%
-		\kern#1\relax
-		\hbox to\wd\CF_box{\hss\printatom{#3}\hss}%
-		\CF_temp\vss
-		}%
-	\endgroup
-}
-
-\def\Chemabove{\begingroup\let\CF_temp\CF_gobarg\CF_chemabovea}
-
-\def\chemabove{\begingroup\let\CF_temp\CF_id\CF_chemabovea}
-
-\def\CF_chemabovea{\CF_testopt\CF_chemaboveb\CF_stacksep}
-
-\def\CF_chemaboveb[#1]#2#3{%
-	\setbox\CF_box\hbox{\printatom{#2}}%
-	\expandafter\vbox\CF_temp{to\ht\CF_box}{%
-		\offinterlineskip
-		\CF_temp\vss
-		\hbox to\wd\CF_box{\hss\printatom{#3}\hss}%
-		\kern#1\relax
-		\hbox{\printatom{#2}}%
-	}%
-	\endgroup
-}
-
-\def\chemmove{\CF_testopt\CF_chemmove{}}
-
-\def\CF_chemmove[#1]#2{%
-	\CF_doifnotempty{#2}%
-		{\expandafter\tikzpicture\romannumeral
-			\CF_ifempty{#1}%
-				{\CF_zero[overlay,remember picture,-CF]}
-				{\CF_zero[overlay,remember picture,-CF,#1]}%
-			#2
-		\endtikzpicture
-		}%
-}
-
-\def\chemnameinit#1{%
-	\setbox\CF_boxstuff\hbox{#1}%
-	\xdef\CF_dpmax{\the\dp\CF_boxstuff}%
-}
-\let\CF_dpmax\CF_zero
-
-\def\CF_parsemolname#1\\#2\_nil{%
-	\hbox to\CF_wdstuffbox{\hss#1\hss}%
-	\CF_doifnotempty{#2}{\CF_parsemolname#2\_nil}%
-}
-
-\def\chemname{%
-	\CF_ifstar
-		{\CF_adjustnamedpfalse\CF_chemnamea}
-		{\CF_adjustnamedptrue \CF_chemnamea}%
-}
-
-\def\CF_chemnamea{\CF_testopt\CF_chemnameb{1.5ex}}
-
-\def\CF_chemnameb[#1]#2#3{%
-	\setbox\CF_boxstuff\hbox{#2}%
-	\edef\CF_wdstuffbox{\the\wd\CF_boxstuff}\edef\CF_dpstuffbox{\the\dp\CF_boxstuff}%
-	\leavevmode
-	\ifdim\CF_dpmax<\CF_dpstuffbox\global\let\CF_dpmax\CF_dpstuffbox\fi
-	\vtop{%
-		\box\CF_boxstuff
-		\nointerlineskip
-		\kern\dimexpr#1\ifCF_adjustnamedp+\CF_dpmax-\CF_dpstuffbox\fi\relax
-		\CF_parsemolname#3\\\_nil
-	}%
-}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%           S C H � M A S      R � A C T I O N N E L S           %%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\let\CF_schemenest\CF_zero
-
-\def\CF_subscheme{\CF_testopt\CF_subschemea{}}
-\def\CF_subschemea[#1]{\CF_testopt{\CF_subschemeb[#1]}{text}}
-\def\CF_subschemeb[#1][#2]#3{\schemestart[#1][#2]#3\schemestop}
-
-\def\chemleft#1#2\chemright#3{%
-	\leavevmode
-	\begingroup
-		\setbox0\hbox{$\vcenter{\hbox{}}$}\edef\CF_delimmathht{\the\ht0}%
-		\setbox0\hbox{#2}\edef\CF_delimdim{\the\dimexpr(\ht0+\dp0)/2}%
-		\edef\CF_delimshift{\the\dimexpr(\ht0-\dp0)/2-\CF_delimmathht}%
-		\raise\CF_delimshift\hbox{$\left#1\vrule height\CF_delimdim depth\CF_delimdim width0pt\right.$}\box0
-		\raise\CF_delimshift\hbox{$\left.\vrule height\CF_delimdim depth\CF_delimdim width0pt\right#3$}%
-	\endgroup
-}
-
-\def\chemright#1{%
-	\CF_warning{"\string\chemright\string#1" ignored! No \string\chemleft\space previously found.}%
-}
-
-\def\chemup#1#2\chemdown#3{%
-	\begingroup
-		\setbox0\hbox{\printatom{#2}}\edef\CF_delimdim{\the\dimexpr\wd0/2}%
-		\tikzpicture[every node/.style={inner sep=0pt,outer sep=0pt,minimum size=0pt},baseline]%
-			\node[anchor=base west](chem@stuff){\box0};%
-			\node[at=(chem@stuff.north),anchor=east,rotate=-90]{$\left#1\vrule height\CF_delimdim depth\CF_delimdim width0pt\right.$};%
-			\node[at=(chem@stuff.south),anchor=west,rotate=-90]{$\left.\vrule height\CF_delimdim depth\CF_delimdim width0pt\right#3$};%
-		\endtikzpicture
-	\endgroup
-}
-
-\def\chemdown#1{%
-	\CF_warning{"\string\chemdown\string#1" ignored! No \string\chemup\space previously found.}%
-}
-
-\def\CF_setstyle#1,#2,#3\_nil#4#5#6{%
-	\def#4{#1}\let#5\empty\let#6\empty
-	\CF_iffirsttokmatch\CF_quark{#2\relax}
-		{}%
-		{\def#5{#2}%
-		\CF_iffirsttokmatch\CF_quark{#3\relax}
-			{}%
-			{\CF_setstylea#3\_nil#6}%
-		}%
-}
-\def\CF_setstylea#1,\CF_quark#2\_nil#3{\def#3{#1}}
-
-\def\CF_and{\futurelet\CF_toksa\CF_anda}
-
-\def\CF_anda{%
-	\CF_ifx\CF_toksa\bgroup
-		{\CF_andb}
-		{\CF_andb{}}%
-}
-
-\def\CF_andb#1{%
-	\CF_setstyle#1,\CF_quark,\CF_quark\_nil\CF_signspaceante\CF_signspacepost\CF_signvshift
-	\CF_doifempty\CF_signspaceante{\CF_valuetomacro\CF_signspaceante[0.5em]{+ sep left}}%
-	\CF_doifempty\CF_signspacepost{\CF_valuetomacro\CF_signspacepost[0.5em]{+ sep right}}%
-	\CF_doifempty\CF_signvshift{\CF_valuetomacro\CF_signvshift[0pt]{+ vshift}}%
-	\raise\CF_signvshift\hbox{\kern\CF_signspaceante$+$\kern\CF_signspacepost}%
-}
-
-\def\schemestart{%
-	\begingroup
-	\xdef\CF_schemenest{\number\numexpr\CF_schemenest+1}%
-	\CF_testopt\CF_schemestarta{}%
-}
-
-\def\CF_schemestarta[#1]{%
-	\CF_valuetomacro\CF_defaultcompoundstyle[]{compound style}%
-	\CF_setstyle#1,\CF_quark,\CF_quark\_nil\CF_arrowangle\CF_arrowlength\CF_arrowstyle
-	\CF_doifempty\CF_arrowangle{\CF_valuetomacro\CF_arrowangle[0]{arrow angle}}%
-	\CF_doifempty\CF_arrowlength{\CF_valuetomacro\CF_arrowlength[1]{arrow coeff}}%
-	\CF_valuetomacro\CF_defaultarrowstyle[]{arrow style}%
-	\CF_valuetomacro\CF_arrowoffset[1em]{arrow offset}%
-	\CF_valuetomacro\CF_compoundsep[5em]{compound sep}%
-	\CF_valuetomacro\CF_arrowlabelsep[3pt]{arrow label sep}%
-	\CF_valuetomacro\CF_arrowhead[-CF]{arrow head}%
-	\CF_eexpsecond{\def\CF_arrowtip}{\expandafter\CF_gobarg\CF_arrowhead}%
-	\CF_eexpsecond{\CF_preaddtomacro\CF_defaultarrowstyle}{\useKV[chemfig]{arrow head},}%
-	\CF_ifx\empty\CF_arrowstyle
-		{\let\CF_arrowstyle\CF_defaultarrowstyle}
-		{\CF_expsecond{\CF_preaddtomacro\CF_arrowstyle}{\CF_defaultarrowstyle,}}% se rajoute apr�s le style par d�faut
-	\CF_valuetomacro\CF_arrowdoublesep[2pt]{arrow double sep}%
-	\pgfmathsetmacro\CF_arrowdoublesep{\CF_arrowdoublesep/2}%
-	\CF_valuetomacro\CF_arrowdoubleposstart[0.6]{arrow double coeff}%
-	\pgfmathsetmacro\CF_arrowdoubleposstart{(1-\CF_arrowdoubleposstart)/2}%
-	\pgfmathsetmacro\CF_arrowdoubleposend{1-\CF_arrowdoubleposstart}%
-	\ifboolKV[chemfig]{scheme debug}
-		{\tikzpicture[every node/.style={draw,anchor=base,inner sep=0pt,outer sep=0pt,minimum size=1.5pt},baseline,remember picture]}
-		{\tikzpicture[every node/.style={anchor=base,inner sep=0pt,outer sep=0pt,minimum size=0pt},baseline,remember picture]}%
-	\let\merge\CF_merge
-	\expandafter\let\csname+\endcsname\CF_and
-	\let\arrow\CF_arrow
-	\let\schemestop\CF_schemestop
-	\let\subscheme\CF_subscheme
-	\CF_testopt{\CF_schemestartb}{text}%
-}
-
-\def\CF_schemestartb[#1]{%
-	\ifnum\CF_schemenest=1 % la commande n'est pas imbriqu�e ?
-		\CF_cntcompound0
-	\fi
-	\edef\CF_currentnodename{c\number\CF_cntcompound}%
-	\let\CF_nextnodename\empty
-	\let\CF_nextnodestyle\empty
-	\let\CF_directarrowlist\empty
-	\ifboolKV[chemfig]{scheme debug}
-		{\node[fill,green](\CF_currentnodename){};}
-		{\node(\CF_currentnodename){};}%
-	\def\CF_nextnodeanchor{#1}%
-	\CF_doifempty\CF_nextnodeanchor{\def\CF_nextnodeanchor{text}}%
-	\let\CF_compound\empty
-	\CF_schemestartc
-}
-
-\def\CF_schemestartc{%
-	\futurelet\CF_toksa\CF_schemestarte
-}
-
-\expandafter\def\expandafter\CF_schemestartd\space{\futurelet\CF_toksa\CF_schemestarte}
-
-\def\CF_schemestarte{% ... et l'examine :
-	\CF_iffirsttokina{\arrow\schemestop\merge}%
-		{}
-		{\CF_ifx\CF_toksa\bgroup
-			{\CF_addnextarg
-			}
-			{\CF_ifx\CF_toksa\CF_sptoken
-				{\CF_addtomacro\CF_compound{ }%
-				\CF_schemestartd
-				}
-				{\afterassignment\CF_schemestartc
-				\CF_addtomacro\CF_compound
-				}%
-			}%
-		}%
-}
-
-\def\CF_addnextarg#1{\CF_addtomacro\CF_compound{{#1}}\CF_schemestartc}
-
-\def\CF_displaycompound#1#2{% #1 = nom et #2 = style
-	\CF_doifnotempty\CF_compound
-		{\global\advance\CF_cntcompound1
-		\CF_ifx\CF_defaultcompoundstyle\empty
-			{\let\CF_currentnodestyle\empty}
-			{\CF_expsecond{\def\CF_currentnodestyle}{\CF_defaultcompoundstyle,}}%
-		\CF_addtomacro\CF_currentnodestyle{anchor=\CF_nextnodeanchor,at=(\CF_currentnodename)}%
-		\CF_ifempty{#2}%
-			{\CF_doifnotempty\CF_nextnodestyle
-				{\CF_eaddtomacro\CF_currentnodestyle{\expandafter,\CF_nextnodestyle}}%
-			}
-			{\CF_doifnotempty\CF_nextnodestyle
-				{\CF_warning{two styles for the same node, first style "\CF_nextnodestyle" ignored}%
-				}%
-			\CF_addtomacro\CF_currentnodestyle{,#2}%
-			}%
-		\CF_ifempty{#1}
-			{\edef\CF_temp{%
-				\CF_ifempty\CF_nextnodename
-					{c\number\CF_cntcompound}
-					{\CF_nextnodename}%
-				}%
-			}
-			{\CF_doifnotempty\CF_nextnodename
-				{\CF_warning{two names for the same node, first name "\CF_nextnodename" ignored}%
-				}%
-			\edef\CF_temp{#1}%
-			}%
-		\CF_expafter{\node[}\CF_currentnodestyle](\CF_temp){\CF_compound};%
-		\ifboolKV[chemfig]{scheme debug}%
-			{\node[draw=none,anchor=270,at=(\CF_temp.90),fill=green!60,overlay,opacity=0.5]{\scriptsize\bfseries\CF_temp};%
-			}
-			{}%
-		\let\CF_currentnodename\CF_temp
-		}%
-}
-
-\def\CF_schemestop{%
-	\CF_displaycompound{}{}%
-	\CF_directarrowlist
-	\endtikzpicture
-	\xdef\CF_schemenest{\number\numexpr\CF_schemenest-1}%
-	\endgroup
-}
-
-\def\CF_analysearrowarg#1{\CF_analysearrowarga#1[]\_nil}
-
-\def\CF_analysearrowarga#1[#2]#3\_nil{%
-	\CF_ifinstr{#1}.
-		{\CF_addtomacro\CF_temp{#1[#2]}}
-		{\CF_addtomacro\CF_temp{#1.[#2]}}%
-}
-
-\def\CF_arrow{%
-	\CF_ifnextchar(%
-		{\CF_arrowa
-		}
-		{\CF_ifnextchar\bgroup
-			{\CF_arrowb(.[]--.[])}
-			{\CF_arrowb(.[]--.[]){}}%
-		}%
-}
-
-\def\CF_arrowa(#1--#2){%
-	\def\CF_temp{(}%
-	\CF_analysearrowarg{#1}%
-	\CF_addtomacro\CF_temp{--}%
-	\CF_analysearrowarg{#2}%
-	\CF_addtomacro\CF_temp)%
-	\CF_ifnextchar\bgroup
-		{\expandafter\CF_arrowb\CF_temp}
-		{\expandafter\CF_arrowb\CF_temp{}}%
-}
-
-\def\CF_arrowb(#1.#2[#3]--#4.#5[#6])#7{%
-	\def\CF_currentarrowtype{#7}% nom de la fl�che
-	\CF_doifempty\CF_currentarrowtype{\def\CF_currentarrowtype{->}}%
-	\CF_testopt{\CF_arrowc(#1.#2[#3]--#4.#5[#6])}{}%
-}
-
-\def\CF_arrowc(#1.#2[#3]--#4.#5[#6])[#7]{%
-	\def\CF_temp{\CF_arrowe(#1.#2[#3]--#4.#5[#6])}%
-	\CF_arrowd#7,\empty,\empty\_nil
-}
-
-\def\CF_arrowd#1,#2,#3\_nil{%
-	\CF_addtomacro\CF_temp{{#1}}%
-	\CF_eaddtomacro\CF_temp{\expandafter{#2}}%
-	\expandafter\CF_eaddtomacro\expandafter\CF_temp\expandafter{\expandafter\expandafter\expandafter{\expandafter\CF_sanitizelastitem#3,\empty\_nil}}%
-	\CF_temp
-}
-
-% #1, #4 : nom des nodes    #2, #5 : ancres des nodes    #3, #6 : styles des nodes
-% #7 : angle fl�che    #8 : longueur fl�che    #9 : style tikz de la fl�che
-\def\CF_arrowe(#1.#2[#3]--#4.#5[#6])#7#8#9{%
-	\let\CF_arrowcurrentstyle\CF_arrowstyle
-	\if @\expandafter\CF_firsttonil\detokenize{#1.}\_nil% si #1 commence par @
-		\if @\expandafter\CF_firsttonil\detokenize{#4.}\_nil
-			\CF_eaddtomacro\CF_directarrowlist{\expandafter\CF_directarrow\expandafter{\CF_currentarrowtype}{#1}{#2}{#4}{#5}{#9}}%
-			\let\CF_nextaction\CF_schemestartc
-		\else
-			\CF_doifnotempty\CF_arrowcurrentstyle{\CF_addtomacro\CF_arrowcurrentstyle,}%
-			\CF_doifnotempty{#9}{\CF_addtomacro\CF_arrowcurrentstyle{#9,}}%
-			\CF_displaycompound{}{#3}%
-			\def\CF_nextnodename{#4}%
-			\CF_expsecond{\def\CF_currentnodename}{\CF_gobarg#1}%
-			\let\CF_arrowstartname\CF_currentnodename
-			\let\CF_arrowendname\CF_nextnodename
-			\CF_arrowf{#7}{#8}{#2}{#5}%
-			\def\CF_nextnodestyle{#6}%
-		\fi
-	\else
-		\CF_doifnotempty\CF_arrowcurrentstyle{\CF_addtomacro\CF_arrowcurrentstyle,}%
-		\CF_doifnotempty{#9}{\CF_addtomacro\CF_arrowcurrentstyle{#9,}}%
-		\if @\expandafter\CF_firsttonil\detokenize{#2.}\_nil
-			\CF_error{syntax "(<name>--@<name>)" is not allowed}%
-		\else
-			\CF_displaycompound{#1}{#3}%
-			\edef\CF_arrowstartname{%
-				\CF_ifempty{#1}
-					\CF_currentnodename
-					{#1}%
-				\CF_doifnotempty{#2}{.#2}%
-			}%
-			\CF_arrowf{#7}{#8}{#2}{#5}%
-			\def\CF_nextnodename{#4}%
-			\def\CF_nextnodestyle{#6}%
-		\fi
-	\fi
-	\CF_arrowgobspaces% mange les espaces puis ex�cute \CF_nextaction
-}
-
-\def\CF_arrowgobspaces{\futurelet\CF_toksa\CF_arrowgobspacesa}
-
-\def\CF_arrowgobspacesa{%
-	\CF_ifx\CF_sptoken\CF_toksa
-		\CF_arrowgobspacesb
-		\CF_nextaction
-}
-
-\expandafter\def\expandafter\CF_arrowgobspacesb\space{\futurelet\CF_toksa\CF_arrowgobspacesa}
-
-\def\CF_arrowf#1#2#3#4{% #1=angle   #2=longueur    #3=ancre d�part   #4=ancre arriv�e
-	\def\CF_nextaction{\let\CF_compound\empty\CF_schemestartc}%
-	\def\CF_arrowcurrentangle{#1}\CF_doifempty\CF_arrowcurrentangle{\let\CF_arrowcurrentangle\CF_arrowangle}%
-	\def\CF_currentarrowlength{#2}\CF_doifempty\CF_currentarrowlength{\let\CF_currentarrowlength\CF_arrowlength}%
-	\node[at=(\CF_currentnodename.\CF_ifempty{#3}\CF_arrowcurrentangle{#3}),shift=(\CF_arrowcurrentangle:\CF_currentarrowlength*\CF_compoundsep),cyan,fill](end@arrow@i@\number\CF_schemenest){};%
-	\edef\CF_arrowendname{end@arrow@i@\number\CF_schemenest\CF_doifnotempty{#4}{.#4}}%
-	\ifboolKV[chemfig]{scheme debug}
-		{\node[at=(\CF_currentnodename.\CF_ifempty{#3}\CF_arrowcurrentangle{#3}),shift=(\CF_arrowcurrentangle:\CF_arrowoffset),red,fill](start@arrow){};%
-		\node[at=(\CF_currentnodename.\CF_ifempty{#3}\CF_arrowcurrentangle{#3}),shift=(\CF_arrowcurrentangle:\CF_currentarrowlength*\CF_compoundsep-\CF_arrowoffset),red,fill](end@arrow){};%
-		}
-		{\node[at=(\CF_currentnodename.\CF_ifempty{#3}\CF_arrowcurrentangle{#3}),shift=(\CF_arrowcurrentangle:\CF_arrowoffset)](start@arrow){};%
-		\node[at=(\CF_currentnodename.\CF_ifempty{#3}\CF_arrowcurrentangle{#3}),shift=(\CF_arrowcurrentangle:\CF_currentarrowlength*\CF_compoundsep-\CF_arrowoffset)](end@arrow){};%
-		}%
-	\def\CF_arrowstartnode{start@arrow}\def\CF_arrowendnode{end@arrow}%
-	\csname\expandafter\CF_grabarrowname\CF_currentarrowtype[\_nil\CF_threeea\endcsname
-		\expandafter\CF_grabarrowargs\CF_currentarrowtype[]\_nil[][][][][][][][]\_nil
-	\def\CF_currentnodename{end@arrow@i@\number\CF_schemenest}%
-	\edef\CF_nextnodeanchor{\CF_ifempty{#4}{180+\CF_arrowcurrentangle}{#4}}%
-}
-
-% trace un fl�che initi�e par (@nom--@nom)
-% #1=type de fl�che   #2=nom depart   #3=ancre d�part    #4=nom arriv�e    #5=ancre arriv�e    #6=style fl�che
-\def\CF_directarrow#1#2#3#4#5#6{%
-	\CF_expsecond{\def\CF_arrowstartname}{\CF_gobarg#2}%
-	\CF_expsecond{\def\CF_arrowendname}{\CF_gobarg#4}%
-	\path[sloped,allow upside down](\CF_gobarg#2\ifx\empty#3\empty\else.#3\fi)--(\CF_gobarg#4\ifx\empty#5\empty\else.#5\fi)%
-		coordinate[pos=0,xshift=\CF_arrowoffset](start@direct@arrow)%
-		coordinate[pos=1,xshift=-\CF_arrowoffset](end@direct@arrow);%
-	\def\CF_arrowstartnode{start@direct@arrow}%
-	\def\CF_arrowendnode{end@direct@arrow}%
-	\pgfmathanglebetweenpoints
-		{\pgfpointanchor{\CF_gobarg#2}{\ifx\empty#3\empty center\else#3\fi}}% Ne pas utiliser \CF_ifempty ici !!!
-		{\pgfpointanchor{\CF_gobarg#4}{\ifx\empty#5\empty center\else#5\fi}}%
-	\let\CF_arrowcurrentangle\pgfmathresult
-	\CF_doifnotempty{#6}{\CF_addtomacro\CF_arrowcurrentstyle{#6,}}%
-	\csname\CF_grabarrowname#1[]\_nil\expandafter\endcsname\CF_grabarrowargs#1[]\_nil[][][][][][][][]\_nil
-}
-
-\def\CF_mergegrabchardir#1[#2][#3]#4\_nil{%
-	\CF_expafter{\futurelet\CF_toksa\CF_gobtonil}{\CF_firsttonil#1>\_nil}\_nil
-	\ifx>\CF_toksa
-		\def\CF_mergeangle{0}\def\CF_mergeextreme{xmax}\def\CF_mergesign{+}%
-	\else
-	\ifx<\CF_toksa
-		\def\CF_mergeangle{180}\def\CF_mergeextreme{xmin}\def\CF_mergesign{-}%
-	\else
-	\ifx^\CF_toksa
-		\def\CF_mergeangle{90}\def\CF_mergeextreme{ymax}\def\CF_mergesign{+}%
-	\else
-	\ifx v\CF_toksa
-		\def\CF_mergeangle{-90}\def\CF_mergeextreme{ymin}\def\CF_mergesign{-}%
-	\fi\fi\fi\fi
-	\def\CF_mergelabelup{#2}\def\CF_mergelabeldo{#3}%
-}
-
-\def\CF_merge#1({%
-	\CF_mergegrabchardir#1[][]\_nil
-	\CF_mergea(%
-}
-
-\def\CF_mergea#1--(#2){\CF_testopt{\CF_mergeb#1--(#2)}{}}
-
-\def\CF_mergeb#1--(#2)[#3]{%
-	\CF_displaycompound{}{}%
-	\CF_parsemergeopt#3,\CF_quark,\CF_quark,\CF_quark\_nil
-	\def\CF_mergexmax{-16383.99999pt}\let\CF_mergeymax\CF_mergexmax
-	\def\CF_mergexmin{16383.99999pt}\let\CF_mergeymin\CF_mergexmin
-	\CF_mergeparsenodelist#1(\relax)% calcule les maxi des positions
-	\pgfmathsetmacro\CF_mergeextremeresult{\csname CF_merge\CF_mergeextreme\endcsname\CF_mergesign\CF_mergefromcoeff*\CF_compoundsep}%
-	\CF_mergec#1(\relax)% trace les lignes entre les noeuds pr�c�dents et la ligne de jonction
-	\CF_expsecond{\def\CF_temp}{\expandafter[\CF_mergestyle,shorten <=0,shorten >=0,-]}%
-	\if x\expandafter\CF_firsttonil\CF_mergeextreme\_nil
-		\CF_addtomacro\CF_temp{(\CF_mergeextremeresult pt,\CF_mergeymax)--(\CF_mergeextremeresult pt,\CF_mergeymin)}%
-	\else
-		\CF_addtomacro\CF_temp{(\CF_mergexmin,\CF_mergeextremeresult pt)--(\CF_mergexmax,\CF_mergeextremeresult pt)}%
-	\fi
-	\expandafter\draw\CF_temp node[pos=\CF_mergesplitcoeff](merge@point){}% trace la ligne de jonction
-		node[at=(merge@point),shift=(\CF_mergeangle:\CF_compoundsep*\CF_mergetocoeff-\CF_arrowoffset)](end@merge){}%
-		node[at=(merge@point),shift=(\CF_mergeangle:\CF_compoundsep*\CF_mergetocoeff)](end@merge@i){};%
-	\let\CF_arrowcurrentangle\CF_mergeangle
-	\CF_expafter{\draw[}\CF_mergestyle,shorten <=0](merge@point)--(end@merge)%
-		\expandafter\CF_arrowdisplaylabela\expandafter{\CF_mergelabelup}{.5}+\expandafter\CF_arrowdisplaylabela\expandafter{\CF_mergelabeldo}{.5}-;%
-	\def\CF_currentnodename{end@merge@i}%
-	\let\CF_temp\empty
-	\CF_analysearrowarg{#2}%
-	\expandafter\CF_merged\CF_temp\_nil
-}
-
-\def\CF_mergec(#1){%
-	\if\relax\expandafter\noexpand\CF_firsttonil#1\_nil
-	\else
-		\CF_ifdot{#1}%
-			{\edef\merge_currentnodename{\CF_beforedot#1\_nil}%
-			\edef\merge_currentanchor{\CF_afterdot#1\_nil}%
-			}%
-			{\def\merge_currentnodename{#1}%
-			\let\merge_currentanchor\CF_mergeangle
-			}%
-		\if x\expandafter\CF_firsttonil\CF_mergeextreme\_nil
-			\pgfextracty\CF_dim{\pgfpointanchor\merge_currentnodename\merge_currentanchor}%
-			\CF_expafter{\draw[}\CF_mergestyle,shorten >=0,-]([shift=(\CF_mergeangle:\CF_arrowoffset)]\merge_currentnodename.\merge_currentanchor)--(\CF_mergeextremeresult pt,\CF_dim);%
-		\else
-			\pgfextractx\CF_dim{\pgfpointanchor\merge_currentnodename\merge_currentanchor}%
-			\CF_expafter{\draw[}\CF_mergestyle,shorten >=0,-]([shift=(\CF_mergeangle:\CF_arrowoffset)]\merge_currentnodename.\merge_currentanchor)--(\CF_dim,\CF_mergeextremeresult pt);%
-		\fi
-		\expandafter\CF_mergec
-	\fi
-}
-
-\def\CF_merged#1.#2[#3]\_nil{%
-	\def\CF_nextnodename{#1}%
-	\edef\CF_nextnodeanchor{%
-		\CF_ifempty{#2}
-			{180+\CF_mergeangle}
-			{#2}%
-		}%
-	\def\CF_nextnodestyle{#3}%
-	\let\CF_compound\empty
-	\CF_schemestartc
-}
-
-\def\CF_parsemergeopt#1,#2,#3,#4\_nil{%
-	\CF_ifempty{#1}
-		{\def\CF_mergefromcoeff{0.5}}
-		{\def\CF_mergefromcoeff{#1}}%
-	\def\CF_mergetocoeff{0.5}%
-	\def\CF_mergesplitcoeff{0.5}%
-	\CF_eexpsecond{\def\CF_mergestyle}{\useKV[chemfig]{arrow head}}%
-	\CF_iffirsttokmatch\CF_quark{#2\relax}
-		{}
-		{\CF_ifempty{#2}
-			{\def\CF_mergetocoeff{0.5}}
-			{\def\CF_mergetocoeff{#2}}%
-		\CF_iffirsttokmatch\CF_quark{#3\relax}
-			{}
-			{\CF_ifempty{#3}
-				{\def\CF_mergesplitcoeff{0.5}}
-				{\def\CF_mergesplitcoeff{#3}}%
-			\CF_iffirsttokmatch\CF_quark{#4\relax}
-				{}
-				{\CF_parsemergeopta#4\_nil}%
-			}%
-		}%
-}
-
-\def\CF_parsemergeopta#1,\CF_quark#2\_nil{%
-	\CF_ifempty{#1}
-		{}
-		{\CF_addtomacro\CF_mergestyle{,#1}}%
-}
-
-\def\CF_mergeparsenodelist(#1){%
-	\if\relax\expandafter\noexpand\CF_firsttonil#1\_nil
-	\else
-		\CF_ifdot{#1}%
-			{\edef\merge_currentnodename{\CF_beforedot#1\_nil}\edef\merge_currentanchor{\CF_afterdot#1\_nil}}%
-			{\def\merge_currentnodename{#1}\let\merge_currentanchor\CF_mergeangle}%
-		\pgfextractx\CF_dim{\pgfpointanchor\merge_currentnodename\merge_currentanchor}%
-		\ifdim\CF_dim>\CF_mergexmax
-			\edef\CF_mergexmax{\the\CF_dim}%
-		\fi
-		\ifdim\CF_dim<\CF_mergexmin
-			\edef\CF_mergexmin{\the\CF_dim}%
-		\fi
-		\pgfextracty\CF_dim{\pgfpointanchor\merge_currentnodename\merge_currentanchor}%
-		\ifdim\CF_dim>\CF_mergeymax
-			\edef\CF_mergeymax{\the\CF_dim}%
-		\fi
-		\ifdim\CF_dim<\CF_mergeymin
-			\edef\CF_mergeymin{\the\CF_dim}%
-		\fi
-		\expandafter\CF_mergeparsenodelist
-	\fi
-}
-
-\def\CF_grabarrowname#1[#2\_nil{\detokenize{CF_arrow(#1)}}
-\def\CF_grabarrowargs#1[#2\_nil{[#2}
-
-\def\CF_makeparametertext#1{%
-	\toks0{}%
-	\CF_cntgroup#1\relax
-	\CF_makeparametertexta1%
-}
-
-\def\CF_makeparametertexta#1{%
-	\unless\ifnum#1>\CF_cntgroup
-		\toks0\expandafter{\the\toks0[###1]}%
-		\expandafter\CF_makeparametertexta\expandafter{\number\numexpr#1+1\expandafter}%
-	\fi
-}
-
-% #1 est le nombre d'arguments optionnels, #2 est le nom et #3 le code
-\def\definearrow#1#2#3{%
-	\begingroup
-		\CF_makeparametertext{#1}%
-	\expandafter\endgroup
-	\expandafter\def\csname\detokenize{CF_arrow(#2)}\expandafter\endcsname\the\toks0{#3\CF_gobtonil}%
-}
-
-\def\CF_ifdot#1{\CF_ifdota#1.\_nil}
-\def\CF_ifdota#1.#2\_nil{\ifx\empty#2\empty\expandafter\CF_execsecond\else\expandafter\CF_execfirst\fi}
-\def\CF_beforedot#1.#2\_nil{#1}
-\def\CF_afterdot#1.#2\_nil{#2}
-
-\def\CF_rotatenode*#1#2\_nil{%
-	\CF_ifdot{#1}
-		{\CF_beforedot#1\_nil}
-		{#1}%
-}
-\def\CF_anchornode*#1#2\_nil#3{%
-	\CF_ifdot{#1}
-		{\CF_afterdot#1\_nil}
-		{\CF_arrowcurrentangle-#390-#1}%
-}
-
-% #1 = label  #2 = position  #3 = + ou - (au dessus ou au dessous)  #4 : nom du noeud de d�part
-% #5 = label  #6 = position  #7 = + ou - (au dessus ou au dessous)  #8 : nom du noeud de fin
-\def\CF_arrowdisplaylabel#1#2#3#4#5#6#7#8{%
-	\CF_doifnotempty{#1#5}
-		{\path(#4)--(#8)\CF_arrowdisplaylabela{#1}{#2}{#3}\CF_arrowdisplaylabela{#5}{#6}{#7};}%
-}
-
-\def\CF_arrowdisplaylabela#1#2#3{%
-	\CF_doifnotempty{#1}
-		{\if*\expandafter\CF_firsttonil\detokenize{#1}\_nil
-			\ifboolKV[chemfig]{scheme debug}
-				{node[pos=#2,sloped,yshift=#3\CF_arrowlabelsep,draw,fill,cyan](shifted@node){}%
-				node[draw,rotate=\CF_rotatenode#1\_nil,anchor=\CF_anchornode#1\_nil#3,at=(shifted@node)]{\expandafter\CF_gobarg\CF_gobarg#1}%
-				}
-				{node[pos=#2,sloped,yshift=#3\CF_arrowlabelsep](shifted@node){}%
-				node[rotate=\CF_rotatenode#1\_nil,anchor=\CF_anchornode#1\_nil#3,at=(shifted@node)]{\expandafter\CF_gobarg\CF_gobarg#1}%
-				}%
-		\else
-			\ifboolKV[chemfig]{scheme debug}
-				{node[pos=#2,sloped,yshift=#3\CF_arrowlabelsep,draw,fill,cyan](shifted@node){}%
-				node[draw,pos=#2,anchor=-#390,sloped,yshift=#3\CF_arrowlabelsep]{#1}%
-				}
-				{node[pos=#2,anchor=-#390,sloped,yshift=#3\CF_arrowlabelsep]{#1}%
-				}
-		\fi
-		}%
-}
-
-% pose des noeuds d�cal�s de la dimension #1 � (\CF_arrowstartnode) et (\CF_arrowendnode)
-\def\CF_arrowshiftnodes#1{%
-	\unless\ifdim\CF_ifempty{#1}\CF_zero{#1}=0pt
-		\edef\CF_temp{%
-			\noexpand\path(\CF_arrowstartnode)--(\CF_arrowendnode)%
-			node[pos=0,sloped,yshift=#1](\CF_arrowstartnode1){}node[pos=1,sloped,yshift=#1](\CF_arrowendnode1){};}%
-		\CF_temp
-		\edef\CF_arrowstartnode{\CF_arrowstartnode1}\edef\CF_arrowendnode{\CF_arrowendnode1}%
-	\fi
-}
-
-\definearrow3{->}{%
-	\CF_arrowshiftnodes{#3}%
-	\CF_expafter{\draw[}\CF_arrowcurrentstyle](\CF_arrowstartnode)--(\CF_arrowendnode);%
-	\CF_arrowdisplaylabel{#1}{0.5}+\CF_arrowstartnode{#2}{0.5}-\CF_arrowendnode
-}
-
-\definearrow3{<-}{%
-	\CF_arrowshiftnodes{#3}%
-	\CF_expafter{\draw[}\CF_arrowcurrentstyle](\CF_arrowendnode)--(\CF_arrowstartnode);%
-	\CF_arrowdisplaylabel{#1}{0.5}+\CF_arrowstartnode{#2}{0.5}-\CF_arrowendnode
-}
-
-\definearrow5{-/>}{%
-	\CF_arrowshiftnodes{#3}%
-	\CF_expafter{\draw[}\CF_arrowcurrentstyle](\CF_arrowstartnode)--(\CF_arrowendnode)%
-		coordinate[midway,shift=(\CF_arrowcurrentangle:-1pt)](midway@i)%
-		coordinate[midway,shift=(\CF_arrowcurrentangle:1pt)](midway@ii)%
-		coordinate[at=(midway@i),shift=(\CF_ifempty{#4}{225}{#4+180}+\CF_arrowcurrentangle:\CF_ifempty{#5}{5pt}{#5})](line@start)%
-		coordinate[at=(midway@i),shift=(\CF_ifempty{#4}{45}{#4}+\CF_arrowcurrentangle:\CF_ifempty{#5}{5pt}{#5})](line@end)%
-		coordinate[at=(midway@ii),shift=(\CF_ifempty{#4}{225}{#4+180}+\CF_arrowcurrentangle:\CF_ifempty{#5}{5pt}{#5})](line@start@i)%
-		coordinate[at=(midway@ii),shift=(\CF_ifempty{#4}{45}{#4}+\CF_arrowcurrentangle:\CF_ifempty{#5}{5pt}{#5})](line@end@i);
-	\draw(line@start)--(line@end);%
-	\draw(line@start@i)--(line@end@i);%
-	\CF_arrowdisplaylabel{#1}{0.5}+\CF_arrowstartnode{#2}{0.5}-\CF_arrowendnode
-}
-
-\definearrow3{<->}{%
-	\CF_arrowshiftnodes{#3}%
-	\CF_expafter{\draw[}\CF_arrowcurrentstyle,\CF_arrowtip-\CF_arrowtip](\CF_arrowstartnode)--(\CF_arrowendnode);%
-	\CF_arrowdisplaylabel{#1}{0.5}+\CF_arrowstartnode{#2}{0.5}-\CF_arrowendnode
-}
-
-\definearrow3{<=>}{%
-	\CF_arrowshiftnodes{#3}%
-	\path[allow upside down](\CF_arrowstartnode)--(\CF_arrowendnode)%
-			node[pos=0,sloped,yshift=\CF_arrowdoublesep](\CF_arrowstartnode @u0){}%
-			node[pos=0,sloped,yshift=-\CF_arrowdoublesep](\CF_arrowstartnode @d0){}%
-			node[pos=1,sloped,yshift=\CF_arrowdoublesep](\CF_arrowstartnode @u1){}%
-			node[pos=1,sloped,yshift=-\CF_arrowdoublesep](\CF_arrowstartnode @d1){};%
-	\begingroup
-		\ifboolKV[chemfig]{arrow double harpoon}
-			{\pgfarrowharpoontrue}
-			{}%
-		\CF_expafter{\draw[}\CF_arrowcurrentstyle](\CF_arrowstartnode @u0)--(\CF_arrowstartnode @u1);%
-		\CF_expafter{\draw[}\CF_arrowcurrentstyle](\CF_arrowstartnode @d1)--(\CF_arrowstartnode @d0);%
-	\endgroup
-	\CF_arrowdisplaylabel{#1}{0.5}+\CF_arrowstartnode{#2}{0.5}-\CF_arrowendnode%
-}
-
-\definearrow3{<->>}{%
-	\CF_arrowshiftnodes{#3}%
-	\path[allow upside down](\CF_arrowstartnode)--(\CF_arrowendnode)%
-			node[pos=0,sloped,yshift=1pt](\CF_arrowstartnode @u0){}%
-			node[pos=\CF_arrowdoubleposstart,sloped,yshift=-1pt](\CF_arrowstartnode @d0){}%
-			node[pos=1,sloped,yshift=1pt](\CF_arrowstartnode @u1){}%
-			node[pos=\CF_arrowdoubleposend,sloped,yshift=-1pt](\CF_arrowstartnode @d1){};%
-	\begingroup
-		\ifboolKV[chemfig]{arrow double harpoon}
-			{\pgfarrowharpoontrue}
-			{}%
-		\CF_expafter{\draw[}\CF_arrowcurrentstyle](\CF_arrowstartnode @u0)--(\CF_arrowstartnode @u1);%
-		\CF_expafter{\draw[}\CF_arrowcurrentstyle](\CF_arrowstartnode @d1)--(\CF_arrowstartnode @d0);%
-	\endgroup
-	\CF_arrowdisplaylabel{#1}{0.5}+\CF_arrowstartnode{#2}{0.5}-\CF_arrowendnode%
-}
-
-\definearrow3{<<->}{%
-	\path[allow upside down](\CF_arrowstartnode)--(\CF_arrowendnode)%
-			node[pos=\CF_arrowdoubleposstart,sloped,yshift=1pt](\CF_arrowstartnode @u0){}%
-			node[pos=0,sloped,yshift=-1pt](\CF_arrowstartnode @d0){}%
-			node[pos=\CF_arrowdoubleposend,sloped,yshift=1pt](\CF_arrowstartnode @u1){}%
-			node[pos=1,sloped,yshift=-1pt](\CF_arrowstartnode @d1){};%
-	\begingroup
-		\ifboolKV[chemfig]{arrow double harpoon}
-			{\pgfarrowharpoontrue}
-			{}%
-		\CF_expafter{\draw[}\CF_arrowcurrentstyle](\CF_arrowstartnode @u0)--(\CF_arrowstartnode @u1);%
-		\CF_expafter{\draw[}\CF_arrowcurrentstyle](\CF_arrowstartnode @d1)--(\CF_arrowstartnode @d0);%
-	\endgroup
-	\CF_arrowdisplaylabel{#1}{0.5}+\CF_arrowstartnode{#2}{0.5}-\CF_arrowendnode
-}
-
-\definearrow30{%
-	\CF_arrowshiftnodes{#3}%
-	\CF_arrowdisplaylabel{#1}{0.5}+\CF_arrowstartnode{#2}{0.5}-\CF_arrowendnode
-}
-
-\definearrow5{-U>}{%
-	\CF_arrowshiftnodes{#3}%
-	\CF_expafter{\draw[}\CF_arrowcurrentstyle](\CF_arrowstartnode)--(\CF_arrowendnode)node[midway](Uarrow@arctangent){};%
-	\CF_ifempty{#4}
-		{\def\CF_Uarrowradius{0.333}}
-		{\def\CF_Uarrowradius{#4}}%
-	\CF_ifempty{#5}%
-		{\def\CF_Uarrowabsangle{60}}
-		{\pgfmathsetmacro\CF_Uarrowabsangle{abs(#5)}}% ne prendre en compte que la valeur absolue de l'angle
-	\edef\CF_temp{[\CF_ifempty{#1}{draw=none}{\unexpanded\expandafter{\CF_arrowcurrentstyle}},-]}%
-	\expandafter\draw\CF_temp (Uarrow@arctangent)%
-		arc[radius=\CF_compoundsep*\CF_currentarrowlength*\CF_Uarrowradius,start angle=\CF_arrowcurrentangle-90,delta angle=-\CF_Uarrowabsangle]node(Uarrow@start){};
-	\edef\CF_temp{[\CF_ifempty{#2}{draw=none}{\unexpanded\expandafter{\CF_arrowcurrentstyle}}]}%
-	\expandafter\draw\CF_temp (Uarrow@arctangent)%
-		arc[radius=\CF_compoundsep*\CF_currentarrowlength*\CF_Uarrowradius,start angle=\CF_arrowcurrentangle-90,delta angle=\CF_Uarrowabsangle]node(Uarrow@end){};
-	\pgfmathsetmacro\CF_temp{\CF_Uarrowradius*cos(\CF_arrowcurrentangle)<0?"-":"+"}%
-	\ifdim\CF_Uarrowradius pt>0pt
-		\CF_arrowdisplaylabel{#1}{0}\CF_temp{Uarrow@start}{#2}{1}\CF_temp{Uarrow@end}%
-	\else
-		\CF_arrowdisplaylabel{#2}{0}\CF_temp{Uarrow@start}{#1}{1}\CF_temp{Uarrow@end}%
-	\fi
-}
-
-\def\CF_grabdelim#1#2#3\_nil{\def\CF_leftdelim{#1}\def\CF_rightdelim{#2}}
-\def\CF_resetdelim{%
-	\setKVdefault[CFdelimiters]
-		{delimiters  =(),
-		 height      =10pt,
-		 depth       =,
-		 open xshift =0pt,
-		 close xshift=,
-		 indice      =n}%
-}
-
-\CF_resetdelim
-
-\def\polymerdelim{\CF_ifnextchar[{\CF_polymerdelima}{\CF_polymerdelima[]}}
-\def\CF_polymerdelima[#1]#2#3{%
-	\CF_resetdelim
-	\CF_doifnotempty{#1}{\setKV[CFdelimiters]{#1}}%
-	\expandafter\expandafter\expandafter\CF_grabdelim\useKV[CFdelimiters]{delimiters}()\_nil
-	\edef\CF_delimheight{\the\dimexpr\useKV[CFdelimiters]{height}}%
-	\CF_eexpsecond\CF_ifempty{\useKV[CFdelimiters]{depth}}
-		{\let\CF_delimdepth\CF_delimheight}
-		{\edef\CF_delimdepth{\the\dimexpr\useKV[CFdelimiters]{depth}}}%
-	\edef\CF_delimhalfdim{\the\dimexpr(\CF_delimheight+\CF_delimdepth)/2}%
-	\edef\CF_delimvshift {\the\dimexpr(\CF_delimheight-\CF_delimdepth)/2}%
-	\edef\CF_leftdelimxshift{\the\dimexpr\useKV[CFdelimiters]{open xshift}}%
-	\CF_eexpsecond\CF_ifempty{\useKV[CFdelimiters]{close xshift}}
-		{\edef\CF_rightdelimxshift{\the\dimexpr-\useKV[CFdelimiters]{open xshift}}}
-		{\edef\CF_rightdelimxshift{\the\dimexpr-\useKV[CFdelimiters]{close xshift}}}%
-	\chemmove{%
-		\nulldelimiterspace0pt
-		\pgfextractx\CF_dim{\pgfpointanchor{#2}{center}}\edef\CF_leftdelimx{\the\CF_dim}%
-		\pgfextracty\CF_dim{\pgfpointanchor{#2}{center}}\edef\CF_leftdelimy{\the\CF_dim}%
-		\pgfextractx\CF_dim{\pgfpointanchor{#3}{center}}\edef\CF_rightdelimx{\the\CF_dim}%
-		\node[at={(\CF_leftdelimx+\CF_leftdelimxshift,\CF_leftdelimy+\CF_delimvshift)}]
-			{$\left\CF_leftdelim\vrule height\CF_delimhalfdim depth\CF_delimhalfdim width0pt\right.$};%
-		\node[at={(\CF_rightdelimx+\CF_rightdelimxshift,\CF_leftdelimy+\CF_delimvshift)}]
-			{$\left.\vrule height\CF_delimhalfdim depth\CF_delimhalfdim width0pt\right\CF_rightdelim
-				\CF_eexpsecond\CF_doifnotempty{\useKV[CFdelimiters]{indice}}
-					{\CF_underscore{\rlap{$\scriptstyle\useKV[CFdelimiters]{indice}$}}}
-			$};
-	}%
-}
-
-\catcode`\@11
-\pgfdeclarearrow{%
-	name = CF,%
-	defaults = {%
-		length  = 3pt 5 1,%
-		width'  = 0pt .8,%
-		inset'  = 0pt .5,%
-		line width = 0pt 1 1,%
-		round%
-	},%
-	setup code = {%
-		% Cap the line width at 1/4th distance from inset to tip
-		\pgf@x\pgfarrowlength
-		\advance\pgf@x by-\pgfarrowinset
-		\pgf@x.25\pgf@x
-		\ifdim\pgf@x<\pgfarrowlinewidth\pgfarrowlinewidth\pgf@x\fi
-		% Compute front miter length:
-		\pgfmathdivide@{\pgf@sys@tonumber\pgfarrowlength}{\pgf@sys@tonumber\pgfarrowwidth}%
-		\let\pgf@temp@quot\pgfmathresult%
-		\pgf@x\pgfmathresult pt%
-		\pgf@x\pgfmathresult\pgf@x%
-		\pgf@x4\pgf@x%
-		\advance\pgf@x by1pt%
-		\pgfmathsqrt@{\pgf@sys@tonumber\pgf@x}%
-		\pgf@xc\pgfmathresult\pgfarrowlinewidth% xc is front miter
-		\pgf@xc.5\pgf@xc
-		\pgf@xa\pgf@temp@quot\pgfarrowlinewidth% xa is extra harpoon miter
-		% Compute back miter length:
-		\pgf@ya.5\pgfarrowwidth%
-		\csname pgfmathatan2@\endcsname{\pgfmath@tonumber\pgfarrowlength}{\pgfmath@tonumber\pgf@ya}%
-		\pgf@yb\pgfmathresult pt%
-		\csname pgfmathatan2@\endcsname{\pgfmath@tonumber\pgfarrowinset}{\pgfmath@tonumber\pgf@ya}%
-		\pgf@ya\pgfmathresult pt%
-		\advance\pgf@yb by-\pgf@ya%
-		\pgf@yb.5\pgf@yb% half angle in yb
-		\pgfmathtan@{\pgf@sys@tonumber\pgf@yb}%
-		\pgfmathreciprocal@{\pgfmathresult}%
-		\pgf@yc\pgfmathresult\pgfarrowlinewidth%
-		\pgf@yc.5\pgf@yc%
-		\advance\pgf@ya by\pgf@yb%
-		\pgfmathsincos@{\pgf@sys@tonumber\pgf@ya}%
-		\pgf@ya\pgfmathresulty\pgf@yc% ya is the back miter
-		\pgf@yb\pgfmathresultx\pgf@yc% yb is the top miter
-		\ifdim\pgfarrowinset=0pt
-			\pgf@ya.5\pgfarrowlinewidth% easy: back miter is half linewidth
-		\fi
-		% Compute inset miter length:
-		\pgfmathdivide@{\pgf@sys@tonumber\pgfarrowinset}{\pgf@sys@tonumber\pgfarrowwidth}%
-		\let\pgf@temp@quot\pgfmathresult%
-		\pgf@x\pgfmathresult pt%
-		\pgf@x\pgfmathresult\pgf@x%
-		\pgf@x4\pgf@x%\pgf@ya
-		\advance\pgf@x by1pt%
-		\pgfmathsqrt@{\pgf@sys@tonumber\pgf@x}%
-		\pgf@yc\pgfmathresult\pgfarrowlinewidth% yc is inset miter
-		\pgf@yc.5\pgf@yc% 
-		% Inner length (pgfutil@tempdima) is now arrowlength - front miter - back miter
-		\pgfutil@tempdima\pgfarrowlength%
-		\advance\pgfutil@tempdima by-\pgf@xc%
-		\advance\pgfutil@tempdima by-\pgf@ya%
-		\pgfutil@tempdimb.5\pgfarrowwidth%
-		\advance\pgfutil@tempdimb by-\pgf@yb%
-		% harpoon miter correction
-		\ifpgfarrowroundjoin
-			\pgfarrowssetbackend{\pgf@ya\advance\pgf@x by-.5\pgfarrowlinewidth}%
-		\else
-			\pgfarrowssetbackend{0pt}
-		\fi
-		\ifpgfarrowharpoon
-			\pgfarrowssetlineend{\pgfarrowinset\advance\pgf@x by\pgf@yc\advance\pgf@x by.5\pgfarrowlinewidth}%
-		\else
-			\pgfarrowssetlineend{\pgfarrowinset\advance\pgf@x by\pgf@yc\advance\pgf@x by-.25\pgfarrowlinewidth}%
-			\ifpgfarrowreversed
-				\ifdim\pgfinnerlinewidth>0pt
-					\pgfarrowssetlineend{\pgfarrowinset}%
-				\else
-					\pgfarrowssetlineend{\pgfutil@tempdima\advance\pgf@x by\pgf@ya\advance\pgf@x by-.25\pgfarrowlinewidth}%
-				\fi
-			\fi
-		\fi
-		\ifpgfarrowroundjoin
-			\pgfarrowssettipend{\pgfutil@tempdima\advance\pgf@x by\pgf@ya\advance\pgf@x by.5\pgfarrowlinewidth}%
-		\else
-			\pgfarrowssettipend{\pgfarrowlength\ifpgfarrowharpoon\advance\pgf@x by\pgf@xa\fi}%
-		\fi
-		% The hull:
-		\pgfarrowshullpoint{\pgfarrowlength\ifpgfarrowroundjoin\else\ifpgfarrowharpoon\advance\pgf@x by\pgf@xa\fi\fi}{\ifpgfarrowharpoon-.5\pgfarrowlinewidth\else0pt\fi}%
-		\pgfarrowsupperhullpoint{0pt}{.5\pgfarrowwidth}%
-		\pgfarrowshullpoint{\pgfarrowinset}{\ifpgfarrowharpoon-.5\pgfarrowlinewidth\else 0pt\fi}%
-		% Adjust inset
-		\pgfarrowssetvisualbackend{\pgfarrowinset}%
-		\advance\pgfarrowinset by\pgf@yc%
-		% The following are needed in the code:
-		\pgfarrowssavethe\pgfutil@tempdima
-		\pgfarrowssavethe\pgfutil@tempdimb
-		\pgfarrowssavethe\pgfarrowlinewidth
-		\pgfarrowssavethe\pgf@ya
-		\pgfarrowssavethe\pgfarrowinset
-	},%
-	drawing code = {%
-		\pgfsetdash{}{0pt}%
-		\ifpgfarrowroundjoin\pgfsetroundjoin\else\pgfsetmiterjoin\fi
-		\ifdim\pgfarrowlinewidth=\pgflinewidth\else\pgfsetlinewidth{\pgfarrowlinewidth}\fi
-		\pgfpathmoveto{\pgfqpoint{\pgfutil@tempdima\advance\pgf@x by\pgf@ya}{0pt}}%
-		\pgfpathlineto{\pgfqpoint{\pgf@ya}{\pgfutil@tempdimb}}%
-		\pgfpathlineto{\pgfqpoint{\pgfarrowinset}{0pt}}%
-		\ifpgfarrowharpoon \else
-			\pgfpathlineto{\pgfqpoint{\pgf@ya}{-\pgfutil@tempdimb}}%
-		\fi
-		\pgfpathclose
-		\ifpgfarrowopen\pgfusepathqstroke\else\ifdim\pgfarrowlinewidth>0pt \pgfusepathqfillstroke\else\pgfusepathqfill\fi\fi
-	},%
-	parameters = {%
-		\the\pgfarrowlinewidth,%
-		\the\pgfarrowlength,%
-		\the\pgfarrowwidth,%
-		\the\pgfarrowinset,%
-		\ifpgfarrowharpoon h\fi%
-		\ifpgfarrowopen o\fi%
-		\ifpgfarrowroundjoin j\fi%
-	}%
-}
-\CFrestorecatcode
-\endinput
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%                       H I S T O R I Q U E                      %%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-v0.1        2010/06/23
-    - Premi�re version publique sur le CTAN
-----------------------------------------------------------------------
-v0.2        2010/08/31
-    - Ajout de la documentation en anglais.
-    - Correction de bugs.
-    - \printatom est d�sormais une macro publique.
-    - Les espaces sont permis dans les mol�cules. Ils seront
-      ignor�s par d�faut puisque les atomes sont compos�s en
-      mode math par \printatom
-    - Une paire de Lewis peut �tre repr�sent�e ":".
-    - Dans les cycles, une correction de la longueur du trait
-      d�port� des liaisons doubles est fait de telle sorte que si
-      l'on �crit \chemfig{*5(=====)}, on obtient deux polygones
-      r�guliers concentriques.
-    - La s�quence de contr�le \setnodestyle permet de sp�cifier
-      le style des n?uds dessin�s par tikz.
-----------------------------------------------------------------------
-v0.3        2010/11/21
-    - Am�lioration de \definesubmol qui accepte les s�quences de
-      contr�le. On peut aussi choisir un alias dont la substitution
-      est diff�rente selon l'orientation de la liaison qui lui
-      arrive dessus.
-    - Le caract�re "|" force la fin d'un atome. Si on �crit
-      "D|ef" alors, chemfig verra deux atomes "D" et "ef".
-    - Le caract�re "#" est reconnu lorsqu'il suit un caract�re de
-      liaison. Il doit �tre suivi d'un argument entre parenth�ses
-      qui contient l'offset de d�but et de fin qui s'appliqueront
-      � cette liaison.
-    - La macro \chemfig admet un argument optionnel qui sera pass�
-      � l'environnement tikzpicture dans lequel elle est dessin�e
-    - Mise en place de la repr�sentation des m�canismes
-      r�actionnels avec la syntaxe "@{<nom>}" devant un atome o�
-      "@{<nom>,<coeff>}" au tout d�but de l'argument d'une liaison.
-      Cette syntaxe permet de placer un n?ud (au sens de tikz) qui
-      deviendra l'extr�mit� des fl�ches des m�canismes.
-      Le trac� des fl�ches est faite par la macro \chemmove dont
-      l'argument optionnel devient celui de l'environnement
-      tikzpicture dans lequel sont faites les fl�ches.
-    - Pour le m�canisme d'alignement vertical via le \vphantom, la
-      commande \chemskipalign permet d'ignorer le groupe d'atomes
-      dans lequel elle est �crite.
-    - La commande \chemname permet d'afficher un nom sous une
-      mol�cule. la commande \chemnameinit initialise la plus grande
-      profondeur rencontr�e.
-    - La commande \lewis a �t� modifi�e de telle sorte que les
-      dessins des d�corations soient proportionnels � la taille
-      de la police.
-----------------------------------------------------------------------
-v0.3a       2011/01/08
-    - Correction d'un bug dans l'argument optionnel de \definesubmol
-      lorsque celui-ci comporte des crochets.
-    - Mise � jour du manuel en anglais.
-    - Ajout de \vflipnext et \hflipnext pour retourner
-      horizontalement ou verticalement la prochaine mol�cule.
-----------------------------------------------------------------------
-v0.4        2011/03/07
-    - chemfig est d�sormais �crit en plain-etex et donc
-      utilisable par d'autres formats que LaTeX.
-    - Un peu plus de rigueur avec les catcodes des caract�res
-      sp�ciaux, notamment lorsque la commande \chemfig se trouve
-      dans l'argument de \chemmove, \chemabove, \chembelow, \chemrel.
-      TODO : faut-il \scantoker l'argument de \chemfig pour �tre
-      d�finitivement d�barrass� de ces histoires de catcode ???
-    - Correction d'un bug dans le calcul de l'angle des liaisons
-----------------------------------------------------------------------
-v0.4a       2011/04/10
-    - Correction d'un bug concernant l'argument optionnel en d�but
-      de mol�cule.
-----------------------------------------------------------------------
-v0.4b       2011/04/24
-    - l'argument de \chemfig est tok�nis� avec \scantokens ce qui
-      rend caduc tout souci de code de cat�gorie, � part #.
-    - la commande \setbondstyle permet de d�finir le style des
-      liaisons.
-    - correction de l'affichage incorrect des doubles liaisons dans
-      les cycles apr�s les commandes \hflipnext et \vflipnext
-    - correction d'un bug lorsqu'un alias commence une mol�cule
-----------------------------------------------------------------------
-v1.0       2011/06/15
-    - les sch�mas r�actionnels sont d�sormais disponibles.
-    - \Chemabove et \Chembelow modifient la boite englobante.
-    - \Lewis modifie la boite englobante
-    - les macros \chemleft, \chemright, \chemup et \chemdown
-      affichent des d�limiteurs extensibles � gauche, � droite,
-      au dessus et au dessous d'un mat�riel.
-----------------------------------------------------------------------
-v1.0a      2011/09/18
-    - les macros \Lewis et \lewis admettent un argument optionnel
-    - la macro \setlewisdist r�gle la distance entre les 2
-      �lectrons
-----------------------------------------------------------------------
-v1.0b      2011/11/29
-    - la commande \merge est d�sormais prot�g�e entre
-      \schemestart et \schemestop contre des d�finitions par d'autres
-      packages.
-    - \box0 est utilis� au lieu du maladroit \unhbox0
-----------------------------------------------------------------------
-v1.0c      2011/11/30
-    - la macro \+ n'est plus explicitement �crite
-    - v�rifie que eTeX est le moteur utilis�
-----------------------------------------------------------------------
-v1.0d      2011/12/19
-    - les cercles des cycles �taient trac�s au mauvais moment. La
-      longueur de la liaison qui les pr�c�dait influait sur le
-      rayon du cercle : \chemfig{-[,0.5]**6(------)} donnait un bug
-      � l'affichage.
-----------------------------------------------------------------------
-v1.0e      2012/01/13
-    - la gestion des espaces dans les groupes d'atomes est
-      d�sormais plus rigoureuse. Plusieurs bugs ont �t�
-      corrig�
-----------------------------------------------------------------------
-v1.0f      2012/02/24
-    - correction d'un bug avec \definesubmol, les catcodes n'�taient
-      pas correctement g�r�s.
-----------------------------------------------------------------------
-v1.0g      2012/11/16
-    - correction d'un bug dans \CF_directarrow pour faire prendre en
-      compte le style des fl�che par d�faut
-    - correction d'un bug dans \CF_lewisc : la boite *doit* �tre
-      compos�e en dehors de l'environnement tikzpicture pour
-      �viter nullfont si jamais \printatom ne passe pas en mode
-      math.
-    - correction d'un bug dans \CF_chemfigc : si une longueur par
-      d�faut est modifi�e par [,<l>] au d�but d'une mol�cule
-      et si des cycles �taient emboit�s, cette longueur n'�tait
-      pas appliqu�e aux sous-cycles.
-    - r�-�criture des macros \chemabove et \chembemow pour
-      prendre en compte le bug (d�sormais corrig�) dans luatex.
-    - nouvelle macro \setstacksep qui d�finit l'espacement par
-      d�faut dans les macros \chemabove et \chembelow.
-----------------------------------------------------------------------
-v1.0h      2013/11/28
-    - \chemname admet maintenant une version �toil� qui ne tient
-      pas compte des profondeurs pr�c�dentes.
-    - \CF_dpmax est g�r� globalement.
-    - correction d'un bug dans "-U>" : le style de la fl�che
-      n'�tait pris en compte pour l'arc.
-    - correction d'un bug dans \CF_directarrow : l'angle de la
-      fl�che n'�tait pas calcul�
-----------------------------------------------------------------------
-v1.1       2015/02/13
-    - correction d'un bug dans \CF_seeksubmol : la macro
-      \CF_molecule est d�pouill� de son �ventuel espace
-      en premi�re position.
-    - correction d'un bug dans \CF_arrowf : le nom du prochain
-      n?ud courant "end@arrow@i" �tait erron� dans le cas o� une
-      fl�che contenait un sous sch�ma. Ce nom doit d�pendre de
-      \CF_schemenest.
-    - la jonction entre deux liaisons cons�cutives dans l'axe peut
-      �tre activ� avec \enablebondjoin et d�sactiv� avec
-      \disablebondjoin (pr�f�rable, �tat par d�faut).
-    - \chemfig suivi d'une "*" demande � ce que les liaisons aient
-      une longueur invariable : la distance inter-atome devient donc
-      variable. Cette fonctionnalit� est d�sactiv� dans les
-      cycles afin que les polygones soient r�guliers.
-      \enablefixedbondlength permet cette fonctionnalit� pour
-      toutes les macros \chemfig (m�me non �toil�e) tandis que
-      \disablefixedbondlength le d�sactive.
-----------------------------------------------------------------------
-v1.1a      2015/02/23
-    - correction d'un bug dans \CF_grabbondoffset. Si \chemfig est
-      dans l'argument d'une macro, les # sont doubl�s par l'action
-      de \scantokens de la macro \CF_chemfigb et il faut un
-      argument d�limit� avant "(" pour absorber tous les #.
-----------------------------------------------------------------------
-v1.2       2015/10/08
-    - correction d'un bug dans le trac� des liaisons de Cram.
-    - cr�ation de \setangleincrement.
-    - chargement de "arrows.meta" et d�finition de la fl�che "CF"
-      bas�e sur "Stealth" et d�finie avec \pgfdeclarearrow.
-      Les anciennes fl�ches "CF_full" et "CF_half" sont
-      abandonn�es puisque d�finies avec \pgfarrowsdeclare.
-    - fl�che "-U>" corrig�e : le placement des labels est
-      maintenant correct dans tous les cas. Ainsi :
-                         -U>[<a>][<b>][<d>][r][a]
-      place le label <a> pr�s du d�but de la fl�che, quels que
-      soient les signes du rayon r et de l'angle a.
-    - \chemrel, \setchemrel et \chemsign sont supprim�es.
-    - compatibilit�, avec les limitations d'usage, avec la
-      librairie "externalize" : le \begin{tikzpicture} voit
-      d�sormais le \end{tikzpicture} correspondant dans la macro
-      \CF_chemfigb.
-----------------------------------------------------------------------
-v1.2a      2015/10/21
-    - erreur de copier-coller dans le code: une adresse url �tait
-      malencontreusement pr�sente en plein milieu d'une ligne de
-      code
-----------------------------------------------------------------------
-v1.2b      2015/11/15
-    - bug dans \CF_seeksubmol qui laissait "*" dans le flux de
-      lecture de TeX. Un message d'erreur est �galement ajout�
-      en cas de "!" en fin de traitement.
-    - correction d'un bug dans \CF_setbondangle o� l'angle [<:a>]
-      n'�tait pas �valu� par \pgfmathsetmacro.
-----------------------------------------------------------------------
-v1.2c      2015/11/20
-    - Correction d'un bug dans \CF_setbondangle : l'angle renvoy�
-      pouvait �tre n�gatif
-    - Correction d'un bug dans \CF_directarrow : la macro \CF_ifempty
-      n'est pas correctement d�velopp�e dans l'argument de
-      \pgfpointanchor
-----------------------------------------------------------------------
-v1.2d      2015/12/01
-    - correction d'un bug dans la fl�che "-U"
-    - la version �toil�e de \setcrambond dessine les liaisons de
-      Cram en pointill�s sous forme de trait large et non pas sous
-      forme de triangle.
-----------------------------------------------------------------------
-v1.2e      2017/05/20
-    - la macro contenant la d�finition d'une fl�che est
-      d�sormais "\CF_arrow(<nom>)", ainsi la macro \0 n'est plus
-      d�finie par \definearrow
-    - remerciements rajout�s apr�s une suppression indue, pour ne
-      froisser aucune susceptibilit�
-----------------------------------------------------------------------
-v1.3       2018/03/08
-    - tous les param�tres sont d�sormais pass�s via \setchemfig qui
-      fait appel � "simplekv". Par cons�quent, _toutes_ les macros qui
-      r�glaient des param�tres deviennent obsol�tes, � savoir :
-          \setcrambond, \setatomsep, \setbondoffset, \setdoublesep,
-          \setangleincrement, \enablefixedbondlength,
-          \disablefixedbondlength, \setnodestyle, \setbondstyle,
-          \setlewis, \setlewisdist, \setstacksep, \setcompoundstyle,
-          \setarrowdefault, \setandsign, \setarrowoffset,
-          \setcompoundsep, \setarrowlabelsep, \enablebondjoin,
-          \disablebondjoin et \schemedebug.
-      et ces macros seront *supprim�es* dans une future version.
-    - la version �toil�e "\chemfig*" et les deux arguments optionnels
-      de la macro "\chemfig[][]" sont �galement optionnels et seront
-      *supprim�*s dans une future version afin d'acc�der � la syntaxe
-      \chemfig[cl�s=valeurs]{code}
-    - 6 nouveaux param�tres : "lewis radius", "arrow double sep",
-      "arrow double coeff", "arrow double harpoon", "cycle radius
-      coeff", "arrow head".
-    - correction d'un bug dans \CF_parsemergeopt qui dans certains
-      cas, envoyait vers l'affichage des caract�res
-    - petit toilettage du code
-    - macro \polymerdelim (non document�e) exp�rimentale et encore
-      en phase de tests
-    - suppression d'un registre d'�criture de fichier
-----------------------------------------------------------------------
-v1.31       2018/04/05
-    - correction d'un espace ind�sirable dans \CF_ifnextchar
-----------------------------------------------------------------------
-v1.32       2018/08/23
-    - d�finition de \printatom, \CF_begintikzpicture et 
-      \CF_endtikzpicture dans le fichier t-chemfig.tex
-----------------------------------------------------------------------
-v1.33       2018/10/31
-    - les macros d�finies par \definesubmol peuvent d�sormais avoir un ou
-      plusieurs arguments
-    - macro \polymerdelim document�e
-----------------------------------------------------------------------
-v1.34       2019/02/23
-    - bug dans la fl�che "<->" corrig�
-----------------------------------------------------------------------
-v1.4        2019/04/18
-    - corrections de nombreux bugs
-    - caract�re priv� "_" et non plus "@" -> modifications � pr�voir
-      notamment dans la doc avec les codes sp�cifiques aux fl�ches, �a
-      risque de couiner sur tex.stackexchange.com
-    - anciennes macros abandonn�es et d�sormais ind�finies :
-          \setcrambond, \setatomsep, \setbondoffset, \setdoublesep,
-          \setangleincrement, \enablefixedbondlength,
-          \disablefixedbondlength, \setnodestyle, \setbondstyle,
-          \setlewis, \setlewisdist, \setstacksep, \setcompoundstyle,
-          \setarrowdefault, \setandsign, \setarrowoffset,
-          \setcompoundsep, \setarrowlabelsep, \enablebondjoin,
-          \disablebondjoin et \schemedebug
-    - l'ancienne syntaxe \chemfig[][]{} est abandonn�e et n'est plus
-      accept�e, d�sormais c'est 
-      \chemfig[<cl�s>=<valeurs>]{<code mol�cule>}
-    - l'ancienne syntaxe \lewis[<coeff>] ou \Lewis[<coeff>] n'est
-      plus accept�e au profit de \lewis[<cl�s>=<valeurs>]
\ No newline at end of file
diff --git a/macros/latex/contrib/babel-contrib/italian/README.txt b/macros/latex/contrib/babel-contrib/italian/README.txt
index cc96d0bdf0..1d7ea33902 100644
--- a/macros/latex/contrib/babel-contrib/italian/README.txt
+++ b/macros/latex/contrib/babel-contrib/italian/README.txt
@@ -1,10 +1,10 @@
-The italian.dtx file has version number 1.4.03 dated  2019-11-16.
-It is and update of a series fo files stating with the first one in 1990
-Copyright (C) 1990-2019 Claudio Beccari
+The italian.dtx file has version number 1.4.04 dated  2020-05-21.
+It is and update of a series fo files starting with the first one in 1990
+Copyright (C) 1990-2020 Claudio Beccari
 Maintainer Claudio Beccari
 Contact: claudio dot beccari at gmail dot com
 
-This bundle containes the source file italian.dtx and this README.txt file. By running pdfLaTeX on thei italian.dtx file you obtain bith the documentation italian.pdf and the language description file italian.ldf.
+This bundle contains the source file italian.dtx and this README.txt file. By running pdfLaTeX on this italian.dtx file you obtain both the documentation italian.pdf and the language description file italian.ldf.
 
 Description
 This file contain the necessary and supplementary data for typesetting documents in Italian with babel as the manager of the language management.
diff --git a/macros/latex/contrib/babel-contrib/italian/italian.dtx b/macros/latex/contrib/babel-contrib/italian/italian.dtx
index 6d5a088d6b..da0f09ab40 100644
--- a/macros/latex/contrib/babel-contrib/italian/italian.dtx
+++ b/macros/latex/contrib/babel-contrib/italian/italian.dtx
@@ -10,7 +10,7 @@
 \preamble
 ------------------------------------------
 The Italian support for babel: italian.ldf.
-Copyright (C) 1990-2019 Claudio Beccari
+Copyright (C) 1990-2020 Claudio Beccari
 All rights reserved 
 
 License information appended.
@@ -60,7 +60,7 @@ This file is a self unpacking one.
 %</driver>
 %<code>\ProvidesLanguage{italian}
 %<*code>
-        [2019/11/16 v.1.4.03 Italian support for the babel system]
+        [2020/05/21 v.1.4.04 Italian support for the babel system]
 %</code>
 %%
 %% Please report errors to: claudio dot beccari at gmail dot com
@@ -99,7 +99,7 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
 %</driver>
 %\fi
 %
-% \CheckSum{753}
+% \CheckSum{772}
 %
 % \changes{italian-0.99}{1990/07/11}{First version, from english.doc}
 % \changes{italian-1.0}{1991/04/23}{Modified for babel 3.0}
@@ -171,6 +171,8 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
 %   xelatex or lualatex.}
 % \changes{italian-1.4.01}{2019/01/05}{Rewritten code introduced in 1.4.00,
 %   and the documentation modified accordingly.}
+% \changes{italian-1.4.04}{2020-05-21}{Added option for ordinal day~1 in
+%   \string\dateitalian.}
 %
 %  \section{The Italian language}
 %    \textbf{Important notice}: This language description file relies on
@@ -190,7 +192,7 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
 %    defines all the required and some optional language-specific
 %    macros for the Italian language.
 %
-%    \begin{table}[htb]\centering
+%    \begin{table}[!htb]\centering
 %    \begin{tabular}{cp{90mm}}
 %    \toprule
 %    |"|    & inserts a compound word mark where hyphenation is legal;
@@ -211,16 +213,17 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
 %    \bottomrule
 %    \end{tabular}
 %    \caption{shorthands for the Italian language. These shorthands are
-%    available only if command \texttt{\string\setactivedoublequote} is given
-%    after loading \babel\ and before \texttt{\string\begin\{document\}}.}
-%    \label{t:itshrtct}
+%    available only if command \texttt{\string\setactivedoublequote} is
+%    given after loading \babel\ and before
+%   \texttt{\string\begin\{document\}}.}\label{t:itshrtct}
 %    \end{table}
 %
 %    The features of this language definition file are the following:
 %  \begin{enumerate}
 %  \item The Italian hyphenation is invoked, provided that the Italian 
 %    hyphenation pattern files were loaded when the specific format file
-%    was built.
+%    was built. This is normally done with the initial installation of
+%     \TeX\-Live, but other distributions may not do so.
 %  \item The language dependent infix words to be inserted by such
 %    commands as |\chapter|, |\caption|, |\tableofcontents|,
 %    etc. are redefined in accordance with the Italian
@@ -234,9 +237,6 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
 %    |\finalhyphendemerits| is set to such a high value that
 %    hyphenation is strongly discouraged between the last two lines
 %    of a paragraph.
-%^^A
-%^^A  Qui ci si potrebbero mettere le indicazioni per gli attributi e modificatori
-%^^A
 %  \item Some language specific shorthands have been defined so as to
 %    allow etymological hyphenation, specifically |"| inserts a
 %    break point at any word boundary that the typesetter chooses,
@@ -267,8 +267,8 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
 %    is required in the first word, them the |"-| shorthand comes in
 %    handy; pay attention though, that if you use an en-dash or an
 %    em-dash (both should not be used in Italian as compound words
-%    connectors, but\dots) then the |"-| shorthand might impeach the |--| 
-%    or |---| ligatures, thus producing an unacceptable appearance.
+%    connectors, but\dots) then the |"-| shorthand might impeach the
+%    |--| or |---| ligatures, thus producing an unacceptable appearance.
 %  \item The shorthand |""| introduces the raised (English) opening
 %    double quotes; this shorthand proves its usefulness when one
 %    reminds that the Italian keyboard misses the back tick key, and
@@ -292,14 +292,17 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
 %    The definition of |\unit| takes place only at ``begin document''
 %    so that it is possible to verify if some other similar
 %    functionalities have already been defined by other packages, such
-%    as |units.sty| or |siunitx.sty|. In particular command |\unit| is
-%    deactivated by default; the user can activate it by entering the
-%    command |\setISOcompliance| after loading the \babel\ package and
-%    before the |\begin{document}| statement. The above checks will enter 
-%    into action even if this ISO compliance is set, in order to avoid
-%    conflicts with the above named packages. The |\ap| and |\ped|
-%    commands remain available because up to now no specific conflicts
-%    have been reported. 
+%    as |units.sty| or |siunitx.sty|. Command |\unit| does not
+%      conflict with package |SIunitx| and it may be redefined by means
+%      of its internals.
+%      Nevertheless command |\unit| is deactivated by
+%      default; the user can activate it by entering the command
+%      |\setISOcompliance| after loading the \babel\ package and before the
+%      |\begin{document}| statement. The above checks will enter into
+%      action even if this ISO compliance is set, in order to avoid
+%      conflicts with the above named packages. The |\ap| and |\ped|
+%      commands remain available because up to now no specific conflicts
+%      have been reported. 
 %  \item Since in all languages different from English the decimal
 %    separator according to the ISO regulations \emph{must} be a
 %    comma\footnote{Actually the Bureau International des Pois et
@@ -311,22 +314,26 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
 %    in mathematics it behaves correctly.
 %    There are other packages that provide a similar functionality, for
 %    example |icomma| and |ncccomma|; |icomma|, apparently is not in
-%    conflict with |dcolomn|, but requires a space after the comma all
-%    the times it plays the r\^ole of a punctuation mark; |ncccomma|,
-%    checks if the next token is a digit, but it repeats ten tests every
-%    time it meets a comma, irrespective from what it is followed by.
-%    I believe that my solution is better than that provided by both
-%    those packages; but I assume that if the user loads one of those
-%    packages, it prefers to use their functionality; in case one of those
-%    packages is loaded, this module excludes its intelligent comma
-%    functionality. By default this functionality is turned \emph{off},
-%    therefore the user should turn it on by means of the
-%    |\IntelligentComma| command; it can turn it off by means of
-%    |\NoIntelligentComma|. Please, read subsection~\ref{ssec:comma} to
-%    see the various situations where a mathematical comma may be used
-%    and how to overcome the few cases when the macros of this file don't 
-%    behave as expected. The section describes also some limitations when 
-%    some conflicting packages are being loaded.
+%    conflict with |dcolumn|, but requires a space after the comma
+%    all the times it plays the r\^ole of a punctuation mark;
+%    |ncccomma| checks if the next token is a digit, but it repeats ten
+%    tests every time it meets a comma, irrespective from what it is
+%    followed by. I believe that my solution is better than that
+%    provided by both those packages; but I assume that
+%    if the user loads one of those packages, it prefers to use their
+%    functionality; in case one of those packages is loaded, this module
+%    excludes its intelligent comma functionality.
+%    By default this functionality is turned \emph{off}, therefore the
+%    user should turn it on by means of the |\IntelligentComma| command;
+%    it can turn it off by means of |\NoIntelligentComma|. Please, read
+%    subsection~\ref{ssec:comma} to see the various situations where a
+%    mathematical comma may be used and how to overcome the few cases
+%    when the macros of this file don't behave as expected. The section
+%    describes also some limitations when some conflicting packages are
+%    being loaded. Apparently there are conflicts with package
+%    |unicode-math| because active characters are defined with different
+%    codes. Therefore this functionality is not available when
+%    typesetting with XeLaTeX or LuaLaTeX.
 %  \item In Italian legal documents it is common to tag list-items
 %    with the old fashioned 21-letter Italian alphabet, that differs from
 %    the Latin one by the omission of the letters `j', `k', `w',`x', and
@@ -351,6 +358,7 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
 % essential with open software such as the uncountable contributions
 % to the \TeX\ system. Thank you very much.
 %
+% \StopEventually{%
 %    \begin{thebibliography}{1}
 %    \bibitem{CBec} Beccari C., ``Computer Aided Hyphenation for
 %    Italian and Modern Latin'', \textsf{TUGboat} vol.~13, n.~1,
@@ -358,9 +366,7 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
 %    \bibitem{Becc2} Beccari C., ``Typesetting mathematics for science
 %    and technology according to ISO\,31/XI'', \textsf{TUGboat}
 %    vol.~18, n.~1, pp.~39-48 (1997).
-%    \end{thebibliography}
-%
-% \StopEventually{}%
+%    \end{thebibliography}}
 %
 %\section{The commented code}
 %    The macro |\LdfInit| takes care of preventing that this file is
@@ -445,9 +451,27 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
 %    The macro |\dateitalian| redefines the command
 %    |\today| to produce Italian dates.
 % \changes{italian-1.0c}{1991/06/06}{Removed \cs{global} definitions}
+% \changes{italian-1.4.04}{2020-05-10}{Added commands
+%   \cs{OrdinalDayNumberOn} and \cs{OrdinalDayNumberOff}}
+%    Normally in Italian day numbers a set as cardinal numbers; some
+%    people prefer to use the ordinal number for day~1, and use the
+%    cardinal number with the superscript masculine `o'. By default
+%    this functionality is turned off but the user can select it with
+%    command |\OrdinalDayNumberOn| and deselect it with
+%    |\OrdinalDayNumberOff|. The national official regulation require
+%    the cardinal numbers only with fully numerical dates; they allow,
+%    without prescribing, roman numbers and ordinal numbers only when
+%    the month name is spelled out in letters.
 %    \begin{macrocode}
+\newif\ifOrdinalDayNumber \OrdinalDayNumberfalse
+\def\OrdinalDayNumberOn{\OrdinalDayNumbertrue}
+\def\OrdinalDayNumberOff{\OrdinalDayNumberfalse}
 \def\dateitalian{%
-  \def\today{\number\day~\ifcase\month\or
+  \def\today{\ifnum\number\day=\@ne
+      \ifOrdinalDayNumber1\ap{o}\else1\fi
+    \else
+      \number\day
+    \fi~\ifcase\month\or
     gennaio\or febbraio\or marzo\or aprile\or maggio\or giugno\or
     luglio\or agosto\or settembre\or ottobre\or novembre\or
     dicembre\fi\space \number\year}}%
@@ -502,7 +526,7 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
 %    typesetting engines xelatelx and lualatex.}
 % \changes{italian 1.4.03}{2019-11-16}{Adjust the lccode for the
 %    apostrophe so as to work also with platex and uplatex. Thanks to
-%    Hironobu Yamashita <h.y.acetaminophen@gmail.com> who spottes the
+%    Hironobu Yamashita <h.y.acetaminophen@gmail.com> who spotted the
 %    error and suggested the correction.}
 %
 %    In order to enable the hyphenation of words such as
@@ -531,8 +555,8 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
 % lead to their proper font alternative variants being used. Apparently
 % the |\babelfont| command is more performant in transmitting the proper
 % information to |fontspec|. Of course |\babelfont| must be used after the 
-% |babel| package has been invoked; while there appears to be any loading
-% precedence requirements when |fontspec| and |polyglossia| are used
+% |babel| package has been invoked; while there appears to be no loading
+% precedence requirements when |fontspec| and |polyglossia| are used.
 % \end{macro}
 % \end{macro}
 %
@@ -618,10 +642,10 @@ mail: \texttt{claudio dot beccari at gmail dot com}}}
 %    hyphenation}
 %
 %  \subsection{Support for etymological hyphenation}
-
+%
 %    In Italian etymological hyphenation is desirable with
 %    technical terms, chemical names, and the like.
-
+%
 %    \subsubsection{Some history}
 %    In his article on Italian hyphenation \cite{CBec} Beccari pointed
 %    out that the Italian language gets hyphenated on a phonetic
diff --git a/macros/latex/contrib/babel-contrib/italian/italian.pdf b/macros/latex/contrib/babel-contrib/italian/italian.pdf
index 7f0838f365..f881ca2719 100644
--- a/macros/latex/contrib/babel-contrib/italian/italian.pdf
+++ b/macros/latex/contrib/babel-contrib/italian/italian.pdf
diff --git a/macros/latex/contrib/decorule/MANIFEST b/macros/latex/contrib/decorule/MANIFEST
index 5315031b5f..c4e0a46368 100644
--- a/macros/latex/contrib/decorule/MANIFEST
+++ b/macros/latex/contrib/decorule/MANIFEST
@@ -1,7 +1,6 @@
-README
-MANIFEST
 decorule.dtx
 decorule.ins
 decorule.pdf
-decorule.dvi
-decorule.ps.gz
+MANIFEST
+README.md
+VERSION
diff --git a/macros/latex/contrib/decorule/README b/macros/latex/contrib/decorule/README
deleted file mode 100644
index fa7fef1c5a..0000000000
--- a/macros/latex/contrib/decorule/README
+++ /dev/null
@@ -1,87 +0,0 @@
-This is the README file for the decorule package.
-
-Summary
-
-This package implements a decorative swelled rule using
-only a symbol from a font installed with all distributions of
-\TeX{}, so it works independently, without the need to install
-any additional software or fonts.
-
-This is the packaged version of the macro which was
-originally published in the 'Typographers' Inn'
-column in TUGboat (Flynn 2010).
-
-This version fixes the bug caused by failing to supply the
-correct values for DVI drivers for rendering glyph rotation.
-The result now works in Postscript output but DVI viewers may
-still display incorrectly.
-
-INSTALLATION
-
-To install this package, run LaTeX on the decorule.ins file.
-This will create the package file decorule.sty, which you must 
-move to a directory (folder) where LaTeX will find it. 
-
-For personal installations, that is:
-
-(Mac)              ~/Library/texmf/tex/latex/decorule
-(Unix / GNU/Linux) ~/texmf/tex/latex/decorule
-(MS-Windows 95/XP) C:\texmf\tex\latex\decorule
-(Windows 7/8)      Computer\System\Users\your~name\texmf\tex\latex\decorule
-                      [replacing your-name with your account name]
-
-Create that directory (folder) if it does not exist.
-
-If you are a Windows user with MiKTeX and this is your 
-first time installing packages by hand, you must also 
-add the texmf folder to MiKTeX's list of supported
-folders (in the Roots tab of the MiKTeX Maintenance/Settings
-program), and then update the FNDB in the General tab.
-
-For shared installations (multi-user systems), identify 
-the shared local directory with the command
-
-   kpsewhich -expand-var '$TEXMFLOCAL'
-
-This will give you the texmf location within which you must
-create the tex/latex/decorule subdirectories. Do not forget
-to run the texhash or mktexlsr filename indexer program
-after installation, otherwise the files will not be findable.
-
-USAGE
-
-Add this line to the Preamble of your LateX document:
-
-   \usepackage[options]{decorule}
-
-Read the documentation for the options available.
-
-
-BUGS
-
-None known of.
-
-
-COPYRIGHT
-
-%% decorule.*
-%% Copyright © 2010-2011 by Peter Flynn <peter@silmaril.ie>
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either
-% version 1.3 of this license or (at your option) any later
-% version. The latest version of this license is in:
-%
-%     http://www.latex-project.org/lppl.txt
-%
-% and version 1.3 or later is part of all distributions of
-% LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-% 
-% The current maintainer of this work is Peter Flynn <peter@silmaril.ie>
-%
-% This work consists of the files decorule.dtx and decorule.ins
-% and the derived file decorule.sty.
-
-Please send comments and bug reports to the maintainer.
diff --git a/macros/latex/contrib/decorule/README.md b/macros/latex/contrib/decorule/README.md
new file mode 100644
index 0000000000..fdbc0de71a
--- /dev/null
+++ b/macros/latex/contrib/decorule/README.md
@@ -0,0 +1,187 @@
+
+[//]: # (decorule LaTeX package)
+
+# decorule
+
+This is the README.md file for the decorule LaTeX package v0.7 (2020-04-01)
+generated by ClassPack v.1.19 (2020-05-19) on 21 May 2020 at 11:04:52 
+
+## Summary
+
+This package implements a decorative swelled rule using only a symbol
+from a font installed with all distributions of TeX, so it works
+independently, without the need to install any additional software or
+fonts.
+
+This is the packaged version of the macro which was originally published
+in the “Typographers' Inn” column in TUGboat (Flynn, 2010).
+
+
+## Automated installation
+
+If this package is distributed from CTAN, it should be in a zip file
+which allows it to be installed automatically by the TeX Live Manager
+(tlmgr) and similar automated installers.
+
+If you are using automated LaTeX package installation, no further action
+is required: the package will be installed the first time you use it in
+a LaTeX document.
+
+If you are using the TeX Live Manager (_tlmgr_) program manually, you
+can install this package with the command:
+
+    $ tlmgr install decorule
+
+
+## TDS installation
+
+This package is also available as a TeX Directory System (TDS) zip file
+(`.tds.zip`). This is the standard directory layout for a modern TeX
+installation which enables the package to be unzipped directly into your
+Personal TeX Directory without the need to use _tlmgr_. If you haven’t
+yet created a Personal TeX Directory, see below for details of what one
+is, and how to create it.
+  *  You can install this package on any TDS-compliant personal system
+(laptop, desktop, workstation, table, smartphone, PDA, etc) by unzipping
+it straight into your Personal TeX Directory. This will put all the
+files into the right places, so you can start using them immediately.
+  *  On a shared (multiuser) system like a server, the administrator can
+unzip it into the `$TEXMFLOCAL` directory instead (see below), and run
+your TeX directory-indexing program (eg _texhash_, _mktexlsr_, etc) so
+that everyone can use it.
+  *  If you are using an old non-TDS-compliant system, see below under Manual
+Installation.
+
+### Your Personal TeX Directory
+
+This is a directory (folder) where you should put all local manual
+modifications (updates, additions such as new or updated classes,
+packages, and fonts) that are _not_ handled automatically by _tlmgr_.
+The name and location are fixed (for all practical purposes):
+  *  Apple Mac OS X
+
+    ~/Library/texmf
+  *  Unix and GNU/Linux
+
+    ~/texmf
+  *  MS-Windows 95/XP/NT
+
+    C:\texmf
+  *  MS-Windows 2007 and above
+
+    Computer\System\YOURNAME\texmf
+
+Create that folder now if it does not already exist. Put (or unzip) all
+additions to your system that are _not_ handled by _tlmgr_ into this
+directory, following _exactly_ the subdirectory structure that is used
+in your main TeX distribution (unzipping a TDS file does this for you).
+This is what enables LaTeX to find stuff automatically.
+
+
+> ####  If you are a Windows user running _MiKTeX_
+> When you create the folder for your Personal TeX Directory, you MUST add it to _MiKTeX_ ’s list of supported folders. Run the _MiKTeX Maintenance/Settings_ program, select the `Roots` tab, and add the folder. You only have to do this once.
+> > Each time you add or remove software in your Personal TeX Directory, you MUST then click on the `Update FNDB` button in the `General` tab of the _MiKTeX Maintenance/Settings_ program, otherwise _MiKTeX_ will not find them and nothing will work!
+> 
+
+Unix (Mac and GNU/Linux) users do not need to (indeed, should not) run
+their filename database indexer program (_mktexlsr_ or _texhash_) for
+files put into a personal TeX directory.
+
+
+## Installation on shared systems
+
+On multi-user systems (Unix-based), identify the shared local directory
+tree with the command
+
+    kpsewhich -expand-var '$TEXMFLOCAL'
+
+This will give you the location of the shared `texmf` directory into
+which you must unzip these files.
+
+Do not forget to run your local TeX filename database indexer program
+(_texhash_ or _mktexlsr_) after installation, otherwise the files will
+not be found by LaTeX and nothing will work!
+
+
+## Manual installation (non-TDS systems)
+
+To install this software manually, download and unzip the _non-_TDS zip
+file into a temporary directory and move the class and/or package
+file[s] and other files to the proper locations where LaTeX will find
+them on your system. This is referred to in some documentation as “the
+`TEXINPUTS` directory”, although it may be called something else on your
+system.
+
+_It is your responsibility to know where this location is._ See the
+question in the TeX FAQ at https://texfaq.org/FAQ-inst-wlcf.html for
+more information. If you do not know, or cannot find it, or do not have
+access to it, your TeX system may be out of date and may need replacing.
+
+
+
+## Online systems and “last resort” systems
+
+Some online LaTeX systems use CTAN, so a package from there should be
+available on demand. For other online LaTeX systems where you do not
+have access to the file system, unzip the _non-_TDS zip file into a
+temporary directory and upload the files to the online system. Follow
+their instructions for where to put them.
+
+In an emergency, or as a last resort on unmanageable systems, it is
+possible simply to put the class and/or package file[s] into your
+current working directory (the same folder as your `.tex` file[s]).
+
+While this may work, it is not supported, and may lead to other
+resources (packages, fonts, images etc) not being found.
+
+
+## Usage
+
+Include the line shown below in the Preamble of your LaTeX document; a
+`\documentclass` line should be at the top; a `\usepackage` command
+normally goes anywhere in the Preamble:
+
+    \usepackage[options]{decorule}
+
+(similarly for other classes or packages if more than one is supplied
+with this package). Read the documentation for the options available, if
+any. The documentation is distributed as a PDF document in the zip file.
+You can also regenerate it by typesetting the `decorule.dtx` file with
+`pdflatex` (and `biber` and _makeindex_) in the normal way.
+
+
+## Bugs and TODO
+
+No outstanding reported bugs at the time of this version.
+
+For TODO items, see the PDF documentation.
+
+
+## Copyright
+
+The following statement is included in the source code:
+
+     Transformed from decorule.xml by ClassPack db2dtx.xsl
+     version 1.19 (2020-05-19) on Thursday 21 May 2020 at 11:04:52
+    
+     decorule.sty is copyright © 2010-2020 by Peter Flynn <peter@silmaril.ie>
+    
+     This work may be distributed and/or modified under the
+     conditions of the LaTeX Project Public License, either
+     version 1.3 of this license or (at your option) any later
+     version. The latest version of this license is in:
+    
+         http://www.latex-project.org/lppl.txt
+    
+     and version 1.3 or later is part of all distributions of
+     LaTeX version 2005/12/01 or later.
+    
+     This work has the LPPL maintenance status ‘maintained’.
+     
+     The current maintainer of this work is Peter Flynn <peter@silmaril.ie>
+    
+     This work consists of the files decorule.dtx and decorule.ins,
+     the derived file , 
+     and any other ancillary files listed in the MANIFEST.
+    
+
diff --git a/macros/latex/contrib/decorule/VERSION b/macros/latex/contrib/decorule/VERSION
new file mode 100644
index 0000000000..67e019434c
--- /dev/null
+++ b/macros/latex/contrib/decorule/VERSION
@@ -0,0 +1 @@
+Date of most recent change is 2020-04-01
diff --git a/macros/latex/contrib/decorule/decorule.dtx b/macros/latex/contrib/decorule/decorule.dtx
index 80f70bd597..b7dbb68009 100644
--- a/macros/latex/contrib/decorule/decorule.dtx
+++ b/macros/latex/contrib/decorule/decorule.dtx
@@ -1,7 +1,9 @@
 % \iffalse meta-comment
 %
-%% decorule.dtx
-%% Copyright © 2010-2011 by Peter Flynn <peter@silmaril.ie>
+% Transformed from decorule.xml by ClassPack db2dtx.xsl
+% version 1.19 (2020-05-19) on Thursday 21 May 2020 at 11:04:52
+%
+% decorule.dtx is copyright © 2010-2020 by Peter Flynn <peter@silmaril.ie>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -13,38 +15,404 @@
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
-% This work has the LPPL maintenance status `maintained'.
+% This work has the LPPL maintenance status ‘maintained’.
 % 
 % The current maintainer of this work is Peter Flynn <peter@silmaril.ie>
 %
-% This work consists of the files decorule.dtx and decorule.ins
-% and the derived file decorule.sty.
+% This work consists of the files decorule.dtx and decorule.ins,
+% the derived file , 
+% and any other ancillary files listed in the MANIFEST.
 %
 % \fi
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[2009/09/24]
-%<package>\ProvidesPackage{decorule}[2011/08/02 v0.6 The decorule LaTeX2e package]
-%<package>\RequirePackage{graphicx}
-%<package>\RequirePackage{fix-cm}
+%<package>\ProvidesPackage{decorule}[2020/04/01 v0.7
+%<package>  A decorative swelled rule for LaTeX]
 %<*driver>
+\RequirePackage{fix-cm}% included by default.
+\PassOptionsToPackage{svgnames}{xcolor}% xcolor/dox/hyperref implied
 \documentclass[12pt]{ltxdoc}
-\usepackage{decorule}
-\usepackage[utf8x]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{fancyvrb}
-\usepackage{mflogo}
-\usepackage{chicago}
-\usepackage{url}
-\usepackage{nicefrac}
-\usepackage{lmodern}
-\usepackage[a4paper,margin=3cm]{geometry}
-\usepackage{parskip}
-\usepackage{varioref}
-\usepackage{listings}
-\usepackage{textcomp}
-\newcommand{\classorpackage}{package}
-\newcommand{\ConTeXt}{%
-	C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt}
+%%
+%% Packages added for documentation
+%%
+\usepackage{dox}% used by default. (0)%
+  \makeatletter
+  \doxitem[idxtype=attribute]{Attribute}{CPK@attribute}{attributes}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=attributevalue]{AttributeValue}{CPK@attributevalue}{attribute values}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=class]{Class}{CPK@class}{classes}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=colour]{Colour}{CPK@colour}{colours}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=counter]{Counter}{CPK@counter}{counters}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=DTD]{DTD}{CPK@dtd}{DTDs/Schemas}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=element]{Element}{CPK@element}{element types}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=entity]{Entity}{CPK@entity}{entities}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=error]{Error}{CPK@error}{errors}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=field]{Field}{CPK@field}{fields}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=file]{File}{CPK@file}{files}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=font]{Font}{CPK@font}{fonts}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=function]{Function}{CPK@function}{functions}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=language]{Language}{CPK@language}{languages}
+  \makeatother
+  \makeatletter
+  \doxitem[macrolike,idxtype=length]{Length}{CPK@length}{lengths}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=mode]{Mode}{CPK@mode}{modes}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=option]{Option}{CPK@option}{options}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=package]{Package}{CPK@package}{packages}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=variable]{Variable}{CPK@variable}{variables}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=parameter]{Parameter}{CPK@parameter}{parameters}
+  \makeatother
+  \makeatletter
+  \doxitem[macrolike,idxtype=switch]{Switch}{CPK@switch}{switches}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=template]{Template}{CPK@template}{templates}
+  \makeatother
+  \makeatletter
+  \doxitem[idxtype=typeface]{Typeface}{CPK@typeface}{typefaces}
+  \makeatother
+  \makeatletter
+  \doxitem[macrolike,idxtype=box]{Box}{CPK@box}{boxes}
+  \makeatother
+  \newcommand{\LabelFont}[2][\relax]{\strut
+    {\fontencoding\encodingdefault
+	    \fontfamily{lmtt}\fontseries{lc}#1\selectfont#2}\space}
+  \makeatletter
+  \let\CPK@macro\macro\let\CPK@endmacro\endmacro
+  \makeatother
+  \makeatletter
+  \let\CPK@environment\environment\let\CPK@endenvironment\endenvironment
+  \makeatother
+  \makeatletter
+  \def\PrintAttributeName#1{\LabelFont{@#1}}
+  \makeatother
+  \def\PrintAttributeValueName#1{\LabelFont{"#1"}}
+  \def\PrintClassName#1{\LabelFont[\fontfamily{lmss}]{#1}}
+  \def\PrintColourName#1{\LabelFont[\color{#1}]{#1}}
+  \def\PrintCounterName#1{\LabelFont{#1}}
+  \def\PrintDTDName#1{\LabelFont{#1}}
+  \def\PrintElementName#1{\LabelFont{<#1>}}
+  \def\PrintEntityName#1{\LabelFont{\&#1;}}
+  \def\PrintEnvironmentName#1{\LabelFont[\fontfamily{lmss}]{#1}}
+  \def\PrintErrorName#1{\LabelFont[\color{Red}!]{#1}}
+  \def\PrintFunctionName#1{\LabelFont[\bfseries\itshape]{#1}}
+  \def\PrintLanguageName#1{\LabelFont{#1}}
+  \def\PrintLengthName#1{\LabelFont{#1}}
+  \def\PrintMacroName#1{\LabelFont{#1}}
+  \def\PrintModeName#1{\LabelFont[\sffamily]{\textlangle#1\textrangle}}
+  \def\PrintOptionName#1{\LabelFont[\bfseries]{#1}}
+  \def\PrintPackageName#1{\LabelFont[\fontfamily{lmss}]{#1}}
+  \def\PrintSwitchName#1{\LabelFont{#1}}
+  \def\PrintTemplateName#1{\LabelFont[\bfseries]{#1}}
+  \def\PrintVariableName#1{\LabelFont[\ttfamily]{#1}}
+  \def\PrintParameterName#1{\LabelFont[\ttfamily]{#1}}
+  \def\PrintFieldName#1{\LabelFont[\ttfamily]{#1}}
+\usepackage[T1]{fontenc}% used by default. (3)%
+  \let\SavedShow\show
+  \let\SavedShow\show
+\usepackage[utf8]{inputenc}[2008/03/30]% requested by author (6)%
+\usepackage{mflogo}% used by default. (35)%
+\usepackage[british]{babel}% used by default. (40)%
+\usepackage[backend=biber,doi=true,
+  isbn=true,url=true,uniquename=false,style=apa]{biblatex}% bibliography/@arch=biblatex detected. (41)%
+  \makeatletter
+  \AtBeginDocument{%
+	    \setlength{\bibitemsep}{1ex}%
+	    \setlength{\bibnamesep}{1.5\itemsep}%
+	    \defbibheading{shortbib}[References]%
+	      {\section{#1}}}
+	  \@ifpackagewith{babel}{british}{%
+	    \DeclareLanguageMapping{british}%
+	      {british-apa}}{\relax}
+  \makeatother
+  \makeatletter
+  \providetoggle{blx@skipbiblist}
+  \makeatother
+\usepackage{csquotes}% bibliography/@arch=biblatex detected. (43)%
+\usepackage{array}% use of 'tgroup' detected (46)%
+\usepackage{calc}% used by default. (49)%
+  \makeatletter
+  {\scriptsize
+	    \global\advance\@totalleftmargin by1em
+	    \global\advance\MacroIndent by.5em}
+  \makeatother
+\usepackage{ccaption}% used by default. (52)%
+  \captionnamefont{\bfseries}
+  \captionstyle{\raggedright}
+\usepackage[inline]{enumitem}% use of 'variablelist' detected (56)%
+  \setlist[description]{style=unboxed}
+  \setlist[itemize]{leftmargin=2em}
+  \setlist[enumerate]{leftmargin=2em}
+  \newlist{inlineenum}{enumerate*}{1}
+  \setlist[inlineenum,1]{label=\emph{\alph*}),
+	    itemjoin={{; }},itemjoin*={{; and }}}
+\usepackage{fancybox}% use of 'note' detected (57)%
+\usepackage{fancyvrb}% use of 'bibliography' detected (60)%
+\usepackage{relsize}% use of 'acronym' detected (64)%
+\usepackage{textcase}% used by default. (67)%
+\usepackage{float}% used by default. (69)%
+  \renewcommand{\topfraction}{.85}
+  \renewcommand{\bottomfraction}{.7}
+  \renewcommand{\textfraction}{.15}
+  \renewcommand{\floatpagefraction}{.66}
+  \renewcommand{\dbltopfraction}{.66}
+  \renewcommand{\dblfloatpagefraction}{.66}
+  \setcounter{topnumber}{9}
+  \setcounter{bottomnumber}{9}
+  \setcounter{totalnumber}{20}
+  \setcounter{dbltopnumber}{9}
+\usepackage[a4paper,left=30mm,top=25mm,
+  textwidth=150mm,textheight=225mm,headheight=15pt]{geometry}% used by default. (71)%
+\usepackage{listings}% use of 'programlisting' detected (83)%
+  \lstdefinelanguage{dummy}
+	    {morekeywords={dummy}}
+  \lstdefinelanguage{Makefile}
+	  {otherkeywords={.PHONY,.DEFAULT},%
+	    morekeywords={PHONY,DEFAULT,shell,ifeq,else,endif},%
+	    keywordsprefix={.},%
+	    moredelim=[l][\color{Green}]{:},%
+	    morecomment=[l]{\#},%
+	    moredelim=[s][\color{Blue}]{\$(}{)}%
+	  }
+  \lstdefinelanguage{DocBook}[]{XML}
+	    {morekeywords={abstract,address,affiliation,annotation,arg,
+	    author,book,chapter,classname,cmdsynopsis,command,
+	    constraintdef,contrib,copyright,cover,date,email,emphasis,
+	    envar,filename,firstname,footnote,guibutton,guilabel,
+	    guimenu,guimenuitem,guisubmenu,holder,info,itemizedlist,
+	    listitem,literal,member,option,orderedlist,orgdiv,orgname,
+	    package,para,parameter,part,personname,phrase,procedure,
+	    productname,programlisting,quote,refsection,remark,
+	    constructorsynopsis,methodparan,modifier,funcparams,olink,
+	    bibliography,biblioentry,biblioset,subtitle,artpagenums,
+	    volumenum,issuenum,DOCTYPE,SYSTEM,xml:id,releaseinfo,
+	    replaceable,revdescription,revhistory,revision,sect1,sect2,
+	    sect3,sect4,seg,seglistitem,segmentedlist,segtitle,
+	    simplelist,step,surname,systemitem,tag,term,title,uri,
+	    userinput,variablelist,varlistentry,wordasword,xref,year,
+	    xlink:href}}
+	  
+  \makeatletter
+  \lstdefinelanguage{bash}
+	    {morestring=[s]{[]},morekeywords={exit,logout,yes,no,@,
+	    password,ssh,URL,cd,dvips,latex,ls,makeindex,man,mkdir,
+	    pdflatex,sudo,texconfig,texdoc,updmap,xelatex,biber,
+	    latexmk,bibtex}} 
+	  
+  \makeatother
+  \lstdefinelanguage{APA}[]{XML}
+	    {morekeywords={TTL}}
+	  
+  \lstdefinelanguage{OOXML}[]{XML}
+	    {morekeywords={w:p,w:pPr,w:pStyle,w:rPr,w:rFonts,
+	    w:r,w:t,w:lang}}
+	  
+  \lstdefinelanguage{SGML}[]{XML}
+	    {morekeywords={sec,ttl}}
+	  
+  \lstdefinelanguage{DTD}[]{XML}
+	    {morekeywords={ELEMENT,ENTITY,ATTLIST,CDATA,ID,REQUIRED,
+	    IMPLIED,PCDATA}}
+	  
+  \lstdefinelanguage{Runoff}
+	    {morekeywords={h1}}
+	  
+  \lstdefinelanguage{GML}
+	    {morekeywords={h1}}
+	  
+  \lstdefinelanguage{Scribe}
+	    {morekeywords={Heading},morestring=[s]{[]}}
+	  
+  \lstdefinelanguage{RTF}[]{TeX}
+	    {moretexcs={rtf,ansi,deff,adeflang,fonttbl,f,froman,fprq,
+	    fcharset,f1,fswiss,falt,fnil,colortbl,red,green,blue,
+	    stylesheet,s,snext,nowidctlpar,hyphen,hyphlead,hyphtrail,
+	    hyphmax,cf,kerning,dbch,af,langfe,afs,alang,loch,fs,
+	    pgndec,pard,plain,qc,sb,sa,keepn,b,ab,rtlch,ltrch,par}}
+
+  \lstdefinelanguage{TEI}[]{XML}
+	    {morekeywords={TEI,TEI.2,teiHeader,fileDesc,sourceDesc,
+	    titleStmt,title,author,editor,respStmt,resp,name,
+	    editionStmt,edition,text,body,publicationStmt,publisher,
+	    div,div1,placeName,lg,l,s,cl,phr,w,list,distinct,p,pb,
+	    mls,div2,head,num,val,app,lem,rdg,q,sup,uncl,note,
+	    DOCTYPE,SYSTEM,xml:id}}[keywords,comments,strings]
+	  
+  \lstdefinelanguage{XSLT2}[]{XML}
+	    {morekeywords={xsl:stylesheet,xsl:transform,
+	    xsl:apply-imports,xsl:attribute-set,xsl:decimal-format,
+	    xsl:import,xsl:include,xsl:key,xsl:namespace-alias,
+	    xsl:output,xsl:param,
+	    xsl:preserve-space,xsl:strip-space,xsl:template,
+	    xsl:variable,xsl:character-map,xsl:function,
+	    xsl:import-schema,xsl:param,xsl:variable,
+	    xsl:apply-imports,xsl:apply-templates,xsl:attribute,
+	    xsl:call-template,xsl:choose,xsl:comment,xsl:copy,
+	    xsl:copy-of,xsl:element,xsl:fallback,xsl:for-each,
+	    xsl:if,xsl:message,xsl:number,xsl:otherwise,
+	    xsl:processing-instruction,xsl:text,xsl:value-of,
+	    xsl:variable,xsl:when,xsl:with-param,xsl:sort,
+	    xsl:for-each-group,xsl:next-match,xsl:analyze-string,
+	    xsl:namespace,xsl:result-document,xsl:copy,
+	    xsl:fallback,xsl:document,xsl:sequence,
+	    xsl:matching-substring,xsl:non-matching-substring,
+	    xsl:perform-sort,xsl:output-character},
+	    alsodigit={-}}
+	  
+  \lstdefinelanguage{LaTeXe}[LaTeX]{TeX}
+	    {morekeywords = {selectlanguage,foreignlanguage,
+	    textbrokenbar,textlangle,textrangle,subsection,url,
+	    chapter,tableofcontents,part,subsubsection,paragraph,
+	    subparagraph,maketitle,setlength,listoffigures,
+	    listoftables,color,arraybackslash,includegraphics,
+	    textcite,parencite,graphicspath,lstinline,
+	    DeclareLanguageMapping,textcolor,definecolor,colorbox,
+	    fcolorbox,RequirePackage,PassOptionsToPackage}}
+	  
+  \lstdefinelanguage{BIBTeX}{
+	    morekeywords = {title,author,edition,publisher,year,
+	    address},
+	    morestring=[b]",
+	    }
+	  
+  \lstdefinelanguage{Email}{
+	    morekeywords={From,Subject,To,Date},
+	    }
+	  
+  \lstset{defaultdialect=LaTeXe,frame=single,
+	    framesep=.5em,backgroundcolor=\color{AliceBlue},
+	    rulecolor=\color{LightSteelBlue},framerule=1pt}
+	  
+  \lstloadlanguages{LaTeXe,DocBook,XML,XSLT2,bash}
+  \lstdefinelanguage{XMLFRAG}{tag=**[s]<>}[html]
+  \lstnewenvironment{listingsdoc}
+	    {\lstset{language={[LaTeX]TeX}}}
+	    {}
+  \newcommand\basicdefault[1]{\footnotesize
+	    \color{Black}\ttfamily#1}
+	  
+  \lstset{basicstyle=\basicdefault{\spaceskip.5em}}
+  \lstset{literate=
+	    {§}{{\S}}1
+	    {©}{{\raisebox{.125ex}{\copyright}\enspace}}1
+	    {«}{{\guillemotleft}}1
+	    {»}{{\guillemotright}}1
+	    {Á}{{\'A}}1
+	    {Ä}{{\"A}}1
+	    {É}{{\'E}}1
+	    {Í}{{\'I}}1
+	    {Ó}{{\'O}}1
+	    {Ö}{{\"O}}1
+	    {Ú}{{\'U}}1
+	    {Ü}{{\"U}}1
+	    {ß}{{\ss}}2
+	    {à}{{\`a}}1
+	    {á}{{\'a}}1
+	    {ä}{{\"a}}1
+	    {é}{{\'e}}1
+	    {í}{{\'i}}1
+	    {ó}{{\'o}}1
+	    {ö}{{\"o}}1
+	    {ú}{{\'u}}1
+	    {ü}{{\"u}}1
+	    {¹}{{\textsuperscript1}}1
+            {²}{{\textsuperscript2}}1
+            {³}{{\textsuperscript3}}1
+	    {ı}{{\i}}1
+	    {—}{{---}}1
+	    {’}{{'}}1
+	    {…}{{\dots}}1
+	    {➝}{{$leftarrow$}}1
+            {⮠}{{$\hookleftarrow$}}1
+	    {␣}{{\textvisiblespace}}1,
+	    keywordstyle=\color{DarkGreen}\bfseries,
+	    identifierstyle=\color{DarkRed},
+	    commentstyle=\color{Gray}\upshape,
+	    stringstyle=\color{DarkBlue}\upshape,
+	    emphstyle=\color{Chocolate}\upshape,
+	    showstringspaces=false,
+	    columns=fullflexible,
+	    keepspaces=true}
+\usepackage{makeidx}% used by default. (85)%
+  \makeindex
+\usepackage{nicefrac}% used by default. (91)%
+  \def\textonehalf{\ensuremath{\nicefrac12}}
+\usepackage{parskip}% used by default. (93)%
+\usepackage{sectsty}% used by default. (96)%
+  \allsectionsfont{\sffamily\raggedright}
+  \renewcommand*{\descriptionlabel}[1]{\hspace\labelsep
+	    \sffamily\bfseries #1}
+\usepackage[normalem]{ulem}% use of 'link' detected (103)%
+\usepackage{url}% use of 'ulink' detected (104)%
+  \AtBeginDocument{\urlstyle{tt}}
+\usepackage{varioref}% use of 'xref' detected (107)%
+  \vrefwarning
+  \labelformat{appendix}{Appendix~#1}
+  \makeatletter
+  \labelformat{chapter}{\@chapapp~#1}
+  \makeatother
+  \labelformat{section}{section~#1}
+  \labelformat{subsection}{section~#1}
+  \labelformat{subsubsection}{section~#1}
+  \labelformat{paragraph}{section~#1}
+  \labelformat{figure}{Figure~#1}
+  \labelformat{table}{Table~#1}
+  \labelformat{item}{item~#1}
+  \renewcommand{\reftextcurrent}{elsewhere on this
+	    page}
+  \def\reftextafter{on the
+	    \reftextvario{next}{following} page}
+\usepackage{xcolor}% used by default. (115)%
+  \makeatletter
+  \@ifundefined{T}{%
+	    \newcommand{\T}[2]{{\fontencoding{T1}%
+	      \selectfont#2}}}{}
+  \makeatother
+\usepackage{menukeys}% use of 'guimenu' detected (118)%
+  \renewmenumacro{\menu}[>]{roundedmenus}
+  \renewmenumacro{\directory}[/]{hyphenatepathswithfolder}
+  \renewmenumacro{\keys}{shadowedroundedkeys}
+\usepackage{classpack}[2020/05/19]% used by default. (120)%
+\usepackage{decorule}[2020/04/01]% added by spec
+\addbibresource{decorule.bib}
+%
+%%
+%% Settings for docstrip and ltxdoc 
+%%
 \EnableCrossrefs
 \CodelineIndex
 \RecordChanges
@@ -54,114 +422,166 @@
 %</driver>
 % \fi
 %
-% \CheckSum{142}
+% \CheckSum{145}
 %
 % \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
 %   Digits        \0\1\2\3\4\5\6\7\8\9
-%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%   Dollar        \$     Percent       \%     Ampersand     \&
-%   Acute accent  \'     Left paren    \(     Right paren   \)
-%   Asterisk      \*     Plus          \+     Comma         \,
-%   Minus         \-     Point         \.     Solidus       \/
-%   Colon         \:     Semicolon     \;     Less than     \<
-%   Equals        \=     Greater than  \>     Question mark \?
-%   Commercial at \@     Left bracket  \[     Backslash     \\
-%   Right bracket \]     Circumflex    \^     Underscore    \_
-%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%   Right brace   \}     Tilde         \~}
+%   Exclamation   \!  Double quote  \"  Hash (number) \#
+%   Dollar        \$  Percent       \%  Ampersand     \&
+%   Acute accent  \'  Left paren    \(  Right paren   \)
+%   Asterisk      \*  Plus          \+  Comma         \,
+%   Minus         \-  Point         \.  Solidus       \/
+%   Colon         \:  Semicolon     \;  Less than     \<
+%   Equals        \=  Greater than  \>  Question mark \?
+%   Commercial at \@  Left bracket  \[  Backslash     \\
+%   Right bracket \]  Circumflex    \^  Underscore    \_
+%   Grave accent  \`  Left brace    \{  Vertical bar  \|
+%   Right brace   \}  Tilde         \~}
 % 
-% \changes{v0.6}{2011/08/02}{Fix for the DVI-related display bug: Heiko Overdiek kindly identified the problem with the c@sym@rotate counter, that it isn't expandable. The graphics package only uses edef, but in the special, the explicit number is needed, because PostScript or GhostScript don't know \TeX{}. The result now works in Postscript output but DVI viewers may still display incorrectly..}
-% \changes{v0.5}{2011/07/28}{Fixes after release: Added par breaks and centering. Attempted to identify why it fails when creating DVI but works for PDF (section on Bugs created)..}
-% \changes{v0.4}{2011/06/13}{Bugs fixed on first release: 1) Added missing packages (graphicx and fix-cm); 2) Removed bogus change record from .sty file.}
-% \changes{v0.3}{2011/06/11}{Revised for .dtx file: 1) Rewrote documentation; 2) Generated .dtx.}
-% \changes{v0.2}{2010/07/14}{Updated to package format: Wrote .dtx file by hand.}
-% \changes{v0.1}{2010/03/20}{Written for TUGboat: Developed by hand.}
+% \changes{v0.7}{2020/04/01}{Regression release: 1) Updated to use ClassPack 1.19; 2) Switched all conformance attributes on revision dates to YYYY-MM-DD; 3) The jump in versions is because the previously submitted version was misnumbered as 0.6 when it should have been 0.06. Thanks to Erik Braun at CTAN for spotting this..}
+% \changes{v0.34}{2020/04/01}{Regression release: 1) Recreated package with latest version (1.18) of ClassPack; 2) Fixed bug in using the angle counter that was preventing \XeLaTeX{} generating output.}
+% \changes{v0.33}{2019/03/03}{Regression release: Recreated package with latest version (1.13) of ClassPack.}
+% \changes{v0.32}{2017/01/10}{Regression release: Recreated package with latest version (1.06) of ClassPack.}
+% \changes{v0.31}{2017/02/10}{Regression release: Recreated package with latest version (1.04) of ClassPack.}
+% \changes{v0.30}{2016/06/19}{Regression release: Recreated package with latest version (1.01) of ClassPack.}
+% \changes{v0.29}{2016/05/10}{Regenerated: Recreated package with new classpack code to create zip file to the CTAN standard.}
+% \changes{v0.28}{2014/04/01}{Maintenance release: Added PNG image for conversion to EPUB3.}
+% \changes{v0.27}{2013/03/27}{Maintenance release: Regression test for ClassPack v0.75 (autopackage with multifile).}
+% \changes{v0.26}{2013/02/23}{Internal update: Regression test for ClassPack v0.74 (autopackage).}
+% \changes{v0.25}{2012/06/15}{Internal update: Reworded final paragraph of documentation since the package is now available on CTAN. Removed palatino..}
+% \changes{v0.24}{2012/03/23}{Internal update: Updated header, replaced docmfp with dox package, checked conformance with latest version of classpack, added packages calc, listings, and palatino.}
+% \changes{v0.23}{2011/08/15}{Maintenance release: Updated documentation with docmfp, varioref, and geometry.}
+% \changes{v0.22}{2011/06/13}{Bugs fixed on first release: 1) Added missing packages (graphicx and fix-cm); 2) Removed bogus change record from .sty file.}
+% \changes{v0.21}{2011/06/11}{Revised for .dtx file: 1) Rewrote documentation; 2) Generated .dtx.}
+% \changes{v0.20}{2010/07/14}{Updated to package format: Wrote .dtx file by hand.}
+% \changes{v0.11}{2010/03/20}{Written for TUGboat: Developed by hand.}
 %
 % \GetFileInfo{decorule.dtx}
 %
 % \DoNotIndex{\@,\@@par,\@beginparpenalty,\@empty}
-% \DoNotIndex{\@flushglue,\@gobble,\@input}
-% \DoNotIndex{\@makefnmark,\@makeother,\@maketitle}
-% \DoNotIndex{\@namedef,\@ne,\@spaces,\@tempa}
-% \DoNotIndex{\@tempb,\@tempswafalse,\@tempswatrue}
-% \DoNotIndex{\@thanks,\@thefnmark,\@topnum}
-% \DoNotIndex{\@@,\@elt,\@forloop,\@fortmp,\@gtempa,\@totalleftmargin}
-% \DoNotIndex{\",\/,\@ifundefined,\@nil,\@verbatim,\@vobeyspaces}
-% \DoNotIndex{\|,\~,\ ,\active,\advance,\aftergroup,\begingroup,\bgroup}
-% \DoNotIndex{\mathcal,\csname,\def,\documentstyle,\dospecials,\edef}
-% \DoNotIndex{\egroup}
-% \DoNotIndex{\else,\endcsname,\endgroup,\endinput,\endtrivlist}
-% \DoNotIndex{\expandafter,\fi,\fnsymbol,\futurelet,\gdef,\global}
-% \DoNotIndex{\hbox,\hss,\if,\if@inlabel,\if@tempswa,\if@twocolumn}
-% \DoNotIndex{\ifcase}
-% \DoNotIndex{\ifcat,\iffalse,\ifx,\ignorespaces,\index,\input,\item}
-% \DoNotIndex{\jobname,\kern,\leavevmode,\leftskip,\let,\llap,\lower}
-% \DoNotIndex{\m@ne,\next,\newpage,\nobreak,\noexpand,\nonfrenchspacing}
-% \DoNotIndex{\obeylines,\or,\protect,\raggedleft,\rightskip,\rm,\sc}
-% \DoNotIndex{\setbox,\setcounter,\small,\space,\string,\strut}
-% \DoNotIndex{\strutbox}
-% \DoNotIndex{\thefootnote,\thispagestyle,\topmargin,\trivlist,\tt}
-% \DoNotIndex{\twocolumn,\typeout,\vss,\vtop,\xdef,\z@}
-% \DoNotIndex{\,,\@bsphack,\@esphack,\@noligs,\@vobeyspaces,\@xverbatim}
-% \DoNotIndex{\`,\catcode,\end,\escapechar,\frenchspacing,\glossary}
-% \DoNotIndex{\hangindent,\hfil,\hfill,\hskip,\hspace,\ht,\it,\langle}
-% \DoNotIndex{\leaders,\long,\makelabel,\marginpar,\markboth,\mathcode}
-% \DoNotIndex{\mathsurround,\mbox,\newcount,\newdimen,\newskip}
-% \DoNotIndex{\nopagebreak}
-% \DoNotIndex{\parfillskip,\parindent,\parskip,\penalty,\raise,\rangle}
-% \DoNotIndex{\section,\setlength,\TeX,\topsep,\underline,\unskip,\verb}
-% \DoNotIndex{\vskip,\vspace,\widetilde,\\,\%,\@date,\@defpar}
-% \DoNotIndex{\[,\{,\},\]}
-% \DoNotIndex{\count@,\ifnum,\loop,\today,\uppercase,\uccode}
-% \DoNotIndex{\baselineskip,\begin,\tw@}
-% \DoNotIndex{\a,\b,\c,\d,\e,\f,\g,\h,\i,\j,\k,\l,\m,\n,\o,\p,\q}
-% \DoNotIndex{\r,\s,\t,\u,\v,\w,\x,\y,\z,\A,\B,\C,\D,\E,\F,\G,\H}
-% \DoNotIndex{\I,\J,\K,\L,\M,\N,\O,\P,\Q,\R,\S,\T,\U,\V,\W,\X,\Y,\Z}
-% \DoNotIndex{\1,\2,\3,\4,\5,\6,\7,\8,\9,\0}
-% \DoNotIndex{\!,\#,\$,\&,\',\(,\),\+,\.,\:,\;,\<,\=,\>,\?,\_}
-% \DoNotIndex{\discretionary,\immediate,\makeatletter,\makeatother}
-% \DoNotIndex{\meaning,\newenvironment,\par,\relax,\renewenvironment}
-% \DoNotIndex{\repeat,\scriptsize,\selectfont,\the,\undefined}
-% \DoNotIndex{\arabic,\do,\makeindex,\null,\number,\show,\write,\@ehc}
-% \DoNotIndex{\@author,\@ehc,\@ifstar,\@sanitize,\@title,\everypar}
-% \DoNotIndex{\if@minipage,\if@restonecol,\ifeof,\ifmmode}
-% \DoNotIndex{\lccode,\newtoks,\onecolumn,\openin,\p@,\SelfDocumenting}
-% \DoNotIndex{\settowidth,\@resetonecoltrue,\@resetonecolfalse,\bf}
-% \DoNotIndex{\clearpage,\closein,\lowercase,\@inlabelfalse}
-% \DoNotIndex{\selectfont,\mathcode,\newmathalphabet,\rmdefault}
-% \DoNotIndex{\bfdefault}
+% \DoNotIndex{\@flushglue,\@gobble,\@input,\@makefnmark}
+% \DoNotIndex{\@makeother,\@maketitle,\@namedef,\@ne}
+% \DoNotIndex{\@spaces,\@tempa,\@tempb,\@tempswafalse}
+% \DoNotIndex{\@tempswatrue,\@thanks,\@thefnmark,\@topnum}
+% \DoNotIndex{\@@,\@elt,\@forloop,\@fortmp,\@gtempa}
+% \DoNotIndex{\@totalleftmargin,\",\/,\@ifundefined,\@nil}
+% \DoNotIndex{\@verbatim,\@vobeyspaces,\|,\~,\ ,\active}
+% \DoNotIndex{\advance,\aftergroup,\begingroup,\bgroup}
+% \DoNotIndex{\mathcal,\csname,\def,\documentstyle}
+% \DoNotIndex{\dospecials,\edef,\egroup,\else,\endcsname}
+% \DoNotIndex{\endgroup,\endinput,\endtrivlist}
+% \DoNotIndex{\expandafter,\fi,\fnsymbol,\futurelet,\gdef}
+% \DoNotIndex{\global,\hbox,\hss,\if,\if@inlabel}
+% \DoNotIndex{\if@tempswa,\if@twocolumn,\ifcase,\ifcat}
+% \DoNotIndex{\iffalse,\ifx,\ignorespaces,\index,\input}
+% \DoNotIndex{\item,\jobname,\kern,\leavevmode,\leftskip}
+% \DoNotIndex{\let,\llap,\lower,\m@ne,\next,\newpage}
+% \DoNotIndex{\nobreak,\noexpand,\nonfrenchspacing}
+% \DoNotIndex{\obeylines,\or,\protect,\raggedleft}
+% \DoNotIndex{\rightskip,\rm,\sc,\setbox,\setcounter}
+% \DoNotIndex{\small,\space,\string,\strut,\strutbox}
+% \DoNotIndex{\thefootnote,\thispagestyle,\topmargin}
+% \DoNotIndex{\trivlist,\tt,\twocolumn,\typeout,\vss,\vtop}
+% \DoNotIndex{\xdef,\z@,\,,\@bsphack,\@esphack,\@noligs}
+% \DoNotIndex{\@vobeyspaces,\@xverbatim,\`,\catcode,\end}
+% \DoNotIndex{\escapechar,\frenchspacing,\glossary}
+% \DoNotIndex{\hangindent,\hfil,\hfill,\hskip,\hspace,\ht}
+% \DoNotIndex{\it,\langle,\leaders,\long,\makelabel}
+% \DoNotIndex{\marginpar,\markboth,\mathcode,\mathsurround}
+% \DoNotIndex{\mbox,\newcount,\newdimen,\newskip}
+% \DoNotIndex{\nopagebreak,\parfillskip,\parindent}
+% \DoNotIndex{\parskip,\penalty,\raise,\rangle,\section}
+% \DoNotIndex{\setlength,\TeX,\topsep,\underline,\unskip}
+% \DoNotIndex{\verb,\vskip,\vspace,\widetilde,\\,\%,\@date}
+% \DoNotIndex{\@defpar,\[,\{,\},\],\count@,\ifnum,\loop}
+% \DoNotIndex{\today,\uppercase,\uccode,\baselineskip}
+% \DoNotIndex{\begin,\tw@,\a,\b,\c,\d,\e,\f,\g,\h,\i,\j,\k}
+% \DoNotIndex{\l,\m,\n,\o,\p,\q,\r,\s,\t,\u,\v,\w,\x,\y,\z}
+% \DoNotIndex{\A,\B,\C,\D,\E,\F,\G,\H,\I,\J,\K,\L,\M,\N,\O}
+% \DoNotIndex{\P,\Q,\R,\S,\T,\U,\V,\W,\X,\Y,\Z,\1,\2,\3,\4}
+% \DoNotIndex{\5,\6,\7,\8,\9,\0,\!,\#,\$,\&,\',\(,\)}
+% \DoNotIndex{\+,\.,\:,\;,\<,\=,\>,\?,\_,\discretionary}
+% \DoNotIndex{\immediate,\makeatletter,\makeatother}
+% \DoNotIndex{\meaning,\newenvironment,\par,\relax}
+% \DoNotIndex{\renewenvironment,\repeat,\scriptsize}
+% \DoNotIndex{\selectfont,\the,\undefined,\arabic,\do}
+% \DoNotIndex{\makeindex,\null,\number,\show,\write,\@ehc}
+% \DoNotIndex{\@author,\@ehc,\@ifstar,\@sanitize,\@title}
+% \DoNotIndex{\everypar,\if@minipage,\if@restonecol,\ifeof}
+% \DoNotIndex{\ifmmode,\lccode,\newtoks,\onecolumn,\openin}
+% \DoNotIndex{\p@,\SelfDocumenting,\settowidth}
+% \DoNotIndex{\@resetonecoltrue,\@resetonecolfalse,\bf}
+% \DoNotIndex{\clearpage,\closein,\lowercase}
+% \DoNotIndex{\@inlabelfalse,\selectfont,\mathcode}
+% \DoNotIndex{\newmathalphabet,\rmdefault,\bfdefault}
+% \DoNotIndex{\DeclareRobustCommand}
+% \DoNotIndex{\sim}
+% \DoNotIndex{\decorule}
+% \DoNotIndex{\hbox}
+% \DoNotIndex{\hss}
 %
-% \def\fileversion{0.6}
-% \def\filedate{2011/08/02}
-% \title{The \textsf{decorule} LaTeX2e package\thanks{%
+% \def\fileversion{0.7}
+% \def\filedate{2020/04/01}
+% \title{The  \textsf{decorule} \LaTeXe\ package\thanks{%
 % This document corresponds to \textsf{decorule}
-% \textit{v.}\ \fileversion, dated \filedate.}
-% \\[1ex]\Large 
-% A decorative swelled rule}
-% \author{Peter Flynn\\\normalsize
-% Silmaril Consultants\\[-4pt]\normalsize
-% Textual Therapy Division\\\normalsize
-% (\texttt{peter@silmaril.ie})}
+% \textit{v.}\ \fileversion p, dated \filedate.}
+% \\[1em]\Large 
+% A decorative swelled rule for
+%       \LaTeX{}}
+% \author{Peter Flynn\\\normalsize Silmaril Consultants\\[-.25ex]\normalsize Textual Therapy Division\\\normalsize(\url{peter@silmaril.ie})}
 % \maketitle
 % \renewcommand{\abstractname}{Summary}\thispagestyle{empty}
-% \begin{abstract}\noindent
+% \begin{abstract}
+% \parskip=0.5\baselineskip
+% \advance\parskip by 0pt plus 2pt
+% \parindent=0pt% \noindent
 % This package implements a decorative swelled rule using
 % only a symbol from a font installed with all distributions of
 % \TeX{}, so it works independently, without the need to install
 % any additional software or fonts.\par
 % This is the packaged version of the macro which was
 % originally published in the `Typographers' Inn'
-% column in TUGboat \cite{tb97}.\par
-% This version fixes the bug caused by failing to supply the
-% correct values for DVI drivers for rendering glyph rotation.
-% The result now works in Postscript output but DVI viewers may
-% still display incorrectly.\par
+% column in TUGboat \parencite{tb97}.\par
 % \end{abstract}
 % \clearpage
 % \tableofcontents
 % \clearpage
+% \section*{Latest changes}
+% \subsection*{v.0.7 (2020-04-01)}
+% \paragraph*{Regression release}
+% \begin{itemize}
+% \item Updated to use ClassPack 1.19\par
+% \item Switched all conformance attributes on revision
+% dates to YYYY-MM-DD\par
+% \item The jump in versions is because the previously
+% submitted version was misnumbered as 0.6 when it
+% should have been 0.06. Thanks to Erik Braun at CTAN
+% for spotting this.\par
+% \end{itemize}
+% \subsection*{v.0.34 (2020-04-01)}
+% \paragraph*{Regression release}
+% \begin{itemize}
+% \item Recreated package with latest version (1.18) of
+% \emph{ClassPack}\par
+% \item Fixed bug in using the angle counter that was
+% preventing \XeLaTeX{} generating output\par
+% \end{itemize}
+% \subsection*{v.0.33 (2019-03-03)}
+% \paragraph*{Regression release}
+% \begin{itemize}
+% \item Recreated package with latest version (1.13) of
+% \emph{ClassPack}\par
+% \end{itemize}
+% \subsection*{v.0.31 (2017-02-10)}
+% \paragraph*{Regression release}
+% \begin{itemize}
+% \item Recreated package with latest version (1.04) of
+% \emph{ClassPack}\par
+% \end{itemize}
+% See p.\thinspace\pageref{} for earlier changes.
+% \clearpage
 % \section{Swelled rules}
 % Swelled rules were a popular device in 19th century
 % typesetting, and were usually done as special sorts from a
@@ -174,228 +594,234 @@
 % feature is not implemented in this version and is left as an
 % exercise to the user).\par
 % \subsection{Other work}
-% As discussed in the original article \cite{tb97} there is an \textsf{swrule} package
-%   by Tobias Dussa \cite{dussa} which builds a
+% As discussed in the original article \parencite{tb97} there is an \textsf{swrule} package
+%   by Tobias Dussa \parencite{dussa} which builds a
 %   geometric lozenge from very fine lines, and there is a paper
-%   by Steve Peter \cite{peter} which describes
+%   by Steve Peter \parencite{peter} which describes
 %   a more extensible method using \MP{} for
-%   \ConTeXt{}.\par
+%   Con\TeX t{}.\par
 % \subsection{This solution}
 % However, it is also possible to produce one using just a
 %   character from a font, combined with some looping in a macro
 %   with careful positioning and kerning. This example was
-%   constructed from the swung dash (\DescribeMacro{\sim}\verb`\sim`)
+%   constructed from the swung dash ({\ttfamily{}\textbackslash{}sim})
 %   character in math mode, rotated and scaled to fit in an
-%   asending and then descending series.\par
-% This package is available from your nearest CTAN
-%   respository in the directory \url{}. The original
-%   example is available at
-%   \url{http://latex.silmaril.ie/packages/decorule}.
-%   All suggestions for improving and extending it are
-%   welcome.\par
-% \decorule{}\par
-% \subsection{Bugs}
-% Rainer adS and Herbert Schulz kindly pointed out on
-%   \url{comp.text.tex}\footnote{%
-% \url{<j0sco9$emv$1@news.albasani.net>} 
-%       and
-%       \url{<herbs-038AC9.15151428072011@news.wowway.com>}} that it failed when using standard (DVI)
-%   \LaTeX{}, although it was correct when using
-%   \emph{pdflatex}.\par
-% Attempts to render the DVI with (eg)
-%   \emph{dvipdf} were failing with a
-%   Ghostscript error: \verb`/undefined in \c@sym@rotate`.\par
-% Heiko Overdiek kindly identified the problem with the
-%   \DescribeMacro{\c@sym@rotate}\verb`\c@sym@rotate` counter, that `it
-%     isn't expandable. The graphics package only uses \texttt{edef}, but in the \texttt{special}, the explicit number is
-%     needed, because PostScript or GhostScript don't know
-%     \TeX{}.'\par
-% The result now works in Postscript output but DVI
-%   viewers may still display incorrectly.\par
+%   ascending and then descending series.\par
+% {\bigskip\centering{}\decorule{}\par}
+% \changes{v0.25}{2012/06/15}{Changed order of paragraphs and added space}
+% {\par\medskip{}The package is available on
+%   {\smaller CTAN} in
+%   \url{http://ctan.org/pkg/decorule}, and the development
+%   files will be available at
+%   \url{http://latex.silmaril.ie/packages} when the
+%   \textsf{classpack} toolkit is released.
+%   Suggestions for improving and extending this package are
+%   welcome.\par}
 % \clearpage
 % \raggedright
-% \addtocontents{toc}{\medskip}
-% \addcontentsline{toc}{section}{\refname}
-% \bibliography{decorule}
-% \bibliographystyle{chicago}
-% \begin{VerbatimOut}{decorule.bib}
-%<*ignore>
-@article{tb97,
-author 	 = {Peter Flynn},
-shortauthor 	 = {Flynn},
-title 	 = {{Typographers' Inn: Where have all the flowers gone?}},
-pages 	 = {21-22},
-journal 	 = {{TUGboat}},
-volume 	 = {31},
-number 	 = {1},
-year 	 = {2010}
-}
-@article{peter,
-author 	 = {Steve Peter},
-shortauthor 	 = {Peter},
-title 	 = {{Swelled rules and \MP{}}},
-pages 	 = {193-195},
-journal 	 = {{TUGboat}},
-volume 	 = {26},
-number 	 = {3},
-year 	 = {2005}
-}
-@misc{dussa,
-author 	 = {Tobias Dussa},
-shortauthor 	 = {Dussa},
-title 	 = {{swrule.sty}},
-year 	 = {2001},
-month 	 = {Oct},
-howpublished 	 = {CTAN: \TeX{} Users Group},
-url 	 = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
-}
-%</ignore>
-% \end{VerbatimOut}
-% \StopEventually{%
+% \raggedright\printbibliography
+% \StopEventually{\label{endcode}%
 %   \clearpage
-%   \newgeometry{left=3cm}
+%   \newgeometry{left=3cm}%
+%   \addcontentsline{toc}{section}{Change History}%
+%   \label{}%
 %   \PrintChanges
 %   \clearpage
+%   \label{codeindex}%
+%   \addcontentsline{toc}{section}{Index}%
 %   \PrintIndex}
-%   \newgeometry{left=5cm}
+% \addtolength{\CPKrevmarg}{\widthof{\LabelFont{DCR@rotate}}}
+% \newgeometry{left=\CPKrevmarg}
+% \message{Margin reset to \the\CPKrevmarg, to fit <DCR@rotate>}
+% \iffalse
+%<*package>
+% \fi
 % \clearpage
 % \section{Implementation}
-% The package consists of a single main macro \texttt{decorule}, which cycles through sizes
+% The package consists of a single main macro {\ttfamily{}\textbackslash{}decorule}, which cycles through sizes
 % of the symbol from minimum to maximum, rotating and scaling
 % according to values preset here; and then from the maximum
 % back down to the minimum.\par
-% \subsection{Preliminary declarations}
-% \begin{macro}{\sym@min}
+% \subsection{Auto-initialisation}\label{:autoinit}
+% This section is added automatically by \textit{ClassPack} 
+% as a preamble to all classes and style packages. 
+% The \textsf{fixltx2e} package, which used to be included
+% automatically, is no longer preloaded, as its
+% features are now a part of the latest \LaTeXe\ kernel.\par
+% The code starts with identity and requirements which are 
+% generated automatically as needed by the Doc\TeX\ system.
+% For details see the \textsf{ltxdoc} package documentation.
+% \par\smallskip
+% \begingroup\color{DarkRed}\tabcolsep3pt\footnotesize
+% \begin{tabular}{>{\refstepcounter{CodelineNo}\tiny\theCodelineNo}r@{\enspace}l}
+% &\verb`\NeedsTeXFormat{LaTeX2e}[2009/09/24]`\\
+% &\verb`\ProvidesPackage{decorule}[2020/04/01 v0.7`\\
+% &\verb`  A decorative swelled rule for \LaTeX{}]`
+% \end{tabular}\endgroup
+% \setcounter{CodelineNo}{3}
+%\iffalse
+%%
+%% Packages required for the class or package
+%% 
+% \fi
+% \subsection{Packages required}\label{stypackages}
+% \begin{CPK@package}{fix-cm}
+% Allow infinitely-variable font scaling.
+% \iffalse
+%% Allow infinitely-variable font scaling.
+% \fi
+%    \begin{macrocode}
+\RequirePackage{fix-cm}%
+%    \end{macrocode}
+% \end{CPK@package}
+% \begin{CPK@package}{graphicx}
+% Provide for graphics (PNG, JPG, or PDF format (only) for
+% pdflatex; EPS format (only) for standard \LaTeX{}).
+% \iffalse
+%% Provide for graphics (PNG, JPG, or PDF format (only) for pdflatex; EPS format (only) for standard \LaTeX{}).
+% \fi
+%    \begin{macrocode}
+\RequirePackage{graphicx}%
+%    \end{macrocode}
+% \end{CPK@package}
+% 
+% \subsection{Preliminary declarations}\label{packages-here}
+% \iffalse
+%% 
+%% ****************************************************************** 
+%% 
+%% Preliminary declarations
+% \fi
+% \begin{CPK@counter}{DCR@min}\label{counter--DCR@min}
 % Define a counter and a minimum point size to start and
 %     end with. This value is an integer, hence a counter is
 %     used.\par
 %    \begin{macrocode}
-\newcounter{sym@min}
-\setcounter{sym@min}{1}
+\newcounter{DCR@min}
+\setcounter{DCR@min}{1}
 %    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\sym@max}
+% \end{CPK@counter}
+% \begin{CPK@counter}{DCR@max}\label{counter--DCR@max}
 % Do the same for the maximum point size that the rule
 %     will get to in the middle.\par
 %    \begin{macrocode}
-\newcounter{sym@max}
-\setcounter{sym@max}{20}
+\newcounter{DCR@max}
+\setcounter{DCR@max}{20}
 %    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\sym@step}
+% \end{CPK@counter}
+% \begin{CPK@counter}{DCR@step}\label{counter--DCR@step}
 % Set the step size or the increments of the glyph in
 %     whole points.\par
 %    \begin{macrocode}
-\newcounter{sym@step}
-\setcounter{sym@step}{1}
+\newcounter{DCR@step}
+\setcounter{DCR@step}{1}
 %    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\sym@rotate}
+% \end{CPK@counter}
+% \begin{CPK@counter}{DCR@rotate}\label{counter--DCR@rotate}
 % Specify the amount in (whole) degrees by which we will
 %     need to rotate the symbol to make each glyph mesh with the
-%     previous one. The use of the
-%     \DescribeMacro{\thesym@rotate}\verb`\thesym@rotate` form is a bugfix due to
-%     Heiko Oberdiek in \url{news:comp.text.tex} at \textlangle\verb`j0sonk$q9v$1@dont-email.me`\textrangle{}.\par
-% \changes{v0.6}{2011/08/02}{Added fix from Heiko for sym@rotate}
+%     previous one.\par
 %    \begin{macrocode}
-\newcounter{sym@rotate}
-\renewcommand*{\thesym@rotate}{\the\c@sym@rotate}%
-\setcounter{sym@rotate}{45}
+\newcounter{DCR@rotate}
+\setcounter{DCR@rotate}{45}
 %    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\sym@size}
+% \end{CPK@counter}
+% \begin{CPK@counter}{DCR@size}\label{counter--DCR@size}
 % Define a counter to hold the current (calculated) size
 %     as we loop through the sizes.\par
 %    \begin{macrocode}
-\newcounter{sym@size}
+\newcounter{DCR@size}
 %    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\sym@raise}
+% \end{CPK@counter}
+% \begin{CPK@length}{\DCR@raise}\label{length--DCR@raise}
 % Define a length to hold the amount calculated at each
 %     step to raise/lower each glyph by (because we rotate them as
 %     we go).\par
 %    \begin{macrocode}
-\newlength{\sym@raise}
+\newlength{\DCR@raise}
 %    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\sym@skip}
+% \end{CPK@length}
+% \begin{CPK@length}{\DCR@skip}\label{length--DCR@skip}
 % Define another length to hold the amount calculated to
 %     backspace between successive glyphs to make sure they
 %     touch.\par
 %    \begin{macrocode}
-\newlength{\sym@skip}
+\newlength{\DCR@skip}
 %    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\sym@symbol}
+% \end{CPK@length}
+% \begin{CPK@macro}{\DCR@symbol}\label{macro--DCR@symbol}
 % Lastly, define the font character to use as the glyph.
 %     For the swelled rule we use the swung dash.\par
 %    \begin{macrocode}
-\newcommand{\sym@symbol}{$\sim$}
+\newcommand{\DCR@symbol}{\ensuremath{\sim}}
 %    \end{macrocode}
-% \end{macro}
+% \end{CPK@macro}
 % \subsection{The main macro}
-% \begin{macro}{\decorule}
+% \iffalse
+%% 
+%% ****************************************************************** 
+%% 
+%% The main macro
+% \fi
+% \begin{CPK@macro}{\decorule}\label{macro--decorule}
 % Now we can define the macro that does the actual
 %     work.\par
-% \changes{v0.3}{2011/06/11}{Rearranged spacing to suit the .dtx layout}
-% \changes{v0.5}{2011/07/28}{Added par breaks and centering}
+% \changes{v0.21}{2011/06/06}{Rearranged spacing to suit the .dtx layout}
 %    \begin{macrocode}
-\newcommand{\decorule}{\par\begingroup\centering
+\newcommand{\decorule}{%
 %    \end{macrocode}
 % Start by setting the initial size to the minimum size
 %     declared above:\par
 %    \begin{macrocode}
-\setcounter{sym@size}{\c@sym@min}
+  \begingroup\fontencoding{OT1}\fontfamily{cmr}\selectfont%
+  \setcounter{DCR@size}{\c@DCR@min}%
 %    \end{macrocode}
-% Go through the steps up to, but not including, the
-%     maximum size:\par
+% Loop through the steps up to, but not including, the
+%     maximum size (this loop ends on line 28):\par
 %    \begin{macrocode}
-\loop
+  \loop
 %    \end{macrocode}
-% Raise each glyph above the baseline by half the
-%     point size that we will use:\par
+% We want to raise each glyph above the baseline by half the
+%     point size that we will use, so set the amount to the
+%     current size and then divide by two:\par
 %    \begin{macrocode}
-\setlength{\sym@raise}{\c@sym@size pt}%
-    \divide\sym@raise by2
+    \setlength{\DCR@raise}{\c@DCR@size pt}%
+    \divide\DCR@raise by2
 %    \end{macrocode}
 % Raise, rotate, and (in this case of
-%     \DescribeMacro{\sim}\verb`\sim`) reflect the glyph in a \texttt{hbox} of its own point size,
-%     using \texttt{hss} to prevent
-%     \TeX{} squawking. Heiko Oberdiek also identified the fix of
-%     using \DescribeMacro{\thesym@rotate}\verb`\thesym@rotate` instead of
-%     \DescribeMacro{\c@sym@rotate}\verb`\c@sym@rotate` for the box rotation, here
-%     and elsewhere below.\par
-% \changes{v0.6}{2011/08/02}{Changed c@sym@rotate to thesym@rotate}
+%     {\ttfamily{}\textbackslash{}sim}) reflect the glyph in a
+%     {\ttfamily{}\textbackslash{}hbox} of its own point size, using
+%     {\ttfamily{}\textbackslash{}hss} as
+%     infinitely-flexible space to prevent \TeX{} squawking if
+%     the glyph is slightly oversized:\par
 %    \begin{macrocode}
-\raisebox{-\sym@raise}{%
-      \fontsize{\c@sym@size}{0}\selectfont
-      \rotatebox{\thesym@rotate}{\reflectbox{\hbox
-          to\c@sym@size pt{\hss\sym@symbol\hss}}}}%
+    \raisebox{-\DCR@raise}{\fontsize{\c@DCR@size}{0}\selectfont
+      \rotatebox{\the\c@DCR@rotate}{%
+        \reflectbox{\hbox to\c@DCR@size pt{\hss\DCR@symbol\hss}}}}%
 %    \end{macrocode}
 % Calculate the amount to backspace as \nicefrac23 of the
 %     current size:\par
 %    \begin{macrocode}
-\setlength{\sym@skip}{\c@sym@size pt}%
-    \divide\sym@skip by3
-    \multiply\sym@skip by2
-    \kern-\sym@skip
+    \setlength{\DCR@skip}{\c@DCR@size pt}%
+    \divide\DCR@skip by3
+    \multiply\DCR@skip by2
+    \kern-\DCR@skip
 %    \end{macrocode}
 % Increment the counter and repeat:\par
 %    \begin{macrocode}
-\addtocounter{sym@size}{\c@sym@step}%
-    \ifnum\c@sym@size<\c@sym@max
+    \addtocounter{DCR@size}{\c@DCR@step}%
+    \ifnum\c@DCR@size<\c@DCR@max
   \repeat
 %    \end{macrocode}
 % Now do the same for the sole occurrence of the maximum
-%     size:\par
-% \changes{v0.6}{2011/08/02}{Changed c@sym@rotate to thesym@rotate}
+%     size: this marks the mid-point of the rule:\par
 %    \begin{macrocode}
-\setlength{\sym@raise}{\c@sym@max pt}%
-  \divide\sym@raise by2
-  \raisebox{-\sym@raise}{%
-    \fontsize{\c@sym@max}{0}\selectfont
-    \rotatebox{\thesym@rotate}{\reflectbox{\hbox
-        to\c@sym@max pt{\hss\sym@symbol\hss}}}}%
+  \setlength{\DCR@raise}{\c@DCR@max pt}%
+  \divide\DCR@raise by2
+  \raisebox{-\DCR@raise}{%
+    \fontsize{\c@DCR@max}{0}\selectfont
+    \rotatebox{\the\c@DCR@rotate}{\reflectbox{\hbox
+        to\c@DCR@max pt{\hss\DCR@symbol\hss}}}}%
 %    \end{macrocode}
 % Start back down following the exact same pattern in
 %     reverse, using the current size (one step less than the
@@ -403,49 +829,52 @@ url 	 = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
 %     from the last loop of the outward journey. This time,
 %     however, do the kerning \emph{before} the
 %     glyph.\par
-% \changes{v0.6}{2011/08/02}{Changed c@sym@rotate to thesym@rotate}
 %    \begin{macrocode}
-\loop
-    \setlength{\sym@skip}{\c@sym@size pt}%
-    \divide\sym@skip by3
-    \multiply\sym@skip by2
-    \kern-\sym@skip
-    \setlength{\sym@raise}{\c@sym@size pt}%
-    \divide\sym@raise by2
-    \raisebox{-\sym@raise}{%
-    \fontsize{\c@sym@size}{0}\selectfont
-    \rotatebox{\thesym@rotate}{\reflectbox{\hbox
-        to\c@sym@size pt{\hss\sym@symbol\hss}}}}%
-    \addtocounter{sym@size}{-\c@sym@step}%
-    \ifnum\c@sym@size>\c@sym@min
+  \loop
+    \setlength{\DCR@skip}{\c@DCR@size pt}%
+    \divide\DCR@skip by3
+    \multiply\DCR@skip by2
+    \kern-\DCR@skip
+    \setlength{\DCR@raise}{\c@DCR@size pt}%
+    \divide\DCR@raise by2
+    \raisebox{-\DCR@raise}{%
+    \fontsize{\c@DCR@size}{0}\selectfont
+    \rotatebox{\the\c@DCR@rotate}{\reflectbox{\hbox
+        to\c@DCR@size pt{\hss\DCR@symbol\hss}}}}%
+    \addtocounter{DCR@size}{-\c@DCR@step}%
+    \ifnum\c@DCR@size>\c@DCR@min
   \repeat
 %    \end{macrocode}
 % Finally, do the minimum size:\par
-% \changes{v0.6}{2011/08/02}{Changed c@sym@rotate to thesym@rotate}
 %    \begin{macrocode}
-\setlength{\sym@skip}{\c@sym@min pt}%
-  \divide\sym@skip by3
-  \multiply\sym@skip by2
-  \kern-\sym@skip
-  \setlength{\sym@raise}{\c@sym@min pt}%
-  \divide\sym@raise by2
-  \raisebox{-\sym@raise}{%
-  \fontsize{\c@sym@min}{0}\selectfont
-  \rotatebox{\thesym@rotate}{\reflectbox{\hbox
-        to\c@sym@min pt{\hss\sym@symbol\hss}}}}%
-\par\endgroup}
+  \setlength{\DCR@skip}{\c@DCR@min pt}%
+  \divide\DCR@skip by3
+  \multiply\DCR@skip by2
+  \kern-\DCR@skip
+  \setlength{\DCR@raise}{\c@DCR@min pt}%
+  \divide\DCR@raise by2
+  \raisebox{-\DCR@raise}{%
+  \fontsize{\c@DCR@min}{0}\selectfont
+  \rotatebox{\the\c@DCR@rotate}{\reflectbox{\hbox
+        to\c@DCR@min pt{\hss\DCR@symbol\hss}}}}%
+  \endgroup}
 %    \end{macrocode}
-% \end{macro}
+% \end{CPK@macro}
+% \iffalse
+%</package>
+% \fi
 % \appendix
-%   \newgeometry{left=3cm}
+% \newgeometry{left=3cm}
 % \clearpage
-% \section{The \LaTeX{} Project Public License}\label{LPPL:LPPL}
-% \begin{quotation}\small\noindent
+% \section{The \LaTeX{} Project Public License (v\thinspace{}1.3c)}\label{LPPL}
+% \begin{quotation}\small\sffamily\parindent0pt
+%   \parskip.5\baselineskip
+%   \color{DarkBlue}\noindent
 % Everyone is allowed to distribute verbatim copies of this
-%       license document, but modification of it is not allowed.
+%       license document, but modification of it is not allowed.\par
 % \end{quotation}
-% \subsection{Preamble}\label{LPPL:Preamble}
-% The \LaTeX{} Project Public License (\textsc{lppl})
+% \subsection{Preamble}\label{Preamble}
+% The \LaTeX{} Project Public License ({\smaller LPPL})
 %       is the primary license under which the \LaTeX{} kernel and the
 %       base \LaTeX{} packages are distributed.\par
 % You may use this license for any work of which you hold the
@@ -453,8 +882,8 @@ url 	 = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
 %       particularly suitable if your work is \TeX{}-related (such as a
 %       \LaTeX{} package), but it is written in such a way that you can
 %       use it even if your work is unrelated to \TeX{}.\par
-% The section \emph{Whether and How to Distribute Works under This
-%       License}, below, gives instructions, examples, and
+% The section “Whether and How to Distribute Works under This
+%       License”, below, gives instructions, examples, and
 %       recommendations for authors who are considering distributing
 %       their works under this license.\par
 % This license gives conditions under which a work may be
@@ -466,42 +895,41 @@ url 	 = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
 %       you wish while maintaining the availability, integrity, and
 %       reliability of that work.  If you do not see how to achieve your
 %       goal while meeting these conditions, then read the document
-%       \url{cfgguide.tex} and \url{modguide.tex} in the base \LaTeX{}
+%       {\ttfamily{}cfgguide.tex} and {\ttfamily{}modguide.tex} in the base \LaTeX{}
 %       distribution for suggestions.\par
-% \subsection{Definitions}\label{LPPL:Definitions}
+% \subsection{Definitions}\label{Definitions}
 % In this license document the following terms are used:\par
-% \begingroup\raggedright
-% \begin{description}
-% \item[Work:]Any work being distributed under this License.
-% \item[Derived Work:]Any work that under any applicable law is derived from
-%     the Work.
-% \item[Modification:]Any procedure that produces a Derived Work under any
+% \begin{description}[style=unboxed]
+% \item[Work\thinspace:]Any work being distributed under this License.\par
+% \item[Derived Work\thinspace:]Any work that under any applicable law is derived from
+%     the Work.\par
+% \item[Modification\thinspace:]Any procedure that produces a Derived Work under any
 %     applicable law~--- for example, the production of a file
 %     containing an original file associated with the Work or a
 %     significant portion of such a file, either verbatim or
 %     with modifications and/or translated into another
-%     language.
-% \item[Modify:]To apply any procedure that produces a Derived Work
-%     under any applicable law.
-% \item[Distribution:]Making copies of the Work available from one person to
+%     language.\par
+% \item[Modify\thinspace:]To apply any procedure that produces a Derived Work
+%     under any applicable law.\par
+% \item[Distribution\thinspace:]Making copies of the Work available from one person to
 %     another, in whole or in part.  Distribution includes (but
 %     is not limited to) making any electronic components of the
 %     Work accessible by file transfer protocols such as
-%     \textsc{ftp} or \textsc{http} or by
+%     {\smaller FTP} or {\smaller HTTP} or by
 %     shared file systems such as Sun's Network File System
-%     (\textsc{nfs}).
-% \item[Compiled Work:]A version of the Work that has been processed into a
+%     ({\smaller NFS}).\par
+% \item[Compiled Work\thinspace:]A version of the Work that has been processed into a
 %     form where it is directly usable on a computer system.
 %     This processing may include using installation facilities
 %     provided by the Work, transformations of the Work, copying
 %     of components of the Work, or other activities.  Note that
 %     modification of any installation facilities provided by
-%     the Work constitutes modification of the Work.
-% \item[Current Maintainer:]A person or persons nominated as such within the Work.
+%     the Work constitutes modification of the Work.\par
+% \item[Current Maintainer\thinspace:]A person or persons nominated as such within the Work.
 %     If there is no such explicit nomination then it is the
 %     `Copyright Holder' under any applicable
-%     law.
-% \item[Base Interpreter:]A program or process that is normally needed for
+%     law.\par
+% \item[Base Interpreter\thinspace:]A program or process that is normally needed for
 %     running or interpreting a part or the whole of the
 %     Work.\par
 % A Base Interpreter may depend on external components
@@ -512,45 +940,45 @@ url 	 = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
 %     Work, the only applicable Base Interpreter is a
 %     `\LaTeX{}-Format' or in the case of files
 %     belonging to the `\LaTeX{}-format' a program
-%     implementing the `\TeX{} language'.
-% \end{description}\endgroup
-% \subsection{Conditions on Distribution and Modification}\label{LPPL:Conditions}
+%     implementing the `\TeX{} language'.\par
+% \end{description}
+% \subsection{Conditions on Distribution and Modification}\label{Conditions}
 % \begin{enumerate}
 % \item Activities other than distribution and/or modification
 %   of the Work are not covered by this license; they are
 %   outside its scope. In particular, the act of running the
 %   Work is not restricted and no requirements are made
-%   concerning any offers of support for the Work.
-% \item \label{LPPL:item:distribute}You may distribute a complete, unmodified copy of the
+%   concerning any offers of support for the Work.\par
+% \item \label{item-distribute}You may distribute a complete, unmodified copy of the
 %   Work as you received it.  Distribution of only part of the
 %   Work is considered modification of the Work, and no right to
 %   distribute such a Derived Work may be assumed under the
-%   terms of this clause.
+%   terms of this clause.\par
 % \item You may distribute a Compiled Work that has been
 %   generated from a complete, unmodified copy of the Work as
-%   distributed under Clause~\vref{LPPL:item:distribute} above, as
+%   distributed under Clause~item~\ref{item-distribute} above above, as
 %   long as that Compiled Work is distributed in such a way that
 %   the recipients may install the Compiled Work on their system
 %   exactly as it would have been installed if they generated a
-%   Compiled Work directly from the Work.
-% \item \label{LPPL:item:currmaint}If you are the Current Maintainer of the Work, you may,
+%   Compiled Work directly from the Work.\par
+% \item \label{item-currmaint}If you are the Current Maintainer of the Work, you may,
 %   without restriction, modify the Work, thus creating a
 %   Derived Work.  You may also distribute the Derived Work
 %   without restriction, including Compiled Works generated from
 %   the Derived Work.  Derived Works distributed in this manner
 %   by the Current Maintainer are considered to be updated
-%   versions of the Work.
+%   versions of the Work.\par
 % \item If you are not the Current Maintainer of the Work, you
 %   may modify your copy of the Work, thus creating a Derived
 %   Work based on the Work, and compile this Derived Work, thus
-%   creating a Compiled Work based on the Derived Work.
-% \item \label{LPPL:item:conditions}If you are not the Current Maintainer of the Work, you
+%   creating a Compiled Work based on the Derived Work.\par
+% \item \label{item-conditions}If you are not the Current Maintainer of the Work, you
 %   may distribute a Derived Work provided the following
 %   conditions are met for every component of the Work unless
 %   that component clearly states in the copyright notice that
 %   it is exempt from that condition.  Only the Current
 %   Maintainer is allowed to add such statements of exemption to
-%   a component of the Work.
+%   a component of the Work.\par
 % \begin{enumerate}
 % \item If a component of this Derived Work can be a direct
 %       replacement for a component of the Work when that
@@ -560,22 +988,22 @@ url 	 = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
 %       Interpreter, the replacement component of this Derived
 %       Work clearly and unambiguously identifies itself as a
 %       modified version of this component to the user when used
-%       interactively with that Base Interpreter.
+%       interactively with that Base Interpreter.\par
 % \item Every component of the Derived Work contains
 %       prominent notices detailing the nature of the changes to
 %       that component, or a prominent reference to another file
 %       that is distributed as part of the Derived Work and that
 %       contains a complete and accurate log of the
-%       changes.
+%       changes.\par
 % \item No information in the Derived Work implies that any
 %       persons, including (but not limited to) the authors of
 %       the original version of the Work, provide any support,
 %       including (but not limited to) the reporting and
 %       handling of errors, to recipients of the Derived Work
 %       unless those persons have stated explicitly that they do
-%       provide such support for the Derived Work.
+%       provide such support for the Derived Work.\par
 % \item You distribute at least one of the following with
-%       the Derived Work:
+%       the Derived Work:\par
 % \begin{enumerate}
 % \item A complete, unmodified copy of the Work; if your
 %   distribution of a modified component is made by
@@ -584,50 +1012,50 @@ url 	 = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
 %   to copy the Work from the same or some similar place
 %   meets this condition, even though third parties are
 %   not compelled to copy the Work along with the
-%   modified component;
+%   modified component;\par
 % \item Information that is sufficient to obtain a
-%   complete, unmodified copy of the Work.
+%   complete, unmodified copy of the Work.\par
 % \end{enumerate}
 % \end{enumerate}
 % \item If you are not the Current Maintainer of the Work, you
 %   may distribute a Compiled Work generated from a Derived
 %   Work, as long as the Derived Work is distributed to all
 %   recipients of the Compiled Work, and as long as the
-%   conditions of Clause~\vref{LPPL:item:conditions}, above, are met
-%   with regard to the Derived Work.
+%   conditions of Clause~item~\ref{item-conditions} above, above, are met
+%   with regard to the Derived Work.\par
 % \item The conditions above are not intended to prohibit, and
 %   hence do not apply to, the modification, by any method, of
 %   any component so that it becomes identical to an updated
 %   version of that component of the Work as it is distributed
-%   by the Current Maintainer under Clause~\vref{LPPL:item:currmaint}, above.
+%   by the Current Maintainer under Clause~item~\ref{item-currmaint} above, above.\par
 % \item Distribution of the Work or any Derived Work in an
 %   alternative format, where the Work or that Derived Work (in
 %   whole or in part) is then produced by applying some process
 %   to that format, does not relax or nullify any sections of
 %   this license as they pertain to the results of applying that
-%   process.
+%   process.\par
 % \item % \begin{enumerate}
 % \item A Derived Work may be distributed under a different
 %       license provided that license itself honors the
-%       conditions listed in Clause~\vref{LPPL:item:conditions} above, in
+%       conditions listed in Clause~item~\ref{item-conditions} in the list on p.\thinspace\pageref{item-conditions} above, in
 %       regard to the Work, though it does not have to honor the
-%       rest of the conditions in this license.
+%       rest of the conditions in this license.\par
 % \item If a Derived Work is distributed under a different
 %       license, that Derived Work must provide sufficient
 %       documentation as part of itself to allow each recipient
 %       of that Derived Work to honor the restrictions in
-%       Clause~\vref{LPPL:item:conditions} above, concerning
-%       changes from the Work.
+%       Clause~item~\ref{item-conditions} in the list on p.\thinspace\pageref{item-conditions} above, concerning
+%       changes from the Work.\par
 % \end{enumerate}
 % \item This license places no restrictions on works that are
 %   unrelated to the Work, nor does this license place any
 %   restrictions on aggregating such works with the Work by any
-%   means.
+%   means.\par
 % \item Nothing in this license is intended to, or may be used
 %   to, prevent complete compliance by all parties with all
-%   applicable laws.
+%   applicable laws.\par
 % \end{enumerate}
-% \subsection{No Warranty}\label{LPPL:Warranty}
+% \subsection{No Warranty}\label{Warranty}
 % There is no warranty for the Work.  Except when otherwise
 %       stated in writing, the Copyright Holder provides the Work
 %       `as is', without warranty of any kind, either
@@ -649,7 +1077,7 @@ url 	 = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
 %       operate with any other programs), even if the Copyright Holder
 %       or said author or said other party has been advised of the
 %       possibility of such damages.\par
-% \subsection{Maintenance of The Work}\label{LPPL:Maintenance}
+% \subsection{Maintenance of The Work}\label{Maintenance}
 % The Work has the status `author-maintained'
 %       if the Copyright Holder explicitly and prominently states near
 %       the primary copyright notice in the Work that the Work can only
@@ -675,80 +1103,80 @@ url 	 = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
 % \begin{enumerate}
 % \item Make a reasonable attempt to trace the Current
 %   Maintainer (and the Copyright Holder, if the two differ)
-%   through the means of an Internet or similar search.
+%   through the means of an Internet or similar search.\par
 % \item If this search is successful, then enquire whether the
-%   Work is still maintained.
+%   Work is still maintained.\par
 % \begin{enumerate}
 % \item If it is being maintained, then ask the Current
 %       Maintainer to update their communication data within one
-%       month.
-% \item \label{LPPL:item:intention}If the search is unsuccessful or no action to resume
+%       month.\par
+% \item \label{item-intention}If the search is unsuccessful or no action to resume
 %       active maintenance is taken by the Current Maintainer,
 %       then announce within the pertinent community your
 %       intention to take over maintenance.  (If the Work is a
 %       \LaTeX{} work, this could be done, for example, by
-%       posting to \url{news:comp.text.tex}.)
+%       posting to \url{news:comp.text.tex}.)\par
 % \end{enumerate}
 % \item % \begin{enumerate}
 % \item If the Current Maintainer is reachable and agrees to
 %       pass maintenance of the Work to you, then this takes
-%       effect immediately upon announcement.
-% \item \label{LPPL:item:announce}If the Current Maintainer is not reachable and the
+%       effect immediately upon announcement.\par
+% \item \label{item-announce}If the Current Maintainer is not reachable and the
 %       Copyright Holder agrees that maintenance of the Work be
 %       passed to you, then this takes effect immediately upon
-%       announcement.
+%       announcement.\par
 % \end{enumerate}
-% \item \label{LPPL:item:change}If you make an `intention announcement'
-%   as described in~\vref{LPPL:item:intention} above and after three
+% \item \label{item-change}If you make an `intention announcement'
+%   as described in~item~\ref{item-intention} in the list on p.\thinspace\pageref{item-intention} above and after three
 %   months your intention is challenged neither by the Current
 %   Maintainer nor by the Copyright Holder nor by other people,
 %   then you may arrange for the Work to be changed so as to
-%   name you as the (new) Current Maintainer.
+%   name you as the (new) Current Maintainer.\par
 % \item If the previously unreachable Current Maintainer becomes
 %   reachable once more within three months of a change
-%   completed under the terms of~\vref{LPPL:item:announce}
-%   or~\vref{LPPL:item:change}, then that
+%   completed under the terms of~item~\ref{item-announce} in the list on p.\thinspace\pageref{item-announce}
+%   or~item~\ref{item-change} above, then that
 %   Current
 %   Maintainer must become or remain the Current Maintainer upon
 %   request provided they then update their communication data
-%   within one month.
+%   within one month.\par
 % \end{enumerate}
 % A change in the Current Maintainer does not, of itself,
 %       alter the fact that the Work is distributed under the
-%       \textsc{lppl} license.\par
+%       {\smaller LPPL} license.\par
 % If you become the Current Maintainer of the Work, you should
 %       immediately provide, within the Work, a prominent and
 %       unambiguous statement of your status as Current Maintainer.  You
 %       should also announce your new status to the same pertinent
-%       community as in~\vref{LPPL:item:intention}
+%       community as in~item~\ref{item-intention} in the list on p.\thinspace\pageref{item-intention}
 %       above.\par
 % \subsection{Whether and How to Distribute Works under This
-%       License}\label{LPPL:Distribute}
+%       License}\label{Distribute}
 % This section contains important instructions, examples, and
 %       recommendations for authors who are considering distributing
 %       their works under this license.  These authors are addressed as
 %       `you' in this section.\par
-% \subsubsection{Choosing This License or Another License}\label{LPPL:Choosing}
+% \subsubsection{Choosing This License or Another License}\label{Choosing}
 % If for any part of your work you want or need to use
 % \emph{distribution} conditions that differ
 % significantly from those in this license, then do not refer to
 % this license anywhere in your work but, instead, distribute
 % your work under a different license. You may use the text of
 % this license as a model for your own license, but your license
-% should not refer to the \textsc{lppl} or otherwise
+% should not refer to the {\smaller LPPL} or otherwise
 % give the impression that your work is distributed under the
-% \textsc{lppl}.\par
-% The document \url{modguide.tex} in the base \LaTeX{}
+% {\smaller LPPL}.\par
+% The document {\ttfamily{}modguide.tex} in the base \LaTeX{}
 % distribution explains the motivation behind the conditions of
 % this license.  It explains, for example, why distributing
-% \LaTeX{} under the \textsc{gnu} General Public
-% License (\textsc{gpl}) was considered inappropriate.
+% \LaTeX{} under the {\smaller GNU} General Public
+% License ({\smaller GPL}) was considered inappropriate.
 % Even if your work is unrelated to \LaTeX{}, the discussion in
-% \url{modguide.tex} may still be
+% {\ttfamily{}modguide.tex} may still be
 % relevant, and authors intending to distribute their works
 % under any license are encouraged to read it.\par
 % \subsubsection{A Recommendation on Modification Without
-% Distribution}\label{LPPL:WithoutDistribution}
+% Distribution}\label{WithoutDistribution}
 % It is wise never to modify a component of the Work, even
 % for your own personal use, without also meeting the above
 % conditions for distributing the modified component.  While you
@@ -763,7 +1191,7 @@ url 	 = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
 % of the Work identical with the public one.  Many works provide
 % ways to control the behavior of that work without altering any
 % of its licensed components.\par
-% \subsubsection{How to Use This License}\label{LPPL:HowTo}
+% \subsubsection{How to Use This License}\label{HowTo}
 % To use this license, place in each of the components of
 % your work both an explicit copyright notice including your
 % name and the year the work was authored and/or last
@@ -771,7 +1199,10 @@ url 	 = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
 % distribution and/or modification of that component is
 % constrained by the conditions in this license.\par
 % Here is an example of such a notice and statement:\par
-% \begin{verbatim}
+% \iffalse
+%<*ignore>
+% \fi
+\begin{lstlisting}[language={[LaTeX]TeX}]
 %%% pig.dtx
 %%% Copyright 2005 M. Y. Name
 %%
@@ -789,27 +1220,30 @@ url 	 = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
 %%
 %% This work consists of the files pig.dtx and pig.ins
 %% and the derived file pig.sty.
-% \end{verbatim}
+\end{lstlisting}
+% \iffalse
+%</ignore>
+% \fi
 % Given such a notice and statement in a file, the
 % conditions given in this license document would apply, with
 % the `Work' referring to the three files
-% \url{pig.dtx}, \url{pig.ins}, and \url{pig.sty} (the last being generated
-% from \url{pig.dtx} using \url{pig.ins}), the `Base
+% {\ttfamily{}pig.dtx}, {\ttfamily{}pig.ins}, and {\ttfamily{}pig.sty} (the last being generated
+% from {\ttfamily{}pig.dtx} using {\ttfamily{}pig.ins}), the `Base
 %   Interpreter' referring to any
 % `\LaTeX{}-Format', and both `Copyright
 %   Holder' and `Current Maintainer'
 % referring to the person
-% M.~Y.~Name\index{M.~Y.~Name}.\par
+% M.~Y.~Name\index{!}.\par
 % If you do not want the Maintenance section of
-% \textsc{lppl} to apply to your Work, change
+% {\smaller LPPL} to apply to your Work, change
 % `maintained' above into
 % `author-maintained'. However, we recommend that
 % you use `maintained' as the Maintenance
 % section was added in order to ensure that your Work remains
 % useful to the community even when you can no longer maintain
 % and support it yourself.\par
-% \subsubsection{Derived Works That Are Not Replacements}\label{LPPL:NotReplacements}
-% Several clauses of the \textsc{lppl} specify
+% \subsubsection{Derived Works That Are Not Replacements}\label{NotReplacements}
+% Several clauses of the {\smaller LPPL} specify
 % means to provide reliability and stability for the user
 % community. They therefore concern themselves with the case
 % that a Derived Work is intended to be used as a (compatible or
@@ -817,22 +1251,28 @@ url 	 = {http://mirror.ctan.org/macros/generic/misc/swrule.sty}
 % the case (e.g., if a few lines of code are reused for a
 % completely different task), then clauses 6b and 6d shall not
 % apply.\par
-% \subsubsection{Important Recommendations}\label{LPPL:Recommendations}
-% \paragraph{Defining What Constitutes the Work}
-% The \textsc{lppl} requires that distributions
+% \subsubsection{Important Recommendations}\label{Recommendations}
+% \paragraph[Defining What Constitutes the Work]{Defining What Constitutes the Work :}
+% The {\smaller LPPL} requires that distributions
 %   of the Work contain all the files of the Work.  It is
 %   therefore important that you provide a way for the licensee
 %   to determine which files constitute the Work.  This could,
 %   for example, be achieved by explicitly listing all the files
 %   of the Work near the copyright notice of each file or by
 %   using a line such as:\par
-% \begin{verbatim}
+% \iffalse
+%<*ignore>
+% \fi
+\begin{lstlisting}[language={[LaTeX]TeX}]
 %% This work consists of all files listed in manifest.txt.
-% \end{verbatim}
+\end{lstlisting}
+% \iffalse
+%</ignore>
+% \fi
 % in that place.  In the absence of an unequivocal list it
 %   might be impossible for the licensee to determine what is
 %   considered by you to comprise the Work and, in such a case,
 %   the licensee would be entitled to make reasonable
 %   conjectures as to which files comprise the Work.\par
 % \Finale
-\endinput
+
diff --git a/macros/latex/contrib/decorule/decorule.ins b/macros/latex/contrib/decorule/decorule.ins
index b6080f8753..9033256828 100644
--- a/macros/latex/contrib/decorule/decorule.ins
+++ b/macros/latex/contrib/decorule/decorule.ins
@@ -1,5 +1,7 @@
-%%% decorule.ins
-%% Copyright © 2010-2011 by Peter Flynn <peter@silmaril.ie>
+% Transformed from decorule.xml by ClassPack db2dtx.xsl
+% version 1.19 (2020-05-19) on Thursday 21 May 2020 at 11:04:52
+%
+% decorule.ins is copyright © 2010-2020 by Peter Flynn <peter@silmaril.ie>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -11,26 +13,44 @@
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
-% This work has the LPPL maintenance status `maintained'.
+% This work has the LPPL maintenance status ‘maintained’.
 % 
 % The current maintainer of this work is Peter Flynn <peter@silmaril.ie>
 %
-% This work consists of the files decorule.dtx and decorule.ins
-% and the derived file decorule.sty.
+% This work consists of the files decorule.dtx and decorule.ins,
+% the derived file 
+% and any other ancillary files listed in the MANIFEST.
 %
 \input docstrip.tex
 \keepsilent
 \usedir{tex/latex/decorule}
 \preamble
+
+This is a generated file.
+
+Copyright © 2010 by Peter Flynn
+
 This file was generated from an XML master source.
 Amendments and corrections should be notified to the maintiner
 for inclusion in future versions.
+
 \endpreamble
-\generate{\file{decorule.sty}{\from{decorule.dtx}{package}}}
+\generate{\file{decorule.sty}{\from{decorule.dtx}{package}}
+}
 \obeyspaces
 \Msg{********************************************************}
 \Msg{**                                                    **}
-\Msg{** Read the documentation before using this package.  **}
+\Msg{** Read the documentation before using this package.    **}
+\Msg{**                                                    **}
+\Msg{** To finish the installation you have to move the    **}
+\Msg{** following file into a directory searched by TeX:   **}
+\Msg{**                                                    **}
+\Msg{**                                                    **}
+\Msg{**                                                    **}
+\Msg{** To produce the documentation run the file          **}
+\Msg{** decorule.dtx through pdfLaTeX and BiBTeX            **}
+\Msg{**                                                    **}
+\Msg{** Happy LaTeXing!                                    **}
 \Msg{**                                                    **}
 \Msg{********************************************************}
 \endbatchfile
diff --git a/macros/latex/contrib/decorule/decorule.pdf b/macros/latex/contrib/decorule/decorule.pdf
index 6cdb2bd06d..027e981ede 100644
--- a/macros/latex/contrib/decorule/decorule.pdf
+++ b/macros/latex/contrib/decorule/decorule.pdf
diff --git a/macros/latex/contrib/suftesi/suftesi.dtx b/macros/latex/contrib/suftesi/suftesi.dtx
index 8faa427e85..cdeca22b56 100644
--- a/macros/latex/contrib/suftesi/suftesi.dtx
+++ b/macros/latex/contrib/suftesi/suftesi.dtx
@@ -4,28 +4,34 @@
 \input docstrip
 \preamble
 
- Copyright 2009-2020 by Ivan Valbusa
+The 'suftesi' document class 
+Copyright (C) 2009-2020 Ivan Valbusa
+<ivan dot valbusa at gmail dot com> 
 
- This program is provided under the terms of the
- LaTeX Project Public License distributed from CTAN
- archives in directory macros/latex/base/lppl.txt.
+All rights reserved.
 
- Author: Ivan Valbusa
-         ivan dot valbusa at univr dot it
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+of this license or (at your option) any later version. 
+The latest version of this license is in
+   http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
 
- This work has the LPPL maintenance status "author-maintained".
+This work consists of all files listed in README
 
-\endpreamble
+This work has the LPPL maintenance status "author-maintained".
 
+\endpreamble
 \keepsilent
 \askforoverwritefalse
 
 \Msg{*** Generating the class file ***}
-\generate{\file{suftesi.cls}{\from{suftesi.dtx}{class}}
-   \nopreamble\nopostamble
-   \file{suftesi.bib}{\from{suftesi.dtx}{bib}}
- }
- 
+\generate{
+  \file{suftesi.cls}{\from{suftesi.dtx}{class}}
+  \nopreamble\nopostamble
+  \file{suftesi.bib}{\from{suftesi.dtx}{bib}}} 
+
 \Msg{***********************************************************}
 \Msg{*}
 \Msg{* To finish the installation you have to move the following}
@@ -40,26 +46,9 @@
 \Msg{*}
 \Msg{* Happy TeXing}
 \Msg{***********************************************************}
-
 \endgroup
 %</internal>
-%
-% Copyright (C) 2009-2020 by Ivan Valbusa 
-% <ivan dot valbusa at univr dot it>
-% -------------------------------------------------------
-% 
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-%   http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work consists of all files listed in README
-%
 % \fi
-%
 % \iffalse
 %<*driver>
 \ProvidesFile{suftesi.dtx}
@@ -67,87 +56,79 @@
 %<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<class>\ProvidesClass{suftesi}
 %<*class>
-    [2020/02/24 v2.9.8 A class for typesetting theses, books and articles]
+    [2020/05/21 v2.9.9 A class for typesetting theses, books and articles]
 %</class>
 %<*driver>
-\documentclass[10pt]{ltxdoc}
+\documentclass[12pt]{ltxdoc}
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
 \usepackage[greek.ancient,english]{babel}
-% fonts and colors
-\usepackage{cochineal}
-\usepackage[varqu,varl,var0]{inconsolata}
-\usepackage{biolinum}
-\usepackage{amsthm}
-\usepackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
-\usepackage[cal=boondoxo]{mathalfa}
+%--------------------------------------------------------
+% GRAPHICS
+%--------------------------------------------------------
 \usepackage[svgnames]{xcolor}
 \definecolor{philA}{named}{DarkRed}
 \definecolor{philB}{named}{NavyBlue}
 \definecolor{sufred}{rgb}{0.5,0,0}
 \definecolor{sufgray}{rgb}{0.5,0.5,0.5}
-\usepackage{metalogo}
-\usepackage{guit}
+\usepackage{tikz}
+\usetikzlibrary{shadows}
+\usepackage[framemethod=TikZ]{mdframed}
+\mdfsetup{roundcorner=3pt,linecolor=white,backgroundcolor=gray!10}
+%--------------------------------------------------------
+% DOC FACILITIES
+%--------------------------------------------------------
+\usepackage{metalogo,hologo}
+\usepackage{guit}% before ltxdockit but after xcolor!
 \usepackage[final]{microtype}
-% doc facilities
 \let\cs\relax
 \let\cmd\relax
 \usepackage{ltxdockit}
-\usepackage{siunitx}
+%--------------------------------------------------------
+% FONTS
+%--------------------------------------------------------
+\usepackage{cochineal}
 % To use the cochineal inside the document we have to define the family
 % because the .fd files of the font refer to conditionals 
 % defined in 'cochineal.sty’:
 \DeclareFontFamily{T1}{Cochineal-LF}{}
 \DeclareFontShape{T1}{Cochineal-LF}{m}{n}{
-	<-> s*[1.0] Cochineal-Roman-osf-t1}{}
-% layout
+  <-> s*[1.0] Cochineal-Roman-osf-t1}{}
+\usepackage[varqu,varl,var0]{inconsolata}
+\usepackage{biolinum}
+\usepackage{amsthm}
+\usepackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
+\usepackage[cal=boondoxo]{mathalpha}
+%--------------------------------------------------------
+% LAYOUT
+%--------------------------------------------------------
+\usepackage[skip=1.5ex]{parskip}
 \setcounter{tocdepth}{3}
 \usepackage{geometry}
 \geometry{
-	a4paper,
-	margin=3cm,
-	headheight=15pt,
-	ignoreall,
-	heightrounded}
+  a4paper,
+  margin=3cm,
+  %paperwidth=128mm,
+  %paperheight=96mm,
+  %margin=1cm,
+  headheight=15pt,
+  ignoreall,
+  heightrounded}
 \usepackage{sectsty}
 \allsectionsfont{\sffamily}
-\usepackage{fancyhdr}
-\fancyhf{}
-\fancyhead[L]{© 2009-\the\year\quad Ivan Valbusa}
-\fancyfoot[L]{\textsf{suftesi} 
-	\fileversion{}~--~\filedate}
-\renewcommand{\footrulewidth}{0.4pt}
-\fancyhead[R]{\thepage}
-\pagestyle{fancy}
-% Graphics
-\usepackage[framemethod=TikZ]{mdframed}
-  \mdfsetup{roundcorner=3pt,linecolor=white,backgroundcolor=gray!10}
-\usepackage{tikz}
-  \usetikzlibrary{shadows}
-\usepackage{afterpage}
-% Tables
+% --------------------------------------------------------
+% OTHER PACKAGES
+% --------------------------------------------------------
+\usepackage[autostyle]{csquotes}
+\usepackage[style=philosophy-classic,backend=biber]{biblatex}
+\addbibresource{suftesi.bib}
 \usepackage{array}
 \usepackage{booktabs}
 \usepackage{multirow}
-% Bibliography
-\usepackage[autostyle]{csquotes}
-\usepackage[style=philosophy-classic,backend=biber]{biblatex}
-  \addbibresource{suftesi.bib}
-\usepackage{metalogo}
-\usepackage{guit}
-% Greek examples
-\def\latintxt{Aliquam auctor, pede consequat
-  laoreet varius, eros tellus maris quam, pellentesque hendrerit.}  
-\def\latintxtb{Morbi luctus, wisi viverra faucibus pretium,
-  nibh est placerat.}
-\def\greektxt{Πρῶτον εἰπεῖν περὶ τί καὶ τίνος ἐστὶν ἡ σκέψις, ὅτι περὶ 
-ἀπόδειξιν καὶ ἐπιστήμης ἀποδεικτικῆς· εἶτα διορίσαι τί 
-ἐστι πρότασις καὶ τί ὅρος καὶ τί συλλογισμός}    
-\newcommand{\greekexample}[4]{%
-	\noindent\paragraph{#3}{\fontfamily{#1}\selectfont\latintxt}% 
-		{ \fontfamily{#2}\fontsize{#4}{13}\selectfont%
-		\textgreek{\greektxt}} {\fontfamily{#1}\selectfont\latintxtb}}
-% New commands
+\usepackage{siunitx}
+%--------------------------------------------------------
+% COMMANDS AND ENVIRONMENTS
+%--------------------------------------------------------
 \newcommand{\new}{\marginpar{\textcolor{red}{\textbf{NEW!}}}}
 \newcommand{\argstyle}{\itshape}
 \DeclareRobustCommand*{\ar}[1]{\texttt{\char`\{}\textrm{\argstyle#1}\texttt{\char`\}}}
@@ -156,85 +137,79 @@
   $\langle${\argstyle\rmfamily#1\kern0.12em}$\rangle$}
 \DeclareRobustCommand*{\arm}[1]{\ar{\meta{\argstyle#1}}}
 \DeclareRobustCommand*{\oarm}[1]{\oar{\meta{\argstyle#1}}}
+\newcommand*{\OR}{${}\mid{}$}
 % New environments
-\newenvironment{ttquote}
-  {\begin{mdframed}[default]
-  \ttfamily\microtypesetup{activate=false}}
-  {\end{mdframed}}
-\newenvironment{latexcode}
-  {\begin{mdframed}[default]}
-  {\end{mdframed}}
+\newenvironment{ttquote}{%
+  \begin{mdframed}\ttfamily\microtypesetup{activate=false}}{\end{mdframed}}
+\newenvironment{latexcode}{\begin{mdframed}}{\end{mdframed}}
 % Correct (?) \optitem to use \meta inside #2
 \makeatletter
 \renewcommand*{\ltd@ol@optitem}[3][]{%
   \ifblank{#1}
-    {\ltd@option{}{#2}{#3}{}}
-    {\ltd@option{}{#2}{#3}{\ltd@textverb{#1}}}}%
-\def\ltd@textverb#1{~#1~}
-\renewenvironment*{optionlist}
-{\list{}{%
-		\setlength{\labelwidth}{2.5cm}%
-		\setlength{\labelsep}{\z@}%
-		\setlength{\leftmargin}{2.5cm}%
-		\renewcommand*{\makelabel}[1]{\hss\optionlistfont##1}}%
-	\ltd@optionlist}
-{\endlist}
-\renewenvironment*{ltxsyntax}[1][3cm]
-{\list{}{%
-		\setlength{\labelwidth}{3cm}%
-		\setlength{\labelsep}{0pt}%
-		\setlength{\leftmargin}{#1}%
-		\renewcommand*{\makelabel}[1]{%
-			\hss\ltxsyntaxfont\ltxsyntaxlabelfont##1}}%
-	\let\csitem\ltd@csitem
-	\let\cmditem\ltd@cmditem
-	\let\envitem\ltd@envitem
-	\let\lenitem\ltd@csitem
-	\let\boolitem\ltd@boolitem
-	\let\cntitem\ltd@item
-	\let\optitem\ltd@item}
-{\endlist}
-{\endlist}
+  {\ltd@option{}{#2}{#3}{}}
+  {\ltd@option{}{#2}{#3}{\ltd@textverb{#1}}}}%
 \renewenvironment*{valuelist}[1][]
 {\list{}{%
-		\ifblank{#1}
-		{\setlength{\labelwidth}{5em}}
-		{\setlength{\labelwidth}{#1}}%
-		\setlength{\labelsep}{1em}%
-		\setlength{\leftmargin}{\labelwidth}%
-		\addtolength{\leftmargin}{\labelsep}%
-		\setlength{\itemsep}{0pt}%
-		\renewcommand*{\makelabel}[1]{\valuelistfont##1\hss}}}
+    \ifblank{#1}
+    {\setlength{\labelwidth}{5em}}
+    {\setlength{\labelwidth}{#1}}%
+    \setlength{\labelsep}{1em}%
+    \setlength{\leftmargin}{\labelwidth}%
+    \addtolength{\leftmargin}{\labelsep}%
+    \setlength{\itemsep}{0pt}%
+    \renewcommand*{\makelabel}[1]{\valuelistfont##1\hss}}}
 {\endlist}
 \newcommand*{\valuelistfont}{%
-	\color{olive}\sffamily\displayverbfont}
+  \color{olive}\sffamily\displayverbfont}
 \renewcommand*{\optionlistfont}{%
-	\color{philA}\sffamily\displayverbfont}
+  \color{philA}\sffamily\displayverbfont}
 \renewcommand*{\ltxsyntaxlabelfont}{%
-	\color{philA}\sffamily\displayverbfont}
+  \color{philA}\sffamily\displayverbfont}
 \renewcommand*{\marglistfont}{%
-	\color{philA}\sffamily\displayverbfont}
+  \color{philA}\sffamily\displayverbfont}
 % Table of contents
 \renewcommand\tableofcontents{%
-	\setlength{\columnsep}{1cm}
-	{\centering      
-		\section*{\contentsname}%
-		\@mkboth{\contentsname}{\contentsname}}   
-	\thispagestyle{empty}
-	\begin{multicols}{2}
-		\@starttoc{toc}%
+  \setlength{\columnsep}{1cm}
+  {\centering      
+    \section*{\contentsname}%
+    \@mkboth{\contentsname}{\contentsname}}   
+  \thispagestyle{empty}
+  \begin{multicols}{2}
+    \@starttoc{toc}%
 \end{multicols}}
 \makeatother
-% hyperref setup
+% --------------------------------------------------------
+% GREEK EXAMPLES
+% --------------------------------------------------------
+\makeatletter
+\newcommand{\mygrsize}{\f@size}
+\makeatother
+\newcommand{\mygrpxsize}{12.5}
+\def\latintxt{Aliquam auctor, pede consequat
+  laoreet varius, eros tellus maris quam, pellentesque hendrerit.}  
+\def\latintxtb{Morbi luctus, wisi viverra faucibus pretium,
+  nibh est placerat.}
+\def\greektxt{Πρῶτον εἰπεῖν περὶ τί καὶ τίνος ἐστὶν ἡ σκέψις, ὅτι περὶ 
+ἀπόδειξιν καὶ ἐπιστήμης ἀποδεικτικῆς· εἶτα διορίσαι τί 
+ἐστι πρότασις καὶ τί ὅρος καὶ τί συλλογισμός}    
+\newcommand{\greekexample}[4]{%
+  \noindent\paragraph{#3}{\fontfamily{#1}\selectfont\latintxt\ }% 
+    {\fontfamily{#2}\fontsize{#4}{13}\selectfont%
+    \textgreek{\greektxt}} {\fontfamily{#1}\selectfont\latintxtb}}
+% --------------------------------------------------------
+% HYPERREF SETUP
+% --------------------------------------------------------
 \usepackage{hyperref}
 \hypersetup{%
-	hidelinks,
+  hidelinks,
     pdftitle={User's Guide to \textsf{suftesi}},
     pdfsubject={A document class for typesetting theses, 
       books and articles},
     pdfauthor={Ivan Valbusa},
     pdfkeywords={thesis, humanities, books}}   
-
+% --------------------------------------------------------
+% FINAL SETTINGS
+% --------------------------------------------------------
 \EnableCrossrefs         
 \CodelineIndex
 \RecordChanges
@@ -246,7 +221,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{5277}
+% \CheckSum{5385}
 %
 % \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
@@ -264,6 +239,7 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
+% \changes{v2.9.9}{2020/05/21}{Removed a bug with \cmd{appendix} and roman chapter numbers in table of contents. Updated documentation.}
 % \changes{v2.9.8}{2020/02/24}{Removed license restrictions. Updated documentation.}
 % \changes{v2.9.7}{2020/02/22}{New option \opt{fontisize}. The \opt{parindent} options now accepts arbitrary values. Updated documentation.}
 % \changes{v2.9.6a}{2020/02/11}{Maintenance release}
@@ -356,17 +332,62 @@
 % \DoNotIndex{\titlepage,\vss,\vtop,\xdef,\@gobbletwo,\color,\dimexpr}
 % \DoNotIndex{\huge,\large,\makebox,\ProcessOptions,\renewcommand}
 %
+% \thispagestyle{empty}
+% \begin{tikzpicture}[overlay,remember picture]
+% \draw[circular drop shadow,draw=none,fill=white] (current page.center) circle (6cm) node[align=center,anchor=center] {%
+% Ivan Valbusa\\[1cm]
+% 
+%\Huge\color{gray}\bfseries \parbox{10cm}{\centering The \\{{\color{philA}\fontsize{30}{32}\textsf{suftesi}}\\ document class}}\\[1cm]
+% \color{black!60!Goldenrod}
+%
+%\normalsize \fileversion{} -- \filedate
+% 
+%};
+% \end{tikzpicture}
+% \clearpage\thispagestyle{empty}
+%
+% \null\vfill
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section*{Legalese}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%	
+% \noindent Copyright \copyright\ 2009-\the\year\ Ivan Valbusa
+% \smallskip
+%
+% \noindent This package is author-maintained. 
+% Permission is granted to copy, distribute and/or modify this software 
+% under the terms of the \LaTeX{} Project Public License, version 1.3 or 
+% later (\url{http://latex-project.org/lppl}). 
+% This software is provided ``as is'', without warranty of any kind, 
+% either expressed or implied, including, but not limited to, the implied 
+% warranties of merchantability and fitness for a particular purpose.
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section*{Feedback}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% If you have any questions, feedback or requests please email 
+% me at \texttt{ivan dot valbusa at gmail dot com}. If you need specific 
+% features not already implemented, remember to attach the example files.
+%
+% \clearpage
+%
 % \begin{center}
-% {\color{philA}\bfseries 
-%   \Huge User's Guide to \textsf{suftesi}\\[3mm]}
-% {\large\itshape A document class for typesetting theses,  books and articles}
+% {\color{philA}\bfseries\sffamily 
+%   \Huge User's Guide to \texttt{suftesi}\\[3mm]}
+% {\large\bfseries\sffamily A document class for typesetting theses,  books and articles}
 % \vspace{.8cm}
 %
 % \normalsize\fileversion{} -- \filedate
 % \vspace{.7cm}
 %
 % Ivan Valbusa\\[2mm]
-%  \footnotesize\texttt{Ivan dot Valbusa at univr dot it}
+%  \footnotesize\texttt{ivan dot valbusa at gmail dot com}
 % \vspace{1cm}
 % \end{center} 
 % \begin{abstract}
@@ -376,70 +397,94 @@
 % provides a set of ``humanistic'' page layouts, title styles 
 % and heading styles to typeset books, articles and theses. 
 % The styles are very simple and sober and also have the aim of
-% finding an aesthetic harmony in the formal simplicity  \parencite[see][]{valbusa:20122}. They are
+% finding an aesthetic harmony in the formal simplicity  
+% \parencite[see][]{valbusa:20122}. They are
 % largely inspired by some interesting readings, particularly
-% \citetitle{Bringhurst:1992} by Robert \textcite{Bringhurst:1992}, \citetitle{Tschichold:1975} by Jan \textcite{Tschichold:1975} and
+% \citetitle{Bringhurst:1992} by Robert \textcite{Bringhurst:1992}, 
+% \citetitle{Tschichold:1975} by Jan \textcite{Tschichold:1975} and
 % \citetitle{Morison:1111} by Stanley \textcite{Morison:1111}.
 % \end{abstract}
 %
-% \tableofcontents
-%
-% \section*{Legalese}
-%
-% \noindent Copyright \copyright\ 2009-\the\year\ Ivan Valbusa
-% \smallskip
-%
-% \noindent This package is author-maintained. 
-% Permission is granted to copy, distribute and/or modify this software under the 
-% terms of the LaTeX Project Public License, version 1.3 or later (\url{http://latex-project.org/lppl}). 
-% This software is provided ``as is'', without warranty of any kind, either expressed or implied, 
-% including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose.
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \tableofcontents
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
-% \section*{A brief history}
+% \clearpage
 %
-% The \sty{suftesi} class was born as a result of the course \emph{Introduzione a \LaTeX{} per le scienze umane} (\emph{Introduction to \LaTeX{} for the human sciences}) which I held at the Graduate School of Human Sciences and Philosophy  (\textcolor{magenta}{\textbf{S}}cienze \textcolor{magenta}{\textbf{U}}mane e \textcolor{magenta}{\textbf{F}}ilosofia) of Verona University (Italy) in June 2010. Originally thought as a class to typeset theses, during these years it has developed many new features and styles. Finally it has become the referential class of the Joint Project \emph{Formal Style for PhD Theses with LaTeX} of the University of Verona. 
 %
-% \section*{Acknowledgments}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section*{A brief history}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% The \sty{suftesi} class was born as a result of the course \emph{Introduzione 
+	% a \LaTeX{} per le scienze umane} (\emph{Introduction to \LaTeX{} for the human 
+	% sciences}) which I held at the Graduate School of Human Sciences and Philosophy 
+% (\textcolor{magenta}{\textbf{S}}cienze \textcolor{magenta}{\textbf{U}}mane e 
+% \textcolor{magenta}{\textbf{F}}ilosofia) of Verona University (Italy) in June 
+% 2010. Originally thought as a class to typeset theses, during these years 
+% it has developed many new features and styles. Finally it has become the 
+% referential class of the Joint Project \emph{Formal Style for PhD 
+	% Theses with \LaTeX} of the University of Verona. 
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section*{Acknowledgments}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % I would like to thank Professors Paola Di~Nicola,
-% Director of the Graduate School, and Ugo Savardi who suggested to propose the course precisely to that School; Gilberto D'Arduini, Matteo Lanza and Antonio Rinaldi, who installed \LaTeX{} on the computers used during the course; Catia Cordioli, for her help in the organization of the lessons; Corrado Ferreri, responsible of the \mbox{E-Learning} Center, who provided the \TeX{}~Live~2009 \textsc{DVD}s.
-% Special thanks to Professors Enrico~Gregorio, the Italian guru of \TeX, for the \TeX pert support and his priceless ``magic formulas'', and Tommaso Gordini for his valuable advice in choosing and improving the class features during these years.
-% I would finally thank all the participants to the course who patiently resisted the four intensive lessons. This work is dedicated to them.
-
-% \section*{Feedback}
-%
-% \noindent If you have any questions, feedback or requests please email me at \texttt{ivan dot valbusa at univr dot it}. If you need specific features not already implemented, remember to attach the example files.
+% Director of the Graduate School, and Ugo Savardi who suggested to propose 
+% the course precisely to that School; Gilberto D'Arduini, Matteo Lanza and 
+% Antonio Rinaldi, who installed \LaTeX{} on the computers used during the course; 
+% Catia Cordioli, for her help in the organization of the lessons; 
+% Corrado Ferreri, responsible of the \mbox{E-Learning} Center, who provided 
+% the \TeX{}~Live~2009 \textsc{DVD}s.
+% Special thanks to Professors Enrico~Gregorio, the Italian guru of \TeX, 
+% for the \TeX pert support and his priceless ``magic formulas'', and Tommaso 
+% Gordini for his valuable advice in choosing and improving the class 
+% features during these years. I would finally thank all the participants 
+% to the course who patiently resisted the four intensive lessons. 
+% This work is dedicated to them.
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section{Usage}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
-% \section{Use}
+% The class can be loaded as usual with:
 %
-% The \sty{suftesi} class is called as usual by
 % \begin{ttquote}
 % \cmd{documentclass}\oarm{options}\{suftesi\}
 % \end{ttquote}
-% All the options defined by the class are in the \meta{key}=\meta{value} format.
-%
-% In addition to these you can also use the options defined by the standard \sty{book} class (on which \sty{suftesi} is based) except those modifying 
-% the page dimensions (\opt{a4paper}, \opt{a5paper}, \opt{b5paper},  \opt{legalpaper}, \opt{executivepaper}  and \opt{landscape}), which are automatically disabled. The class loads the packages listed in table \ref{tab:pkgloaded}.
-%
-% \subsection*{Using with Xe\LaTeX and Lua\LaTeX}
-% For using the class with the \XeTeX{} and \LuaTeX{} engines you need to load the \sty{fontspec} package (\sty{mathspec} is an alternative only for \XeTeX) and to select a main font. 
-%
+% All the options defined by the class are in 
+% the \meta{key}\texttt{=}\meta{value} format. In addition to these you can
+% also use the options defined by the standard 
+% \sty{book} class (on which \sty{suftesi} is based) except those modifying 
+% the page dimensions (\opt{a4paper}, \opt{a5paper}, \opt{b5paper}, 
+%\opt{legalpaper}, \opt{executivepaper}  and \opt{landscape}), which are 
+% automatically disabled. The class loads the packages listed in 
+% the following table.
 %
 % \begin{table}[h]
 % \centering 
 % \begin{tabular}{>{\sffamily}r@{}>{\sffamily}l>{\raggedright\arraybackslash}>{\sffamily}p{9.6cm}}
 % \toprule
-% 					&	textrm{Global}					& 	appendix, caption, color, crop, enumitem, emptypage, 
-% 															fancyhdr, fixltxhyph, fontenc, geometry, iftex,
-% 															microtype, multicol, titlesec, titletoc, xkeyval, (cclicenses)	\\\midrule
-% 					&	\textrm{pdf\LaTeX{} only}		&	fontenc, substitutefont											\\\midrule
-% 					&	\textrm{Lua\LaTeX{} only}		&	luatex85														\\\midrule
-% defaultfont~=		&	~standard						&	lmodern															\\
-% 					&	~palatino						&	textcomp, newpxtext, biolinum, inconsolata, newpxmath			\\
-% 					&	~libertine						&	textcomp, libertine, biolinum, inconsolata, newtxmath			\\
-% 					&	~cochineal						&	textcomp, cochineal, biolinum, inconsolata, newtxmath			\\
-% 					&	~compatibility					&	mathpazo, beramono												\\\midrule
-% mathfont~=		&	~extended						&	amsthm, mathalfa												\\\bottomrule
+%               &  \textrm{Global}           &   appendix, caption, color, crop, enumitem, emptypage, 
+%                               fancyhdr, fixltxhyph, fontenc, geometry, iftex,
+%                               microtype, multicol, titlesec, titletoc, xkeyval, (cclicenses)            \\\midrule
+%               &  \textrm{pdf\LaTeX{} only} &  fontenc, substitutefont                                   \\\midrule
+%               &  \textrm{Lua\LaTeX{} only} &  luatex85                                                  \\\midrule
+% defaultfont~=                              &  ~standard                                   &  lmodern    \\
+%               &  ~palatino                 &  textcomp, newpxtext, biolinum, inconsolata, newpxmath     \\
+%               &  ~libertine                &  textcomp, libertine, biolinum, inconsolata, newtxmath     \\
+%               &  ~cochineal                &  textcomp, cochineal, biolinum, inconsolata, newtxmath     \\
+%               &  ~compatibility            &  mathpazo, beramono                                        \\\midrule
+% mathfont~=    &  ~extended                 &  amsthm, mathalpha                                          \\\bottomrule
 % \end{tabular}
 % \caption{Packages loaded by \sty{suftesi}}\label{tab:pkgloaded}
 % \end{table}
@@ -447,68 +492,129 @@
 % \changes{v0.9b}{2012/09/23}{The \sty{epigraph} package is no longer loaded}
 %
 %
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection*{Using with Xe\LaTeX and Lua\LaTeX}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
-% \section{Class features}
+% For using the class with the \XeTeX{} and \LuaTeX{} engines you need 
+% to load the \sty{fontspec} package (\sty{mathspec} is an alternative 
+% only for \XeTeX) and to select a main font. 
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section{Class features}
+% ^^A
+% ^^A ----------------------------------------------------------------
 % 
-% The \sty{suftesi} class provides a large set of options to customize the style of page, titles, headings and other text elements (see section \ref{sec:options}). The simplest way to get to know the class features is therefore to typeset one of the templates which you can find in the \texttt{/doc/latex/suftesi} folder in your \LaTeX{} distribution \parencite[see also][]{valbusa:20122}. The class files as well as the templates are also available online on the CTAN’s website at 
+% The \sty{suftesi} class provides a large set of options to customize 
+% the style of page, titles, headings and other text elements (see section 
+% \ref{sec:options}). The simplest way to get to know the class features 
+% is therefore to typeset one of the templates which you can find in the 
+% \texttt{/doc/latex/suftesi} folder in your \LaTeX{} distribution 
+% \parencite[see also][]{valbusa:20122}. The class files as well as the 
+% templates are also available online on the CTAN’s website at 
 % \textcolor{magenta}{\url{http://www.ctan.org/pkg/suftesi}}.
 %
-% \subsection{Document structure}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Document structure}
+% ^^A
+% ^^A ----------------------------------------------------------------
 % 
-% With \sty{suftesi} you can typeset book-style documents (with chapters), article-style documents (without chapters) and collections of papers (see section \ref{sec:collection}). The kind of document is set by the \opt{structure} option which defaults to \opt{book} (see section \ref{sec:options}).
-%
-% \begin{ttquote}
-% \cmd{documentclass}[structure=\meta{value},\meta{options}]\{suftesi\}
-% ^^A\cmd{documentclass}[structure=article,\meta{options}]\{suftesi\}\\
-% ^^A\cmd{documentclass}[structure=collection,\meta{options}]\{suftesi\}
-% \end{ttquote}
-%
-% \changes{v0.9b}{2012/09/23}{The \sty{mparhack} package is no longer loaded. It is not compatible with \sty{crop}.}
+% With \sty{suftesi} you can typeset book-style documents (with chapters), 
+% article-style documents (without chapters) and collections of papers 
+% (see section \ref{sec:collection}). The kind of document is set by the 
+% \opt{structure} option which defaults to \opt{book} (see section 
+% \ref{sec:options}).
+%
+% \changes{v0.9b}{2012/09/23}{The \sty{mparhack} package is no longer 
+% loaded. It is not compatible with \sty{crop}.}
 % 
-% \subsection{Page layouts}
-%
-% The class provides nine page layouts which can be selected by the \opt{pagelayout} option (table \ref{tab:layouts}). The \opt{standard} layout (default) or \opt{standardaureo} layout are aimed to typeset  A4 documents, while the other seven layouts are particularly suitable to typeset compact books, articles or theses. For these compact layouts  the \opt{version=screen} and \opt{version=cscreen} options are particularly useful as they show the output in its real size. See section \ref{sec:page-styles} for details.
-%
-% \begin{table}[h]
-% \centering
-% \begin{tabular}{lcccccccl}
-% \toprule
-% 							&	\multicolumn{4}{c}{Dimensions(mm)}		&	\multicolumn{4}{c}{Proportions}\\\cmidrule(lr){2-5}\cmidrule(lr){6-9}
-% 							&	\multicolumn{2}{c}{Typeblock}&	\multicolumn{2}{c}{Page}&	\multicolumn{2}{c}{Margins}	
-% 							&	\multicolumn{2}{c}{Stock}\\\cmidrule(lr){2-3}\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(l){8-9}
-% Layout					&	w	&	h	&	w	&	h	&	t\,/\,b	&	i	\,/\,o	&	Typeblock									&	Page\\
-% \cmidrule(r){2-3}\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(l){8-9}\cmidrule(r){1-1}
-% \opt{standard}			&	110	&	220	&	210	&	297	&	$1:2$	&	$1:2$		&	$1:2$										&	$1:\sqrt{2}$	\\
-% \opt{standardaureo}		&	136	&	220	&	210	&	297	&	$2:3$	&	$2:3$		&	$5:8$ \makebox[0pt]{\textsuperscript{*}}	&	$1:\sqrt{2}$	\\
-% \opt{compact}				&	110	&	165	&	160	&	240	&	$2:3$	&	$2:3$		&	$2:3$										&	$2:3$			\\
-% \opt{compactaureo}		&	118	&	191	&	160	&	240	&	$2:3$	&	$2:3$		&	$5:8$ \makebox[0pt]{\textsuperscript{*}}	&	$2:3$			\\
-% \opt{supercompact}		&	100	&	150	&	140	&	210	&	$2:3$	&	$2:3$		&	$2:3$										&	$2:3$			\\
-% \opt{supercompactaureo}	&	108	&	175	&	140	&	210	&	$1:1$	&	$1:1$		&	$5:8$ \makebox[0pt]{\textsuperscript{*}}	&	$2:3$			\\
-% \opt{periodical}			&	110	&	165	&	170	&	240	&	$2:3$	&	$2:3$		&	$2:3$										&	$1:\sqrt{2}$	\\
-% \opt{periodicalaureo}		&	120	&	194	&	170	&	240	&	$2:3$	&	$2:3$		&	$5:8$ \makebox[0pt]{\textsuperscript{*}}	&	$1:\sqrt{2}$	\\
-% \bottomrule\\[-2ex]
-% \multicolumn{9}{r}{\footnotesize\textsuperscript{*}$5:8\approx1:1,618$}
-% \end{tabular}\\[-3ex]
-% \caption{The layouts of \sty{suftesi}}\label{tab:layouts}
-% \end{table}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Page layouts}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% The class provides eight page layouts which can be selected by the 
+% \opt{pagelayout} option (table \ref{tab:layouts}). The \opt{standard} 
+% layout (default) or \opt{standardaureo} layout are aimed to typeset 
+% A4 documents, while the other seven layouts are particularly suitable 
+% to typeset compact books, articles or theses. For these compact layouts 
+% the \opt{version=screen} and \opt{version=cscreen} options are particularly 
+% useful as they show the output in its real size. See section 
+% \ref{sec:page-styles} for details.
+%
+%\begin{table}[h]
+%\centering
+%\begin{tabular}{@{}lccccr@{\,$:$\,}lr@{\,$:$\,}lcr@{\,$:$\,}l@{}}
+%\toprule
+%                                     & 
+% \multicolumn{4}{c}{Dimensions (mm)} &
+% \multicolumn{7}{c}{Proportions}     \\
+% \cmidrule(lr){2-5}
+% \cmidrule(l){6-12}
+%                               &
+% \multicolumn{2}{c}{Typeblock} &
+% \multicolumn{2}{c}{Page}      & 
+% \multicolumn{4}{c}{Margins}   &
+% \multicolumn{3}{c}{Stock}     \\
+% \cmidrule(lr){2-3}
+% \cmidrule(lr){4-5}
+% \cmidrule(lr){6-9}
+% \cmidrule(l){10-12}
+% Layout                        & w & h & w & h & 
+% \multicolumn{2}{c}{t\,/\,b}   & 
+% \multicolumn{2}{c}{i\,/\,o}   & 
+% Typeblock                     & 
+% \multicolumn{2}{c}{Page}      \\
+% \cmidrule(r){1-1}
+% \cmidrule(rl){2-3}
+% \cmidrule(lr){4-5}
+% \cmidrule(lr){6-9}
+% \cmidrule(l){10-12}
+% \opt{standard}          & 110 & 220 & 210 & 297 & $1$ & $2$ & $1$ & $2$ & 1\,:\,2 & $1$ & $\sqrt{2}$ \\
+% \opt{standardaureo}     & 136 & 220 & 210 & 297 & $2$ & $3$ & $2$ & $3$ & 
+% 5\,:\,8\makebox[0pt]{\ \textsuperscript{*}}     & $1$ & $\sqrt{2}$ \\
+% \opt{compact}           & 110 & 165 & 160 & 240 & $2$ & $3$ & $2$ & $3$ & 2\,:\,3 & $2$ & $3$ \\
+% \opt{compactaureo}      & 118 & 191 & 160 & 240 & $2$ & $3$ & $2$ & $3$ & 
+% 5\,:\,8\makebox[0pt]{\ \textsuperscript{*}}     & $2$ & $3$         \\
+% \opt{supercompact}      & 100 & 150 & 140 & 210 & $2$ & $3$ & $2$ & $3$ & 2\,:\,3 & $2$ & $3$ \\
+% \opt{supercompactaureo} & 108 & 175 & 140 & 210 & $1$ & $1$ & $1$ & $1$ & 
+% 5\,:\,8\makebox[0pt]{\ \textsuperscript{*}}     & $2$ & $3$         \\
+% \opt{periodical}        & 110 & 165 & 170 & 240 & $2$ & $3$ & $2$ & $3$ & 2\,:\,3 & $1$ & $\sqrt{2}$ \\
+% \opt{periodicalaureo}   & 120 & 194 & 170 & 240 & $2$ & $3$ & $2$ & $3$ & 
+% 5\,:\,8\makebox[0pt]{\ \textsuperscript{*}}     & $1$ & $\sqrt{2}$  \\
+%\bottomrule\\[-2ex]
+%\multicolumn{12}{r}{\footnotesize\textsuperscript{*}5\,:\,8\,$\approx$\,1\,:\,1,618}
+%\end{tabular}\\[-3ex]
+%\caption{The layouts of \sty{suftesi}}\label{tab:layouts}
+%\end{table}
+%
+% You can define your own layouts through the \cmd{geometry} command
+% and you can change the value of \cmd{baselineskip} too. For example 
+% you can resize the typeblock of the \texttt{supercompactaureo} layout 
+% to fit your particular needs. In this case remember to declare 
+% \cmd{normalsize} like in the following example:
 %
-% You can define your own layouts through the \cmd{geometry} command and you can change the value of \cmd{baselineskip} too. For example you can resize the typeblock of the \texttt{supercompactaureo} layout to fit your particular needs. In this case remember to declare \cmd{normalsize} like in the following example:
 % \begin{latexcode}
-% \begin{verbatim}
-% \linespread{0.95}
-% \normalsize
-% \geometry{
-% textheight=     162mm,
-% textwidth=      100mm,
-% paperwidth=     140mm,
-% paperheight=    210mm,
-% hmarginratio=    2:3,
-% vmarginratio=    1:1,
-% marginparwidth= 11mm,
-% marginparsep=   7pt,
-% ignoreall,
-% heightrounded}
-% \end{verbatim}
+%\begin{verbatim}
+%\linespread{0.95}
+%\normalsize
+%\geometry{
+%  textheight=     162mm,
+%  textwidth=      100mm,
+%  paperwidth=     140mm,
+%  paperheight=    210mm,
+%  hmarginratio=    2:3,
+%  vmarginratio=    1:1,
+%  marginparwidth= 11mm,
+%  marginparsep=   7pt,
+%  ignoreall,
+%  heightrounded}
+%\end{verbatim}
 % \end{latexcode}%
 % ^^A The form of the book has been changing through the centuries and every content requires a particular shape. Nowdays the most widespread form for literary essays is a compact one. So, if you are interested in such a topic, you should consider the compact layouts. The one I prefer is shown on figure \ref{fig:periodicalaureo}.
 %
@@ -522,26 +628,62 @@
 % ^^A\caption{The \opt{periodicalaureo} layout}\label{fig:periodicalaureo}
 % ^^A\end{figure}
 %
-% \subsection{Fonts}
-%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Fonts}
+% ^^A
+% ^^A ----------------------------------------------------------------
 % 
 % The default roman font is Cochineal by Michael Sharpe,
-% the sans serif font is Linux Biolinum O, designed by Philipp H. Poll,\index{Poll, Philipp H.} and the typewriter face is Inconsolata by Michael Sharpe. Cochineal is a fork of Crimson, by Sebastina Kosch, a font inspired by masterpieces like Sabon (Jan Tschichold) and Minion (Robert Slimbach). It is a very complete typeface and it offers full support for Greek and Cyrillic, real small caps (even in italic shape) and four figure styles. Moreover it provides support for mathematics through the \sty{newtxmath} package.
-%
-% The \opt{defaultfont}  option allows you to can change the default roman font to New PX (Palatino-like), Linux Libertine O, or Latin modern. 
-% You can use other fonts as well, but in this case remember to load the \opt{defaultfont=none} option which turns off the default font settings (see section \ref{sec:options} for details). 
-%
-% Today there are several Garamond-like fonts in TeX Live distribution. See, for example \textit{Garamond Libre} (Open Type only) and \textit{Cormorant Garamond}. The Bembo-like fonts \textit{Etbb} and \textit{fbb} should also be considered if you appreciate humanist fonts. In any case, before using a font, read the license carefully.
-%
-% Another beautiful Garamond-like font, complete of real small caps, bold weight and mathematical support, is made available by the \sty{garamondx} package by Michael Sharpe, which provides an extension of the \sty{ugm} fonts, (URW)++ GaramondNo8 (see the License note in the package documentation at the web page \url{https://www.ctan.org/pkg/garamondx}. They are not distributed as part of \TeX Live, but they may be downloaded using the \texttt{getnonfreefonts} script. See the instructions for installation at
-% \url{http://tug.org/fonts/getnonfreefonts/}.
-%
-%
-% \subsubsection[Mathematics]{Typesetting mathematics}
-%
-% The class loads by default a ‘minimal’ mathematical support for Cochineal (default), Linux Libertine O or New PX via the \sty{newtxmath} or \sty{newpxmath} packages by Michael Sharpe. Moreover the \opt{mathfont} option is provided to extend or disable the support for mathematics when using these fonts. These non-standard fonts have a very good mathematical support but if you aim at typesetting high mathematics the Latin Modern font family remains, of course, the better choice: \opt{defaultfont=standard}. See section \ref{sec:fonts} for details. 
-%
-% If some of the loaded packages conflict or if you simply want to change some of the default font settings you should first reset the font default with \opt{defaultfont=none} option and then load the packages in the right order and with your favorite options. 
+% the sans serif font is Linux Biolinum O, designed by Philipp H. 
+% Poll,\index{Poll, Philipp H.} and the typewriter face is Inconsolata 
+% by Michael Sharpe. Cochineal is a fork of Crimson, by Sebastian Kosch, 
+% a font inspired by masterpieces like Sabon (Jan Tschichold) and Minion 
+% (Robert Slimbach). It is a very complete typeface and it offers full 
+% support for Greek and Cyrillic, real small caps (even in italic shape) 
+% and four figure styles. Moreover it provides support for mathematics 
+% through the \sty{newtxmath} package.
+%
+% The \opt{defaultfont}  option allows you to can change the default roman 
+% font to New PX (Palatino-like), Linux Libertine O, or Latin Modern. 
+% You can use other fonts as well, but in this case remember to load the 
+% \opt{defaultfont=none} option which turns off the default font settings 
+% (see section \ref{sec:options} for details). 
+%
+% Today there are several Garamond-like fonts in \TeX~Live distribution. 
+% See, for example Garamond Libre (OpenType only) and Cormorant Garamond. 
+% The Bembo-like fonts Etbb and fbb should also be considered if you 
+% appreciate humanist fonts. In any case, before using a font, read the 
+% license carefully.
+%
+% Another beautiful Garamond-like font, complete of real small caps, 
+% bold weight and mathematical support, is made available by the 
+% \sty{garamondx} package by Michael Sharpe, which provides an extension 
+% of the \sty{ugm} fonts, (URW)++ GaramondNo8 (see the License note in the 
+% package documentation at the web page \url{https://www.ctan.org/pkg/garamondx}. 
+% They are not distributed as part of \TeX~Live, but they may be downloaded 
+% using the \texttt{getnonfreefonts} script. See the instructions for 
+% installation at \url{http://tug.org/fonts/getnonfreefonts/}.
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsubsection[Mathematics]{Typesetting mathematics}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% The class loads by default a ‘minimal’ mathematical support for Cochineal 
+% (default), Linux Libertine O or New PX via the \sty{newtxmath} or 
+% \sty{newpxmath} packages by Michael Sharpe. Moreover the \opt{mathfont} 
+% option is provided to extend or disable the support for mathematics when 
+% using these fonts. These non-standard fonts have a very good mathematical 
+% support but if you aim at typesetting high mathematics the Latin Modern 
+% font family remains, of course, the better choice: \opt{defaultfont=standard}. 
+% See section \ref{sec:fonts} for details. 
+%
+% If some of the loaded packages conflict or if you simply want to change 
+% some of the default font settings you should first reset the font default 
+% with \opt{defaultfont=none} option and then load the packages in the right 
+% order and with your favorite options. 
 % ^^AFor example, these are the codes loaded for the three non-standard fonts:
 % ^^A
 % ^^A\paragraph{defaultfont=cochineal}
@@ -557,7 +699,7 @@
 % ^^A\usepackage{cochineal}
 % ^^A\usepackage{amsthm}
 % ^^A\usepackge[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
-% ^^A\usepackge[cal=boondoxo]{mathalfa}
+% ^^A\usepackge[cal=boondoxo]{mathalpha}
 % ^^A\useosf
 % ^^A\useproportional
 % ^^A\end{verbatim}
@@ -573,7 +715,7 @@
 % ^^A\usepackage[varqu,varl]{inconsolata}
 % ^^A\usepackage{amsthm}
 % ^^A\usepackage[bigdelims,vvarbb]{newpxmath}
-% ^^A\usepackage[cal=boondoxo]{mathalfa} 
+% ^^A\usepackage[cal=boondoxo]{mathalpha} 
 % ^^A\useosf
 % ^^A\useproportional
 % ^^A\end{verbatim}
@@ -588,43 +730,90 @@
 % ^^A\usepackage[varqu,varl,scaled=0.94]{inconsolata}
 % ^^A\usepackage{amsthm}
 % ^^A\usepackage[libertine,bigdelims,vvarbb]{newtxmath}
-% ^^A\usepackage[cal=boondoxo]{mathalfa} 
+% ^^A\usepackage[cal=boondoxo]{mathalpha} 
 % ^^A\useosf
 % ^^A\end{verbatim}
 % ^^A\end{latexcode}
 % 
 %
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsubsection[Greek]{Typesetting Greek}
+% ^^A
+% ^^A ----------------------------------------------------------------
+% 
+% The Cochineal default font is complete of Greek and Cyrillic. Anyway 
+% the class provides the \opt{greekfont} option (see section \ref{sec:fonts}) 
+% to select four different Greek fonts for use with the roman typeface
+% set by the \opt{defaultfont} option (except for the \opt{defaultfont=standard} 
+% option, i.e. with Latin Modern font family which uses the CB Greek by default). 
+% These fonts are: GFS Bodoni, GFS Artemisia, GFS Porson (by the Greek Font Society) 
+% and CB Greek (by Claudio Beccari). You may, of course, choose a different font 
+% but in this case, as previously cleared, remember to load the 
+% \opt{defaultfont=none} option.
+%
+% \begin{mdframed}[backgroundcolor=philA!10,linecolor=white]\vskip-\baselineskip
+% \greekexample{Cochineal-LF}{Cochineal-LF}{Cochineal/Cochineal}{\mygrsize}
+% \greekexample{Cochineal-LF}{bodoni}{Cochineal/Bodoni}{\mygrsize}
+% \greekexample{Cochineal-LF}{artemisia}{Cochineal/Artemisia}{\mygrsize}
+% \greekexample{Cochineal-LF}{porson}{Cochineal/Porson}{\mygrsize}
+% \greekexample{Cochineal-LF}{lmr}{Cochineal/CB Greek}{\mygrsize}
+% \greekexample{LinuxLibertineT-OsF}{LinuxLibertineT-OsF}{Libertine/Libertine}{\mygrsize}
+% \greekexample{LinuxLibertineT-OsF}{bodoni}{Libertine/Bodoni}{\mygrsize}
+% \greekexample{LinuxLibertineT-OsF}{artemisia}{Libertine/Artemisia}{\mygrsize}
+% \greekexample{LinuxLibertineT-OsF}{porson}{Libertine/Porson}{\mygrsize}
+% \greekexample{LinuxLibertineT-OsF}{lmr}{Libertine/CB Greek}{\mygrsize}
+% \greekexample{zplosf}{bodoni}{New PX/Bodoni}{\mygrsize}
+% \greekexample{zplosf}{artemisia}{New PX/Artemisia}{\mygrsize}
+% \greekexample{zplosf}{porson}{New PX/Porson}{\mygrsize}
+% \greekexample{zplosf}{lmr}{New PX/CB Greek}{\mygrpxsize}
+% \greekexample{lmr}{cbgreek}{Latin Modern/CB Greek}{\mygrsize}
+% \end{mdframed}
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{The cover page}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% Since version 2.6 \sty{suftesi} provides a command to print a simple 
+% cover page (figure \ref{fig:cover}), inspired by the Italian designer 
+% Bruno \textcite[85-89]{munari:arte-come-mestiere}. The color used for 
+% the text and the circle as well as other graphical elements are partially 
+% customizable (see section \ref{sec:options} for details). The cover shown 
+% in figure \ref{fig:cover} is obtained with the following code:
+% \begin{latexcode}
+%\begin{verbatim}
+%\Cauthor{Bruce Lee}
+%\Ctitle{The Art of Kicking}
+%\Csubtitle{How to survive in the modern societies}
+%\Ceditor{edited by\\ Walker Texas Ranger}
+%\Cfoot{Punch Press\\\fbox{\bfseries P\&P}}
+%\Cpagecolor{white!90!black}
+%\Ctextcolor{white}
+%\Cfootcolor{black}
+%
+%\makecover[ball color=DarkBlue,draw=none]
+%\end{verbatim}
+% \end{latexcode}
 %
+% To produce a complete book cover, with spine and dust jacket, you should 
+% take a look at the \sty{bookcover} package by Tibor Tómács.
 %
-% \subsubsection[Greek]{Typesetting Greek}
-% 
-% The Cochineal default font is complete of Greek and Cyrillic. Anyway the class provides the \opt{greekfont} option (see section \ref{sec:fonts}) to select four different Greek fonts for use with the roman typeface
-% set by the \opt{defaultfont} option (except for the \opt{defaultfont=standard} option, i.e. with Latin Modern font family which uses the CB Greek by default). These fonts are: GFS Bodoni, GFS Artemisia, GFS Porson (by the Greek Font Society) and CB Greek (by Claudio Beccari). You may, of course, choose a different font but in this case, as previously cleared, remember to load the \opt{defaultfont=none} option.
-% 
 %
-% \greekexample{Cochineal-LF}{Cochineal-LF}{Cochineal/Cochineal}{10}
-% \greekexample{Cochineal-LF}{bodoni}{Cochineal/Bodoni}{10}
-% \greekexample{Cochineal-LF}{artemisia}{Cochineal/Artemisia}{10}
-% \greekexample{Cochineal-LF}{porson}{Cochineal/Porson}{10}
-% \greekexample{Cochineal-LF}{lmr}{Cochineal/CB Greek}{10}
-% \greekexample{LinuxLibertineT-OsF}{LinuxLibertineT-OsF}{Libertine/Libertine}{10}
-% \greekexample{LinuxLibertineT-OsF}{bodoni}{Libertine/Bodoni}{10}
-% \greekexample{LinuxLibertineT-OsF}{artemisia}{Libertine/Artemisia}{10}
-% \greekexample{LinuxLibertineT-OsF}{porson}{Libertine/Porson}{10}
-% \greekexample{LinuxLibertineT-OsF}{lmr}{Libertine/CB Greek}{10}
-% \greekexample{zplosf}{bodoni}{New PX/Bodoni}{10}
-% \greekexample{zplosf}{artemisia}{New PX/Artemisia}{10}
-% \greekexample{zplosf}{porson}{New PX/Porson}{10}
-% \greekexample{zplosf}{lmr}{New PX/CB Greek}{10.5}
-% \greekexample{lmr}{cbgreek}{Latin Modern/CB Greek}{10}
-%
-%
-% \begin{figure}
-% \centering
-% \begin{tikzpicture}
-% \draw[draw=gray,fill=white,drop shadow] (-.5\textwidth,0) rectangle (.5\textwidth,.9\textheight);
-% \draw[line width=.5mm,fill=white,text=black,draw=black!60] (-4.2,17.1) circle (9mm) node {\parbox{12mm}{\centering\tiny * * * \\  St. Anford\\ University\\[1mm] * * * }};
-% \node[anchor=north west] at (-2.5cm,18cm) {%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{The frontispiece} \enlargethispage{\baselineskip}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+%\begin{figure}
+%\begin{minipage}{.5\textwidth}
+%\centering
+%\begin{tikzpicture}[scale=0.4]%
+%\draw[draw=gray,fill=white,drop shadow] (-\textwidth,0) rectangle (\textwidth,.9\textheight);
+%\draw[line width=.1mm,fill=black!70,text=white,draw=black!300] (-4.2,18.1) circle (13mm) node {\parbox{10mm}{\centering\tiny ---*---\\ St. Anford\\ University\\ ---*--- }};
+% \node[scale=0.4,anchor=north west] at (-2.5cm,19cm) {%
 %  \parbox{8cm}{%
 %    \small University of St. Anford\par
 %      \normalsize Department of Typography
@@ -655,18 +844,17 @@
 %
 % Thesis submitted in 2010
 % }
-%      };
-%
-% \end{tikzpicture}
-% \caption{The frontispiece of \sty{suftesi}}\label{fig:frontispiece}
-% \end{figure}
-% \begin{figure}
-% \centering
-% \begin{tikzpicture}
-% \draw[draw=gray,fill=gray!5,drop shadow] (-.5\textwidth,0) rectangle (.5\textwidth,.9\textheight);
+% };
+%\end{tikzpicture}
+%\caption{The frontispiece of \sty{suftesi}}\label{fig:frontispiece}
+%\end{minipage}
+%\begin{minipage}{.5\textwidth}
+%\centering  
+%\begin{tikzpicture}[scale=0.4]%
+%\draw[draw=gray,fill=gray!5,drop shadow] (-\textwidth,0) rectangle (\textwidth,.9\textheight);
 % \node at (0,.65\textheight) (c) {};
 % \draw[ball color=DarkBlue,draw=none] (c) circle (4.5cm);
-% \node[anchor=center,text=white] at (c) {\parbox{6cm}{%
+% \node[scale=0.4,anchor=center,text=white] at (c) {\parbox{6cm}{%
 %  \centering
 %       {\scriptsize\scshape Bruce Lee\\}
 %       \vspace*{\baselineskip}
@@ -676,203 +864,212 @@
 %       {\smallskip\normalsize How to survive in the modern societies\\}
 %
 %       {\vspace*{2\baselineskip}\scriptsize edited by\\ Walker Texas Ranger\\}}};
-% \node[align=center] at (0,1) {\scriptsize \textcolor{black}{Punch Press}\\[1ex]\textcolor{black}{\fbox{§§§§}}\\};
-% \end{tikzpicture}
-% \caption{An example of the cover page of \sty{suftesi}}\label{fig:cover}
-% \end{figure}
-
-%
-% \subsection{The cover page}
-% Since version 2.6 \sty{suftesi} provides a command to print a simple cover page (figure \ref{fig:cover}), inspired by the Italian designer Bruno \textcite[85-89]{munari:arte-come-mestiere}. The color used for the text and the circle as well as other graphical elements are partially customizable (see section \ref{sec:options} for details). The cover shown in figure \ref{fig:cover} is obtained with the following code:
-% \begin{latexcode}
-% \begin{verbatim}
-% \Cauthor{Bruce Lee}
-% \Ctitle{The Art of Kicking}
-% \Csubtitle{How to survive in the modern societies}
-% \Ceditor{edited by\\ Walker Texas Ranger}
-% \Cfoot{Punch Press\\\fbox{\bfseries P\&P}}
-% \Cpagecolor{white!90!black}
-% \Ctextcolor{white}
-% \Cfootcolor{black}
-%
-% \makecover[ball color=DarkBlue,draw=none]
-% \end{verbatim}
-% \end{latexcode}
-%
-% To produce a complete book cover, with spine and dust jacket, you should take a look at the \sty{bookcover} package by Tibor Tómács.
-%
-% \subsection{The frontispiece} \enlargethispage{\baselineskip}
-%
-% The class has an original frontispiece (see figure \ref{fig:frontispiece}) now directly available 
-% loading the \sty{frontespizio} package  
+% \node[align=center] at (0,2) {\scriptsize \textcolor{black}{Punch Press}\\\textcolor{black}{\bfseries P\&P}};
+%\end{tikzpicture}
+%\caption{A cover page of \sty{suftesi}}\label{fig:cover}
+%\end{minipage}
+%\end{figure}
+%
+% The class has an original frontispiece (see figure \ref{fig:frontispiece}) 
+% now directly available loading the \sty{frontespizio} package  
 % with the \opt{suftesi} option. It is meant only for Italian users
 % \parencite[see][version 1.4 or later]{Gregorio:frontespizio}:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \usepackage[suftesi]{frontespizio}
-% \end{verbatim}
+%\begin{verbatim}
+%\usepackage[suftesi]{frontespizio}
+%\end{verbatim}
 % \end{latexcode}
-% Note that this frontispiece requires the use of a logo which could be restricted by some institutions. So before using it you have to be sure that you have the required permissions.
+% 
+% Note that this frontispiece requires the use of a logo which could be 
+% restricted by some institutions. So before using it you have to be sure 
+% that you have the required permissions.
 %
-% The \sty{frontespizio} package produces a frontispiece in the standard Computer Modern typeface. If you prefer a consistent font remember to load the needed packages or commands in the \cmd{Preambolo} command:
+% The \sty{frontespizio} package produces a frontispiece in the standard 
+% Computer Modern typeface. If you prefer a consistent font remember 
+% to load the needed packages or commands in the \cmd{Preambolo} command:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \begin{frontespizio} 
-%  \Preambolo{\usepackage[osf]{cochineal}}%  <===
-%  \Universita{Paperopoli} 
-%  \Dipartimento{Filosofia, Pedagogia e Psicologia} 
-%  \Corso[Laurea]{Filosofia} 
-%  \Annoaccademico{2030--2031} 
-%  \Titolo{La mia tesi:\\ una lunga serie di risultati\\
-%      difficilissimi e complicatissimi} 
-%  \Sottotitolo{Alcune considerazioni mutevoli} 
-%  \Candidato[vr12301231]{Paolo Rossi} 
-%  \Relatore{Guido Bianchi} 
-% \end{frontespizio}
-% \end{verbatim}
+%\begin{verbatim}
+%\begin{frontespizio} 
+% \Preambolo{\usepackage[osf]{cochineal}}%  <===
+% ...
+%\end{frontespizio}
+%\end{verbatim}
 % \end{latexcode}
 %
-%
-%
 % ^^A\subsection{Title page}
 % 
 % ^^A The class provides a very simple title page through the \cmd{maketitle} command. A large collection of stylish title pages is provided by the \sty{titlepages} package by Peter Wilson. This package is part of  the \sty{memoir} documentation but you can copy the code examples and adapt them to work with \sty{suftesi} with quite simple changes.
 %
-% \subsection{The appendices}
-% Since version 2.9.5 the class relies on \sty{appendix} package to manage the appendices. To get the correct label in titles, headings and table of contents, you should use the \env{appendices} environment. 
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{The appendices}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% Since version 2.9.5 the class relies on \sty{appendix} package to manage 
+% the appendices \parencite[see][]{wilson-robertson:appendix}. To get the correct label in titles, headings and table of 
+% contents, you should use the \env{appendices} environment. 
 % \begin{latexcode}
-% \begin{verbatim}
-% \renewcommand{\appendixpagename}{Appendices}
-% \renewcommand{\appendixname}{Appendix}
-% \addappheadtotoc
+%\begin{verbatim}
+%\renewcommand{\appendixpagename}{Appendices}
+%\renewcommand{\appendixname}{Appendix}
+%\addappheadtotoc
 %
-% \begin{document}
+%\begin{document}
 %...
-% \appendixpage
-%
-% \begin{appendices}
-%	
-%  \chapter{First appendix}
-%    Lorem ipsum
-%	
-%  \chapter{First appendix}
-%    Lorem ipsum
-%	
-% \end{appendices}
-% \end{document}
-% \end{verbatim}
+%\appendixpage
+%
+%\begin{appendices}
+%  
+% \chapter{First appendix}
+%   Lorem ipsum
+%  
+% \chapter{First appendix}
+%   Lorem ipsum
+%
+%\end{appendices}
+%\end{document}
+%\end{verbatim}
 % \end{latexcode}
 % 
 %
-% \section{Options}\label{sec:options}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section{Options}\label{sec:options}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
-% \subsection{Layout}\label{sec:page-styles}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Layout}\label{sec:page-styles}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{optionlist}
-% \optitem[book]{structure}{\opt{book}, \opt{article}, \opt{collection}}
+% \optitem[book]{structure}{\opt{book}\OR\opt{article}\OR\opt{collection}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{structure}} 
-% \begin{valuelist}
-% \item[book] For typesetting texts with chapters.
-% \item[article] For typesetting articles or short theses 
-% (without chapters).
-% \item[collection] For typesetting journals or collections of articles (see section \ref{sec:collection}).
-% \end{valuelist}
-% \optitem[standard]{pagelayout}{\opt{standard}, \opt{standardaureo},  \opt{periodical}, \opt{periodicalaureo}, \opt{compact}, \opt{compactaureo},  \opt{supercompact}, \opt{supercompactaureo}}
+%   \begin{valuelist}
+%     \item[book] For typesetting texts with chapters.
+%     \item[article] For typesetting articles or short theses 
+%     (without chapters).
+%     \item[collection] For typesetting journals or collections of articles 
+%     (see section \ref{sec:collection}).
+%   \end{valuelist}
+% \optitem[standard]{pagelayout}{\opt{standard}\OR\opt{standardaureo}%
+% \OR\opt{periodical}\OR\opt{periodicalaureo}\OR\opt{compact}\OR
+% \opt{compactaureo}\OR\opt{supercompact}\OR\opt{supercompactaureo}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{pagestyle}}
-% \begin{valuelist}
-% \item[standard]
-% Prints an A4 page with a 
-% typeblock of $\SI{110}{mm} \times \SI{220}{mm}$.
-% \end{valuelist}
+%   \begin{valuelist}
+%     \item[standard] Prints an A4 page with a 
+%      typeblock of $\SI{110}{mm} \times \SI{220}{mm}$.
+%   \end{valuelist}
 % With the following values the option prints the typeblock 
 % on a an A4 paper showing the crop marks which can be controlled 
 % by the \opt{version} option.
-% \begin{valuelist}
-% \item[periodical]
-% Prints a page  of $\SI{17}{cm} \times \SI{24}{cm}$ with a typeblock of  $\SI{11}{cm} \times \SI{16,5}{cm}$.
-% \item[periodicalaureo] The same of \opt{periodical} but with a 
-% \emph{golden ratio} typeblock of $\SI{120}{cm} \times \SI{194}{mm}$. 
-% \item[compact]
-% Prints a page  of $\SI{16}{cm} \times \SI{24}{cm}$ with a typeblock of $\SI{11}{cm} \times \SI{16,5}{cm}$. 
-% \item[compactaureo]
-% The same as \opt{compact} but with 
-% a \emph{golden ratio} typeblock of $\SI{11,8}{cm} \times \SI{19,1}{cm}$.% \item[supercompact]
-% Prints a page  of  $\SI{14}{cm} \times \SI{21}{cm}$  with a typeblock of $\SI{10}{cm} \times \SI{15,5}{cm}$.
-% \item[supercompactaureo]
-% The same as \opt{supercompact} but with 
-% a \emph{golden ratio} typeblock of $\SI{10,8}{cm} \times \SI{17,5}{cm}$.
-% \end{valuelist}
+%   \begin{valuelist}
+%     \item[periodical]
+%     Prints a page  of $\SI{17}{cm} \times \SI{24}{cm}$ with a typeblock of  
+%     $\SI{11}{cm} \times \SI{16,5}{cm}$.
+%     \item[periodicalaureo] The same of \opt{periodical} but with a 
+%     \emph{golden ratio} typeblock of $\SI{120}{cm} \times \SI{194}{mm}$. 
+%     \item[compact]
+%     Prints a page  of $\SI{16}{cm} \times \SI{24}{cm}$ with a typeblock of 
+%     $\SI{11}{cm} \times \SI{16,5}{cm}$. 
+%     \item[compactaureo]
+%     The same as \opt{compact} but with 
+%     a \emph{golden ratio} typeblock of $\SI{11,8}{cm} \times \SI{19,1}{cm}$.
+%     \item[supercompact]
+%     Prints a page  of  $\SI{14}{cm} \times \SI{21}{cm}$  with a typeblock of 
+%     $\SI{10}{cm} \times \SI{15,5}{cm}$.
+%     \item[supercompactaureo]
+%     The same as \opt{supercompact} but with 
+%     a \emph{golden ratio} typeblock of $\SI{10,8}{cm} \times \SI{17,5}{cm}$.
+%   \end{valuelist}
 % The details of this option are shown in table \ref{tab:layouts}.
-% \optitem[final]{version}{\opt{screen}, \opt{cscreen}, \opt{draft}, \opt{final}}
-% \begin{valuelist}
-% \item[screen] Prints the \textsc{pdf} with its real dimensions.
-% \item[cscreen] The same as \opt{version=screen} but with a centered typeblock.
-% \end{valuelist}
-% These previous two options are provided to have a better view when you are 
-% typesetting and reading the \textsc{pdf} on the screen or for online publications. The following options meant for printed documents.
-% \begin{valuelist}
-% \item[draft] 
-% Prints the output on a A4 paper, showing the crop marks. Useless with \opt{standard} and \opt{standardaureo} layouts.
-% \item[final] Prints the output on a A4 paper, hiding the crop marks. Useless with \opt{standard} and \opt{standardaureo} layouts.
-% \end{valuelist}
-% Sometimes it is not desirable to have the crop marks on every page. In such a case you can use the \cmd{crop}|[off]| command after the first page of the document.
+% \optitem[final]{version}{\opt{screen}\OR\opt{cscreen}\OR\opt{draft}
+% \OR\opt{final}}
+% The following two options are provided to have a better view when 
+% you are typesetting and reading the \textsc{pdf} on the screen 
+% or for online publications. 
+%   \begin{valuelist}
+%     \item[screen] Prints the PDF with its real dimensions.
+%     \item[cscreen] The same as \opt{version=screen} but with a centered 
+%     typeblock.
+%   \end{valuelist}
+% The following two options are meant for printed documents.
+%   \begin{valuelist}
+%     \item[draft] 
+%     Prints the output on a A4 paper, showing the crop marks. 
+%     Useless with \opt{standard} and \opt{standardaureo} layouts.
+%     \item[final] Prints the output on a A4 paper, hiding the crop marks. 
+%     Useless with \opt{standard} and \opt{standardaureo} layouts.
+%   \end{valuelist}
+% Sometimes it is not desirable to have the crop marks on every page. 
+% In such a case you can use the \cmd{crop}|[off]| command 
+% after the first page of the document.
 % \end{optionlist}
 %
-% \subsection{Font}\label{sec:fonts}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Font}\label{sec:fonts}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{optionlist}
-% \optitem[10]{fontsize}{10, 10.1, 10.2...,11, 11.1, 11.2...}
-% Sets the main font sizes for the document, changing the \cmd{baselineskip} accordingly. It is based on the \sty{fontsize} package. Remember that using \XeLaTeX{} or \LuaLaTeX{} you can change the default font size also with the option \opt{SizeFeatures} of \sty{fontspec}. For example:
+% \optitem[10\OR 10pt]{fontsize}{\meta{dimen}}
+% Sets the main font sizes for the document, changing the \cmd{baselineskip} 
+% accordingly (possible values: 10\OR 11pt\OR 10.7\OR 1.2ex\dots). It is based on the \sty{fontsize} package \parencite{Valbusa:fontsize}. 
+% Remember that using \XeLaTeX{} or \LuaLaTeX{} you can change the default 
+% font size also with the option \opt{SizeFeatures} of \sty{fontspec}. 
+% For example:
+% 
 % \begin{latexcode}
-% \begin{verbatim}
-% \setmainfont[SizeFeatures={Size=11.5}]{Garamond Libre}
-% \end{verbatim}
+%\begin{verbatim}
+%\setmainfont[SizeFeatures={Size=11.5}]{Garamond Libre}
+%\end{verbatim}
 % \end{latexcode}
 %
-% \end{optionlist}
-% The first three options below are available only with \LaTeX.
-% Using \XeLaTeX{} or \LuaLaTeX{} 
-% the default font is the Computer Modern but you can change it through 
-% the \sty{fontspec} or \sty{mathspec} (\XeLaTeX{} only) packages. If you do not need to typeset mathematics, with these engines I do suggest the EB Garamond font family by Georg Duffner.
-% 
-% \begin{optionlist}
-% \optitem[cochineal]{defaultfont}{\opt{none}, \opt{cochineal}, \opt{libertine}, \opt{palatino}, \opt{standard}}
+% \optitem[cochineal]{defaultfont}{\opt{none}\OR\opt{cochineal}
+% \OR\opt{libertine}\OR\opt{palatino}\OR\opt{standard}}
 %   \begin{valuelist}
 %     \item[none] Does not load any font. Use this option 
-%		if you want full control over the font selection.
+%    if you want full control over the font selection. This is the default with 
+%    \XeLaTeX{} or \LuaLaTeX.
 %     \item[cochineal] Loads the Cochineal serif, the Linux Biolinum O sans serif and the Inconsolata typewriter.
 %     \item[libertine] Loads the Linux Libertine O serif, the Linux Biolinum O sans serif and the Inconsolata typewriter.
-%     \item[palatino] Loads the New PX serif, the Linux Biolinum O sans serif and the Inconsolata typewriter. Note that the New PX font does not provide support for Greek. The \opt{greekfont=artemisa} option offers a very good solution.
+%     \item[palatino] Loads the New PX serif, the Linux Biolinum O sans serif and the Inconsolata typewriter. Note that the New PX font does not provide support for Greek. The \opt{greekfont=artemisia} option offers a very good solution.
 % ^^A and {\fontfamily{artemisia}\selectfont Artemisia} by the {\fontfamily{artemisia}\selectfont Greek Font Society} for the greek text.
 %     \item[standard] Loads the \sty{lmodern} package: Latin Modern font family and CB Greek.
 %   \end{valuelist}
-% \optitem[none]{greekfont}{\opt{none}, \opt{artemisia}, \opt{porson}, \opt{bodoni}, \opt{cbgreek}}
+% \optitem[none]{greekfont}{\opt{none}\OR\opt{artemisia}\OR\opt{porson}\OR\opt{bodoni}\OR\opt{cbgreek}}
 % Actually useless  with \opt{defaultfont=none} and not available with \opt{defaultfont=standard} options.
 % \changes{v0.9b}{2012/09/23}{New option \opt{greekfont}}
 %   \begin{valuelist}
-%     \item[none] Does not load any Greek font. 
+%     \item[none] Does not load any Greek font. This is the default with 
+%    \XeLaTeX{} or \LuaLaTeX. 
 %     \item[artemisia] Loads the Artemisia font by the Greek Font Society.
 %     \item[porson] Loads the Porson font by the Greek Font Society.\footnote{The first code for the Porson font (\sty{suftesi} <v.2.4) has been written by Enrico 
-% Gregorio. Claudio Beccari successively added the code to improve the 
-% scale factor when using this greek font in combination with Palatino.}
+%     Gregorio. Claudio Beccari successively added the code to improve the 
+%     scale factor when using this greek font in combination with Palatino.}
 %     \item[bodoni] Loads the Bodoni font by the Greek Font Society.
 %     \item[cbgreek] Loads the standard CB~Greek font by Claudio Beccari.
 %   \end{valuelist}
 %
-% \optitem[minimal]{mathfont}{\opt{none},\opt{minimal},\opt{extended}}
+% \optitem[minimal]{mathfont}{\opt{none}\OR\opt{minimal}\OR\opt{extended}}
 % 
 % Available only with Cochineal, Libertine and New PX fonts.
 %   \begin{valuelist}
-%     \item[none] Do not load any mathematical support. Use this option if you need some packages that have to be loaded before \sty{newtxmath} and \sty{newpxmath}.
+%     \item[none] Do not load any mathematical support. Use this option if you need some packages that have to be loaded before \sty{newtxmath} and \sty{newpxmath}. This is the default with 
+%    \XeLaTeX{} or \LuaLaTeX.
 %     \item[minimal]  Loads \sty{newtxmath} (for Cochineal and Linux Libertine O) or \sty{newpxmath} (for PX Fonts).
-%     \item[extended] Loads the previous option plus the \sty{amsthm} and \sty{mathalfa} packages. 
+%     \item[extended] Loads the previous option plus the \sty{amsthm} and \sty{mathalpha} packages. 
 %   \end{valuelist}
 % \end{optionlist}
 %
 % \begin{optionlist}
-% \optitem[low]{smallcapsstyle}{\opt{low}, \opt{upper}}
+% \optitem[low]{smallcapsstyle}{\opt{low}\OR\opt{upper}}
 % Active only with \opt{\meta{level}font=smallcaps} and \opt{toc\meta{level}font=smallcaps} options (see sections \ref{sec:titles} and \ref{sec:toc}).
 % With \XeLaTeX{} or \LuaLaTeX{} this option is effective only if a font selection command (such as \cmd{setmainfont}) is given.
 %   \begin{valuelist}
@@ -881,10 +1078,14 @@
 %   \end{valuelist}
 % \end{optionlist}
 %
-% 	\subsection{Titles}\label{sec:titles}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Titles}\label{sec:titles}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{optionlist}
-% \optitem[roman]{\meta{level}font}{\opt{roman}, \opt{italic}, 
+% \optitem[roman]{\meta{level}font}{\opt{roman}\OR\opt{italic}\OR 
 % \opt{smallcaps}}
 %   \begin{valuelist}
 %     \item[roman] Prints the \meta{level} title in roman.
@@ -894,8 +1095,8 @@
 %   \end{valuelist}
 %   Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec},
 %   \opt{subsec}, \opt{subsubsec}.
-% \optitem[left]{\meta{level}style}{\opt{left}, \opt{center}, 
-% \opt{right}, \opt{parleft}, \opt{parcenter}, 
+% \optitem[left]{\meta{level}style}{\opt{left}\OR\opt{center}\OR 
+% \opt{right}\OR\opt{parleft}\OR\opt{parcenter}\OR 
 % \opt{parright}}
 %   \begin{valuelist}
 %     \item[left] Aligns the \meta{level} title on the left.
@@ -909,9 +1110,10 @@
 %     \item[parcenter] As \opt{center} but with the title below the number.
 %     \item[parright] As \opt{right} but with the title below the number.
 %   \end{valuelist}
-%   Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}.
-% \optitem[Roman/arabic/arabic]{\meta{level}numstyle}{\opt{arabic}, 
-% \opt{roman}, \opt{Roman}, \opt{dotarabic}, \opt{dotroman}, 
+%   Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec},
+%   \opt{subsec}, \opt{subsubsec}.
+% \optitem[Roman/arabic/arabic]{\meta{level}numstyle}{\opt{arabic}\OR 
+% \opt{roman}\OR\opt{Roman}\OR\opt{dotarabic}\OR\opt{dotroman}\OR
 % \opt{dotRoman}}
 %   \begin{valuelist}
 %     \item[arabic] Arabic \meta{level} number.
@@ -925,67 +1127,75 @@
 %   \opt{subsec}, \opt{subsubsec}.
 % \end{optionlist}
 %
-%
-% 	\subsection{Contents lists}\label{sec:toc}
-%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Contents lists}\label{sec:toc}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{optionlist}
-% \optitem[standard]{tocstyle}{\opt{standard}, \opt{dotted}, 
-% \opt{ragged}, \opt{leftpage}}
+% \optitem[standard]{tocstyle}{\opt{standard}\OR\opt{dotted}\OR
+% \opt{ragged}\OR\opt{leftpage}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{tocstyle}}
-%	\begin{valuelist}
-%		\item[standard] Prints a standard table of contents with
+%  \begin{valuelist}
+%    \item[standard] Prints a standard table of contents with
 %   page numbers on the right margin.
-%		\item[dotted] As the previous one but with dotted lines.
-%		\item[ragged] Aligns the table of contents on the left 
-%			as suggested by \textcite{Bringhurst:1992}.
-%		\item[leftpage] Prints a table of contents with page numbers 
+%    \item[dotted] As the previous one but with dotted lines.
+%    \item[ragged] Aligns the table of contents on the left 
+%      as suggested by \textcite{Bringhurst:1992}.
+%    \item[leftpage] Prints a table of contents with page numbers 
 %     on the left margin.
-%	\end{valuelist}
-% \optitem[sec]{compacttoc}{\opt{sec}, \opt{subsec}, 
+%  \end{valuelist}
+% \optitem[sec]{compacttoc}{\opt{sec}\OR\opt{subsec}\OR
 % \opt{subsubsec}}
-%	\begin{valuelist}
-%		\item[sec] Prints the sections, subsections and sub-subsections in a single paragraph. Note that in this case the option \opt{tocstyle=dotted} in uneffective as the dots are not printed for chapter entries.
-%		\item[subsec] Prints the subsections and sub-subsections in a single paragraph.
-%		\item[subsubsec] Prints the sub-subsections in a single paragraph.
-%	\end{valuelist}
-% \optitem[roman]{toc\meta{level}font}{\opt{roman}, \opt{italic}, 
+%  \begin{valuelist}
+%    \item[sec] Prints the sections, subsections and sub-subsections 
+%        in a single paragraph. Note that in this case the option 
+%        \opt{tocstyle=dotted} is uneffective as the dots are not printed for chapter entries.
+%    \item[subsec] Prints the subsections and sub-subsections in a single paragraph.
+%    \item[subsubsec] Prints the sub-subsections in a single paragraph.
+%  \end{valuelist}
+% \optitem[roman]{toc\meta{level}font}{\opt{roman}\OR\opt{italic}\OR
 % \opt{smallcaps}}
-%	\begin{valuelist}
+%  \begin{valuelist}
 %     \item[roman] Prints the \meta{level} TOC entry in roman.
 %     \item[italic] Prints the \meta{level} TOC entry in \emph{italic}.
 %     \item[smallcaps] Prints the \meta{level} TOC entry 
 %      in \textsc{\lsstyle spaced small caps}
-%	\end{valuelist}
+%  \end{valuelist}
 %   Where \meta{level} can be \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}.
-% \optitem[all]{twocolcontents}{\opt{toc}, \opt{lof}, 
-% \opt{lot}, \opt{toclof}, \opt{toclot}, \opt{loflot}, \opt{all}}
+% \optitem[all]{twocolcontents}{\opt{toc}\OR\opt{lof}\OR
+% \opt{lot}\OR\opt{toclof}\OR\opt{toclot}\OR\opt{loflot}\OR\opt{all}}
 % This option activates the \opt{tocstyle=ragged} option 
 % and disables the other values of \opt{tocstyle}.
-%	\begin{valuelist}
-%		\item[toc] Prints the table of contents in two columns.
-%		\item[lof] Prints the list of figures in two columns.
-%		\item[lot] Prints the list of tables in two columns.
-%		\item[toclof] Prints the table of contents 
+%  \begin{valuelist}
+%    \item[toc] Prints the table of contents in two columns.
+%    \item[lof] Prints the list of figures in two columns.
+%    \item[lot] Prints the list of tables in two columns.
+%    \item[toclof] Prints the table of contents 
 %    and the list of figures in two columns.
-%		\item[toclot] Prints the table of contents 
+%    \item[toclot] Prints the table of contents 
 %    and the list of tables in two columns.
-%		\item[loflot] Prints the list of figures 
+%    \item[loflot] Prints the list of figures 
 %    and the list of tables in two columns.
-%		\item[all] Prints all the contents lists in two columns.
-%	\end{valuelist}
+%    \item[all] Prints all the contents lists in two columns.
+%  \end{valuelist}
 % \end{optionlist}
 %
-% \subsection{Headings}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Headings}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{optionlist}
-% \optitem[inner]{headerstyle}{\opt{inner}, \opt{center}, 
-% \opt{plain}, \opt{authortitleinner}, \opt{authortitlecenter}}
+% \optitem[inner]{headerstyle}{\opt{inner}\OR\opt{center}\OR
+% \opt{plain}\OR\opt{authortitleinner}\OR\opt{authortitlecenter}}
 %   \begin{valuelist}
 %     \item[inner] Prints the chapter title and the string ``Chapter~ 
 %     \meta{n}'' in the inner side 
-%      respectively of even and odd 
-%     headers, and the page number in the outer side.
+%      of even and odd 
+%     headers respectively, and the page number in the outer side.
 %     \item[center] Centers the header and footer and puts 
 %       the page number in the center of the footer.
 %     \item[plain] Prints no headers and puts the page number 
@@ -998,8 +1208,7 @@
 %     \item[authortitlecenter]
 %       As the previous one but with centered headers and footers.
 %   \end{valuelist}
-% \optitem[roman]{headerfont}{\opt{roman}, \opt{italic}, 
-% \opt{smallcaps}}
+% \optitem[roman]{headerfont}{\opt{roman}\OR\opt{italic}\OR\opt{smallcaps}}
 %   \begin{valuelist}
 %     \item[roman] Prints the headers in roman.
 %     \item[italic] Prints the headers in \emph{italic}.
@@ -1007,139 +1216,155 @@
 %   \end{valuelist}
 % \end{optionlist}
 %
-% \subsection{Notes, lists, quotations}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Notes, lists, quotations}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{optionlist}
-% \optitem[center]{quotestyle}{\opt{center}, \opt{right}}
+% \optitem[center]{quotestyle}{\opt{center}\OR\opt{right}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{quotestyle}} 
-% \begin{valuelist}
-% \item[center] 
-% Indents the block quotations
-% on both the left and right margins.
-% \item[right] 
-% Indents the block quotations
-% only on the left margin.
-% \end{valuelist}
-% \optitem[footnotesize]{quotesize}{\opt{footnotesize}, \opt{small}}
+%   \begin{valuelist}
+%     \item[center] 
+%      Indents the block quotations on both the left and right margins.
+%     \item[right] 
+%      Indents the block quotations only on the left margin.
+%   \end{valuelist}
+% \optitem[footnotesize]{quotesize}{\opt{footnotesize}\OR\opt{small}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{quotationfont}} 
-% \begin{valuelist}
-% \item[footnotesize] 
-% Prints the block quotations 
-% in \cmd{footnotesize} size.
-% \item[small] 
-% Prints the block quotations 
-% in \cmd{small} size.
-% \end{valuelist}
-% \optitem[bulged]{footnotestyle}{\opt{bulged}, \opt{hung}, 
-% \opt{dotted}, \opt{superscript}}
+%   \begin{valuelist}
+%     \item[footnotesize] 
+%      Prints the block quotations in \cmd{footnotesize} size.
+%     \item[small] 
+%      Prints the block quotations in \cmd{small} size.
+%   \end{valuelist}
+% \optitem[bulged]{footnotestyle}{\opt{bulged}\OR\opt{hung}\OR
+% \opt{dotted}\OR\opt{superscript}}
 % \changes{v0.9b}{2012/09/23}{Changed \opt{standardfootnote} option 
 % and renamed to \opt{footnotestyle}}
-% \begin{valuelist}
-% \item[bulged] The footnote number protrudes beyond the left margin.
-% \item[hung] 
-% Indents the footnote text, so it will hang 
-% under the first line of the text. 
-% \item[dotted] 
-% The footnote number is aligned to the left margin
-% and followed by a dot. 
-% \item[superscript] 
-% Prints a superscript footnote number aligned to the left margin. 
-% \end{valuelist}
-% \boolitem[false]{fewfootnotes}
+%   \begin{valuelist}
+%     \item[bulged] The footnote number protrudes beyond the left margin.
+%     \item[hung] 
+%      Indents the footnote text, so it will hang 
+%       under the first line of the text. 
+%     \item[dotted] 
+%      The footnote number is aligned to the left margin
+%      and followed by a dot. 
+%     \item[superscript] 
+%      Prints a superscript footnote number aligned to the left margin. 
+%   \end{valuelist}
+% \optitem[false]{fewfootnotes}{\opt{true}\OR\opt{false}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{fewfootnotes}}
 % Uses symbols instead of numbers to mark footnotes.
 % It is active only in documents with 
 % three footnotes per page maximum. 
 % The symbol sequence is: *, **, ***. 
 % With more footnotes you should not need this option.
-% \optitem[bulged]{liststyle}{\opt{bulged}, \opt{aligned}, \opt{indented}}
-% \begin{valuelist}
-% \item[bulged]
-% The item number or symbol protrudes beyond the left margin.
-% \item[aligned]
-%  Aligns the lists to the left margin.
-% \item[indented]
+% \optitem[bulged]{liststyle}{\opt{bulged}\OR\opt{aligned}\OR\opt{indented}}
+%   \begin{valuelist}
+%     \item[bulged]
+%      The item number or symbol protrudes beyond the left margin.
+%     \item[aligned]
+%      Aligns the lists to the left margin.
+%     \item[indented]
 %  Prints standard indented lists.
-% \end{valuelist}
-% \optitem[standard]{captionstyle}{\opt{standard}, \opt{sanserif}, \opt{italic}, \opt{smallcaps}}
+%   \end{valuelist}
+% \optitem[standard]{captionstyle}{\opt{standard}\OR\opt{sanserif}\OR\opt{italic}\OR\opt{smallcaps}}
 % All these values print the caption in small size, changing the shape:
-% \begin{valuelist}
-% \item[standard] Prints the caption text and label in normal font.
-% \item[sanserif] Prints the caption text and label in \textsf{sanserif}.
-% \item[italic] Prints the caption text and label in \emph{italic}. 
-% \item[smallcaps] Prints only the caption label in \textsc{\lsstyle spaced small caps}.
-% \end{valuelist}
+%   \begin{valuelist}
+%     \item[standard] 
+%      Prints the caption text and label in normal font.
+%     \item[sanserif] 
+%      Prints the caption text and label in \textsf{sanserif}.
+%     \item[italic] 
+%      Prints the caption text and label in \emph{italic}. 
+%     \item[smallcaps] 
+%      Prints only the caption label in \textsc{\lsstyle spaced small caps}.
+%   \end{valuelist}
 % \end{optionlist}
 %
-%
-% \subsection{Miscellaneous}\label{sec:miscellaneous}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Miscellaneous}\label{sec:miscellaneous}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{optionlist}
-% \optitem[\cmd{baselineskip}]{parindent}{\opt{1em}, \opt{1cm}, \opt{17pt}, \ldots}
+% \optitem[\cmd{baselineskip}]{parindent}{\meta{dimen}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{parindent}} 
-% \begin{valuelist}
-% Sets the indentation of the first line of each paragraph except those following a section title. 
-% For backward compatibility you should use \opt{parindet=1em} or \opt{parindet=1.5} in place 
-% of \opt{parindet=compact} and \opt{parindet=wide} respectively.
-% \end{valuelist}
-% \boolitem[true]{marginpar}
-% \begin{valuelist}
-% \item[true] Prints the marginal notes.
-% \item[false] Hide the marginal notes.
-% \end{valuelist}
-% \boolitem[false]{partpage}
+%   \begin{valuelist}
+% Sets the indentation of the first line of each paragraph except those following a section title. You can use any unit recognized by \TeX{} (for example: \opt{1em}\OR\opt{1cm}\OR\opt{17pt}, \ldots).
+%   \end{valuelist}
+% \optitem[true]{marginpar}{\opt{true}\OR\opt{false}}
+%   \begin{valuelist}
+%     \item[true] Prints the marginal notes.
+%     \item[false] Hide the marginal notes.
+%   \end{valuelist}
+% \optitem[false]{partpage}{\opt{true}\OR\opt{false}}
 % \changes{v0.9b}{2012/09/23}{New option \opt{partpage}}
 %  Active only with \opt{structure=article}.
-% \begin{valuelist}
-% \item[true] Prints the part title in a separate page as in 
-% \opt{structure=book}
-% \item[false] Prints a part title similar to the one used in the standard \opt{article} class.
-% \end{valuelist}
-% \optitem[false]{draftdate}{\opt{true}, \opt{false}}
+%   \begin{valuelist}
+%     \item[true] Prints the part title in a separate page as in 
+%      \opt{structure=book}
+%     \item[false] Prints a part title similar to the one used in the standard \opt{article} class.
+%   \end{valuelist}
+% \optitem[false]{draftdate}{\opt{true}\OR\opt{false}}
 % \changes{v1.0}{2012/10/14}{First stable release. Renamed option \opt{bozza} to \opt{draftdate}} 
 % If \opt{true} it prints the string ``Version of \meta{date}'' in the footer. 
 % It requires the \cmd{date}\ar{\meta{date}} command.
 % \end{optionlist}
 %
-% \subsection{Pre-defined styles}\label{sec:predefined-styles}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Pre-defined styles}\label{sec:predefined-styles}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
-% These pre-defined styles are intended as shotrcuts to some groups of 
+% These pre-defined styles are intended as shortcuts to some groups of 
 % class options. Combining them
 % with \opt{chapnumstyle} options 
 % you can get up to 120 variants. 
 %
 % \begin{optionlist}
-% \optitem[roman1]{style}{\opt{roman(1-6)}, \opt{italic(1-12)}, 
+% \optitem[roman1]{style}{\opt{roman(1-6)}\OR\opt{italic(1-12)}\OR
 % \opt{smallcaps(1-6)}}
-% \begin{valuelist}
-% \item[roman(1-6)] The titles of chapters and headers are printed 
-% in roman. The number of the chapter is on the same line in styles 
-% 1-3 and above the title in styles 4-6.
-% The title can be printed on the left (styles 1 and 4), 
-% in the center (styles 2 and 5) or on the right (styles 3 and 6).
-% \item[italic(1-12)]
-% The titles of chapters and headers are in \emph{italic}. The section title is in \emph{italic}  
-% in styles 1-6 and in \textsc{\lsstyle spaced small caps}  in styles 7-12.
-% There are three position for the title and two positions for the number as above.
-% \item[smallcaps(1-12)]
-% The titles of chapters and headers are in \textsc{\lsstyle spaced small caps}. 
-% The  title of the section is in \emph{italic}  in styles 1-6 and in 
-% \textsc{\lsstyle spaced small caps}  in styles 7-12.
-% There are three position for the title and two positions for the chapter as above.
-% \end{valuelist}
+%   \begin{valuelist}
+%     \item[roman(1-6)] The titles of chapters and headers are printed 
+%      in roman. The number of the chapter is on the same line in styles 
+%      1-3 and above the title in styles 4-6.
+%      The title can be printed on the left (styles 1 and 4), 
+%      in the center (styles 2 and 5) or on the right (styles 3 and 6).
+%     \item[italic(1-12)]
+%      The titles of chapters and headers are in \emph{italic}. The section title is in \emph{italic}  
+%      in styles 1-6 and in \textsc{\lsstyle spaced small caps}  in styles 7-12.
+%      There are three position for the title and two positions for the number as above.
+%     \item[smallcaps(1-12)]
+%      The titles of chapters and headers are in \textsc{\lsstyle spaced small caps}. 
+%      The  title of sections is in \emph{italic}  in styles 1-6 and in 
+%      \textsc{\lsstyle spaced small caps}  in styles 7-12.
+%      There are three position for the title and two positions for the chapter as above.
+%   \end{valuelist}
 % \end{optionlist}
 %
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section{New commands}\label{sec:commands}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
-% \section{New commands}\label{sec:commands}
-%
-% \subsection{Printing the cover page}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Composing and printing the cover page}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{ltxsyntax}
 % \cmditem{makecover}
 % \cmditem{makecover}[tikz options]
 %
 % Prints the cover page (figure \ref{fig:cover}). This command requires \sty{tikz} 
-% and the optional arguments accepts the same options of the \cmd{draw} 
+% and the optional argument accepts the same options of the \cmd{draw} 
 % command of that package (see the examples below). Commands available:
 %
 % \cmditem{Cauthor}{text} 
@@ -1178,20 +1403,24 @@
 %
 % \end{ltxsyntax}
 % 
-% \subsubsection*{Some examples of cover pages}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsubsection*{Some examples of cover pages}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % First you have to declare the informations you want to put in the cover page. It is better to give these informations in the preamble:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \usepackage{tikz}
-%
-% \Cauthor{Bruce Lee}
-% \Ctitle{The Art of Kicking}
-% \Csubtitle{How to survive in the modern societies}
-% \Ceditor{edited by\\ Walker Texas Ranger}
-% \Cfoot{Punch Press\\\includegraphics[width=1cm]{logo}}
-% \end{verbatim}
+%\begin{verbatim}
+%\usepackage{tikz}
+%
+%\Cauthor{Bruce Lee}
+%\Ctitle{The Art of Kicking}
+%\Csubtitle{How to survive in the modern societies}
+%\Ceditor{edited by\\ Walker Texas Ranger}
+%\Cfoot{Punch Press\\\includegraphics[width=1cm]{logo}}
+%\end{verbatim}
 % \end{latexcode}
 %
 % Then you can print the cover page with:
@@ -1205,41 +1434,45 @@
 % \begin{ttquote}
 % \cmd{makecover}\oar{\meta{tikz options}}
 % \end{ttquote}
-
+%
 % You can customize the circle using the optional arguments of the \cmd{makecover} command. Some of these \meta{tikz options} require special \sty{tikz} libraries. For example, you can add a shadow to the circle loading the \texttt{shadows} library and using the \texttt{circular drop shadow} otpion:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \usepackage{tikz}
-% \usetikzlibrary{shadows}
+%\begin{verbatim}
+%\usepackage{tikz}
+%\usetikzlibrary{shadows}
 %...
-% \begin{document}
-% \makecover[circular drop shadow]
-% \end{document}
-% \end{verbatim}
+%\begin{document}
+%\makecover[circular drop shadow]
+%\end{document}
+%\end{verbatim}
 % \end{latexcode}
 %
 % There are thousands of possibilities. Here is another (not necessarily good) example:
 % \begin{latexcode}
-% \begin{verbatim}
-% \usepackage{tikz}
+%\begin{verbatim}
+%\usepackage{tikz}
 %
-% \Cpagecolor{gray!30}
-% \Ctextcolor{blue!50}
-% \Cfootcolor{black}
+%\Cpagecolor{gray!30}
+%\Ctextcolor{blue!50}
+%\Cfootcolor{black}
 %
-% \begin{document}
-% \makecover[fill=blue!30!black,draw=teal,line width=2mm,dashed]
-% \end{document}
-% \end{verbatim}
+%\begin{document}
+%\makecover[fill=blue!30!black,draw=teal,line width=2mm,dashed]
+%\end{document}
+%\end{verbatim}
 % \end{latexcode}
 % 
 %
-% \subsection{Printing the colophon} 
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Printing the colophon} 
+% ^^A
+% ^^A ----------------------------------------------------------------
 % 
 % \begin{ltxsyntax}
 %
-% \cmditem{colophon}[OS]{name and surname}{additional info}
+% \cmditem{colophon}[OS]{name and surname}{additional infos}
 % 
 % This command is provided only for Italian documents. It prints a page with 
 % a copyright notice and the colophon in the bottom of the page. For different languages 
@@ -1247,19 +1480,21 @@
 % 
 % If you don't need the copyright notice, leave the second argument of 
 % the command empty:
+%
 % \begin{ttquote}
-% \cmd{colophon\oarm{OS}\ar{}\arm{additional info}}
+% \cmd{colophon\oarm{OS}\ar{}\arm{additional infos}}
 % \end{ttquote}
+%
 % With the \opt{article} document structure, you can use the \cmd{artcolophon} command 
 % (see below) 
 % as well as  the \cmd{thanks} command:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \author{Name Surname
-%  \thanks{This work has been typeset with \LaTeX, using the 
-%  \textsf{suftesi} class by Ivan Valbusa}.}
-% \end{verbatim}
+%\begin{verbatim}
+%\author{Name Surname
+% \thanks{This work has been typeset with \LaTeX, using the 
+% \textsf{suftesi} class by Ivan Valbusa}.}
+%\end{verbatim}
 % \end{latexcode}
 %
 % \cmditem{bookcolophon}{copyright notice}{attribution notice and 
@@ -1271,14 +1506,14 @@
 % The second one prints its content at the bottom. For example:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \bookcolophon{%
-%    Copyright © 2007 by Ivan Valbusa}{%
-%    This work has been typeset with \LaTeX, using the  \textsf{suftesi} 
-%    class by Ivan Valbusa\index{Valbusa, Ivan}. The serif font is 
-%    Cochineal by Michael Sharpe and the sans serif font is Linux 
-%    Biolinum O by Philipp H. Poll.}
-% \end{verbatim}
+%\begin{verbatim}
+%\bookcolophon{%
+%   Copyright © 2007 by Ivan Valbusa}{%
+%   This work has been typeset with \LaTeX, using the  \textsf{suftesi} 
+%   class by Ivan Valbusa\index{Valbusa, Ivan}. The serif font is 
+%   Cochineal by Michael Sharpe and the sans serif font is Linux 
+%   Biolinum O by Philipp H. Poll.}
+%\end{verbatim}
 % \end{latexcode}
 %
 % \cmditem{artcolophon}{copyright notice, attribution and other informations}
@@ -1289,21 +1524,21 @@
 % Here is an example:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \artcolophon{%
-%    This work is licensed under the Creative Commons 
-%    Attribution-NonCommercial-NoDerivs 3.0 Unported 
-%    License. To view a copy of this license, visit
-%     \begin{center}
-%       http://creativecommons.org/licenses/by-nc-nd/3.0
-%     \end{center}
-%    or send a letter to Creative Commons, 444 
-%    Castro Street, Suite 900, Mountain View, 
-%    California, 94041, USA.\\[1ex]
-%
-%    Typeset with \LaTeX,  using the \textsf{suftesi} 
-%    class by Ivan Valbusa.}
-% \end{verbatim}
+%\begin{verbatim}
+%\artcolophon{%
+%   This work is licensed under the Creative Commons 
+%   Attribution-NonCommercial-NoDerivs 3.0 Unported 
+%   License. To view a copy of this license, visit
+%    \begin{center}
+%      http://creativecommons.org/licenses/by-nc-nd/3.0
+%    \end{center}
+%   or send a letter to Creative Commons, 444 
+%   Castro Street, Suite 900, Mountain View, 
+%   California, 94041, USA.\\[1ex]
+%
+%   Typeset with \LaTeX,  using the \textsf{suftesi} 
+%   class by Ivan Valbusa.}
+%\end{verbatim}
 % \end{latexcode}
 %
 % \cmditem{finalcolophon}{colophon content}
@@ -1314,7 +1549,11 @@
 %
 % \end{ltxsyntax}
 %
-% \subsection[Breaking titles]{Breaking titles in header and table of contents}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection[Breaking titles]{Breaking titles in header and table of contents}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{ltxsyntax}
 % \cmditem{headbreak}
@@ -1322,91 +1561,99 @@
 % A manual break which is active for the table of contents but not in the text or in the headers.
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \section{This title will be break here \headbreak{} 
-%     inside the table of contents}
-% \end{verbatim}
+%\begin{verbatim}
+%\section{This title will be break here \headbreak{} inside the table of contents}
+%\end{verbatim}
 % \end{latexcode}
 % \cmditem{xheadbreak}
 %
 % A manual break which is active in the text but not in the headers and in the table of contents.
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \section{This title will be break here \xheadbreak{} 
-%     inside the text}
-% \end{verbatim}
+%\begin{verbatim}
+%\section{This title will be break here \xheadbreak{} inside the text}
+%\end{verbatim}
 % \end{latexcode}
 % \end{ltxsyntax}
 %
 % \changes{v0.5}{2011/10/21}{New command \opt{chapnumfont}}
-% \subsection{Customizing titles}\label{sec:secfont}
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Customizing titles}\label{sec:secfont}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
 % \changes{v2.9.3}{2020/001/29}{New commands to change the font of the section titles and numbers.}
 %
 % The commands in this section are experimental. They provide a fast way to customize the format of section titles and numbers. Note that in some cases you will have to manually adjust the spacing  accordingly, using \cmd{titlespacing}, \cmd{hskip}/\cmd{hspace}, \cmd{vskip}/\cmd{vspace}, and so on. 
 %
 % \begin{ltxsyntax}
-% \cmditem*{\meta{level}font}{definition}\hfill(default=\texttt{empty})
+% \cmditem*{\meta{level}font}{definition}\hfill default:\texttt{empty}
 %
-% Changes the font of the \meta{level} title. Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}. For example, to change the size of the chapter title according to the \opt{chapfont=smallcaps} option you should use:
+% Changes the font of the \meta{level} title, where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}. For example, to change the size of the chapter title according to the \opt{chapfont=smallcaps} option you should use:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \chapfont{\fontsize{13}{17}\scshape\lsstyle\expandafter\MakeLowercase}
-% \end{verbatim}
+%\begin{verbatim}
+%\chapfont{\fontsize{13}{17}\scshape\lsstyle\expandafter\MakeLowercase}
+%\end{verbatim}
 % \end{latexcode}
-% \cmditem*{\meta{level}numfont}{definition}\hfill(default=\texttt{empty})
+% \cmditem*{\meta{level}numfont}{definition}\hfill default:\texttt{empty}
 %
-% Changes the font of the \meta{level} number. Where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}. For example:
+% Changes the font of the \meta{level} number, where \meta{level} can be \opt{part}, \opt{chap}, \opt{sec}, \opt{subsec}, \opt{subsubsec}. For example:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \chapnumfont{\bfseries\fontsize{160}{50}\selectfont
-%  \color{gray}\arabic{chapter}\hskip-15cm}
-% \end{verbatim}
+%\begin{verbatim}
+%\chapnumfont{\bfseries\fontsize{160}{50}\selectfont
+% \color{gray}\arabic{chapter}\hskip-15cm}
+%\end{verbatim}
 % \end{latexcode}
 % Combining these commands you can get something like this (or something worse/better):
 % \begin{latexcode}
-% \begin{verbatim}
-% \documentclass[pagelayout=periodicalaureo,11pt,
-% version=cscreen,chapstyle=parright]{suftesi}
+%\begin{verbatim}
+%\documentclass[pagelayout=periodicalaureo,11pt,
+%version=cscreen,chapstyle=parright]{suftesi}
 %
-% \usepackage{xcolor,lipsum}
+%\usepackage{xcolor,lipsum}
 %
-% \chapfont{\bfseries\sffamily\scshape\LARGE}
-% \secfont{\sffamily\fontsize{14.5}{15.5}\selectfont}
+%\chapfont{\bfseries\sffamily\scshape\LARGE}
+%\secfont{\sffamily\fontsize{14.5}{15.5}\selectfont}
 %
-% \chapnumfont{\hskip1cm\hbox{\bfseries\fontsize{100}{100}\selectfont%
-% \color{gray}\arabic{chapter}}\hskip-1cm}
-% \secnumfont{\bfseries---\,\arabic{chapter}.\arabic{section}}
+%\chapnumfont{\hskip1cm\hbox{\bfseries\fontsize{100}{100}\selectfont%
+%\color{gray}\arabic{chapter}}\hskip-1cm}
+%\secnumfont{\bfseries---\,\arabic{chapter}.\arabic{section}}
 %
-% \begin{document}
+%\begin{document}
 %
-% \chapter{Lorem ipsum dolor sit amet, consectetuer adipiscing elit}
+%\chapter{Lorem ipsum dolor sit amet, consectetuer adipiscing elit}
 %
-% \section{Dolor sit amet}	
-% \lipsum[1-2]
+%\section{Dolor sit amet}  
+%\lipsum[1-2]
 %
-% \section{Lorem ipsum dolor sit amet}
-% \subsection{Dolor sit amet}
-% \lipsum[1]
+%\section{Lorem ipsum dolor sit amet}
+%\subsection{Dolor sit amet}
+%\lipsum[1]
 %
-% \end{document}
-% \end{verbatim}
+%\end{document}
+%\end{verbatim}
 % \end{latexcode}
 % \end{ltxsyntax}
 %
-% \subsection{Miscellaneous}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Miscellaneous}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{ltxsyntax}
 % \cmditem{xfootnote}[symbol]{footnote text}
 % \changes{v0.9b}{2012/09/23}{New command \cmd{xfootnote}}
 %
 % A command to print a footnote with a discretionary
-% symbols given in the optional argument (default=*).  
+% symbols given in the optional argument (default:\texttt{*}).  
 % It does not increment the footnote counter.
+%
 % \begin{ttquote}
-% \cmd{xfootnote}\oar{\em\textdollar\cmd{dagger}\textdollar}\arm{Footnote text}\\
 % \cmd{xfootnote}\oar{\em\cmd{textdagger}}\arm{Footnote text}
 % \end{ttquote}
 %
@@ -1425,14 +1672,12 @@
 % Adds the \meta{dim} to the \meta{level} label in the table of contents, where \meta{level} can be \opt{part}, \opt{chap},  \opt{sec},  \opt{subsec},  \opt{subsubsec},  \opt{par},  \opt{subpar}, \opt{fig}, \opt{tab}. For example, when using \opt{chapnumstyle=Roman} you would probably need to adjust the width of the chapter label with:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \toclabelwidth{chap}{1em}
-% \end{verbatim}
+%\begin{verbatim}
+%\toclabelwidth{chap}{1em}
+%\end{verbatim}
 % \end{latexcode}
 % \end{ltxsyntax}
 %
-%
-%
 % \begin{ltxsyntax}
 %
 % \cmditem{chapterintro}
@@ -1440,83 +1685,90 @@
 % Prints an unnumbered introduction at the beginning of the chapter, 
 % with the correct hyperlink. In order to use this command the \sty{hyperref} package must be loaded.
 %
-% \cmditem{chapterintroname}{name}\hfill(default=\texttt{Introduzione})
+% \cmditem{chapterintroname}{name}\hfill default:\texttt{Introduzione}
 %
 % Changes in \meta{name} the title printed by the \cmd{chapterintro} command.
 %
 % \cmditem{appendixpage}
 % 
-% Prints a page with the title provided by \cmd{appendixpagename} (default=\texttt{Appendici}) at the center according to the \opt{partfont} option. You can redefine the command by (see the \sty{appendix} package documentation for details):
+% Prints a page with the title provided by \cmd{appendixpagename} (default:\texttt{Appendici}) at the center according to the \opt{partfont} option. You can redefine the command by (see the \sty{appendix} package documentation for details):
 % \begin{latexcode}
-% \begin{verbatim}
-% \renewcommand{\appendixpagename}{Appendices}
-% \end{verbatim}
+%\begin{verbatim}
+%\renewcommand{\appendixpagename}{Appendices}
+%\end{verbatim}
 % \end{latexcode}%
-% ^^A \cmditem{appendicesname}{name}\hfill(default=\texttt{Appendici})
+% ^^A \cmditem{appendicesname}{name}\hfill default:\texttt{Appendici}
 % ^^A
 % ^^A Changes in \meta{name} the title printed by the \cmd{appendixpage} command.
 %
 % \end{ltxsyntax}
 %
-%
-% \section{Collections}\label{sec:collection}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section{Collections}\label{sec:collection}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % The \opt{collection} document structure is thought to create a collection of papers. Each paper has to be typeset in a separate \file{.tex} file inside the \env{article} environment:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \begin{article}
-% \author{Author}
-% \title{Title of the paper}
-%  % The abstract is optional.
-%  % \begin{abstract}
-%  %  The abstract
-%  % \end{abstract}
-%
-% \maketitle
-%
-%   Text of the paper
-% \end{article}
-% \end{verbatim}
+%\begin{verbatim}
+%\begin{article}
+%\author{Author}
+%\title{Title of the paper}
+% % The abstract is optional.
+% % \begin{abstract}
+% %  The abstract
+% % \end{abstract}
+%
+%\maketitle
+%
+%  Text of the paper
+%\end{article}
+%\end{verbatim}
 % \end{latexcode}
 % If the names of the papers are \file{article1.tex}, \file{article2.tex}, \file{article3.tex}, etc., then a minimal main file should be similar to this:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \documentclass[structure=collection]{suftesi}
-%
-% \begin{document}
-%  \input{article1}
-%  \input{article2}
-%  \input{article3}
-% \end{document}
-% \end{verbatim}
+%\begin{verbatim}
+%\documentclass[structure=collection]{suftesi}
+%
+%\begin{document}
+% \input{article1}
+% \input{article2}
+% \input{article3}
+%\end{document}
+%\end{verbatim}
 % \end{latexcode}
 %
-% \subsection{Options}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Options}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
-% In addition to the following options you can use the other options of the class too. In particular, with the \opt{chapstyle} and \opt{chapfont} options you can customize all the section titles which are treated as a normal unnumbered chapters in the \opt{book} document structure, such as ``Table of Contents'', ``Index'', ``Bibliography'', etc.
+% In addition to the following options you can use the other options of the class too. In particular, with the \opt{chapstyle} and \opt{chapfont} options you can customize all the section titles which are treated as a normal unnumbered chapters in the \opt{book} document structure, such as \emph{Table of Contents}, \emph{Index}, \emph{Bibliography}, etc.
 %
 % \begin{optionlist}
-% \optitem[left]{papertitlestyle}{\opt{left}, \opt{center}, \opt{right}}
+% \optitem[left]{papertitlestyle}{\opt{left}\OR\opt{center}\OR\opt{right}}
 %   \begin{valuelist}
 %     \item[left] Aligns the author-title block on the left.
 %     \item[center] Centers the author-title block. 
 %     \item[right] Aligns the author-title block on the right.
 %   \end{valuelist}
-% \optitem[false]{revauthortitle}{\opt{true}, \opt{false}}
+% \optitem[false]{revauthortitle}{\opt{true}\OR\opt{false}}
 %   \begin{valuelist}
 %     \item[true] Prints the author’s name below the title.
 %     \item[false] Prints the author’s name above the title.
 %   \end{valuelist}
-% \optitem[italic]{titlefont}{\opt{roman}, \opt{italic}, \opt{smallcaps}}
+% \optitem[italic]{titlefont}{\opt{roman}\OR\opt{italic}\OR\opt{smallcaps}}
 %   \begin{valuelist}
 %     \item[roman] Prints the title of the articles in roman.
 %     \item[italic] Prints the  title of the articles in \emph{italic}.
 %     \item[smallcaps] Prints the  title of the articles 
 %      in \textsc{\lsstyle spaced small caps}.
 %   \end{valuelist}
-% \optitem[roman]{authorfont}{\opt{roman}, \opt{italic}, \opt{smallcaps}}
+% \optitem[roman]{authorfont}{\opt{roman}\OR\opt{italic}\OR\opt{smallcaps}}
 %   \begin{valuelist}
 %     \item[roman] Prints the author's name in roman.
 %     \item[italic] Prints the author's name in \emph{italic}.
@@ -1526,28 +1778,33 @@
 %         to protect the \cmd{thanks} command:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \author{The Author\protect\thanks{...}}
-% \end{verbatim}
+%\begin{verbatim}
+%\author{The Author\protect\thanks{...}}
+%\end{verbatim}
 % \end{latexcode}
-% \end{valuelist}
-% \optitem[italic]{toctitlefont}{\opt{roman}, \opt{italic}, \opt{smallcaps}}
+%   \end{valuelist}
+% \optitem[italic]{toctitlefont}{\opt{roman}\OR\opt{italic}\OR\opt{smallcaps}}
 %   \begin{valuelist}
 %     \item[roman] Prints the title TOC entry in roman.
 %     \item[italic] Prints the  title TOC entry in \emph{italic}.
 %     \item[smallcaps] Prints the  title TOC entry  
 %      in \textsc{\lsstyle spaced small caps}.
 %   \end{valuelist}
-% \optitem[roman]{tocauthorfont}{\opt{roman}, \opt{italic}, \opt{smallcaps}}
+% \optitem[roman]{tocauthorfont}{\opt{roman}\OR\opt{italic}\OR\opt{smallcaps}}
 %   \begin{valuelist}
 %     \item[roman] Prints the author’s name TOC entry in roman.
 %     \item[italic] Prints the  author’s name TOC entry in \emph{italic}.
 %     \item[smallcaps] Prints the  author’s name TOC entry  
 %      in \textsc{\lsstyle spaced small caps}. 
-% \end{valuelist}
+%   \end{valuelist}
 % \end{optionlist}
 %
-% \subsection{Commands} 
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \subsection{Commands} 
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
 % \begin{ltxsyntax} 
 %
 % \cmditem{frontispiece} 
@@ -1564,66 +1821,70 @@
 %
 % Sets the editor(s) of the collection.
 %
-% \cmditem{titlefont}{definition}\hfill(default=\texttt{empty})
+% \cmditem{titlefont}{definition}\hfill default:\texttt{empty}
 %
 % \changes{v2.9.4}{2020/001/29}{New commands to change the font of the title of the articles and of the author's name in the collections}
 %
-% \cmditem{authorfont}{definition}\hfill(default=\texttt{empty})
+% \cmditem{authorfont}{definition}\hfill default:\texttt{empty}
 %
 % Changes the font of the title of the articles and of the author's name. For example:
 %
 % \begin{latexcode}
-% \begin{verbatim}
-% \titlefont{\bfseries\sffamily\scshape}	
-% \authorfont{\itshape\sffamily}
-% \end{verbatim}
+%\begin{verbatim}
+%\titlefont{\bfseries\sffamily\scshape}  
+%\authorfont{\itshape\sffamily}
+%\end{verbatim}
 % \end{latexcode}
 % \end{ltxsyntax}
 %
-% \section{Known issues}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section{Known issues}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % A problem occurs with the article document structure. The \cmd{part} command resets the headers so if it is the first sectioning command of the page you will get no headers in that page. In this case you have to add the header manually with something like this:
 % \begin{latexcode}
-% \begin{verbatim}
-% \markboth{Section title}{Section title}
-% \part{The title of the part}
-% %
-% \section{Section title}
-% \end{verbatim}
+%\begin{verbatim}
+%\markboth{Section title}{Section title}
+%\part{The title of the part}
+%
+%\section{Section title}
+%\end{verbatim}
 % \end{latexcode}
-% If the title of the part is at the beginning of the page you will need the \sty{afterpage} package and the \cmd{afterapge} command:
+% If the title of the part is at the beginning of the page you will need the \sty{afterpage} package and the \cmd{afterpage} command:
 % \begin{latexcode}
-% \begin{verbatim}
-% \afterpage{
-%  \markboth{Section title}{Section title}
-%    \part{The title of the part}
-%   }
-% %
+%\begin{verbatim}
+%\afterpage{
+% \markboth{Section title}{Section title}
+%   \part{The title of the part}
+%  }
+%
 % \section{Section title}
-% \end{verbatim}
+%\end{verbatim}
 % \end{latexcode}
 %
-%
-%
-% \section{Backward compatibility}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section{Backward compatibility}
+% ^^A
+% ^^A ----------------------------------------------------------------
 %
 % \begin{optionlist}
 % \optitem{defaultfont}{\opt{compatibility}}
-% Loads the fonts of \sty{suftesi} v2.3 (and previous): Palatino (\sty{mathpazo}), Iwona, Bera Mono. To get the default Greek font of those versions (i.e. Artemisia) add the \opt{greekfont=artemisia} option.
-% \optitem[book]{documentstructure}{\opt{book}, \opt{article}, \opt{collection}}
+% Loads the fonts of \sty{suftesi} v2.3 (and previous): Palatino (\sty{mathpazo}), Iwona, Bera Mono. To get the default Greek font of those versions (GFS Artemisia) add the \opt{greekfont=artemisia} option.
+% \optitem[book]{documentstructure}{\opt{book}\OR\opt{article}\OR\opt{collection}}
 % An alias for \opt{structure}
-% \boolitem[true]{crop}
-% \begin{valuelist}
-% \item[true] An alias for \opt{version=draft} option.
-% \item[false] An alias for \opt{version=center} option.
-% \end{valuelist}
-%
-%
-% \optitem{style}{\opt{FSPLa}, \opt{FSPLb}, \opt{FSPLc}}
-% \end{optionlist}
+% \optitem[true]{crop}{\opt{true}\OR\opt{false}}
+%   \begin{valuelist}
+%     \item[true] An alias for \opt{version=draft} option.
+%     \item[false] An alias for \opt{version=center} option.
+%   \end{valuelist}
+% \optitem{parindent}{\opt{1em}, \opt{1.5em}}
+% An alias fo \opt{parindent=compact} and \opt{parindent=wide} respectively.
+% \optitem{style}{\opt{FSPLa}\OR\opt{FSPLb}\OR\opt{FSPLc}}
 % These styles are only meant to typeset a doctoral thesis respecting the features required by the Joint Project \emph{Formal Style for PhD Theses with LaTeX} of the Verona University  (Italy).
-%
-% 
+% \end{optionlist}
 %
 % \changes{v1.3}{2013/03/05}{New command \cmd{FSPLcolophon}}
 % \noindent The \cmd{FSPLcolophon}\ar{\meta{Name Surname}} command is provided to typeset the colophon according to these styles:
@@ -1646,10 +1907,9 @@
 % \bigskip
 %
 % \noindent Typeset with \LaTeX{} in collaboration with the Joint Project 
-% \emph{Formal Style for PhD Theses with \LaTeX{}} (University of Verona, 
+% \emph{Formal Style for PhD Theses with \LaTeX} (University of Verona, 
 % Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face 
-% is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by Janus M. Nowacki.
-%
+% is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by Janus M.~ Nowacki.
 %
 % \noindent\rule{\textwidth}{.4pt}
 %
@@ -1808,7 +2068,11 @@
 %
 % \StopEventually{\PrintChanges\PrintIndex}
 %
-% \section*{The Code}
+% ^^A ----------------------------------------------------------------
+% ^^A
+%        \section*{The Code}
+% ^^A
+% ^^A ----------------------------------------------------------------
 % \addcontentsline{toc}{section}{The Code}
 % \iffalse
 %<*class>
@@ -2264,34 +2528,28 @@
 \ifcase\nr\relax
   \def\SUF@thepart{\arabic{part}}
   \def\SUF@dotpart{}
-% \def\SUF@PART@thecontentslabel{\thecontentslabel}
 \or
   \def\SUF@thepart{\textsc{\roman{part}}}
   \def\SUF@dotpart{}
-% \def\SUF@PART@thecontentslabel{\@roman{\thecontentslabel}}
 \or
   \def\SUF@thepart{\Roman{part}}
   \def\SUF@dotpart{}
-% \def\SUF@PART@thecontentslabel{\@Roman{\thecontentslabel}}
 \or
   \def\SUF@thepart{\arabic{part}}
   \def\SUF@dotpart{.}
-% \def\SUF@PART@thecontentslabel{\thecontentslabel}
 \or
   \def\SUF@thepart{\textsc{\roman{part}}}
   \def\SUF@dotpart{.}
-% \def\SUF@PART@thecontentslabel{\@roman{\thecontentslabel}}
 \or
   \def\SUF@thepart{\Roman{part}}
   \def\SUF@dotpart{.}
-% \def\SUF@PART@thecontentslabel{\@Roman{\thecontentslabel}}
 \fi}
 %    \end{macrocode}
 % \subsubsection*{Chapter number style}
 %    \begin{macrocode}
 \define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,
-dotarabic,dotroman,dotRoman}[arabic]{%
-\ifcase\nr\relax
+    dotarabic,dotroman,dotRoman}[arabic]{%
+  \ifcase\nr\relax
   \def\SUF@thechapter{\arabic{chapter}}
   \def\SUF@HEAD@thechapter{\arabic{chapter}}
   \def\SUF@dotchap{}
@@ -2321,13 +2579,13 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \def\SUF@HEAD@thechapter{\Roman{chapter}}
   \def\SUF@dotchap{.}
   \def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
-\fi}
+  \fi}
 %    \end{macrocode}
 % \subsubsection*{Section number style}
 %    \begin{macrocode}
 \define@choicekey{}{secnumstyle}[\val\nr]
-    {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
-\ifcase\nr\relax
+{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+  \ifcase\nr\relax
   \def\SUF@thesection{\SUF@chapswitch\arabic{section}}
   \def\SUF@HEAD@thesection{\arabic{section}}
   \def\SUF@dotsec{}
@@ -2357,67 +2615,67 @@ dotarabic,dotroman,dotRoman}[arabic]{%
   \def\SUF@HEAD@thesection{\Roman{section}}
   \def\SUF@dotsec{.}
   \def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}}
-\fi}
+  \fi}
 %    \end{macrocode}
 % \subsubsection*{Subsection number style}
 %    \begin{macrocode}
 \define@choicekey{}{subsecnumstyle}[\val\nr]
 {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
-	\ifcase\nr\relax
-	\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
-	\def\SUF@dotsubsec{}
-	\def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
-	\or
-	\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
-	\def\SUF@dotsubsec{}
-	\def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
-	\or
-	\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
-	\def\SUF@dotsubsec{}
-	\def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
-	\or
-	\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
-	\def\SUF@dotsubsec{.}
-	\def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
-	\or
-	\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
-	\def\SUF@dotsubsec{.}
-	\def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
-	\or
-	\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
-	\def\SUF@dotsubsec{.}
-	\def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
-	\fi}
+  \ifcase\nr\relax
+  \def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
+  \def\SUF@dotsubsec{}
+  \def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
+\or
+  \def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
+  \def\SUF@dotsubsec{}
+  \def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+  \def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
+  \def\SUF@dotsubsec{}
+  \def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+\or
+  \def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
+  \def\SUF@dotsubsec{.}
+  \def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
+\or
+  \def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
+  \def\SUF@dotsubsec{.}
+  \def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+  \def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
+  \def\SUF@dotsubsec{.}
+  \def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+  \fi}
 %    \end{macrocode}
 % \subsubsection*{Sub-subsection number style}
 %    \begin{macrocode}
 \define@choicekey{}{subsubsecnumstyle}[\val\nr]
 {arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
-	\ifcase\nr\relax
-	\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
-	\def\SUF@dotsubsubsec{}
-	\def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
-	\or
-	\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
-	\def\SUF@dotsubsubsec{}
-	\def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
-	\or
-	\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
-	\def\SUF@dotsubsubsec{}
-	\def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
-	\or
-	\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
-	\def\SUF@dotsubsubsec{.}
-	\def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
-	\or
-	\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
-	\def\SUF@dotsubsubsec{.}
-	\def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
-	\or
-	\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
-	\def\SUF@dotsubsubsec{.}
-	\def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
-	\fi}
+  \ifcase\nr\relax
+  \def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
+  \def\SUF@dotsubsubsec{}
+  \def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
+\or
+  \def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
+  \def\SUF@dotsubsubsec{}
+  \def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+  \def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
+  \def\SUF@dotsubsubsec{}
+  \def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+\or
+  \def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
+  \def\SUF@dotsubsubsec{.}
+  \def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
+\or
+  \def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
+  \def\SUF@dotsubsubsec{.}
+  \def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+  \def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
+  \def\SUF@dotsubsubsec{.}
+  \def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+  \fi}
 %    \end{macrocode}
 % This option controls the style of small capitals used in the 
 % title of chapters and sections using \opt{\meta{level}font=smallcaps} option:
@@ -2449,12 +2707,18 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \newcommand{\tocchapfont}[1]{\def\SUF@tocCHAP@font{#1}}
 \newcommand{\tocsecfont}[1]{\def\SUF@tocSEC@font{#1}}
 \newcommand{\tocsubsecfont}[1]{\def\SUF@tocSUBSEC@font{#1}}
-\newcommand{\tocsubsubsecfont}[1]{\def\SUF@tocSUBSUBSEC@font{#1}}
-\newcommand{\tocpartnumfont}[1]{\def\SUF@PART@thecontentslabel{#1\thecontentslabel}}
-\newcommand{\tocchapnumfont}[1]{\def\SUF@CHAP@thecontentslabel{#1\thecontentslabel}}
-\newcommand{\tocsecnumfont}[1]{\def\SUF@SEC@thecontentslabel{#1\thecontentslabel}}
-\newcommand{\tocsubsecnumfont}[1]{\def\SUF@SUBSEC@thecontentslabel{#1\thecontentslabel}}
-\newcommand{\tocsubsubsecnumfont}[1]{\def\SUF@SUBSUBSEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsubsecfont}[1]{%
+  \def\SUF@tocSUBSUBSEC@font{#1}}
+\newcommand{\tocpartnumfont}[1]{%
+  \def\SUF@PART@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocchapnumfont}[1]{%
+  \def\SUF@CHAP@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsecnumfont}[1]{%
+  \def\SUF@SEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsecnumfont}[1]{%
+  \def\SUF@SUBSEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsubsecnumfont}[1]{%
+  \def\SUF@SUBSUBSEC@thecontentslabel{#1\thecontentslabel}}
 %    \end{macrocode}
 % \subsection*{Headers}
 %
@@ -2620,29 +2884,29 @@ dotarabic,dotroman,dotRoman}[arabic]{%
 \suftesi@pagelefttoctrue
 \fi}
 \define@choicekey{}{compacttoc}[\val\nr]{%
-	sec,subsec,subsubsec}[sec]{%
-	\ifcase\nr\relax
-	\suftesi@toccompactsectrue
-	\suftesi@toccompactsubsectrue
-	\suftesi@toccompactsubsubsectrue
-	\def\suf@sscorrect{\hskip.5em}
-	\def\suf@ssscorrect{\hskip.5em}
+  sec,subsec,subsubsec}[sec]{%
+  \ifcase\nr\relax
+  \suftesi@toccompactsectrue
+  \suftesi@toccompactsubsectrue
+  \suftesi@toccompactsubsubsectrue
+  \def\suf@sscorrect{\hskip.5em}
+  \def\suf@ssscorrect{\hskip.5em}
     \def\suf@ctocdotsec{.}
     \def\suf@ctocdotssec{}
     \def\suf@ctocdotsssec{}
-	\or
-	\suftesi@toccompactsubsectrue
-	\suftesi@toccompactsubsubsectrue
-	\def\suf@sscorrect{\relax}
-	\def\suf@ssscorrect{\hskip.5em}
+\or
+  \suftesi@toccompactsubsectrue
+  \suftesi@toccompactsubsubsectrue
+  \def\suf@sscorrect{\relax}
+  \def\suf@ssscorrect{\hskip.5em}
     \def\suf@ctocdotssec{.}
     \def\suf@ctocdotsssec{}
-	\or
-	\suftesi@toccompactsubsubsectrue
-	\def\suf@sscorrect{\relax}
-	\def\suf@ssscorrect{\relax}
+\or
+  \suftesi@toccompactsubsubsectrue
+  \def\suf@sscorrect{\relax}
+  \def\suf@ssscorrect{\relax}
     \def\suf@ctocdotsssec{.}
-	\fi}
+  \fi}
 \define@choicekey{}{twocolcontents}[\val\nr]{%
     toc,lof,lot,toclof,toclot,loflot,all}[all]{%
 \ifcase\nr\relax
@@ -3246,7 +3510,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
          \ifsuftesi@mathextended
          \RequirePackage{amsthm}
          \RequirePackage[bigdelims,vvarbb]{newpxmath}
-         \RequirePackage[cal=boondoxo]{mathalfa} 
+         \RequirePackage[cal=boondoxo]{mathalpha} 
          \else
          \ifsuftesi@mathminimal
          \RequirePackage[bigdelims,vvarbb]{newpxmath}
@@ -3283,18 +3547,18 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \else
   \ifsuftesi@libertine
     \RequirePackage{textcomp}
-		\RequirePackage[sb]{libertine}
-		\RequirePackage[varqu,varl,scaled=0.94]{inconsolata}
-		\ifsuftesi@mathextended
-		\RequirePackage{amsthm}
-		\RequirePackage{libertinust1math}
-		\RequirePackage[cal=stix,scr=boondoxo,bb=boondox]{mathalfa}
-		\else
-		\ifsuftesi@mathminimal
-		\RequirePackage{libertinust1math}
-		\else
-		\fi
-		\fi
+    \RequirePackage[sb]{libertine}
+    \RequirePackage[varqu,varl,scaled=0.94]{inconsolata}
+    \ifsuftesi@mathextended
+    \RequirePackage{amsthm}
+    \RequirePackage{libertinust1math}
+    \RequirePackage[cal=stix,scr=boondoxo,bb=boondox]{mathalpha}
+    \else
+    \ifsuftesi@mathminimal
+    \RequirePackage{libertinust1math}
+    \else
+    \fi
+    \fi
          \useosf
       \ifsuftesi@bodoni
       \gdef\SUFfntscale{0.9}
@@ -3317,7 +3581,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
         \ifsuftesi@mathextended
         \RequirePackage{amsthm}
         \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
-        \RequirePackage[cal=boondoxo]{mathalfa}
+        \RequirePackage[cal=boondoxo]{mathalpha}
         \else
         \ifsuftesi@mathminimal
         \RequirePackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
@@ -3475,84 +3739,84 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \def\SUF@default@SECTIONS{
 \ifsuftesi@numparsec
 % \titleformat{\section}[display]
-%	  {\SUF@sectionsize\SUF@lr@SECSwitch}
-%	  {\ifsuftesi@article\SUF@thesection
-%	    \else\thesection\fi\SUF@dotsec}
-%	  {0ex}
-%	  {\SUF@SEC@StyleSwitch}
+%    {\SUF@sectionsize\SUF@lr@SECSwitch}
+%    {\ifsuftesi@article\SUF@thesection
+%      \else\thesection\fi\SUF@dotsec}
+%    {0ex}
+%    {\SUF@SEC@StyleSwitch}
 \titleformat{\section}[display]
 {\SUF@sectionsize\SUF@lr@SECSwitch}
 {\SUF@thesection\SUF@dotsec}
 {0ex}
 {\SUF@SEC@StyleSwitch}
-	\titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]	 
+  \titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]   
 \else
 % \titleformat{\section}[hang]
-%	  {\SUF@sectionsize\SUF@lr@SECSwitch}
-%	  {\ifsuftesi@article\SUF@thesection
-%	    \else\thesection\fi\SUF@dotsec}
-%	  {1em}
-%	  {\SUF@SEC@StyleSwitch}
+%    {\SUF@sectionsize\SUF@lr@SECSwitch}
+%    {\ifsuftesi@article\SUF@thesection
+%      \else\thesection\fi\SUF@dotsec}
+%    {1em}
+%    {\SUF@SEC@StyleSwitch}
 \titleformat{\section}[hang]
 {\SUF@sectionsize\SUF@lr@SECSwitch}
 {\SUF@thesection\SUF@dotsec}
 {1em}
 {\SUF@SEC@StyleSwitch}
-	\titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]	  
+  \titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]    
 \fi
 %    \end{macrocode}
 %    \begin{macrocode}
 \ifsuftesi@numparsubsec
 % \titleformat{\subsection}[display]
-%	  {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
-%	  {\textnormal\thesubsection}
-%	  {0ex}
-%	  {\SUF@SUBSEC@StyleSwitch}
+%    {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
+%    {\textnormal\thesubsection}
+%    {0ex}
+%    {\SUF@SUBSEC@StyleSwitch}
 \titleformat{\subsection}[display]
 {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
 {\textnormal\SUF@thesubsection\SUF@dotsubsec}
 {0ex}
 {\SUF@SUBSEC@StyleSwitch}
-	\titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
+  \titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
 \else
 % \titleformat{\subsection}[hang]
-%	  {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
-%	  {\textnormal\thesubsection}
-%	  {1em}
-%	  {\SUF@SUBSEC@StyleSwitch}
+%    {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
+%    {\textnormal\thesubsection}
+%    {1em}
+%    {\SUF@SUBSEC@StyleSwitch}
 \titleformat{\subsection}[hang]
 {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
 {\textnormal\SUF@thesubsection\SUF@dotsubsec}
 {1em}
 {\SUF@SUBSEC@StyleSwitch}
-	\titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
+  \titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
 \fi
 %    \end{macrocode}
 %    \begin{macrocode}
 \ifsuftesi@numparsubsubsec
 % \titleformat{\subsubsection}[display]
-%	  {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
-%	  {\textnormal\thesubsubsection}
-%	  {0ex}
-%	  {\SUF@SUBSUBSEC@StyleSwitch}
+%    {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
+%    {\textnormal\thesubsubsection}
+%    {0ex}
+%    {\SUF@SUBSUBSEC@StyleSwitch}
 \titleformat{\subsubsection}[display]
 {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
 {\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec}
 {0ex}
 {\SUF@SUBSUBSEC@StyleSwitch}
-	\titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]  
+  \titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]  
 \else
 % \titleformat{\subsubsection}[hang]
-%	  {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
-%	  {\textnormal\thesubsubsection}
-%	  {1em}
-%	  {\SUF@SUBSUBSEC@StyleSwitch}
+%    {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
+%    {\textnormal\thesubsubsection}
+%    {1em}
+%    {\SUF@SUBSUBSEC@StyleSwitch}
 \titleformat{\subsubsection}[hang]
 {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
 {\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec}
 {1em}
 {\SUF@SUBSUBSEC@StyleSwitch}
-	\titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]  
+  \titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]  
   \fi
 }
 \SUF@default@CHAPTER
@@ -3582,7 +3846,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
   \titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
 \else%standard/standardaureo
   \titlespacing*{\chapter}{0em}{%
-     \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}	
+     \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}  
   \titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex}
          \fi
        \fi
@@ -3601,16 +3865,16 @@ quotesize,footnotestyle,liststyle,captionstyle}
      using 'structure=article'}}
   \setcounter{tocdepth}{3}
     \setcounter{secnumdepth}{3}
- 		  \renewcommand\thesection{%
-		          \@arabic\c@section}
-		  \renewcommand\thesubsection{%
-		          \thesection.\@arabic\c@subsection} 
-		  \renewcommand\thesubsubsection{%
-		          \thesubsection.\@arabic\c@subsubsection}
-		  \renewcommand\theparagraph{%
-		          \thesubsubsection.\@arabic\c@paragraph}
-		  \renewcommand\thesubparagraph{%
-		          \theparagraph.\@arabic\c@subparagraph}
+       \renewcommand\thesection{%
+              \@arabic\c@section}
+      \renewcommand\thesubsection{%
+              \thesection.\@arabic\c@subsection} 
+      \renewcommand\thesubsubsection{%
+              \thesubsection.\@arabic\c@subsubsection}
+      \renewcommand\theparagraph{%
+              \thesubsubsection.\@arabic\c@paragraph}
+      \renewcommand\thesubparagraph{%
+              \theparagraph.\@arabic\c@subparagraph}
 %    \end{macrocode}
 % The \opt{partpage} options allows you to print a standard part page
 % in \opt{article} mode.
@@ -3681,7 +3945,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
 % so we must redefine them according to the styles of \sty{suftesi},
 % which does not use uppercase letters in the headings.
 %    \begin{macrocode}
-\ifsuftesi@article			
+\ifsuftesi@article      
 \AtBeginDocument{%
 \@ifpackageloaded{biblatex}{%
   \defbibheading{bibliography}[\refname]{%
@@ -3713,7 +3977,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
     \subsection{#1}}}%
     {\relax}%
 }%
-\else							
+\else              
 \AtBeginDocument{%
 \@ifpackageloaded{biblatex}{%
   \defbibheading{bibliography}[\bibname]{%
@@ -4144,7 +4408,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
       \fi
     \else
       \newpage
-      \global\@topnum\z@   % Prevents figures from going at top of page.
+      \global\@topnum\z@ % Prevents figures from going at top of page.
       \@maketitle
     \fi
     \thispagestyle{plain}\@thanks%
@@ -4303,25 +4567,25 @@ quotesize,footnotestyle,liststyle,captionstyle}
 %    \end{macrocode}
 %    \begin{macrocode}
 \renewenvironment{theindex}
-               {\if@twocolumn
-                  \@restonecolfalse
-                \else
-                  \@restonecoltrue
-                \fi
-                \ifsuftesi@article
-                \twocolumn[\section*{\indexname}]%
-                \else
-                \twocolumn[\@makeschapterhead{\indexname}]%
-                \fi
-                \@mkboth{\indexname}{\indexname}%
-                \thispagestyle{plain}%
-                \raggedright%
-                \parindent\z@
-                \parskip\z@ \@plus .3\p@\relax
-                \columnseprule \z@
-                \columnsep 35\p@
-                \let\item\@idxitem}
-               {\if@restonecol\onecolumn\else\clearpage\fi}
+  {\if@twocolumn
+     \@restonecolfalse
+   \else
+     \@restonecoltrue
+   \fi
+   \ifsuftesi@article
+   \twocolumn[\section*{\indexname}]%
+   \else
+   \twocolumn[\@makeschapterhead{\indexname}]%
+   \fi
+   \@mkboth{\indexname}{\indexname}%
+   \thispagestyle{plain}%
+   \raggedright%
+   \parindent\z@
+   \parskip\z@ \@plus .3\p@\relax
+   \columnseprule \z@
+   \columnsep 35\p@
+   \let\item\@idxitem}
+  {\if@restonecol\onecolumn\else\clearpage\fi}
 %    \end{macrocode}
 % \subsection*{Appendix}
 %    \begin{macrocode}
@@ -4338,7 +4602,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
     Redefine the \noexpand\appendixpagename command instead. 
     See the 'appendix' package documentation.\MessageBreak
     \noexpand\renewcommand{\noexpand\appendixpagename{newname}}}
-	{Command \noexpand\appendicesname undefined\MessageBreak
+  {Command \noexpand\appendicesname undefined\MessageBreak
     Redefine the \noexpand\appendixpagename command instead.
     See the 'appendix' package documentation.\MessageBreak
     \noexpand\renewcommand{\noexpand\appendixpagename{newname}}}}
@@ -4347,8 +4611,8 @@ quotesize,footnotestyle,liststyle,captionstyle}
 %     \newcommand{\appendixpage}{\SUF@appendixpage}
 % \def\SUF@appendixpage{%
 %   \@mainmattertrue
-%     \titlecontents{part}                                                  
-%       [0em]                                                                    
+%     \titlecontents{part}           
+%       [0em]                
 %       {\addvspace{3ex}}
 %       {}
 %       {}
@@ -4365,73 +4629,151 @@ quotesize,footnotestyle,liststyle,captionstyle}
 %           \vfil
 %    \endgroup
 %     \cleardoublepage
-% \titlecontents{part}                                                  
-%    [0em]                                                                    
-%   {\addvspace{3ex}\partname~}                                                 
+% \titlecontents{part}           
+%    [0em]                
+%   {\addvspace{3ex}\partname~}          
 %   {\makebox[\SUF@label@part][l]{%
 %   \thecontentslabel}\hspace*{1em}}   
-%   {}                                                                      
+%   {}                  
 %   {}
 %   [\addvspace{1ex}]
 % }
 \renewcommand{\@chap@pppage}{%
-	\clear@ppage
-	\thispagestyle{plain}%
-	\if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
-	\null\vfil
-	\markboth{}{}%
-	{\centering
-		\interlinepenalty \@M
-		\normalfont
-		\SUF@chaptersize
+  \clear@ppage
+  \thispagestyle{plain}%
+  \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
+  \null\vfil
+  \markboth{}{}%
+  {\centering
+    \interlinepenalty \@M
+    \normalfont
+    \SUF@chaptersize
         \SUF@CHAP@StyleSwitch\expandafter\appendixpagename\par}%
-	\if@dotoc@pp
-	\addappheadtotoc
-	\fi
-	\vfil\newpage
-	\if@twoside
-	\if@openright
-	\null
-	\thispagestyle{empty}%
-	\newpage
-	\fi
-	\fi
-	\if@tempswa
-	\twocolumn
-	\fi
+  \if@dotoc@pp
+  \addappheadtotoc
+  \fi
+  \vfil\newpage
+  \if@twoside
+  \if@openright
+  \null
+  \thispagestyle{empty}%
+  \newpage
+  \fi
+  \fi
+  \if@tempswa
+  \twocolumn
+  \fi
 }
 \renewcommand{\@sec@pppage}{%
-	\par
-	\addvspace{4ex}%
-	\@afterindentfalse
-	{\parindent \z@ \raggedright
-		\interlinepenalty \@M
-		\normalfont
-		\SUF@chaptersize
+  \par
+  \addvspace{4ex}%
+  \@afterindentfalse
+  {\parindent \z@ \raggedright
+    \interlinepenalty \@M
+    \normalfont
+    \SUF@chaptersize
         \SUF@CHAP@StyleSwitch\expandafter\appendixpagename%
-		\markboth{}{}\par}%
-	\if@dotoc@pp
-	\addappheadtotoc
-	\fi
-	\nobreak
-	\vskip 3ex
-	\@afterheading
+    \markboth{}{}\par}%
+  \if@dotoc@pp
+  \addappheadtotoc
+  \fi
+  \nobreak
+  \vskip 3ex
+  \@afterheading
+}
+%    \end{macrocode}
+% Within the appendices the chapter and section labels are literal. 
+% Using the \opt{chapnumstyle=Roman} or  \opt{chapnumstyle=roman} options, 
+% this label is passed as an argument to \cmd{@Roman} or \cmd{@roman}, 
+% which however accepts only integers. For this reason we must redefine 
+% all the occurrences of \cmd{titlecontents} in order to have \cmd{thecontentslabel} 
+% in place of \cmd{SUF@CHAP@thecontentslabel} or \cmd{SUF@SEC@thecontentslabel}.
+%    \begin{macrocode}
+\def\suf@appendixtoc{%
+  \ifsuftesi@pagelefttoc
+  \titlecontents{chapter}
+  [\SUF@tochang@chap]
+  {\addvspace{2ex}}
+  {\hskip-\SUF@tochang@chap%
+    \makebox[1em][l]{\thecontentspage}%
+    \hskip\SUF@addto@tochang@chap%
+    \makebox[\SUF@label@chap][l]{%
+      \thecontentslabel}\hspace*{1em}%
+    \SUF@tocCHAP@font}
+  {\hskip-\SUF@tochang@chap%
+    \makebox[1em][l]{\thecontentspage}%
+    \hskip\SUF@addto@tochang@chap\SUF@tocCHAP@font}
+  {}
+  [\addvspace{1ex}]
+  \ifsuftesi@toccompactsec
+  \titlecontents*{section}[\SUF@tochang@chap]{}{%
+    \thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{, 
+    \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+  \else
+  \titlecontents{section}
+  [\SUF@tochang@sec]
+  {}
+  {\hskip-\SUF@tochang@sec%
+    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
+%     \makebox[\SUF@label@sec][l]{%
+%     \ifsuftesi@article\SUF@toclabelnum%
+%      \else\fi\thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF@label@sec][l]{\thecontentslabel}\hspace*{1em}%
+    \SUF@tocSEC@font}
+  {\hskip-\SUF@tochang@sec%
+    \makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
+    \SUF@tocSEC@font}
+  {}
+  \fi
+  \else
+  \titlecontents{chapter}
+  [\SUF@tocindent@chap]
+  {\addvspace{2ex}}
+  {\hskip-\SUF@tocindent@chap%
+    \makebox[\SUF@label@chap][l]{\thecontentslabel}%
+    \hspace*{1em}%
+    \SUF@tocCHAP@font}
+  {\hskip-\SUF@tocindent@chap%
+    \SUF@tocCHAP@font}
+  {\SUF@chaptitlerule\contentspage}
+  [\addvspace{1ex}]
+  \ifsuftesi@toccompactsec
+  \titlecontents*{section}[\SUF@tocindent@chap]{}{%
+    \thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{, 
+    \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+  \else
+  \titlecontents{section}
+  [\SUF@tocindent@sec]
+  {}
+  {\hskip-\dimexpr(\SUF@label@sec+1em)%
+%     \makebox[\SUF@label@sec][l]{%
+%     \ifsuftesi@article\SUF@toclabelnum%
+%       \else\fi\thecontentslabel}\hspace*{1em}%
+    \makebox[\SUF@label@sec][l]{\thecontentslabel}\hspace*{1em}%
+    \SUF@tocSEC@font}
+  {\hskip-\dimexpr(\SUF@label@sec+1em)%
+    \SUF@tocSEC@font}
+  {\ifsuftesi@article\SUF@chaptitlerule%
+    \else\SUF@titlerule\fi\contentspage}
+  \fi
 }
 \ifsuftesi@article
-  \renewcommand\appendix{\par
-    \setcounter{section}{0}%
-    \setcounter{subsection}{0}%
-    \gdef\SUF@thesection{\@Alph\c@section}%
-    \gdef\SUF@HEAD@thesection{\@Alph\c@section}%
-    \renewcommand{\thesection}{\@Alph\c@section}}
+\renewcommand\appendix{\par
+  \suf@appendixtoc%
+  \setcounter{section}{0}%
+  \setcounter{subsection}{0}%
+  \gdef\SUF@thesection{\@Alph\c@section}%
+  \gdef\SUF@HEAD@thesection{\@Alph\c@section}%
+  \renewcommand{\thesection}{\@Alph\c@section}}
 \else
-  \renewcommand\appendix{\par
-    \setcounter{chapter}{0}%
-    \setcounter{section}{0}%
-    \gdef\@chapapp{\appendixname}%
-    \gdef\SUF@thechapter{\@Alph\c@chapter}%
-    \gdef\SUF@HEAD@thechapter{\@Alph\c@chapter}%
-    \renewcommand{\thechapter}{\@Alph\c@chapter}}
+\renewcommand\appendix{\par
+  \suf@appendixtoc%
+  \setcounter{chapter}{0}%
+  \setcounter{section}{0}%
+  \gdef\@chapapp{\appendixname}%
+  \gdef\SUF@thechapter{\@Alph\c@chapter}%
+  \gdef\SUF@HEAD@thechapter{\@Alph\c@chapter}%
+  \renewcommand{\thechapter}{\@Alph\c@chapter}}
 \fi
 %    \end{macrocode}
 % \subsection*{Headings}
@@ -4449,11 +4791,11 @@ quotesize,footnotestyle,liststyle,captionstyle}
 %    \begin{macrocode}
 \renewcommand{\chaptermark}[1]{%
   \markboth{\chaptertitlename\ \protect\SUF@HEAD@thechapter}{#1}}
-	\ifsuftesi@article
-	  \renewcommand{\sectionmark}[1]{\markright{\protect\SUF@HEAD@thesection.\ #1}}
-	    \else
-	  \renewcommand{\sectionmark}[1]{}
-	\fi
+  \ifsuftesi@article
+    \renewcommand{\sectionmark}[1]{\markright{\protect\SUF@HEAD@thesection.\ #1}}
+      \else
+    \renewcommand{\sectionmark}[1]{}
+  \fi
 %    \end{macrocode}
 % \paragraph{The \opt{plain} style}
 %    \begin{macrocode}
@@ -4492,11 +4834,11 @@ quotesize,footnotestyle,liststyle,captionstyle}
   }%
 %
 \ifsuftesi@article
-				\ifsuftesi@authortitle
-				\def\SUF@LR@MarkSwitch{\SUF@leftmark}
-				\else
-				\def\SUF@LR@MarkSwitch{\SUF@rightmark}
-				\fi
+        \ifsuftesi@authortitle
+        \def\SUF@LR@MarkSwitch{\SUF@leftmark}
+        \else
+        \def\SUF@LR@MarkSwitch{\SUF@rightmark}
+        \fi
 \else
         \def\SUF@LR@MarkSwitch{\SUF@leftmark}
 \fi
@@ -4517,31 +4859,31 @@ quotesize,footnotestyle,liststyle,captionstyle}
 % The font size is the same of the footnotes and the margins are set to \cmd{parindent}.
 %    \begin{macrocode}
 \renewenvironment{quotation}
-            {\list{}{\listparindent\parindent%
-                     \itemindent    \listparindent
-                     \leftmargin     \parindent
-                     \SUF@quote@style                       
-                     \parsep        \z@ \@plus\p@}%
-               \item\relax%
-                 \SUF@quotation@size%
-                 \noindent\ignorespaces}
-               {\endlist}
+  {\list{}{\listparindent\parindent%
+    \itemindent    \listparindent
+    \leftmargin     \parindent
+    \SUF@quote@style      
+    \parsep    \z@ \@plus\p@}%
+    \item\relax%
+    \SUF@quotation@size%
+    \noindent\ignorespaces}
+  {\endlist}
 \renewenvironment{quote}
-            {\list{}{\leftmargin \parindent
-            \SUF@quote@style}%
-               \item\relax%
-                 \SUF@quotation@size}% \ignorespaces?
-               {\endlist}
+  {\list{}{\leftmargin \parindent
+    \SUF@quote@style}%
+    \item\relax%
+    \SUF@quotation@size}% \ignorespaces?
+  {\endlist}
 \renewenvironment{verse}
-               {\let\\\@centercr
-                \list{}{\itemsep      \z@
-                        \itemindent   -1.5em%
-                        \listparindent\itemindent
-                        \rightmargin  \leftmargin
-                        \advance\leftmargin 1.5em}%
-                \item\relax
-                 \SUF@quotation@size}
-               {\endlist}  
+  {\let\\\@centercr
+    \list{}{\itemsep      \z@
+      \itemindent   -1.5em%
+      \listparindent\itemindent
+      \rightmargin  \leftmargin
+      \advance\leftmargin 1.5em}%
+    \item\relax
+    \SUF@quotation@size}
+  {\endlist}  
 %    \end{macrocode}
 % \paragraph{The \opt{fewfootnotes} option}
 % Enable only with three footnotes per page maximum.
@@ -4573,7 +4915,7 @@ quotesize,footnotestyle,liststyle,captionstyle}
 \def\SUF@mpsetup{%
   \itshape
     \footnotesize%
-    \parindent=0pt \lineskip=0pt \lineskiplimit=0pt %
+    \parindent=0pt \lineskip=0pt \lineskiplimit=0pt%
     \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
     \doublehyphendemerits=100000%
     \finalhyphendemerits=\doublehyphendemerits}
@@ -4716,10 +5058,10 @@ visit http://creativecom mons.org/licenses/by-nc-nd/3.0/.
 \null\vspace{\stretch{1}}
 
 \noindent Typeset with \LaTeX{} in collaboration with the Joint Project 
-\emph{Formal Style for PhD Theses with \LaTeX{}} (University of Verona, 
+\emph{Formal Style for PhD Theses with \LaTeX} (University of Verona, 
 Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face 
 is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by 
-Janusz M. Nowacki.
+Janusz M.~Nowacki.
 
 \endgroup
 
@@ -4739,7 +5081,7 @@ Janusz M. Nowacki.
 %    \end{macrocode}
 % All the lengths depend on |\SUF@label@chap| 
 % so we define this first.
-%    \begin{macrocode}
+%    \begin{macrocode}z
 \newlength\SUF@label@chap
 \setlength\SUF@label@chap{.5em}
 %    \end{macrocode}
@@ -4890,8 +5232,8 @@ Janusz M. Nowacki.
   [\addvspace{1ex}]
 \ifsuftesi@toccompactsec
 \titlecontents*{section}[\SUF@tochang@chap]{}{%
-	\SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{}{, 
-	\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+  \SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{, 
+  \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
 \else
 \titlecontents{section}
   [\SUF@tochang@sec]
@@ -4910,8 +5252,8 @@ Janusz M. Nowacki.
 \fi
 \ifsuftesi@toccompactsubsec
 \titlecontents*{subsection}[\SUF@tochang@sec]{\suf@sscorrect}{%
-	\SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{}{, 
-	\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
+  \SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{\SUF@tocSUBSEC@font}{, 
+  \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
 \else
 \titlecontents{subsection}
   [\SUF@tochang@subsec]
@@ -4927,8 +5269,9 @@ Janusz M. Nowacki.
 \fi
 \ifsuftesi@toccompactsubsubsec
 \titlecontents*{subsubsection}[\SUF@tochang@subsec]{\suf@ssscorrect}{%
-	\SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSUBSEC@font}{}{, 
-	\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
+  \SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep%
+  \SUF@tocSUBSUBSEC@font}{\SUF@tocSUBSUBSEC@font}{, 
+  \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
 \else
 \titlecontents{subsubsection}
   [\SUF@tochang@subsubsec]
@@ -5039,8 +5382,8 @@ Janusz M. Nowacki.
   [\addvspace{1ex}]
 \ifsuftesi@toccompactsec
 \titlecontents*{section}[\SUF@tocindent@chap]{}{%
-	\SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{}{, 
-	\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+  \SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{, 
+  \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
 \else
 \titlecontents{section}
   [\SUF@tocindent@sec]
@@ -5058,8 +5401,8 @@ Janusz M. Nowacki.
 \fi
 \ifsuftesi@toccompactsubsec
 \titlecontents*{subsection}[\SUF@tocindent@sec]{\suf@sscorrect}{%
-	\SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{}{, 
-	\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
+  \SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{\SUF@tocSUBSEC@font}{, 
+  \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
 \else
 \titlecontents{subsection}
   [\SUF@tocindent@subsec]
@@ -5073,8 +5416,9 @@ Janusz M. Nowacki.
 \fi  
 \ifsuftesi@toccompactsubsubsec
 \titlecontents*{subsubsection}[\SUF@tocindent@subsec]{\suf@ssscorrect}{%
-	\SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSUBSEC@font}{}{, 
-	\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
+  \SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep%
+  \SUF@tocSUBSUBSEC@font}{\SUF@tocSUBSUBSEC@font}{, 
+  \thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
 \else
 \titlecontents{subsubsection}
   [\SUF@tocindent@subsubsec]
@@ -5122,16 +5466,16 @@ Janusz M. Nowacki.
 \ifsuftesi@article 
 \renewcommand\tableofcontents{%
     \vspace{2ex}%
-	    \section*{\contentsname}%
-	      \@mkboth{\contentsname}{\contentsname}%
+      \section*{\contentsname}%
+        \@mkboth{\contentsname}{\contentsname}%
         \thispagestyle{empty}
         \ifsuftesi@twocolumntoc
           \begin{multicols}{2}
-	          \@starttoc{toc}%
-	        \end{multicols}
-	      \else
-	         \@starttoc{toc}%
-	      \fi
+            \@starttoc{toc}%
+          \end{multicols}
+        \else
+           \@starttoc{toc}%
+        \fi
     \vspace{2ex}%
    }
 \renewcommand\listoffigures{%
@@ -5141,11 +5485,11 @@ Janusz M. Nowacki.
      \thispagestyle{empty}
         \ifsuftesi@twocolumnlof
           \begin{multicols}{2}
-	          \@starttoc{lof}%
-	        \end{multicols}
-	      \else
-	         \@starttoc{lof}%
-	      \fi
+            \@starttoc{lof}%
+          \end{multicols}
+        \else
+           \@starttoc{lof}%
+        \fi
     \vspace{2ex}%
     }
 \renewcommand\listoftables{%
@@ -5155,11 +5499,11 @@ Janusz M. Nowacki.
       \thispagestyle{empty}
         \ifsuftesi@twocolumnlot
           \begin{multicols}{2}
-	          \@starttoc{lot}%
-	        \end{multicols}
-	      \else
-	         \@starttoc{lot}%
-	      \fi
+            \@starttoc{lot}%
+          \end{multicols}
+        \else
+           \@starttoc{lot}%
+        \fi
     \vspace{2ex}%
     }
 \else
@@ -5179,11 +5523,11 @@ Janusz M. Nowacki.
       \thispagestyle{empty}
         \ifsuftesi@twocolumntoc
           \begin{multicols}{2}
-	          \@starttoc{toc}%
-	        \end{multicols}
-	      \else
-	         \@starttoc{toc}%
-	      \fi
+            \@starttoc{toc}%
+          \end{multicols}
+        \else
+           \@starttoc{toc}%
+        \fi
     \if@restonecol\twocolumn\fi
    }
 \renewcommand\listoffigures{%
@@ -5198,11 +5542,11 @@ Janusz M. Nowacki.
      \thispagestyle{empty}
         \ifsuftesi@twocolumnlof
           \begin{multicols}{2}
-	          \@starttoc{lof}%
-	        \end{multicols}
-	      \else
-	         \@starttoc{lof}%
-	      \fi
+            \@starttoc{lof}%
+          \end{multicols}
+        \else
+           \@starttoc{lof}%
+        \fi
     \if@restonecol\twocolumn\fi
     }
 \renewcommand\listoftables{%
@@ -5218,11 +5562,11 @@ Janusz M. Nowacki.
      \thispagestyle{empty}
         \ifsuftesi@twocolumnlot
           \begin{multicols}{2}
-	          \@starttoc{lot}%
-	        \end{multicols}
-	      \else
-	         \@starttoc{lot}%
-	      \fi
+            \@starttoc{lot}%
+          \end{multicols}
+        \else
+           \@starttoc{lot}%
+        \fi
     \if@restonecol\twocolumn\fi
     }
 \fi
@@ -5301,7 +5645,7 @@ Janusz M. Nowacki.
 %    \end{macrocode}
 %
 % \subsection*{Final settings}
-% Renew  |\frontmatter| to have arabic page numbering:
+% Renew  \cmd{frontmatter} to have arabic page numbering.
 %
 %    \begin{macrocode}
 \ifsuftesi@article
@@ -5350,7 +5694,8 @@ Janusz M. Nowacki.
   \relax
 \fi
 %    \end{macrocode}
-% Just one touch of french typography:
+% Now we switch off extra space after punctuation, in accordance with the habits 
+% of European typography, especially the Italian one. The user can restore standard behavior with the \cmd{nonfrenchspacing} command.
 %    \begin{macrocode}
 \frenchspacing
 %    \end{macrocode}
@@ -5358,7 +5703,6 @@ Janusz M. Nowacki.
 %</class>
 % \fi
 %
-%
 % \iffalse
 %<*bib>
 @book{Morison:1111,
@@ -5435,6 +5779,21 @@ Janusz M. Nowacki.
   Url = {http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/biblatex.pdf},
   Year = {2010}}
 
+@online{wilson-robertson:appendix,
+	Author = {Peter R. Wilson and Will Robertson},
+	Note = {Version 1.2c},
+	Title = {The \textsf{appendix} package},
+	Url = {http://mirrors.ctan.org/macros/latex/contrib/appendix/appendix.pdf},
+	Year = {2020}}
+
+@online{Valbusa:fontsize,
+	Author = {Ivan Valbusa},
+	Note = {Versione 0.1},
+	Title = {User's Guide to \textsf{fontsize}},
+	Subtitle = {A small package to change the font size},	
+	Url = {http://mirrors.ctan.org/macros/latex/contrib/fontsize/fontsize.pdf},
+	Year = {2020}}
+
 @online{Miede:2011,
   Author = {André Miede},
   Title = {A Classic Thesis style},
@@ -5471,27 +5830,23 @@ Janusz M. Nowacki.
   Year = {2008}}
 
 @article{valbusa:20122,
-	Author = {Ivan Valbusa},
-	Date = {2012},
-	Date-Added = {2013-08-23 10:45:16 +0200},
-	Date-Modified = {2013-08-23 10:48:03 +0200},
-	Journaltitle = {\Ars},
-	Month = {10},
-	Number = {14},
-	Pages = {15-30},
-	Subtitle = {La classe suftesi},
-	Title = {La forma del testo umanistico},
-	url={http://www.guitex.org/home/images/ArsTeXnica/AT014/valbusa.pdf}}
+  Author = {Ivan Valbusa},
+  Date = {2012},
+  Journaltitle = {\Ars},
+  Month = {10},
+  Number = {14},
+  Pages = {15-30},
+  Subtitle = {La classe suftesi},
+  Title = {La forma del testo umanistico},
+  url={http://www.guitex.org/home/images/ArsTeXnica/AT014/valbusa.pdf}}
 
 @book{munari:arte-come-mestiere,
-	Author = {Bruno Munari},
-	Booktitle = {Arte come mestiere},
-	Date-Added = {2016-03-12 16:39:37 +0000},
-	Date-Modified = {2016-03-12 16:40:07 +0000},
-	Location = {Roma-Bari},
-	Publisher = {Laterza},
-	Title = {Arte come mestiere},
-	Year = {1966}}
+  Author = {Bruno Munari},
+  Booktitle = {Arte come mestiere},
+  Location = {Roma-Bari},
+  Publisher = {Laterza},
+  Title = {Arte come mestiere},
+  Year = {1966}}
 %</bib>
 % \fi
 %
diff --git a/macros/latex/contrib/suftesi/suftesi.pdf b/macros/latex/contrib/suftesi/suftesi.pdf
index 02e73f34ab..9cbbbd4580 100644
--- a/macros/latex/contrib/suftesi/suftesi.pdf
+++ b/macros/latex/contrib/suftesi/suftesi.pdf
diff --git a/macros/luatex/optex/README b/macros/luatex/optex/README
index 1a612e6179..caba16dda0 100644
--- a/macros/luatex/optex/README
+++ b/macros/luatex/optex/README
@@ -19,6 +19,11 @@ doc/   ... PDF version of the OpTeX documentation and sources.
 
 History:
 
+<0.13> \table have more features: \tabskip, \table to, \table pxto, \vspan
+       The \eqalign reimplemented to be more flexible.
+       The boundary character ":" introduced in the \table.
+       \| undefined in 8bit math: bug fixed.
+       \isnextchar: \let\tmp=#1 -> \let\tmp= #1 
 <0.12> The external macro qrcode.opm introduced
        New directory structure: base/, demo/, pkg/, doc/ introduced.
        \load macro introduced 
diff --git a/macros/luatex/optex/base/alloc.opm b/macros/luatex/optex/base/alloc.opm
index 7e03ae77b7..d5625321a9 100644
--- a/macros/luatex/optex/base/alloc.opm
+++ b/macros/luatex/optex/base/alloc.opm
@@ -1,6 +1,6 @@
 %% This is part of OpTeX project, see http://petr.olsak.net/optex
 
-\_codedecl \newdimen {Allocators for registers <2020-01-23>} % loaded in format
+\_codedecl \newdimen {Allocators for registers <2020-05-12>} % loaded in format
 
    \_doc -----------------------------
    The limits are set first.
@@ -28,7 +28,7 @@
 \_countdef\_toksalloc=15   \_toksalloc=255
 \_countdef\_readalloc=16   \_readalloc=-1
 \_countdef\_writealloc=17  \_writealloc=-1
-\_countdef\_mathalloc=18   \_mathalloc=3
+\_countdef\_famalloc=18    \_famalloc=3
 
    \_doc -----------------------------
    The common allocation macro 
@@ -51,7 +51,7 @@
    \_doc -----------------------------
    The allocation macros 
    \`\newcount`, \`\newdimen`, \`\newskip`, \`\newmuskip`, \`\newbox`,
-   \`\newtoks`, \`\newread`, \`\newwrite` and \`\newmath`
+   \`\newtoks`, \`\newread`, \`\newwrite` and \`\newfam`
    are defined here.
    \_cod -----------------------------
 
@@ -63,9 +63,9 @@
 \_def\_newtoks #1{\_allocator #1{toks}\_toksdef}
 \_def\_newread #1{\_allocator #1{read}\_chardef}
 \_def\_newwrite #1{\_allocator #1{write}\_chardef}
-\_def\_newmath #1{\_allocator #1{fam}\_chardef}
+\_def\_newfam #1{\_allocator #1{fam}\_chardef}
 
-\_public \newcount \newdimen \newskip \newmuskip \newbox \newtoks \newread \newwrite \newmath ;
+\_public \newcount \newdimen \newskip \newmuskip \newbox \newtoks \newread \newwrite \newfam ;
 
    \_doc -----------------------------
    The \`\newinsert` macro is defined differently than others.
@@ -162,4 +162,7 @@ the array-like declarator of counters.
 }
 \endtt
 
+\_endinput
 
+2020-05-12  \newmath -> \newfam  bug fixing
+2020-01-23  released
diff --git a/macros/luatex/optex/base/bib-iso690.opm b/macros/luatex/optex/base/bib-iso690.opm
index b569de0d30..612258baee 100644
--- a/macros/luatex/optex/base/bib-iso690.opm
+++ b/macros/luatex/optex/base/bib-iso690.opm
@@ -361,7 +361,7 @@ Moreover, there are two optional special fields:
 \begitems
 * lang     = language of the entry. The hyphenation plus autogenerated phrases and
              abbreviations will be typeset by this language.
-* option   = options by which you can control special printing of vairous fields.
+* option   = options by which you can control special printing of various fields.
 \enditems 
 
 There can be only one option field per each entry with (may be) more options
diff --git a/macros/luatex/optex/base/bib-simple.opm b/macros/luatex/optex/base/bib-simple.opm
index 347d90bb14..f152d87acd 100644
--- a/macros/luatex/optex/base/bib-simple.opm
+++ b/macros/luatex/optex/base/bib-simple.opm
@@ -13,7 +13,7 @@
 \_sfcode`\?=\_tmpnum \_sfcode`\!=\_tmpnum
 \_let\.=\_maybedot  % prevents from double periods
 
-% Formating of Author/Editor lists:
+% Formatting of Author/Editor lists:
 
 \_def\_authorname{%
   \_ifnum\_NameCount>1
diff --git a/macros/luatex/optex/base/cite-bib.opm b/macros/luatex/optex/base/cite-bib.opm
index 44f8dee055..c756a619bd 100644
--- a/macros/luatex/optex/base/cite-bib.opm
+++ b/macros/luatex/optex/base/cite-bib.opm
@@ -25,7 +25,7 @@
    \`\ecite` `[<label>]{<text>}` behaves like `\rcite [<label>]` but prints
    <text> instead <bib-mark>. The <text> is hyperlinked like <bib-marks>
    when `\cite` or `\rcite` is used. 
-   The emptpty internal macro \`\_savedcites` will include the `<bib-marks>` list to
+   The empty internal macro \`\_savedcites` will include the `<bib-marks>` list to
    be printed. This list is set by `\_citeA` inside group and it is used by
    `\_printsavedcites` in the same group. Each `\cite`/`\rcite`/`\ecite`  macro 
    starts from empty list of <bib-marks> because new group is opened.
@@ -222,9 +222,9 @@
 \_def \_bibskip {\_ifnum\_bibnum>0 \_smallskip \_fi}
 
    \_doc -----------------------------
-   The \`\usebib` command is implemted in `usebib.opm` file which is loaded
+   The \`\usebib` command is implemented in `usebib.opm` file which is loaded
    when the `\usebib` command is firstly used. 
-   The `usebib.opm` file loads the `librarian.tex` for scaning the `.bib`
+   The `usebib.opm` file loads the `librarian.tex` for scanning the `.bib`
    files. See the section~\ref[usebib], where the file `usebib.opm` is
    documented.
    \_cod -----------------------------
diff --git a/macros/luatex/optex/base/colors.opm b/macros/luatex/optex/base/colors.opm
index 2745e0fc51..eb57d0d9a8 100644
--- a/macros/luatex/optex/base/colors.opm
+++ b/macros/luatex/optex/base/colors.opm
@@ -74,15 +74,16 @@
 
    \_doc -----------------------------
    The \`\_setcolor` macro redefines empty `\_ensureblack` macro (used in
-   output routine for headres and footers) to `\_ensureblackA` which sets
-   Black at the start of its parameter and retunrs to the current color at the
-   end of its parameter. The current color
-   is saved into `\_currentcolor` macro and colorstack is pushed.
+   output routine for headers and footers) to `\_ensureblackA` which sets
+   Black at the start of its parameter and returns to the current color at the
+   end of its parameter. 
+   
+   The current color is saved into `\_currentcolor` macro and colorstack is pushed.
    Finally, the `\_colorstackpop` is initialized by `\aftergroup` if
    `\localcolor` is declared.
 
    You can save current color to your macro  by `\let\yourmacro=\_currentcolor` 
-   and you can return to this color by the command `\_setcmykcolor\yourmacro`.
+   and you can return to this color by the command `\_setcolor\yourmacro`.
    \_cod -----------------------------
 
 \_protected\_def \_setcolor #1{\_global\_let\_ensureblack=\_ensureblackA
@@ -111,7 +112,7 @@
    can follow on next pages and their colors are independent on colors
    used in the main page-body. The \`\_openfnotestack` is defined as
    \`\_openfnotestackA` when the \^`\_setcolor` is used first.
-   The \`\_fnotestack` is initializedin in `\everyjob` because the
+   The \`\_fnotestack` is initialized in in `\everyjob` because the
    initialization is not saved to the format.
    \_cod -----------------------------
 
diff --git a/macros/luatex/optex/base/doc.opm b/macros/luatex/optex/base/doc.opm
index 62cbd219c4..e46362e7c6 100644
--- a/macros/luatex/optex/base/doc.opm
+++ b/macros/luatex/optex/base/doc.opm
@@ -32,7 +32,8 @@
 \_pgbottomskip=0pt plus10pt minus2pt
 
    \_doc -----------------------------
-   The listing mode is implemented here.
+   The listing mode is implemented here. The \`\maxlines` 
+   is maximal lines of code printed in the listing mode.
    \_cod -----------------------------
 
 \_newcount \_maxlines   \_maxlines=100000
diff --git a/macros/luatex/optex/base/fams-ini.opm b/macros/luatex/optex/base/fams-ini.opm
index 5ecbfc361f..7619de9657 100644
--- a/macros/luatex/optex/base/fams-ini.opm
+++ b/macros/luatex/optex/base/fams-ini.opm
@@ -16,7 +16,7 @@
        \ttlight,\ttcond,\dunhill: {\rm\it} \upital: {\rm} }
 \_famalias [LMfonts] \_famalias [Latin Modern Fonts]
 
-\_famtext {TeX Gyre fonts based o Adobe 35:}
+\_famtext {TeX Gyre fonts based on Adobe 35:}
 
 \_faminfo [Termes] {TeX Gyre Termes fonts based on Times} {f-termes}
    { -,\caps: {\rm\bf\it\bi} }
@@ -36,7 +36,7 @@
 
 \_faminfo [Pagella] {TeX Gyre Pagella fonts based on Palatino} {f-pagella}
    { -,\caps: {\rm\bf\it\bi} }
-\_famalias [Palation]
+\_famalias [Palatino]
 
 \_faminfo [Schola] {TeX Gyre Schola fonts based on New Century} {f-schola}
    { -,\caps: {\rm\bf\it\bi} }
@@ -48,7 +48,7 @@
 
 \_famtext {Other fonts:}
 
-\_faminfo [Linux Libertine] {Free fonts typicaly installed in systems} {f-libertine}
+\_faminfo [Linux Libertine] {Free fonts typically installed on systems} {f-libertine}
    { -: {\rm\bf\it\bi} \semi: {\rm\it} 
      \caps,\sans,\mono,\caps\sans: {\rm\bf\it\bi} -: {\initials\displ\keybr} }
 \_famalias [Libertine] \_famalias [LinLibertine]
@@ -58,7 +58,7 @@
     \medium,\cond\medium, \light, \cond\light:{\rm\it} }
 \_famalias [Antt]
 
-\_faminfo [Baskerville] {Free vaiants of classical Baskerville} {f-baskerville}
+\_faminfo [Baskerville] {Free variants of classical Baskerville} {f-baskerville}
    { -,\caps: {\rm\bf\it\bi} }
 \_famalias [BaskevilleF]
 
@@ -76,11 +76,11 @@
 
 Once you have prepared a font family file with the name `f-<famname>.opm` and \TeX/ is
 able to see it in your filesystem then you can type \^`\fontfam``[<famname>]` and
-the file is read, so the information about font family is loaded. The name
+the file is read, so the information about the font family is loaded. The name
 `<famname>` must be lowercase and without spaces in the file name
-`f-<famname>.opm`. On the other hand the `\fontfam` command gives more tolerance: 
+`f-<famname>.opm`. On the other hand the `\fontfam` command is more tolerant:
 you can write uppercase letters and spaces here. The spaces are ignored and 
-letters are converted to lowercase.
+uppercase letters are converted to lowercase.
 For example `\fontfam [LM Fonts]` is equivalent to \fontfam [LMfonts] and both
 commands load the file `f-lmfonts.opm`.
 
@@ -95,9 +95,9 @@ existed file `fams-ini.opm`.
 
 The information from the user's `fams-local.opm` file has precedence.
 For example `fams-ini.opm` declares aliases Times$\to$Termes etc. If you
-have original Times purchased from Adobe then you can register your
-declaration about Times family in `fams-local.opm`. When an user write
-`\fontfam[Times]` then orginal Times (no Termes) is used in such case.
+have the original Times purchased from Adobe then you can register your
+declaration of Adobe's Times family in `fams-local.opm`. When a user writes
+`\fontfam[Times]` then the original Times (not Termes) is used.
 
 The `fams-ini.opm` and `fams-local.opm` files use the macros
 `\_famifo`, `\_famalias` and `\_famtext`. See the example from
diff --git a/macros/luatex/optex/base/graphics.opm b/macros/luatex/optex/base/graphics.opm
index f2fa1b9257..bc88a16de0 100644
--- a/macros/luatex/optex/base/graphics.opm
+++ b/macros/luatex/optex/base/graphics.opm
@@ -30,9 +30,9 @@
    Inkscape is able to save a picture to `*.pdf` file and labels for the picture
    to `*.pdf_tex` file. The second file is in \LaTeX/ format (unfortunately) 
    and it is intended to read immediately it after `*.pdf` in included 
-   in order to place labels of this ficture in the same font as document is printed. 
+   in order to place labels of this picture in the same font as document is printed.
    We need to read this \LaTeX/ file by plain \TeX/ macros when \`\inkinspic` is used. 
-   These macros are stored in the \`\_inkdefs` toknes list and it is used
+   These macros are stored in the \`\_inkdefs` tokens list and it is used
    locally in the group. The solution is borrowed from OPmac trick 0032. 
    \_cod -----------------------------
 
@@ -193,12 +193,12 @@
    \`\_circle``{<x>}{<y>}` creates an ellipse with `<x>` axis and `<y>` axix.
    The origin is in the center.
    \nl
-   \`\_oval``{<x>}{<y>}{<roudness>}` creates an oval with `<x>`, `<y>` size and with 
+   \`\_oval``{<x>}{<y>}{<roundness>}` creates an oval with `<x>`, `<y>` size and with
    given `<roundness>`. The real size is bigger by 2`<roundness>`. The
    origin is at the left bottom corner.
    \nl
-   \`\_mv``{<x>}{<y>}{<curve>}` moves current point to `<x>`, `<y>`, crates the
-   `<curve>` and retuns back the current point.
+   \`\_mv``{<x>}{<y>}{<curve>}` moves current point to `<x>`, `<y>`, creates the
+   `<curve>` and returns back the current point.
    All these macros are fully expandable and they can be used in the
    `\pdfliteral` argument.
    \_cod -----------------------------
diff --git a/macros/luatex/optex/base/hi-syntax.opm b/macros/luatex/optex/base/hi-syntax.opm
index e0ac530c3d..48210fa4b1 100644
--- a/macros/luatex/optex/base/hi-syntax.opm
+++ b/macros/luatex/optex/base/hi-syntax.opm
@@ -170,7 +170,7 @@ The `hisyntax-<name>.opm` file must (globally) declare `\_hisyntax<name>` tokens
 where the action over verbatim text is declared typically by `\replfromto` or
 `\replthis` macros. 
 
-The verbatim text is preparared by {\em pre-processing phase}, then the 
+The verbatim text is prepared by {\em pre-processing phase}, then the
 `\_hisyntax<name>` is applied and then {\em post-processing phase} does final
 corrections. Finally, the verbatim text is printed line by line.
 
@@ -180,7 +180,7 @@ The pre-processing phase does:
 * Each space is replaced by {\visiblesp`\n\ \n`}, so `\n<word>\n` should be a pattern to
   finding whole words (no subwords). The `\n` control sequence is removed in
   the post-processing phase.
-* Each end of line is repersented by `\n^^J\n`.
+* Each end of line is represented by `\n^^J\n`.
 * The `\_start` control sequence is added before the verbatim text and `\_end` control
   sequence is appended to the end of the verbatim text. These control
   sequences are removed in post-processing phase.
@@ -192,7 +192,7 @@ text.
 
 \begitems
 * `\n` means noting but it should be used as a boundary of words as mentioned above.
-* `\t` means a tabelator. It is prepared as `\n\t\n` because it can be at
+* `\t` means a tabulator. It is prepared as `\n\t\n` because it can be at
   the boundary of a word.
 * `\x <letter>{<text>}` can be used as replacing text. Suppose the example
   \begtt
@@ -214,7 +214,7 @@ text.
   The `\z <letter>{<text>}` is expanded to `\_z:<letter>{<text>}` and if
   `\hicolor <letter> <color>` is declared then 
   `\_z:<letter>{<text>}` expands to `{<color><text>}`. So, required color is
-  activated at all lines (separatelly) where C comment spans.
+  activated at all lines (separately) where C comment spans.
 * `\y {<text>}` is replaced by `\<text>` in the post processing phase. It should
   be used for macros without a parameter. You cannot use unprotected macros
   as replacement text before the post-processing phase, because the post-processing
diff --git a/macros/luatex/optex/base/hisyntax-c.opm b/macros/luatex/optex/base/hisyntax-c.opm
index e7583657a4..8e8ccf0920 100644
--- a/macros/luatex/optex/base/hisyntax-c.opm
+++ b/macros/luatex/optex/base/hisyntax-c.opm
@@ -46,12 +46,12 @@
 
 
 Each `hisyntax-<name>.opm` file must declare the token list
-`\_hisyntax<name>` using `\newtoks` and must ceclare the syntax declaration
+`\_hisyntax<name>` using `\newtoks` and must declare the syntax declaration
 in it. The second cotken list `\_hicolors<name>` is optional but recommended.
 User can re-declare his/her own colors by `\hicolors` which has precedence
 before `\_hicolors<name>`.
 
-The public variants can be deacred if you want to give these token lists to
+The public variants can be declared if you want to give these token lists to
 the user name space. But it is not explicitly needed.
 
 All settings must be global here, because the file is typically read inside
diff --git a/macros/luatex/optex/base/hyphen-lan.opm b/macros/luatex/optex/base/hyphen-lan.opm
index 76feb2296d..27de1af376 100644
--- a/macros/luatex/optex/base/hyphen-lan.opm
+++ b/macros/luatex/optex/base/hyphen-lan.opm
@@ -182,7 +182,7 @@
 \_endcode % ---------------------------------------------
 
 
-Maybe, you need to do more language specific actions than only to swich
+Maybe, you need to do more language specific actions than just switching
 hyphenation patterns. For example you need to load a specific font with a
 specific script used in selected language, you can define a macros for
 quotation marks depending on the language etc.
diff --git a/macros/luatex/optex/base/if-macros.opm b/macros/luatex/optex/base/if-macros.opm
index c33c8a91d3..4685aed48e 100644
--- a/macros/luatex/optex/base/if-macros.opm
+++ b/macros/luatex/optex/base/if-macros.opm
@@ -1,6 +1,6 @@
 %% This is part of OpTeX project, see http://petr.olsak.net/optex
 
-\_codedecl \newif {Special if-macros, is-macros and loops <2020-05-02>} % preloaded in format
+\_codedecl \newif {Special if-macros, is-macros and loops <2020-05-06>} % preloaded in format
 
    \_doc ----------------------------
    \secc Classical \code{\\newif}
@@ -159,7 +159,7 @@
    is true if the `<tokens variable>` is empty. It is expandable.
    \_cod ----------------------------
 
-\_def \_isempty #1#2{\_if\_relax\_detokenize{#1}\_relax \_else \_ea\_unless \_fi#2}
+\_long\_def \_isempty #1#2{\_if\_relax\_detokenize{#1}\_relax \_else \_ea\_unless \_fi#2}
 \_def \_istoksempty #1#2{\_ea\_isempty\_ea{\_the#1}#2}
 \_public \isempty \istoksempty ;
 
@@ -243,7 +243,7 @@
    \_cod ----------------------------
 
 \_long\_def\_isnextchar#1#2#3{\_begingroup\_toks0={\_endgroup#2}\_toks1={\_endgroup#3}%
-   \_let\_tmp=#1\_futurelet\_next\_isnextcharA
+   \_let\_tmp= #1\_futurelet\_next\_isnextcharA
 }
 \_def\_isnextcharA{\_the\_toks\_ifx\_tmp\_next0\_else1\_fi\_space}
 
@@ -252,6 +252,7 @@
 
 \_endcode 
 
+2020-05-06 \isnextchar: \let\tmp=#1 -> \let\tmp= #1 (bug fix, #1 should be space)
 2020-05-02 \newif bug fix
 2020-04-15 \fornumstep 3: 1..12 instead \fornum 1..12\step 3
 2020-04-15 \fornum, \foreach can be nested without groups
diff --git a/macros/luatex/optex/base/languages.opm b/macros/luatex/optex/base/languages.opm
index aedcd249f4..aa862de431 100644
--- a/macros/luatex/optex/base/languages.opm
+++ b/macros/luatex/optex/base/languages.opm
@@ -35,7 +35,7 @@
 \_langw en  Chapter      Table       Figure       Subject
 %--------------------------------------------------------------
 \_langw cs  Kapitola     Tabulka     Obrázek      Věc
-\_langw de  Kapitel      Tabelle     Abbildung    Subjekt
+\_langw de  Kapitel      Tabelle     Abbildung    Betreff
 \_langw es  Capítulo     Tabla       Figura       Sujeto
 \_langw fr  Chaptire     Tableau     Figure       Matière
 \_langw it  Capitolo     Tabella     Fig.         Soggetto
@@ -118,4 +118,4 @@
 \_endcode % -------------------------------------
 
 2020-04-29 Obrazek -> Abbildung: bug fixed
-2020-03-15 introduced
\ No newline at end of file
+2020-03-15 introduced
diff --git a/macros/luatex/optex/base/math-macros.opm b/macros/luatex/optex/base/math-macros.opm
index a1e7b817ff..71a7923906 100644
--- a/macros/luatex/optex/base/math-macros.opm
+++ b/macros/luatex/optex/base/math-macros.opm
@@ -1,6 +1,6 @@
 %% This is part of OpTeX project, see http://petr.olsak.net/optex
 
-\_codedecl \sin {Math macros plus mathchardefs <2020-04-27>} % preloaded in format 
+\_codedecl \sin {Math macros plus mathchardefs <2020-05-11>} % preloaded in format 
 
    \_doc -----------------------------
    The category code of the character `_` remains as letter (11) and the mathocode 
@@ -11,12 +11,12 @@
    without problem. But `\int``_a^b` is tokenized as `\int``_a`, `^`, `b`. The
    control sequence `\int``_a` isn't defined. We must write `\int _a^b`.
 
-   The lua code presented here solves this problem. But you cannot set our own
+   The Lua code presented here solves this problem. But you cannot set our own
    control sequence in the form `\<word>_` or `\<word>_<one-letter>` (where
    <word> is sequence of letters) because such control sequences are
-   unacessible: proprocessor rewrites it.
+   inaccessible: preprocessor rewrites it.
 
-   The \`\mathsbon` macro activates the rewritting rule `\<word>_<nonleter>` to
+   The \`\mathsbon` macro activates the rewriting rule `\<word>_<nonleter>` to
    `\<word> _<nonletter>` and 
    `\<word>``_<letter><nonletter>` to `\<word> _<letter><nonletter>` at input
    processor level. The \`\mathsboff` deactivates it.
@@ -120,7 +120,7 @@
 
    \_doc -----------------------------
    All control sequences declared by `\mathchardef` are supposed (by default)
-   only for public usage. It means that they are delcared without `_` prefix.
+   only for public usage. It means that they are declared without `_` prefix.
    If such sequences are used in internal \OpTeX/ macro then their internal
    prefixed form is declared using `\_private` macro.\nl
    These encoding dependent declarations will be set to different values
@@ -490,7 +490,7 @@
 \_protected\_def\arrowvert{\_delimiter"26A33C } % arrow without arrowheads
 \_protected\_def\Arrowvert{\_delimiter"26B33D } % double arrow without arrowheads
 \_protected\_def\bracevert{\_delimiter"77C33E } % the vertical bar that extends braces
-\_protected\_def\Vert{\_delimiter"26B30D } \_let\|=\_Vert
+\_protected\_def\Vert{\_delimiter"26B30D } \_let\|=\Vert
 \_protected\_def\vert{\_delimiter"26A30C }
 \_protected\_def\uparrow{\_delimiter"3222378 }
 \_protected\_def\downarrow{\_delimiter"3223379 }
@@ -571,18 +571,44 @@
 \_public \bmod \pmod ;
 
    \_doc -----------------------------
-   \`\cases`, \`\matrix`, \`\pmatrix` and \`\bordermatrix` macros from plain \TeX/
+   \`\matrix`, \`\pmatrix` and \`\bordermatrix`
+   behave as in Plain \TeX/, if it is used in the
+   `\displaystyle` or `\textstyle`. On the other hand, it is printed in smaller size
+   (by appropriate amount) in `\scriptstyle` and `\scriptscriptstyle`. 
+   This feature is new in \OpTeX/.
    \_cod -----------------------------
 
-\_protected\_def\_cases#1{\_left\{\_thinsk\_vcenter{\_normalbaselines\_math
-    \_ialign{$##\_hfil$&\_quad##\_hfil\_crcr#1\_crcr}}\_right.}
-\_protected\_def\_matrix#1{\_null\_thinsk\_vcenter{\_normalbaselines\_math
-    \_ialign{\_hfil$##$\_hfil&&\_quad\_hfil$##$\_hfil\_crcr
+\_protected\_def\_matrix#1{\_null\_thinsk
+    \_edef\_stylenum{\_the\_numexpr\_mathstyle/2\_relax}%
+    \_vcenter{\_matrixbaselines\_math
+    \_ialign{\_hfil$\_matrixstyle##$\_hfil&&\_quad\_hfil$\_matrixstyle##$\_hfil\_crcr
       \_mathstrut\_crcr\_noalign{\_kern-\_baselineskip}
       #1\_crcr\_mathstrut\_crcr\_noalign{\_kern-\_baselineskip}}}\_thinsk}
+
+\_def\_matrixbaselines{\_normalbaselines \_def\_matrixstyle{}%
+   \_ifcase\_stylenum \_or \_or
+       \_baselineskip=.7\_baselineskip
+       \_def\_quad {\_hskip.7em\_relax}%
+       \_let\_matrixstyle=\_scriptstyle
+   \_or
+       \_baselineskip=.5\_baselineskip
+       \_def\_quad {\_hskip.5em\_relax}%
+       \_let\_matrixstyle=\_scriptscriptstyle
+   \_fi
+}
 \_protected\_def\_pmatrix#1{\_left(\_matrix{#1}\_right)}
+
+\_public \matrix \pmatrix ;
+
+   \_doc -----------------------------
+   The \`\cases` and `\bordermatrix` macros are identical from plain \TeX/.
+   \_cod -----------------------------
+
+\_protected\_def\_cases#1{\_left\{\_thinsk\_vcenter{\_normalbaselines\_math
+    \_ialign{$##\_hfil$&\_quad##\_hfil\_crcr#1\_crcr}}\_right.}
+
 \_newdimen\_ptrenwd
-\_ptrenwd=0.875\_fontdimen6\_textfont1 % width of the big left (
+\_ptrenwd=8.75pt % width of the big left (
 \_protected\_def\_bordermatrix#1{\_begingroup \_math
   \_setbox0=\_vbox{\_def\_cr{\_crcr\_noalign{\_kern.2em\_global\_let\_cr\_endline}}%
     \_ialign{$##$\_hfil\_kern.2em\_kern\_ptrenwd&\_thinspace\_hfil$##$\_hfil
@@ -595,20 +621,62 @@
     \_global\_setbox1=\_vbox{\_box1 \_kern.2em}%
     \_vcenter{\_kern-\_ht1 \_unvbox0 \_kern-\_baselineskip}\_thinsk\_right)$}%
   \_null\_thicksk\_vbox{\_kern\_ht1 \_box2}\_endgroup}
-\_public \cases \matrix \pmatrix \bordermatrix ;
+
+\_public \cases \bordermatrix ;
+
+   \_doc -----------------------------
+   The \`\eqalign` macro behaves like in Plain \TeX/ by default.
+   It creates the `\vcenter` in the math mode. The contents is two column
+   `\halign` with right aligned left column and left aligned right column.
+   The table items are in `\displaystyle` and the `\baselineskip` is
+   advanced by `\jot` (3pt in plain \TeX). It follows from the default
+   settings of \^`\eqlines` and \^`\eqstyle` parameters.
+
+   In \OpTeX/, this macro is more flexible. You can set the
+   `\baselineskip` value by the \^`\eqlines` parameter and math style
+   by the \^`\eqstyle` parameter. 
+   For example, you need to put the system of euations as an index of sum
+   operator:
+   \begtt
+   $$
+     \sum_{\eqlines{\baselineskip=.7\baselineskip}\eqstyle{\scriptstyle}\eqalign{
+                     i &\in A  \cr
+                     j &\in B  \cr
+                     k &\in C }}
+     i + j + k
+   $$
+   \endtt
+   You can write more equation systems one next second:
+   \begtt
+   $$\eqalign{
+        x + y + z &= 1     &&  a + b + c &= -1 \cr  
+            u + v &= 20    &&      f + g &= -20 \cr
+                i &= j   
+   }$$
+   \endtt
+   You can use the third column for centered equations without aligning point
+   (as in \^`\displaylines`, but packed to the `\vcenter` box). For example:
+   \begtt \catcode`\<=13
+   $$ \left( \eqspace=0pt \eqalign{&& <first equation>\cr && <second equation>} \right) $$
+   \endtt
+   The \^`\eqspace` is additional space used in the third column to separate
+   equation systems one next second.
+   \_cod -----------------------------
+
+\_def\_eqalign#1{\_null\_thinsk\_vcenter{\_the\_eqlines\_math
+   \_ialign{&\_hfil$\_the\_eqstyle{##}$&$\_the\_eqstyle{{}##}$\_hfil
+            &\_hskip.5\_eqspace\_hfil$\_the\_eqstyle{##}$\_hskip.5\_eqspace\_hfil
+            \_crcr#1\_crcr}}\_thinsk}
 
    \_doc -----------------------------
-   \`\openup`, \`\eqalign`, \`\displaylines` and  \`\eqalignno` macros from
-   plain \TeX/.
+   \`\openup`, \`\displaylines` and  \`\eqalignno` macros are copied from
+   Plain \TeX/ unchanged.
    \_cod -----------------------------
 
 \_def\_openup{\_afterassignment\_openupA\_dimen0=}
 \_def\_openupA{\_advance\_lineskip by\_dimen0
   \_advance\_baselineskip by\_dimen0
   \_advance\_lineskiplimit by\_dimen0 }
-\_def\_eqalign#1{\_null\_thinsk\_vcenter{\_openup\_jot\_math
-  \_ialign{\_strut\_hfil$\_displaystyle{##}$&$\_displaystyle{{}##}$\_hfil
-      \_crcr#1\_crcr}}\_thinsk}
 \_newifi\_ifdtop
 \_def\_display{\_global\_dtoptrue\_openup\_jot\_math
   \_everycr{\_noalign{\_ifdtop \_global\_dtopfalse \_ifdim\_prevdepth>-1000pt
@@ -873,7 +941,7 @@
 \_let\circleddot\odot
 
    \_doc -----------------------------
-   The \`\not` macro is re-defined to be mote inteligent than in plain
+   The \`\not` macro is re-defined to be smarter than in plain
    \TeX/. The macro follows this rule:
    \begtt
    \not< becomes \_nless
@@ -931,7 +999,7 @@
    \_doc -----------------------------
    The \`\mathbox``{<text>}` macro is copied from OPmac trick 078.
    It behaves like `\hbox{<text>}` but the `<text>` is scaled to smaller
-   size if it is used in scriptstye or scriptscript style.
+   size if it is used in scriptstyle or scriptscript style.
    \_cod -----------------------------
 
 \_def\_mathbox#1{{\_mathstyles{\_hbox{%
@@ -942,5 +1010,6 @@
 
 \_endcode %---------------------------------------------------
 
+2020-05-11 \let\|=\Vert, bug fixed
 2020-04-27 \mathstyles introduced
 2020-03-14 implemented
diff --git a/macros/luatex/optex/base/math-preload.opm b/macros/luatex/optex/base/math-preload.opm
index 0b8ffeebab..633b5ebeb8 100644
--- a/macros/luatex/optex/base/math-preload.opm
+++ b/macros/luatex/optex/base/math-preload.opm
@@ -4,7 +4,7 @@
 
   \_doc ------------------------------
   We have two math macros \`\normalmath` for normal shape of all math
-  symbols and \`\boldmath` for bold shape of all math symbos. The second one
+  symbols and \`\boldmath` for bold shape of all math symbols. The second one
   can be used in bold titles, for example.
   These macros load all fonts from all given math font families.
   \_cod ------------------------------
@@ -132,7 +132,7 @@
    \`\_sizemsscript` sizes. These sizes are set by the
    \`\setmathsizes` `[<text-size>/<script-size>/<scriptscript-size>]` macro. 
    These parameters are given in the \`\ptmunit` unit, it is set to 
-   1\`\ptunit` and it is set to 1\,pt by  defaut.
+   1\`\ptunit` and it is set to 1\,pt by  default.
    \nl
    \`\_corrmsizes` should be used in the \^`\normalmath` and \^`\boldmath`
    macros if you need a size correction when a selected math family is
diff --git a/macros/luatex/optex/base/more-macros.opm b/macros/luatex/optex/base/more-macros.opm
index a022375360..51f1919870 100644
--- a/macros/luatex/optex/base/more-macros.opm
+++ b/macros/luatex/optex/base/more-macros.opm
@@ -4,8 +4,8 @@
 
    \_doc -----------------------------
    We define \`\opinput` `{<file name>}` macro which
-   does `\input {<file name>}` but catocodes are set to normal catcodes
-   (like \OpTeX/ initializes them) and the catodes setting is return back to
+   does `\input {<file name>}` but the catcodes are set to normal catcodes
+   (like \OpTeX/ initializes them) and the catcodes setting are returned back to
    the current values when the file is read. You can use `\optinput`
    in any situation inside the document and you will be sure that the file
    is read correctly with correct catcode settings.
@@ -33,7 +33,7 @@
    \_doc -----------------------------
    The implementation of the catcodetable stack follows. 
 
-   The current catodes are
+   The current catcodes are
    managed in the `\catcodetable0`. If the `\setctable` is used first (or at
    the outer level of the stack), then the `\catcodetable0` is pushed to the
    stack and the current table is re-set to the given `<catcode table>`.
diff --git a/macros/luatex/optex/base/optex.ini b/macros/luatex/optex/base/optex.ini
index de15a1db73..27649370ef 100644
--- a/macros/luatex/optex/base/optex.ini
+++ b/macros/luatex/optex/base/optex.ini
@@ -21,7 +21,7 @@
 
 % OpTeX version
 
-\def\optexversion{Beta 0.12 May 2020}
+\def\optexversion{Beta 0.13 May 2020}
 \def\fmtname{OpTeX}
 
 % Engine testing:
diff --git a/macros/luatex/optex/base/others.opm b/macros/luatex/optex/base/others.opm
index ffa8451f90..f4bcc78698 100644
--- a/macros/luatex/optex/base/others.opm
+++ b/macros/luatex/optex/base/others.opm
@@ -66,6 +66,12 @@
 \_def\OPmacversion{OpTeX}  
 
     \_doc ----------------------------
+    We allow empty lines in math formulae. It is more comfortable.
+    \_cod ----------------------------
+
+\_suppressmathparerror = 1
+
+    \_doc ----------------------------
     Lorem ipsum can be printed by \`\lipsum``[<range>]` or \`\lorem``[<range>]`,
     for example `\lipsum[3]` or `\lipsum[112-121]`, max=150. The data are read
     from \LaTeX/ file `lipsum.ltd.tex`.
diff --git a/macros/luatex/optex/base/output.opm b/macros/luatex/optex/base/output.opm
index ae8ee0b08b..41948896e7 100644
--- a/macros/luatex/optex/base/output.opm
+++ b/macros/luatex/optex/base/output.opm
@@ -151,7 +151,7 @@
      {\_bgroup \_aftergroup\_vfootA \_afterassignment\_ignorespaces \_let\_next=}{\_vfootB}%
 }
 \_def\_vfootA{\_unskip\_strut\_isnextchar\_colorstackpop\_closefncolor\_vfootF}
-\_def\_vfootB #1{#1\_uskip\_strut\_vfootF}
+\_def\_vfootB #1{#1\_unskip\_strut\_vfootF}
 \_def\_vfootF{\_egroup} % close \_insert\_footins\_bgroup
 \_def\_closefncolor#1{#1\_isnextchar\_colorstackpop\_closefncolor\_vfootF}
 \_def \_footstrut {\_vbox to\_splittopskip{}}
@@ -243,3 +243,8 @@ The output routine \^`\_optexoutput` is similar as in plain \TeX. It does:
   * runs output routine repeatedly if \^`\dosupereject` is activated.
   \enditems
 \enditems
+
+\_endinput
+
+2020-05-12 \vfootB: \uskip -> \unskip bug fixed
+2020-03-28 Released
diff --git a/macros/luatex/optex/base/parameters.opm b/macros/luatex/optex/base/parameters.opm
index 8a707b4758..bd12bac070 100644
--- a/macros/luatex/optex/base/parameters.opm
+++ b/macros/luatex/optex/base/parameters.opm
@@ -178,7 +178,7 @@
 \_public \picdir ;
 
    \_doc -----------------------------
-   You can control the dimesions of included images by
+   You can control the dimensions of included images by
    the parameters \`\picwidth` (which is equivalent to \`\picw`) and
    \`\picheight`. By default these parameters are set to zero: the native
    dimension of the image is used. If only `\picwidth` has a nonzero value,
@@ -399,12 +399,19 @@
    and the lines of the table.
    \nl
    \`\hhkern` gives the space between horizontal lines if they are doubled and 
-   \`\vvkern` gives the space between such vertical lines. 
+   \`\vvkern` gives the space between such vertical lines.
+   \nl
+   \`\tabskipl` is `\tabskip` used before first column,
+   \`\tabskipr` is `\tabskip` used after the last column.
+   \nl
+   \`\tsize` is virtual unit of the width of paragraph-like table items when 
+   `\table pxto<size>` is used.
    \_cod -----------------------------
 
 \_newtoks\_everytable \_newtoks\_thistable 
 \_newtoks\_tabiteml \_newtoks\_tabitemr \_newtoks\_tabstrut
-\_newdimen\_tablinespace \_newdimen\_vvkern \_newdimen\_hhkern
+\_newdimen\_tablinespace \_newdimen\_vvkern \_newdimen\_hhkern \_newdimen\_tsize
+\_newskip\_tabskipl  \_newskip\_tabskipr 
 \_everytable={}        % code used after settings in \vbox before table processing
 \_thistable={}         % code used when \vbox starts, is is removed after using it
 \_tabstrut={\_strut}
@@ -413,7 +420,22 @@
 \_tablinespace=2pt     % additional vertical space before/after horizontal rules
 \_vvkern=1pt           % space between double vertical line and used in \frame
 \_hhkern=1pt           % space between double horizontal line and used in \frame
-\_public \everytable \thistable \tabiteml \tabitemr \tabstrut \tablinespace \vvkern \hhkern ;
+\_tabskipl=0pt\_relax  % \tabskip used before first column 
+\_tabskipr=0pt\_relax  % \tabskip used after the last column
+\_public \everytable \thistable \tabiteml \tabitemr \tabstrut \tablinespace 
+         \vvkern \hhkern \tsize \tabskiplr ;
+
+   \_doc -----------------------------
+   The \^`\eqalign` macro can be configured by \`\eqlines` and \`\eqstyle`
+   tokens lists. The default values are set in order this macro beahaves
+   like in Plain \TeX. The \`\eqspace` is horizontal space put 
+   between equation systems if more columns in \^`\eqalign` is used.
+   \_cod -----------------------------
+
+\_newtoks  \_eqlines  \_eqlines={\_openup\_jot}
+\_newtoks  \_eqstyle  \_eqstyle={\_strut\_displaystyle}   
+\_newdimen \_eqspace  \_eqspace=20pt
+\_public \eqlines \eqstyle \eqspace ;
 
    \_doc -----------------------------
    The output routine uses token list \`\headline` and \`\footline` in the
@@ -423,7 +445,7 @@
    Assume that page-body text can be typeset in different sizes and
    different fonts and we don't know in what font context the output routine
    is invoked. So, it is strongly recommended to declare fixed variants of
-   fonts at begining of your document. For example `\fontdef\rmfixed{\rm}`,
+   fonts at the beginning of your document. For example `\fontdef\rmfixed{\rm}`,
    `\fontdef\itfixed{\it}`. Then use them in headline and footline:
    \begtt
    \headline={\itfixed Text of headline, section: \fistmark \hss}
diff --git a/macros/luatex/optex/base/prefixed.opm b/macros/luatex/optex/base/prefixed.opm
index 799cc923f9..a409a44697 100644
--- a/macros/luatex/optex/base/prefixed.opm
+++ b/macros/luatex/optex/base/prefixed.opm
@@ -161,7 +161,7 @@ example `\my_control_sequence`, but with the following exceptions:
   \OpTeX/ internal macros and macro package writers.
 * Control sequences (terminated by non-letter) in the form 
   `\<word>_` or `\<word>_<one-letter>`, where
-  <word> is a sequence of letters, are unaccessible, because they
+  <word> is a sequence of letters, are inaccessible, because they
   are interpreted as `\<word>` followed by `_` or as `\<word>` followed by
   `_<one-letter>`. This is important for writing math, for example:
 \begtt  \adef-{_}
diff --git a/macros/luatex/optex/base/ref-file.opm b/macros/luatex/optex/base/ref-file.opm
index 52ace30b8d..3cf6f6be7d 100644
--- a/macros/luatex/optex/base/ref-file.opm
+++ b/macros/luatex/optex/base/ref-file.opm
@@ -29,7 +29,7 @@
 \_let\_wref=\_wrefrelax
 
    \_doc ---------------------
-   If a macro needs to ceate and to use `.ref` file then such macro must use
+   If a macro needs to create and to use `.ref` file then such macro must use
    \`\openref`. When the file is created (using internal \`\_openrefA`) then
    the \`\_wref` `\<macro>{<data>}` is redefined in order to 
    save the line `\<macro><data>` to the `.ref` file using asynchronous
diff --git a/macros/luatex/optex/base/sections.opm b/macros/luatex/optex/base/sections.opm
index 45a3e61d28..ee02064b9e 100644
--- a/macros/luatex/optex/base/sections.opm
+++ b/macros/luatex/optex/base/sections.opm
@@ -272,7 +272,7 @@
    `\mark` mechanism is needed. But sections need `\mark`s. And they can be
    mixed with chapter's running heads, of course. 
 
-   The \`\_insermark``{<title text>}` saves `\mark` in the format
+   The \`\_insertmark``{<title text>}` saves `\mark` in the format
    `{<title-num>} {<title-text>}`, so it can be printed \"as is" in
    `\headline` (see the space between them), or you can define a formating
    macro with two parameters for processing these data, if you need it.   
diff --git a/macros/luatex/optex/base/table.opm b/macros/luatex/optex/base/table.opm
index 5fa252eeba..4aaaa9a442 100644
--- a/macros/luatex/optex/base/table.opm
+++ b/macros/luatex/optex/base/table.opm
@@ -1,6 +1,6 @@
 %% This is part of OpTeX project, see http://petr.olsak.net/optex
 
-\_codedecl \table {Basic macros for OpTeX <2020-04-10>} % preloaded in format
+\_codedecl \table {Basic macros for OpTeX <2020-05-20>} % preloaded in format
 
    \_doc -----------------------------
    The result of the \`\table``{<declaration>}{<data>}` macro is inserted into 
@@ -11,21 +11,36 @@
 \_let\_tablebox=\_vbox
 
    \_doc -----------------------------
-   Categories (for example of `|` character) have to be normal when reading 
-   `\table` parameters.
+   We save the `to<size>` or `pxto<size>` to `#1` and \`\_tableW` sets the
+   `to<size>` to the \`\_tablew` macro. 
+   If `pxto<size>` is used then `\_tablew` is empty and `\_tmpdim` includes
+   given <size>. The `\_ifpxto` returns true in this case.
+
+   The `\table` continues by reading `{<declaration>}` in the \^`\_tableA` macro.
+   Catcodes (for example the `|` character) have to be normal when reading 
+   `\table` parameters. This is the reason why we use `\catcodetable` here.
    \_cod -----------------------------
 
-\_def\_table{\_tablebox\_bgroup \_catcodetable\_optexcatcodes \_tableA}
+\_newifi \_ifpxto
+\_def\_table#1#{\_tablebox\_bgroup \_tableW#1\_empty\_end 
+   \_bgroup \_catcodetable\_optexcatcodes \_tableA}
+\_def\_tableW#1#2\_end{\_pxtofalse 
+   \_ifx#1\_empty \_def\_tablew{}\_else 
+   \_ifx#1p \_def\_tablew{}\_tableWx#2\_end \_else \_def\_tablew{#1#2}\_fi\_fi}
+\_def\_tableWx xto#1\_end{\_tmpdim=#1\_relax \_pxtotrue}
 \_public \table ;
 
    \_doc -----------------------------
    The \^`\tablinespace` is implemented by enlarging given \^`\tabstrut`
    by desired dimension (height and depth too) and by setting
    `\_lineskip=-2\_tablinespace`. Normal table rows (where no `\hrule` is
-   between them) have normal baseline distance.
+   between them) have normal baseline distance.\nl
+   The \`\_tableA``{<declaration>}` macro scans the `<declaration>` by
+   `\_scantabdata#1\_relax` and continues by reading `{<data>}` by
+   the \^`\_tableB` macro.
    \_cod -----------------------------
 
-\_def\_tableA#1{%
+\_def\_tableA#1{\_egroup
    \_the\_thistable \_global\_thistable={}%
    \_ea\_ifx\_ea^\_the\_tabstrut^\_setbox\_tstrutbox=\_null
    \_else \_setbox\_tstrutbox=\_hbox{\_the\_tabstrut}%
@@ -35,17 +50,67 @@
           \_offinterlineskip
           \_lineskip=-2\_tablinespace
    \_fi
-   \_colnum=0 \_def\_tmpa{}\_tabdata={}\_scantabdata#1\_relax
+   \_colnum=0 \_let\_addtabitem=\_addtabitemx 
+   \_def\_tmpa{}\_tabdata={\_colnum1\_relax}\_scantabdata#1\_relax
    \_the\_everytable \_tableB
 }
-\_def\_tableB#1{\_halign\_ea{\_the\_tabdata\_cr#1\_crcr}\_egroup}
+
+   \_doc -----------------------------
+   The \`\_tableB``{<data>}` saves `<data>` to `\_tmpb`
+   and does four \^`\replstring`s to prefix each macro \^`\crli` (etc.)
+   by `\_crcr`. The reason is: we want to use macros which scan its parameter 
+   to the delimeiter written in right part of table item declaration. 
+   See \^`\fS` for example. The `\crcr` cannot be hidden in other macro in such case.
+
+   The `\tabskip` value is saved for places between columns
+   into the \`\_tabskipmid` macro. Then it runs
+   \begtt \catcode`\<=13
+   \tabskip=\tabskipl \halign{<converted declaration>\tabskip=\tabskipr \cr <data>\crcr}
+   \endtt
+   This sets the desired boundary values of `\tabskip`. The
+   \"between-columns" values are set as `\tabskip=`\^`\_tabskipmid` in the 
+   `<converted declaration>` immediately after each column declarator.
+
+   If `pxto` keyword was used, then we set the virtual unit \^`\tsize` to
+   `\hsize` first. Then the first attempt of the table is created in box 0.
+   Then the \^`\tsize` is re-calculated using `\wd0` and the real table is 
+   printed by `\halign` in the second pass. 
+
+   If no `pxto` keyword was used, then we print the table using `\halign`
+   directly. The \^`\_tablew` macro is nonempty if the `to` keyword was used.
+
+   Because the color selector with `\aftergroup` can be used inside the
+   table item, we must to create second real group for each table item.
+   This is reason why we start `<converted declaration>` by `\bgroup` and we
+   end it by `\egroup` in the \`\_tableC` macro. Each `&` character
+   is stored as `\egroup&\bgroup` in `<converted declaration>`. The 
+   `\halign\_tablew\_tableC` really does:
+   \begtt \catcode`\<=13
+   \halign\_tablew{\bgroup<converted declaration>\egroup\tabskip=\tabskipr \cr<data>\crcr}
+   \endtt
+   \relax
+   \_cod -----------------------------
+
+\_def\_tableB#1{\_def\_tmpb{#1}%
+   \_replstring\_tmpb{\crli}{\_crcr\crli}\_replstring\_tmpb{\crll}{\_crcr\crll}% 
+   \_replstring\_tmpb{\crlli}{\_crcr\crlli}\_replstring\_tmpb{\crlp}{\_crcr\crlp}% 
+   \_edef\_tabskipmid{\_the\_tabskip}\_tabskip=\_tabskipl
+   \_ifpxto
+      \_tsize=\_hsize \_setbox0 = \_vbox{\_halign \_tableC}%
+      \_tsize=\_dimexpr\_hsize-(\_wd0-\_tmpdim)\_relax
+      \_setbox0=\_null \_halign \_tableC
+   \_else
+      \_halign\_tablew \_tableC
+   \_fi \_egroup
+}
+\_def\_tableC{\_ea{\_ea\_bgroup\_the\_tabdata\_egroup\_tabskip=\_tabskipr\_cr\_tmpb\_crcr}}
+
 \_newbox\_tstrutbox  % strut used in table rows
 \_newtoks\_tabdata   % the \halign declaration line
-\_newcount\_colnum   % number of columns
 
    \_doc -----------------------------
-   The \`\_scantabdata` converts `\table`'s `<declaration>` to 
-   `\halign` `<declaration>`.
+   The \`\_scantabdata` macro converts `\table`'s `<declaration>` to 
+   `\halign` `<converted declaration>`.
    The result is stored into \`\_tabdata` tokens list. 
    For example, the 
    following result is generated when `<declaration>=|cr||cl|`.
@@ -57,7 +122,7 @@
       &\_the\_tabiteml#\_unsskip\_hfil\_the\_tabitemr\_vrule\_tabstrutA
    ddlinedata: &\_dditem &\_dditem\_vvitem &\_dditem &\_dditem
    \endtt
-   The second result in the \`\_ddlinedata` macro is a teplate of one row of the table
+   The second result in the \`\_ddlinedata` macro is a template of one row of the table
    used by \^`\crli` macro.
    \_cod -----------------------------
 
@@ -65,25 +130,57 @@
    \_ifx\_relax#1\_let\_next=\_relax
    \_else\_ifx|#1\_addtabvrule
        \_else\_ifx(#1\_def\_next{\_scantabdataE}%
-           \_else\_isinlist{123456789}#1\_iftrue \_def\_next{\_scantabdataC#1}%
-               \_else \_ea\_ifx\_csname _tabdeclare#1\_endcsname \_relax
-                      \_ea\_ifx\_csname _paramtabdeclare#1\_endcsname \_relax
+           \_else\_ifx:#1\_def\_next{\_scantabdataF}%
+               \_else\_isinlist{123456789}#1\_iftrue \_def\_next{\_scantabdataC#1}%
+                   \_else \_ea\_ifx\_csname _tabdeclare#1\_endcsname \_relax
+                       \_ea\_ifx\_csname _paramtabdeclare#1\_endcsname \_relax
                           \_opwarning{tab-declarator "#1" unknown, ignored}%
-                      \_else
+                       \_else
                           \_def\_next{\_ea\_scantabdataB\_csname _paramtabdeclare#1\_endcsname}\_fi
-                   \_else \_def\_next{\_ea\_scantabdataA\_csname _tabdeclare#1\_endcsname}%
-   \_fi\_fi\_fi\_fi\_fi \_next
+                       \_else \_def\_next{\_ea\_scantabdataA\_csname _tabdeclare#1\_endcsname}%
+   \_fi\_fi\_fi\_fi\_fi\_fi \_next
 }
-\_def\_scantabdataA#1{\_addtabitem \_ea\_addtabdata\_ea{#1\_tabstrutA}\_scantabdata}
-\_def\_scantabdataB#1#2{\_addtabitem\_ea\_addtabdata\_ea{#1{#2}\_tabstrutA}\_scantabdata}
+\_def\_scantabdataA#1{\_addtabitem 
+   \_ea\_addtabdata\_ea{#1\_tabstrutA \_tabskip\_tabskipmid}\_scantabdata}
+\_def\_scantabdataB#1#2{\_addtabitem
+   \_ea\_addtabdata\_ea{#1{#2}\_tabstrutA \_tabskip\_tabskipmid}\_scantabdata}
 \_def\_scantabdataC {\_def\_tmpb{}\_afterassignment\_scantabdataD \_tmpnum=}
 \_def\_scantabdataD#1{\_loop \_ifnum\_tmpnum>0 \_advance\_tmpnum by-1 \_addto\_tmpb{#1}\_repeat
    \_ea\_scantabdata\_tmpb}
 \_def\_scantabdataE#1){\_addtabdata{#1}\_scantabdata}
+\_def\_scantabdataF {\_addtabitem\_def\_addtabitem{\_let\_addtabitem=\_addtabitemx}\_scantabdata}
 
-\_def\_addtabitem{\_ifnum\_colnum>0 \_addtabdata{&}\_addto\_ddlinedata{&\_dditem}\_fi
-    \_advance\_colnum by1 \_let\_tmpa=\_relax}
+   \_doc -----------------------------
+   The \`\_addtabitemx` adds the boundary code (used between columns)
+   to the <converted declaration>. This code is
+   `\egroup &\bgroup \colnum=<value>\relax`. You can get the current number of
+   column from the \`\colnum` register, but you cannot write 
+   `\the\colnum` as the first object in a <data> item because `\halign` 
+   first expands the front of the item and the left part of the declaration
+   is processed after this. Use `\relax\the\colnum` instead. Or you can
+   write: 
+   \begtt
+   \def\showcolnum{\ea\def\ea\totcolnum\ea{\the\colnum}\the\colnum/\totcolnum}
+   \table{ccc}{\showcolnum & \showcolnum & \showcolnum}
+   \endtt
+   This example prints 1/3 \ 2/3 \ 3/3, because the value of the `\colnum` is
+   equal to the total number of columns before left part of the column declaration
+   is processed. 
+   \_cod -----------------------------
+
+\_newcount\_colnum     % number of current column in the table
+\_public \colnum ;
+
+\_def\_addtabitemx{\_ifnum\_colnum>0
+   \_addtabdata{\_egroup &\_bgroup}\_addto\_ddlinedata{&\_dditem}\_fi
+   \_advance\_colnum by1 \_let\_tmpa=\_relax
+   \_ifnum\_colnum>1 \_ea\_addtabdata\_ea{\_ea\_colnum\_the\_colnum\_relax}\_fi}
 \_def\_addtabdata#1{\_tabdata\_ea{\_the\_tabdata#1}}
+
+   \_doc -----------------------------
+   This code converts `||` or `|` from `\table` <declaration> to the <converted declaration>.
+   \_cod -----------------------------
+
 \_def\_addtabvrule{%
     \_ifx\_tmpa\_vrule \_addtabdata{\_kern\_vvkern}%
        \_ifnum\_colnum=0 \_addto\_vvleft{\_vvitem}\_else\_addto\_ddlinedata{\_vvitem}\_fi
@@ -95,32 +192,49 @@
 \_def\_ddlinedata{}
 
    \_doc -----------------------------
-   The default \"declaration letters" `c`, `l`, `r` and `p` are declared.
-   by `\def\_tabdeclare<letter>{...}` for a non-parametric 
-   letter and by `\def\_paramtabdeclare<letter>{...}` for a letter with a parameter.
+   The default \"declaration letters" `c`, `l`, `r` and `p` are declared
+   by setting \`\tabdeclarec`, \`\tabdeclarel`, \`\tabdeclarer` and
+   \`\paramtabdeclarep` macros. In general, define
+   `\def\_tabdeclare<letter>{...}` for a non-parametric 
+   letter and `\def\_paramtabdeclare<letter>{...}` for a letter with a parameter.
    The double hash `##` must be in the definition, it is replaced by a real table item data.
-   All items are put in group because of `\aftergroup` can be used (from
-   `\localcolors` for example).
    You can declare more such \"declaration letters" if you want.
    \_cod -----------------------------
 
-\_def\_tabdeclarec{{\_the\_tabiteml\_hfil##\_unsskip\_hfil\_the\_tabitemr}}
-\_def\_tabdeclarel{{\_the\_tabiteml\_relax##\_unsskip\_hfil\_the\_tabitemr}}
-\_def\_tabdeclarer{{\_the\_tabiteml\_hfil##\_unsskip\_the\_tabitemr}}
-\_def\_paramtabdeclarep#1{{\_the\_tabiteml
+\_def\_tabdeclarec{\_the\_tabiteml\_hfil##\_unsskip\_hfil\_the\_tabitemr}
+\_def\_tabdeclarel{\_the\_tabiteml\_relax##\_unsskip\_hfil\_the\_tabitemr}
+\_def\_tabdeclarer{\_the\_tabiteml\_hfil##\_unsskip\_the\_tabitemr}
+\_def\_paramtabdeclarep#1{\_the\_tabiteml
    \_vtop{\_hsize=#1\_relax \_baselineskip=\_normalbaselineskip 
-   \_lineskiplimit=0pt \_noindent##\_unsskip\_lower\_dp\_tstrutbox\_hbox{}}\_the\_tabitemr}}
+   \_lineskiplimit=0pt \_noindent##\_unsskip
+   \_ifvmode\_vskip\_dp\_tstrutbox \_else\_lower\_dp\_tstrutbox\_hbox{}\_fi}\_the\_tabitemr}
 
    \_doc -----------------------------
-   User puts optional spaces around the table item typically, i.\,e.\ he/she writes
+   User puts optional spaces around the table item typically, i.e.\ he/she writes
    `& text &` instead `&text&`. The left space is ignored by internal \TeX/ algorithm but 
-   the right space must be removed by macros. This is a reason why we reccomend to 
+   the right space must be removed by macros. This is a reason why we recommend to
    use \`\_unsskip` after each `##` in your definition of \"declaration letters".
    This macro isn't only the primitive `\unskip` because we allow usage of plain \TeX/ 
    `\hideskip` macro: `&\hideskip text\hideskip&`.
    \_cod -----------------------------
 
-\_def\_unsskip{\_ifdim\_lastskip>0pt \_unskip\_fi}
+\_def\_unsskip{\_ifmmode\_else\_ifdim\_lastskip>0pt \_unskip\_fi\_fi}
+
+   \_doc -----------------------------
+   The \`\fL`, \`\fR`, \`\fC` and \`\fX` macros only does a special parameters settings
+   for paragraph building algorithm. The \`\fS` prints the paragraph into
+   box 0 first, measures the number of lines by the `\prevgraf` primitive
+   and use (or don't use) `\hfil` (for centering) before the first line. 
+   \_cod -----------------------------
+
+\_let\_fL=\_raggedright 
+\_def\_fR{\_leftskip=0pt plus 1fill \_relax} 
+\_def\_fC{\_leftskip=0pt plus1fill \_rightskip=0pt plus 1fill \_relax} 
+\_def\_fX{\_leftskip=0pt plus1fil  \_rightskip=0pt plus-1fil \_parfillskip=0pt plus2fil \_relax} 
+\_long\_def\_fS #1\_unsskip{\_noindent \_setbox0 =\_vbox{\_noindent #1\_endgraf \_ea}%
+   \_ifnum\_prevgraf=1 \_hfil \_fi #1\_unsskip
+}
+\_public \fL \fR \fC \fX \fS ;
 
    \_doc -----------------------------
    The family of `\_cr*` macros 
@@ -168,17 +282,33 @@
 
 \_def\_mspan{\_omit \_tabdata={\_tabstrutA}\_let\_tmpa=\_relax \_afterassignment\_mspanA \_mscount=}
 \_def\_mspanA[#1]#2{\_loop \_ifnum\_mscount>1 \_cs{_span}\_omit \_advance\_mscount-1 \_repeat
-   \_colnum=0 \_def\_tmpa{}\_tabdata={}\_scantabdata#1\_relax
-   \_setbox0=\_vbox{\_halign\_expandafter{\_the\_tabdata\_cr#2\_cr}\_global\_setbox8=\_lastbox}%
+   \_count1=\_colnum \_colnum=0 \_def\_tmpa{}\_tabdata={}\_scantabdata#1\_relax
+   \_colnum=\_count1 \_setbox0=\_vbox{\_halign\_ea{\_ea\_bgroup\_the\_tabdata\_egroup\_cr#2\_cr}%
+   \_global\_setbox8=\_lastbox}%
    \_setbox0=\_hbox{\_unhbox8 \_unskip \_global\_setbox8=\_lastbox}%
    \_unhbox8 \_ignorespaces}
 \_public \mspan ;
 
    \_doc -----------------------------
+   The \`\vspan``{<number>}{<text>}` implementaiton is here.
+   We need to lower the box by
+   \begtt \catcode`\<=13
+   (<number>-1)*(\ht+\dp of \tabstrut) / 2.
+   \endtt
+   The `#1` parameter must be one-digit number. If you want to set more digits 
+   then use braces. 
+   \_cod -----------------------------
+
+\_def\_vspan#1#2{\_vtop to 0pt{\_hbox{\_lower \_dimexpr
+   #1\_dimexpr(\_ht\_tstrutbox+\_dp\_tstrutbox)/2\_relax
+    -\_dimexpr(\_ht\_tstrutbox+\_dp\_tstrutbox)/2\_relax \_hbox{#2}}\_vss}} 
+\_public \vspan ;
+
+   \_doc -----------------------------
    The parameters of primitive `\vrule` and `\hrule` keeps the rule \"last wins".
    If we re-define `\hrule` to `\_orihrule height1pt` then each usage
    of redefined `\hrule` uses `1pt` height if this parameter isn't
-   overwriten by another following `height` parameter. This principle is used for
+   overwritten by another following `height` parameter. This principle is used for
    settings another default rule thickness than 0.4\,pt by the macro
    \`\rulewidth`.
    \_cod -----------------------------
@@ -208,4 +338,123 @@
 
 \_endcode % -------------------------------------
 
+\secc[table.bound] The boundary declarator \code{:}
+
+The `<declaration>` part of `\table{<declaration>}{<data>}` includes
+column declarators (letters) and other material: the `|` or `(<cmd>)`.
+The boundaries of columns are just before each column declarator 
+(with exception of the first one) if the boundary declarator `:` is not used. 
+For example, the declaration  `{|c||c(xx)(yy)c}`
+should be written more exactly using the boundary declarator `:` 
+by `{|c||:c(xx)(yy):c}`. But you can set these boundaries to
+another places using the boundary declarator~`:` explicitly, 
+for example `{|c:||c(xx):(yy)c}`. The boundary declarator `:` 
+can be used only once between each two column declarators. 
+
+Each table item have its own group. The `(<cmd>)` are parts of the given
+table item (depending on the boundary declarator position).
+If you want to apply a special setting for given column, you can do this by
+`(<setting>)` followed by column declarator. But if such column is not
+first, you must use `:(<setting>)`. Example. We have three centered columns,
+the second one have to be in bold font and the third one have to be in red: 
+`\table{c:(\bf)c:(\Red)c}{<data>}`
+
+\secc Usage of the \code{\\tabskip} primitive
+
+The value of `\tabskip` primitive is used between all columns of the table.
+It is glue-type, so it can be stretchable or shrinkable, see next 
+section~\ref[table.w].
+
+By default, `\tabskip` is 0\,pt. It means that only \^`\tabiteml`,
+\^`\tabitemr` and `(<cmds>)` can generate visual spaces between columns. But they
+are not real spaces between columns because they are in fact the part of 
+the total column width. 
+
+The `\tabskip` value declared before the \^`\table` macro (or in
+\^`\everytable` or in \^`\thistable`) is used between all columns in the table. 
+This value is equal for all spaces between columns. But you can set each such space
+individualy if you use `(\tabskip=<value>)` in the <declaration> immediately
+before boundary character. The boundary character represents the column pair for
+which the `\tabskip` have individual value. For example
+`c(\tabskip=5pt):r` gives `\tabskip` value betwen `c` and `r` columns. 
+You need not to use boundary character explicitly, so `c(\tabskip=5pt)r` gives
+the same result.
+
+The space before first column is given by the \^`\tabskipl` 
+and the space after last column is equal to \^`\tabskipr`. 
+Default values are 0\,pt.
+
+Use nonzero `\tabskip` only in special applications. If `\tabskip` is
+nonzero then horizontal lines generated by \^`\crli`, \^`\crlli` and \^`\crlp`
+have another behavior than you probably expected: they are interrupted in
+each `\tabskip` space.
+
+\secc[table.w] Tables to given width
+
+There are two possibilities how to create tables to given width:
+
+\begitems
+* `\table to<size>{<declaration>}{<data>}` uses stretchability or
+  shrinkability of all spaces between columns generated by `\tabskip` value and
+  eventually by \^`\tabskipl`, \^`\tabskipr` values. See example below.
+* `\table pxto<size>{<declaration>}{<data>}` expands the columns declared 
+  by `p{<size>}`, if the `<size>` is given by a virtual \^`\tsize` unit.
+  See example below.
+\enditems
+
+Example of `\table to<size>`:
+
+\begtt \catcode`\<=13
+\thistable{\tabskip=0pt plus1fil minus1fil}
+\table to\hsize {lr}{<data>}
+\endtt
+%
+This table has its width `\hsize`. First column starts at the left boundary of
+this table and it is justified left (to the boundary). Second column ends at
+the right boundary of the table and it is justified right (to the boundary).
+The space between them are stretchable and shrinkable in order to reach
+given width `\hsize`.
+
+\medskip
+Example of `\table pxto<size>` (means \"{\bf p}aragraphs e{\bf x}panded {\bf to}"):
+
+\begtt
+\table pxto\hsize {|c|p{\tsize}|}{\crl
+ aaa         & Ddkas jd dsjds ds cgha sfgs dd fddzf dfhz xxz
+               dras ffg hksd kds d sdjds h sd jd dsjds ds cgha 
+               sfgs dd fddzf dfhz xxz. \crl
+ bb ddd ggg  & Dsjds ds cgha sfgs dd fddzf dfhz xxz
+               ddkas jd dsjds ds cgha sfgs dd fddzf. \crl }
+\endtt
+
+\noindent\table pxto\hsize {|c|p{\tsize}|}{\crl
+ aaa         & Ddkas jd dsjds ds cgha sfgs dd fddzf dfhz xxz
+               dras ffg hksd kds d sdjds h sd jd dsjds ds cgha 
+               sfgs dd fddzf dfhz xxz. \crl
+ bb ddd ggg  & Dsjds ds cgha sfgs dd fddzf dfhz xxz
+               ddkas jd dsjds ds cgha sfgs dd fddzf. \crl }
+\medskip
+
+The first `c` colum is variable width (it gets the width of most wide item)
+and the resting space to given `\hsize` is filled by the `p` column.
+
+You can declare more than one `p{<coefficient>\tsize}` columns in the table 
+when `pxto` keyword is used. The total sum of <coefficinets> must be exactly one. 
+For example, 
+
+\begtt \catcode`\<=13
+\table pxto13cm {r p{.3\tsize} p{.5\tsize} p{.2\tsize} l}{<data>} 
+\endtt
+%
+This gives the ratio of widths of individual paragraphs in the table.
+
+\_endinput
+
+2020-05-20 \colnum implemented.
+           \vspan implemented.
+2020-05-19 \fL, \fR ets defined.
+           \table to, \table pxto implemented.
+2020-05-10 \bgroup &\egroup added to tabdata (in order to \aftergroup from colors)  
+           boundary declarator : introduced
+           \_unsskip: \ifmmode added.
 2020-04-10 second group for items in order to \localcolors
diff --git a/macros/luatex/optex/base/unimath-codes.opm b/macros/luatex/optex/base/unimath-codes.opm
index 4be18807d7..d0182a0f85 100644
--- a/macros/luatex/optex/base/unimath-codes.opm
+++ b/macros/luatex/optex/base/unimath-codes.opm
@@ -4,7 +4,7 @@
 
    \_doc -----------------------------
    The control sequences for `\alpha`, `\beta` etc are redefined here.
-   The `\alpha` expands to the charcter with unicode `"03B1`, this is normal
+   The `\alpha` expands to the character with unicode `"03B1`, this is normal
    character $α$. You can type it directly in your editor, if you know how
    to do this.
    \_cod -----------------------------
diff --git a/macros/luatex/optex/base/usebib.opm b/macros/luatex/optex/base/usebib.opm
index 33ac47b575..b109e384c2 100644
--- a/macros/luatex/optex/base/usebib.opm
+++ b/macros/luatex/optex/base/usebib.opm
@@ -265,7 +265,7 @@ The `bib-<style>.opm` file must define the commands:
 %
 There are two special fieldnames: `!author` and `!editor`. The processed list of
 authors or editors (by repeatedly calling `\_authorname` or `\_editorname`) are 
-used here insted of raw data.
+used here instead of raw data.
 
 You can define `_print:BEGIN` and/or `_print:END` which is executed at the begin or
 end of each `<entrytype>`. The formatting does not solve the numbering and
diff --git a/macros/luatex/optex/base/verbatim.opm b/macros/luatex/optex/base/verbatim.opm
index ba2cf93dab..84d6d83ae5 100644
--- a/macros/luatex/optex/base/verbatim.opm
+++ b/macros/luatex/optex/base/verbatim.opm
@@ -61,7 +61,7 @@
    \_doc ----------------------------
    \`\activettchar``<char>` saves original catcode of previously declared `<char>` (if
    such character was declared) using \`\_savedttchar` and \`\_savedttcharc`
-   values. Then new such values are stored. The declared charater is activated
+   values. Then new such values are stored. The declared character is activated
    by `\_adef` as a macro (active character) which opens a group, 
    does `\_setverb` and other settings and reads its parameter until second the same 
    character. This is done by the \`\_readverb` macro. Finally it prints scanned
diff --git a/macros/luatex/optex/demo/op-letter.tex b/macros/luatex/optex/demo/op-letter-cs.tex
index 1b5d722d3b..1b5d722d3b 100644
--- a/macros/luatex/optex/demo/op-letter.tex
+++ b/macros/luatex/optex/demo/op-letter-cs.tex
diff --git a/macros/luatex/optex/demo/op-letter-en.tex b/macros/luatex/optex/demo/op-letter-en.tex
new file mode 100644
index 0000000000..a7f19c43d4
--- /dev/null
+++ b/macros/luatex/optex/demo/op-letter-en.tex
@@ -0,0 +1,38 @@
+%% This is part of OpTeX project, see http://petr.olsak.net/optex
+\useOpTeX
+
+\letter            % \letter OpTeX style activated
+\enlang \enquotes  % Language and quote style
+\fontfam[bonum]
+
+\hfill\address
+  Alice Author
+  123 Sender Street
+  City 4567
+
+\bigskip
+
+\address
+  Mr. Bobby Bureaucrat
+  456 Magnolia Street
+  City 8901
+
+\hfill\today
+
+\subject Inquiry regarding \"lorem ipsum"
+
+Dear Mr. Bureaucrat,
+
+\lorem[1-2] % 2 paragraphs of blindtext
+
+Thank you for your time.
+
+With best regards,
+
+\bigskip % leave some space for signature
+\bigskip
+
+Alice Author
+
+\bye
+
diff --git a/macros/luatex/optex/demo/slides-bg.png b/macros/luatex/optex/demo/op-slides-bg.png
index 4ac1ad8c38..4ac1ad8c38 100644
--- a/macros/luatex/optex/demo/slides-bg.png
+++ b/macros/luatex/optex/demo/op-slides-bg.png
diff --git a/macros/luatex/optex/demo/op-slides.tex b/macros/luatex/optex/demo/op-slides.tex
index f6213cc63d..a7c40a854c 100644
--- a/macros/luatex/optex/demo/op-slides.tex
+++ b/macros/luatex/optex/demo/op-slides.tex
@@ -6,8 +6,8 @@
 \def<#1>{\hbox{$\langle$\it#1\/$\rangle$}}
 \everyintt={\catcode`\<=13}
 
-\hyperlinks\Blue\Blue         % hyperlinks are used in the title page
-\backgroundpic{slides-bg.png} % background picture
+\hyperlinks\Blue\Blue            % hyperlinks are used in the title page
+\backgroundpic{op-slides-bg.png} % background picture
 
 \activettchar`                % inline verbatim
 \enquotes                     % English quotes \"..."
diff --git a/macros/luatex/optex/doc/optex-doc.pdf b/macros/luatex/optex/doc/optex-doc.pdf
index caaf6319c7..41b0be5572 100644
--- a/macros/luatex/optex/doc/optex-doc.pdf
+++ b/macros/luatex/optex/doc/optex-doc.pdf
diff --git a/macros/luatex/optex/doc/optex-doc.tex b/macros/luatex/optex/doc/optex-doc.tex
index 267474b24b..d1952e201f 100644
--- a/macros/luatex/optex/doc/optex-doc.tex
+++ b/macros/luatex/optex/doc/optex-doc.tex
@@ -20,7 +20,7 @@
 \tit Format Based on Plain \TeX/ and OPmac\fnotemark1
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\hfill Version 0.12
+\hfill Version 0.13
 
 \centerline{\it Petr Olšák, 2020}
 
diff --git a/macros/luatex/optex/doc/optex-techdoc.tex b/macros/luatex/optex/doc/optex-techdoc.tex
index 561f2a8685..0d53140a24 100644
--- a/macros/luatex/optex/doc/optex-techdoc.tex
+++ b/macros/luatex/optex/doc/optex-techdoc.tex
@@ -162,7 +162,7 @@ The `\margins` macro is documented in the section~\ref[marg].
 \printdoc     hyperlinks.opm
 
 \sec[maketoc] Making table of contents
-\printdoc maketoc.opm
+\printdoc     maketoc.opm
 
 \sec PDF outlines
 \secc Nesting PDF outlines
@@ -189,7 +189,9 @@ The `\margins` macro is documented in the section~\ref[marg].
 \printdoc graphics.opm
 
 \sec[table] The \code{\\table} macro
-\printdoc table.opm
+\printdoctail table.opm
+\secc[table.impl] Implemetation of the \code{\\table} macro
+\printdoc     table.opm
 
 \sec Balanced multi-columns
 \printdoc multicolumns.opm
@@ -229,7 +231,7 @@ The `\margins` macro is documented in the section~\ref[marg].
 \printdoc logos.opm
 
 \sec Multilingual support
-\secc Lovercase, uppercase codes
+\secc Lowercase, uppercase codes
 \printdoctail uni-lcuc.opm
 \secc Hyphenations
 \printdoc     hyphen-lan.opm
diff --git a/macros/luatex/optex/doc/optex-userdoc.tex b/macros/luatex/optex/doc/optex-userdoc.tex
index d9c537559f..15a33ee632 100644
--- a/macros/luatex/optex/doc/optex-userdoc.tex
+++ b/macros/luatex/optex/doc/optex-userdoc.tex
@@ -407,6 +407,8 @@ scriptscript). Moreover, there is the macro \^`\mathstyles{<math list>}` which d
 the current math style. It is documented at the end of the
 section~\ref[math-macros].
 
+The \^`\eqalign` macro is more flexible in \OpTeX/, see technical documentation about it.
+
 
 \sec Typical elements of document
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -762,19 +764,28 @@ These letters can be combined by the `|` character (vertical line). Example
 %
 generates the following result:
 
-\bigskip
+\medskip
 \noindent\hfil\table{||lc|r||}{    \crl
    Month    & commodity  & price   \crli \tskip2pt
    January  & notebook   &  \$ 700 \cr
    February & skateboard &  \$ 100 \cr
    July     & yacht      & k\$ 170 \crl}
-\bigskip
+\medskip
 
 Apart from `l`, `r`, `c` declarators, you can use the `p{<size>}` declarator
-which declares the column of given width. More precisely, a long text in
-the table cell is printed as an paragraph with given width.
-To avoid problems with narrow left-right aligned paragraphs you can write
-`p{<size>`\^`\raggedright}`, then the paragraph will be only left aligned.
+which declares the column with paragraphs of given width. More precisely, 
+a long text in the table cell is printed as an paragraph with given width.
+By default, the paragraph is left-right justified. But there are
+alternatives:
+
+\begitems
+* `p{<size>`\^`\fL}` fit left, i.e.\ left justified, ragged right,
+* `p{<size>`\^`\fR}` fit right, i.e.\ right justified, ragged left,
+* `p{<size>`\^`\fC}` fit center, i.e.\ ragged left plus right,
+* `p{<size>`\^`\fS}` fit special, short one-line pararaph centered, 
+                long paragraph normal,
+* `p{<size>`\^`\fX}` fit extra, left-right justified but last line centered. 
+\enditems 
 
 You can use `(<text>)` in the <declaration>. Then this text is applied in
 each line of the table. For example `r(\kern10pt)l` adds more 10\,pt space
@@ -786,7 +797,7 @@ prefixed. For example `3c` means `ccc` or `c 3{|c}` means
 can use them in order to more legibility.
  
 The command `\cr` used in the <data> part of the table 
-is generally known. It marks end row of the table. 
+is generally known. It marks the end of each row in the table. 
 Moreover \OpTeX/ defines following similar commands:
 
 \begitems
@@ -801,7 +812,7 @@ Moreover \OpTeX/ defines following similar commands:
 \enditems
 
 The \^`\tskip<dimen>` command works like the `\noalign{\vskip<dimen>}` 
-after `\cr*` commands but it doesn't interrupt the vertical lines.
+immediately after `\cr*` commands but it doesn't interrupt the vertical lines.
 
 \new
 You can use following parameters for the \^`\table` macro. Default values are listed
@@ -816,6 +827,8 @@ too.
 \tablinespace=2pt    % additional vert. space before/after horizontal lines
 \vvkern=1pt          % space between lines in double vertical line
 \hhkern=1pt          % space between lines in double horizontal line
+\tabskip=0pt         % space between columns
+\tabskipl=0pt \tabskipr=0pt % space before first and after last column 
 \endtt
 
 Example: if you do \^`\tabiteml={$\enspace}`\^`\tabitemr={\enspace$}` then
@@ -830,7 +843,7 @@ which spans <number> columns and formats the <text> by the
 with the same syntax as common \^`\table` <declaration>.
 If your table includes vertical rules and you want to
 create continuous vertical rules by \^`\mspan`, then use rule declarators `|`
-only after `c`, `l` or `r` letter in \^`\mspan` <declaration>. The
+after `c`, `l` or `r` letter in \^`\mspan` <declaration>. The
 exception is only in the case when \^`\mspan` includes first
 column and the table have rules on the left side. The example of \^`\mspan` 
 usage is below.
@@ -853,17 +866,63 @@ creates the following result:
   seven & eight  & nine   \crli}}
 \bigskip
 
-The `c`, `l`, `r` and `p` are default \"declaration letters" but you can define
-more such letters by `\def\_tabdeclare<letter>{<left>##<right>}`. More about
-it is in technical documentation in the section~\ref[table].
+The \^`\vspan``<number>{<text>}` shifts the <text> down in order it looks
+like to be in the center of the <number> lines (current line is first).
+You can use this for creating tables like in the following example:
+
+\begtt \typosize[8.7/11]
+\thistable{\tabstrut={\vrule height 20pt depth10pt width0pt} 
+           \baselineskip=20pt \tablinespace=0pt \rulewidth=.8pt} 
+\table{|8{c|}}{\crlp{3-8} 
+   \mspan2[c|]{}      & \mspan3[c|]{Singular}         & \mspan3[c|]{Plural} \crlp{3-8} 
+   \mspan2[c|]{}      & Neuter & Masculine & Feminine & Masculine & Feminine & Neuter \crl
+   \vspan2{I}   & Inclusive & \mspan3[c|]{\vspan2{O}} & \mspan3[c|]{X} \crlp{2,6-8} 
+                & Exclusive & \mspan3[c|]{}           & \mspan3[c|]{X} \crl 
+   \vspan2{II}  & Informal  & \mspan3[c|]{X}          & \mspan3[c|]{X} \crlp{2-8} 
+                & Formal    & \mspan6[c|]{X} \crl 
+   \vspan2{III} & Informal  & \vspan2{O} & X & X      & \mspan2[c|]{X} &\vspan2{O} \crlp{2,4-7} 
+                & Formal    &                         & \mspan4[c|]{X} & \crl 
+} 
+\endtt
 
+\puttext 8.9cm -4cm {\pdfsave\pdfscale{.5}{.5}\rlap{%
+\thistable{\tabstrut={\vrule height 20pt depth10pt width0pt} 
+           \baselineskip=20pt \tablinespace=0pt \rulewidth=.8pt} 
+\table{|8{c|}}{\crlp{3-8} 
+   \mspan2[c|]{}      &\mspan3[c|]{Singular} &\mspan3[c|]{Plural} \crlp{3-8} 
+   \mspan2[c|]{}      & Neuter & Masculine & Feminine & Masculine & Feminine & Neuter \crl
+   \vspan2{I}   & Inclusive & \mspan3[c|]{\vspan2{O}} &\mspan3[c|] X \crlp{2,6-8} 
+                & Exclusive & \mspan3[c|]{} &\mspan3[c|] X \crl 
+   \vspan2{II}  & Informal  & \mspan3[c|] X &\mspan3[c|] X \crlp{2-8} 
+                & Formal    & \mspan6[c|] X \crl 
+   \vspan2{III} & Informal  & \vspan2 O & X & X &\mspan2[c|] X & \vspan2 O \crlp{2,4-7} 
+                & Formal    & &\mspan4[c|] X & \crl 
+}}\pdfrestore}
+
+
+\hangindent=-7.5cm \hangafter=0 
+The <number> parameter of \^`\vspan` must be one-digit number. 
+If you want to set more digits then use braces. 
+You can use non-integer values too if you feel that the
+result is better, for example \^`\vspan{2.1}{text}`.
+
+\hangindent=-7.5cm \hangafter=0 
 The rule width of tables and implicit width of all `\vrule`s and `\hrule`s
 can be set by the command \^`\rulewidth=<dimen>`. The default value given 
 by \TeX/ is 0.4\,pt.
 
+The `c`, `l`, `r` and `p` are default \"declaration letters" but you can define
+more such letters by `\def\_tabdeclare<letter>{<left>##<right>}`. 
+More about it is in technical documentation in section~\ref[table.impl].
+See the definition of the \^`\tabdeclarec` macro, for example.
+
+The `:` columns boundary declarator is described in section~\ref[table.bound].
+The tables with given width can be declared by `to<size>` or `xto<size>`.
+More about it is in section~\ref[table.w]
 Many tips about tables can be seen on the site
 \url{http://petr.olsak.net/optex/optex-tricks.html}.
 
+
 \label[verbatim]\secc Verbatim
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -1570,8 +1629,9 @@ document. The macro `\author <authors><end-line>` can be used when
 \^`\report` is declared. It prints `<authors>` in italics at center of the
 line. You can separate authors by `\nl` to more lines.
 
-The \^`\letter` declaration is intended to create letters. See an example in
-the file `op-letter.tex`. The \^`\letter` style sets default
+The \^`\letter` declaration is intended to create letters. 
+See the files `op-letter-*.tex` for examples.
+The \^`\letter` style sets default
 font size to 11\,pt and `\parindent` to 0\,pt. It sets half-line space
 between paragraphs. The page numbers are not printed. The \^`\subject` macro
 can be used, it prints the word \"Subject:" or \"Věc" (or something else
@@ -1579,7 +1639,7 @@ depending on current language) in bold. Moreover, the \^`\address` macro
 can be used when \^`\letter` is declared. The usage of the \^`\address` macro
 looks like:
 
-\begtt
+\begtt \catcode`\<=13
 \address
   <first line of address>
   <second line of address>
@@ -1727,7 +1787,7 @@ put it as the first command in your document:
 \thefontsize [size] \thefontscale [factor]   % current font size
 
 \inspic file.ext    % insert a picture, extensions: jpg, png, pdf
-\table {rule}{data} % simple macro for the tables like in LaTeX
+\table {rule}{data} % macro for the tables like in LaTeX
 
 \fnote {text}   % footnote (local numbering on each page)
 \mnote {text}   % note in the margin (left or right by page number)
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index d1406dbc7c..0624215ee9 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/2020
-depend revision/55223
+depend revision/55233
 
 name 00texlive.image
 category TLCore
-revision 55213
+revision 55226
 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
@@ -27587,27 +27587,27 @@ catalogue-version 1.0h
 
 name babel-italian
 category Package
-revision 53019
+revision 55232
 shortdesc Babel support for Italian text
 relocated 1
 longdesc The package provides language definitions for use in babel.
-containersize 3756
-containerchecksum 9dd2d58f0d730be0cc5319eea1400b8644ba107c81f9d4905842e5c5a4bfb20402e2d67ede0a1c1337e166c63f8c1e90574e11b18275596cf24764de671b3a16
-doccontainersize 446552
-doccontainerchecksum 97d2a498f4fd9fb8cf1561117b5eb805dd17c7c09c85addb510a62adbfd25ad83cf23e4b97a234878cb735f986245363a1b9f9cb2ec36f67bc45408b05539b48
+containersize 3808
+containerchecksum 647a87e3e516f4723bd991b973417302c6f369438e6b76c5ef1d795bdc138f31516433af5b93471f0a2692ace29096d6cf8aa49edfadc2e48d1d40c4344dbfd0
+doccontainersize 446484
+doccontainerchecksum 109a27cbdd24d91166059ae7dc24c78175aecac477a13b06c148b21a8c6451b0a07fd7db55ed8a78e92c05c00d0f73a9fe59c0726f34136cdf7ca3af8bbf12b6
 docfiles size=110
  RELOC/doc/generic/babel-italian/README.txt details="Readme"
  RELOC/doc/generic/babel-italian/italian.pdf details="Package documentation"
-srccontainersize 22064
-srccontainerchecksum 98cc8e42965bef45e30309d0e3f6dac1c39d4964e9aa362552c5bd5aeb9a583f94c41ff5cf3ee6ebc7918588ae6f0bc3913dad0226dbfea98b301deec272ef73
-srcfiles size=18
+srccontainersize 22436
+srccontainerchecksum c9309c07a97625c3f9b1098b603015d339adf4f73218447ddb40c36c8430866b435678ce06b88b0f36f84e4ee5c971452d8f4caa283e1298d182fe8667255b74
+srcfiles size=19
  RELOC/source/generic/babel-italian/italian.dtx
 runfiles size=3
  RELOC/tex/generic/babel-italian/italian.ldf
 catalogue-ctan /macros/latex/contrib/babel-contrib/italian
 catalogue-license lppl1.3c
 catalogue-topics italian multilingual-addon
-catalogue-version 1.4.03
+catalogue-version 1.4.04
 
 name babel-japanese
 category Package
@@ -50860,7 +50860,7 @@ catalogue-version 1.0
 
 name chemfig
 category Package
-revision 54914
+revision 55229
 shortdesc Draw molecules with easy syntax
 relocated 1
 longdesc The package provides the command \chemfig{<code>}, which draws
@@ -50870,17 +50870,16 @@ longdesc produced are essentially 2-dimensional, the package supports
 longdesc many of the conventional notations for illustrating the
 longdesc 3-dimensional layout of a molecule. The package uses TikZ for
 longdesc its actual drawing operations.
-containersize 25588
-containerchecksum e7e7a662941a7c5b18a14f2f7ec798df4470522ccd5cd6312163f29f596ecd1c7cf782026c2e50b958bf9cf5b7fa5d8268c5221b5d37fc01cb024a5115d5df2c
-doccontainersize 2065340
-doccontainerchecksum a12e1c142af88b550bde612aa0469f3a1b8ee68f329ed097cf350db6114ca491c7ddbffaa4f54906ba7788817d42493654792c7a5279b344b8aebb33e6ebbf59
-docfiles size=662
+containersize 25624
+containerchecksum 40bf7700f9bea43889d4f9f90a32ce41fb5bdf631ed1f1d1b03600e5398f1add4b8f137241baa90c39ea3e19aec2cd24cc2bfdd30a980b7966756aada88cb58e
+doccontainersize 2044860
+doccontainerchecksum 7f78b0d16ff846fc01c3bc89944b91c0e199672527cc4d2054a29357485b35a492e06c3389e465bc9db65c48c0113f745d413bdfaaccd39b52e2419bd5af2c4f
+docfiles size=635
  RELOC/doc/generic/chemfig/README details="Readme"
  RELOC/doc/generic/chemfig/chemfig-en.pdf details="Package documentation (English)" language="en"
  RELOC/doc/generic/chemfig/chemfig-en.tex
  RELOC/doc/generic/chemfig/chemfig-fr.pdf details="Package documentation (French)" language="fr"
  RELOC/doc/generic/chemfig/chemfig-fr.tex
- RELOC/doc/generic/chemfig/chemfigold.tex
 runfiles size=32
  RELOC/tex/generic/chemfig/chemfig.sty
  RELOC/tex/generic/chemfig/chemfig.tex
@@ -50890,7 +50889,7 @@ catalogue-contact-repository https://framagit.org/unbonpetit/chemfig/tree/master
 catalogue-ctan /macros/generic/chemfig
 catalogue-license lppl1.3c
 catalogue-topics graphics diagram chemistry pgf-tikz etex
-catalogue-version 1.53
+catalogue-version 1.54
 
 name chemformula
 category Package
@@ -84146,7 +84145,7 @@ catalogue-topics typesetting
 
 name decorule
 category Package
-revision 23487
+revision 55230
 shortdesc Decorative swelled rule using font character
 relocated 1
 longdesc The package implements a decorative swelled rule using only a
@@ -84155,17 +84154,18 @@ longdesc it works independently, without the need to install any
 longdesc additional software or fonts. This is the packaged version of
 longdesc the macro which was originally published in the "Typographers'
 longdesc Inn" column in TUGboat 31:1 (2010).
-containersize 1652
-containerchecksum e5a962002f66d4d3a5c48d93930ea2e14a68226a1beb9f9aee5b7936ef51a49b4d9a249b7a3038d5ade41aef8388ad78f254973e7ef3558e42848409427e5cd7
-doccontainersize 404940
-doccontainerchecksum 533ca67eabadea3125dc359a839d5b45b5e1efee88fe74b4a2b911014b599930419a49e7e0b5967e5f89d29e1b452d223faae3d31fc3f94c64cb613907cc2255
-docfiles size=106
+containersize 1476
+containerchecksum 783f09b3810616b14f04dace838ed1ed2faf32ea4df84dd0973df375928e16fb129ddf6429fc54560a317da0a9422630becc92543e1a1da76809c4962c423fc7
+doccontainersize 397084
+doccontainerchecksum 0c13e2ff2744ca2d0e32446a85cbec06d832ce1fc8af5a719f3c73ed59e1a85461d5f51d33fe5a51a89b209f80196ad52609e83adbf7cc41336f5bfae8c4389f
+docfiles size=101
  RELOC/doc/latex/decorule/MANIFEST
- RELOC/doc/latex/decorule/README details="Readme"
+ RELOC/doc/latex/decorule/README.md details="Readme"
+ RELOC/doc/latex/decorule/VERSION
  RELOC/doc/latex/decorule/decorule.pdf details="Package documentation"
-srccontainersize 12480
-srccontainerchecksum 1d612d121367ec69f578479001602aa2a25251edbb35c495a13b636e23831e8dca5f7a2715ad6fc5f3b5e3fbf3769d0b90c88949f5fafcd8d778e8489a80892f
-srcfiles size=11
+srccontainersize 17264
+srccontainerchecksum 84ab7801ab7b0772ffa3520a42e132007e05152e206072fc1ebb43d8d9675ac4929ad1abb30d8111db7d825f05d37b038ecc923267c5095ed62a34cf3955dc20
+srcfiles size=15
  RELOC/source/latex/decorule/decorule.dtx
  RELOC/source/latex/decorule/decorule.ins
 runfiles size=1
@@ -84174,7 +84174,7 @@ catalogue-also swrule
 catalogue-ctan /macros/latex/contrib/decorule
 catalogue-license lppl1.3
 catalogue-topics line-weight decoration
-catalogue-version 0.6
+catalogue-version 0.7
 
 name dehyph
 category Package
@@ -107930,26 +107930,25 @@ catalogue-version 0.1h
 
 name euflag
 category Package
-revision 49970
+revision 55227
 shortdesc A command to reproduce the flag of the European Union
 relocated 1
 longdesc This LaTeX package implements a command to reproduce the
 longdesc official flag of the European Union (EU). The flag is
 longdesc reproduced at 1em high based on the current font size, so it
 longdesc can be scaled arbitrarily by changing the font size.
-containersize 1472
-containerchecksum e046d3b4b0de99d6669aa7cb62b4304ea8c2b83bef6dbae7d997355bc97ef07ffbad6ba139a4969c0a99307a43202566a283a40de1a69635d09afd9256ba0a51
-doccontainersize 100864
-doccontainerchecksum e0b58801624084e20083f1c92ee71dd6f53b75954cc2a63c7f99b2453d3925e9d4bb9509e86cf3fec3bcb2b1814ccc6ec27bdb08bc24f23803c0349dbe1a9574
-docfiles size=30
+containersize 1652
+containerchecksum 46f945f8602b610ad2d7a7984e574736ae77a7e56655b3dd643a0798ca458b9f6c437b3180ca540f76fb11f158eae447d3706b7f208a0771fdd5e4272e73e63f
+doccontainersize 104504
+doccontainerchecksum e2aab6abbe4488918f1a0a2739beb7e9045c7deac4827336901ab14e54129501f44a63bef47d509b07904f472ee81c7a74a218191dc89a9d1c74f43b1a1e6a23
+docfiles size=31
  RELOC/doc/latex/euflag/MANIFEST
  RELOC/doc/latex/euflag/README.md details="Readme"
  RELOC/doc/latex/euflag/VERSION
- RELOC/doc/latex/euflag/classpack.sty
  RELOC/doc/latex/euflag/euflag.pdf details="Package documentation"
-srccontainersize 17804
-srccontainerchecksum 2365d9bf74ff4194060edd03776363d3890c6cb3ea4da741413fb7a2fb03a79bba1c0775b287a82c9b30ec68dcc3db3d778460b44f5e249be5f21e130e7e52cb
-srcfiles size=15
+srccontainersize 18656
+srccontainerchecksum 43b33bc1bd0cbe4ef51b313e85d1f817943828e05a4e87bb1129234d909a1f1394a20dbfd7aab63c28cb7834a6dec200b41467a6ff68efab42615cee465ec30a
+srcfiles size=16
  RELOC/source/latex/euflag/euflag.dtx
  RELOC/source/latex/euflag/euflag.ins
 runfiles size=1
@@ -107957,7 +107956,7 @@ runfiles size=1
 catalogue-ctan /graphics/euflag
 catalogue-license lppl1.3
 catalogue-topics graphics
-catalogue-version 0.4
+catalogue-version 0.7
 
 name eukdate
 category Package
@@ -160683,7 +160682,7 @@ catalogue-version 0.03
 
 name latex-veryshortguide
 category Package
-revision 41844
+revision 55228
 shortdesc The Very Short Guide to LaTeX
 relocated 1
 longdesc This is a 4-page reminder of what LaTeX does. It is designed
@@ -160691,28 +160690,28 @@ longdesc for printing on A4 paper, double-sided, and folding once to A5.
 longdesc Such an 'imposed' version of the document is provided in the
 longdesc distribution, as PDF. An analogous version is provided in
 longdesc 'legal' format.
-containersize 576
-containerchecksum 239b6ae896eb109fb61aaa96149e3b3962fab250a4e017baf81da0ba7836837c1920456eec8fd20999535c96fe415115a621e73e639cbebf64cc2b14989c93cb
-doccontainersize 975444
-doccontainerchecksum aa58ce07f56dd819b6a3b618a518384547350a4582828020f5b45752c1dbb88d5f36c5b5bb831129352489bba8f5c19f89d38c99585da9253f01311ea63d3232
-docfiles size=564
+containersize 560
+containerchecksum 5c32c836c5ada42858de4579167848ef51c4b7626601fa95fe56175f406cb747bba5015ffe369ebfa93e789d29ba5329e1ab3e42262699695fa59b6cf047a581
+doccontainersize 521444
+doccontainerchecksum e2c521e768ea425312a400d88c893404c0f86c5886f595162b2a03493836ee1a949e2feebf8a8b3c9d6450630ff644b8973374f9963c67478af29e2a432d2f9d
+docfiles size=228
  RELOC/doc/latex/latex-veryshortguide/MANIFEST
  RELOC/doc/latex/latex-veryshortguide/README.md details="Readme"
- RELOC/doc/latex/latex-veryshortguide/menno-a.png
+ RELOC/doc/latex/latex-veryshortguide/VERSION
+ RELOC/doc/latex/latex-veryshortguide/menno-a.jpg
  RELOC/doc/latex/latex-veryshortguide/veryshortguide-A4-imposed.pdf details="The document itself, imposed for 1 sheet of A4 paper"
- RELOC/doc/latex/latex-veryshortguide/veryshortguide-Legal-imposed.pdf details="The document itself, imposed for 1 sheet of legal paper"
- RELOC/doc/latex/latex-veryshortguide/veryshortguide.bib
+ RELOC/doc/latex/latex-veryshortguide/veryshortguide.cls
+ RELOC/doc/latex/latex-veryshortguide/veryshortguide.dtx
+ RELOC/doc/latex/latex-veryshortguide/veryshortguide.ins
  RELOC/doc/latex/latex-veryshortguide/veryshortguide.pdf details="The document itself"
- RELOC/doc/latex/latex-veryshortguide/veryshortguide.tex
- RELOC/doc/latex/latex-veryshortguide/vsg.cls
- RELOC/doc/latex/latex-veryshortguide/vsg.dtx
- RELOC/doc/latex/latex-veryshortguide/vsg.ins
- RELOC/doc/latex/latex-veryshortguide/vsg.pdf
+ RELOC/doc/latex/latex-veryshortguide/vsg.bib
+ RELOC/doc/latex/latex-veryshortguide/vsg.tex
 catalogue-also latex-brochure
 catalogue-contact-home http://latex.silmaril.ie/veryshortguide/
 catalogue-ctan /info/latex-veryshortguide
 catalogue-license lppl1.3
 catalogue-topics tut-latex
+catalogue-version 0.7
 
 name latex-via-exemplos
 category Package
@@ -224503,7 +224502,7 @@ catalogue-version 1.0
 
 name optex
 category Package
-revision 55062
+revision 55231
 shortdesc LuaTeX format based on Plain TeX and OPmac
 longdesc OpTeX is a LuaTeX format based on Plain TeX macros with power
 longdesc from OPmac (fonts selection system, colors, external graphics,
@@ -224517,11 +224516,11 @@ depend luatex
 depend optex.ARCH
 depend rsfs
 execute AddFormat name=optex engine=luatex patterns=hyphen-lan.opm           options="optex.ini"           fmttriggers=amsfonts,cm,ec,hyphen-base,lm,rsfs
-containersize 749100
-containerchecksum ee4114b7bded2a6b53af4e6378ff533618e50478ea581fdedf9f8fa53e6d0722058933ba768e463a3fc072ec02227a11fd13ae7a9a8357ec50d37fc56ce08784
-doccontainersize 1182016
-doccontainerchecksum 5710163b65b19973ce79986761b81053d700da2215e1ad9767ebac158b2abd8b96b3d451da87acd904c72fab4c345f44340fb364fa941fd0d957eeed7bd54b4d
-docfiles size=315
+containersize 752964
+containerchecksum d90034e91a3da7f8ddb77051008fe93032883de022699fd3ea630aba665694b839723a0c21a92e962e28e4c23dfe6c92f9fd10b7201ad08ce6efa8dee300d45c
+doccontainersize 1215340
+doccontainerchecksum 61d6aae2a1564fc3d6963de452b06c887acf86b1f11c29149304639eb4bb143b185163a1822089caace6378383373c911c1d43cfa784486d75d8f2f7b731f783
+docfiles size=323
  texmf-dist/doc/luatex/optex/README details="Readme"
  texmf-dist/doc/luatex/optex/optex-doc.pdf details="Package documentation"
  texmf-dist/doc/luatex/optex/optex-doc.tex
@@ -224529,7 +224528,7 @@ docfiles size=315
  texmf-dist/doc/luatex/optex/optex-userdoc.tex
  texmf-dist/doc/man/man1/optex.1
  texmf-dist/doc/man/man1/optex.man1.pdf
-runfiles size=429
+runfiles size=433
  texmf-dist/tex/luatex/optex/base/alloc.opm
  texmf-dist/tex/luatex/optex/base/basic-macros.opm
  texmf-dist/tex/luatex/optex/base/bib-iso690.opm
@@ -224602,17 +224601,18 @@ runfiles size=429
  texmf-dist/tex/luatex/optex/base/usebib.opm
  texmf-dist/tex/luatex/optex/base/verbatim.opm
  texmf-dist/tex/luatex/optex/demo/op-demo.tex
- texmf-dist/tex/luatex/optex/demo/op-letter.tex
+ texmf-dist/tex/luatex/optex/demo/op-letter-cs.tex
+ texmf-dist/tex/luatex/optex/demo/op-letter-en.tex
  texmf-dist/tex/luatex/optex/demo/op-ring.png
+ texmf-dist/tex/luatex/optex/demo/op-slides-bg.png
  texmf-dist/tex/luatex/optex/demo/op-slides.tex
- texmf-dist/tex/luatex/optex/demo/slides-bg.png
  texmf-dist/tex/luatex/optex/pkg/qrcode.opm
 catalogue-also csplain
 catalogue-contact-home http://petr.olsak.net/optex
 catalogue-ctan /macros/luatex/optex
 catalogue-license pd
 catalogue-topics format luatex
-catalogue-version 0.12
+catalogue-version 0.13
 
 name optex.aarch64-linux
 category Package
@@ -275153,29 +275153,29 @@ catalogue-version 1.0a
 
 name suftesi
 category Package
-revision 53903
+revision 55233
 shortdesc A document class for typesetting theses, books and articles
 relocated 1
 longdesc The class can be used to typeset any kind of book (originally
 longdesc designed for use in the humanities).
-containersize 13772
-containerchecksum 6b6249485e0c7076ad6141af22ec6aba22c0df86c38c03565bf61a486cd8d7c24c1909034e365699e3428307762f65aa6be64e222f167e8ce744e8b84d2a0e71
-doccontainersize 957272
-doccontainerchecksum 316340999ebe6534adcb38c53f3183c64fce9819ed57ca51587c8ca2dda25afbb6d2c68529134524974ebaf9ee27b03267e8021d4d6e4cfa51a7697b942f4a7e
-docfiles size=354
+containersize 13988
+containerchecksum 76776fcbc2993ec5a36384f62ef8e854340ba7d04ff5fb2a24f0c17cc2899b53ba6867af33276eee46d139a61aa97e815a3d98e10358c1d8149dcb41ee9e9079
+doccontainersize 959832
+doccontainerchecksum 8f0cb65265718bddb2390f7116276b67f77deb9ddd53304f6e5eb120f08de4819931f0ac26378d66871bd3e07a97669f27f1ece1bd39a0c2acf151eb132a2ee2
+docfiles size=355
  RELOC/doc/latex/suftesi/README details="Readme"
  RELOC/doc/latex/suftesi/suftesi.pdf details="Package documentation" language="en"
  RELOC/doc/latex/suftesi/templates.zip
-srccontainersize 36724
-srccontainerchecksum cdffa74eed1f65452acf39233decd0941bc23718862545fd74b95ede4daa3c1e65f7f7e14dbe69253ccf09f198ff2e2d8434bc9842b61d5a11de56c497aaa0e1
-srcfiles size=47
+srccontainersize 37280
+srccontainerchecksum 38f8cf6d2490e38f4e6365669ebd24cc2d1c08a677c67074e6fbdebb495f8245dbaf59950d6b4456da7cf92498b517a3996c10452d314003225355f9ae7d4b2f
+srcfiles size=50
  RELOC/source/latex/suftesi/suftesi.dtx
 runfiles size=23
  RELOC/tex/latex/suftesi/suftesi.cls
 catalogue-ctan /macros/latex/contrib/suftesi
 catalogue-license lppl1.3
 catalogue-topics book-pub class dissertation
-catalogue-version 2.9.8
+catalogue-version 2.9.9
 
 name sugconf
 category Package
@@ -289444,15 +289444,15 @@ docfiles size=592
 
 name texlive-docindex
 category TLCore
-revision 55216
+revision 55225
 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 392
-containerchecksum d2f6d2ab28c152bb6afa8462a0c6966454b75ed9242241287d960efc6d786d2464231309d1e86004281815a756a0a645678a7903171a8e0d7d427245900eca42
-doccontainersize 162208
-doccontainerchecksum db427ec3a375415e672180932cb3b18c1e6ce476715b8cb875d92b7c48ab669282811644d4249bcf31b5581d4150a5064c6b360411281934ddc6a897c2e4644f
+containerchecksum 21e03c5d0d54a7f6cf6146d20eefebfb2324adb9e876d6a1ab3d25a605c99259632a8cda257c034941056f95b60bd9c575d63f1542a40602825412210a83f9d2
+doccontainersize 162192
+doccontainerchecksum 9d34afff3fa792b8f99a01f91b294b9b2eff933dd545190bb077764f15db8fdc2625da33ef982168b5a516bd49a86e13d68f82521a210face5dbf0882c36f8d0
 docfiles size=325
  doc.html
 
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 55dcb5310b..b7aa6c4804 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-479b013078b4594bf7e8839c20373846  texlive.tlpdb
+a6f1cd04725b57c868436c974c7219c9  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 951441c21a..94553527da 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-61b5b686083c12fa818daaf97b2cb6cb0a91b5129bf7e4f9f1e925cbcbb856562f678be862d378e4d05f09da1e44fc4efc8e4b9c2924755bb1aca7e9ba7465aa  texlive.tlpdb
+053e327bfb978cbadf61f4681974cee4904fba201285eb5c54362f6c215c3732b2376d49f88d5174c87ee497036fa599d59e36965a0303e71717e734d9a2ec8d  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 77d1ae7bf1..746b6496fa 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-----
 
-iQEcBAEBCgAGBQJexabKAAoJEEzhh34ZQ4xw95UH/2TFgYhgLC7JfRr2cwbRiKy9
-Yym4UpoBcoFdNt18wKUyjCcP4gvyrLlshnxKcnykjQ0qDuaMlrsmDahRqS5ibs5Q
-etgazhA5ehIIXvY0MOihOl7h+HN+rZWLsXHJd2j9dTPbq2p3uiiPtAjL9VWO+kw3
-gC24lPeL+M21f0ajKJOb7vYTIgeGauP2j564O2H5DzeVbAXjtDMi3W6YD5s1nHEp
-4vvkjGhhG3mQiI0ZaELvcX5a34w0rTzFvl8cA5Rb5DSzixGml9/aXUegLI4mbC9B
-F7phnZ39ojqQMY5diaNXQd3lVThlQcZX4ajcWcp7SYeXYbAfMwRC8SoyDybbe6E=
-=Wn1J
+iQEcBAEBCgAGBQJexvy7AAoJEEzhh34ZQ4xwaM8H/2Ew9HG5en3nQr86aOovbj27
+UvNzy3opVwsyZmKB75gsVhSqgn/er62NWGZL+Ae1VdaY4YhqmxiZtjjyxqjhS8AY
+NTY8epS87KntyRs03f7uWLkLTEcXAlZsY5o5pC9eKwbkTlJQntUFwRp3HScRAuNB
+VKvZ8Az+auSETt0SkzxVqjdQCtFwoxAFQl/0z7sB/oZtnyqwwcDgJAVxkhLKz0W6
+2us6Qnc3YEOhqac6lfo9+dOkHvV1voR4/17PybsU3ERxGpKx6mevlH2FiTN7bjj0
+TzbdA9vnsUofQxmI3YXIjk+Pz9UCFDjbqpKUZzJcjetMOP3NcNOlBYbzRnb4tRg=
+=qssh
 -----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index e3bd7f62bd..f1b4e83d71 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index 30d1c7fdf6..9dc7bb2c90 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=1590005797

+date=1590092134

 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=c29dc2d5ef3a95b628382820569f8880

+lstdigest=c484fa9e4e5697d9edc75af5c90c7caa

 numpkg=3911

 relstate=next

-version=7445

+version=7446

 

 ;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.

 ;;;;-----BEGIN MIKTEX SIGNATURE-----

-;;;; signature/miktex: n/ptAP3mYIYyrwNeLvrGZNc9SgqX4AznFbKEbd5xlbi7jGPj3u74AVPLAdysofhAijby1Cx0x1oU2uKI+r1/hQieRzVRPxAmYBK0PIHRSuJaNUd3qEYyVlLNYgOC44MaExEx78CFnIDTqhPXjPL8YiDHfARmsHkMSHVWeNMcm4gQY0wjD0n1Di4dbxgeo81OOMaf3wPzs+db8dF18aSFkuw8kTKMsDoC07Kn51CtMRCmAMH68tnmd+wNAe86ZgowG3uswTZWEAzjiaU6lXbdiMZpgfbaWcXOry6iaAemWAQDRTX0a8DkiS7G3BCvGm2H0cu+P5ApGfA0qZqNKYq6SQ==

+;;;; signature/miktex: T782k3ZHLslk9Ric936X4aoyvSbI1danWzj0OvXXw2E38ND5LCMzUaRWS9hqWXfkB+VE4bvdkrKDeyxQhq9UiA2lLkpC7b6MdluTz7L4EjPJmU9ZxFBBldAQVoZgVAPr2FCNrLXoSqrARw/yDNRideQcWcL0ZCh53z5FzAw5nyCilkjlyRcPlYx6b9hhs7Ik7kGFbiQ+wRxAT6yCQzo/SAZWgS+RtNhI3b0nR8ZKWQNFTTgqGv6ieeas2GNiBLxZjgnk6QEn9AM9Xgtj0w8X9doOQHbicxRxosFB7C30bWfYGZUahxTNIXnq3PtFHsJ4vs8VM+xy8yW5/WyYAt+NMA==

 ;;;;-----END MIKTEX SIGNATURE-----

diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index 3c50b9ef7d..fe43b46f5d 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
 

 [repository]

-date=1590005474

+date=1590091872

 lastupd=helmholtz-ellis-ji-notation l3experimental luatexja miktex-luatex-bin-2.9 miktex-luatex-bin-x64-2.9 miktex-runtime-bin-2.9 miktex-runtime-bin-x64-2.9 newcomputermodern newpx newtx parskip plantuml miktex-bibtex-bin-2.9 miktex-bibtex-bin-x64-2.9 bidi circuitikz exercises lua-uni-algos tex-nutshell vcell

-lstdigest=240a9a7bf5246a4b7f8e1f13a8fd7fbb

+lstdigest=c358962c87709f17fbd603f18fab3b05

 numpkg=3911

 relstate=stable

-version=7445

+version=7446

 

 ;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.

 ;;;;-----BEGIN MIKTEX SIGNATURE-----

-;;;; signature/miktex: mHz2j8rl+wM9Jxe3LtAY8fE12Tx3cohDnJH/PP5EZNhNtu/zO4zQCNVTK0ICf47IXbFm5K+GC8IzR8SFXkDvNyXJgWwwZ5cDNSjtCo61ABEFl0QaSMwXu/nkJvgROKabNcDz3WGiftEd1Acr8QjWwjzvzdX1NnY+XYS4/LmlZhgBWg8U9vvX/QX7cNu1ZZNZu8+zl5m8FMqwrZj7Wyq3MSw/ueYVcAqhyabZa+XjIoBdwg+Z/F5bxX6DUayWIeB4Av/atao6xK8VtMJAet0m+mV+YYyu3NLr7vFs7YYKz09X3XaKFiO1anrducCr4OyJA7rwXpE9JSqvLY0WmmKCDg==

+;;;; signature/miktex: X6hskq6K8u+dVJk9eqIrmRyaR2KRDijifz7eejS58BTgD83rV4bkKUO/YykuYHHWlZzwS0CkRwFIrlAZY9I4aQiRxNNdon3By3nPbZruk3G06wATLfT2aKphpUJDQXauu2u7wEnygGdjB8iMQYIMPh+FX6+/wdtGDZTkLlfeoK/aTMuFP5SNmsjjuhQfCGK7TDd0ZsK7i57c7r7jaOI3ExysuYRozt8NbI12PnVDk3+9w7vig7v9eVK6yA5VLmQP74Oj1e4uwk5OiOPAcPcgFMlmvYuHXEDblOKjdvuSA8j/ycBPVLJnP04H9szyempy6Q6nyNjN593jau3imHtttw==

 ;;;;-----END MIKTEX SIGNATURE-----

diff --git a/systems/win32/w32tex/ChangeLog b/systems/win32/w32tex/ChangeLog
index eed6a92c16..0f7d5eb111 100644
--- a/systems/win32/w32tex/ChangeLog
+++ b/systems/win32/w32tex/ChangeLog
@@ -1,5 +1,11 @@
                    W32TeX (x86 & x64) ChangeLog
 
+[2020/05/21]
+(01) dvipsk-w32.tar.xz
+     Update documents.
+(02) tex4htk-w32.tar.xz
+     Update ooffice.4ht.
+
 [2020/05/20]
 (01) ltxpkgdocs.tar.xz
      Update documents for packages.
diff --git a/timestamp b/timestamp
index 967729ddb6..a26c644cc5 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:
-2020-05-21-02-02
+2020-05-22-02-02