2 files changed, 89 insertions, 81 deletions

diff --git a/Master/texmf-dist/ls-R b/Master/texmf-dist/ls-R
index 18e228eff25..c3c0c590678 100644
--- a/Master/texmf-dist/ls-R
+++ b/Master/texmf-dist/ls-R
@@ -48225,13 +48225,13 @@ texlive-sr.sty
 texlive-sr.tex
 
 ./doc/texlive/texlive-sr/images:
-tl2017-install-tl-collections-freebsd-sr.png
-tl2017-install-tl-expert-gui-freebsd-sr.png
-tl2017-install-tl-first.stage-win32-sr.png
-tl2017-install-tl-wizard-win32-sr.png
-tl2017-tlmgr-main-screen-freebsd-sr.png
-tl2017-tlmgr-options-freebsd-sr.png
-tl2017-tlmgr-paper-options-freebsd-sr.png
+tl2018-install-tl-collections-freebsd-sr.png
+tl2018-install-tl-expert-gui-freebsd-sr.png
+tl2018-install-tl-first.stage-win32-sr.png
+tl2018-install-tl-wizard-win32-sr.png
+tl2018-tlmgr-main-screen-freebsd-sr.png
+tl2018-tlmgr-options-freebsd-sr.png
+tl2018-tlmgr-paper-options-freebsd-sr.png
 
 ./doc/texlive/texlive-zh-cn:
 Makefile
@@ -178741,7 +178741,6 @@ mem60.clo
 mem9.clo
 memhfixc.sty
 memoir.cls
-mempatch.sty
 
 ./tex/latex/memory:
 memory.sty
diff --git a/Master/tlpkg/texlive.tlpdb b/Master/tlpkg/texlive.tlpdb
index b4ec5a0cb89..2b3b6c39c5a 100644
--- a/Master/tlpkg/texlive.tlpdb
+++ b/Master/tlpkg/texlive.tlpdb
@@ -26,11 +26,11 @@ depend container_split_src_files/1
 depend frozen/0
 depend minrelease/2016
 depend release/2018
-depend revision/47298
+depend revision/47316
 
 name 00texlive.image
 category TLCore
-revision 47288
+revision 47311
 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
@@ -11316,7 +11316,7 @@ binfiles arch=amd64-netbsd size=193
 
 name aleph.armhf-linux
 category Package
-revision 47013
+revision 47313
 shortdesc armhf-linux files of aleph
 binfiles arch=armhf-linux size=125
  bin/armhf-linux/aleph
@@ -20388,7 +20388,7 @@ catalogue-version 0.2
 
 name axodraw2
 category Package
-revision 47271
+revision 47311
 shortdesc Feynman diagrams in a LaTeX document
 longdesc This package defines macros for drawing Feynman graphs in LaTeX
 longdesc documents. It is an important update of the axodraw package,
@@ -20403,6 +20403,19 @@ longdesc calculations needed for the pdf code inserted in the output
 longdesc file. The processing involves a run of pdfLaTeX, a run of
 longdesc axohelp, and then another run of pdfLaTeX.
 depend axodraw2.ARCH
+docfiles size=169
+ texmf-dist/doc/latex/axodraw2/AUTHORS
+ texmf-dist/doc/latex/axodraw2/COPYING
+ texmf-dist/doc/latex/axodraw2/ChangeLog
+ texmf-dist/doc/latex/axodraw2/INSTALL
+ texmf-dist/doc/latex/axodraw2/README details="Readme"
+ texmf-dist/doc/latex/axodraw2/README.TEXLIVE
+ texmf-dist/doc/latex/axodraw2/axodraw2-man.pdf details="Package documentation"
+ texmf-dist/doc/latex/axodraw2/axodraw2-man.tex
+ texmf-dist/doc/latex/axodraw2/axohelp.1
+ texmf-dist/doc/latex/axodraw2/example.tex
+ texmf-dist/doc/man/man1/axohelp.1
+ texmf-dist/doc/man/man1/axohelp.man1.pdf
 srcfiles size=76
  texmf-dist/source/latex/axodraw2/Makefile.am
  texmf-dist/source/latex/axodraw2/axohelp-big.test
@@ -30548,9 +30561,9 @@ binfiles arch=amd64-netbsd size=4876
 
 name bibtexu.armhf-linux
 category TLCore
-revision 46862
+revision 47313
 shortdesc armhf-linux files of bibtexu
-binfiles arch=armhf-linux size=4814
+binfiles arch=armhf-linux size=4790
  bin/armhf-linux/bibtexu
 
 name bibtexu.i386-cygwin
@@ -75469,7 +75482,7 @@ binfiles arch=amd64-netbsd size=2117
 
 name dvisvgm.armhf-linux
 category TLCore
-revision 47013
+revision 47313
 shortdesc armhf-linux files of dvisvgm
 binfiles arch=armhf-linux size=1220
  bin/armhf-linux/dvisvgm
@@ -103155,7 +103168,7 @@ binfiles arch=amd64-netbsd size=180
 
 name gregoriotex.armhf-linux
 category Package
-revision 47013
+revision 47313
 shortdesc armhf-linux files of gregoriotex
 binfiles arch=armhf-linux size=159
  bin/armhf-linux/gregorio
@@ -103613,14 +103626,15 @@ binfiles arch=x86_64-solaris size=25
 
 name gtl
 category Package
-revision 45942
+revision 47304
 shortdesc Manipulating generalized token lists
 longdesc The package provides tools for simple operations on lists of
 longdesc tokens which are not necessarily balanced. It is in particular
 longdesc used a lot in the unravel package, to go through tokens one at
 longdesc a time rather than having to work with entire braced groups at
-longdesc a time. The package requires an up-to-date l3kernel bundle.
-docfiles size=131
+longdesc a time. The package requires an up-to-date versions of the
+longdesc l3kernel, l3kpackages, and l3experimental bundles.
+docfiles size=136
  texmf-dist/doc/generic/gtl/README.md details="Readme"
  texmf-dist/doc/generic/gtl/gtl.pdf details="Package documentation"
 srcfiles size=17
@@ -103629,10 +103643,10 @@ srcfiles size=17
 runfiles size=6
  texmf-dist/tex/generic/gtl/gtl.sty
 catalogue-ctan /macros/generic/gtl
-catalogue-date 2017-11-29 19:02:40 +0100
+catalogue-date 2018-04-05 07:12:36 +0200
 catalogue-license lppl
 catalogue-topics macro-supp
-catalogue-version 0.3
+catalogue-version 0.4
 
 name gtrcrd
 category Package
@@ -141262,9 +141276,9 @@ binfiles arch=amd64-netbsd size=7469
 
 name luatex.armhf-linux
 category TLCore
-revision 47237
+revision 47313
 shortdesc armhf-linux files of luatex
-binfiles arch=armhf-linux size=5876
+binfiles arch=armhf-linux size=5878
  bin/armhf-linux/dviluatex
  bin/armhf-linux/luajittex
  bin/armhf-linux/luatex
@@ -147299,7 +147313,7 @@ catalogue-version 0.1
 
 name memoir
 category Package
-revision 41203
+revision 47305
 shortdesc Typeset fiction, non-fiction and mathematical books
 longdesc The memoir class is for typesetting poetry, fiction,
 longdesc non-fiction, and mathematical works. Permissible document
@@ -147308,16 +147322,12 @@ longdesc page-styles and well over a dozen chapter-styles to choose
 longdesc from, as well as methods for specifying your own layouts and
 longdesc designs. The class also provides the functionality of over
 longdesc thirty of the more popular packages, thus simplifying document
-longdesc sources. The class automatically loads an associated patch file
-longdesc mempatch; the patch file may be updated from time to time,
-longdesc between releases of the class itself. (The patch file stays
-longdesc around even when there are no extant patches.) Users who wish
-longdesc to use the hyperref package, in a document written with the
-longdesc memoir class, should also use the memhfixc package (part of
-longdesc this bundle). Note, however, that any current version of
-longdesc hyperref actually loads the package automatically if it detects
-longdesc that it is running under memoir.
-docfiles size=1066
+longdesc sources. Users who wish to use the hyperref package, in a
+longdesc document written with the memoir class, should also use the
+longdesc memhfixc package (part of this bundle). Note, however, that any
+longdesc current version of hyperref actually loads the package
+longdesc automatically if it detects that it is running under memoir.
+docfiles size=1082
  texmf-dist/doc/latex/memoir/Makeidxglo
  texmf-dist/doc/latex/memoir/README details="Readme"
  texmf-dist/doc/latex/memoir/anvil2.mps
@@ -147331,7 +147341,7 @@ docfiles size=1066
  texmf-dist/doc/latex/memoir/memsty.sty
  texmf-dist/doc/latex/memoir/titlepages.sty
  texmf-dist/doc/latex/memoir/trims-example.tex
-srcfiles size=307
+srcfiles size=313
  texmf-dist/source/latex/memoir/memoir.dtx
  texmf-dist/source/latex/memoir/memoir.ins
  texmf-dist/source/latex/memoir/mempatch.dtx
@@ -147352,13 +147362,12 @@ runfiles size=119
  texmf-dist/tex/latex/memoir/mem9.clo
  texmf-dist/tex/latex/memoir/memhfixc.sty
  texmf-dist/tex/latex/memoir/memoir.cls
- texmf-dist/tex/latex/memoir/mempatch.sty
 catalogue-also memdesign
 catalogue-ctan /macros/latex/contrib/memoir
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2018-04-05 16:46:34 +0200
 catalogue-license lppl1.3
 catalogue-topics book-pub class
-catalogue-version 3.7f
+catalogue-version 3.7g
 
 name memory
 category Package
@@ -157056,7 +157065,7 @@ catalogue-version 2.3a
 
 name morewrites
 category Package
-revision 43945
+revision 47306
 shortdesc Always room for a new write stream
 longdesc The package aims to solve the error "No room for a new \write",
 longdesc which occurs when the user, or when the user's packages have
@@ -157066,7 +157075,7 @@ longdesc package hooks into TeX primitive commands associated with
 longdesc writing to files; it should be loaded near the beginning of the
 longdesc sequence of loading packages for a document. The package uses
 longdesc the l3kernel bundle.
-docfiles size=320
+docfiles size=323
  texmf-dist/doc/latex/morewrites/README.md details="Readme"
  texmf-dist/doc/latex/morewrites/morewrites.pdf details="Package documentation"
  texmf-dist/doc/latex/morewrites/primargs.pdf
@@ -157079,7 +157088,7 @@ runfiles size=8
  texmf-dist/tex/latex/morewrites/primargs.sty
 catalogue-also rvwrite
 catalogue-ctan /macros/latex/contrib/morewrites
-catalogue-date 2017-04-20 21:01:46 +0200
+catalogue-date 2018-04-05 12:09:04 +0200
 catalogue-license lppl1.3c
 catalogue-topics io-mgmt
 
@@ -167579,7 +167588,7 @@ catalogue-topics headings cite-supp
 
 name novel
 category Package
-revision 47270
+revision 47309
 shortdesc Class for printing fiction, such as novels
 longdesc This LuaLaTeX document class is specifically written to meet
 longdesc the needs of original fiction writers, who are typesetting
@@ -167588,7 +167597,7 @@ longdesc Built-in PDF/X is available, using new technology. The package
 longdesc is well suited for detective novels, science fiction, and short
 longdesc stories. It is however not recommended for creating color
 longdesc picture books or dissertations.
-docfiles size=1328
+docfiles size=1329
  texmf-dist/doc/lualatex/novel/extras/CPmodified.otf
  texmf-dist/doc/lualatex/novel/extras/NovelDeco-glyphs.pdf
  texmf-dist/doc/lualatex/novel/extras/novel-Gallery-ChapterStart.pdf
@@ -167724,10 +167733,10 @@ runfiles size=102
  texmf-dist/tex/lualatex/novel/novel-xmppacket.sty
  texmf-dist/tex/lualatex/novel/novel.cls
 catalogue-ctan /macros/luatex/latex/novel
-catalogue-date 2018-04-03 08:51:20 +0200
+catalogue-date 2018-04-05 06:51:55 +0200
 catalogue-license lppl1.3cofl
 catalogue-topics luatex production book-pub class
-catalogue-version 1.50.2
+catalogue-version 1.50.3
 
 name nowidow
 category Package
@@ -167976,7 +167985,7 @@ catalogue-version 0.1
 
 name nucleardata
 category Package
-revision 42307
+revision 47307
 shortdesc Provides data about atomic nuclides for documents
 longdesc The package provides data and commands for including nuclear
 longdesc and atomic mass and energy data in LaTeX documents. It uses the
@@ -167990,17 +167999,17 @@ docfiles size=102
 srcfiles size=121
  texmf-dist/source/latex/nucleardata/nucleardata.dtx
  texmf-dist/source/latex/nucleardata/nucleardata.ins
-runfiles size=119
+runfiles size=120
  texmf-dist/tex/latex/nucleardata/elementlist.csv
  texmf-dist/tex/latex/nucleardata/massdata.csv
  texmf-dist/tex/latex/nucleardata/nucleardata.hd
  texmf-dist/tex/latex/nucleardata/nucleardata.pytxcode
  texmf-dist/tex/latex/nucleardata/nucleardata.sty
 catalogue-ctan /macros/latex/contrib/nucleardata
-catalogue-date 2016-10-19 19:49:06 +0200
+catalogue-date 2018-04-05 06:30:46 +0200
 catalogue-license lppl1.3
 catalogue-topics callback physics chemistry
-catalogue-version 1.01d
+catalogue-version 1.1
 
 name numberedblock
 category Package
@@ -175809,7 +175818,7 @@ binfiles arch=amd64-netbsd size=595
 
 name pdftex.armhf-linux
 category TLCore
-revision 47013
+revision 47313
 shortdesc armhf-linux files of pdftex
 binfiles arch=armhf-linux size=441
  bin/armhf-linux/etex
@@ -191147,7 +191156,7 @@ binfiles arch=amd64-netbsd size=1898
 
 name ptex.armhf-linux
 category Package
-revision 47013
+revision 47313
 shortdesc armhf-linux files of ptex
 binfiles arch=armhf-linux size=951
  bin/armhf-linux/eptex
@@ -201571,7 +201580,7 @@ runfiles size=22
  texmf-dist/bibtex/bst/seuthesis/seuthesis.bst
 catalogue-also seuthesix
 catalogue-ctan /macros/latex/contrib/seuthesis
-catalogue-date 2017-04-18 05:31:40 +0200
+catalogue-date 2018-04-05 06:13:24 +0200
 catalogue-license gpl3
 catalogue-topics dissertation class
 catalogue-version 2.1.2
@@ -221862,7 +221871,7 @@ docfiles size=372
 
 name texlive-docindex
 category TLCore
-revision 47277
+revision 47300
 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
@@ -221932,9 +221941,9 @@ docfiles size=1232
 
 name texlive-es
 category TLCore
-revision 47298
+revision 47316
 shortdesc TeX Live manual (Spanish)
-docfiles size=626
+docfiles size=627
  texmf-dist/doc/texlive/texlive-es/Makefile
  texmf-dist/doc/texlive/texlive-es/archive/texlive-es.html
  texmf-dist/doc/texlive/texlive-es/archive/texlive-es.pdf
@@ -222014,9 +222023,9 @@ docfiles size=377
 
 name texlive-ru
 category TLCore
-revision 44444
+revision 47301
 shortdesc TeX Live manual (Russian)
-docfiles size=398
+docfiles size=418
  texmf-dist/doc/texlive/texlive-ru/Makefile
  texmf-dist/doc/texlive/texlive-ru/live4ht.cfg
  texmf-dist/doc/texlive/texlive-ru/tex-live.css
@@ -222193,18 +222202,18 @@ binfiles arch=x86_64-solaris size=2
 
 name texlive-sr
 category TLCore
-revision 44341
+revision 47302
 shortdesc TeX Live manual (Serbian)
-docfiles size=474
+docfiles size=468
  texmf-dist/doc/texlive/texlive-sr/Makefile
  texmf-dist/doc/texlive/texlive-sr/README-SR.txt
- texmf-dist/doc/texlive/texlive-sr/images/tl2017-install-tl-collections-freebsd-sr.png
- texmf-dist/doc/texlive/texlive-sr/images/tl2017-install-tl-expert-gui-freebsd-sr.png
- texmf-dist/doc/texlive/texlive-sr/images/tl2017-install-tl-first.stage-win32-sr.png
- texmf-dist/doc/texlive/texlive-sr/images/tl2017-install-tl-wizard-win32-sr.png
- texmf-dist/doc/texlive/texlive-sr/images/tl2017-tlmgr-main-screen-freebsd-sr.png
- texmf-dist/doc/texlive/texlive-sr/images/tl2017-tlmgr-options-freebsd-sr.png
- texmf-dist/doc/texlive/texlive-sr/images/tl2017-tlmgr-paper-options-freebsd-sr.png
+ texmf-dist/doc/texlive/texlive-sr/images/tl2018-install-tl-collections-freebsd-sr.png
+ texmf-dist/doc/texlive/texlive-sr/images/tl2018-install-tl-expert-gui-freebsd-sr.png
+ texmf-dist/doc/texlive/texlive-sr/images/tl2018-install-tl-first.stage-win32-sr.png
+ texmf-dist/doc/texlive/texlive-sr/images/tl2018-install-tl-wizard-win32-sr.png
+ texmf-dist/doc/texlive/texlive-sr/images/tl2018-tlmgr-main-screen-freebsd-sr.png
+ texmf-dist/doc/texlive/texlive-sr/images/tl2018-tlmgr-options-freebsd-sr.png
+ texmf-dist/doc/texlive/texlive-sr/images/tl2018-tlmgr-paper-options-freebsd-sr.png
  texmf-dist/doc/texlive/texlive-sr/texlive-sr.css
  texmf-dist/doc/texlive/texlive-sr/texlive-sr.html
  texmf-dist/doc/texlive/texlive-sr/texlive-sr.pdf
@@ -222224,7 +222233,7 @@ docfiles size=240
 
 name texlive.infra
 category TLCore
-revision 47278
+revision 47303
 shortdesc basic TeX Live infrastructure
 longdesc This package contains the files needed to get the TeX Live
 longdesc tools (notably tlmgr) running: perl modules, xz binaries, plus
@@ -222232,7 +222241,7 @@ longdesc (sometimes) tar and wget.  These files end up in the standalone
 longdesc install packages, and in the tlcritical repository.
 depend texlive.infra.ARCH
 postaction shortcut type=menu name="TeX Live Manager"              cmd=TEXDIR/bin/win32/tlmgr-gui.exe
-docfiles size=120
+docfiles size=121
  README
  README.usergroups
  index.html
@@ -233238,7 +233247,7 @@ runfiles size=27
  texmf-dist/tex/latex/tufte-latex/tufte-common.def
  texmf-dist/tex/latex/tufte-latex/tufte-handout.cls
 catalogue-ctan /macros/latex/contrib/tufte-latex
-catalogue-date 2017-04-18 05:31:40 +0200
+catalogue-date 2018-04-05 06:13:24 +0200
 catalogue-license apache2
 catalogue-topics book-pub class
 catalogue-version 3.5.2
@@ -239618,7 +239627,7 @@ catalogue-version 1.3
 
 name unravel
 category Package
-revision 38506
+revision 47308
 shortdesc Watching TeX digest tokens
 longdesc The aim of this LaTeX package is to help debug complicated
 longdesc macros. This is done by letting the user step through the
@@ -239628,19 +239637,19 @@ longdesc typesetting commands. To use this package, one should normally
 longdesc run TeX in a terminal. The unravel package requires up-to-date
 longdesc versions of the l3kernel, l3packages and l3experimental
 longdesc bundles.
-docfiles size=175
+docfiles size=170
  texmf-dist/doc/latex/unravel/README.md details="Readme"
  texmf-dist/doc/latex/unravel/unravel.pdf details="Package documentation"
-srcfiles size=70
+srcfiles size=71
  texmf-dist/source/latex/unravel/unravel.dtx
  texmf-dist/source/latex/unravel/unravel.ins
-runfiles size=53
+runfiles size=54
  texmf-dist/tex/latex/unravel/unravel.sty
 catalogue-ctan /macros/latex/contrib/unravel
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2018-04-05 08:10:45 +0200
 catalogue-license lppl1.3
 catalogue-topics macro-supp
-catalogue-version 0.2
+catalogue-version 0.2e
 
 name unswcover
 category Package
@@ -240375,9 +240384,9 @@ binfiles arch=amd64-netbsd size=6753
 
 name uptex.armhf-linux
 category Package
-revision 47013
+revision 47313
 shortdesc armhf-linux files of uptex
-binfiles arch=armhf-linux size=5753
+binfiles arch=armhf-linux size=5730
  bin/armhf-linux/euptex
  bin/armhf-linux/upbibtex
  bin/armhf-linux/updvitomp
@@ -248208,7 +248217,7 @@ runfiles size=8
  texmf-dist/tex/latex/xcookybooky/xcookybooky.sty
 catalogue-also cookybooky
 catalogue-ctan /macros/latex/contrib/xcookybooky
-catalogue-date 2017-04-18 05:31:40 +0200
+catalogue-date 2018-04-05 06:13:24 +0200
 catalogue-license lppl1.3
 catalogue-topics cooking
 catalogue-version 1.5
@@ -249035,9 +249044,9 @@ binfiles arch=amd64-netbsd size=6766
 
 name xetex.armhf-linux
 category TLCore
-revision 47013
+revision 47313
 shortdesc armhf-linux files of xetex
-binfiles arch=armhf-linux size=6424
+binfiles arch=armhf-linux size=6401
  bin/armhf-linux/teckit_compile
  bin/armhf-linux/xdvipdfmx
  bin/armhf-linux/xelatex
@@ -250335,7 +250344,7 @@ runfiles size=24
  texmf-dist/tex/xmltex/base/xmltex.cfg
  texmf-dist/tex/xmltex/base/xmltex.tex
 catalogue-ctan /macros/xmltex/base
-catalogue-date 2017-04-18 05:31:40 +0200
+catalogue-date 2018-04-05 06:13:24 +0200
 catalogue-license lppl
 catalogue-topics foreign-import
 catalogue-version 0.8