circuit-macros (3jan21)

git-svn-id: svn://tug.org/texlive/trunk@57308 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2021-01-03 22:28:40 +0000
committer: Karl Berry <karl@freefriends.org> 2021-01-03 22:28:40 +0000
commit: c2bba0f0e98daeca2063914b65825d9ca50bca91 (patch)
tree: 231f1f86795132fe089424c96d0aba4b87047d8d
parent: 54acbdb8e89ca53284132a35b803929d6e88e43a (diff)
39 files changed, 48 insertions, 2558 deletions
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/CHANGES b/Master/texmf-dist/doc/latex/circuit-macros/CHANGES
index 1f84acc33b1..3d78630bf70 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/CHANGES
+++ b/Master/texmf-dist/doc/latex/circuit-macros/CHANGES
@@ -1,5 +1,6 @@
 CHANGES
 
+Version 9.5: Distribution cleaned and a non utf-8 character removed.
 Version 9.4: Changes to examples and additional SVG examples. New
   macros RightAngle, PerpTo, langle, ArcAngle, DCsymbol.  Rewritten
   arrester macro. Tweaked Equidist3, ground, antenna, NeedDpicTools.
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/Copying b/Master/texmf-dist/doc/latex/circuit-macros/Copying
index 1c8e4d1950e..26840bdaefe 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/Copying
+++ b/Master/texmf-dist/doc/latex/circuit-macros/Copying
@@ -1,4 +1,4 @@
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under      *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under      *
 * the LaTeX Project Public Licence in file Licence.txt. The files of       *
 * this distribution may be redistributed or modified provided that this    *
 * copyright notice is included and provided that modifications are clearly *
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/README b/Master/texmf-dist/doc/latex/circuit-macros/README
index 1ae81ea52ef..1da33f0aa03 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/README
+++ b/Master/texmf-dist/doc/latex/circuit-macros/README
@@ -1,5 +1,5 @@
 
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under      *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under      *
 * the LaTeX Project Public Licence in file Licence.txt. The files of       *
 * this distribution may be redistributed or modified provided that this    *
 * copyright notice is included and provided that modifications are clearly *
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/darrow.m4 b/Master/texmf-dist/doc/latex/circuit-macros/darrow.m4
index 44da3b45da4..c3183ccd2c6 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/darrow.m4
+++ b/Master/texmf-dist/doc/latex/circuit-macros/darrow.m4
@@ -1,7 +1,7 @@
 divert(-1)
   darrow.m4                     Macros for double lines and arrows
 
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under      *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under      *
 * the LaTeX Project Public Licence in file Licence.txt. The files of       *
 * this distribution may be redistributed or modified provided that this    *
 * copyright notice is included and provided that modifications are clearly *
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/doc/Circuit_macros.pdf b/Master/texmf-dist/doc/latex/circuit-macros/doc/Circuit_macros.pdf
index 6e50fe8ba6d..a9c34834cec 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/doc/Circuit_macros.pdf
+++ b/Master/texmf-dist/doc/latex/circuit-macros/doc/Circuit_macros.pdf
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/doc/Circuit_macros.tex b/Master/texmf-dist/doc/latex/circuit-macros/doc/Circuit_macros.tex
index 49e6570970b..fcd9e09fa69 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/doc/Circuit_macros.tex
+++ b/Master/texmf-dist/doc/latex/circuit-macros/doc/Circuit_macros.tex
@@ -58,6 +58,8 @@
 \let\@@tmp\@svsec\def\@svsec{\llap{\@@tmp}}%
 }}
 
+\renewcommand\contentsname{Contents, \Version}
+
 \makeatother
 
 \hypersetup{
@@ -70,11 +72,17 @@
 \begin{document}
 \title{M4 Macros for Electric Circuit Diagrams in \LaTeX\ Documents}
 \author{Dwight Aplevich}
+\enlargethispage{\baselineskip}
 \date{%
-\input Version
+%\input Version
 \vspace*{-\baselineskip}
 }
 \maketitle
+% \pdfbookmark[section]{\contentsname}{toc}
+  \pdfbookmark[section]{Contents}{toc}
+\begin{multicols}{2}
+  \tableofcontents
+\end{multicols}
 
 \input body
 
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/doc/Makefile b/Master/texmf-dist/doc/latex/circuit-macros/doc/Makefile
index fb7ed9bc933..1abd51504e7 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/doc/Makefile
+++ b/Master/texmf-dist/doc/latex/circuit-macros/doc/Makefile
@@ -67,7 +67,7 @@ M4LIBS = $(MODE).m4
 $(DOC).pdf:
 	touch mode.tex
 	-if grep -q tikz mode.tex ; then true ; else \
-           make clean ; printf "\\usepackage{tikz}\n" > mode.tex ; fi
+           rm mode.tex; make MODE=tikz clean mode.tex ; fi
 	make MODE=pgf PIC="dpic -g" LATEX=pdflatex SFX=pdf \
          POST="; printf '\\\\vspace*{-0.5\\\\baselineskip}\\n'" \
          $(DOC).pdf
@@ -113,6 +113,8 @@ mode.tex:
 	-if test "$(MODE)" = "pstricks" ; then \
 	printf "\\usepackage{pstricks}\n" > mode.tex ; else \
 	printf "\\usepackage{tikz}\n" > mode.tex ; fi
+	printf "\\def\\Version{" >> mode.tex
+	sed -e 's/$$/}/' Version.tex >> mode.tex
 
 heading.tex:
 	printf '\\documentclass{article}\n' > heading.tex
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/doc/Version.tex b/Master/texmf-dist/doc/latex/circuit-macros/doc/Version.tex
index 9d14ec204ed..ccce7cfa86c 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/doc/Version.tex
+++ b/Master/texmf-dist/doc/latex/circuit-macros/doc/Version.tex
@@ -1 +1 @@
-Version 9.4
+Version 9.5
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/doc/body.tex b/Master/texmf-dist/doc/latex/circuit-macros/doc/body.tex
index ac8db93ef50..0afb23e5be5 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/doc/body.tex
+++ b/Master/texmf-dist/doc/latex/circuit-macros/doc/body.tex
@@ -41,10 +41,10 @@
 %
 \newcommand{\Example}[1]{\vspace{\parsep}\noindent {\bf Example #1:}}
 %
-  \pdfbookmark[section]{\contentsname}{toc}
-\begin{multicols}{2}
-  \tableofcontents
-\end{multicols}
+%  \pdfbookmark[section]{\contentsname}{toc}
+%\begin{multicols}{2}
+%  \tableofcontents
+%\end{multicols}
 %
 \xection{Introduction\label{Introduction:}}
    \begin{quotation}\noindent
@@ -55,10 +55,8 @@
    gratifying to try with a computer~\cite{Landauer95}.
    \end{quotation}
 
-This manual
-%\footnote{%
-%This manual is best viewed with a reader that shows bookmarks
-%for easy navigation and for exploring the list of defined macros.}%
+This manual\footnote{%
+This document is best displayed with a reader that shows bookmarks.}
 describes a method for drawing electric circuits and
 other diagrams in \latex and web documents.
 The diagrams are defined in the simple \pic drawing language~\cite{KRpic}
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/dpictools.pic b/Master/texmf-dist/doc/latex/circuit-macros/dpictools.pic
index 008360f9a45..0afd517ce71 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/dpictools.pic
+++ b/Master/texmf-dist/doc/latex/circuit-macros/dpictools.pic
@@ -3,7 +3,7 @@
 # m4 macro NeedDpicTools or the pic statement copy "HOMELIB_/dpictools.pic"
 # when HOMELIB_ is defined or, generically, copy "<path>dpictools.pic"
 
-# Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under      #
+# Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under      #
 # the LaTeX Project Public Licence in file Licence.txt. The files of       #
 # this distribution may be redistributed or modified provided that this    #
 # copyright notice is included and provided that modifications are clearly #
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/examples.pdf b/Master/texmf-dist/doc/latex/circuit-macros/examples/examples.pdf
index a2f15a2c9a7..e658c456a03 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/examples/examples.pdf
+++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/examples.pdf
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/mf/cct.mf b/Master/texmf-dist/doc/latex/circuit-macros/examples/mf/cct.mf
index e28b40c9f90..e523a753e2c 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/examples/mf/cct.mf
+++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/mf/cct.mf
@@ -1,5 +1,5 @@
 % cct.mf, generated by Mfpic, v1.10 2012/12/03,
-% from TeX source "font" on 2020/12/20 at 17:40
+% from TeX source "font" on 2021/01/03 at 16:42
 numeric mfpicversion; mfpicversion := 110;
 if unknown mode: mode := localfont; fi
 if unknown mag: mag := 1000/1000; fi
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/Makefile b/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/Makefile
deleted file mode 100644
index b2132e1ee89..00000000000
--- a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-LIBDIR = $$HOME/lib
-M4LIBS = svg.m4 SVGconfig.m4
-M4LIBS = svg.m4
-
-# To process a single file, copy it to test.m4 and type "make tst"
-# to produce tstSVG.html
-
-DPIC = dpic
-#DPIC = $$HOME/dpic/build/p2c/ftp/dpic
-#DPIC = ../../../dpic/build/p2c/ftp/dpic
-#DPIC = ../../../dpic/bison/dpic
-#DPIC = ../../../dpic/bdev/dpic
-
-# To test the Windows executable.  Change these as needed for the operating
-# system.  NOTE: AntiqueClockSVG.m4 and Connectors.m4 use awk and sed which
-# do not work at present with the Windows version.
-# M4LIBS = svg.m4 windows.m4
-# DPIC = ../../../dpic/bison/distsrc/Windows/dpic
-
-.SUFFIXES: .pic .svg .m4
-.pic.svg:
-	$(DPIC) -v $*.pic > $*.svg
-	grep '<\!-- width' $*.svg | sed -e 's%<\!-- *%%' -e 's% *-->%%' > $*.siz
-.m4.svg:
-	m4 $(M4LIBS) $*.m4 | sed -e '/^\%/d' > $*.pic
-	$(DPIC) -v $*.pic > $*.svg
-	grep '<\!-- width' $*.svg | sed -e 's%<\!-- *%%' -e 's% *-->%%' > $*.siz
-
-PAGES = examples_1.svg
-
-examplesSVG.html: examplesSVG.htmx pages
-	Version=`sed -e 's/Version //' $(LIBDIR)/doc/Version.tex` ; \
-      sed -e 's/Version XXX/Version '$$Version'/' examplesSVG.htmx \
-      | m4 > examplesSVG.html
-
-pages:
-	(cd .. ; make )
-	cp ../examples.pdf .
-	pdf2svg examples.pdf
-	touch pages
-
-SED = sed -e '/^\%/d'
-TEST = test
-tst:
-	if test -f test.pic; then printf "\n\nUsage: make clean tst\n\n"; exit 1; fi
-	m4 $(M4LIBS) test.m4 | $(SED) > test.pic
-	$(DPIC) -v $(TEST).pic > $(TEST).svg
-	m4 $(M4LIBS) $(TEST).m4 | $(SED) > $(TEST).pic
-	$(DPIC) -v $(TEST).pic > $(TEST).svg
-	grep '<\!-- width' $(TEST).svg | sed -e 's%<\!-- *%%' -e 's% *-->%%' \
-     > $(TEST).siz
-	make tstSVG.html
-
-test.pic:
-	if test -f test.pic ; then echo "Usage: make clean tst" ; fi
-	m4 $(M4LIBS) test.m4 | $(SED) > test.pic
-	m4 $(M4LIBS) test.m4 | $(SED) > test.pic
-
-tstSVG.html: tstSVG.htmx $(TEST).svg
-	Version=`sed -e 's/Version //' $(LIBDIR)/doc/Version.tex` ; \
-      sed -e 's/Version XXX/Version '$$Version'/' \
-          -e 's/XXXXX/'$(TEST)'/g' \
-      tstSVG.htmx | m4 > tstSVG.html
-#	cp tstSVG.html $(TEST) $$HOME/public_html/svg
-
-xst: Incleps.png
-
-AntiqueClockSVG.svg ConnectorsSVG.svg:
-	m4 $(M4LIBS) $*.m4 | sed -e '/^\%/d' > $*.pic
-	$(DPIC) -v $*.pic > $*.svg
-	m4 $(M4LIBS) $*.m4 | sed -e '/^\%/d' > $*.pic
-	$(DPIC) -v $*.pic > $*.svg
-	grep '<\!-- width' $*.svg | sed -e 's%<\!-- *%%' -e 's% *-->%%' > $*.siz
-
-InclepsSVG.svg: InclepsSVG.m4
-	m4 $(M4LIBS) $*.m4 | sed -e '/^\%/d' > $*.pic
-	$(DPIC) -v $*.pic > $*.svg
-	$(DPIC) -v $*.pic > $*.svg
-
-Incleps.png:
-	(cd ..; make Incleps.png); cp ../Incleps.png .
-
-clean:
-	@printf "\n svg clean:\n"
-	rm -f *.svg *.dim *.ps *log *.siz *.pic examplesSVG.html Incleps.png
-	rm -f tstSVG.html copy_tmp__
-	rm -f pages
-	@printf "\n"
-
-clobber: clean
-	(cd dev; make clobber)
-	rm -f test.m4
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/F_test.tex b/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/F_test.tex
deleted file mode 100644
index 68098bbf3ab..00000000000
--- a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/F_test.tex
+++ /dev/null
@@ -1,5 +0,0 @@
-\documentclass[crop,tikz,multi=false]{standalone}
-\usepackage{boxdims,siunitx,amssymb}
-\begin{document}
-\input test.tex
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/Makefile b/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/Makefile
deleted file mode 100644
index cdc126d8bd8..00000000000
--- a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-LIBDIR = $$HOME/lib
-M4LIBS = pgf.m4
-M4 = m4
-
-# To process a single file, copy it to test.m4 and type "make tst"
-# to produce tstSVG.html
-
-DPIC = dpic
-#DPIC = $$HOME/dpic/build/p2c/ftp/dpic
-#DPIC = $$HOME/dpic/build/p2c/ftp/dpic
-#DPIC = $$HOME/dpic/bison/dpic
-#DPIC = $$HOME/dpic/bdev/dpic
-
-.SUFFIXES: .pic .svg .m4 .pdf
-.pic.svg:
-	$(DPIC) -v $*.pic > $*.svg
-	grep '<\!-- width' $*.svg | sed -e 's%<\!-- *%%' -e 's% *-->%%' > $*.siz
-.m4.svg:
-	touch F_$*.dim
-	$(M4) pgf.m4 F_$*.dim $*.m4 > $*.pic
-	$(DPIC) -g $*.pic >> $*.tex
-	echo "\documentclass[crop,tikz,multi=false]{standalone}" > F_$*.tex
-	echo "\usepackage{boxdims,siunitx,amssymb}" >> F_$*.tex
-	echo "\begin{document}" >> F_$*.tex
-	echo "\input $*.tex" >> F_$*.tex
-	echo "\end{document}" >> F_$*.tex
-	pdflatex --quiet F_$*
-	$(M4) pgf.m4 F_$*.dim $*.m4 > $*.pic
-	$(DPIC) -g $*.pic >> $*.tex
-	pdflatex --quiet F_$*
-	pdf2svg F_$*.pdf $*.svg
-	rm -f F_$**
-.m4.pdf:
-	touch F_$*.dim
-	$(M4) pgf.m4 F_$*.dim $*.m4 > $*.pic
-	$(DPIC) -g $*.pic >> $*.tex
-	echo "\documentclass[crop,tikz,multi=false]{standalone}" > F_$*.tex
-	echo "\usepackage{boxdims,siunitx,amssymb}" >> F_$*.tex
-	echo "\begin{document}" >> F_$*.tex
-	echo "\input $*.tex" >> F_$*.tex
-	echo "\end{document}" >> F_$*.tex
-	pdflatex --quiet F_$*
-	$(M4) pgf.m4 F_$*.dim $*.m4 > $*.pic
-	$(DPIC) -g $*.pic >> $*.tex
-	pdflatex --quiet F_$*
-	mv F_$*.pdf $*.pdf
-
-examplesSVG.html: examplesSVG.htmx pages
-	Version=`sed -e 's/Version //' $(LIBDIR)/doc/Version.tex` ; \
-      sed -e 's/Version XXX/Version '$$Version'/' examplesSVG.htmx \
-      | m4 > examplesSVG.html
-
-SED = sed -e '/^\%/d'
-TEST = test
-tst:
-	if test -f test.pic; then printf "\n\nUsage: make clean tst\n\n"; exit 1; fi
-	m4 $(M4LIBS) test.m4 | $(SED) > test.pic
-	$(DPIC) -v $(TEST).pic > $(TEST).svg
-	m4 $(M4LIBS) $(TEST).m4 | $(SED) > $(TEST).pic
-	$(DPIC) -v $(TEST).pic > $(TEST).svg
-	grep '<\!-- width' $(TEST).svg | sed -e 's%<\!-- *%%' -e 's% *-->%%' \
-     > $(TEST).siz
-	make tstSVG.html
-
-tstSVG.html: tstSVG.htmx $(TEST).svg
-	Version=`sed -e 's/Version //' $(LIBDIR)/doc/Version.tex` ; \
-      sed -e 's/Version XXX/Version '$$Version'/' \
-          -e 's/XXXXX/'$(TEST)'/g' \
-      tstSVG.htmx | m4 > tstSVG.html
-#	cp tstSVG.html $(TEST) $$HOME/public_html/svg
-
-clean:
-	@printf "\n svg clean:\n"
-	rm -f *.svg *.dim *.ps *log *.siz *.pic examplesSVG.html Incleps.png
-	rm -f tstSVG.html copy_tmp__
-	rm -f pages
-	@printf "\n"
-
-clobber: clean
-	(cd dev; make clobber)
-	rm -f test.m4
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test-1.svg b/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test-1.svg
deleted file mode 100644
index 7c48b506b43..00000000000
--- a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test-1.svg
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- This file was generated by dvisvgm 2.6.3 -->
-<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='337.972pt' height='139.358pt' viewBox='0 -139.358 337.972 139.358'>
-<g id='page1'>
-<g transform='matrix(1 0 0 -1 0 0)'>
-<path d='M14.37648 26.83561C13.78867 26.447172 13.44992 26.237797 12.46398 26.237797C11.02929 26.237797 10.13304 27.73217 10.13304 29.16655C10.13304 30.52123 10.95961 32.08498 12.48367 32.08498C13.19117 32.08498 13.6393 31.91592 14.18711 31.56717L14.32648 32.38405C13.89836 32.59311 13.13117 32.7228 12.49367 32.7228C10.65086 32.7228 9.236483 31.16873 9.236483 29.07686C9.236483 27.50311 10.4218 25.590297 12.49367 25.590297C13.41023 25.590297 13.78867 25.749672 14.43617 26.148109L14.37648 26.83561Z'/>
-<path d='M7.0763 92.0121H6.19974L3.600049 85.098973H4.33692L5.10411 87.13116H8.00286L8.75974 85.098973H9.6763L7.0763 92.0121ZM7.78349 87.68897H5.31317L5.96067 89.49179C6.17005 90.0796 6.4788 90.92616 6.54849 91.29491H6.55849C6.57817 91.15554 6.64817 90.90647 6.87724 90.24897L7.78349 87.68897ZM14.5152 88.34647C14.5152 89.13335 14.4755 90.0596 14.0571 90.86647C13.6486 91.61366 12.96146 91.85272 12.45333 91.85272C11.86552 91.85272 11.16833 91.58366 10.75989 90.6971C10.43114 89.96991 10.38145 89.14335 10.38145 88.34647C10.38145 87.55929 10.42114 86.8321 10.72021 86.10491C11.11864 85.148661 11.87552 84.879911 12.44333 84.879911C13.17052 84.879911 13.798 85.288348 14.1168 85.975536C14.4158 86.62304 14.5152 87.28054 14.5152 88.34647ZM12.45333 85.487411C11.93521 85.487411 11.52708 85.865848 11.32771 86.58335C11.16833 87.15085 11.15833 87.68897 11.15833 88.46585C11.15833 89.09335 11.15833 89.69116 11.32771 90.23897C11.38739 90.42835 11.63646 91.24491 12.44333 91.24491C13.22021 91.24491 13.4793 90.48804 13.549 90.30866C13.7383 89.75085 13.7383 89.08335 13.7383 88.46585C13.7383 87.80835 13.7383 87.18085 13.559 86.55335C13.29989 85.646786 12.77208 85.487411 12.45333 85.487411Z'/>
-<path d='M7.0763 113.61213H6.19974L3.600049 106.699004H4.33692L5.10411 108.73119H8.00286L8.75974 106.699004H9.6763L7.0763 113.61213ZM7.78349 109.289H5.31317L5.96067 111.09182C6.17005 111.67963 6.4788 112.52619 6.54849 112.89494H6.55849C6.57817 112.75557 6.64817 112.5065 6.87724 111.849L7.78349 109.289ZM12.94145 113.45275H12.74208C12.15458 112.84494 11.32771 112.81525 10.84958 112.79525V112.21744C11.17833 112.22744 11.65645 112.24744 12.15458 112.4565V107.276817H10.90927V106.699004H14.1865V107.276817H12.94145V113.45275Z'/>
-<path d='M7.0763 135.21314H6.19974L3.600049 128.300016H4.33692L5.10411 130.3322H8.00286L8.75974 128.300016H9.6763L7.0763 135.21314ZM7.78349 130.89002H5.31317L5.96067 132.69283C6.17005 133.28064 6.4788 134.1272 6.54849 134.49595H6.55849C6.57817 134.35658 6.64817 134.10752 6.87724 133.45002L7.78349 130.89002ZM11.69614 130.17283L10.46114 128.937516V128.300016H14.4355V129.007203H12.62271C12.50302 129.007203 12.38364 128.997203 12.26396 128.997203H11.17833C11.49708 129.276266 12.25395 130.02345 12.56302 130.3122C12.75208 130.49158 13.26021 130.9097 13.4496 131.08908C13.8977 131.53752 14.4355 132.06533 14.4355 132.9122C14.4355 134.05752 13.6286 135.05377 12.31396 135.05377C11.17833 135.05377 10.62052 134.27689 10.38145 133.42002C10.50083 133.25064 10.55083 133.19095 10.57052 133.16095C10.59052 133.14127 10.6902 133.01158 10.78989 132.8722C10.98895 133.63908 11.26802 134.41627 12.17427 134.41627C13.11083 134.41627 13.6186 133.66908 13.6186 132.8922C13.6186 132.04533 13.05114 131.47752 12.46333 130.88002L11.69614 130.17283Z'/>
-<path d='M16.464844 131.762H43.4648' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M56.0625 131.762L43.4648 124.5586V138.961L56.0625 131.762' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M61.4648 131.762C61.4648 133.254 60.2539 134.461 58.7617 134.461C57.2695 134.461 56.0625 133.254 56.0625 131.762S57.2695 129.0586 58.7617 129.0586C60.2539 129.0586 61.4648 130.27 61.4648 131.762Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M61.4648 131.762H79.4648' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M97.4648 131.762L84.8633 124.5586V138.961L97.4648 131.762' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M84.8672 131.762C84.8672 133.254 83.6563 134.461 82.1641 134.461S79.4609 133.254 79.4609 131.762S80.6719 129.0586 82.1641 129.0586S84.8672 130.27 84.8672 131.762Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M16.464844 110.1602H43.4648' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M56.0625 110.1602L43.4648 102.9609V117.3594L56.0625 110.1602' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M61.4648 110.1602C61.4648 111.6523 60.2539 112.8594 58.7617 112.8594C57.2695 112.8594 56.0625 111.6523 56.0625 110.1602C56.0625 108.668 57.2695 107.457 58.7617 107.457C60.2539 107.457 61.4648 108.668 61.4648 110.1602Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M61.4648 110.1602H79.4648' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M97.4648 110.1602L84.8633 102.9609V117.3594L97.4648 110.1602' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M84.8672 110.1602C84.8672 111.6523 83.6563 112.8594 82.1641 112.8594S79.4609 111.6523 79.4609 110.1602C79.4609 108.668 80.6719 107.457 82.1641 107.457S84.8672 108.668 84.8672 110.1602Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M16.464844 88.5586H43.4648' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M56.0625 88.5586L43.4648 81.3594V95.7617L56.0625 88.5586' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M61.4648 88.5586C61.4648 90.0508 60.2539 91.2617 58.7617 91.2617C57.2695 91.2617 56.0625 90.0508 56.0625 88.5586C56.0625 87.0664 57.2695 85.8594 58.7617 85.8594C60.2539 85.8594 61.4648 87.0664 61.4648 88.5586Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M61.4648 88.5586H79.4648' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M97.4648 88.5586L84.8633 81.3594V95.7617L97.4648 88.5586' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M84.8672 88.5586C84.8672 90.0508 83.6563 91.2617 82.1641 91.2617S79.4609 90.0508 79.4609 88.5586C79.4609 87.0664 80.6719 85.8594 82.1641 85.8594S84.8672 87.0664 84.8672 88.5586Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M58.7617 29.160156L46.1641 21.95703V36.35937L58.7617 29.160156' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M39.2617 77.7578H30.4648' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M30.7891 77.918C34.1055 71.0508 34.1328 63.0469 30.8633 56.1602' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M30.4648 56.1602H39.2617' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M39.2617 77.7578C46.4961 77.7578 53.0625 73.5391 56.0625 66.957' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M39.2617 56.1602C46.4961 56.1602 53.0625 60.3789 56.0625 66.957' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M61.4648 66.957C61.4648 68.4492 60.2539 69.6602 58.7617 69.6602C57.2695 69.6602 56.0625 68.4492 56.0625 66.957C56.0625 65.4687 57.2695 64.2578 58.7617 64.2578C60.2539 64.2578 61.4648 65.4687 61.4648 66.957Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M84.4648 56.1602H75.6641' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M75.9883 56.3164C79.3047 49.4492 79.332 41.4492 76.0625 34.55859' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M75.6641 34.55859H84.4648' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M84.4648 56.1602C91.6953 56.1602 98.2617 51.9375 101.2656 45.3594' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M84.4648 34.55859C91.6953 34.55859 98.2617 38.78125 101.2656 45.3594' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M106.6641 45.3594C106.6641 46.8516 105.457 48.0625 103.9648 48.0625C102.4727 48.0625 101.2617 46.8516 101.2617 45.3594C101.2617 43.8672 102.4727 42.6602 103.9648 42.6602C105.457 42.6602 106.6641 43.8672 106.6641 45.3594Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M202.066 112.8594H187.664V134.461H202.066' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M202.066 134.461C208.027 134.461 212.867 129.625 212.867 123.6602C212.867 117.6953 208.027 112.8594 202.066 112.8594' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M202.066 42.6602H187.664V64.2578H202.066' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M202.066 64.2578C208.027 64.2578 212.867 59.4258 212.867 53.457C212.867 47.4961 208.027 42.6602 202.066 42.6602' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M245.266 58.8594H230.867V80.4609H245.266' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M245.266 80.4609C251.23 80.4609 256.066 75.625 256.066 69.6602C256.066 63.6953 251.23 58.8594 245.266 58.8594' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M280.621 129.0586H271.82' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M272.145 129.219C275.461 122.3477 275.488 114.3516 272.219 107.4609' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M271.82 107.4609H280.621' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M280.621 129.0586C287.852 129.0586 294.418 124.8398 297.418 118.2617' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M280.621 107.4609C287.852 107.4609 294.418 111.6797 297.418 118.2617' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M302.82 118.2617C302.82 119.75 301.613 120.9609 300.121 120.9609C298.629 120.9609 297.418 119.75 297.418 118.2617C297.418 116.7695 298.629 115.5586 300.121 115.5586C301.613 115.5586 302.82 116.7695 302.82 118.2617Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M280.621 69.6602H271.82' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M272.145 69.8164C275.461 62.9492 275.488 54.9492 272.219 48.0586' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M271.82 48.0586H280.621' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M280.621 69.6602C287.852 69.6602 294.418 65.4375 297.418 58.8594' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M280.621 48.0586C287.852 48.0586 294.418 52.2812 297.418 58.8594' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M302.82 58.8594C302.82 60.3516 301.613 61.5625 300.121 61.5625C298.629 61.5625 297.418 60.3516 297.418 58.8594C297.418 57.3672 298.629 56.1602 300.121 56.1602C301.613 56.1602 302.82 57.3672 302.82 58.8594Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M139.52534 9.38724C139.56534 9.59661 139.57503 9.6963 139.77441 9.73599C139.86409 9.75599 140.14284 9.75599 140.32222 9.75599C141.48784 9.75599 141.84628 9.58661 141.84628 8.59036C141.84628 8.32161 141.82628 8.08255 141.79659 7.82349H142.04566L142.23472 10.06474H136.14847L135.58066 7.82349H135.82972C136.25816 9.36755 136.35784 9.75599 137.95159 9.75599C138.10097 9.75599 138.33003 9.75599 138.38972 9.74599C138.59909 9.72599 138.64878 9.6963 138.64878 9.54661C138.64878 9.46692 138.62878 9.37755 138.61878 9.29786L137.74222 4.078174C137.69253 3.759424 137.66253 3.629736 136.60659 3.629736H136.22816L136.17847 3.320986C136.42753 3.340986 136.86566 3.340986 137.11472 3.340986L138.07097 3.350986C138.52909 3.350986 139.54534 3.350986 139.95378 3.320986L140.00347 3.629736H139.62503C138.77816 3.629736 138.61878 3.709424 138.61878 3.928486C138.61878 3.938486 138.61878 3.978486 138.63878 4.087861L139.52534 9.38724Z'/>
-<path d='M145.9198 5.85099C145.9198 6.95692 145.1426 7.78349 144.06698 7.78349C142.6523 7.78349 141.4373 6.39911 141.4373 5.07411C141.4373 4.038174 142.19417 3.211299 143.3098 3.211299C144.6348 3.211299 145.9198 4.40661 145.9198 5.85099ZM143.3498 3.460361C143.07073 3.460361 142.23417 3.560049 142.23417 4.75536C142.23417 5.12411 142.36355 6.21974 142.6723 6.72786C143.16042 7.52474 143.85761 7.56442 144.02698 7.56442C144.34573 7.56442 145.1526 7.41505 145.1526 6.29942C145.1526 6.07036 145.0729 4.99442 144.7245 4.33692C144.41542 3.769111 143.86761 3.460361 143.3498 3.460361Z'/>
-<path d='M154.2178 5.85099C154.2178 6.95692 153.4407 7.78349 152.365 7.78349C150.9503 7.78349 149.7353 6.39911 149.7353 5.07411C149.7353 4.038174 150.4922 3.211299 151.6078 3.211299C152.9328 3.211299 154.2178 4.40661 154.2178 5.85099ZM151.6478 3.460361C151.3688 3.460361 150.5322 3.560049 150.5322 4.75536C150.5322 5.12411 150.6616 6.21974 150.9703 6.72786C151.4585 7.52474 152.1557 7.56442 152.325 7.56442C152.6438 7.56442 153.4507 7.41505 153.4507 6.29942C153.4507 6.07036 153.371 4.99442 153.0225 4.33692C152.7135 3.769111 152.1657 3.460361 151.6478 3.460361ZM156.5094 7.30536H157.9338C157.9538 7.40505 157.9638 7.51474 157.9838 7.61442H156.5594L156.8582 9.44724H156.6091C156.4497 8.51067 155.9219 7.55442 155.0053 7.52474L154.9753 7.30536H155.8122L155.3638 4.58599C155.3341 4.40661 155.3341 4.38692 155.3341 4.257236C155.3341 3.290986 156.141 3.211299 156.4397 3.211299C156.9078 3.211299 157.2166 3.520361 157.396 3.858799C157.5753 4.167549 157.5953 4.297236 157.7247 5.12411H157.4757C157.3563 4.39692 157.3363 4.257236 157.2069 3.998486C157.1272 3.848799 156.8978 3.460361 156.5194 3.460361C156.101 3.460361 156.0016 3.848799 156.0016 4.137861C156.0016 4.247236 156.0113 4.287236 156.0213 4.35692L156.5094 7.30536ZM163.0535 6.33911C163.0835 6.51849 163.0835 6.54849 163.0835 6.70786C163.0835 7.46474 162.5954 7.7238 161.9079 7.7238C161.0614 7.7238 160.5332 7.1163 160.3342 6.78755L160.3242 6.79755L160.902 10.23411L159.6467 10.13442C159.627 10.13442 159.4776 10.12442 159.4676 10.11442C159.4376 10.09474 159.3979 9.84567 159.3979 9.81567C159.9654 9.81567 160.1051 9.76599 160.1051 9.49692C160.1051 9.48692 160.1051 9.41724 160.0751 9.23786L159.2085 4.058174C159.1489 3.679736 159.1089 3.629736 158.3717 3.629736H158.3617L158.312 3.320986C158.6507 3.330986 159.1785 3.350986 159.4376 3.350986C159.6867 3.350986 160.2245 3.330986 160.5432 3.320986L160.6029 3.629736C160.1051 3.629736 159.876 3.629736 159.876 3.878799C159.876 3.908799 159.9457 4.287236 159.9754 4.4863C160.0451 4.92474 160.1151 5.36317 160.1948 5.8013C160.2445 6.13005 160.3342 6.60817 160.8223 7.0763C161.121 7.34536 161.4995 7.50474 161.8282 7.50474C162.2167 7.50474 162.416 7.30536 162.416 6.83724C162.416 6.68786 162.396 6.57817 162.3064 6.00067L161.9676 4.008174C161.9079 3.629736 161.7485 3.629736 161.141 3.629736H161.131L161.0814 3.320986C161.4198 3.330986 161.9479 3.350986 162.207 3.350986C162.4557 3.350986 162.9939 3.330986 163.3126 3.320986L163.3723 3.629736C162.8742 3.629736 162.6451 3.629736 162.6451 3.878799C162.6451 3.918799 162.6551 3.978486 162.6651 4.028174L163.0535 6.33911ZM167.7918 5.62192C168.0309 5.62192 168.0509 5.62192 168.0806 5.8113C168.1106 6.03036 168.1106 6.18974 168.1106 6.24974C168.1106 7.42505 167.3237 7.78349 166.6065 7.78349C165.2615 7.78349 164.1359 6.4388 164.1359 5.1338C164.1359 4.018174 164.9528 3.211299 165.9987 3.211299C167.224 3.211299 167.8515 4.34692 167.8515 4.5163C167.8515 4.5563 167.8315 4.62599 167.7421 4.62599C167.6621 4.62599 167.6425 4.58599 167.5925 4.4863C167.1143 3.570049 166.3275 3.460361 166.0584 3.460361C165.6003 3.460361 164.9331 3.749424 164.9331 4.82505C164.9331 5.12411 164.9928 5.47255 165.0225 5.62192H167.7918ZM165.0625 5.8313C165.4112 7.41505 166.3575 7.56442 166.5965 7.56442C167.4631 7.56442 167.4631 6.58817 167.4631 6.38911C167.4631 6.17005 167.4531 6.10005 167.4134 5.8313H165.0625ZM170.187 6.68786L170.3564 7.7238L169.141 7.63411C168.9617 7.62411 168.952 7.60442 168.942 7.55442C168.942 7.52474 168.902 7.32536 168.902 7.30536C169.4698 7.30536 169.6092 7.25567 169.6092 6.98661C169.6092 6.97661 169.6092 6.90692 169.5795 6.72786L169.131 4.058174C169.0714 3.679736 169.0317 3.629736 168.2945 3.629736H168.2845L168.2348 3.320986C168.6332 3.330986 169.0914 3.350986 169.3801 3.350986C169.4401 3.350986 170.3167 3.340986 170.6354 3.320986C170.6551 3.420674 170.6651 3.530049 170.6851 3.629736H170.4957C169.8882 3.629736 169.7685 3.689424 169.7685 3.908799C169.7685 4.048174 170.0873 5.8113 170.1373 6.01036C170.3067 6.56849 170.7151 7.50474 171.6214 7.50474V7.49474C171.462 7.42505 171.3526 7.24567 171.3526 7.04661C171.3526 6.74755 171.6017 6.67786 171.731 6.67786C171.9801 6.67786 172.2192 6.87724 172.2192 7.17599C172.2192 7.49474 171.9501 7.7238 171.5617 7.7238C170.9242 7.7238 170.436 7.19599 170.197 6.67786L170.187 6.68786Z'/>
-<path d='M178.0887 10.23411L176.8334 10.13442C176.8137 10.13442 176.664 10.12442 176.6543 10.11442C176.6243 10.09474 176.5843 9.84567 176.5843 9.81567C177.1521 9.81567 177.2918 9.76599 177.2918 9.49692C177.2918 9.48692 177.2918 9.41724 177.2618 9.23786L176.3953 4.058174C176.3353 3.679736 176.2956 3.629736 175.5584 3.629736H175.5484L175.4987 3.320986C175.8275 3.330986 176.3553 3.350986 176.6043 3.350986C176.8434 3.350986 177.3415 3.330986 177.7 3.320986L177.76 3.629736C177.2618 3.629736 177.0328 3.629736 177.0328 3.878799C177.0328 3.918799 177.0428 3.978486 177.0528 4.028174L178.0887 10.23411ZM182.8385 4.76536C182.7985 4.5063 182.7288 4.087861 182.6991 3.998486C182.6194 3.699424 182.43 3.570049 182.2807 3.570049C182.0616 3.570049 181.9916 3.789111 181.9916 3.978486C181.9916 4.078174 182.0813 4.56599 182.1013 4.69567C182.161 5.01442 182.3903 6.30942 182.3903 6.52849C182.3903 7.28567 181.7128 7.78349 180.876 7.78349C179.87 7.78349 179.1925 7.13599 179.1925 6.57817C179.1925 6.40911 179.2922 6.18974 179.601 6.18974C179.89 6.18974 180.1191 6.4288 180.1191 6.70786C180.1191 6.96692 179.9397 7.0963 179.7007 7.1063C180.0094 7.45474 180.5472 7.56442 180.8463 7.56442C181.4141 7.56442 181.7128 7.0963 181.7128 6.59817C181.7128 6.49849 181.6432 5.96067 181.6032 5.93067C181.5835 5.92099 181.5635 5.92099 181.3344 5.91099C179.6907 5.85099 178.5053 5.06411 178.5053 4.137861C178.5053 3.370674 179.4716 3.211299 179.9497 3.211299C180.8363 3.211299 181.3044 3.908799 181.3841 4.048174C181.3841 3.360986 181.8125 3.261299 182.0216 3.261299C182.3107 3.261299 182.8685 3.460361 182.9878 4.187549C183.0178 4.317236 183.0278 4.39692 183.0875 4.76536H182.8385ZM181.4338 4.81505C181.3841 4.5163 181.3344 4.207549 180.9557 3.839111C180.7166 3.600049 180.3682 3.430674 180.0194 3.430674C179.591 3.430674 179.2722 3.709424 179.2722 4.117861C179.2722 4.127861 179.2722 5.61192 181.5835 5.71161L181.4338 4.81505ZM185.3094 7.30536H186.7338C186.7538 7.40505 186.7638 7.51474 186.7838 7.61442H185.3594L185.6582 9.44724H185.4091C185.2497 8.51067 184.7219 7.55442 183.8053 7.52474L183.7753 7.30536H184.6122L184.1638 4.58599C184.1341 4.40661 184.1341 4.38692 184.1341 4.257236C184.1341 3.290986 184.941 3.211299 185.2397 3.211299C185.7078 3.211299 186.0166 3.520361 186.196 3.858799C186.3753 4.167549 186.3953 4.297236 186.5247 5.12411H186.2757C186.1563 4.39692 186.1363 4.257236 186.0069 3.998486C185.9272 3.848799 185.6978 3.460361 185.3194 3.460361C184.901 3.460361 184.8016 3.848799 184.8016 4.137861C184.8016 4.247236 184.8113 4.287236 184.8213 4.35692L185.3094 7.30536ZM191.0267 7.16599C190.5089 7.14599 190.4589 6.73755 190.4589 6.63817C190.4589 6.4688 190.5585 6.24974 190.8673 6.24974C191.1164 6.24974 191.3954 6.4388 191.3954 6.83724C191.3954 7.48474 190.6782 7.78349 190.0207 7.78349C188.656 7.78349 187.4607 6.4788 187.4607 5.09411C187.4607 3.958486 188.2776 3.211299 189.2735 3.211299C190.6082 3.211299 191.1164 4.41661 191.1164 4.5063C191.1164 4.58599 191.0467 4.60599 190.997 4.60599C190.9173 4.60599 190.9073 4.58599 190.8473 4.46661C190.5189 3.789111 189.951 3.460361 189.3732 3.460361C188.8851 3.460361 188.2676 3.809111 188.2676 4.88505C188.2676 6.22974 188.9848 7.53474 190.0207 7.53474C190.1601 7.53474 190.7379 7.51474 191.0267 7.16599Z'/>
-<path d='M196.0042 6.33911C196.0342 6.51849 196.0342 6.54849 196.0342 6.70786C196.0342 7.46474 195.546 7.7238 194.8585 7.7238C194.012 7.7238 193.4839 7.1163 193.2848 6.78755L193.2748 6.79755L193.8526 10.23411L192.5973 10.13442C192.5776 10.13442 192.4282 10.12442 192.4182 10.11442C192.3882 10.09474 192.3485 9.84567 192.3485 9.81567C192.916 9.81567 193.0557 9.76599 193.0557 9.49692C193.0557 9.48692 193.0557 9.41724 193.0257 9.23786L192.1592 4.058174C192.0995 3.679736 192.0595 3.629736 191.3223 3.629736H191.3123L191.2626 3.320986C191.6014 3.330986 192.1292 3.350986 192.3882 3.350986C192.6373 3.350986 193.1751 3.330986 193.4939 3.320986L193.5535 3.629736C193.0557 3.629736 192.8267 3.629736 192.8267 3.878799C192.8267 3.908799 192.8964 4.287236 192.926 4.4863C192.9957 4.92474 193.0657 5.36317 193.1454 5.8013C193.1951 6.13005 193.2848 6.60817 193.7729 7.0763C194.0717 7.34536 194.4501 7.50474 194.7789 7.50474C195.1673 7.50474 195.3667 7.30536 195.3667 6.83724C195.3667 6.68786 195.3467 6.57817 195.257 6.00067L194.9182 4.008174C194.8585 3.629736 194.6992 3.629736 194.0917 3.629736H194.0817L194.032 3.320986C194.3704 3.330986 194.8985 3.350986 195.1576 3.350986C195.4064 3.350986 195.9445 3.330986 196.2632 3.320986L196.3229 3.629736C195.8248 3.629736 195.5957 3.629736 195.5957 3.878799C195.5957 3.918799 195.6057 3.978486 195.6157 4.028174L196.0042 6.33911ZM200.7425 5.62192C200.9815 5.62192 201.0015 5.62192 201.0312 5.8113C201.0612 6.03036 201.0612 6.18974 201.0612 6.24974C201.0612 7.42505 200.2743 7.78349 199.5571 7.78349C198.2121 7.78349 197.0865 6.4388 197.0865 5.1338C197.0865 4.018174 197.9034 3.211299 198.9493 3.211299C200.1746 3.211299 200.8021 4.34692 200.8021 4.5163C200.8021 4.5563 200.7821 4.62599 200.6928 4.62599C200.6128 4.62599 200.5931 4.58599 200.5431 4.4863C200.065 3.570049 199.2781 3.460361 199.009 3.460361C198.5509 3.460361 197.8837 3.749424 197.8837 4.82505C197.8837 5.12411 197.9434 5.47255 197.9731 5.62192H200.7425ZM198.0131 5.8313C198.3618 7.41505 199.3081 7.56442 199.5471 7.56442C200.4137 7.56442 200.4137 6.58817 200.4137 6.38911C200.4137 6.17005 200.4037 6.10005 200.364 5.8313H198.0131ZM204.9507 7.53474C204.9704 7.62411 204.9704 7.64411 204.9704 7.67411C204.9704 7.7338 204.9407 7.78349 204.861 7.78349C204.821 7.78349 204.801 7.78349 204.6517 7.65411C204.5323 7.56442 204.5223 7.56442 204.4526 7.50474C204.1239 7.78349 203.6854 7.78349 203.556 7.78349C202.1317 7.78349 201.7629 6.88724 201.7629 6.40911C201.7629 6.07036 201.9223 5.8413 202.1217 5.67192C202.3907 5.44286 202.6895 5.38286 203.1576 5.29317C203.5957 5.2038 204.1935 5.08411 204.1935 4.47661C204.1935 4.137861 203.9445 3.430674 202.8885 3.430674C202.4004 3.430674 201.8129 3.600049 201.7529 4.80536C201.7432 4.96474 201.7432 5.01442 201.6235 5.01442C201.5239 5.01442 201.5139 4.98442 201.4842 4.80536L201.2551 3.470361C201.2351 3.380674 201.2351 3.360986 201.2351 3.320986C201.2351 3.251299 201.2748 3.211299 201.3448 3.211299C201.3945 3.211299 201.4045 3.221299 201.6135 3.420674C201.6732 3.470361 201.8129 3.600049 201.8626 3.649736C202.1217 3.310986 202.5001 3.211299 202.8885 3.211299C204.3429 3.211299 204.7214 4.267236 204.7214 4.78536C204.7214 5.1638 204.562 5.41286 204.3829 5.58224C204.0939 5.88099 203.8351 5.93067 203.297 6.03036C202.8489 6.12005 202.291 6.22974 202.291 6.72786C202.291 6.73755 202.291 7.59442 203.556 7.59442C203.7454 7.59442 204.5323 7.59442 204.5323 6.68786C204.5323 6.55849 204.5123 6.4288 204.5123 6.39911C204.5123 6.30942 204.602 6.29942 204.632 6.29942C204.7414 6.29942 204.7514 6.35911 204.7814 6.52849L204.9507 7.53474Z'/>
-<path d='M32.7109 72.3594H16.464844' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M8.704212 75.81309V68.899969H11.3239C13.01734 68.899969 14.37202 70.41403 14.37202 72.29684C14.37202 74.22934 13.02734 75.81309 11.31421 75.81309H8.704212ZM9.56077 69.457781V75.25528H11.08484C12.47952 75.25528 13.51546 74.04997 13.51546 72.29684C13.51546 70.60341 12.47952 69.457781 11.08484 69.457781H9.56077Z'/>
-<path d='M32.7109 61.5586H16.464844' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M14.10396 61.37616V61.98397H10.81678V64.3446H12.19146C12.31115 64.3446 12.43053 64.3346 12.55021 64.3346H14.37303V64.9821H9.930214V58.098973H14.5124V58.806161H13.2574C13.13771 58.806161 13.01834 58.796161 12.89865 58.796161H10.81678V61.37616H14.10396Z'/>
-<path d='M25.14844 61.5586C25.14844 62.3555 24.50391 63 23.71094 63C22.91406 63 22.26953 62.3555 22.26953 61.5586C22.26953 60.7656 22.91406 60.1211 23.71094 60.1211C24.50391 60.1211 25.14844 60.7656 25.14844 61.5586Z'/>
-<path d='M25.14844 61.5586C25.14844 62.3555 24.50391 63 23.71094 63C22.91406 63 22.26953 62.3555 22.26953 61.5586C22.26953 60.7656 22.91406 60.1211 23.71094 60.1211C24.50391 60.1211 25.14844 60.7656 25.14844 61.5586Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M23.71094 61.5586V39.957H77.9102' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M16.464844 29.160156H46.1641' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M71.9023 131.762C71.9023 132.555 71.2578 133.199 70.4648 133.199C69.668 133.199 69.0234 132.555 69.0234 131.762C69.0234 130.965 69.668 130.32 70.4648 130.32C71.2578 130.32 71.9023 130.965 71.9023 131.762Z'/>
-<path d='M71.9023 131.762C71.9023 132.555 71.2578 133.199 70.4648 133.199C69.668 133.199 69.0234 132.555 69.0234 131.762C69.0234 130.965 69.668 130.32 70.4648 130.32C71.2578 130.32 71.9023 130.965 71.9023 131.762Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M70.4648 131.762V120.9609' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M70.4648 120.9609H133.664' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M131.863 21.95703L133.664 14.7578L135.465 21.95703Z'/>
-<path d='M131.863 21.95703L133.664 14.7578L135.465 21.95703Z' stroke='#000' fill='none' stroke-width='0.5' stroke-miterlimit='10'/>
-<path d='M133.664 120.9609V16.4062' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M71.9023 110.1602C71.9023 110.9531 71.2578 111.6016 70.4648 111.6016C69.668 111.6016 69.0234 110.9531 69.0234 110.1602C69.0234 109.3633 69.668 108.7188 70.4648 108.7188C71.2578 108.7188 71.9023 109.3633 71.9023 110.1602Z'/>
-<path d='M71.9023 110.1602C71.9023 110.9531 71.2578 111.6016 70.4648 111.6016C69.668 111.6016 69.0234 110.9531 69.0234 110.1602C69.0234 109.3633 69.668 108.7188 70.4648 108.7188C71.2578 108.7188 71.9023 109.3633 71.9023 110.1602Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M70.4648 110.1602V99.3594' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M70.4648 99.3594H124.664' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M122.863 21.95703L124.664 14.7578L126.465 21.95703Z'/>
-<path d='M122.863 21.95703L124.664 14.7578L126.465 21.95703Z' stroke='#000' fill='none' stroke-width='0.5' stroke-miterlimit='10'/>
-<path d='M124.664 99.3594V16.4062' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M71.9023 88.5586C71.9023 89.3555 71.2578 90 70.4648 90C69.668 90 69.0234 89.3555 69.0234 88.5586C69.0234 87.7656 69.668 87.1211 70.4648 87.1211C71.2578 87.1211 71.9023 87.7656 71.9023 88.5586Z'/>
-<path d='M71.9023 88.5586C71.9023 89.3555 71.2578 90 70.4648 90C69.668 90 69.0234 89.3555 69.0234 88.5586C69.0234 87.7656 69.668 87.1211 70.4648 87.1211C71.2578 87.1211 71.9023 87.7656 71.9023 88.5586Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M70.4648 88.5586V77.7578' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M70.4648 77.7578H115.6641' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M113.8633 21.95703L115.6641 14.7578L117.465 21.95703Z'/>
-<path d='M113.8633 21.95703L115.6641 14.7578L117.465 21.95703Z' stroke='#000' fill='none' stroke-width='0.5' stroke-miterlimit='10'/>
-<path d='M115.6641 77.7578V16.4062' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M71.9023 67.0391C71.9023 67.832 71.2578 68.4766 70.4648 68.4766C69.668 68.4766 69.0234 67.832 69.0234 67.0391C69.0234 66.2422 69.668 65.5977 70.4648 65.5977C71.2578 65.5977 71.9023 66.2422 71.9023 67.0391Z'/>
-<path d='M71.9023 67.0391C71.9023 67.832 71.2578 68.4766 70.4648 68.4766C69.668 68.4766 69.0234 67.832 69.0234 67.0391C69.0234 66.2422 69.668 65.5977 70.4648 65.5977C71.2578 65.5977 71.9023 66.2422 71.9023 67.0391Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M70.4648 67.0391V50.7578H77.9102' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M187.664 131.762H151.664' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M149.863 21.95703L151.664 14.7578L153.465 21.95703Z'/>
-<path d='M149.863 21.95703L151.664 14.7578L153.465 21.95703Z' stroke='#000' fill='none' stroke-width='0.5' stroke-miterlimit='10'/>
-<path d='M151.664 131.762V16.4062' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M187.664 126.3594H160.664' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M158.863 21.95703L160.664 14.7578L162.465 21.95703Z'/>
-<path d='M158.863 21.95703L160.664 14.7578L162.465 21.95703Z' stroke='#000' fill='none' stroke-width='0.5' stroke-miterlimit='10'/>
-<path d='M160.664 126.3594V16.4062' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M187.664 120.9609H169.664' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M167.863 21.95703L169.664 14.7578L171.465 21.95703Z'/>
-<path d='M167.863 21.95703L169.664 14.7578L171.465 21.95703Z' stroke='#000' fill='none' stroke-width='0.5' stroke-miterlimit='10'/>
-<path d='M169.664 120.9609V16.4062' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M187.664 115.5586H178.664' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M176.863 21.95703L178.664 14.7578L180.465 21.95703Z'/>
-<path d='M176.863 21.95703L178.664 14.7578L180.465 21.95703Z' stroke='#000' fill='none' stroke-width='0.5' stroke-miterlimit='10'/>
-<path d='M178.664 115.5586V16.4062' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M97.4648 131.762H151.664' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M153.105 131.762C153.105 132.555 152.461 133.199 151.664 133.199S150.223 132.555 150.223 131.762C150.223 130.965 150.867 130.32 151.664 130.32S153.105 130.965 153.105 131.762Z'/>
-<path d='M153.105 131.762C153.105 132.555 152.461 133.199 151.664 133.199S150.223 132.555 150.223 131.762C150.223 130.965 150.867 130.32 151.664 130.32S153.105 130.965 153.105 131.762Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M97.4648 110.1602H160.664' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M162.105 110.1602C162.105 110.9531 161.461 111.6016 160.664 111.6016S159.223 110.9531 159.223 110.1602C159.223 109.3633 159.867 108.7188 160.664 108.7188S162.105 109.3633 162.105 110.1602Z'/>
-<path d='M162.105 110.1602C162.105 110.9531 161.461 111.6016 160.664 111.6016S159.223 110.9531 159.223 110.1602C159.223 109.3633 159.867 108.7188 160.664 108.7188S162.105 109.3633 162.105 110.1602Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M97.4648 88.5586H169.664' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M171.105 88.5586C171.105 89.3555 170.461 90 169.664 90C168.871 90 168.223 89.3555 168.223 88.5586C168.223 87.7656 168.871 87.1211 169.664 87.1211C170.461 87.1211 171.105 87.7656 171.105 88.5586Z'/>
-<path d='M171.105 88.5586C171.105 89.3555 170.461 90 169.664 90C168.871 90 168.223 89.3555 168.223 88.5586C168.223 87.7656 168.871 87.1211 169.664 87.1211C170.461 87.1211 171.105 87.7656 171.105 88.5586Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M61.4648 66.957L178.664 67.0391' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M180.105 67.0391C180.105 67.832 179.461 68.4766 178.664 68.4766C177.871 68.4766 177.227 67.832 177.227 67.0391C177.227 66.2422 177.871 65.5977 178.664 65.5977C179.461 65.5977 180.105 66.2422 180.105 67.0391Z'/>
-<path d='M180.105 67.0391C180.105 67.832 179.461 68.4766 178.664 68.4766C177.871 68.4766 177.227 67.832 177.227 67.0391C177.227 66.2422 177.871 65.5977 178.664 65.5977C179.461 65.5977 180.105 66.2422 180.105 67.0391Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M187.664 61.5586H151.664' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M153.105 61.5586C153.105 62.3555 152.461 63 151.664 63S150.223 62.3555 150.223 61.5586C150.223 60.7656 150.867 60.1211 151.664 60.1211S153.105 60.7656 153.105 61.5586Z'/>
-<path d='M153.105 61.5586C153.105 62.3555 152.461 63 151.664 63S150.223 62.3555 150.223 61.5586C150.223 60.7656 150.867 60.1211 151.664 60.1211S153.105 60.7656 153.105 61.5586Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M187.664 56.1602H160.664' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M162.105 56.1602C162.105 56.9531 161.461 57.5977 160.664 57.5977S159.223 56.9531 159.223 56.1602C159.223 55.3633 159.867 54.7187 160.664 54.7187S162.105 55.3633 162.105 56.1602Z'/>
-<path d='M162.105 56.1602C162.105 56.9531 161.461 57.5977 160.664 57.5977S159.223 56.9531 159.223 56.1602C159.223 55.3633 159.867 54.7187 160.664 54.7187S162.105 55.3633 162.105 56.1602Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M187.664 50.7578H169.664' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M171.105 50.7578C171.105 51.5547 170.461 52.1992 169.664 52.1992C168.871 52.1992 168.223 51.5547 168.223 50.7578C168.223 49.9648 168.871 49.3203 169.664 49.3203C170.461 49.3203 171.105 49.9648 171.105 50.7578Z'/>
-<path d='M171.105 50.7578C171.105 51.5547 170.461 52.1992 169.664 52.1992C168.871 52.1992 168.223 51.5547 168.223 50.7578C168.223 49.9648 168.871 49.3203 169.664 49.3203C170.461 49.3203 171.105 49.9648 171.105 50.7578Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M106.6641 45.3594H187.664' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M144.105 45.3594C144.105 46.1562 143.461 46.8008 142.664 46.8008C141.867 46.8008 141.223 46.1562 141.223 45.3594C141.223 44.5625 141.867 43.918 142.664 43.918C143.461 43.918 144.105 44.5625 144.105 45.3594Z'/>
-<path d='M144.105 45.3594C144.105 46.1562 143.461 46.8008 142.664 46.8008C141.867 46.8008 141.223 46.1562 141.223 45.3594C141.223 44.5625 141.867 43.918 142.664 43.918C143.461 43.918 144.105 44.5625 144.105 45.3594Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M140.863 21.95703L142.664 14.7578L144.465 21.95703Z'/>
-<path d='M140.863 21.95703L142.664 14.7578L144.465 21.95703Z' stroke='#000' fill='none' stroke-width='0.5' stroke-miterlimit='10'/>
-<path d='M142.664 45.3594V16.4062' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M212.867 123.6602H274.066' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M302.82 118.2617H311.82' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M313.262 118.2617C313.262 119.0547 312.617 119.6992 311.82 119.6992C311.023 119.6992 310.379 119.0547 310.379 118.2617C310.379 117.4648 311.023 116.8203 311.82 116.8203C312.617 116.8203 313.262 117.4648 313.262 118.2617Z'/>
-<path d='M313.262 118.2617C313.262 119.0547 312.617 119.6992 311.82 119.6992C311.023 119.6992 310.379 119.0547 310.379 118.2617C310.379 117.4648 311.023 116.8203 311.82 116.8203C312.617 116.8203 313.262 117.4648 313.262 118.2617Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M311.82 118.2617H320.82' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M327.64537 115.750748C328.731 116.59731 329.09975 117.81262 329.09975 118.85856C329.09975 120.95044 327.65537 122.55418 326.00162 122.55418C324.30819 122.55418 322.893811 120.93044 322.893811 118.85856C322.893811 116.74669 324.36819 115.202935 325.99162 115.202935C326.151 115.202935 326.51975 115.212935 326.94819 115.381998L327.80475 114.177H328.83069L327.64537 115.750748ZM326.55944 115.930123C326.54975 115.930123 326.29069 115.840435 326.00162 115.840435C324.82631 115.840435 323.75037 117.00575 323.75037 118.85856C323.75037 120.72137 324.83631 121.91669 325.99162 121.91669C327.18725 121.91669 328.24287 120.70137 328.24287 118.85856C328.24287 118.21106 328.1235 117.12544 327.22694 116.30856L326.44006 117.3545H325.5535L326.55944 115.930123ZM331.98037 121.24919C332.10006 121.24919 332.21944 121.25918 332.3391 121.25918H333.5444C332.07006 119.63575 331.1835 117.64325 331.1835 115.31231H332.02037C332.02037 118.30075 333.4447 120.43262 334.2216 121.30919V121.95669H330.08787V121.24919H331.98037Z'/>
-<path d='M311.82 118.2617V100.2617L221.867 84.0586' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M221.867 84.0586V75.0586H230.867' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M274.066 112.8594H221.867' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M221.867 112.8594V103.8594L311.82 76.8594' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M311.82 76.8594V58.9375L302.82 58.8594' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M256.066 69.6602H265.066' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M265.066 69.6602V64.2578H274.066' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M212.867 53.457H274.066' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M230.867 64.2578H221.867' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M220.066 21.95703L221.867 14.7578L223.664 21.95703Z'/>
-<path d='M220.066 21.95703L221.867 14.7578L223.664 21.95703Z' stroke='#000' fill='none' stroke-width='0.5' stroke-miterlimit='10'/>
-<path d='M221.867 64.2578V16.4062' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M223.305 29.160156C223.305 29.953125 222.66 30.59766 221.867 30.59766C221.07 30.59766 220.426 29.953125 220.426 29.160156C220.426 28.363281 221.07 27.71875 221.867 27.71875C222.66 27.71875 223.305 28.363281 223.305 29.160156Z'/>
-<path d='M223.305 29.160156C223.305 29.953125 222.66 30.59766 221.867 30.59766C221.07 30.59766 220.426 29.953125 220.426 29.160156C220.426 28.363281 221.07 27.71875 221.867 27.71875C222.66 27.71875 223.305 28.363281 223.305 29.160156Z' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-<path d='M221.867 29.160156H58.7617' stroke='#000' fill='none' stroke-width='0.8' stroke-miterlimit='10'/>
-</g>
-</g>
-</svg>
-\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test.pdf b/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test.pdf
deleted file mode 100644
index 05af7c12631..00000000000
--- a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test.pic b/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test.pic
deleted file mode 100644
index d035baa113d..00000000000
--- a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test.pic
+++ /dev/null
@@ -1,383 +0,0 @@
-.PS
-# ex08.m4
-# log_init Version 9.3: TikZ PGF m4 macro settings.
-  
-# log_init begin
-  # gen_init Version 9.3: TikZ PGF m4 macro settings.
-  
-
-  define rpoint__ {
-    rp_wid = last line.end.x-last line.start.x
-    rp_ht = last line.end.y-last line.start.y
-    rp_len = sqrt(abs((rp_wid)^2+(rp_ht)^2)); move to last line.start
-    rp_ang = atan2(rp_ht,rp_wid) }
-
-  rtod_ = 57.295779513082323;  dtor_ = 0.017453292519943295
-  twopi_ = 6.2831853071795862;  pi_ = (twopi_/2)
-  rp_ang = 0;  right
-  
-  
-  linethick = 0.8
-  arrowwid = 0.05*scale; arrowht = 0.1*scale 
-  
-  
-  # gen_init end
-
-
-# log_init end
-
-
-
-
-# Input labels
-C: (0,0); "\sf C " rjust at C
-DE: C+(0,((linewid/10))*((2*3)*7/4))
-A0: DE+(0,((linewid/10))*(4*3/2)); "\sf A0 " rjust at A0
-A1: A0+(0,((linewid/10))*(4*3/2)); "\sf A1 " rjust at A1
-A2: A1+(0,((linewid/10))*(4*3/2)); "\sf A2 " rjust at A2
-  move to (-0.2,0)   # Lettering within the global object 
-
-# Buffer strings
- line right 3*(linewid/10)*5/2 from A2
-   B1:        [Tm: line from (((linewid/10))*(3.5),0) \
-     to (0,((linewid/10))*(-4/2)) \
-     then to (0,((linewid/10))*(4/2)) \
-     then to (((linewid/10))*(3.5),0)
-     Tc: (((linewid/10))*(3.5/2),0)
-            NE: (((linewid/10))*(3.5/2),((linewid/10))*(4/4))
-      SE: (((linewid/10))*(3.5/2),((linewid/10))*(-4/4))
-           Out: (((linewid/10))*(3.5+(3/2)),0)
-    N_Out: circle diam (3/2)*(linewid/10) \
-     at (((linewid/10))*(3.5+((3/2)/2)),0)
-            In1: (0,0)
-      C: (((linewid/10))*(3.5/3),0)
-      
-  
-  
-  ]; line right 2*(linewid/10)*5/2
-   T1: last line.c
-   B2:        [Tm: line from (((linewid/10))*(3.5),0) \
-     to (0,((linewid/10))*(-4/2)) \
-     then to (0,((linewid/10))*(4/2)) \
-     then to (((linewid/10))*(3.5),0)
-     Tc: (((linewid/10))*(3.5/2),0)
-           In1: (((linewid/10))*(-(3/2)),0)
-    N_In1: circle diam (3/2)*(linewid/10) \
-      at (((linewid/10))*(-((3/2)/2)),0)
-      NE: (((linewid/10))*(3.5/2),((linewid/10))*(4/4))
-      SE: (((linewid/10))*(3.5/2),((linewid/10))*(-4/4))
-                Out: (((linewid/10))*(3.5),0)
-        C: (((linewid/10))*(3.5/3),0)
-      
-  
-  
-  ] 
-   line right 3*(linewid/10)*5/2 from A1
-   B3:        [Tm: line from (((linewid/10))*(3.5),0) \
-     to (0,((linewid/10))*(-4/2)) \
-     then to (0,((linewid/10))*(4/2)) \
-     then to (((linewid/10))*(3.5),0)
-     Tc: (((linewid/10))*(3.5/2),0)
-            NE: (((linewid/10))*(3.5/2),((linewid/10))*(4/4))
-      SE: (((linewid/10))*(3.5/2),((linewid/10))*(-4/4))
-           Out: (((linewid/10))*(3.5+(3/2)),0)
-    N_Out: circle diam (3/2)*(linewid/10) \
-     at (((linewid/10))*(3.5+((3/2)/2)),0)
-            In1: (0,0)
-      C: (((linewid/10))*(3.5/3),0)
-      
-  
-  
-  ]; line right 2*(linewid/10)*5/2
-   T2: last line.c
-   B4:        [Tm: line from (((linewid/10))*(3.5),0) \
-     to (0,((linewid/10))*(-4/2)) \
-     then to (0,((linewid/10))*(4/2)) \
-     then to (((linewid/10))*(3.5),0)
-     Tc: (((linewid/10))*(3.5/2),0)
-           In1: (((linewid/10))*(-(3/2)),0)
-    N_In1: circle diam (3/2)*(linewid/10) \
-      at (((linewid/10))*(-((3/2)/2)),0)
-      NE: (((linewid/10))*(3.5/2),((linewid/10))*(4/4))
-      SE: (((linewid/10))*(3.5/2),((linewid/10))*(-4/4))
-                Out: (((linewid/10))*(3.5),0)
-        C: (((linewid/10))*(3.5/3),0)
-      
-  
-  
-  ] 
-   line right 3*(linewid/10)*5/2 from A0
-   B5:        [Tm: line from (((linewid/10))*(3.5),0) \
-     to (0,((linewid/10))*(-4/2)) \
-     then to (0,((linewid/10))*(4/2)) \
-     then to (((linewid/10))*(3.5),0)
-     Tc: (((linewid/10))*(3.5/2),0)
-            NE: (((linewid/10))*(3.5/2),((linewid/10))*(4/4))
-      SE: (((linewid/10))*(3.5/2),((linewid/10))*(-4/4))
-           Out: (((linewid/10))*(3.5+(3/2)),0)
-    N_Out: circle diam (3/2)*(linewid/10) \
-     at (((linewid/10))*(3.5+((3/2)/2)),0)
-            In1: (0,0)
-      C: (((linewid/10))*(3.5/3),0)
-      
-  
-  
-  ]; line right 2*(linewid/10)*5/2
-   T3: last line.c
-   B6:        [Tm: line from (((linewid/10))*(3.5),0) \
-     to (0,((linewid/10))*(-4/2)) \
-     then to (0,((linewid/10))*(4/2)) \
-     then to (((linewid/10))*(3.5),0)
-     Tc: (((linewid/10))*(3.5/2),0)
-           In1: (((linewid/10))*(-(3/2)),0)
-    N_In1: circle diam (3/2)*(linewid/10) \
-      at (((linewid/10))*(-((3/2)/2)),0)
-      NE: (((linewid/10))*(3.5/2),((linewid/10))*(4/4))
-      SE: (((linewid/10))*(3.5/2),((linewid/10))*(-4/4))
-                Out: (((linewid/10))*(3.5),0)
-        C: (((linewid/10))*(3.5/3),0)
-      
-  
-  
-  ] 
-  
-
-B7:        [Tm: line from (((linewid/10))*(3.5),0) \
-     to (0,((linewid/10))*(-4/2)) \
-     then to (0,((linewid/10))*(4/2)) \
-     then to (((linewid/10))*(3.5),0)
-     Tc: (((linewid/10))*(3.5/2),0)
-            NE: (((linewid/10))*(3.5/2),((linewid/10))*(4/4))
-      SE: (((linewid/10))*(3.5/2),((linewid/10))*(-4/4))
-                Out: (((linewid/10))*(3.5),0)
-      In1: (0,0)
-      C: (((linewid/10))*(3.5/3),0)
-      
-  
-  
-  ] at (B1,C)
-
-G1:       [           Bt: line from (((linewid/10))*(0+7/3),((linewid/10))*((2*3)/2)) \
-     to (0,((linewid/10))*((2*3)/2)) chop 0 chop -(linethick *(scale/72)/2)
-    ArcB: arc cw to (0,((linewid/10))*(-(2*3)/2)) \
-      with .c at (((linewid/10))*(0-sqrt((7*(2*3)/((2*3)))^2-((2*3)/2)^2)),0)
-    Bb: line to (((linewid/10))*(0+7/3),((linewid/10))*(-(2*3)/2)) chop -(linethick *(scale/72)/2) chop 0
-         ArcN: arc  cw from (((linewid/10))*(0+7/3),((linewid/10))*((2*3)/2)) \
-     to (((linewid/10))*(0+7),0) \
-     with .c at (((linewid/10))*(0+7/3),((linewid/10))*(-((7*2/3)^2-((2*3)/2)^2)/((2*3))))
-   ArcS: arc ccw from (((linewid/10))*(0+7/3),((linewid/10))*(-(2*3)/2)) \
-     to (((linewid/10))*(0+7),0) \
-     with .c at (((linewid/10))*(0+7/3),((linewid/10))*(((7*2/3)^2-((2*3)/2)^2)/((2*3))))
-          NE: (((linewid/10))*(0+7/3),((linewid/10))*(-((7*2/3)^2-((2*3)/2)^2)/((2*3))))+(((linewid/10))*(((2*3)/2+((7*2/3)^2-((2*3)/2)^2)/((2*3)))*(cos((60)*dtor_))),((linewid/10))*(((2*3)/2+((7*2/3)^2-((2*3)/2)^2)/((2*3)))*(sin((60)*dtor_))))
-      SE: (((linewid/10))*(0+7/3),((linewid/10))*(((7*2/3)^2-((2*3)/2)^2)/((2*3))))+(((linewid/10))*(((2*3)/2+((7*2/3)^2-((2*3)/2)^2)/((2*3)))*(cos((-60)*dtor_))),((linewid/10))*(((2*3)/2+((7*2/3)^2-((2*3)/2)^2)/((2*3)))*(sin((-60)*dtor_))))
-            N_Out: circle diam (3/2)*(linewid/10) \
-    at (((linewid/10))*(0+7+((3/2)/2)),0)
-    Out: (((linewid/10))*(0+7+(3/2)),0)
-                         In1: (((linewid/10))*(-sqrt((7*(2*3)/((2*3)))^2-((2*3)/2)^2)+sqrt((7*(2*3)/((2*3)))^2-((2*3)/2/min(2,6-1)*(2+1-2*1))^2)),((linewid/10))*((2*3)/2/min(2,6-1)*(2+1-2*1)))
-            
-       In2: (((linewid/10))*(-sqrt((7*(2*3)/((2*3)))^2-((2*3)/2)^2)+sqrt((7*(2*3)/((2*3)))^2-((2*3)/2/min(2,6-1)*(2+1-2*2))^2)),((linewid/10))*((2*3)/2/min(2,6-1)*(2+1-2*2)))
-            
-  
-  
-    C: (((linewid/10))*(0+7/2),0)
-  ] with .Out at (B1.Out,DE)
-G2:       [           Bt: line from (((linewid/10))*(0+7/3),((linewid/10))*((2*3)/2)) \
-     to (0,((linewid/10))*((2*3)/2)) chop 0 chop -(linethick *(scale/72)/2)
-    ArcB: arc cw to (0,((linewid/10))*(-(2*3)/2)) \
-      with .c at (((linewid/10))*(0-sqrt((7*(2*3)/((2*3)))^2-((2*3)/2)^2)),0)
-    Bb: line to (((linewid/10))*(0+7/3),((linewid/10))*(-(2*3)/2)) chop -(linethick *(scale/72)/2) chop 0
-         ArcN: arc  cw from (((linewid/10))*(0+7/3),((linewid/10))*((2*3)/2)) \
-     to (((linewid/10))*(0+7),0) \
-     with .c at (((linewid/10))*(0+7/3),((linewid/10))*(-((7*2/3)^2-((2*3)/2)^2)/((2*3))))
-   ArcS: arc ccw from (((linewid/10))*(0+7/3),((linewid/10))*(-(2*3)/2)) \
-     to (((linewid/10))*(0+7),0) \
-     with .c at (((linewid/10))*(0+7/3),((linewid/10))*(((7*2/3)^2-((2*3)/2)^2)/((2*3))))
-          NE: (((linewid/10))*(0+7/3),((linewid/10))*(-((7*2/3)^2-((2*3)/2)^2)/((2*3))))+(((linewid/10))*(((2*3)/2+((7*2/3)^2-((2*3)/2)^2)/((2*3)))*(cos((60)*dtor_))),((linewid/10))*(((2*3)/2+((7*2/3)^2-((2*3)/2)^2)/((2*3)))*(sin((60)*dtor_))))
-      SE: (((linewid/10))*(0+7/3),((linewid/10))*(((7*2/3)^2-((2*3)/2)^2)/((2*3))))+(((linewid/10))*(((2*3)/2+((7*2/3)^2-((2*3)/2)^2)/((2*3)))*(cos((-60)*dtor_))),((linewid/10))*(((2*3)/2+((7*2/3)^2-((2*3)/2)^2)/((2*3)))*(sin((-60)*dtor_))))
-            N_Out: circle diam (3/2)*(linewid/10) \
-    at (((linewid/10))*(0+7+((3/2)/2)),0)
-    Out: (((linewid/10))*(0+7+(3/2)),0)
-                         In1: (((linewid/10))*(-sqrt((7*(2*3)/((2*3)))^2-((2*3)/2)^2)+sqrt((7*(2*3)/((2*3)))^2-((2*3)/2/min(2,6-1)*(2+1-2*1))^2)),((linewid/10))*((2*3)/2/min(2,6-1)*(2+1-2*1)))
-            
-       In2: (((linewid/10))*(-sqrt((7*(2*3)/((2*3)))^2-((2*3)/2)^2)+sqrt((7*(2*3)/((2*3)))^2-((2*3)/2/min(2,6-1)*(2+1-2*2))^2)),((linewid/10))*((2*3)/2/min(2,6-1)*(2+1-2*2)))
-            
-  
-  
-    C: (((linewid/10))*(0+7/2),0)
-  ] at (B2+(((linewid/10))*(((3/2)/2)),0),G1-(0,((linewid/10))*((2*3))))
-G3:                  [ Bm: line from (((linewid/10))*(7-(2*3)/2),((linewid/10))*(-(2*3)/2)) \
-     to (0,((linewid/10))*(-(2*3)/2)) \
-     then to (0,((linewid/10))*((2*3)/2)) then \
-     to (((linewid/10))*(7-(2*3)/2),((linewid/10))*((2*3)/2))
-       Arc: arc cw rad (2*3)/2 \
-     to Here+(0,((linewid/10))*(-(2*3))) \
-     with .c at Here+(0,((linewid/10))*(-(2*3)/2))
-           NE: (((linewid/10))*(7-(2*3)/2),0)+(((linewid/10))*(((2*3)/2)*(cos((45)*dtor_))),((linewid/10))*(((2*3)/2)*(sin((45)*dtor_))))
-         SE: (((linewid/10))*(7-(2*3)/2),0)+(((linewid/10))*(((2*3)/2)*(cos((-45)*dtor_))),((linewid/10))*(((2*3)/2)*(sin((-45)*dtor_))))
-             Out: (((linewid/10))*(7),0)
-               
-   In1: (0,((linewid/10))*((2*3)/min(4,6-1)*((4+1)/2-1)))     
-   In2: (0,((linewid/10))*((2*3)/min(4,6-1)*((4+1)/2-2)))     
-   In3: (0,((linewid/10))*((2*3)/min(4,6-1)*((4+1)/2-3)))     
-   In4: (0,((linewid/10))*((2*3)/min(4,6-1)*((4+1)/2-4)))     
-   
-    C: (((linewid/10))*(7/2),0)
-  ] with .In1 at (G2.Out+(9*(linewid/10)*5/2,0),A2)
-G5:                  [ Bm: line from (((linewid/10))*(7-(2*3)/2),((linewid/10))*(-(2*3)/2)) \
-     to (0,((linewid/10))*(-(2*3)/2)) \
-     then to (0,((linewid/10))*((2*3)/2)) then \
-     to (((linewid/10))*(7-(2*3)/2),((linewid/10))*((2*3)/2))
-       Arc: arc cw rad (2*3)/2 \
-     to Here+(0,((linewid/10))*(-(2*3))) \
-     with .c at Here+(0,((linewid/10))*(-(2*3)/2))
-           NE: (((linewid/10))*(7-(2*3)/2),0)+(((linewid/10))*(((2*3)/2)*(cos((45)*dtor_))),((linewid/10))*(((2*3)/2)*(sin((45)*dtor_))))
-         SE: (((linewid/10))*(7-(2*3)/2),0)+(((linewid/10))*(((2*3)/2)*(cos((-45)*dtor_))),((linewid/10))*(((2*3)/2)*(sin((-45)*dtor_))))
-             Out: (((linewid/10))*(7),0)
-               
-   In1: (0,((linewid/10))*((2*3)/min(4,6-1)*((4+1)/2-1)))     
-   In2: (0,((linewid/10))*((2*3)/min(4,6-1)*((4+1)/2-2)))     
-   In3: (0,((linewid/10))*((2*3)/min(4,6-1)*((4+1)/2-3)))     
-   In4: (0,((linewid/10))*((2*3)/min(4,6-1)*((4+1)/2-4)))     
-   
-    C: (((linewid/10))*(7/2),0)
-  ] with .In4 at (G3.In1,G2.Out)
-G6:            [ Bm: line from (((linewid/10))*(7-(2*3)/2),((linewid/10))*(-(2*3)/2)) \
-     to (0,((linewid/10))*(-(2*3)/2)) \
-     then to (0,((linewid/10))*((2*3)/2)) then \
-     to (((linewid/10))*(7-(2*3)/2),((linewid/10))*((2*3)/2))
-       Arc: arc cw rad (2*3)/2 \
-     to Here+(0,((linewid/10))*(-(2*3))) \
-     with .c at Here+(0,((linewid/10))*(-(2*3)/2))
-           NE: (((linewid/10))*(7-(2*3)/2),0)+(((linewid/10))*(((2*3)/2)*(cos((45)*dtor_))),((linewid/10))*(((2*3)/2)*(sin((45)*dtor_))))
-         SE: (((linewid/10))*(7-(2*3)/2),0)+(((linewid/10))*(((2*3)/2)*(cos((-45)*dtor_))),((linewid/10))*(((2*3)/2)*(sin((-45)*dtor_))))
-             Out: (((linewid/10))*(7),0)
-               
-   In1: (0,((linewid/10))*((2*3)/min(2,6-1)*((2+1)/2-1)))     
-   In2: (0,((linewid/10))*((2*3)/min(2,6-1)*((2+1)/2-2)))     
-   
-    C: (((linewid/10))*(7/2),0)
-  ] at G5+(((linewid/10))*(7),((linewid/10))*((2*3)*3/4))+((linewid/10)*5/2*2,0)
-G4:       [           Bt: line from (((linewid/10))*(0+7/3),((linewid/10))*((2*3)/2)) \
-     to (0,((linewid/10))*((2*3)/2)) chop 0 chop -(linethick *(scale/72)/2)
-    ArcB: arc cw to (0,((linewid/10))*(-(2*3)/2)) \
-      with .c at (((linewid/10))*(0-sqrt((7*(2*3)/((2*3)))^2-((2*3)/2)^2)),0)
-    Bb: line to (((linewid/10))*(0+7/3),((linewid/10))*(-(2*3)/2)) chop -(linethick *(scale/72)/2) chop 0
-         ArcN: arc  cw from (((linewid/10))*(0+7/3),((linewid/10))*((2*3)/2)) \
-     to (((linewid/10))*(0+7),0) \
-     with .c at (((linewid/10))*(0+7/3),((linewid/10))*(-((7*2/3)^2-((2*3)/2)^2)/((2*3))))
-   ArcS: arc ccw from (((linewid/10))*(0+7/3),((linewid/10))*(-(2*3)/2)) \
-     to (((linewid/10))*(0+7),0) \
-     with .c at (((linewid/10))*(0+7/3),((linewid/10))*(((7*2/3)^2-((2*3)/2)^2)/((2*3))))
-          NE: (((linewid/10))*(0+7/3),((linewid/10))*(-((7*2/3)^2-((2*3)/2)^2)/((2*3))))+(((linewid/10))*(((2*3)/2+((7*2/3)^2-((2*3)/2)^2)/((2*3)))*(cos((60)*dtor_))),((linewid/10))*(((2*3)/2+((7*2/3)^2-((2*3)/2)^2)/((2*3)))*(sin((60)*dtor_))))
-      SE: (((linewid/10))*(0+7/3),((linewid/10))*(((7*2/3)^2-((2*3)/2)^2)/((2*3))))+(((linewid/10))*(((2*3)/2+((7*2/3)^2-((2*3)/2)^2)/((2*3)))*(cos((-60)*dtor_))),((linewid/10))*(((2*3)/2+((7*2/3)^2-((2*3)/2)^2)/((2*3)))*(sin((-60)*dtor_))))
-            N_Out: circle diam (3/2)*(linewid/10) \
-    at (((linewid/10))*(0+7+((3/2)/2)),0)
-    Out: (((linewid/10))*(0+7+(3/2)),0)
-                         In1: (((linewid/10))*(-sqrt((7*(2*3)/((2*3)))^2-((2*3)/2)^2)+sqrt((7*(2*3)/((2*3)))^2-((2*3)/2/min(2,6-1)*(2+1-2*1))^2)),((linewid/10))*((2*3)/2/min(2,6-1)*(2+1-2*1)))
-            
-       In2: (((linewid/10))*(-sqrt((7*(2*3)/((2*3)))^2-((2*3)/2)^2)+sqrt((7*(2*3)/((2*3)))^2-((2*3)/2/min(2,6-1)*(2+1-2*2))^2)),((linewid/10))*((2*3)/2/min(2,6-1)*(2+1-2*2)))
-            
-  
-  
-    C: (((linewid/10))*(0+7/2),0)
-  ] with .In1 at (G6.Out,G3)+(2*(linewid/10)*5/2,0)
-G7:       [           Bt: line from (((linewid/10))*(0+7/3),((linewid/10))*((2*3)/2)) \
-     to (0,((linewid/10))*((2*3)/2)) chop 0 chop -(linethick *(scale/72)/2)
-    ArcB: arc cw to (0,((linewid/10))*(-(2*3)/2)) \
-      with .c at (((linewid/10))*(0-sqrt((7*(2*3)/((2*3)))^2-((2*3)/2)^2)),0)
-    Bb: line to (((linewid/10))*(0+7/3),((linewid/10))*(-(2*3)/2)) chop -(linethick *(scale/72)/2) chop 0
-         ArcN: arc  cw from (((linewid/10))*(0+7/3),((linewid/10))*((2*3)/2)) \
-     to (((linewid/10))*(0+7),0) \
-     with .c at (((linewid/10))*(0+7/3),((linewid/10))*(-((7*2/3)^2-((2*3)/2)^2)/((2*3))))
-   ArcS: arc ccw from (((linewid/10))*(0+7/3),((linewid/10))*(-(2*3)/2)) \
-     to (((linewid/10))*(0+7),0) \
-     with .c at (((linewid/10))*(0+7/3),((linewid/10))*(((7*2/3)^2-((2*3)/2)^2)/((2*3))))
-          NE: (((linewid/10))*(0+7/3),((linewid/10))*(-((7*2/3)^2-((2*3)/2)^2)/((2*3))))+(((linewid/10))*(((2*3)/2+((7*2/3)^2-((2*3)/2)^2)/((2*3)))*(cos((60)*dtor_))),((linewid/10))*(((2*3)/2+((7*2/3)^2-((2*3)/2)^2)/((2*3)))*(sin((60)*dtor_))))
-      SE: (((linewid/10))*(0+7/3),((linewid/10))*(((7*2/3)^2-((2*3)/2)^2)/((2*3))))+(((linewid/10))*(((2*3)/2+((7*2/3)^2-((2*3)/2)^2)/((2*3)))*(cos((-60)*dtor_))),((linewid/10))*(((2*3)/2+((7*2/3)^2-((2*3)/2)^2)/((2*3)))*(sin((-60)*dtor_))))
-            N_Out: circle diam (3/2)*(linewid/10) \
-    at (((linewid/10))*(0+7+((3/2)/2)),0)
-    Out: (((linewid/10))*(0+7+(3/2)),0)
-                         In1: (((linewid/10))*(-sqrt((7*(2*3)/((2*3)))^2-((2*3)/2)^2)+sqrt((7*(2*3)/((2*3)))^2-((2*3)/2/min(2,6-1)*(2+1-2*1))^2)),((linewid/10))*((2*3)/2/min(2,6-1)*(2+1-2*1)))
-            
-       In2: (((linewid/10))*(-sqrt((7*(2*3)/((2*3)))^2-((2*3)/2)^2)+sqrt((7*(2*3)/((2*3)))^2-((2*3)/2/min(2,6-1)*(2+1-2*2))^2)),((linewid/10))*((2*3)/2/min(2,6-1)*(2+1-2*2)))
-            
-  
-  
-    C: (((linewid/10))*(0+7/2),0)
-  ] with .In2 at (G4.In2,G5.Out)
-
-# Output to other latches
-TOL: (G2.Out,C)+(4*(linewid/10)*5/2,-4*(linewid/10))
-  move to TOL+(3*(linewid/10)*5/2,-(linewid/10)*5/2/3) ; {move down 0.15}
-  "\sf {\sl To other latches}" below
-
-# Remaining input lines
-  line from G1.In1 to (DE,G1.In1); "\sf D " rjust
-  line from G1.In2 to (DE,G1.In2); "\sf E " rjust
-  [  circle rad (0.04*linewid)  fill 0    ] with .c at G1.In2-((linewid/10)*5/2,0)
-  move to last [].c; line to (Here,G2.In2) then to G2.In2
-  line from C to B7.In1
-
-# Connect Bi, and connect to output bus
- [  circle rad (0.04*linewid)  fill 0    ] with .c at T1.c
-  move to last [].c ; line down (A2.y-A1.y)/2
-  line to (TOL-(1*(linewid/10)*5/2,0),Here) ; arrow to (Here,TOL) 
-   [  circle rad (0.04*linewid)  fill 0    ] with .c at T2.c
-  move to last [].c ; line down (A2.y-A1.y)/2
-  line to (TOL-(2*(linewid/10)*5/2,0),Here) ; arrow to (Here,TOL) 
-   [  circle rad (0.04*linewid)  fill 0    ] with .c at T3.c
-  move to last [].c ; line down (A2.y-A1.y)/2
-  line to (TOL-(3*(linewid/10)*5/2,0),Here) ; arrow to (Here,TOL) 
-  
-
-# G1 to G2
-  [  circle rad (0.04*linewid)  fill 0    ] with .c at (T1.c,G1)
-  move to last [].c; line to (Here,G2.In1) then to G2.In1
-
-# Upper And inputs to output bus
- line left 4*(linewid/10)*5/2 from G3.In1
-  arrow to (Here,TOL) 
-   line left 3*(linewid/10)*5/2 from G3.In2
-  arrow to (Here,TOL) 
-   line left 2*(linewid/10)*5/2 from G3.In3
-  arrow to (Here,TOL) 
-   line left 1*(linewid/10)*5/2 from G3.In4
-  arrow to (Here,TOL) 
-  
-
-  line from B2.Out to (G3.In1,B2)-(4*(linewid/10)*5/2,0) ; [  circle rad (0.04*linewid)  fill 0    ] with .c at Here
-  move to last [].c
-  line from B4.Out to (G3.In2,B4)-(3*(linewid/10)*5/2,0) ; [  circle rad (0.04*linewid)  fill 0    ] with .c at Here
-  move to last [].c
-  line from B6.Out to (G3.In3,B6)-(2*(linewid/10)*5/2,0) ; [  circle rad (0.04*linewid)  fill 0    ] with .c at Here
-  move to last [].c
-  line from G1.Out to (G3.In4,G1)-((linewid/10)*5/2,0) ; [  circle rad (0.04*linewid)  fill 0    ] with .c at Here
-  move to last [].c
-
-# Lower And inputs
-  line left 4*(linewid/10)*5/2 from G5.In1 ; [  circle rad (0.04*linewid)  fill 0    ] with .c at Here
-  move to last [].c
-  line left 3*(linewid/10)*5/2 from G5.In2 ; [  circle rad (0.04*linewid)  fill 0    ] with .c at Here
-  move to last [].c
-  line left 2*(linewid/10)*5/2 from G5.In3 ; [  circle rad (0.04*linewid)  fill 0    ] with .c at Here
-  move to last [].c
-  line from G2.Out to G5.In4 ; [  circle rad (0.04*linewid)  fill 0    ] with .c at (TOL,Here)
-  move to last [].c ; arrow to (Here,TOL)
-
-# Fix up G4, G6, G7
-  line from G3.Out to G4.In1
-  line right (linewid/10)*5/2 from G4.Out
-  {[  circle rad (0.04*linewid)  fill 0    ] with .c at Here
-  move to last [].c; line right (linewid/10)*5/2 ; "\sf  Q7" ljust; move right 0.2 } # letters in object
-  line down 2*(linewid/10)*5/2 then to G6.In1+(-(linewid/10)*5/2,(linewid/10)*5/2)
-    line to (Here,G6.In1) then to G6.In1
-  line from G4.In2 to (G6.In1+(-(linewid/10)*5/2,0),G4.In2)
-    line down (linewid/10)*5/2 then to G7.Out+((linewid/10)*5/2,2*(linewid/10)*5/2)
-    line to (Here,G7) then to G7.Out
-  line from G6.Out right (linewid/10)*5/2 ; line to (Here,G7.In1) then to G7.In1
-  line from G5.Out to G7.In2
-  line left (linewid/10)*5/2 from G6.In2 ; arrow to (Here,TOL)
-  [  circle rad (0.04*linewid)  fill 0    ] with .c at (Here,C)
-  move to last [].c ; line to B7.Out
-
-.PE
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test.svg b/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test.svg
deleted file mode 100644
index a9c554efdce..00000000000
--- a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test.svg
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="337.972pt" height="139.358pt" viewBox="0 0 337.972 139.358" version="1.1">
-<defs>
-<g>
-<symbol overflow="visible" id="glyph0-0">
-<path style="stroke:none;" d=""/>
-</symbol>
-<symbol overflow="visible" id="glyph0-1">
-<path style="stroke:none;" d="M 5.796875 -1.140625 C 5.21875 -0.75 4.875 -0.53125 3.890625 -0.53125 C 2.453125 -0.53125 1.5625 -2.03125 1.5625 -3.46875 C 1.5625 -4.828125 2.375 -6.390625 3.90625 -6.390625 C 4.609375 -6.390625 5.0625 -6.21875 5.609375 -5.875 L 5.75 -6.6875 C 5.328125 -6.890625 4.5625 -7.03125 3.921875 -7.03125 C 2.078125 -7.03125 0.65625 -5.46875 0.65625 -3.375 C 0.65625 -1.796875 1.84375 0.109375 3.921875 0.109375 C 4.828125 0.109375 5.21875 -0.046875 5.859375 -0.453125 Z M 5.796875 -1.140625 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-2">
-<path style="stroke:none;" d="M 3.765625 -6.921875 L 2.875 -6.921875 L 0.28125 0 L 1.015625 0 L 1.78125 -2.03125 L 4.6875 -2.03125 L 5.4375 0 L 6.359375 0 Z M 4.46875 -2.59375 L 2 -2.59375 L 2.640625 -4.390625 C 2.84375 -4.984375 3.15625 -5.828125 3.234375 -6.203125 C 3.265625 -6.0625 3.328125 -5.8125 3.5625 -5.15625 Z M 4.46875 -2.59375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-3">
-<path style="stroke:none;" d="M 4.5625 -3.25 C 4.5625 -4.03125 4.515625 -4.96875 4.09375 -5.765625 C 3.6875 -6.515625 3 -6.765625 2.5 -6.765625 C 1.90625 -6.765625 1.203125 -6.484375 0.796875 -5.609375 C 0.46875 -4.875 0.421875 -4.046875 0.421875 -3.25 C 0.421875 -2.46875 0.453125 -1.734375 0.75 -1 C 1.15625 -0.046875 1.90625 0.21875 2.484375 0.21875 C 3.203125 0.21875 3.84375 -0.1875 4.15625 -0.875 C 4.453125 -1.53125 4.5625 -2.1875 4.5625 -3.25 Z M 2.5 -0.390625 C 1.96875 -0.390625 1.5625 -0.765625 1.359375 -1.484375 C 1.203125 -2.046875 1.203125 -2.59375 1.203125 -3.375 C 1.203125 -4 1.203125 -4.59375 1.359375 -5.140625 C 1.421875 -5.328125 1.671875 -6.15625 2.484375 -6.15625 C 3.265625 -6.15625 3.515625 -5.390625 3.59375 -5.21875 C 3.78125 -4.65625 3.78125 -3.984375 3.78125 -3.375 C 3.78125 -2.71875 3.78125 -2.078125 3.59375 -1.453125 C 3.34375 -0.546875 2.8125 -0.390625 2.5 -0.390625 Z M 2.5 -0.390625 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-4">
-<path style="stroke:none;" d="M 2.984375 -6.765625 L 2.78125 -6.765625 C 2.1875 -6.15625 1.359375 -6.125 0.890625 -6.09375 L 0.890625 -5.515625 C 1.21875 -5.53125 1.6875 -5.546875 2.1875 -5.765625 L 2.1875 -0.578125 L 0.953125 -0.578125 L 0.953125 0 L 4.234375 0 L 4.234375 -0.578125 L 2.984375 -0.578125 Z M 2.984375 -6.765625 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-5">
-<path style="stroke:none;" d="M 1.734375 -1.875 L 0.5 -0.640625 L 0.5 0 L 4.46875 0 L 4.46875 -0.703125 L 2.65625 -0.703125 C 2.546875 -0.703125 2.421875 -0.703125 2.296875 -0.703125 L 1.21875 -0.703125 C 1.53125 -0.984375 2.296875 -1.71875 2.609375 -2.015625 C 2.796875 -2.1875 3.296875 -2.609375 3.484375 -2.796875 C 3.9375 -3.234375 4.46875 -3.765625 4.46875 -4.609375 C 4.46875 -5.765625 3.671875 -6.765625 2.359375 -6.765625 C 1.21875 -6.765625 0.65625 -5.984375 0.421875 -5.125 C 0.53125 -4.953125 0.59375 -4.890625 0.609375 -4.859375 C 0.625 -4.84375 0.734375 -4.71875 0.828125 -4.578125 C 1.03125 -5.34375 1.3125 -6.125 2.21875 -6.125 C 3.15625 -6.125 3.65625 -5.375 3.65625 -4.59375 C 3.65625 -3.75 3.09375 -3.1875 2.5 -2.578125 Z M 1.734375 -1.875 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-6">
-<path style="stroke:none;" d="M 0.953125 -6.921875 L 0.953125 0 L 3.578125 0 C 5.28125 0 6.625 -1.515625 6.625 -3.40625 C 6.625 -5.328125 5.28125 -6.921875 3.5625 -6.921875 Z M 1.8125 -0.5625 L 1.8125 -6.359375 L 3.34375 -6.359375 C 4.734375 -6.359375 5.765625 -5.15625 5.765625 -3.40625 C 5.765625 -1.703125 4.734375 -0.5625 3.34375 -0.5625 Z M 1.8125 -0.5625 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-7">
-<path style="stroke:none;" d="M 5.109375 -3.28125 L 5.109375 -3.890625 L 1.828125 -3.890625 L 1.828125 -6.25 L 3.203125 -6.25 C 3.3125 -6.25 3.4375 -6.234375 3.5625 -6.234375 L 5.390625 -6.234375 L 5.390625 -6.890625 L 0.9375 -6.890625 L 0.9375 0 L 5.515625 0 L 5.515625 -0.703125 L 4.265625 -0.703125 C 4.140625 -0.703125 4.03125 -0.703125 3.90625 -0.703125 L 1.828125 -0.703125 L 1.828125 -3.28125 Z M 5.109375 -3.28125 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-8">
-<path style="stroke:none;" d="M 5.3125 -0.328125 C 6.40625 -1.171875 6.765625 -2.390625 6.765625 -3.4375 C 6.765625 -5.53125 5.328125 -7.140625 3.671875 -7.140625 C 1.96875 -7.140625 0.5625 -5.515625 0.5625 -3.4375 C 0.5625 -1.328125 2.03125 0.21875 3.65625 0.21875 C 3.8125 0.21875 4.1875 0.203125 4.609375 0.046875 L 5.46875 1.25 L 6.5 1.25 Z M 4.234375 -0.515625 C 4.21875 -0.515625 3.953125 -0.421875 3.671875 -0.421875 C 2.5 -0.421875 1.421875 -1.578125 1.421875 -3.4375 C 1.421875 -5.296875 2.5 -6.5 3.65625 -6.5 C 4.859375 -6.5 5.90625 -5.28125 5.90625 -3.4375 C 5.90625 -2.796875 5.796875 -1.703125 4.890625 -0.890625 L 4.109375 -1.9375 L 3.21875 -1.9375 Z M 4.234375 -0.515625 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-9">
-<path style="stroke:none;" d="M 2.3125 -5.828125 C 2.4375 -5.828125 2.546875 -5.84375 2.671875 -5.84375 L 3.875 -5.84375 C 2.40625 -4.21875 1.515625 -2.21875 1.515625 0.109375 L 2.359375 0.109375 C 2.359375 -2.875 3.78125 -5.015625 4.5625 -5.890625 L 4.5625 -6.546875 L 0.421875 -6.546875 L 0.421875 -5.828125 Z M 2.3125 -5.828125 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-0">
-<path style="stroke:none;" d=""/>
-</symbol>
-<symbol overflow="visible" id="glyph1-1">
-<path style="stroke:none;" d="M 5.046875 -6.078125 C 5.09375 -6.28125 5.109375 -6.375 5.296875 -6.421875 C 5.390625 -6.4375 5.671875 -6.4375 5.859375 -6.4375 C 7.015625 -6.4375 7.375 -6.265625 7.375 -5.28125 C 7.375 -5 7.359375 -4.765625 7.328125 -4.5 L 7.578125 -4.5 L 7.765625 -6.75 L 1.671875 -6.75 L 1.109375 -4.5 L 1.359375 -4.5 C 1.78125 -6.046875 1.890625 -6.4375 3.484375 -6.4375 C 3.625 -6.4375 3.859375 -6.4375 3.921875 -6.4375 C 4.125 -6.40625 4.171875 -6.375 4.171875 -6.234375 C 4.171875 -6.15625 4.15625 -6.0625 4.140625 -5.984375 L 3.265625 -0.75 C 3.21875 -0.4375 3.1875 -0.3125 2.140625 -0.3125 L 1.75 -0.3125 L 1.703125 0 C 1.953125 -0.015625 2.390625 -0.015625 2.640625 -0.015625 L 3.59375 -0.03125 C 4.0625 -0.03125 5.078125 -0.03125 5.484375 0 L 5.53125 -0.3125 L 5.15625 -0.3125 C 4.3125 -0.3125 4.140625 -0.390625 4.140625 -0.609375 C 4.140625 -0.625 4.140625 -0.65625 4.171875 -0.765625 Z M 5.046875 -6.078125 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-2">
-<path style="stroke:none;" d="M 5.078125 -2.53125 C 5.078125 -3.640625 4.3125 -4.46875 3.234375 -4.46875 C 1.8125 -4.46875 0.59375 -3.078125 0.59375 -1.75 C 0.59375 -0.71875 1.359375 0.109375 2.46875 0.109375 C 3.796875 0.109375 5.078125 -1.09375 5.078125 -2.53125 Z M 2.515625 -0.140625 C 2.234375 -0.140625 1.390625 -0.234375 1.390625 -1.4375 C 1.390625 -1.796875 1.53125 -2.90625 1.828125 -3.40625 C 2.328125 -4.203125 3.015625 -4.25 3.1875 -4.25 C 3.515625 -4.25 4.3125 -4.09375 4.3125 -2.984375 C 4.3125 -2.75 4.234375 -1.671875 3.890625 -1.015625 C 3.578125 -0.453125 3.03125 -0.140625 2.515625 -0.140625 Z M 2.515625 -0.140625 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-3">
-<path style="stroke:none;" d="M 2.390625 -3.984375 L 3.8125 -3.984375 C 3.84375 -4.09375 3.84375 -4.203125 3.875 -4.296875 L 2.4375 -4.296875 L 2.734375 -6.125 L 2.5 -6.125 C 2.328125 -5.1875 1.796875 -4.234375 0.890625 -4.203125 L 0.859375 -3.984375 L 1.6875 -3.984375 L 1.25 -1.265625 C 1.21875 -1.09375 1.21875 -1.0625 1.21875 -0.9375 C 1.21875 0.03125 2.03125 0.109375 2.328125 0.109375 C 2.796875 0.109375 3.09375 -0.203125 3.28125 -0.53125 C 3.453125 -0.84375 3.484375 -0.984375 3.609375 -1.796875 L 3.359375 -1.796875 C 3.234375 -1.078125 3.21875 -0.9375 3.09375 -0.671875 C 3.015625 -0.53125 2.78125 -0.140625 2.40625 -0.140625 C 1.984375 -0.140625 1.890625 -0.53125 1.890625 -0.8125 C 1.890625 -0.921875 1.890625 -0.96875 1.90625 -1.03125 Z M 2.390625 -3.984375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-4">
-<path style="stroke:none;" d="M 5.0625 -3.015625 C 5.09375 -3.203125 5.09375 -3.234375 5.09375 -3.390625 C 5.09375 -4.140625 4.609375 -4.40625 3.921875 -4.40625 C 3.078125 -4.40625 2.546875 -3.796875 2.34375 -3.46875 L 2.328125 -3.484375 L 2.90625 -6.921875 L 1.65625 -6.8125 C 1.640625 -6.8125 1.484375 -6.8125 1.46875 -6.796875 C 1.453125 -6.78125 1.40625 -6.53125 1.40625 -6.5 C 1.96875 -6.5 2.109375 -6.453125 2.109375 -6.1875 C 2.109375 -6.171875 2.109375 -6.09375 2.078125 -5.921875 L 1.21875 -0.734375 C 1.15625 -0.359375 1.109375 -0.3125 0.375 -0.3125 L 0.3125 0 C 0.65625 -0.015625 1.1875 -0.03125 1.453125 -0.03125 C 1.6875 -0.03125 2.234375 -0.015625 2.546875 0 L 2.609375 -0.3125 C 2.109375 -0.3125 1.890625 -0.3125 1.890625 -0.5625 C 1.890625 -0.59375 1.953125 -0.96875 1.984375 -1.171875 C 2.046875 -1.609375 2.125 -2.046875 2.203125 -2.484375 C 2.25 -2.8125 2.34375 -3.296875 2.828125 -3.765625 C 3.125 -4.03125 3.515625 -4.1875 3.84375 -4.1875 C 4.234375 -4.1875 4.421875 -3.984375 4.421875 -3.515625 C 4.421875 -3.375 4.40625 -3.265625 4.3125 -2.6875 L 3.984375 -0.6875 C 3.921875 -0.3125 3.765625 -0.3125 3.15625 -0.3125 L 3.140625 -0.3125 L 3.09375 0 C 3.421875 -0.015625 3.953125 -0.03125 4.21875 -0.03125 C 4.46875 -0.03125 5 -0.015625 5.328125 0 L 5.390625 -0.3125 C 4.890625 -0.3125 4.65625 -0.3125 4.65625 -0.5625 C 4.65625 -0.59375 4.671875 -0.65625 4.671875 -0.703125 Z M 5.0625 -3.015625 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-5">
-<path style="stroke:none;" d="M 4.265625 -2.296875 C 4.5 -2.296875 4.53125 -2.296875 4.5625 -2.5 C 4.578125 -2.71875 4.578125 -2.875 4.578125 -2.9375 C 4.578125 -4.109375 3.796875 -4.46875 3.078125 -4.46875 C 1.734375 -4.46875 0.609375 -3.125 0.609375 -1.8125 C 0.609375 -0.703125 1.421875 0.109375 2.46875 0.109375 C 3.703125 0.109375 4.328125 -1.03125 4.328125 -1.203125 C 4.328125 -1.234375 4.3125 -1.3125 4.21875 -1.3125 C 4.140625 -1.3125 4.109375 -1.265625 4.0625 -1.171875 C 3.59375 -0.25 2.796875 -0.140625 2.53125 -0.140625 C 2.078125 -0.140625 1.40625 -0.421875 1.40625 -1.5 C 1.40625 -1.796875 1.46875 -2.15625 1.5 -2.296875 Z M 1.53125 -2.515625 C 1.890625 -4.09375 2.828125 -4.25 3.078125 -4.25 C 3.9375 -4.25 3.9375 -3.265625 3.9375 -3.078125 C 3.9375 -2.84375 3.921875 -2.78125 3.890625 -2.515625 Z M 1.53125 -2.515625 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-6">
-<path style="stroke:none;" d="M 2.234375 -3.375 L 2.40625 -4.40625 L 1.1875 -4.3125 C 1 -4.3125 1 -4.28125 0.984375 -4.234375 C 0.984375 -4.203125 0.953125 -4 0.953125 -3.984375 C 1.515625 -3.984375 1.65625 -3.9375 1.65625 -3.671875 C 1.65625 -3.65625 1.65625 -3.59375 1.625 -3.40625 L 1.171875 -0.734375 C 1.109375 -0.359375 1.078125 -0.3125 0.34375 -0.3125 L 0.328125 -0.3125 L 0.28125 0 C 0.671875 -0.015625 1.140625 -0.03125 1.421875 -0.03125 C 1.484375 -0.03125 2.359375 -0.015625 2.6875 0 C 2.703125 -0.09375 2.71875 -0.203125 2.734375 -0.3125 L 2.546875 -0.3125 C 1.9375 -0.3125 1.8125 -0.375 1.8125 -0.59375 C 1.8125 -0.734375 2.140625 -2.5 2.1875 -2.6875 C 2.359375 -3.25 2.765625 -4.1875 3.671875 -4.1875 L 3.671875 -4.171875 C 3.515625 -4.109375 3.40625 -3.921875 3.40625 -3.734375 C 3.40625 -3.421875 3.65625 -3.359375 3.78125 -3.359375 C 4.03125 -3.359375 4.265625 -3.5625 4.265625 -3.859375 C 4.265625 -4.171875 4 -4.40625 3.609375 -4.40625 C 2.96875 -4.40625 2.484375 -3.875 2.25 -3.359375 Z M 2.234375 -3.375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-7">
-<path style="stroke:none;" d="M 2.921875 -6.921875 L 1.671875 -6.8125 C 1.640625 -6.8125 1.5 -6.8125 1.484375 -6.796875 C 1.453125 -6.78125 1.421875 -6.53125 1.421875 -6.5 C 1.984375 -6.5 2.125 -6.453125 2.125 -6.1875 C 2.125 -6.171875 2.125 -6.09375 2.09375 -5.921875 L 1.21875 -0.734375 C 1.171875 -0.359375 1.125 -0.3125 0.390625 -0.3125 L 0.375 -0.3125 L 0.328125 0 C 0.65625 -0.015625 1.1875 -0.03125 1.4375 -0.03125 C 1.671875 -0.03125 2.171875 -0.015625 2.53125 0 L 2.59375 -0.3125 C 2.09375 -0.3125 1.859375 -0.3125 1.859375 -0.5625 C 1.859375 -0.59375 1.875 -0.65625 1.890625 -0.703125 Z M 2.921875 -6.921875 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-8">
-<path style="stroke:none;" d="M 4.90625 -1.453125 C 4.859375 -1.1875 4.796875 -0.765625 4.765625 -0.671875 C 4.6875 -0.375 4.5 -0.25 4.34375 -0.25 C 4.125 -0.25 4.0625 -0.46875 4.0625 -0.65625 C 4.0625 -0.75 4.140625 -1.25 4.171875 -1.375 C 4.234375 -1.6875 4.453125 -2.984375 4.453125 -3.203125 C 4.453125 -3.96875 3.78125 -4.46875 2.9375 -4.46875 C 1.9375 -4.46875 1.25 -3.8125 1.25 -3.265625 C 1.25 -3.09375 1.359375 -2.875 1.671875 -2.875 C 1.953125 -2.875 2.1875 -3.109375 2.1875 -3.390625 C 2.1875 -3.65625 2 -3.78125 1.765625 -3.78125 C 2.078125 -4.140625 2.609375 -4.25 2.90625 -4.25 C 3.484375 -4.25 3.78125 -3.78125 3.78125 -3.28125 C 3.78125 -3.1875 3.703125 -2.640625 3.671875 -2.609375 C 3.65625 -2.609375 3.625 -2.609375 3.40625 -2.59375 C 1.75 -2.53125 0.5625 -1.75 0.5625 -0.8125 C 0.5625 -0.046875 1.53125 0.109375 2.015625 0.109375 C 2.90625 0.109375 3.375 -0.59375 3.453125 -0.734375 C 3.453125 -0.046875 3.875 0.0625 4.09375 0.0625 C 4.375 0.0625 4.9375 -0.140625 5.046875 -0.875 C 5.078125 -1 5.09375 -1.078125 5.15625 -1.453125 Z M 3.5 -1.5 C 3.453125 -1.203125 3.40625 -0.890625 3.015625 -0.515625 C 2.78125 -0.28125 2.4375 -0.109375 2.078125 -0.109375 C 1.65625 -0.109375 1.328125 -0.390625 1.328125 -0.796875 C 1.328125 -0.8125 1.328125 -2.296875 3.65625 -2.390625 Z M 3.5 -1.5 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-9">
-<path style="stroke:none;" d="M 4.234375 -3.84375 C 3.71875 -3.828125 3.671875 -3.421875 3.671875 -3.3125 C 3.671875 -3.15625 3.765625 -2.9375 4.078125 -2.9375 C 4.328125 -2.9375 4.609375 -3.125 4.609375 -3.515625 C 4.609375 -4.171875 3.890625 -4.46875 3.234375 -4.46875 C 1.859375 -4.46875 0.671875 -3.15625 0.671875 -1.78125 C 0.671875 -0.640625 1.484375 0.109375 2.484375 0.109375 C 3.8125 0.109375 4.328125 -1.09375 4.328125 -1.1875 C 4.328125 -1.265625 4.25 -1.28125 4.203125 -1.28125 C 4.125 -1.28125 4.109375 -1.265625 4.0625 -1.140625 C 3.734375 -0.46875 3.15625 -0.140625 2.578125 -0.140625 C 2.09375 -0.140625 1.46875 -0.484375 1.46875 -1.5625 C 1.46875 -2.90625 2.1875 -4.21875 3.234375 -4.21875 C 3.375 -4.21875 3.953125 -4.203125 4.234375 -3.84375 Z M 4.234375 -3.84375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-10">
-<path style="stroke:none;" d="M 4.046875 -4.21875 C 4.0625 -4.3125 4.0625 -4.328125 4.0625 -4.359375 C 4.0625 -4.421875 4.03125 -4.46875 3.953125 -4.46875 C 3.921875 -4.46875 3.890625 -4.46875 3.75 -4.34375 C 3.625 -4.25 3.625 -4.25 3.546875 -4.1875 C 3.21875 -4.46875 2.78125 -4.46875 2.65625 -4.46875 C 1.21875 -4.46875 0.859375 -3.5625 0.859375 -3.09375 C 0.859375 -2.75 1.015625 -2.515625 1.21875 -2.359375 C 1.484375 -2.125 1.78125 -2.0625 2.25 -1.96875 C 2.6875 -1.890625 3.296875 -1.765625 3.296875 -1.15625 C 3.296875 -0.8125 3.046875 -0.109375 1.984375 -0.109375 C 1.5 -0.109375 0.90625 -0.28125 0.84375 -1.484375 C 0.84375 -1.640625 0.84375 -1.6875 0.71875 -1.6875 C 0.625 -1.6875 0.609375 -1.671875 0.578125 -1.484375 L 0.34375 -0.15625 C 0.328125 -0.0625 0.328125 -0.046875 0.328125 0 C 0.328125 0.0625 0.375 0.109375 0.4375 0.109375 C 0.484375 0.109375 0.5 0.09375 0.703125 -0.09375 C 0.765625 -0.15625 0.90625 -0.28125 0.953125 -0.328125 C 1.21875 0.015625 1.59375 0.109375 1.984375 0.109375 C 3.4375 0.109375 3.8125 -0.953125 3.8125 -1.46875 C 3.8125 -1.84375 3.65625 -2.09375 3.484375 -2.265625 C 3.1875 -2.5625 2.9375 -2.609375 2.390625 -2.71875 C 1.9375 -2.796875 1.390625 -2.90625 1.390625 -3.40625 C 1.390625 -3.421875 1.390625 -4.28125 2.65625 -4.28125 C 2.84375 -4.28125 3.625 -4.28125 3.625 -3.375 C 3.625 -3.234375 3.609375 -3.109375 3.609375 -3.078125 C 3.609375 -2.984375 3.703125 -2.984375 3.734375 -2.984375 C 3.84375 -2.984375 3.84375 -3.046875 3.875 -3.203125 Z M 4.046875 -4.21875 "/>
-</symbol>
-</g>
-</defs>
-<g id="surface1">
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-1" x="8.579" y="113.658"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-2" x="3.321" y="54.259"/>
-  <use xlink:href="#glyph0-3" x="9.963065" y="54.259"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-2" x="3.321" y="32.659"/>
-  <use xlink:href="#glyph0-4" x="9.963065" y="32.659"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-2" x="3.321" y="11.058"/>
-  <use xlink:href="#glyph0-5" x="9.963065" y="11.058"/>
-</g>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 0.00184375 102.601344 L 27.001844 102.601344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 39.5995 102.601344 L 27.001844 95.402125 L 27.001844 109.800563 L 39.5995 102.601344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 45.001844 102.601344 C 45.001844 104.093531 43.790906 105.300563 42.298719 105.300563 C 40.806531 105.300563 39.5995 104.093531 39.5995 102.601344 C 39.5995 101.109156 40.806531 99.898219 42.298719 99.898219 C 43.790906 99.898219 45.001844 101.109156 45.001844 102.601344 Z M 45.001844 102.601344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 45.001844 102.601344 L 63.001844 102.601344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 81.001844 102.601344 L 68.400281 95.402125 L 68.400281 109.800563 L 81.001844 102.601344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 68.404188 102.601344 C 68.404188 104.093531 67.19325 105.300563 65.701063 105.300563 C 64.208875 105.300563 62.997938 104.093531 62.997938 102.601344 C 62.997938 101.109156 64.208875 99.898219 65.701063 99.898219 C 67.19325 99.898219 68.404188 101.109156 68.404188 102.601344 Z M 68.404188 102.601344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 0.00184375 80.999781 L 27.001844 80.999781 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 39.5995 80.999781 L 27.001844 73.800563 L 27.001844 88.202906 L 39.5995 80.999781 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 45.001844 80.999781 C 45.001844 82.491969 43.790906 83.702906 42.298719 83.702906 C 40.806531 83.702906 39.5995 82.491969 39.5995 80.999781 C 39.5995 79.507594 40.806531 78.300563 42.298719 78.300563 C 43.790906 78.300563 45.001844 79.507594 45.001844 80.999781 Z M 45.001844 80.999781 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 45.001844 80.999781 L 63.001844 80.999781 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 81.001844 80.999781 L 68.400281 73.800563 L 68.400281 88.202906 L 81.001844 80.999781 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 68.404188 80.999781 C 68.404188 82.491969 67.19325 83.702906 65.701063 83.702906 C 64.208875 83.702906 62.997938 82.491969 62.997938 80.999781 C 62.997938 79.507594 64.208875 78.300563 65.701063 78.300563 C 67.19325 78.300563 68.404188 79.507594 68.404188 80.999781 Z M 68.404188 80.999781 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 0.00184375 59.402125 L 27.001844 59.402125 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 39.5995 59.402125 L 27.001844 52.199 L 27.001844 66.601344 L 39.5995 59.402125 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 45.001844 59.402125 C 45.001844 60.890406 43.790906 62.101344 42.298719 62.101344 C 40.806531 62.101344 39.5995 60.890406 39.5995 59.402125 C 39.5995 57.909938 40.806531 56.699 42.298719 56.699 C 43.790906 56.699 45.001844 57.909938 45.001844 59.402125 Z M 45.001844 59.402125 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 45.001844 59.402125 L 63.001844 59.402125 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 81.001844 59.402125 L 68.400281 52.199 L 68.400281 66.601344 L 81.001844 59.402125 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 68.404188 59.402125 C 68.404188 60.890406 67.19325 62.101344 65.701063 62.101344 C 64.208875 62.101344 62.997938 60.890406 62.997938 59.402125 C 62.997938 57.909938 64.208875 56.699 65.701063 56.699 C 67.19325 56.699 68.404188 57.909938 68.404188 59.402125 Z M 68.404188 59.402125 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 42.298719 -0.00021875 L 29.701063 -7.199437 L 29.701063 7.199 L 42.298719 -0.00021875 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 22.798719 48.601344 L 14.001844 48.601344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 14.326063 48.757594 C 17.642469 41.890406 17.669813 33.890406 14.400281 26.999781 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 14.001844 26.999781 L 22.798719 26.999781 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 22.798719 48.601344 C 30.033094 48.601344 36.5995 44.378688 39.5995 37.800563 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 22.798719 26.999781 C 30.033094 26.999781 36.5995 31.222438 39.5995 37.800563 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 45.001844 37.800563 C 45.001844 39.29275 43.790906 40.499781 42.298719 40.499781 C 40.806531 40.499781 39.5995 39.29275 39.5995 37.800563 C 39.5995 36.308375 40.806531 35.097438 42.298719 35.097438 C 43.790906 35.097438 45.001844 36.308375 45.001844 37.800563 Z M 45.001844 37.800563 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 68.001844 26.999781 L 59.201063 26.999781 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 59.525281 27.156031 C 62.841688 20.288844 62.869031 12.288844 59.5995 5.398219 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 59.201063 5.398219 L 68.001844 5.398219 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 68.001844 26.999781 C 75.232313 26.999781 81.798719 22.781031 84.802625 16.199 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 68.001844 5.398219 C 75.232313 5.398219 81.798719 9.620875 84.802625 16.199 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 90.201063 16.199 C 90.201063 17.691188 88.994031 18.902125 87.501844 18.902125 C 86.009656 18.902125 84.798719 17.691188 84.798719 16.199 C 84.798719 14.706813 86.009656 13.499781 87.501844 13.499781 C 88.994031 13.499781 90.201063 14.706813 90.201063 16.199 Z M 90.201063 16.199 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 185.603406 83.702906 L 171.201063 83.702906 L 171.201063 105.300563 L 185.603406 105.300563 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 185.603406 105.300563 C 191.564344 105.300563 196.404188 100.464625 196.404188 94.499781 C 196.404188 88.534938 191.564344 83.702906 185.603406 83.702906 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 185.603406 13.499781 L 171.201063 13.499781 L 171.201063 35.101344 L 185.603406 35.101344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 185.603406 35.101344 C 191.564344 35.101344 196.404188 30.265406 196.404188 24.300563 C 196.404188 18.335719 191.564344 13.499781 185.603406 13.499781 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 228.802625 29.699 L 214.404188 29.699 L 214.404188 51.300563 L 228.802625 51.300563 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 228.802625 51.300563 C 234.767469 51.300563 239.603406 46.464625 239.603406 40.499781 C 239.603406 34.534938 234.767469 29.699 228.802625 29.699 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 264.158094 99.902125 L 255.357313 99.902125 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 255.681531 100.058375 C 258.997937 93.191188 259.025281 85.191188 255.75575 78.300563 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 255.357313 78.300563 L 264.158094 78.300563 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 264.158094 99.902125 C 271.388562 99.902125 277.954969 95.679469 280.954969 89.101344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 264.158094 78.300563 C 271.388562 78.300563 277.954969 82.523219 280.954969 89.101344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 286.357312 89.101344 C 286.357312 90.593531 285.150281 91.800563 283.658094 91.800563 C 282.165906 91.800563 280.954969 90.593531 280.954969 89.101344 C 280.954969 87.609156 282.165906 86.398219 283.658094 86.398219 C 285.150281 86.398219 286.357312 87.609156 286.357312 89.101344 Z M 286.357312 89.101344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 264.158094 40.499781 L 255.357313 40.499781 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 255.681531 40.656031 C 258.997937 33.788844 259.025281 25.788844 255.75575 18.898219 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 255.357313 18.898219 L 264.158094 18.898219 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 264.158094 40.499781 C 271.388562 40.499781 277.954969 36.281031 280.954969 29.699 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 264.158094 18.898219 C 271.388562 18.898219 277.954969 23.120875 280.954969 29.699 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 286.357312 29.699 C 286.357312 31.191188 285.150281 32.402125 283.658094 32.402125 C 282.165906 32.402125 280.954969 31.191188 280.954969 29.699 C 280.954969 28.210719 282.165906 26.999781 283.658094 26.999781 C 285.150281 26.999781 286.357312 28.210719 286.357312 29.699 Z M 286.357312 29.699 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph1-1" x="134.475" y="136.037"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph1-2" x="140.843094" y="136.037"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph1-2" x="149.14194" y="136.037"/>
-  <use xlink:href="#glyph1-3" x="154.12324" y="136.037"/>
-  <use xlink:href="#glyph1-4" x="157.997695" y="136.037"/>
-  <use xlink:href="#glyph1-5" x="163.532915" y="136.037"/>
-  <use xlink:href="#glyph1-6" x="167.960295" y="136.037"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph1-7" x="175.180191" y="136.037"/>
-  <use xlink:href="#glyph1-8" x="177.947801" y="136.037"/>
-  <use xlink:href="#glyph1-3" x="182.929101" y="136.037"/>
-  <use xlink:href="#glyph1-9" x="186.803557" y="136.037"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph1-4" x="190.961946" y="136.037"/>
-  <use xlink:href="#glyph1-5" x="196.497166" y="136.037"/>
-  <use xlink:href="#glyph1-10" x="200.924546" y="136.037"/>
-</g>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 16.247938 43.199 L 0.00184375 43.199 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-6" x="7.748" y="70.458"/>
-</g>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 16.247938 32.398219 L 0.00184375 32.398219 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-7" x="8.994" y="81.259"/>
-</g>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 8.685438 32.398219 C 8.685438 33.195094 8.040906 33.839625 7.247938 33.839625 C 6.451063 33.839625 5.806531 33.195094 5.806531 32.398219 C 5.806531 31.60525 6.451063 30.960719 7.247938 30.960719 C 8.040906 30.960719 8.685438 31.60525 8.685438 32.398219 Z M 8.685438 32.398219 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 7.247938 32.398219 L 7.247938 10.800563 L 61.447156 10.800563 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 0.00184375 -0.00021875 L 29.701063 -0.00021875 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 55.439344 102.601344 C 55.439344 103.398219 54.794813 104.04275 54.001844 104.04275 C 53.204969 104.04275 52.560438 103.398219 52.560438 102.601344 C 52.560438 101.804469 53.204969 101.159938 54.001844 101.159938 C 54.794813 101.159938 55.439344 101.804469 55.439344 102.601344 Z M 55.439344 102.601344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 54.001844 102.601344 L 54.001844 91.800563 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 54.001844 91.800563 L 117.201063 91.800563 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.12;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 115.400281 -7.199437 L 117.201063 -14.398656 L 119.001844 -7.199437 Z M 115.400281 -7.199437 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 117.201063 91.800563 L 117.201063 -12.750219 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 55.439344 80.999781 C 55.439344 81.796656 54.794813 82.441188 54.001844 82.441188 C 53.204969 82.441188 52.560438 81.796656 52.560438 80.999781 C 52.560438 80.206813 53.204969 79.562281 54.001844 79.562281 C 54.794813 79.562281 55.439344 80.206813 55.439344 80.999781 Z M 55.439344 80.999781 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 54.001844 80.999781 L 54.001844 70.202906 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 54.001844 70.202906 L 108.201063 70.202906 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.12;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 106.400281 -7.199437 L 108.201063 -14.398656 L 110.001844 -7.199437 Z M 106.400281 -7.199437 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 108.201063 70.202906 L 108.201063 -12.750219 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 55.439344 59.402125 C 55.439344 60.195094 54.794813 60.839625 54.001844 60.839625 C 53.204969 60.839625 52.560438 60.195094 52.560438 59.402125 C 52.560438 58.60525 53.204969 57.960719 54.001844 57.960719 C 54.794813 57.960719 55.439344 58.60525 55.439344 59.402125 Z M 55.439344 59.402125 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 54.001844 59.402125 L 54.001844 48.601344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 54.001844 48.601344 L 99.201063 48.601344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.12;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 97.400281 -7.199437 L 99.201063 -14.398656 L 101.001844 -7.199437 Z M 97.400281 -7.199437 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 99.201063 48.601344 L 99.201063 -12.750219 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 55.439344 37.878688 C 55.439344 38.675563 54.794813 39.320094 54.001844 39.320094 C 53.204969 39.320094 52.560438 38.675563 52.560438 37.878688 C 52.560438 37.081813 53.204969 36.437281 54.001844 36.437281 C 54.794813 36.437281 55.439344 37.081813 55.439344 37.878688 Z M 55.439344 37.878688 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 54.001844 37.878688 L 54.001844 21.601344 L 61.447156 21.601344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 171.201063 102.601344 L 135.201063 102.601344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.12;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 133.400281 -7.199437 L 135.201063 -14.398656 L 137.001844 -7.199437 Z M 133.400281 -7.199437 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 135.201063 102.601344 L 135.201063 -12.750219 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 171.201063 97.202906 L 144.201063 97.202906 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.12;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 142.400281 -7.199437 L 144.201063 -14.398656 L 146.001844 -7.199437 Z M 142.400281 -7.199437 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 144.201063 97.202906 L 144.201063 -12.750219 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 171.201063 91.800563 L 153.201063 91.800563 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.12;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 151.400281 -7.199437 L 153.201063 -14.398656 L 155.001844 -7.199437 Z M 151.400281 -7.199437 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 153.201063 91.800563 L 153.201063 -12.750219 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 171.201063 86.402125 L 162.201063 86.402125 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.12;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 160.400281 -7.199437 L 162.201063 -14.398656 L 164.001844 -7.199437 Z M 160.400281 -7.199437 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 162.201063 86.402125 L 162.201063 -12.750219 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 81.001844 102.601344 L 135.201063 102.601344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 136.642469 102.601344 C 136.642469 103.398219 135.997938 104.04275 135.201063 104.04275 C 134.404188 104.04275 133.759656 103.398219 133.759656 102.601344 C 133.759656 101.804469 134.404188 101.159938 135.201063 101.159938 C 135.997938 101.159938 136.642469 101.804469 136.642469 102.601344 Z M 136.642469 102.601344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 81.001844 80.999781 L 144.201063 80.999781 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 145.642469 80.999781 C 145.642469 81.796656 144.997938 82.441188 144.201063 82.441188 C 143.404188 82.441188 142.759656 81.796656 142.759656 80.999781 C 142.759656 80.206813 143.404188 79.562281 144.201063 79.562281 C 144.997938 79.562281 145.642469 80.206813 145.642469 80.999781 Z M 145.642469 80.999781 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 81.001844 59.402125 L 153.201063 59.402125 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 154.642469 59.402125 C 154.642469 60.195094 153.997938 60.839625 153.201063 60.839625 C 152.408094 60.839625 151.759656 60.195094 151.759656 59.402125 C 151.759656 58.60525 152.408094 57.960719 153.201063 57.960719 C 153.997938 57.960719 154.642469 58.60525 154.642469 59.402125 Z M 154.642469 59.402125 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 45.001844 37.800563 L 162.201063 37.878688 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 163.642469 37.878688 C 163.642469 38.675563 162.997938 39.320094 162.201063 39.320094 C 161.408094 39.320094 160.763563 38.675563 160.763563 37.878688 C 160.763563 37.081813 161.408094 36.437281 162.201063 36.437281 C 162.997938 36.437281 163.642469 37.081813 163.642469 37.878688 Z M 163.642469 37.878688 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 171.201063 32.398219 L 135.201063 32.398219 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 136.642469 32.398219 C 136.642469 33.195094 135.997938 33.839625 135.201063 33.839625 C 134.404188 33.839625 133.759656 33.195094 133.759656 32.398219 C 133.759656 31.60525 134.404188 30.960719 135.201063 30.960719 C 135.997938 30.960719 136.642469 31.60525 136.642469 32.398219 Z M 136.642469 32.398219 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 171.201063 26.999781 L 144.201063 26.999781 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 145.642469 26.999781 C 145.642469 27.796656 144.997938 28.441188 144.201063 28.441188 C 143.404188 28.441188 142.759656 27.796656 142.759656 26.999781 C 142.759656 26.206813 143.404188 25.558375 144.201063 25.558375 C 144.997938 25.558375 145.642469 26.206813 145.642469 26.999781 Z M 145.642469 26.999781 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 171.201063 21.601344 L 153.201063 21.601344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 154.642469 21.601344 C 154.642469 22.394313 153.997938 23.038844 153.201063 23.038844 C 152.408094 23.038844 151.759656 22.394313 151.759656 21.601344 C 151.759656 20.804469 152.408094 20.159938 153.201063 20.159938 C 153.997938 20.159938 154.642469 20.804469 154.642469 21.601344 Z M 154.642469 21.601344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 90.201063 16.199 L 171.201063 16.199 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 127.642469 16.199 C 127.642469 16.995875 126.997938 17.640406 126.201063 17.640406 C 125.404188 17.640406 124.759656 16.995875 124.759656 16.199 C 124.759656 15.406031 125.404188 14.7615 126.201063 14.7615 C 126.997938 14.7615 127.642469 15.406031 127.642469 16.199 Z M 127.642469 16.199 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.12;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 124.400281 -7.199437 L 126.201063 -14.398656 L 128.001844 -7.199437 Z M 124.400281 -7.199437 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 126.201063 16.199 L 126.201063 -12.750219 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 196.404188 94.499781 L 257.603406 94.499781 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 286.357312 89.101344 L 295.357312 89.101344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 296.798719 89.101344 C 296.798719 89.898219 296.154187 90.54275 295.357312 90.54275 C 294.560437 90.54275 293.915906 89.898219 293.915906 89.101344 C 293.915906 88.304469 294.560437 87.659938 295.357312 87.659938 C 296.154187 87.659938 296.798719 88.304469 296.798719 89.101344 Z M 296.798719 89.101344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 295.357312 89.101344 L 304.357312 89.101344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-8" x="322.336" y="23.936"/>
-  <use xlink:href="#glyph0-9" x="329.66947" y="23.936"/>
-</g>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 295.357312 89.101344 L 295.357312 71.101344 L 205.404188 54.902125 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 205.404188 54.902125 L 205.404188 45.902125 L 214.404188 45.902125 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 257.603406 83.702906 L 205.404188 83.702906 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 205.404188 83.702906 L 205.404188 74.702906 L 295.357312 47.699 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 295.357312 47.699 L 295.357312 29.777125 L 286.357312 29.699 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 239.603406 40.499781 L 248.603406 40.499781 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 248.603406 40.499781 L 248.603406 35.101344 L 257.603406 35.101344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 196.404188 24.300563 L 257.603406 24.300563 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 214.404188 35.101344 L 205.404188 35.101344 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.12;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 203.603406 -7.199437 L 205.404188 -14.398656 L 207.201063 -7.199437 Z M 203.603406 -7.199437 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 205.404188 35.101344 L 205.404188 -12.750219 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 206.841688 -0.00021875 C 206.841688 0.796656 206.197156 1.441188 205.404188 1.441188 C 204.607313 1.441188 203.962781 0.796656 203.962781 -0.00021875 C 203.962781 -0.797094 204.607313 -1.441625 205.404188 -1.441625 C 206.197156 -1.441625 206.841688 -0.797094 206.841688 -0.00021875 Z M 206.841688 -0.00021875 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-<path style="fill:none;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 205.404188 -0.00021875 L 42.298719 -0.00021875 " transform="matrix(1,0,0,-1,16.463,110.199)"/>
-</g>
-</svg>
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test.tex b/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test.tex
deleted file mode 100644
index e4361f70333..00000000000
--- a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test.tex
+++ /dev/null
@@ -1,1136 +0,0 @@
-\begin{tikzpicture}[scale=2.54]
-% dpic version 2020.06.01 option -g for TikZ and PGF 1.01
-\ifx\dpiclw\undefined\newdimen\dpiclw\fi
-\global\def\dpicdraw{\draw[line width=\dpiclw]}
-\global\def\dpicstop{;}
-\dpiclw=0.8bp
-\dpiclw=0.8bp
-\draw (0,0) node[left=-2bp]{\sf C };
-\draw (0,0.825) node[left=-2bp]{\sf A0 };
-\draw (0,1.125) node[left=-2bp]{\sf A1 };
-\draw (0,1.425) node[left=-2bp]{\sf A2 };
-\dpicdraw (0,1.425)
- --(0.375,1.425)\dpicstop
-\dpicdraw (0.55,1.425)
- --(0.375,1.325)
- --(0.375,1.525)
- --(0.55,1.425)\dpicstop
-\dpicdraw (0.5875,1.425) circle (0.014764in)\dpicstop
-\dpicdraw (0.625,1.425)
- --(0.875,1.425)\dpicstop
-\dpicdraw (1.125,1.425)
- --(0.95,1.325)
- --(0.95,1.525)
- --(1.125,1.425)\dpicstop
-\dpicdraw (0.9125,1.425) circle (0.014764in)\dpicstop
-\dpicdraw (0,1.125)
- --(0.375,1.125)\dpicstop
-\dpicdraw (0.55,1.125)
- --(0.375,1.025)
- --(0.375,1.225)
- --(0.55,1.125)\dpicstop
-\dpicdraw (0.5875,1.125) circle (0.014764in)\dpicstop
-\dpicdraw (0.625,1.125)
- --(0.875,1.125)\dpicstop
-\dpicdraw (1.125,1.125)
- --(0.95,1.025)
- --(0.95,1.225)
- --(1.125,1.125)\dpicstop
-\dpicdraw (0.9125,1.125) circle (0.014764in)\dpicstop
-\dpicdraw (0,0.825)
- --(0.375,0.825)\dpicstop
-\dpicdraw (0.55,0.825)
- --(0.375,0.725)
- --(0.375,0.925)
- --(0.55,0.825)\dpicstop
-\dpicdraw (0.5875,0.825) circle (0.014764in)\dpicstop
-\dpicdraw (0.625,0.825)
- --(0.875,0.825)\dpicstop
-\dpicdraw (1.125,0.825)
- --(0.95,0.725)
- --(0.95,0.925)
- --(1.125,0.825)\dpicstop
-\dpicdraw (0.9125,0.825) circle (0.014764in)\dpicstop
-\dpicdraw (0.5875,0)
- --(0.4125,-0.1)
- --(0.4125,0.1)
- --(0.5875,0)\dpicstop
-\dpicdraw (0.316667,0.675)
- --(0.194444,0.675)\dpicstop
-\dpicdraw (0.198957,0.677179)
- ..controls (0.245009,0.581799) and (0.245392,0.470695)
- ..(0.2,0.375)\dpicstop
-\dpicdraw (0.194444,0.375)
- --(0.316667,0.375)\dpicstop
-\dpicdraw (0.316667,0.675)
- ..controls (0.417105,0.675) and (0.508302,0.616374)
- ..(0.55,0.525)\dpicstop
-\dpicdraw (0.316667,0.375)
- ..controls (0.417105,0.375) and (0.508302,0.433626)
- ..(0.55,0.525)\dpicstop
-\dpicdraw (0.5875,0.525) circle (0.014764in)\dpicstop
-\dpicdraw (0.944444,0.375)
- --(0.822222,0.375)\dpicstop
-\dpicdraw (0.826735,0.377179)
- ..controls (0.872787,0.281799) and (0.87317,0.170695)
- ..(0.827778,0.075)\dpicstop
-\dpicdraw (0.822222,0.075)
- --(0.944444,0.075)\dpicstop
-\dpicdraw (0.944444,0.375)
- ..controls (1.044883,0.375) and (1.136079,0.316374)
- ..(1.177778,0.225)\dpicstop
-\dpicdraw (0.944444,0.075)
- ..controls (1.044883,0.075) and (1.136079,0.133626)
- ..(1.177778,0.225)\dpicstop
-\dpicdraw (1.215278,0.225) circle (0.014764in)\dpicstop
-\dpicdraw (2.577778,1.1625)
- --(2.377778,1.1625)
- --(2.377778,1.4625)
- --(2.577778,1.4625)\dpicstop
-\dpicdraw (2.577778,1.4625)
- ..controls (2.66062,1.4625) and (2.727778,1.395343)
- ..(2.727778,1.3125)
- ..controls (2.727778,1.229657) and (2.66062,1.1625)
- ..(2.577778,1.1625)\dpicstop
-\dpicdraw (2.577778,0.1875)
- --(2.377778,0.1875)
- --(2.377778,0.4875)
- --(2.577778,0.4875)\dpicstop
-\dpicdraw (2.577778,0.4875)
- ..controls (2.66062,0.4875) and (2.727778,0.420343)
- ..(2.727778,0.3375)
- ..controls (2.727778,0.254657) and (2.66062,0.1875)
- ..(2.577778,0.1875)\dpicstop
-\dpicdraw (3.177778,0.4125)
- --(2.977778,0.4125)
- --(2.977778,0.7125)
- --(3.177778,0.7125)\dpicstop
-\dpicdraw (3.177778,0.7125)
- ..controls (3.26062,0.7125) and (3.327778,0.645343)
- ..(3.327778,0.5625)
- ..controls (3.327778,0.479657) and (3.26062,0.4125)
- ..(3.177778,0.4125)\dpicstop
-\dpicdraw (3.668802,1.3875)
- --(3.54658,1.3875)\dpicstop
-\dpicdraw (3.551093,1.389679)
- ..controls (3.597145,1.294299) and (3.597528,1.183195)
- ..(3.552136,1.0875)\dpicstop
-\dpicdraw (3.54658,1.0875)
- --(3.668802,1.0875)\dpicstop
-\dpicdraw (3.668802,1.3875)
- ..controls (3.769241,1.3875) and (3.860437,1.328874)
- ..(3.902136,1.2375)\dpicstop
-\dpicdraw (3.668802,1.0875)
- ..controls (3.769241,1.0875) and (3.860437,1.146126)
- ..(3.902136,1.2375)\dpicstop
-\dpicdraw (3.939636,1.2375) circle (0.014764in)\dpicstop
-\dpicdraw (3.668802,0.5625)
- --(3.54658,0.5625)\dpicstop
-\dpicdraw (3.551093,0.564679)
- ..controls (3.597145,0.469299) and (3.597528,0.358195)
- ..(3.552136,0.2625)\dpicstop
-\dpicdraw (3.54658,0.2625)
- --(3.668802,0.2625)\dpicstop
-\dpicdraw (3.668802,0.5625)
- ..controls (3.769241,0.5625) and (3.860437,0.503874)
- ..(3.902136,0.4125)\dpicstop
-\dpicdraw (3.668802,0.2625)
- ..controls (3.769241,0.2625) and (3.860437,0.321126)
- ..(3.902136,0.4125)\dpicstop
-\dpicdraw (3.939636,0.4125) circle (0.014764in)\dpicstop
-\draw (2.127778,-0.241667) node[below=-2bp]{\sf {\sl To other latches}};
-\dpicdraw (0.225642,0.6)
- --(0,0.6)\dpicstop
-\draw (0,0.6) node[left=-2bp]{\sf D };
-\dpicdraw (0.225642,0.45)
- --(0,0.45)\dpicstop
-\draw (0,0.45) node[left=-2bp]{\sf E };
-\dpicdraw[fill=black](0.100642,0.45) circle (0.007874in)\dpicstop
-\dpicdraw (0.100642,0.45)
- --(0.100642,0.15)
- --(0.85342,0.15)\dpicstop
-\dpicdraw (0,0)
- --(0.4125,0)\dpicstop
-\dpicdraw[fill=black](0.75,1.425) circle (0.007874in)\dpicstop
-\dpicdraw (0.75,1.425)
- --(0.75,1.275)\dpicstop
-\dpicdraw (0.75,1.275)
- --(1.627778,1.275)\dpicstop
-\filldraw[line width=0bp](1.602778,-0.1)
- --(1.627778,-0.2)
- --(1.652778,-0.1) --cycle\dpicstop
-\dpicdraw (1.627778,1.275)
- --(1.627778,-0.177094)\dpicstop
-\dpicdraw[fill=black](0.75,1.125) circle (0.007874in)\dpicstop
-\dpicdraw (0.75,1.125)
- --(0.75,0.975)\dpicstop
-\dpicdraw (0.75,0.975)
- --(1.502778,0.975)\dpicstop
-\filldraw[line width=0bp](1.477778,-0.1)
- --(1.502778,-0.2)
- --(1.527778,-0.1) --cycle\dpicstop
-\dpicdraw (1.502778,0.975)
- --(1.502778,-0.177094)\dpicstop
-\dpicdraw[fill=black](0.75,0.825) circle (0.007874in)\dpicstop
-\dpicdraw (0.75,0.825)
- --(0.75,0.675)\dpicstop
-\dpicdraw (0.75,0.675)
- --(1.377778,0.675)\dpicstop
-\filldraw[line width=0bp](1.352778,-0.1)
- --(1.377778,-0.2)
- --(1.402778,-0.1) --cycle\dpicstop
-\dpicdraw (1.377778,0.675)
- --(1.377778,-0.177094)\dpicstop
-\dpicdraw[fill=black](0.75,0.526089) circle (0.007874in)\dpicstop
-\dpicdraw (0.75,0.526089)
- --(0.75,0.3)
- --(0.85342,0.3)\dpicstop
-\dpicdraw (2.377778,1.425)
- --(1.877778,1.425)\dpicstop
-\filldraw[line width=0bp](1.852778,-0.1)
- --(1.877778,-0.2)
- --(1.902778,-0.1) --cycle\dpicstop
-\dpicdraw (1.877778,1.425)
- --(1.877778,-0.177094)\dpicstop
-\dpicdraw (2.377778,1.35)
- --(2.002778,1.35)\dpicstop
-\filldraw[line width=0bp](1.977778,-0.1)
- --(2.002778,-0.2)
- --(2.027778,-0.1) --cycle\dpicstop
-\dpicdraw (2.002778,1.35)
- --(2.002778,-0.177094)\dpicstop
-\dpicdraw (2.377778,1.275)
- --(2.127778,1.275)\dpicstop
-\filldraw[line width=0bp](2.102778,-0.1)
- --(2.127778,-0.2)
- --(2.152778,-0.1) --cycle\dpicstop
-\dpicdraw (2.127778,1.275)
- --(2.127778,-0.177094)\dpicstop
-\dpicdraw (2.377778,1.2)
- --(2.252778,1.2)\dpicstop
-\filldraw[line width=0bp](2.227778,-0.1)
- --(2.252778,-0.2)
- --(2.277778,-0.1) --cycle\dpicstop
-\dpicdraw (2.252778,1.2)
- --(2.252778,-0.177094)\dpicstop
-\dpicdraw (1.125,1.425)
- --(1.877778,1.425)\dpicstop
-\dpicdraw[fill=black](1.877778,1.425) circle (0.007874in)\dpicstop
-\dpicdraw (1.125,1.125)
- --(2.002778,1.125)\dpicstop
-\dpicdraw[fill=black](2.002778,1.125) circle (0.007874in)\dpicstop
-\dpicdraw (1.125,0.825)
- --(2.127778,0.825)\dpicstop
-\dpicdraw[fill=black](2.127778,0.825) circle (0.007874in)\dpicstop
-\dpicdraw (0.625,0.525)
- --(2.252778,0.526089)\dpicstop
-\dpicdraw[fill=black](2.252778,0.526089) circle (0.007874in)\dpicstop
-\dpicdraw (2.377778,0.45)
- --(1.877778,0.45)\dpicstop
-\dpicdraw[fill=black](1.877778,0.45) circle (0.007874in)\dpicstop
-\dpicdraw (2.377778,0.375)
- --(2.002778,0.375)\dpicstop
-\dpicdraw[fill=black](2.002778,0.375) circle (0.007874in)\dpicstop
-\dpicdraw (2.377778,0.3)
- --(2.127778,0.3)\dpicstop
-\dpicdraw[fill=black](2.127778,0.3) circle (0.007874in)\dpicstop
-\dpicdraw (1.252778,0.225)
- --(2.377778,0.225)\dpicstop
-\dpicdraw[fill=black](1.752778,0.225) circle (0.007874in)\dpicstop
-\filldraw[line width=0bp](1.727778,-0.1)
- --(1.752778,-0.2)
- --(1.777778,-0.1) --cycle\dpicstop
-\dpicdraw (1.752778,0.225)
- --(1.752778,-0.177094)\dpicstop
-\dpicdraw (2.727778,1.3125)
- --(3.577778,1.3125)\dpicstop
-\dpicdraw (3.977136,1.2375)
- --(4.102136,1.2375)\dpicstop
-\dpicdraw[fill=black](4.102136,1.2375) circle (0.007874in)\dpicstop
-\dpicdraw (4.102136,1.2375)
- --(4.227136,1.2375)\dpicstop
-\draw (4.227136,1.2375) node[right=-2bp]{\sf  Q7};
-\dpicdraw (4.102136,1.2375)
- --(4.102136,0.9875)
- --(2.852778,0.7625)\dpicstop
-\dpicdraw (2.852778,0.7625)
- --(2.852778,0.6375)
- --(2.977778,0.6375)\dpicstop
-\dpicdraw (3.577778,1.1625)
- --(2.852778,1.1625)\dpicstop
-\dpicdraw (2.852778,1.1625)
- --(2.852778,1.0375)
- --(4.102136,0.6625)\dpicstop
-\dpicdraw (4.102136,0.6625)
- --(4.102136,0.413589)
- --(3.977136,0.4125)\dpicstop
-\dpicdraw (3.327778,0.5625)
- --(3.452778,0.5625)\dpicstop
-\dpicdraw (3.452778,0.5625)
- --(3.452778,0.4875)
- --(3.577778,0.4875)\dpicstop
-\dpicdraw (2.727778,0.3375)
- --(3.577778,0.3375)\dpicstop
-\dpicdraw (2.977778,0.4875)
- --(2.852778,0.4875)\dpicstop
-\filldraw[line width=0bp](2.827778,-0.1)
- --(2.852778,-0.2)
- --(2.877778,-0.1) --cycle\dpicstop
-\dpicdraw (2.852778,0.4875)
- --(2.852778,-0.177094)\dpicstop
-\dpicdraw[fill=black](2.852778,0) circle (0.007874in)\dpicstop
-\dpicdraw (2.852778,0)
- --(0.5875,0)\dpicstop
-\end{tikzpicture}
-\begin{tikzpicture}[scale=2.54]
-% dpic version 2020.06.01 option -g for TikZ and PGF 1.01
-\ifx\dpiclw\undefined\newdimen\dpiclw\fi
-\global\def\dpicdraw{\draw[line width=\dpiclw]}
-\global\def\dpicstop{;}
-\dpiclw=0.8bp
-\dpiclw=0.8bp
-\draw (0,0) node[left=-2bp]{\sf C };
-\draw (0,0.825) node[left=-2bp]{\sf A0 };
-\draw (0,1.125) node[left=-2bp]{\sf A1 };
-\draw (0,1.425) node[left=-2bp]{\sf A2 };
-\dpicdraw (0,1.425)
- --(0.375,1.425)\dpicstop
-\dpicdraw (0.55,1.425)
- --(0.375,1.325)
- --(0.375,1.525)
- --(0.55,1.425)\dpicstop
-\dpicdraw (0.5875,1.425) circle (0.014764in)\dpicstop
-\dpicdraw (0.625,1.425)
- --(0.875,1.425)\dpicstop
-\dpicdraw (1.125,1.425)
- --(0.95,1.325)
- --(0.95,1.525)
- --(1.125,1.425)\dpicstop
-\dpicdraw (0.9125,1.425) circle (0.014764in)\dpicstop
-\dpicdraw (0,1.125)
- --(0.375,1.125)\dpicstop
-\dpicdraw (0.55,1.125)
- --(0.375,1.025)
- --(0.375,1.225)
- --(0.55,1.125)\dpicstop
-\dpicdraw (0.5875,1.125) circle (0.014764in)\dpicstop
-\dpicdraw (0.625,1.125)
- --(0.875,1.125)\dpicstop
-\dpicdraw (1.125,1.125)
- --(0.95,1.025)
- --(0.95,1.225)
- --(1.125,1.125)\dpicstop
-\dpicdraw (0.9125,1.125) circle (0.014764in)\dpicstop
-\dpicdraw (0,0.825)
- --(0.375,0.825)\dpicstop
-\dpicdraw (0.55,0.825)
- --(0.375,0.725)
- --(0.375,0.925)
- --(0.55,0.825)\dpicstop
-\dpicdraw (0.5875,0.825) circle (0.014764in)\dpicstop
-\dpicdraw (0.625,0.825)
- --(0.875,0.825)\dpicstop
-\dpicdraw (1.125,0.825)
- --(0.95,0.725)
- --(0.95,0.925)
- --(1.125,0.825)\dpicstop
-\dpicdraw (0.9125,0.825) circle (0.014764in)\dpicstop
-\dpicdraw (0.5875,0)
- --(0.4125,-0.1)
- --(0.4125,0.1)
- --(0.5875,0)\dpicstop
-\dpicdraw (0.316667,0.675)
- --(0.194444,0.675)\dpicstop
-\dpicdraw (0.198957,0.677179)
- ..controls (0.245009,0.581799) and (0.245392,0.470695)
- ..(0.2,0.375)\dpicstop
-\dpicdraw (0.194444,0.375)
- --(0.316667,0.375)\dpicstop
-\dpicdraw (0.316667,0.675)
- ..controls (0.417105,0.675) and (0.508302,0.616374)
- ..(0.55,0.525)\dpicstop
-\dpicdraw (0.316667,0.375)
- ..controls (0.417105,0.375) and (0.508302,0.433626)
- ..(0.55,0.525)\dpicstop
-\dpicdraw (0.5875,0.525) circle (0.014764in)\dpicstop
-\dpicdraw (0.944444,0.375)
- --(0.822222,0.375)\dpicstop
-\dpicdraw (0.826735,0.377179)
- ..controls (0.872787,0.281799) and (0.87317,0.170695)
- ..(0.827778,0.075)\dpicstop
-\dpicdraw (0.822222,0.075)
- --(0.944444,0.075)\dpicstop
-\dpicdraw (0.944444,0.375)
- ..controls (1.044883,0.375) and (1.136079,0.316374)
- ..(1.177778,0.225)\dpicstop
-\dpicdraw (0.944444,0.075)
- ..controls (1.044883,0.075) and (1.136079,0.133626)
- ..(1.177778,0.225)\dpicstop
-\dpicdraw (1.215278,0.225) circle (0.014764in)\dpicstop
-\dpicdraw (2.577778,1.1625)
- --(2.377778,1.1625)
- --(2.377778,1.4625)
- --(2.577778,1.4625)\dpicstop
-\dpicdraw (2.577778,1.4625)
- ..controls (2.66062,1.4625) and (2.727778,1.395343)
- ..(2.727778,1.3125)
- ..controls (2.727778,1.229657) and (2.66062,1.1625)
- ..(2.577778,1.1625)\dpicstop
-\dpicdraw (2.577778,0.1875)
- --(2.377778,0.1875)
- --(2.377778,0.4875)
- --(2.577778,0.4875)\dpicstop
-\dpicdraw (2.577778,0.4875)
- ..controls (2.66062,0.4875) and (2.727778,0.420343)
- ..(2.727778,0.3375)
- ..controls (2.727778,0.254657) and (2.66062,0.1875)
- ..(2.577778,0.1875)\dpicstop
-\dpicdraw (3.177778,0.4125)
- --(2.977778,0.4125)
- --(2.977778,0.7125)
- --(3.177778,0.7125)\dpicstop
-\dpicdraw (3.177778,0.7125)
- ..controls (3.26062,0.7125) and (3.327778,0.645343)
- ..(3.327778,0.5625)
- ..controls (3.327778,0.479657) and (3.26062,0.4125)
- ..(3.177778,0.4125)\dpicstop
-\dpicdraw (3.668802,1.3875)
- --(3.54658,1.3875)\dpicstop
-\dpicdraw (3.551093,1.389679)
- ..controls (3.597145,1.294299) and (3.597528,1.183195)
- ..(3.552136,1.0875)\dpicstop
-\dpicdraw (3.54658,1.0875)
- --(3.668802,1.0875)\dpicstop
-\dpicdraw (3.668802,1.3875)
- ..controls (3.769241,1.3875) and (3.860437,1.328874)
- ..(3.902136,1.2375)\dpicstop
-\dpicdraw (3.668802,1.0875)
- ..controls (3.769241,1.0875) and (3.860437,1.146126)
- ..(3.902136,1.2375)\dpicstop
-\dpicdraw (3.939636,1.2375) circle (0.014764in)\dpicstop
-\dpicdraw (3.668802,0.5625)
- --(3.54658,0.5625)\dpicstop
-\dpicdraw (3.551093,0.564679)
- ..controls (3.597145,0.469299) and (3.597528,0.358195)
- ..(3.552136,0.2625)\dpicstop
-\dpicdraw (3.54658,0.2625)
- --(3.668802,0.2625)\dpicstop
-\dpicdraw (3.668802,0.5625)
- ..controls (3.769241,0.5625) and (3.860437,0.503874)
- ..(3.902136,0.4125)\dpicstop
-\dpicdraw (3.668802,0.2625)
- ..controls (3.769241,0.2625) and (3.860437,0.321126)
- ..(3.902136,0.4125)\dpicstop
-\dpicdraw (3.939636,0.4125) circle (0.014764in)\dpicstop
-\draw (2.127778,-0.241667) node[below=-2bp]{\sf {\sl To other latches}};
-\dpicdraw (0.225642,0.6)
- --(0,0.6)\dpicstop
-\draw (0,0.6) node[left=-2bp]{\sf D };
-\dpicdraw (0.225642,0.45)
- --(0,0.45)\dpicstop
-\draw (0,0.45) node[left=-2bp]{\sf E };
-\dpicdraw[fill=black](0.100642,0.45) circle (0.007874in)\dpicstop
-\dpicdraw (0.100642,0.45)
- --(0.100642,0.15)
- --(0.85342,0.15)\dpicstop
-\dpicdraw (0,0)
- --(0.4125,0)\dpicstop
-\dpicdraw[fill=black](0.75,1.425) circle (0.007874in)\dpicstop
-\dpicdraw (0.75,1.425)
- --(0.75,1.275)\dpicstop
-\dpicdraw (0.75,1.275)
- --(1.627778,1.275)\dpicstop
-\filldraw[line width=0bp](1.602778,-0.1)
- --(1.627778,-0.2)
- --(1.652778,-0.1) --cycle\dpicstop
-\dpicdraw (1.627778,1.275)
- --(1.627778,-0.177094)\dpicstop
-\dpicdraw[fill=black](0.75,1.125) circle (0.007874in)\dpicstop
-\dpicdraw (0.75,1.125)
- --(0.75,0.975)\dpicstop
-\dpicdraw (0.75,0.975)
- --(1.502778,0.975)\dpicstop
-\filldraw[line width=0bp](1.477778,-0.1)
- --(1.502778,-0.2)
- --(1.527778,-0.1) --cycle\dpicstop
-\dpicdraw (1.502778,0.975)
- --(1.502778,-0.177094)\dpicstop
-\dpicdraw[fill=black](0.75,0.825) circle (0.007874in)\dpicstop
-\dpicdraw (0.75,0.825)
- --(0.75,0.675)\dpicstop
-\dpicdraw (0.75,0.675)
- --(1.377778,0.675)\dpicstop
-\filldraw[line width=0bp](1.352778,-0.1)
- --(1.377778,-0.2)
- --(1.402778,-0.1) --cycle\dpicstop
-\dpicdraw (1.377778,0.675)
- --(1.377778,-0.177094)\dpicstop
-\dpicdraw[fill=black](0.75,0.526089) circle (0.007874in)\dpicstop
-\dpicdraw (0.75,0.526089)
- --(0.75,0.3)
- --(0.85342,0.3)\dpicstop
-\dpicdraw (2.377778,1.425)
- --(1.877778,1.425)\dpicstop
-\filldraw[line width=0bp](1.852778,-0.1)
- --(1.877778,-0.2)
- --(1.902778,-0.1) --cycle\dpicstop
-\dpicdraw (1.877778,1.425)
- --(1.877778,-0.177094)\dpicstop
-\dpicdraw (2.377778,1.35)
- --(2.002778,1.35)\dpicstop
-\filldraw[line width=0bp](1.977778,-0.1)
- --(2.002778,-0.2)
- --(2.027778,-0.1) --cycle\dpicstop
-\dpicdraw (2.002778,1.35)
- --(2.002778,-0.177094)\dpicstop
-\dpicdraw (2.377778,1.275)
- --(2.127778,1.275)\dpicstop
-\filldraw[line width=0bp](2.102778,-0.1)
- --(2.127778,-0.2)
- --(2.152778,-0.1) --cycle\dpicstop
-\dpicdraw (2.127778,1.275)
- --(2.127778,-0.177094)\dpicstop
-\dpicdraw (2.377778,1.2)
- --(2.252778,1.2)\dpicstop
-\filldraw[line width=0bp](2.227778,-0.1)
- --(2.252778,-0.2)
- --(2.277778,-0.1) --cycle\dpicstop
-\dpicdraw (2.252778,1.2)
- --(2.252778,-0.177094)\dpicstop
-\dpicdraw (1.125,1.425)
- --(1.877778,1.425)\dpicstop
-\dpicdraw[fill=black](1.877778,1.425) circle (0.007874in)\dpicstop
-\dpicdraw (1.125,1.125)
- --(2.002778,1.125)\dpicstop
-\dpicdraw[fill=black](2.002778,1.125) circle (0.007874in)\dpicstop
-\dpicdraw (1.125,0.825)
- --(2.127778,0.825)\dpicstop
-\dpicdraw[fill=black](2.127778,0.825) circle (0.007874in)\dpicstop
-\dpicdraw (0.625,0.525)
- --(2.252778,0.526089)\dpicstop
-\dpicdraw[fill=black](2.252778,0.526089) circle (0.007874in)\dpicstop
-\dpicdraw (2.377778,0.45)
- --(1.877778,0.45)\dpicstop
-\dpicdraw[fill=black](1.877778,0.45) circle (0.007874in)\dpicstop
-\dpicdraw (2.377778,0.375)
- --(2.002778,0.375)\dpicstop
-\dpicdraw[fill=black](2.002778,0.375) circle (0.007874in)\dpicstop
-\dpicdraw (2.377778,0.3)
- --(2.127778,0.3)\dpicstop
-\dpicdraw[fill=black](2.127778,0.3) circle (0.007874in)\dpicstop
-\dpicdraw (1.252778,0.225)
- --(2.377778,0.225)\dpicstop
-\dpicdraw[fill=black](1.752778,0.225) circle (0.007874in)\dpicstop
-\filldraw[line width=0bp](1.727778,-0.1)
- --(1.752778,-0.2)
- --(1.777778,-0.1) --cycle\dpicstop
-\dpicdraw (1.752778,0.225)
- --(1.752778,-0.177094)\dpicstop
-\dpicdraw (2.727778,1.3125)
- --(3.577778,1.3125)\dpicstop
-\dpicdraw (3.977136,1.2375)
- --(4.102136,1.2375)\dpicstop
-\dpicdraw[fill=black](4.102136,1.2375) circle (0.007874in)\dpicstop
-\dpicdraw (4.102136,1.2375)
- --(4.227136,1.2375)\dpicstop
-\draw (4.227136,1.2375) node[right=-2bp]{\sf  Q7};
-\dpicdraw (4.102136,1.2375)
- --(4.102136,0.9875)
- --(2.852778,0.7625)\dpicstop
-\dpicdraw (2.852778,0.7625)
- --(2.852778,0.6375)
- --(2.977778,0.6375)\dpicstop
-\dpicdraw (3.577778,1.1625)
- --(2.852778,1.1625)\dpicstop
-\dpicdraw (2.852778,1.1625)
- --(2.852778,1.0375)
- --(4.102136,0.6625)\dpicstop
-\dpicdraw (4.102136,0.6625)
- --(4.102136,0.413589)
- --(3.977136,0.4125)\dpicstop
-\dpicdraw (3.327778,0.5625)
- --(3.452778,0.5625)\dpicstop
-\dpicdraw (3.452778,0.5625)
- --(3.452778,0.4875)
- --(3.577778,0.4875)\dpicstop
-\dpicdraw (2.727778,0.3375)
- --(3.577778,0.3375)\dpicstop
-\dpicdraw (2.977778,0.4875)
- --(2.852778,0.4875)\dpicstop
-\filldraw[line width=0bp](2.827778,-0.1)
- --(2.852778,-0.2)
- --(2.877778,-0.1) --cycle\dpicstop
-\dpicdraw (2.852778,0.4875)
- --(2.852778,-0.177094)\dpicstop
-\dpicdraw[fill=black](2.852778,0) circle (0.007874in)\dpicstop
-\dpicdraw (2.852778,0)
- --(0.5875,0)\dpicstop
-\end{tikzpicture}
-\begin{tikzpicture}[scale=2.54]
-% dpic version 2020.06.01 option -g for TikZ and PGF 1.01
-\ifx\dpiclw\undefined\newdimen\dpiclw\fi
-\global\def\dpicdraw{\draw[line width=\dpiclw]}
-\global\def\dpicstop{;}
-\dpiclw=0.8bp
-\dpiclw=0.8bp
-\draw (0,0) node[left=-2bp]{\sf C };
-\draw (0,0.825) node[left=-2bp]{\sf A0 };
-\draw (0,1.125) node[left=-2bp]{\sf A1 };
-\draw (0,1.425) node[left=-2bp]{\sf A2 };
-\dpicdraw (0,1.425)
- --(0.375,1.425)\dpicstop
-\dpicdraw (0.55,1.425)
- --(0.375,1.325)
- --(0.375,1.525)
- --(0.55,1.425)\dpicstop
-\dpicdraw (0.5875,1.425) circle (0.014764in)\dpicstop
-\dpicdraw (0.625,1.425)
- --(0.875,1.425)\dpicstop
-\dpicdraw (1.125,1.425)
- --(0.95,1.325)
- --(0.95,1.525)
- --(1.125,1.425)\dpicstop
-\dpicdraw (0.9125,1.425) circle (0.014764in)\dpicstop
-\dpicdraw (0,1.125)
- --(0.375,1.125)\dpicstop
-\dpicdraw (0.55,1.125)
- --(0.375,1.025)
- --(0.375,1.225)
- --(0.55,1.125)\dpicstop
-\dpicdraw (0.5875,1.125) circle (0.014764in)\dpicstop
-\dpicdraw (0.625,1.125)
- --(0.875,1.125)\dpicstop
-\dpicdraw (1.125,1.125)
- --(0.95,1.025)
- --(0.95,1.225)
- --(1.125,1.125)\dpicstop
-\dpicdraw (0.9125,1.125) circle (0.014764in)\dpicstop
-\dpicdraw (0,0.825)
- --(0.375,0.825)\dpicstop
-\dpicdraw (0.55,0.825)
- --(0.375,0.725)
- --(0.375,0.925)
- --(0.55,0.825)\dpicstop
-\dpicdraw (0.5875,0.825) circle (0.014764in)\dpicstop
-\dpicdraw (0.625,0.825)
- --(0.875,0.825)\dpicstop
-\dpicdraw (1.125,0.825)
- --(0.95,0.725)
- --(0.95,0.925)
- --(1.125,0.825)\dpicstop
-\dpicdraw (0.9125,0.825) circle (0.014764in)\dpicstop
-\dpicdraw (0.5875,0)
- --(0.4125,-0.1)
- --(0.4125,0.1)
- --(0.5875,0)\dpicstop
-\dpicdraw (0.316667,0.675)
- --(0.194444,0.675)\dpicstop
-\dpicdraw (0.198957,0.677179)
- ..controls (0.245009,0.581799) and (0.245392,0.470695)
- ..(0.2,0.375)\dpicstop
-\dpicdraw (0.194444,0.375)
- --(0.316667,0.375)\dpicstop
-\dpicdraw (0.316667,0.675)
- ..controls (0.417105,0.675) and (0.508302,0.616374)
- ..(0.55,0.525)\dpicstop
-\dpicdraw (0.316667,0.375)
- ..controls (0.417105,0.375) and (0.508302,0.433626)
- ..(0.55,0.525)\dpicstop
-\dpicdraw (0.5875,0.525) circle (0.014764in)\dpicstop
-\dpicdraw (0.944444,0.375)
- --(0.822222,0.375)\dpicstop
-\dpicdraw (0.826735,0.377179)
- ..controls (0.872787,0.281799) and (0.87317,0.170695)
- ..(0.827778,0.075)\dpicstop
-\dpicdraw (0.822222,0.075)
- --(0.944444,0.075)\dpicstop
-\dpicdraw (0.944444,0.375)
- ..controls (1.044883,0.375) and (1.136079,0.316374)
- ..(1.177778,0.225)\dpicstop
-\dpicdraw (0.944444,0.075)
- ..controls (1.044883,0.075) and (1.136079,0.133626)
- ..(1.177778,0.225)\dpicstop
-\dpicdraw (1.215278,0.225) circle (0.014764in)\dpicstop
-\dpicdraw (2.577778,1.1625)
- --(2.377778,1.1625)
- --(2.377778,1.4625)
- --(2.577778,1.4625)\dpicstop
-\dpicdraw (2.577778,1.4625)
- ..controls (2.66062,1.4625) and (2.727778,1.395343)
- ..(2.727778,1.3125)
- ..controls (2.727778,1.229657) and (2.66062,1.1625)
- ..(2.577778,1.1625)\dpicstop
-\dpicdraw (2.577778,0.1875)
- --(2.377778,0.1875)
- --(2.377778,0.4875)
- --(2.577778,0.4875)\dpicstop
-\dpicdraw (2.577778,0.4875)
- ..controls (2.66062,0.4875) and (2.727778,0.420343)
- ..(2.727778,0.3375)
- ..controls (2.727778,0.254657) and (2.66062,0.1875)
- ..(2.577778,0.1875)\dpicstop
-\dpicdraw (3.177778,0.4125)
- --(2.977778,0.4125)
- --(2.977778,0.7125)
- --(3.177778,0.7125)\dpicstop
-\dpicdraw (3.177778,0.7125)
- ..controls (3.26062,0.7125) and (3.327778,0.645343)
- ..(3.327778,0.5625)
- ..controls (3.327778,0.479657) and (3.26062,0.4125)
- ..(3.177778,0.4125)\dpicstop
-\dpicdraw (3.668802,1.3875)
- --(3.54658,1.3875)\dpicstop
-\dpicdraw (3.551093,1.389679)
- ..controls (3.597145,1.294299) and (3.597528,1.183195)
- ..(3.552136,1.0875)\dpicstop
-\dpicdraw (3.54658,1.0875)
- --(3.668802,1.0875)\dpicstop
-\dpicdraw (3.668802,1.3875)
- ..controls (3.769241,1.3875) and (3.860437,1.328874)
- ..(3.902136,1.2375)\dpicstop
-\dpicdraw (3.668802,1.0875)
- ..controls (3.769241,1.0875) and (3.860437,1.146126)
- ..(3.902136,1.2375)\dpicstop
-\dpicdraw (3.939636,1.2375) circle (0.014764in)\dpicstop
-\dpicdraw (3.668802,0.5625)
- --(3.54658,0.5625)\dpicstop
-\dpicdraw (3.551093,0.564679)
- ..controls (3.597145,0.469299) and (3.597528,0.358195)
- ..(3.552136,0.2625)\dpicstop
-\dpicdraw (3.54658,0.2625)
- --(3.668802,0.2625)\dpicstop
-\dpicdraw (3.668802,0.5625)
- ..controls (3.769241,0.5625) and (3.860437,0.503874)
- ..(3.902136,0.4125)\dpicstop
-\dpicdraw (3.668802,0.2625)
- ..controls (3.769241,0.2625) and (3.860437,0.321126)
- ..(3.902136,0.4125)\dpicstop
-\dpicdraw (3.939636,0.4125) circle (0.014764in)\dpicstop
-\draw (2.127778,-0.241667) node[below=-2bp]{\sf {\sl To other latches}};
-\dpicdraw (0.225642,0.6)
- --(0,0.6)\dpicstop
-\draw (0,0.6) node[left=-2bp]{\sf D };
-\dpicdraw (0.225642,0.45)
- --(0,0.45)\dpicstop
-\draw (0,0.45) node[left=-2bp]{\sf E };
-\dpicdraw[fill=black](0.100642,0.45) circle (0.007874in)\dpicstop
-\dpicdraw (0.100642,0.45)
- --(0.100642,0.15)
- --(0.85342,0.15)\dpicstop
-\dpicdraw (0,0)
- --(0.4125,0)\dpicstop
-\dpicdraw[fill=black](0.75,1.425) circle (0.007874in)\dpicstop
-\dpicdraw (0.75,1.425)
- --(0.75,1.275)\dpicstop
-\dpicdraw (0.75,1.275)
- --(1.627778,1.275)\dpicstop
-\filldraw[line width=0bp](1.602778,-0.1)
- --(1.627778,-0.2)
- --(1.652778,-0.1) --cycle\dpicstop
-\dpicdraw (1.627778,1.275)
- --(1.627778,-0.177094)\dpicstop
-\dpicdraw[fill=black](0.75,1.125) circle (0.007874in)\dpicstop
-\dpicdraw (0.75,1.125)
- --(0.75,0.975)\dpicstop
-\dpicdraw (0.75,0.975)
- --(1.502778,0.975)\dpicstop
-\filldraw[line width=0bp](1.477778,-0.1)
- --(1.502778,-0.2)
- --(1.527778,-0.1) --cycle\dpicstop
-\dpicdraw (1.502778,0.975)
- --(1.502778,-0.177094)\dpicstop
-\dpicdraw[fill=black](0.75,0.825) circle (0.007874in)\dpicstop
-\dpicdraw (0.75,0.825)
- --(0.75,0.675)\dpicstop
-\dpicdraw (0.75,0.675)
- --(1.377778,0.675)\dpicstop
-\filldraw[line width=0bp](1.352778,-0.1)
- --(1.377778,-0.2)
- --(1.402778,-0.1) --cycle\dpicstop
-\dpicdraw (1.377778,0.675)
- --(1.377778,-0.177094)\dpicstop
-\dpicdraw[fill=black](0.75,0.526089) circle (0.007874in)\dpicstop
-\dpicdraw (0.75,0.526089)
- --(0.75,0.3)
- --(0.85342,0.3)\dpicstop
-\dpicdraw (2.377778,1.425)
- --(1.877778,1.425)\dpicstop
-\filldraw[line width=0bp](1.852778,-0.1)
- --(1.877778,-0.2)
- --(1.902778,-0.1) --cycle\dpicstop
-\dpicdraw (1.877778,1.425)
- --(1.877778,-0.177094)\dpicstop
-\dpicdraw (2.377778,1.35)
- --(2.002778,1.35)\dpicstop
-\filldraw[line width=0bp](1.977778,-0.1)
- --(2.002778,-0.2)
- --(2.027778,-0.1) --cycle\dpicstop
-\dpicdraw (2.002778,1.35)
- --(2.002778,-0.177094)\dpicstop
-\dpicdraw (2.377778,1.275)
- --(2.127778,1.275)\dpicstop
-\filldraw[line width=0bp](2.102778,-0.1)
- --(2.127778,-0.2)
- --(2.152778,-0.1) --cycle\dpicstop
-\dpicdraw (2.127778,1.275)
- --(2.127778,-0.177094)\dpicstop
-\dpicdraw (2.377778,1.2)
- --(2.252778,1.2)\dpicstop
-\filldraw[line width=0bp](2.227778,-0.1)
- --(2.252778,-0.2)
- --(2.277778,-0.1) --cycle\dpicstop
-\dpicdraw (2.252778,1.2)
- --(2.252778,-0.177094)\dpicstop
-\dpicdraw (1.125,1.425)
- --(1.877778,1.425)\dpicstop
-\dpicdraw[fill=black](1.877778,1.425) circle (0.007874in)\dpicstop
-\dpicdraw (1.125,1.125)
- --(2.002778,1.125)\dpicstop
-\dpicdraw[fill=black](2.002778,1.125) circle (0.007874in)\dpicstop
-\dpicdraw (1.125,0.825)
- --(2.127778,0.825)\dpicstop
-\dpicdraw[fill=black](2.127778,0.825) circle (0.007874in)\dpicstop
-\dpicdraw (0.625,0.525)
- --(2.252778,0.526089)\dpicstop
-\dpicdraw[fill=black](2.252778,0.526089) circle (0.007874in)\dpicstop
-\dpicdraw (2.377778,0.45)
- --(1.877778,0.45)\dpicstop
-\dpicdraw[fill=black](1.877778,0.45) circle (0.007874in)\dpicstop
-\dpicdraw (2.377778,0.375)
- --(2.002778,0.375)\dpicstop
-\dpicdraw[fill=black](2.002778,0.375) circle (0.007874in)\dpicstop
-\dpicdraw (2.377778,0.3)
- --(2.127778,0.3)\dpicstop
-\dpicdraw[fill=black](2.127778,0.3) circle (0.007874in)\dpicstop
-\dpicdraw (1.252778,0.225)
- --(2.377778,0.225)\dpicstop
-\dpicdraw[fill=black](1.752778,0.225) circle (0.007874in)\dpicstop
-\filldraw[line width=0bp](1.727778,-0.1)
- --(1.752778,-0.2)
- --(1.777778,-0.1) --cycle\dpicstop
-\dpicdraw (1.752778,0.225)
- --(1.752778,-0.177094)\dpicstop
-\dpicdraw (2.727778,1.3125)
- --(3.577778,1.3125)\dpicstop
-\dpicdraw (3.977136,1.2375)
- --(4.102136,1.2375)\dpicstop
-\dpicdraw[fill=black](4.102136,1.2375) circle (0.007874in)\dpicstop
-\dpicdraw (4.102136,1.2375)
- --(4.227136,1.2375)\dpicstop
-\draw (4.227136,1.2375) node[right=-2bp]{\sf  Q7};
-\dpicdraw (4.102136,1.2375)
- --(4.102136,0.9875)
- --(2.852778,0.7625)\dpicstop
-\dpicdraw (2.852778,0.7625)
- --(2.852778,0.6375)
- --(2.977778,0.6375)\dpicstop
-\dpicdraw (3.577778,1.1625)
- --(2.852778,1.1625)\dpicstop
-\dpicdraw (2.852778,1.1625)
- --(2.852778,1.0375)
- --(4.102136,0.6625)\dpicstop
-\dpicdraw (4.102136,0.6625)
- --(4.102136,0.413589)
- --(3.977136,0.4125)\dpicstop
-\dpicdraw (3.327778,0.5625)
- --(3.452778,0.5625)\dpicstop
-\dpicdraw (3.452778,0.5625)
- --(3.452778,0.4875)
- --(3.577778,0.4875)\dpicstop
-\dpicdraw (2.727778,0.3375)
- --(3.577778,0.3375)\dpicstop
-\dpicdraw (2.977778,0.4875)
- --(2.852778,0.4875)\dpicstop
-\filldraw[line width=0bp](2.827778,-0.1)
- --(2.852778,-0.2)
- --(2.877778,-0.1) --cycle\dpicstop
-\dpicdraw (2.852778,0.4875)
- --(2.852778,-0.177094)\dpicstop
-\dpicdraw[fill=black](2.852778,0) circle (0.007874in)\dpicstop
-\dpicdraw (2.852778,0)
- --(0.5875,0)\dpicstop
-\end{tikzpicture}
-\begin{tikzpicture}[scale=2.54]
-% dpic version 2020.06.01 option -g for TikZ and PGF 1.01
-\ifx\dpiclw\undefined\newdimen\dpiclw\fi
-\global\def\dpicdraw{\draw[line width=\dpiclw]}
-\global\def\dpicstop{;}
-\dpiclw=0.8bp
-\dpiclw=0.8bp
-\draw (0,0) node[left=-2bp]{\sf C };
-\draw (0,0.825) node[left=-2bp]{\sf A0 };
-\draw (0,1.125) node[left=-2bp]{\sf A1 };
-\draw (0,1.425) node[left=-2bp]{\sf A2 };
-\dpicdraw (0,1.425)
- --(0.375,1.425)\dpicstop
-\dpicdraw (0.55,1.425)
- --(0.375,1.325)
- --(0.375,1.525)
- --(0.55,1.425)\dpicstop
-\dpicdraw (0.5875,1.425) circle (0.014764in)\dpicstop
-\dpicdraw (0.625,1.425)
- --(0.875,1.425)\dpicstop
-\dpicdraw (1.125,1.425)
- --(0.95,1.325)
- --(0.95,1.525)
- --(1.125,1.425)\dpicstop
-\dpicdraw (0.9125,1.425) circle (0.014764in)\dpicstop
-\dpicdraw (0,1.125)
- --(0.375,1.125)\dpicstop
-\dpicdraw (0.55,1.125)
- --(0.375,1.025)
- --(0.375,1.225)
- --(0.55,1.125)\dpicstop
-\dpicdraw (0.5875,1.125) circle (0.014764in)\dpicstop
-\dpicdraw (0.625,1.125)
- --(0.875,1.125)\dpicstop
-\dpicdraw (1.125,1.125)
- --(0.95,1.025)
- --(0.95,1.225)
- --(1.125,1.125)\dpicstop
-\dpicdraw (0.9125,1.125) circle (0.014764in)\dpicstop
-\dpicdraw (0,0.825)
- --(0.375,0.825)\dpicstop
-\dpicdraw (0.55,0.825)
- --(0.375,0.725)
- --(0.375,0.925)
- --(0.55,0.825)\dpicstop
-\dpicdraw (0.5875,0.825) circle (0.014764in)\dpicstop
-\dpicdraw (0.625,0.825)
- --(0.875,0.825)\dpicstop
-\dpicdraw (1.125,0.825)
- --(0.95,0.725)
- --(0.95,0.925)
- --(1.125,0.825)\dpicstop
-\dpicdraw (0.9125,0.825) circle (0.014764in)\dpicstop
-\dpicdraw (0.5875,0)
- --(0.4125,-0.1)
- --(0.4125,0.1)
- --(0.5875,0)\dpicstop
-\dpicdraw (0.316667,0.675)
- --(0.194444,0.675)\dpicstop
-\dpicdraw (0.198957,0.677179)
- ..controls (0.245009,0.581799) and (0.245392,0.470695)
- ..(0.2,0.375)\dpicstop
-\dpicdraw (0.194444,0.375)
- --(0.316667,0.375)\dpicstop
-\dpicdraw (0.316667,0.675)
- ..controls (0.417105,0.675) and (0.508302,0.616374)
- ..(0.55,0.525)\dpicstop
-\dpicdraw (0.316667,0.375)
- ..controls (0.417105,0.375) and (0.508302,0.433626)
- ..(0.55,0.525)\dpicstop
-\dpicdraw (0.5875,0.525) circle (0.014764in)\dpicstop
-\dpicdraw (0.944444,0.375)
- --(0.822222,0.375)\dpicstop
-\dpicdraw (0.826735,0.377179)
- ..controls (0.872787,0.281799) and (0.87317,0.170695)
- ..(0.827778,0.075)\dpicstop
-\dpicdraw (0.822222,0.075)
- --(0.944444,0.075)\dpicstop
-\dpicdraw (0.944444,0.375)
- ..controls (1.044883,0.375) and (1.136079,0.316374)
- ..(1.177778,0.225)\dpicstop
-\dpicdraw (0.944444,0.075)
- ..controls (1.044883,0.075) and (1.136079,0.133626)
- ..(1.177778,0.225)\dpicstop
-\dpicdraw (1.215278,0.225) circle (0.014764in)\dpicstop
-\dpicdraw (2.577778,1.1625)
- --(2.377778,1.1625)
- --(2.377778,1.4625)
- --(2.577778,1.4625)\dpicstop
-\dpicdraw (2.577778,1.4625)
- ..controls (2.66062,1.4625) and (2.727778,1.395343)
- ..(2.727778,1.3125)
- ..controls (2.727778,1.229657) and (2.66062,1.1625)
- ..(2.577778,1.1625)\dpicstop
-\dpicdraw (2.577778,0.1875)
- --(2.377778,0.1875)
- --(2.377778,0.4875)
- --(2.577778,0.4875)\dpicstop
-\dpicdraw (2.577778,0.4875)
- ..controls (2.66062,0.4875) and (2.727778,0.420343)
- ..(2.727778,0.3375)
- ..controls (2.727778,0.254657) and (2.66062,0.1875)
- ..(2.577778,0.1875)\dpicstop
-\dpicdraw (3.177778,0.4125)
- --(2.977778,0.4125)
- --(2.977778,0.7125)
- --(3.177778,0.7125)\dpicstop
-\dpicdraw (3.177778,0.7125)
- ..controls (3.26062,0.7125) and (3.327778,0.645343)
- ..(3.327778,0.5625)
- ..controls (3.327778,0.479657) and (3.26062,0.4125)
- ..(3.177778,0.4125)\dpicstop
-\dpicdraw (3.668802,1.3875)
- --(3.54658,1.3875)\dpicstop
-\dpicdraw (3.551093,1.389679)
- ..controls (3.597145,1.294299) and (3.597528,1.183195)
- ..(3.552136,1.0875)\dpicstop
-\dpicdraw (3.54658,1.0875)
- --(3.668802,1.0875)\dpicstop
-\dpicdraw (3.668802,1.3875)
- ..controls (3.769241,1.3875) and (3.860437,1.328874)
- ..(3.902136,1.2375)\dpicstop
-\dpicdraw (3.668802,1.0875)
- ..controls (3.769241,1.0875) and (3.860437,1.146126)
- ..(3.902136,1.2375)\dpicstop
-\dpicdraw (3.939636,1.2375) circle (0.014764in)\dpicstop
-\dpicdraw (3.668802,0.5625)
- --(3.54658,0.5625)\dpicstop
-\dpicdraw (3.551093,0.564679)
- ..controls (3.597145,0.469299) and (3.597528,0.358195)
- ..(3.552136,0.2625)\dpicstop
-\dpicdraw (3.54658,0.2625)
- --(3.668802,0.2625)\dpicstop
-\dpicdraw (3.668802,0.5625)
- ..controls (3.769241,0.5625) and (3.860437,0.503874)
- ..(3.902136,0.4125)\dpicstop
-\dpicdraw (3.668802,0.2625)
- ..controls (3.769241,0.2625) and (3.860437,0.321126)
- ..(3.902136,0.4125)\dpicstop
-\dpicdraw (3.939636,0.4125) circle (0.014764in)\dpicstop
-\draw (2.127778,-0.241667) node[below=-2bp]{\sf {\sl To other latches}};
-\dpicdraw (0.225642,0.6)
- --(0,0.6)\dpicstop
-\draw (0,0.6) node[left=-2bp]{\sf D };
-\dpicdraw (0.225642,0.45)
- --(0,0.45)\dpicstop
-\draw (0,0.45) node[left=-2bp]{\sf E };
-\dpicdraw[fill=black](0.100642,0.45) circle (0.007874in)\dpicstop
-\dpicdraw (0.100642,0.45)
- --(0.100642,0.15)
- --(0.85342,0.15)\dpicstop
-\dpicdraw (0,0)
- --(0.4125,0)\dpicstop
-\dpicdraw[fill=black](0.75,1.425) circle (0.007874in)\dpicstop
-\dpicdraw (0.75,1.425)
- --(0.75,1.275)\dpicstop
-\dpicdraw (0.75,1.275)
- --(1.627778,1.275)\dpicstop
-\filldraw[line width=0bp](1.602778,-0.1)
- --(1.627778,-0.2)
- --(1.652778,-0.1) --cycle\dpicstop
-\dpicdraw (1.627778,1.275)
- --(1.627778,-0.177094)\dpicstop
-\dpicdraw[fill=black](0.75,1.125) circle (0.007874in)\dpicstop
-\dpicdraw (0.75,1.125)
- --(0.75,0.975)\dpicstop
-\dpicdraw (0.75,0.975)
- --(1.502778,0.975)\dpicstop
-\filldraw[line width=0bp](1.477778,-0.1)
- --(1.502778,-0.2)
- --(1.527778,-0.1) --cycle\dpicstop
-\dpicdraw (1.502778,0.975)
- --(1.502778,-0.177094)\dpicstop
-\dpicdraw[fill=black](0.75,0.825) circle (0.007874in)\dpicstop
-\dpicdraw (0.75,0.825)
- --(0.75,0.675)\dpicstop
-\dpicdraw (0.75,0.675)
- --(1.377778,0.675)\dpicstop
-\filldraw[line width=0bp](1.352778,-0.1)
- --(1.377778,-0.2)
- --(1.402778,-0.1) --cycle\dpicstop
-\dpicdraw (1.377778,0.675)
- --(1.377778,-0.177094)\dpicstop
-\dpicdraw[fill=black](0.75,0.526089) circle (0.007874in)\dpicstop
-\dpicdraw (0.75,0.526089)
- --(0.75,0.3)
- --(0.85342,0.3)\dpicstop
-\dpicdraw (2.377778,1.425)
- --(1.877778,1.425)\dpicstop
-\filldraw[line width=0bp](1.852778,-0.1)
- --(1.877778,-0.2)
- --(1.902778,-0.1) --cycle\dpicstop
-\dpicdraw (1.877778,1.425)
- --(1.877778,-0.177094)\dpicstop
-\dpicdraw (2.377778,1.35)
- --(2.002778,1.35)\dpicstop
-\filldraw[line width=0bp](1.977778,-0.1)
- --(2.002778,-0.2)
- --(2.027778,-0.1) --cycle\dpicstop
-\dpicdraw (2.002778,1.35)
- --(2.002778,-0.177094)\dpicstop
-\dpicdraw (2.377778,1.275)
- --(2.127778,1.275)\dpicstop
-\filldraw[line width=0bp](2.102778,-0.1)
- --(2.127778,-0.2)
- --(2.152778,-0.1) --cycle\dpicstop
-\dpicdraw (2.127778,1.275)
- --(2.127778,-0.177094)\dpicstop
-\dpicdraw (2.377778,1.2)
- --(2.252778,1.2)\dpicstop
-\filldraw[line width=0bp](2.227778,-0.1)
- --(2.252778,-0.2)
- --(2.277778,-0.1) --cycle\dpicstop
-\dpicdraw (2.252778,1.2)
- --(2.252778,-0.177094)\dpicstop
-\dpicdraw (1.125,1.425)
- --(1.877778,1.425)\dpicstop
-\dpicdraw[fill=black](1.877778,1.425) circle (0.007874in)\dpicstop
-\dpicdraw (1.125,1.125)
- --(2.002778,1.125)\dpicstop
-\dpicdraw[fill=black](2.002778,1.125) circle (0.007874in)\dpicstop
-\dpicdraw (1.125,0.825)
- --(2.127778,0.825)\dpicstop
-\dpicdraw[fill=black](2.127778,0.825) circle (0.007874in)\dpicstop
-\dpicdraw (0.625,0.525)
- --(2.252778,0.526089)\dpicstop
-\dpicdraw[fill=black](2.252778,0.526089) circle (0.007874in)\dpicstop
-\dpicdraw (2.377778,0.45)
- --(1.877778,0.45)\dpicstop
-\dpicdraw[fill=black](1.877778,0.45) circle (0.007874in)\dpicstop
-\dpicdraw (2.377778,0.375)
- --(2.002778,0.375)\dpicstop
-\dpicdraw[fill=black](2.002778,0.375) circle (0.007874in)\dpicstop
-\dpicdraw (2.377778,0.3)
- --(2.127778,0.3)\dpicstop
-\dpicdraw[fill=black](2.127778,0.3) circle (0.007874in)\dpicstop
-\dpicdraw (1.252778,0.225)
- --(2.377778,0.225)\dpicstop
-\dpicdraw[fill=black](1.752778,0.225) circle (0.007874in)\dpicstop
-\filldraw[line width=0bp](1.727778,-0.1)
- --(1.752778,-0.2)
- --(1.777778,-0.1) --cycle\dpicstop
-\dpicdraw (1.752778,0.225)
- --(1.752778,-0.177094)\dpicstop
-\dpicdraw (2.727778,1.3125)
- --(3.577778,1.3125)\dpicstop
-\dpicdraw (3.977136,1.2375)
- --(4.102136,1.2375)\dpicstop
-\dpicdraw[fill=black](4.102136,1.2375) circle (0.007874in)\dpicstop
-\dpicdraw (4.102136,1.2375)
- --(4.227136,1.2375)\dpicstop
-\draw (4.227136,1.2375) node[right=-2bp]{\sf  Q7};
-\dpicdraw (4.102136,1.2375)
- --(4.102136,0.9875)
- --(2.852778,0.7625)\dpicstop
-\dpicdraw (2.852778,0.7625)
- --(2.852778,0.6375)
- --(2.977778,0.6375)\dpicstop
-\dpicdraw (3.577778,1.1625)
- --(2.852778,1.1625)\dpicstop
-\dpicdraw (2.852778,1.1625)
- --(2.852778,1.0375)
- --(4.102136,0.6625)\dpicstop
-\dpicdraw (4.102136,0.6625)
- --(4.102136,0.413589)
- --(3.977136,0.4125)\dpicstop
-\dpicdraw (3.327778,0.5625)
- --(3.452778,0.5625)\dpicstop
-\dpicdraw (3.452778,0.5625)
- --(3.452778,0.4875)
- --(3.577778,0.4875)\dpicstop
-\dpicdraw (2.727778,0.3375)
- --(3.577778,0.3375)\dpicstop
-\dpicdraw (2.977778,0.4875)
- --(2.852778,0.4875)\dpicstop
-\filldraw[line width=0bp](2.827778,-0.1)
- --(2.852778,-0.2)
- --(2.877778,-0.1) --cycle\dpicstop
-\dpicdraw (2.852778,0.4875)
- --(2.852778,-0.177094)\dpicstop
-\dpicdraw[fill=black](2.852778,0) circle (0.007874in)\dpicstop
-\dpicdraw (2.852778,0)
- --(0.5875,0)\dpicstop
-\end{tikzpicture}
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/tikztosvg b/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/tikztosvg
deleted file mode 100644
index 8e9523347c4..00000000000
--- a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/tikztosvg
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/bin/bash
-
-puts() 
-{
-    echo "[$1] $2"
-}
-
-error()
-{
-    puts "ERROR" "$1" r
-
-    if [ -n "$2" ]
-    then
-        exit $2
-    else
-        exit 1
-    fi
-}
-
-message()
-{
-    puts "TIKZTOSVG" "$1" g
-}
-
-showHelp()
-{
-    man tikztosvg
-    exit 0
-}
-
-showVersion()
-{
-    echo 0.1.0
-    exit 0
-}
-
-if [ -z "$(which xelatex)" ]
-then
-    error "xelatex could not be found"
-fi
-
-if [ -z "$(which pdf2svg)" ]
-then
-    error "pdf2svg could not be found"
-fi
-
-# Parsing the arguments
-PACKAGES=()
-while [ $# -gt 1 ]
-do
-    case "$1" in
-        -h|--help)
-            showHelp
-            ;;
-        -v|--version)
-            showVersion
-            ;;
-        -p|--package)
-            if [ -z "$2" ]
-            then
-                error "Unnexpected EOF"
-            else
-                PACKAGES+=("$2")
-                shift
-                shift
-            fi
-            ;;
-        -o|--output)
-            if [ -n "$OUTPUT" ]
-            then
-                error "The output path was specified multiple times"
-            else if [ -z "$2" ]
-            then
-                error "Unexpected EOF"
-                exit 1
-            else
-                OUTPUT="$2"
-                shift
-                shift
-            fi
-            fi
-            ;;
-        -q|--quit)
-            QUIET=1
-            shift
-            ;;
-        *) 
-            error "Unexpected token: \"$1\""
-            ;;
-    esac
-done
-
-case "$1" in
-    -h|--help)
-        showHelp
-        ;;
-    -v|--version)
-        showVersion
-        ;;
-    "")
-        error "No input path provided"
-        ;;
-    *)
-        INPUT="$1"
-esac
-
-if [ -z "$OUTPUT" ]
-then
-    OUTPUT="$(echo $(basename $INPUT) | cut -d "." -f1)"
-fi
-
-TEMP_DIR="$(mktemp -d)"
-TEX_FILE="$TEMP_DIR/tmp.tex"
-
-# Generate the LaTeX document
-echo "\documentclass[crop,tikz,multi=false]{standalone}" > $TEX_FILE
-
-for PACKAGE in "${PACKAGES[@]}"
-do
-    echo "\usepackage{$PACKAGE}" >> $TEX_FILE
-done
-
-echo "\begin{document}" >> $TEX_FILE
-echo "\huge" >> $TEX_FILE
-
-cat $INPUT >> $TEX_FILE
-
-if [ $? -ne 0 ]
-then
-    rm $TEMP_DIR -r
-    error "File not found: $INPUT"
-fi
-
-echo "\end{document}" >> $TEX_FILE
-
-if [ -z "$QUIET" ]
-then
-    message "Rendering the LaTeX document. . ."
-    xelatex -output-directory=$TEMP_DIR $TEX_FILE
-else
-    xelatex -halt-on-error -output-directory=$TEMP_DIR $TEX_FILE 1> /dev/null 2>&1
-fi
-
-S=$?
-if [ $S -ne 0 ]
-then
-    rm $TEMP_DIR -r
-    if [ -z "$QUIET" ]
-    then
-        error "xelatex exited with code $S" $S
-    else
-        exit $S
-    fi
-fi
-
-if [ -z "$QUIET" ]
-then
-    message "Converting the output to SVG. . ."
-fi
-
-pdf2svg "$TEMP_DIR/tmp.pdf" $OUTPUT 1
-
-S=$?
-if [ $S -ne 0 ]
-then
-    rm $TEMP_DIR -r
-    if [ -z "$QUIET" ]
-    then
-        error "pdf2svg exited with code $S" $S
-    else
-        exit $S
-    fi
-fi
-
-if [ -z "$QUIET" ]
-then
-    message "Done!"
-fi
-
-rm "$TEMP_DIR" -r
-
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/tstSVG.htmx b/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/tstSVG.htmx
deleted file mode 100644
index 9e1884c146f..00000000000
--- a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/tstSVG.htmx
+++ /dev/null
@@ -1,62 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<HTML>
-<HEAD>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<!--meta http-equiv="Content-Script-Type" content="text/javascript"-->
-<TITLE>SVG Examples: Circuit_macros Version XXX</TITLE>
-<style type="text/css">
-.svg{display:none}
-*>.svg{display:inline}
-</style>
-<link rel="shortcut icon" href="../Circuit_macros.ico" type="image/x-icon" />
-</HEAD>
-
-<BODY>
-<H2>SVG Circuit_macros examples, Version XXX</H2>
-<hr>
-
-<p>
-These diagrams are the result of applying pdf2svg to examples.pdf.
- <p>
-  Click on the link to view the source of each diagram.
-</p>
-<hr>
-
-define(`for_',`ifelse(eval(`$1'!=(`$2'+(`$3'))),1,`pushdef(`m4x',`$1') $4
-  popdef(`m4x')for_(eval(`$1'+(`$3')),`$2',`$3',`$4')')')
-
-define(`cfig',`
-<p>
-
-<!--[if lte IE 8]><embed src="$1.svg" sinclude($1.siz)><![endif]-->
-
-<!--[if gte IE 9]>
-<object dx="4" data="$1.svg" width="612" height="792" type="image/svg+xml" class="img">
-  </object> <![endif]-->
-
-<!--[if !IE]><!-->
-<object data="$1.svg" width="612" height="792" type="image/svg+xml" class="img">
-  </object> <!--<![endif]-->
-
-<br>
-<!--
-<a href="$1.txt" TYPE="text/plain" TARGET="_blank" alt="$1">$1.m4</a>
---
-</p>
-<hr>')
-
-define(`m4tt',`<g style="font-family:monospace">')
-
-<!--
-<embed pluginspage="http://www.adobe.com/svg/viewer/install/" />
--->
-
-
-cfig(test)
-#for_(1,46,1,
-#cfig(examples_```'''m4x)
-#)
-
-</BODY>
-</HTML>
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/examples.pdf b/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/examples.pdf
deleted file mode 100644
index b52e15195e6..00000000000
--- a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/examples.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/examplesSVG.htmx b/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/examplesSVG.htmx
deleted file mode 100644
index bb2265a90f1..00000000000
--- a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/examplesSVG.htmx
+++ /dev/null
@@ -1,70 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<HTML>
-<HEAD>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<!--meta http-equiv="Content-Script-Type" content="text/javascript"-->
-<TITLE>SVG Examples: Circuit_macros Version XXX</TITLE>
-<style type="text/css">
-.svg{display:none}
-*>.svg{display:inline}
-</style>
-<link rel="shortcut icon" href="../Circuit_macros.ico" type="image/x-icon" />
-</HEAD>
-
-<BODY>
-<H2>SVG Circuit_macros examples, Version XXX</H2>
-<hr>
-
-<p>
-  These diagrams are in .svg format.
-  <A HREF="examples.pdf">Pdf</A>
-  and
-  <A HREF="examples.html">png</A>
-  versions are also available.
-  The PDF equivalent can be found in examples.pdf of the distribution.
-</p>
- <p>
-  Click on the link to view the source of each diagram.
-</p>
-<hr>
-
-define(`for_',`ifelse(eval(`$1'!=(`$2'+(`$3'))),1,`pushdef(`m4x',`$1') $4
-  popdef(`m4x')for_(eval(`$1'+(`$3')),`$2',`$3',`$4')')')
-
-define(`cfig',`
-<p>
-
-<!--[if lte IE 8]><embed src="$1.svg" sinclude($1.siz)><![endif]-->
-
-<!--[if gte IE 9]>
-<object dx="4" data="$1.svg" width="612" height="792" type="image/svg+xml" class="img">
-  </object> <![endif]-->
-
-<!--[if !IE]><!-->
-<object data="$1.svg" width="612" height="792" type="image/svg+xml" class="img">
-  </object> <!--<![endif]-->
-
-<br>
-<!--
-<a href="$1.txt" TYPE="text/plain" TARGET="_blank" alt="$1">$1.m4</a>
---
-</p>
-<hr>')
-
-define(`m4tt',`<g style="font-family:monospace">')
-
-<!--
-<embed pluginspage="http://www.adobe.com/svg/viewer/install/" />
--->
-
-<p>
-These diagrams are the result of applying pdf2svg to examples.pdf.
-
-
-for_(1,46,1,
-cfig(examples_```'''m4x)
-)
-
-</BODY>
-</HTML>
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/oFlow.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/oFlow.m4
deleted file mode 100644
index f4fa766f1a9..00000000000
--- a/Master/texmf-dist/doc/latex/circuit-macros/examples/oFlow.m4
+++ /dev/null
@@ -1,108 +0,0 @@
-.PS
-# Flow.m4
-gen_init
-ifdef(`FlowchartDefs_',,`include(FlowchartDefs.m4)')
-
-# Could use xcolor with option dvipsnames but define color here for portability:
-define(`Thistle',`rgbstring(0.85,0.75,0.85)')dnl
-define(`RubineRed',`rgbstring(0.81,0,0.35)')dnl
-define(`YellowGreen',`rgbstring(0.68,1,0.18)')dnl
-define(`SeaGreen',`rgbstring(0.13,0.70,0.67)')dnl
-define(`Goldenrod',`rgbstring(0.85,0.65,0.13)')dnl
-
-  linethick_(1.0)
-  arrowwid = 0.05
-  arrowht = 0.1
-  fillval = 0.8
-  down
-
-Case: Fcase(,
-  "Test 1",[Fbox("Task 1",, shaded Thistle); W:last [].W; N:last [].N
-            arrow down linewid/3 from last [].S
-            Fbox("Task 1.5",, shaded Thistle) with .N at Here
-            E:last [].E; S:last [].S],
-  "Test 2",Fbox("Task 2" "is bigger", wid fboxwid*1.2 ht fboxht*3/2, \
-                shaded SeaGreen),
-  "Test 3",Fbox("Task 3",, shaded RubineRed)dnl
-  )
-
-   "\sl .N" at Case.N rjust above; "\sl .S" at Case.S rjust below
-   "\sl .E" at Case.E ljust; "\sl .W" at Case.W rjust
-   "\sl Case statement" below at Case.s+(0,-0.2)
-   move to Case.nw+(-12bp__,10bp__)
-
-Whiledo: Fwhiledo("$i < n$",,,Fbox("Task"),"T" above ljust at Test.E) \
-  with .nw at Case.ne+(0.25,0)
-
-  "\sl .N" at Whiledo.N rjust; "\sl .S" at Whiledo.S rjust below
-  "\sl .E" at Whiledo.E ljust; "\sl .W" at Whiledo.W rjust
-  "\sl While-do" below at Whiledo.s+(0,-0.2)
-
-Repeatuntil: Frepeatuntil("$n \geq 5$",,,Fbox("Task"),
-   "T" at Test.E above ljust) with .nw at Whiledo.sw + (0.25,-1)
-
-  "\sl .N" at Repeatuntil.N rjust above; "\sl .S" at Repeatuntil.S rjust below
-  "\sl .E" at Repeatuntil.E ljust; "\sl .W" at Repeatuntil.W rjust
-  "\sl Repeat-until" below at Repeatuntil.s+(0,-0.2)
-
-Ifthenelse: Fifthenelse("$A<B$",,,
-     Fbox("False"),
-     Fbox("True",ht fboxht*1.2 wid fboxwid)dnl
-     ) with .nw at Repeatuntil.sw +(0.5,-0.5)
-
-  "\sl .N" at Ifthenelse.N rjust above; "\sl .S" at Ifthenelse.S below rjust
-  "\sl .E" at Ifthenelse.E ljust; "\sl .W" at Ifthenelse.W rjust
-  "\sl If-then-else" below at Ifthenelse.s+(0,-0.3) \
-  "\sl (the True and False tasks are optional)"
-
-# Compound statement:
-[ right 
-  ellipse shaded YellowGreen "Start"
-  arrow right linewid/2
-
-  Fbox("First task") with .W at Here
-  arrow down linewid/2 from last [].S
-
-  Fifthenelse("Test 1",,,
-    Frepeatuntil("$i \geq 5$",,shaded Goldenrod,Fbox("Task")),
-    Fifthenelse("$A < B$",,shaded Goldenrod,
-      Fbox("Left"),
-      Fbox("Right"),
-    "T" at Test.E above ljust),
-    "T" at Test.E above ljust) with .N at Here
-
-  A: arrow down 0.25 from last [].S ] with .nw at Case.sw + (-12bp__,-0.7)
-
-  "\sl Compound statement" below at last [].A.end
-
-Example: [ fillvalue = 0.8; awid = linewid/2; right_
-  Start: ellipse wid boxwid/2 ht boxwid/3 shaded "green"
-  arrow right_ awid
-  B1: Fbox("Planejamento")
-  B2: Fbox(`"Execu\c{c}\~ao"') with .W at B1.E+(awid*3,0)
-  B3: Fbox(`"Sele\c{c}\~ao"') with .W at B2.E+(awid*3,0)
-  LT: Ftest(`"Avalia\c{c}\~ao do" "Planejamento"',
-    wid fboxwid*1.5 ht fboxht*2.0,
-    shaded YellowGreen,
-    "Correto" at Box.e above ljust;
-    "Incompleto" at Box.w above rjust) with .S at 0.5 between B1.ne and B2.nw
-  arrow from B1.E to (LT.S,B1.E) then to LT.S
-  arrow from LT.W to (B1.N,LT.W) then to B1.N
-  arrow from LT.E to (B2.N,LT.E) then to B2.N
-  RT: Ftest(`"Avalia\c{c}\~ao da" "Execu\c{c}\~ao"',
-    wid fboxwid*1.5 ht fboxht*2.0,
-    shaded YellowGreen,
-    "Correto" at Box.e below ljust;
-    "Incompleto" at Box.w below rjust) with .N at 0.5 between B2.se and B3.sw
-  arrow from B2.E to (RT.N,B2.E) then to RT.N
-  arrow from RT.W to (B2.S,RT.W) then to B2.S
-  arrow from RT.E to (B3.S,RT.E) then to B3.S
-  B4: Fbox(`"Extra\c{c}\~ao"') with .S at B3.N+(0,awid)
-  arrow from B3.N to B4.S
-  arrow right_ awid from B4.E
-  B5: Fbox(`"Conclus\~ao"')
-  ellipse wid boxwid/2 ht boxwid/3 shaded "red" at (B5.S,Start)
-  arrow down_ awid from B5.S to last ellipse.n
-] with .nw at last [].sw+(0,-fboxht)
-
-.PE
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/shapes.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/shapes.m4
index 646584da7a7..3555057447d 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/examples/shapes.m4
+++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/shapes.m4
@@ -46,7 +46,7 @@ define(`cylinder3D',`[ Start: (0,0)
                            `internal positions:
                               Start (centre of base),
                               End (point),
-�                             C (axis centre)'
+                              C (axis centre)'
 define(`cone3D',`[ Start: (0,0)
  xdispl = `$1'; ydispl = `$2'; zdispl = `$3'
  define(`M4CL',`xdispl,ydispl,zdispl')dnl
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/gpic.m4 b/Master/texmf-dist/doc/latex/circuit-macros/gpic.m4
index 70e5c384273..9a364657f76 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/gpic.m4
+++ b/Master/texmf-dist/doc/latex/circuit-macros/gpic.m4
@@ -1,7 +1,7 @@
 divert(-1)
   gpic.m4                       Initialization for gpic.
 
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under      *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under      *
 * the LaTeX Project Public Licence in file Licence.txt. The files of       *
 * this distribution may be redistributed or modified provided that this    *
 * copyright notice is included and provided that modifications are clearly *
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/lib3D.m4 b/Master/texmf-dist/doc/latex/circuit-macros/lib3D.m4
index 81bde54de0d..12f5170274e 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/lib3D.m4
+++ b/Master/texmf-dist/doc/latex/circuit-macros/lib3D.m4
@@ -3,7 +3,7 @@ lib3D.m4                        Macros for rotation, projection, and other
                                 operations on argument triples representing
                                 3D vectors.
 
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under      *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under      *
 * the LaTeX Project Public Licence in file Licence.txt. The files of       *
 * this distribution may be redistributed or modified provided that this    *
 * copyright notice is included and provided that modifications are clearly *
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/libcct.m4 b/Master/texmf-dist/doc/latex/circuit-macros/libcct.m4
index 81d36357c6f..d0c1e00d149 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/libcct.m4
+++ b/Master/texmf-dist/doc/latex/circuit-macros/libcct.m4
@@ -1,7 +1,7 @@
 divert(-1)
   libcct.m4
 
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under      *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under      *
 * the LaTeX Project Public Licence in file Licence.txt. The files of       *
 * this distribution may be redistributed or modified provided that this    *
 * copyright notice is included and provided that modifications are clearly *
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/libgen.m4 b/Master/texmf-dist/doc/latex/circuit-macros/libgen.m4
index 7aabd68c831..c20416a7268 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/libgen.m4
+++ b/Master/texmf-dist/doc/latex/circuit-macros/libgen.m4
@@ -2,7 +2,7 @@ divert(-1)
  
    libgen.m4                    Base macros for dpic and gpic diagrams
 
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under      *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under      *
 * the LaTeX Project Public Licence in file Licence.txt. The files of       *
 * this distribution may be redistributed or modified provided that this    *
 * copyright notice is included and provided that modifications are clearly *
@@ -185,7 +185,7 @@ define(`SIdefaults',
 define(`latexcommand',`command "ifmpost(verbatimtex) `$1' ifmpost(etex)"')
 
 define(`m4announceprocessor',`dnl Do not change the format of the next line:
-`#' `$1' Version 9.4: ifelse(m4picprocessor,gpic,`Gpic',
+`#' `$1' Version 9.5: ifelse(m4picprocessor,gpic,`Gpic',
   m4postprocessor,pstricks,`PSTricks',
   m4postprocessor,pgf,`TikZ PGF',
   m4postprocessor,mfpic,`Mfpic',
@@ -762,13 +762,14 @@ define(`m4Delch',
                                  Nonblank arg4 omits the parentheses.'
 define(`setkey_',
  `pushdef(`m4xt',index(`$1',`$2'=))ifelse(m4xt,-1,
-   `pushdef(`m4'$2,`ifelse(`$3',,,ifelse(`$4',,(`$3'),`$3'))')',
+   `pushdef(key_prefix`'$2,`ifelse(`$3',,,ifelse(`$4',,(`$3'),`$3'))')',
    `define(`m4sktmp',substr(`$1',eval(m4xt+len(`$2')+1)))dnl m4sktmp used later
     ifelse(index(m4sktmp,;),-1,
-     `pushdef(`m4'$2,ifelse(`$4',,(m4sktmp),m4sktmp))',
-     `pushdef(`m4'$2,ifelse(`$4',,(substr(m4sktmp,0,index(m4sktmp,;))),
+     `pushdef(key_prefix`'$2,ifelse(`$4',,(m4sktmp),m4sktmp))',
+     `pushdef(key_prefix`'$2,ifelse(`$4',,(substr(m4sktmp,0,index(m4sktmp,;))),
                                   substr(m4sktmp,0,index(m4sktmp,;))))')')dnl
   popdef(`m4xt')')
+define(`key_prefix',`m4')
 
                                 `String with exact typeset dimensions:
                                  Requires s_init(name), sinclude(filename.dim),
@@ -1424,14 +1425,13 @@ define(`along_',`between `$1'.start and `$1'.end')
 define(`Along_',`(ifelse(`$2',,1,`(`$2')/lin_leng(`$1')') between \
   `$1'.ifelse(`$3',R,end,start) and `$1'.ifelse(`$3',R,start,end))')
 
-                                `showbox_(planar object,boxspec)
+                                `showbox_(planar object,boxspec,P)
                                  Convenience to draw the bounding box of an obj
                                  (default last []),
                                  e.g. showbox_(B,dotted "Box B")'
-define(`showbox_',
- `{box wid ifelse(`$1',,last [],`$1').wid \
-       ht ifelse(`$1',,last [],`$1').ht \
-       at ifelse(`$1',,last [],`$1') `$2'}')
+define(`showbox_',`define(`M4obj',`ifelse(`$1',,last [],`$1')')dnl
+  {box wid M4obj.wid ht M4obj.ht at M4obj `$2' ;}
+   ifinstr(`$3',P,`{print (M4obj.wid,M4obj.ht)}')')
 
                                 `use continue if dpic, otherwise line or other'
 define(`contline',`ifdpic(continue,ifelse(`$1',,line,`$1'))')
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/liblog.m4 b/Master/texmf-dist/doc/latex/circuit-macros/liblog.m4
index 99c68076eff..a7ae395a753 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/liblog.m4
+++ b/Master/texmf-dist/doc/latex/circuit-macros/liblog.m4
@@ -1,7 +1,7 @@
 divert(-1)
    liblog.m4                    Logic gates
 
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under      *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under      *
 * the LaTeX Project Public Licence in file Licence.txt. The files of       *
 * this distribution may be redistributed or modified provided that this    *
 * copyright notice is included and provided that modifications are clearly *
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/mfpic.m4 b/Master/texmf-dist/doc/latex/circuit-macros/mfpic.m4
index c631f784d11..0ef7c4bf8d6 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/mfpic.m4
+++ b/Master/texmf-dist/doc/latex/circuit-macros/mfpic.m4
@@ -1,7 +1,7 @@
 divert(-1)
    mfpic.m4                     Initialization for mfpic.
 
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under      *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under      *
 * the LaTeX Project Public Licence in file Licence.txt. The files of       *
 * this distribution may be redistributed or modified provided that this    *
 * copyright notice is included and provided that modifications are clearly *
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/mpost.m4 b/Master/texmf-dist/doc/latex/circuit-macros/mpost.m4
index 778f38e2165..0536b66cb39 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/mpost.m4
+++ b/Master/texmf-dist/doc/latex/circuit-macros/mpost.m4
@@ -1,7 +1,7 @@
 divert(-1)
    mpost.m4                     Initialization for metapost.
 
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under      *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under      *
 * the LaTeX Project Public Licence in file Licence.txt. The files of       *
 * this distribution may be redistributed or modified provided that this    *
 * copyright notice is included and provided that modifications are clearly *
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/pgf.m4 b/Master/texmf-dist/doc/latex/circuit-macros/pgf.m4
index 791be9765c6..97152904911 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/pgf.m4
+++ b/Master/texmf-dist/doc/latex/circuit-macros/pgf.m4
@@ -1,7 +1,7 @@
 divert(-1)
    pgf.m4                  Initialization for Tikz-pgf.
 
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under      *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under      *
 * the LaTeX Project Public Licence in file Licence.txt. The files of       *
 * this distribution may be redistributed or modified provided that this    *
 * copyright notice is included and provided that modifications are clearly *
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/postscript.m4 b/Master/texmf-dist/doc/latex/circuit-macros/postscript.m4
index c33c1a7afc7..2860a2aa2ad 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/postscript.m4
+++ b/Master/texmf-dist/doc/latex/circuit-macros/postscript.m4
@@ -1,7 +1,7 @@
 divert(-1)
    postscript.m4                  Initialization for Postscript output.
 
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under      *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under      *
 * the LaTeX Project Public Licence in file Licence.txt. The files of       *
 * this distribution may be redistributed or modified provided that this    *
 * copyright notice is included and provided that modifications are clearly *
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/psfrag.m4 b/Master/texmf-dist/doc/latex/circuit-macros/psfrag.m4
index d11b9dd0bfe..6572761f356 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/psfrag.m4
+++ b/Master/texmf-dist/doc/latex/circuit-macros/psfrag.m4
@@ -2,7 +2,7 @@ divert(-1)
   psfrag.m4                  Initialization for dpic -f processing:
                              Postscript with psfrag strings
 
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under      *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under      *
 * the LaTeX Project Public Licence in file Licence.txt. The files of       *
 * this distribution may be redistributed or modified provided that this    *
 * copyright notice is included and provided that modifications are clearly *
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/pstricks.m4 b/Master/texmf-dist/doc/latex/circuit-macros/pstricks.m4
index 0dbd8ef7f19..48cc91af3a4 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/pstricks.m4
+++ b/Master/texmf-dist/doc/latex/circuit-macros/pstricks.m4
@@ -1,7 +1,7 @@
 divert(-1)
    pstricks.m4                  Initialization for PSTricks.
 
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under      *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under      *
 * the LaTeX Project Public Licence in file Licence.txt. The files of       *
 * this distribution may be redistributed or modified provided that this    *
 * copyright notice is included and provided that modifications are clearly *
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/svg.m4 b/Master/texmf-dist/doc/latex/circuit-macros/svg.m4
index 1b3a285ffbd..113174d0be0 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/svg.m4
+++ b/Master/texmf-dist/doc/latex/circuit-macros/svg.m4
@@ -1,7 +1,7 @@
 divert(-1)
    svg.m4                       Initialization for SVG output.
 
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under      *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under      *
 * the LaTeX Project Public Licence in file Licence.txt. The files of       *
 * this distribution may be redistributed or modified provided that this    *
 * copyright notice is included and provided that modifications are clearly *
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/xfig.m4 b/Master/texmf-dist/doc/latex/circuit-macros/xfig.m4
index c9498cf628f..d0c42ce6dbb 100644
--- a/Master/texmf-dist/doc/latex/circuit-macros/xfig.m4
+++ b/Master/texmf-dist/doc/latex/circuit-macros/xfig.m4
@@ -1,7 +1,7 @@
 divert(-1)
    xfig.m4                      Initialization for xfig.
 
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under      *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under      *
 * the LaTeX Project Public Licence in file Licence.txt. The files of       *
 * this distribution may be redistributed or modified provided that this    *
 * copyright notice is included and provided that modifications are clearly *
author	Karl Berry <karl@freefriends.org>	2021-01-03 22:28:40 +0000
committer	Karl Berry <karl@freefriends.org>	2021-01-03 22:28:40 +0000
commit	c2bba0f0e98daeca2063914b65825d9ca50bca91 (patch)
tree	231f1f86795132fe089424c96d0aba4b87047d8d
parent	54acbdb8e89ca53284132a35b803929d6e88e43a (diff)