2 files changed, 146 insertions, 60 deletions

diff --git a/Master/texmf-dist/ls-R b/Master/texmf-dist/ls-R
index 20e9f848c52..53286276551 100644
--- a/Master/texmf-dist/ls-R
+++ b/Master/texmf-dist/ls-R
@@ -7312,6 +7312,8 @@ prodint.tex
 ./doc/fonts/ptex-fontmaps:
 README
 examples
+kanji-config-updmap.pdf
+kanji-config-updmap.tex
 
 ./doc/fonts/ptex-fontmaps/examples:
 otf-sample-04.tex
@@ -19328,6 +19330,7 @@ lppl-1-3c_license.txt
 ./doc/latex/circuit-macros:
 CHANGES
 Copying
+Licence.txt
 Makefile
 README
 darrow.m4
@@ -19366,6 +19369,8 @@ ConfigA.m4
 ConfigB.m4
 ConfigC.m4
 Conn.m4
+Contact.m4
+Contacts.m4
 Corners.m4
 Dac.m4
 Darlington.m4
@@ -19420,16 +19425,14 @@ eboxdims.m4
 fbfilter.m4
 fet.m4
 lrarrows.m4
-md.tex
 mplex.m4
 oax.m4
 oaxbody.m4
 quick.m4
+relaycoil.m4
 stringdims.m4
 test.tex
 thyristor.m4
-tran.m4
-tran.tex
 tranbody.m4
 ujt.m4
 woodchips.m4
@@ -19438,30 +19441,45 @@ woodchips.m4
 ABlogix.m4
 Adder.m4
 Alogix.m4
+AmpTable.m4
+Antennas.m4
+AntiqueClock.m4
+Audio.m4
 Autologix.m4
 Ball.m4
+Bip.m4
 Blogix.m4
 Btree.m4
 Buttons.m4
 Byte.m4
 CSlight.m4
 CanLogic.m4
+CctTable.m4
 Ccurve.m4
 Chuck.m4
+Conn.m4
+Contact.m4
+Contacts.m4
 Counting.m4
 Crossbar.m4
 Crow.m4
 Cruller.m4
 Csource.m4
 Decoder.m4
+Demultiplexer.m4
+Dini.m4
+Diodes.m4
 Drive.m4
+Emarrows.m4
 Escher.m4
 Euro.m4
 Floor.m4
 Flow.m4
 FlowchartDefs.m4
-GnuMakefile
+Fuses.m4
 GrayCode.m4
+Grounds.m4
+Headers.m4
 Heathkit.m4
 I2L.m4
 IC10107.m4
@@ -19470,37 +19488,52 @@ Incl.eps.gz
 Incl.pdf
 Incleps.m4
 Inclpdf.m4
+Jack.m4
 Koch.m4
+Logic.m4
 Loglog.m4
 MC.m4
 Makefile
 Mixer.m4
-MosfetElements.m4
 MotorControl.m4
+Multiplexer.m4
+NLG.m4
+NPDT.m4
+Nport.m4
 OpAmpFilter.m4
+Opamp.m4
 Optoiso.m4
 Orbits.m4
 PPA.m4
+Pconn.m4
 Planes.m4
 PushPull.m4
 Quantum.m4
 README-examples
 Rectifiers.m4
+Relay.m4
 Resolver.m4
 Rotbox.m4
 SPM.m4
 SQUID.m4
 Schottky.m4
 Shaky.m4
+ShiftR.m4
 Sierpinski.m4
 Sixpole.m4
+Sources.m4
+Switches.m4
 TTLnand.m4
+Tgate.m4
 Three.m4
 Timer.m4
 Ttree.m4
 Tubediags.m4
+Variable.m4
 Wheat.m4
+Windings.m4
 XOR.m4
+Xform.m4
 Zcos.m4
 birds.m4
 bistable.m4
@@ -19509,7 +19542,6 @@ chaos.m4
 clock.m4
 control.m4
 csc.m4
-darrows.m4
 debug1.tex
 debug2.m4
 diamond.m4
@@ -19520,7 +19552,6 @@ ex03.m4
 ex04.m4
 ex05.m4
 ex06.m4
-ex07.m4
 ex08.m4
 ex09.m4
 ex10.m4
@@ -19534,6 +19565,7 @@ ex21.m4
 examples.pdf
 examples.tex
 exp.m4
+fet.m4
 files.tex
 graysurf.m4
 header.tex
@@ -19541,14 +19573,15 @@ ics.m4
 keyval.m4
 lcct.m4
 mf
-mode.tex
 mpost
+odistmakefile
 person.m4
-pgf
 psfrag
 pwrsupply.m4
+quick.m4
 random.m4
 recycle.m4
+relaycoil.m4
 rose.m4
 rotate.tex
 rotatetext.m4
@@ -19560,10 +19593,12 @@ squiggle.m4
 svg
 test.m4
 testpdf.tex
+thyristor.m4
 tikz.tex
 tst.tex
 tst1.tex
 tubedefs.m4
+ujt.m4
 windows.m4
 worm.m4
 xfig
@@ -19582,12 +19617,6 @@ examplesmpost.tex
 mptest
 tstmpost.tex
 
-./doc/latex/circuit-macros/examples/pgf:
-Makefile
-README-pgf
-examplespgf.tex
-tstpgf.tex
-
 ./doc/latex/circuit-macros/examples/psfrag:
 Makefile
 README-psfrag.txt
@@ -19600,6 +19629,7 @@ AdderSVG.m4
 AlogixSVG.m4
 AmpTableSVG.m4
 AntennasSVG.m4
+AntiqueClockSVG.m4
 AudioSVG.m4
 Banking.m4
 BipSVG.m4
@@ -19609,6 +19639,8 @@ ByteSVG.m4
 CanLogicSVG.m4
 CctTableSVG.m4
 ConnSVG.m4
+ContactSVG.m4
+ContactsSVG.m4
 CountingSVG.m4
 CrossbarSVG.m4
 CrowSVG.m4
@@ -19616,6 +19648,7 @@ CrullerSVG.m4
 CsourceSVG.m4
 DecoderSVG.m4
 DemultiplexerSVG.m4
+DiniSVG.m4
 DiodesSVG.m4
 DriveSVG.m4
 EmarrowsSVG.m4
@@ -19700,6 +19733,7 @@ pwrsupplySVG.m4
 quickSVG.m4
 randomSVG.m4
 recycleSVG.m4
+relaycoilSVG.m4
 roseSVG.m4
 sfgSVG.m4
 shapesSVG.m4
@@ -19707,7 +19741,6 @@ thyristorSVG.m4
 tstSVG.htmx
 ujtSVG.m4
 wormSVG.m4
-xx.html
 
 ./doc/latex/circuit-macros/examples/xfig:
 Makefile
@@ -27357,8 +27390,9 @@ ghab-doc.tex
 
 ./doc/latex/ghsystem:
 README
-ghsystem_en.pdf
-ghsystem_en.tex
+ghsystem-manual.cls
+ghsystem-manual.pdf
+ghsystem-manual.tex
 
 ./doc/latex/gillcm:
 README
@@ -65140,6 +65174,7 @@ cjkunifonts-ttf
 dynacomware
 fandol
 founder
+haranoaji
 hiragino
 hiragino-pron
 ipa
@@ -65224,6 +65259,14 @@ uptex-sc-fandol.map
 otf-sc-founder.map
 uptex-sc-founder.map
 
+./fonts/map/dvipdfmx/ptex-fontmaps/haranoaji:
+otf-haranoaji.map
+otf-up-haranoaji.map
+ptex-haranoaji-04.map
+ptex-haranoaji.map
+uptex-haranoaji-04.map
+uptex-haranoaji.map
+
 ./fonts/map/dvipdfmx/ptex-fontmaps/hiragino:
 otf-hiragino.map
 otf-up-hiragino.map
diff --git a/Master/tlpkg/texlive.tlpdb b/Master/tlpkg/texlive.tlpdb
index 5a886ca75e6..6b6cf1f75c5 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/2019
-depend revision/53817
+depend revision/53828
 
 name 00texlive.image
 category TLCore
-revision 53815
+revision 53822
 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
@@ -28798,13 +28798,13 @@ catalogue-version 0.1
 
 name beebe
 category Package
-revision 53228
+revision 53819
 catalogue biblio
 shortdesc A collection of bibliographies
 longdesc A collection of BibTeX bibliographies on TeX-related topics
 longdesc (including, for example, spell-checking and SGML). Each
 longdesc includes a LaTeX wrapper file to typeset the bibliography.
-runfiles size=2027
+runfiles size=2025
  texmf-dist/bibtex/bib/beebe/epodd.bib
  texmf-dist/bibtex/bib/beebe/font.bib
  texmf-dist/bibtex/bib/beebe/printing-history.bib
@@ -48237,7 +48237,7 @@ catalogue-version 1.3
 
 name circuit-macros
 category Package
-revision 52410
+revision 53821
 shortdesc M4 macros for electric circuit diagrams
 longdesc A set of m4 macros for drawing high-quality electric circuits
 longdesc containing fundamental elements, amplifiers, transistors, and
@@ -48254,9 +48254,10 @@ longdesc structured. (The m4 and pic processors are readily available
 longdesc for Unix and PC machines.) Alternative output macros can create
 longdesc TeX output to be read by pstricks, TikZ commands for use by the
 longdesc pgf bundle, or SVG.
-docfiles size=1118
+docfiles size=1035
  texmf-dist/doc/latex/circuit-macros/CHANGES
  texmf-dist/doc/latex/circuit-macros/Copying
+ texmf-dist/doc/latex/circuit-macros/Licence.txt
  texmf-dist/doc/latex/circuit-macros/Makefile
  texmf-dist/doc/latex/circuit-macros/README details="Readme"
  texmf-dist/doc/latex/circuit-macros/darrow.m4
@@ -48277,6 +48278,8 @@ docfiles size=1118
  texmf-dist/doc/latex/circuit-macros/doc/ConfigB.m4
  texmf-dist/doc/latex/circuit-macros/doc/ConfigC.m4
  texmf-dist/doc/latex/circuit-macros/doc/Conn.m4
+ texmf-dist/doc/latex/circuit-macros/doc/Contact.m4
+ texmf-dist/doc/latex/circuit-macros/doc/Contacts.m4
  texmf-dist/doc/latex/circuit-macros/doc/Corners.m4
  texmf-dist/doc/latex/circuit-macros/doc/Dac.m4
  texmf-dist/doc/latex/circuit-macros/doc/Darlington.m4
@@ -48331,16 +48334,14 @@ docfiles size=1118
  texmf-dist/doc/latex/circuit-macros/doc/fbfilter.m4
  texmf-dist/doc/latex/circuit-macros/doc/fet.m4
  texmf-dist/doc/latex/circuit-macros/doc/lrarrows.m4
- texmf-dist/doc/latex/circuit-macros/doc/md.tex
  texmf-dist/doc/latex/circuit-macros/doc/mplex.m4
  texmf-dist/doc/latex/circuit-macros/doc/oax.m4
  texmf-dist/doc/latex/circuit-macros/doc/oaxbody.m4
  texmf-dist/doc/latex/circuit-macros/doc/quick.m4
+ texmf-dist/doc/latex/circuit-macros/doc/relaycoil.m4
  texmf-dist/doc/latex/circuit-macros/doc/stringdims.m4
  texmf-dist/doc/latex/circuit-macros/doc/test.tex
  texmf-dist/doc/latex/circuit-macros/doc/thyristor.m4
- texmf-dist/doc/latex/circuit-macros/doc/tran.m4
- texmf-dist/doc/latex/circuit-macros/doc/tran.tex
  texmf-dist/doc/latex/circuit-macros/doc/tranbody.m4
  texmf-dist/doc/latex/circuit-macros/doc/ujt.m4
  texmf-dist/doc/latex/circuit-macros/doc/woodchips.m4
@@ -48348,30 +48349,45 @@ docfiles size=1118
  texmf-dist/doc/latex/circuit-macros/examples/ABlogix.m4
  texmf-dist/doc/latex/circuit-macros/examples/Adder.m4
  texmf-dist/doc/latex/circuit-macros/examples/Alogix.m4
+ texmf-dist/doc/latex/circuit-macros/examples/AmpTable.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Antennas.m4
+ texmf-dist/doc/latex/circuit-macros/examples/AntiqueClock.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Audio.m4
  texmf-dist/doc/latex/circuit-macros/examples/Autologix.m4
  texmf-dist/doc/latex/circuit-macros/examples/Ball.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Bip.m4
  texmf-dist/doc/latex/circuit-macros/examples/Blogix.m4
  texmf-dist/doc/latex/circuit-macros/examples/Btree.m4
  texmf-dist/doc/latex/circuit-macros/examples/Buttons.m4
  texmf-dist/doc/latex/circuit-macros/examples/Byte.m4
  texmf-dist/doc/latex/circuit-macros/examples/CSlight.m4
  texmf-dist/doc/latex/circuit-macros/examples/CanLogic.m4
+ texmf-dist/doc/latex/circuit-macros/examples/CctTable.m4
  texmf-dist/doc/latex/circuit-macros/examples/Ccurve.m4
  texmf-dist/doc/latex/circuit-macros/examples/Chuck.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Conn.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Contact.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Contacts.m4
  texmf-dist/doc/latex/circuit-macros/examples/Counting.m4
  texmf-dist/doc/latex/circuit-macros/examples/Crossbar.m4
  texmf-dist/doc/latex/circuit-macros/examples/Crow.m4
  texmf-dist/doc/latex/circuit-macros/examples/Cruller.m4
  texmf-dist/doc/latex/circuit-macros/examples/Csource.m4
  texmf-dist/doc/latex/circuit-macros/examples/Decoder.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Demultiplexer.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Dini.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Diodes.m4
  texmf-dist/doc/latex/circuit-macros/examples/Drive.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Emarrows.m4
  texmf-dist/doc/latex/circuit-macros/examples/Escher.m4
  texmf-dist/doc/latex/circuit-macros/examples/Euro.m4
  texmf-dist/doc/latex/circuit-macros/examples/Floor.m4
  texmf-dist/doc/latex/circuit-macros/examples/Flow.m4
  texmf-dist/doc/latex/circuit-macros/examples/FlowchartDefs.m4
- texmf-dist/doc/latex/circuit-macros/examples/GnuMakefile
+ texmf-dist/doc/latex/circuit-macros/examples/Fuses.m4
  texmf-dist/doc/latex/circuit-macros/examples/GrayCode.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Grounds.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Headers.m4
  texmf-dist/doc/latex/circuit-macros/examples/Heathkit.m4
  texmf-dist/doc/latex/circuit-macros/examples/I2L.m4
  texmf-dist/doc/latex/circuit-macros/examples/IC10107.m4
@@ -48380,37 +48396,52 @@ docfiles size=1118
  texmf-dist/doc/latex/circuit-macros/examples/Incl.pdf
  texmf-dist/doc/latex/circuit-macros/examples/Incleps.m4
  texmf-dist/doc/latex/circuit-macros/examples/Inclpdf.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Jack.m4
  texmf-dist/doc/latex/circuit-macros/examples/Koch.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Logic.m4
  texmf-dist/doc/latex/circuit-macros/examples/Loglog.m4
  texmf-dist/doc/latex/circuit-macros/examples/MC.m4
  texmf-dist/doc/latex/circuit-macros/examples/Makefile
  texmf-dist/doc/latex/circuit-macros/examples/Mixer.m4
- texmf-dist/doc/latex/circuit-macros/examples/MosfetElements.m4
  texmf-dist/doc/latex/circuit-macros/examples/MotorControl.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Multiplexer.m4
+ texmf-dist/doc/latex/circuit-macros/examples/NLG.m4
+ texmf-dist/doc/latex/circuit-macros/examples/NPDT.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Nport.m4
  texmf-dist/doc/latex/circuit-macros/examples/OpAmpFilter.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Opamp.m4
  texmf-dist/doc/latex/circuit-macros/examples/Optoiso.m4
  texmf-dist/doc/latex/circuit-macros/examples/Orbits.m4
  texmf-dist/doc/latex/circuit-macros/examples/PPA.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Pconn.m4
  texmf-dist/doc/latex/circuit-macros/examples/Planes.m4
  texmf-dist/doc/latex/circuit-macros/examples/PushPull.m4
  texmf-dist/doc/latex/circuit-macros/examples/Quantum.m4
  texmf-dist/doc/latex/circuit-macros/examples/README-examples
  texmf-dist/doc/latex/circuit-macros/examples/Rectifiers.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Relay.m4
  texmf-dist/doc/latex/circuit-macros/examples/Resolver.m4
  texmf-dist/doc/latex/circuit-macros/examples/Rotbox.m4
  texmf-dist/doc/latex/circuit-macros/examples/SPM.m4
  texmf-dist/doc/latex/circuit-macros/examples/SQUID.m4
  texmf-dist/doc/latex/circuit-macros/examples/Schottky.m4
  texmf-dist/doc/latex/circuit-macros/examples/Shaky.m4
+ texmf-dist/doc/latex/circuit-macros/examples/ShiftR.m4
  texmf-dist/doc/latex/circuit-macros/examples/Sierpinski.m4
  texmf-dist/doc/latex/circuit-macros/examples/Sixpole.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Sources.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Switches.m4
  texmf-dist/doc/latex/circuit-macros/examples/TTLnand.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Tgate.m4
  texmf-dist/doc/latex/circuit-macros/examples/Three.m4
  texmf-dist/doc/latex/circuit-macros/examples/Timer.m4
  texmf-dist/doc/latex/circuit-macros/examples/Ttree.m4
  texmf-dist/doc/latex/circuit-macros/examples/Tubediags.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Variable.m4
  texmf-dist/doc/latex/circuit-macros/examples/Wheat.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Windings.m4
  texmf-dist/doc/latex/circuit-macros/examples/XOR.m4
+ texmf-dist/doc/latex/circuit-macros/examples/Xform.m4
  texmf-dist/doc/latex/circuit-macros/examples/Zcos.m4
  texmf-dist/doc/latex/circuit-macros/examples/birds.m4
  texmf-dist/doc/latex/circuit-macros/examples/bistable.m4
@@ -48419,7 +48450,6 @@ docfiles size=1118
  texmf-dist/doc/latex/circuit-macros/examples/clock.m4
  texmf-dist/doc/latex/circuit-macros/examples/control.m4
  texmf-dist/doc/latex/circuit-macros/examples/csc.m4
- texmf-dist/doc/latex/circuit-macros/examples/darrows.m4
  texmf-dist/doc/latex/circuit-macros/examples/debug1.tex
  texmf-dist/doc/latex/circuit-macros/examples/debug2.m4
  texmf-dist/doc/latex/circuit-macros/examples/diamond.m4
@@ -48430,7 +48460,6 @@ docfiles size=1118
  texmf-dist/doc/latex/circuit-macros/examples/ex04.m4
  texmf-dist/doc/latex/circuit-macros/examples/ex05.m4
  texmf-dist/doc/latex/circuit-macros/examples/ex06.m4
- texmf-dist/doc/latex/circuit-macros/examples/ex07.m4
  texmf-dist/doc/latex/circuit-macros/examples/ex08.m4
  texmf-dist/doc/latex/circuit-macros/examples/ex09.m4
  texmf-dist/doc/latex/circuit-macros/examples/ex10.m4
@@ -48444,6 +48473,7 @@ docfiles size=1118
  texmf-dist/doc/latex/circuit-macros/examples/examples.pdf
  texmf-dist/doc/latex/circuit-macros/examples/examples.tex
  texmf-dist/doc/latex/circuit-macros/examples/exp.m4
+ texmf-dist/doc/latex/circuit-macros/examples/fet.m4
  texmf-dist/doc/latex/circuit-macros/examples/files.tex
  texmf-dist/doc/latex/circuit-macros/examples/graysurf.m4
  texmf-dist/doc/latex/circuit-macros/examples/header.tex
@@ -48455,24 +48485,22 @@ docfiles size=1118
  texmf-dist/doc/latex/circuit-macros/examples/mf/cct.tfm
  texmf-dist/doc/latex/circuit-macros/examples/mf/font.m4
  texmf-dist/doc/latex/circuit-macros/examples/mf/mftest
- texmf-dist/doc/latex/circuit-macros/examples/mode.tex
  texmf-dist/doc/latex/circuit-macros/examples/mpost/Makefile
  texmf-dist/doc/latex/circuit-macros/examples/mpost/README-mpost
  texmf-dist/doc/latex/circuit-macros/examples/mpost/examplesmpost.tex
  texmf-dist/doc/latex/circuit-macros/examples/mpost/mptest
  texmf-dist/doc/latex/circuit-macros/examples/mpost/tstmpost.tex
+ texmf-dist/doc/latex/circuit-macros/examples/odistmakefile
  texmf-dist/doc/latex/circuit-macros/examples/person.m4
- texmf-dist/doc/latex/circuit-macros/examples/pgf/Makefile
- texmf-dist/doc/latex/circuit-macros/examples/pgf/README-pgf
- texmf-dist/doc/latex/circuit-macros/examples/pgf/examplespgf.tex
- texmf-dist/doc/latex/circuit-macros/examples/pgf/tstpgf.tex
  texmf-dist/doc/latex/circuit-macros/examples/psfrag/Makefile
  texmf-dist/doc/latex/circuit-macros/examples/psfrag/README-psfrag.txt
  texmf-dist/doc/latex/circuit-macros/examples/psfrag/examplespsfrag.tex
  texmf-dist/doc/latex/circuit-macros/examples/psfrag/tstpsfrag.tex
  texmf-dist/doc/latex/circuit-macros/examples/pwrsupply.m4
+ texmf-dist/doc/latex/circuit-macros/examples/quick.m4
  texmf-dist/doc/latex/circuit-macros/examples/random.m4
  texmf-dist/doc/latex/circuit-macros/examples/recycle.m4
+ texmf-dist/doc/latex/circuit-macros/examples/relaycoil.m4
  texmf-dist/doc/latex/circuit-macros/examples/rose.m4
  texmf-dist/doc/latex/circuit-macros/examples/rotate.tex
  texmf-dist/doc/latex/circuit-macros/examples/rotatetext.m4
@@ -48486,6 +48514,7 @@ docfiles size=1118
  texmf-dist/doc/latex/circuit-macros/examples/svg/AlogixSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/AmpTableSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/AntennasSVG.m4
+ texmf-dist/doc/latex/circuit-macros/examples/svg/AntiqueClockSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/AudioSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/Banking.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/BipSVG.m4
@@ -48495,6 +48524,8 @@ docfiles size=1118
  texmf-dist/doc/latex/circuit-macros/examples/svg/CanLogicSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/CctTableSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/ConnSVG.m4
+ texmf-dist/doc/latex/circuit-macros/examples/svg/ContactSVG.m4
+ texmf-dist/doc/latex/circuit-macros/examples/svg/ContactsSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/CountingSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/CrossbarSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/CrowSVG.m4
@@ -48502,6 +48533,7 @@ docfiles size=1118
  texmf-dist/doc/latex/circuit-macros/examples/svg/CsourceSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/DecoderSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/DemultiplexerSVG.m4
+ texmf-dist/doc/latex/circuit-macros/examples/svg/DiniSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/DiodesSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/DriveSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/EmarrowsSVG.m4
@@ -48586,6 +48618,7 @@ docfiles size=1118
  texmf-dist/doc/latex/circuit-macros/examples/svg/quickSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/randomSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/recycleSVG.m4
+ texmf-dist/doc/latex/circuit-macros/examples/svg/relaycoilSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/roseSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/sfgSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/shapesSVG.m4
@@ -48593,13 +48626,14 @@ docfiles size=1118
  texmf-dist/doc/latex/circuit-macros/examples/svg/tstSVG.htmx
  texmf-dist/doc/latex/circuit-macros/examples/svg/ujtSVG.m4
  texmf-dist/doc/latex/circuit-macros/examples/svg/wormSVG.m4
- texmf-dist/doc/latex/circuit-macros/examples/svg/xx.html
  texmf-dist/doc/latex/circuit-macros/examples/test.m4
  texmf-dist/doc/latex/circuit-macros/examples/testpdf.tex
+ texmf-dist/doc/latex/circuit-macros/examples/thyristor.m4
  texmf-dist/doc/latex/circuit-macros/examples/tikz.tex
  texmf-dist/doc/latex/circuit-macros/examples/tst.tex
  texmf-dist/doc/latex/circuit-macros/examples/tst1.tex
  texmf-dist/doc/latex/circuit-macros/examples/tubedefs.m4
+ texmf-dist/doc/latex/circuit-macros/examples/ujt.m4
  texmf-dist/doc/latex/circuit-macros/examples/windows.m4
  texmf-dist/doc/latex/circuit-macros/examples/worm.m4
  texmf-dist/doc/latex/circuit-macros/examples/xfig/Makefile
@@ -48622,11 +48656,11 @@ runfiles size=1
  texmf-dist/tex/latex/circuit-macros/boxdims.sty
 catalogue-also circ circuitikz
 catalogue-contact-home https://ece.uwaterloo.ca/~aplevich/Circuit_macros/
-catalogue-contact-repository https://ece.uwaterloo.ca/~aplevich/Circuit_macros/
+catalogue-contact-repository https://gitlab.com/aplevich/circuit_macros
 catalogue-ctan /graphics/circuit_macros
-catalogue-license lppl
+catalogue-license lppl1.3c
 catalogue-topics diagram-circ electronic
-catalogue-version 9.1
+catalogue-version 9.2
 
 name circuitikz
 category Package
@@ -111824,15 +111858,16 @@ catalogue-version 0.5
 
 name ghsystem
 category Package
-revision 53440
+revision 53822
 shortdesc Globally harmonised system of chemical (etc) naming
 longdesc The package provides the means to typeset all the hazard and
 longdesc precautionary statements and pictograms in a straightforward
 longdesc way. The statements are taken from EU regulation 1272/2008.
-docfiles size=197
+docfiles size=200
  texmf-dist/doc/latex/ghsystem/README details="Readme"
- texmf-dist/doc/latex/ghsystem/ghsystem_en.pdf details="Package documentation"
- texmf-dist/doc/latex/ghsystem/ghsystem_en.tex
+ texmf-dist/doc/latex/ghsystem/ghsystem-manual.cls
+ texmf-dist/doc/latex/ghsystem/ghsystem-manual.pdf details="Package documentation"
+ texmf-dist/doc/latex/ghsystem/ghsystem-manual.tex
 runfiles size=1491
  texmf-dist/tex/latex/ghsystem/ghsystem.sty
  texmf-dist/tex/latex/ghsystem/language/ghsystem_english.def
@@ -112000,7 +112035,7 @@ catalogue-contact-repository https://github.com/cgnieder/ghsystem/
 catalogue-ctan /macros/latex/contrib/ghsystem
 catalogue-license lppl1.3
 catalogue-topics chemistry expl3
-catalogue-version 4.8b
+catalogue-version 4.8c
 
 name gillcm
 category Package
@@ -160756,7 +160791,7 @@ catalogue-version 20200209.0
 
 name luatexko
 category Package
-revision 53001
+revision 53824
 shortdesc Typeset Korean with Lua(La)TeX
 longdesc This is a Lua(La)TeX macro package that supports typesetting
 longdesc Korean documents including Old Hangul texts. As LuaTeX has
@@ -160766,12 +160801,12 @@ longdesc package rather than other Hangul macros operating on other
 longdesc engines. LuaTeX version 1.10+ and luaotfload version 2.96+ are
 longdesc required for this package to run. This package also requires
 longdesc the cjk-ko package for its full functionality.
-docfiles size=83
+docfiles size=91
  texmf-dist/doc/luatex/luatexko/ChangeLog
  texmf-dist/doc/luatex/luatexko/README details="Readme"
  texmf-dist/doc/luatex/luatexko/luatexko-doc.pdf details="Package documentation"
  texmf-dist/doc/luatex/luatexko/luatexko-doc.tex
-runfiles size=29
+runfiles size=30
  texmf-dist/tex/luatex/luatexko/luatexko-normalize.lua
  texmf-dist/tex/luatex/luatexko/luatexko-uhc2utf8.lua
  texmf-dist/tex/luatex/luatexko/luatexko.lua
@@ -160810,7 +160845,7 @@ catalogue-version 1.0.1
 
 name luatodonotes
 category Package
-revision 45454
+revision 53825
 shortdesc Add editing annotations in a LuaLaTeX document
 longdesc The package allows the user to insert comments into a document
 longdesc that suggest (for example) further editing that may be needed.
@@ -160819,13 +160854,13 @@ longdesc different styles for the comments may be used; the styles are
 longdesc selected using package options. The package is based on the
 longdesc package todonotes, and depends heavily on Lua, so it can only
 longdesc be used with LuaLaTeX.
-docfiles size=53
+docfiles size=54
  texmf-dist/doc/lualatex/luatodonotes/README.md details="Readme"
  texmf-dist/doc/lualatex/luatodonotes/luatodonotes.pdf details="Package documentation"
 srcfiles size=22
  texmf-dist/source/lualatex/luatodonotes/luatodonotes.dtx
  texmf-dist/source/lualatex/luatodonotes/luatodonotes.ins
-runfiles size=34
+runfiles size=35
  texmf-dist/tex/lualatex/luatodonotes/inspect.lua
  texmf-dist/tex/lualatex/luatodonotes/luatodonotes.lua
  texmf-dist/tex/lualatex/luatodonotes/luatodonotes.sty
@@ -160837,7 +160872,7 @@ catalogue-contact-repository https://github.com/fabianlipp/luatodonotes
 catalogue-ctan /macros/luatex/latex/luatodonotes
 catalogue-license lppl1.2
 catalogue-topics notes editorial luatex use-lua
-catalogue-version 0.4
+catalogue-version 0.5
 
 name luavlna
 category Package
@@ -221669,7 +221704,7 @@ catalogue-topics format japanese
 
 name ptex-fontmaps
 category Package
-revision 51023
+revision 53823
 shortdesc Font maps and configuration tools for Japanese/Chinese/Korean fonts with (u)ptex
 longdesc This package provides font maps and setup tools for Japanese,
 longdesc Korean, Traditional Chinese, and Simplified Chinese. It is the
@@ -221681,12 +221716,14 @@ depend arphic-ttf
 depend baekmuk
 depend ipaex
 depend ptex-fontmaps.ARCH
-docfiles size=7
+docfiles size=55
  texmf-dist/doc/fonts/ptex-fontmaps/README details="Readme"
  texmf-dist/doc/fonts/ptex-fontmaps/examples/otf-sample-04.tex
  texmf-dist/doc/fonts/ptex-fontmaps/examples/otf-sample.tex
  texmf-dist/doc/fonts/ptex-fontmaps/examples/ptex-sample.tex
  texmf-dist/doc/fonts/ptex-fontmaps/examples/series-compare.tex
+ texmf-dist/doc/fonts/ptex-fontmaps/kanji-config-updmap.pdf
+ texmf-dist/doc/fonts/ptex-fontmaps/kanji-config-updmap.tex
 srcfiles size=250
  texmf-dist/source/ptex-fontmaps/jis04cmap_exp/JISX0213-2004-H
  texmf-dist/source/ptex-fontmaps/jis04cmap_exp/JISX0213-2004-V
@@ -221699,7 +221736,7 @@ srcfiles size=250
  texmf-dist/source/ptex-fontmaps/jis04cmap_exp/jisx0213-2004-8bit-std.txt
  texmf-dist/source/ptex-fontmaps/jis04cmap_exp/mk_jis_to_aj16_cid.lua
  texmf-dist/source/ptex-fontmaps/script/updmap-otf.sh
-runfiles size=235
+runfiles size=241
  texmf-dist/fonts/cmap/ptex-fontmaps/2004-H
  texmf-dist/fonts/cmap/ptex-fontmaps/2004-V
  texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/adobe/otf-ko-adobe.map
@@ -221738,6 +221775,12 @@ runfiles size=235
  texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/fandol/uptex-sc-fandol.map
  texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/founder/otf-sc-founder.map
  texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/founder/uptex-sc-founder.map
+ texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/otf-haranoaji.map
+ texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/otf-up-haranoaji.map
+ texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/ptex-haranoaji-04.map
+ texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/ptex-haranoaji.map
+ texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/uptex-haranoaji-04.map
+ texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/uptex-haranoaji.map
  texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-pron/otf-hiragino-pron.map
  texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-pron/otf-up-hiragino-pron.map
  texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-pron/ptex-hiragino-pron-04.map
@@ -221909,7 +221952,7 @@ catalogue-contact-repository https://github.com/texjporg/jfontmaps
 catalogue-ctan /fonts/ptex-fontmaps
 catalogue-license pdgpl3
 catalogue-topics font-use japanese chinese korean
-catalogue-version 20190506.0
+catalogue-version 20200217.0
 
 name ptex-fontmaps.aarch64-linux
 category Package
@@ -259990,7 +260033,7 @@ docfiles size=572
 
 name texlive-docindex
 category TLCore
-revision 53788
+revision 53819
 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
@@ -261034,7 +261077,7 @@ docfiles size=292
 
 name texlive.infra
 category TLCore
-revision 53806
+revision 53820
 shortdesc basic TeX Live infrastructure
 longdesc This package contains the files needed to get tlmgr running:
 longdesc perl modules, xz binaries, plus (sometimes) tar, wget, lz4, and
@@ -261083,7 +261126,7 @@ docfiles size=137
  texmf-dist/scripts/texlive/NEWS
  tlpkg/README
  tlpkg/installer/COPYING.MinGW-runtime.txt
-runfiles size=258
+runfiles size=257
  LICENSE.CTAN
  LICENSE.TL
  release-texlive.txt
@@ -289512,7 +289555,7 @@ catalogue-topics font-supp xetex
 
 name xetexko
 category Package
-revision 53002
+revision 53826
 shortdesc Typeset Korean with Xe(La)TeX
 longdesc The package supports typesetting Korean documents (including
 longdesc old Hangul texts), using XeTeX. It enhances the existing