CTAN sync 202005270303

4 files changed, 30 insertions, 29 deletions

diff --git a/graphics/pstricks/contrib/pst-circ/Changes b/graphics/pstricks/contrib/pst-circ/Changes
index 219fbd3b91..964ce6bfb3 100644
--- a/graphics/pstricks/contrib/pst-circ/Changes
+++ b/graphics/pstricks/contrib/pst-circ/Changes
@@ -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
diff --git a/graphics/pstricks/contrib/pst-circ/doc/pst-circ-doc.pdf b/graphics/pstricks/contrib/pst-circ/doc/pst-circ-doc.pdf
index 11826d5e5e..11abcb0ee9 100644
--- a/graphics/pstricks/contrib/pst-circ/doc/pst-circ-doc.pdf
+++ b/graphics/pstricks/contrib/pst-circ/doc/pst-circ-doc.pdf
diff --git a/graphics/pstricks/contrib/pst-circ/doc/pst-circ-doc.tex b/graphics/pstricks/contrib/pst-circ/doc/pst-circ-doc.tex
index 35f974c0cf..a614cbe3e9 100644
--- a/graphics/pstricks/contrib/pst-circ/doc/pst-circ-doc.tex
+++ b/graphics/pstricks/contrib/pst-circ/doc/pst-circ-doc.tex
@@ -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 @@ Herbert Vo\ss}
 
 \tableofcontents
 
-\clearpage
 
 \begin{abstract}
 \noindent
@@ -113,6 +112,7 @@ Thanks to: \\
     \mbox{Markus Graube},
     \mbox{Henning Heinze},
     \mbox{Christophe Jorssen},
+    \mbox{Jochen Ketter},
     \mbox{Bernd Landwehr},
     \mbox{Michael Lauterbach},
     \mbox{Manuel Luque}, 
diff --git a/graphics/pstricks/contrib/pst-circ/tex/pst-circ.tex b/graphics/pstricks/contrib/pst-circ/tex/pst-circ.tex
index 8b3b4485c0..770e2ff842 100644
--- a/graphics/pstricks/contrib/pst-circ/tex/pst-circ.tex
+++ b/graphics/pstricks/contrib/pst-circ/tex/pst-circ.tex
@@ -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@I@color,
           linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \naput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@OAiplus}
+      \naput[npos=2.5]{\color{\psk@I@labelcolor}\psk@label@OAiplus}
     \fi
   \fi
   \ifPst@OAiminus
@@ -1029,7 +1029,7 @@
       \ncput[npos=2.5]{%
         \psline[linecolor=\psk@I@color,
           linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \naput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@OAiminus}
+      \naput[npos=2.5]{\color{\psk@I@labelcolor}\psk@label@OAiminus}
     \fi
   \fi
   \ncangle[arrows=-,arm=.5,angleA=0,angleB=180]{#2}{\ifPst@OAinvert Plus@\else Minus@\fi}
@@ -1039,7 +1039,7 @@
       \ncput[npos=2.5]{%
         \psline[linecolor=\psk@I@color,
           linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \nbput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@OAiplus}
+      \nbput[npos=2.5]{\color{\psk@I@labelcolor}\psk@label@OAiplus}
     \fi
   \fi
   \ifPst@OAiminus
@@ -1047,7 +1047,7 @@
       \ncput[npos=2.5]{%
         \psline[linecolor=\psk@I@color,
           linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \nbput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@OAiminus}
+      \nbput[npos=2.5]{\color{\psk@I@labelcolor}\psk@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@I@color,
         linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-    \naput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@OAiout}
+    \naput[npos=2.5]{\color{\psk@I@labelcolor}\psk@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@I@color,
           linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \naput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@GMiplus}
+      \naput[npos=2.5]{\color{\psk@I@labelcolor}\psk@label@GMiplus}
     \fi
   \fi
   \ifPst@GMiminus
@@ -1103,7 +1103,7 @@
       \ncput[npos=2.5]{%
         \psline[linecolor=\psk@I@color,
           linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \naput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@GMiminus}
+      \naput[npos=2.5]{\color{\psk@I@labelcolor}\psk@label@GMiminus}
     \fi
   \fi
   \ncangle[arrows=-,arm=.5,angleA=0,angleB=180]{#2}{\ifPst@GMinvert Plus@\else Minus@\fi}
@@ -1113,7 +1113,7 @@
       \ncput[npos=2.5]{%
         \psline[linecolor=\psk@I@color,
           linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \nbput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@GMiplus}
+      \nbput[npos=2.5]{\color{\psk@I@labelcolor}\psk@label@GMiplus}
     \fi
   \fi
   \ifPst@GMiminus
@@ -1121,7 +1121,7 @@
       \ncput[npos=2.5]{%
         \psline[linecolor=\psk@I@color,
           linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \nbput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@GMiminus}
+      \nbput[npos=2.5]{\color{\psk@I@labelcolor}\psk@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@I@color,
         linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-    \naput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@GMiout}
+    \naput[npos=2.5]{\color{\psk@I@labelcolor}\psk@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@TRot]{%
       \psline[linecolor=\psk@I@color,linewidth=\psk@I@width,%
         arrowsize=6\pslinewidth,arrowinset=0]{->}(-.1,0)(.1,0)}%
-    \naput[npos=0.5]{\csname\psk@I@labelcolor\endcsname\psk@labeltransistoribase}%
+    \naput[npos=0.5]{\color{\psk@I@labelcolor}\psk@labeltransistoribase}%
   \fi
   \bgroup
     \psset{style=collectorOpt}%
@@ -1376,14 +1376,14 @@
       \ncput[npos=\pscirc@edge@sector,nrot=:U]{%
         \psline[linecolor=\psk@I@color,linewidth=\psk@I@width,%
     arrowsize=6\pslinewidth,arrowinset=0]{->}(-0.1,0)(0.1,0)}%
-      \nbput[npos=\pscirc@edge@sector]{\csname\psk@I@labelcolor\endcsname\psk@labeltransistoriemitter}%
+      \nbput[npos=\pscirc@edge@sector]{\color{\psk@I@labelcolor}\psk@labeltransistoriemitter}%
     \fi\fi
   \ifPst@transistoricollector% collector current?
     \ifPst@transistorinvert\else% emitter/collector changed?
       \ncput[npos=\pscirc@edge@sector,nrot=:U]{%
         \psline[linecolor=\psk@I@color,linewidth=\psk@I@width,
     arrowsize=6\pslinewidth,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \nbput[npos=\pscirc@edge@sector]{\csname\psk@I@labelcolor\endcsname\psk@labeltransistoricollector}%
+      \nbput[npos=\pscirc@edge@sector]{\color{\psk@I@labelcolor}\psk@labeltransistoricollector}%
     \fi\fi
   \bgroup
   \psset{style=emitterOpt}%
@@ -1395,14 +1395,14 @@
       \ncput[npos=\pscirc@edge@sector,nrot=:U]{%
         \psline[linecolor=\psk@I@color,linewidth=\psk@I@width,
     arrowsize=6\pslinewidth,arrowinset=0]{<-}(-.1,0)(.1,0)}
-      \naput[npos=\pscirc@edge@sector]{\csname\psk@I@labelcolor\endcsname\psk@labeltransistoriemitter}%
+      \naput[npos=\pscirc@edge@sector]{\color{\psk@I@labelcolor}\psk@labeltransistoriemitter}%
     \fi\fi
   \ifPst@transistoricollector% collector current?
     \ifPst@transistorinvert% emitter/collector changed?
       \ncput[npos=\pscirc@edge@sector,nrot=:U]{%
         \psline[linecolor=\psk@I@color,linewidth=\psk@I@width,
     arrowsize=6\pslinewidth,arrowinset=0]{<-}(-.1,0)(.1,0)}
-      \naput[npos=\pscirc@edge@sector]{\csname\psk@I@labelcolor\endcsname\psk@labeltransistoricollector}%
+      \naput[npos=\pscirc@edge@sector]{\color{\psk@I@labelcolor}\psk@labeltransistoricollector}%
     \fi\fi
   \psline[linestyle=none](#1)(#2)% for the end arrows
   \psline[linestyle=none](#1)(#3)% for the end arrows
@@ -1520,14 +1520,14 @@
   \ifPst@Trafo@iprimary
     \ncput[npos=2.5,nrot=:U]{\psline[linecolor=\psk@I@color,
       linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-    \nbput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@Trafo@iprimary@label}
+    \nbput[npos=2.5]{\color{\psk@I@labelcolor}\psk@Trafo@iprimary@label}
   \fi
   \ncangle[arrows=-,arm=0.5,angleB=-90]{@endB}{indown@}
   \ncangle[arrows=-,arm=0.5,angleB=90]{@endC}{outup@}
   \ifPst@Trafo@isecondary
     \ncput[npos=2.5,nrot=:U]{\psline[linecolor=\psk@I@color,
       linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-    \naput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@Trafo@isecondary@label}
+    \naput[npos=2.5]{\color{\psk@I@labelcolor}\psk@Trafo@isecondary@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@I@color,
           linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
       \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk@I@label@offset](#1)(dipole@1)
-      \ncput[nrot=\psk@label@angle]{\csname\psk@I@labelcolor\endcsname\psk@I@label}
+      \ncput[nrot=\psk@label@angle]{\color{\psk@I@labelcolor}\psk@I@label}
     \else
       \pcline[arrows=-,linestyle=none,fillstyle=none](dipole@2)(#2)
       \ncput[nrot=:U]{%
         \psline[linecolor=\psk@I@color,linewidth=\psk@I@width,arrowinset=0]{<-}(-.1,0)(.1,0)}
       \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk@I@label@offset](dipole@2)(#2)
-      \ncput[nrot=\psk@label@angle]{\csname\psk@I@labelcolor\endcsname\psk@I@label}
+      \ncput[nrot=\psk@label@angle]{\color{\psk@I@labelcolor}\psk@I@label}
     \fi
   \fi
 }
@@ -1893,7 +1893,7 @@
       \fi
     \fi
     \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk@tension@label@offset](dipole@1)(dipole@2)
-    \ncput[nrot=\psk@label@angle]{\csname\psk@tension@labelcolor\endcsname\psk@tension@label}
+    \ncput[nrot=\psk@label@angle]{\color{\psk@tension@labelcolor}\psk@tension@label}
   \fi
 }
 %
@@ -2557,12 +2557,12 @@
           \psline[linecolor=\psk@I@color,
             linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
         \pcline[linestyle=none,fillstyle=none,offset=\psk@I@label@offset](#2)(#3)
-        \ncput[nrot=\psk@label@angle]{\csname\psk@I@labelcolor\endcsname\psk@I@label}
+        \ncput[nrot=\psk@label@angle]{\color{\psk@I@labelcolor}\psk@I@label}
       \else
         \ncput[nrot=:U]{%
           \psline[linecolor=\psk@I@color,linewidth=\psk@I@width]{<-}(-.1,0)(.1,0)}
         \pcline[linestyle=none,fillstyle=none,offset=\psk@I@label@offset](#2)(#3)
-        \ncput[nrot=\psk@label@angle]{\csname\psk@I@labelcolor\endcsname\psk@I@label}
+        \ncput[nrot=\psk@label@angle]{\color{\psk@I@labelcolor}\psk@I@label}
       \fi
     \fi
   \fi
@@ -2580,7 +2580,7 @@
   \ncput[nrot=:U,npos=0.95]{\pnode{@M2}}
   \ncline[arrowinset=0,linecolor=\psk@tension@color]{->}{@M1}{@M2}
   \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk@label@offset](@M1)(@M2)
-  \ncput[nrot=\psk@label@angle]{\csname\psk@tension@labelcolor\endcsname #4}
+  \ncput[nrot=\psk@label@angle]{\color{\psk@tension@labelcolor}#4}
 }\ignorespaces}
 %
 \def\node(#1){\pscircle*(#1){2\pslinewidth}}