texlive[55289] Master/texmf-dist: pst-circ (26may20)

commits+karl at tug.org commits+karl at tug.org
Tue May 26 23:29:22 CEST 2020


Revision: 55289
          http://tug.org/svn/texlive?view=revision&revision=55289
Author:   karl
Date:     2020-05-26 23:29:21 +0200 (Tue, 26 May 2020)
Log Message:
-----------
pst-circ (26may20)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/generic/pst-circ/Changes
    trunk/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf
    trunk/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex
    trunk/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex

Modified: trunk/Master/texmf-dist/doc/generic/pst-circ/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-circ/Changes	2020-05-26 21:28:39 UTC (rev 55288)
+++ trunk/Master/texmf-dist/doc/generic/pst-circ/Changes	2020-05-26 21:29:21 UTC (rev 55289)
@@ -1,3 +1,4 @@
+2.17  2020-05-26  fix for colors in xcolor notation
 2.16  2019-01-22  fix for arrows in coil-elektor
 2.15  2017-11-16  fix bug with TRot=180 for \transistor
 2.14  2016-08-21  fix bug with \splitter

Modified: trunk/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex	2020-05-26 21:28:39 UTC (rev 55288)
+++ trunk/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex	2020-05-26 21:29:21 UTC (rev 55289)
@@ -1,9 +1,9 @@
-%% $Id: pst-circ-doc.tex 918 2019-01-22 16:41:03Z herbert $
+%% $Id: pst-circ-doc.tex 1181 2020-05-26 13:19:14Z herbert $
 \documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,
    headings=small, headinclude=false,footinclude=false,oneside,abstract=on]{pst-doc}
+\usepackage{amsmath,siunitx}
 \usepackage{pst-circ}
 \let\pstCircFV\fileversion
-\usepackage{amsmath,siunitx}
 
 \addbibresource{\jobname.bib}
 \DeclareSIUnit\dbm{dBm} %% Définition du dBm
@@ -79,7 +79,6 @@
 
 \tableofcontents
 
-\clearpage
 
 \begin{abstract}
 \noindent
@@ -113,6 +112,7 @@
     \mbox{Markus Graube},
     \mbox{Henning Heinze},
     \mbox{Christophe Jorssen},
+    \mbox{Jochen Ketter},
     \mbox{Bernd Landwehr},
     \mbox{Michael Lauterbach},
     \mbox{Manuel Luque}, 

Modified: trunk/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex	2020-05-26 21:28:39 UTC (rev 55288)
+++ trunk/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex	2020-05-26 21:29:21 UTC (rev 55289)
@@ -1,4 +1,4 @@
-%% $Id: pst-circ.tex 918 2019-01-22 16:41:03Z herbert $
+%% $Id: pst-circ.tex 1181 2020-05-26 13:19:14Z 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.16}
-\def\filedate{2019/01/22}
+\def\fileversion{2.17}
+\def\filedate{2020/05/26}
 \message{`pst-circ' v\fileversion (hv)}
 %
 \edef\PstAtCode{\the\catcode`\@}
@@ -1021,7 +1021,7 @@
       \ncput[npos=2.5]{%
         \psline[linecolor=\psk at I@color,
           linewidth=\psk at I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \naput[npos=2.5]{\csname\psk at I@labelcolor\endcsname\psk at label@OAiplus}
+      \naput[npos=2.5]{\color{\psk at I@labelcolor}\psk at label@OAiplus}
     \fi
   \fi
   \ifPst at OAiminus
@@ -1029,7 +1029,7 @@
       \ncput[npos=2.5]{%
         \psline[linecolor=\psk at I@color,
           linewidth=\psk at I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \naput[npos=2.5]{\csname\psk at I@labelcolor\endcsname\psk at label@OAiminus}
+      \naput[npos=2.5]{\color{\psk at I@labelcolor}\psk at label@OAiminus}
     \fi
   \fi
   \ncangle[arrows=-,arm=.5,angleA=0,angleB=180]{#2}{\ifPst at OAinvert Plus@\else Minus@\fi}
@@ -1039,7 +1039,7 @@
       \ncput[npos=2.5]{%
         \psline[linecolor=\psk at I@color,
           linewidth=\psk at I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \nbput[npos=2.5]{\csname\psk at I@labelcolor\endcsname\psk at label@OAiplus}
+      \nbput[npos=2.5]{\color{\psk at I@labelcolor}\psk at label@OAiplus}
     \fi
   \fi
   \ifPst at OAiminus
@@ -1047,7 +1047,7 @@
       \ncput[npos=2.5]{%
         \psline[linecolor=\psk at I@color,
           linewidth=\psk at I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \nbput[npos=2.5]{\csname\psk at I@labelcolor\endcsname\psk at label@OAiminus}
+      \nbput[npos=2.5]{\color{\psk at I@labelcolor}\psk at label@OAiminus}
     \fi
   \fi
   \ncangle[arrows=-,arm=.5,angleA=180,angleB=0]{#3}{S@}
@@ -1056,7 +1056,7 @@
     \ncput[npos=2.5]{%
       \psline[linecolor=\psk at I@color,
         linewidth=\psk at I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-    \naput[npos=2.5]{\csname\psk at I@labelcolor\endcsname\psk at label@OAiout}
+    \naput[npos=2.5]{\color{\psk at I@labelcolor}\psk at label@OAiout}
   \fi
   \psline[linestyle=none](#1)(#2)% for the end arrows
   \psline[linestyle=none](#1)(#3)% for the end arrows
@@ -1095,7 +1095,7 @@
       \ncput[npos=2.5]{%
         \psline[linecolor=\psk at I@color,
           linewidth=\psk at I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \naput[npos=2.5]{\csname\psk at I@labelcolor\endcsname\psk at label@GMiplus}
+      \naput[npos=2.5]{\color{\psk at I@labelcolor}\psk at label@GMiplus}
     \fi
   \fi
   \ifPst at GMiminus
@@ -1103,7 +1103,7 @@
       \ncput[npos=2.5]{%
         \psline[linecolor=\psk at I@color,
           linewidth=\psk at I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \naput[npos=2.5]{\csname\psk at I@labelcolor\endcsname\psk at label@GMiminus}
+      \naput[npos=2.5]{\color{\psk at I@labelcolor}\psk at label@GMiminus}
     \fi
   \fi
   \ncangle[arrows=-,arm=.5,angleA=0,angleB=180]{#2}{\ifPst at GMinvert Plus@\else Minus@\fi}
@@ -1113,7 +1113,7 @@
       \ncput[npos=2.5]{%
         \psline[linecolor=\psk at I@color,
           linewidth=\psk at I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \nbput[npos=2.5]{\csname\psk at I@labelcolor\endcsname\psk at label@GMiplus}
+      \nbput[npos=2.5]{\color{\psk at I@labelcolor}\psk at label@GMiplus}
     \fi
   \fi
   \ifPst at GMiminus
@@ -1121,7 +1121,7 @@
       \ncput[npos=2.5]{%
         \psline[linecolor=\psk at I@color,
           linewidth=\psk at I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \nbput[npos=2.5]{\csname\psk at I@labelcolor\endcsname\psk at label@GMiminus}
+      \nbput[npos=2.5]{\color{\psk at I@labelcolor}\psk at label@GMiminus}
     \fi
   \fi
   \ncangle[arrows=-,arm=.5,angleA=180,angleB=0]{#3}{S@}
@@ -1130,7 +1130,7 @@
     \ncput[npos=2.5]{%
       \psline[linecolor=\psk at I@color,
         linewidth=\psk at I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-    \naput[npos=2.5]{\csname\psk at I@labelcolor\endcsname\psk at label@GMiout}
+    \naput[npos=2.5]{\color{\psk at I@labelcolor}\psk at label@GMiout}
   \fi
   \psline[linestyle=none](#1)(#2)% for the end arrows
   \psline[linestyle=none](#1)(#3)% for the end arrows
@@ -1360,7 +1360,7 @@
     \ncput[npos=0.5,nrot=\Pst at TRot]{%
       \psline[linecolor=\psk at I@color,linewidth=\psk at I@width,%
         arrowsize=6\pslinewidth,arrowinset=0]{->}(-.1,0)(.1,0)}%
-    \naput[npos=0.5]{\csname\psk at I@labelcolor\endcsname\psk at labeltransistoribase}%
+    \naput[npos=0.5]{\color{\psk at I@labelcolor}\psk at labeltransistoribase}%
   \fi
   \bgroup
     \psset{style=collectorOpt}%
@@ -1376,7 +1376,7 @@
       \ncput[npos=\pscirc at edge@sector,nrot=:U]{%
         \psline[linecolor=\psk at I@color,linewidth=\psk at I@width,%
     arrowsize=6\pslinewidth,arrowinset=0]{->}(-0.1,0)(0.1,0)}%
-      \nbput[npos=\pscirc at edge@sector]{\csname\psk at I@labelcolor\endcsname\psk at labeltransistoriemitter}%
+      \nbput[npos=\pscirc at edge@sector]{\color{\psk at I@labelcolor}\psk at labeltransistoriemitter}%
     \fi\fi
   \ifPst at transistoricollector% collector current?
     \ifPst at transistorinvert\else% emitter/collector changed?
@@ -1383,7 +1383,7 @@
       \ncput[npos=\pscirc at edge@sector,nrot=:U]{%
         \psline[linecolor=\psk at I@color,linewidth=\psk at I@width,
     arrowsize=6\pslinewidth,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \nbput[npos=\pscirc at edge@sector]{\csname\psk at I@labelcolor\endcsname\psk at labeltransistoricollector}%
+      \nbput[npos=\pscirc at edge@sector]{\color{\psk at I@labelcolor}\psk at labeltransistoricollector}%
     \fi\fi
   \bgroup
   \psset{style=emitterOpt}%
@@ -1395,7 +1395,7 @@
       \ncput[npos=\pscirc at edge@sector,nrot=:U]{%
         \psline[linecolor=\psk at I@color,linewidth=\psk at I@width,
     arrowsize=6\pslinewidth,arrowinset=0]{<-}(-.1,0)(.1,0)}
-      \naput[npos=\pscirc at edge@sector]{\csname\psk at I@labelcolor\endcsname\psk at labeltransistoriemitter}%
+      \naput[npos=\pscirc at edge@sector]{\color{\psk at I@labelcolor}\psk at labeltransistoriemitter}%
     \fi\fi
   \ifPst at transistoricollector% collector current?
     \ifPst at transistorinvert% emitter/collector changed?
@@ -1402,7 +1402,7 @@
       \ncput[npos=\pscirc at edge@sector,nrot=:U]{%
         \psline[linecolor=\psk at I@color,linewidth=\psk at I@width,
     arrowsize=6\pslinewidth,arrowinset=0]{<-}(-.1,0)(.1,0)}
-      \naput[npos=\pscirc at edge@sector]{\csname\psk at I@labelcolor\endcsname\psk at labeltransistoricollector}%
+      \naput[npos=\pscirc at edge@sector]{\color{\psk at I@labelcolor}\psk at labeltransistoricollector}%
     \fi\fi
   \psline[linestyle=none](#1)(#2)% for the end arrows
   \psline[linestyle=none](#1)(#3)% for the end arrows
@@ -1520,7 +1520,7 @@
   \ifPst at Trafo@iprimary
     \ncput[npos=2.5,nrot=:U]{\psline[linecolor=\psk at I@color,
       linewidth=\psk at I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-    \nbput[npos=2.5]{\csname\psk at I@labelcolor\endcsname\psk at Trafo@iprimary at label}
+    \nbput[npos=2.5]{\color{\psk at I@labelcolor}\psk at Trafo@iprimary at label}
   \fi
   \ncangle[arrows=-,arm=0.5,angleB=-90]{@endB}{indown@}
   \ncangle[arrows=-,arm=0.5,angleB=90]{@endC}{outup@}
@@ -1527,7 +1527,7 @@
   \ifPst at Trafo@isecondary
     \ncput[npos=2.5,nrot=:U]{\psline[linecolor=\psk at I@color,
       linewidth=\psk at I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-    \naput[npos=2.5]{\csname\psk at I@labelcolor\endcsname\psk at Trafo@isecondary at label}
+    \naput[npos=2.5]{\color{\psk at I@labelcolor}\psk at Trafo@isecondary at label}
   \fi
   \ncangle[arrows=-,arm=0.5,angleB=-90]{@endD}{outdown@}
   \ncline[arrows=-,linestyle=none,fillstyle=none]{indown@}{inup@}
@@ -1842,13 +1842,13 @@
         \psline[linecolor=\psk at I@color,
           linewidth=\psk at I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
       \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk at I@label at offset](#1)(dipole at 1)
-      \ncput[nrot=\psk at label@angle]{\csname\psk at I@labelcolor\endcsname\psk at I@label}
+      \ncput[nrot=\psk at label@angle]{\color{\psk at I@labelcolor}\psk at I@label}
     \else
       \pcline[arrows=-,linestyle=none,fillstyle=none](dipole at 2)(#2)
       \ncput[nrot=:U]{%
         \psline[linecolor=\psk at I@color,linewidth=\psk at I@width,arrowinset=0]{<-}(-.1,0)(.1,0)}
       \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk at I@label at offset](dipole at 2)(#2)
-      \ncput[nrot=\psk at label@angle]{\csname\psk at I@labelcolor\endcsname\psk at I@label}
+      \ncput[nrot=\psk at label@angle]{\color{\psk at I@labelcolor}\psk at I@label}
     \fi
   \fi
 }
@@ -1893,7 +1893,7 @@
       \fi
     \fi
     \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk at tension@label at offset](dipole at 1)(dipole at 2)
-    \ncput[nrot=\psk at label@angle]{\csname\psk at tension@labelcolor\endcsname\psk at tension@label}
+    \ncput[nrot=\psk at label@angle]{\color{\psk at tension@labelcolor}\psk at tension@label}
   \fi
 }
 %
@@ -2557,12 +2557,12 @@
           \psline[linecolor=\psk at I@color,
             linewidth=\psk at I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
         \pcline[linestyle=none,fillstyle=none,offset=\psk at I@label at offset](#2)(#3)
-        \ncput[nrot=\psk at label@angle]{\csname\psk at I@labelcolor\endcsname\psk at I@label}
+        \ncput[nrot=\psk at label@angle]{\color{\psk at I@labelcolor}\psk at I@label}
       \else
         \ncput[nrot=:U]{%
           \psline[linecolor=\psk at I@color,linewidth=\psk at I@width]{<-}(-.1,0)(.1,0)}
         \pcline[linestyle=none,fillstyle=none,offset=\psk at I@label at offset](#2)(#3)
-        \ncput[nrot=\psk at label@angle]{\csname\psk at I@labelcolor\endcsname\psk at I@label}
+        \ncput[nrot=\psk at label@angle]{\color{\psk at I@labelcolor}\psk at I@label}
       \fi
     \fi
   \fi
@@ -2580,7 +2580,7 @@
   \ncput[nrot=:U,npos=0.95]{\pnode{@M2}}
   \ncline[arrowinset=0,linecolor=\psk at tension@color]{->}{@M1}{@M2}
   \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk at label@offset](@M1)(@M2)
-  \ncput[nrot=\psk at label@angle]{\csname\psk at tension@labelcolor\endcsname #4}
+  \ncput[nrot=\psk at label@angle]{\color{\psk at tension@labelcolor}#4}
 }\ignorespaces}
 %
 \def\node(#1){\pscircle*(#1){2\pslinewidth}}



More information about the tex-live-commits mailing list.