From c2bba0f0e98daeca2063914b65825d9ca50bca91 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 3 Jan 2021 22:28:40 +0000 Subject: circuit-macros (3jan21) git-svn-id: svn://tug.org/texlive/trunk@57308 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/circuit-macros/CHANGES | 1 + Master/texmf-dist/doc/latex/circuit-macros/Copying | 2 +- Master/texmf-dist/doc/latex/circuit-macros/README | 2 +- .../texmf-dist/doc/latex/circuit-macros/darrow.m4 | 2 +- .../latex/circuit-macros/doc/Circuit_macros.pdf | Bin 950156 -> 973887 bytes .../latex/circuit-macros/doc/Circuit_macros.tex | 10 +- .../doc/latex/circuit-macros/doc/Makefile | 4 +- .../doc/latex/circuit-macros/doc/Version.tex | 2 +- .../doc/latex/circuit-macros/doc/body.tex | 14 +- .../doc/latex/circuit-macros/dpictools.pic | 2 +- .../doc/latex/circuit-macros/examples/examples.pdf | Bin 876477 -> 876504 bytes .../doc/latex/circuit-macros/examples/mf/cct.mf | 2 +- .../latex/circuit-macros/examples/nsvg/Makefile | 92 -- .../circuit-macros/examples/nsvg/dev/F_test.tex | 5 - .../circuit-macros/examples/nsvg/dev/Makefile | 81 -- .../circuit-macros/examples/nsvg/dev/test-1.svg | 162 --- .../circuit-macros/examples/nsvg/dev/test.pdf | Bin 35308 -> 0 bytes .../circuit-macros/examples/nsvg/dev/test.pic | 383 ------- .../circuit-macros/examples/nsvg/dev/test.svg | 239 ---- .../circuit-macros/examples/nsvg/dev/test.tex | 1136 -------------------- .../circuit-macros/examples/nsvg/dev/tikztosvg | 181 ---- .../circuit-macros/examples/nsvg/dev/tstSVG.htmx | 62 -- .../circuit-macros/examples/nsvg/examples.pdf | Bin 897744 -> 0 bytes .../circuit-macros/examples/nsvg/examplesSVG.htmx | 70 -- .../doc/latex/circuit-macros/examples/oFlow.m4 | 108 -- .../doc/latex/circuit-macros/examples/shapes.m4 | 2 +- Master/texmf-dist/doc/latex/circuit-macros/gpic.m4 | 2 +- .../texmf-dist/doc/latex/circuit-macros/lib3D.m4 | 2 +- .../texmf-dist/doc/latex/circuit-macros/libcct.m4 | 2 +- .../texmf-dist/doc/latex/circuit-macros/libgen.m4 | 20 +- .../texmf-dist/doc/latex/circuit-macros/liblog.m4 | 2 +- .../texmf-dist/doc/latex/circuit-macros/mfpic.m4 | 2 +- .../texmf-dist/doc/latex/circuit-macros/mpost.m4 | 2 +- Master/texmf-dist/doc/latex/circuit-macros/pgf.m4 | 2 +- .../doc/latex/circuit-macros/postscript.m4 | 2 +- .../texmf-dist/doc/latex/circuit-macros/psfrag.m4 | 2 +- .../doc/latex/circuit-macros/pstricks.m4 | 2 +- Master/texmf-dist/doc/latex/circuit-macros/svg.m4 | 2 +- Master/texmf-dist/doc/latex/circuit-macros/xfig.m4 | 2 +- 39 files changed, 48 insertions(+), 2558 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/Makefile delete mode 100644 Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/F_test.tex delete mode 100644 Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/Makefile delete mode 100644 Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test-1.svg delete mode 100644 Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test.pdf delete mode 100644 Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test.pic delete mode 100644 Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test.svg delete mode 100644 Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test.tex delete mode 100644 Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/tikztosvg delete mode 100644 Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/tstSVG.htmx delete mode 100644 Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/examples.pdf delete mode 100644 Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/examplesSVG.htmx delete mode 100644 Master/texmf-dist/doc/latex/circuit-macros/examples/oFlow.m4 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 Binary files a/Master/texmf-dist/doc/latex/circuit-macros/doc/Circuit_macros.pdf and b/Master/texmf-dist/doc/latex/circuit-macros/doc/Circuit_macros.pdf differ 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 "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 Binary files a/Master/texmf-dist/doc/latex/circuit-macros/examples/examples.pdf and b/Master/texmf-dist/doc/latex/circuit-macros/examples/examples.pdf differ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 Binary files a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/test.pdf and /dev/null differ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - -SVG Examples: Circuit_macros Version XXX - - - - - -

SVG Circuit_macros examples, Version XXX

-
- -

-These diagrams are the result of applying pdf2svg to examples.pdf. -

- Click on the link to view the source of each diagram. -

-
- -define(`for_',`ifelse(eval(`$1'!=(`$2'+(`$3'))),1,`pushdef(`m4x',`$1') $4 - popdef(`m4x')for_(eval(`$1'+(`$3')),`$2',`$3',`$4')')') - -define(`cfig',` -

- - - - - - - - - -
- - - -cfig(test) -#for_(1,46,1, -#cfig(examples_```'''m4x) -#) - - - 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 Binary files a/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/examples.pdf and /dev/null differ 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 @@ - - - - - - -SVG Examples: Circuit_macros Version XXX - - - - - -

SVG Circuit_macros examples, Version XXX

-
- -

- These diagrams are in .svg format. - Pdf - and - png - versions are also available. - The PDF equivalent can be found in examples.pdf of the distribution. -

-

- Click on the link to view the source of each diagram. -

-
- -define(`for_',`ifelse(eval(`$1'!=(`$2'+(`$3'))),1,`pushdef(`m4x',`$1') $4 - popdef(`m4x')for_(eval(`$1'+(`$3')),`$2',`$3',`$4')')') - -define(`cfig',` -

- - - - - - - - - -
- - -

-These diagrams are the result of applying pdf2svg to examples.pdf. - - -for_(1,46,1, -cfig(examples_```'''m4x) -) - - - 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