diff --git a/tikz/cmos-nor/Makefile b/tikz/cmos-nor/Makefile index 7431305..2ab1b2e 100644 --- a/tikz/cmos-nor/Makefile +++ b/tikz/cmos-nor/Makefile @@ -17,8 +17,9 @@ gif: png: make - make svg - inkscape $(SOURCE).svg -w $(WIDTH) --export-png=$(SOURCE).png + #make svg + #inkscape $(SOURCE).svg -w $(WIDTH) --export-png=$(SOURCE).png + convert -density $(DENSITY)x$(DENSITY) $(SOURCE).pdf $(SOURCE).png transparentGif: convert $(SOURCE).pdf -transparent white result.gif @@ -26,7 +27,7 @@ transparentGif: svg: make - #inkscape $(SOURCE).pdf --export-plain-svg=$(SOURCE).svg + #inkscape $(SOURCE).pdf --export-plain-svg=$(SOURCE)3.svg pdf2svg $(SOURCE).pdf $(SOURCE).svg # Necessary, as pdf2svg does not always create valid svgs: inkscape $(SOURCE).svg --export-plain-svg=$(SOURCE).svg diff --git a/tikz/cmos-nor/cmos-nor.png b/tikz/cmos-nor/cmos-nor.png index 37097b9..49e78f6 100644 Binary files a/tikz/cmos-nor/cmos-nor.png and b/tikz/cmos-nor/cmos-nor.png differ diff --git a/tikz/cmos-nor/cmos-nor.tex b/tikz/cmos-nor/cmos-nor.tex index c7b585c..19d88d4 100644 --- a/tikz/cmos-nor/cmos-nor.tex +++ b/tikz/cmos-nor/cmos-nor.tex @@ -8,47 +8,37 @@ \begin{preview} \begin{tikzpicture}[scale=0.5] % verbindungen - \draw (0,5) -- (2,5); - \draw (0,8) -- (6,8); - \draw (6,3) -- (6,9); - \draw (6,3) -- (7,3); - \draw (6,9) -- (7,9); - \draw (6,9) -- (7,9); + \draw (0,5) -- (2,5); % von a weg + \draw (0,8) -- (6,8); % von b weg + \draw (7,9) --(6,9) -- (6,3) -- (7,3); \draw (3,3) -- (2,3) -- (2,6) -- (7,6); - \draw (3.5,1) -- (3.5,2.25); - \draw (7.5,1) -- (7.5,2.25); - \draw (3.5,1) -- (7.5,1); - \draw (3.5,3.75) -- (3.5,4.25) -- (10,4.25); - \draw (7.5,3.75) -- (7.5,5.25); - \draw (7.5,6.75) -- (7.5,8.25); - \draw (7.5,9.75) -- (7.5,11); + + \draw (3.25,3.75) -- (3.5,3.75) -- (3.5,4.25) -- (10,4.25); % Transistor left down \draw (3,2) -- (3,4); \draw[dashed] (3.25,2) -- (3.25,4); - \draw (3.25,2.25) -- (3.5,2.25); - \draw (3.25,3.75) -- (3.5,3.75); + \draw (3.25,2.25) -- (3.5,2.25) -- (3.5,1) -- (7.5,1) -- (7.5,2.25) -- (7.25,2.25); \draw[latex-] (3.25,3) -- (4, 3); % Gate % Transistor right down \draw (7,2) -- (7,4); \draw[dashed] (7.25,2) -- (7.25,4); - \draw (7.25,2.25) -- (7.5,2.25); - \draw (7.25,3.75) -- (7.5,3.75); \draw[latex-] (7.25,3) -- (8, 3); % Gate + \draw (7.25,3.75) -- (7.5,3.75) -- (7.5,5.25) -- (7.25,5.25); + % Transistor right middle \draw (7,5) -- (7,7); \draw[dashed] (7.25,5) -- (7.25,7); - \draw (7.25,5.25) -- (7.5,5.25); - \draw (7.25,6.75) -- (7.5,6.75); \draw[-latex] (7.25,6) -- (8, 6); % Gate + \draw (7.25,6.75) -- (7.5,6.75) -- (7.5,8.25) -- (7.25,8.25); + % Transistor right top \draw (7,8) -- (7,10); \draw[dashed] (7.25,8) -- (7.25,10); - \draw (7.25,8.25) -- (7.5,8.25); - \draw (7.25,9.75) -- (7.5,9.75); + \draw (7.25,9.75) -- (7.5,9.75) -- (7.5,11); \draw[-latex] (7.25,9) -- (8,9); % Gate % GND