summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-05-19 22:07:51 +0000
committerKarl Berry <karl@freefriends.org>2014-05-19 22:07:51 +0000
commit1e9d9d93d4fa10d84ee6688752db38d190b33c88 (patch)
tree830ce4a438e21b19935162652763f0669e475901 /Master/texmf-dist
parentdf1c0578d12dbfc05d52fa0c9e05678461a8f8e1 (diff)
pst-circ (19may14)
git-svn-id: svn://tug.org/texlive/trunk@34127 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/Changes2
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdfbin755554 -> 757841 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex9
-rw-r--r--Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex31
4 files changed, 22 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-circ/Changes b/Master/texmf-dist/doc/generic/pst-circ/Changes
index d6e6c6a9168..ba3d6c3cc00 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/Changes
+++ b/Master/texmf-dist/doc/generic/pst-circ/Changes
@@ -1,3 +1,5 @@
+2.09 2014-05-18 - allow empty arguments for logicSymbolstyle and
+ logicLabelstyle
2.08 2014-04-19 - added labeloffset for \mixer
2.07 2014-04-15 - added some more symbols for microwaves
2.06 2014-04-01 - small fix for missing arrowinset
diff --git a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf
index 928a85532d9..ec76d8dff47 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex
index 9cb2a63d4a3..2af7d6aacdf 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-circ-doc.tex 909 2014-04-19 08:32:02Z herbert $
+%% $Id: pst-circ-doc.tex 917 2014-05-18 17:37:17Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\usepackage[utf8]{inputenc}
@@ -2877,6 +2877,13 @@ all is finished.
arrows=*-*, dotsize=0.15]{tempA}{tempB}
\end{LTXexample}
+
+AN empty argument to the \Lkeyword{logicSymbolstyle} and \Lkeyword{logicLabelstyle} will suppress the
+output of the symbol and/or the label. The label, of course, is a mandatory argument because it is the prefix
+of the node names.
+
+
+
\subsection{Examples}
\begin{LTXexample}[pos=t]
diff --git a/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex b/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
index 14d5c2a7fae..b5f9ff8918d 100644
--- a/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
+++ b/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-circ.tex 909 2014-04-19 08:32:02Z herbert $
+%% $Id: pst-circ.tex 915 2014-05-18 17:23:55Z herbert $
%% This is file `pst-circ.tex'
%%
%% IMPORTANT NOTICE:
@@ -26,8 +26,8 @@
\ifx\PSTXKeyLoaded\endinput \else\input pst-xkey \fi
\ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi
%
-\def\fileversion{2.08}
-\def\filedate{2014/04/19}
+\def\fileversion{2.09}
+\def\filedate{2014/05/18}
\message{`pst-circ' v\fileversion (hv)}
%
\edef\PstAtCode{\the\catcode`\@}
@@ -1428,7 +1428,6 @@
% The logical circuits part
%
\def\logic{\@ifnextchar[{\pst@draw@logic}{\pst@draw@logic[]}}
-%
\def\ground{\@ifnextchar[{\pst@ground}{\pst@ground[]}}
\def\pst@ground[#1]{%
\@ifnextchar({\pst@groundi[#1]{0}}{\pst@groundi[#1]}%
@@ -2122,7 +2121,7 @@
\psframe[linewidth=2\pslinewidth](0,0)(\psk@logic@width,\psk@logic@height)%
}
\pst@getcoor{#2}\pst@tempa
- \ifPst@logicChangeLR\def\logic@LR{true}\else\def\logic@LR{false}\fi%
+ \ifPst@logicChangeLR\def\logic@LR{true}\else\def\logic@LR{false}\fi
\pstVerb{
/YA \pst@tempa exch pop \pst@number\psyunit div def
/YB YA \psk@logic@height\space add def
@@ -2157,7 +2156,7 @@
\fi
\rput[b](!%
/dx XB XA sub 2 div def
- XA dx add YA 0.1 add){\psk@logic@labelstyle #3}
+ XA dx add YA 0.1 add){\if$\psk@logic@labelstyle$\else\psk@logic@labelstyle#3\fi}
\else
\ifx\psk@logic@type\pst@logic@type@D%---------------- D -----------------
\pnode(! XA YA dy 2 div add){#3C}
@@ -2183,7 +2182,7 @@
\fi
\rput[b](!%
/dx XB XA sub 2 div def
- XA dx add YA 0.1 add){\psk@logic@labelstyle #3}
+ XA dx add YA 0.1 add){\if$\psk@logic@labelstyle$\else\psk@logic@labelstyle#3\fi}
\else
\ifx\psk@logic@type\pst@logic@type@JK%---------------- JK -----------------
\multido{\n=1+1}{\psk@logic@JInput}{%
@@ -2237,13 +2236,9 @@
\fi
\rput[b](!%
/dx XB XA sub 2 div def
- XA dx add YA 0.1 add){\psk@logic@labelstyle #3}
+ XA dx add YA 0.1 add){\if$\psk@logic@labelstyle$\else\psk@logic@labelstyle#3\fi}
\else%---------------- default AND/NAND/OR/NOR/NOT/EXOR/ENOR -----------------
- \ifx\psk@logic@type\pst@logic@type@not
- \def\@nMax{1}
- \else
- \def\@nMax{\psk@logic@nInput}
- \fi
+ \ifx\psk@logic@type\pst@logic@type@not \def\@nMax{1}\else \def\@nMax{\psk@logic@nInput}\fi
\multido{\n=1+1}{\@nMax}{%
\pnode(!%
/Step dy \psk@logic@nInput\space div def
@@ -2254,10 +2249,8 @@
/YC \pst@tempc exch pop \pst@number\psyunit div def
/XC \pst@tempc pop \pst@number\psxunit div def
XC \psk@logic@wireLength\space \logic@LR {add}{sub} ifelse YC){temp#3\n}
- \psline(#3\n)(temp#3\n)% input
- \ifPst@logicShowDot
- \qdisk(temp#3\n){3pt}
- \fi
+ \expandafter\psline\expandafter(#3\n)(temp#3\n)% input
+ \ifPst@logicShowDot \qdisk(temp#3\n){3pt}\fi
\ifPst@logicShowNode
\uput[\ifPst@logicChangeLR 180\else 0\fi](#3\n){\psk@logic@nodestyle\n}
\fi
@@ -2320,10 +2313,10 @@
\fi
\rput(!%
/dx XB XA sub \psk@logic@symbolpos\space mul def
- XA dx add YB 0.3 sub){\psk@logic@symbolstyle\textbf{\logic@type}}
+ XA dx add YB 0.3 sub){\if$\psk@logic@symbolstyle$\else\psk@logic@symbolstyle\textbf{\logic@type}\fi}
\rput[b](!%
/dx XB XA sub 2 div def
- XA dx add YA 0.1 add){\psk@logic@labelstyle #3}
+ XA dx add YA 0.1 add){\if$\psk@logic@labelstyle$\else\psk@logic@labelstyle#3\fi}
\fi
\fi
\fi% end of no special RS/JK/D