From d2f68b646eb0ca42dcb488171a6e36ea3da68a5d Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Wed, 16 Oct 2019 03:01:51 +0000
Subject: CTAN sync 201910160301

---
 graphics/circuit_macros/doc/CctTable.m4        |   5 +----
 graphics/circuit_macros/doc/Circuit_macros.bib |   7 +++++++
 graphics/circuit_macros/doc/Circuit_macros.pdf | Bin 909464 -> 911278 bytes
 graphics/circuit_macros/doc/Circuit_macros.tex |   4 +++-
 graphics/circuit_macros/doc/Version.tex        |   2 +-
 graphics/circuit_macros/doc/body.tex           |   4 +++-
 graphics/circuit_macros/doc/defines.tex        |  17 +++++++++++++++++
 7 files changed, 32 insertions(+), 7 deletions(-)

(limited to 'graphics/circuit_macros/doc')

diff --git a/graphics/circuit_macros/doc/CctTable.m4 b/graphics/circuit_macros/doc/CctTable.m4
index 4fa5405689..40b5849d66 100644
--- a/graphics/circuit_macros/doc/CctTable.m4
+++ b/graphics/circuit_macros/doc/CctTable.m4
@@ -1,9 +1,6 @@
 .PS
 # `CctTable.m4'
 cct_init
-divert(-1)
-
-divert(0)dnl
 
 movewid = 2 pt__
 hm = 2.05
@@ -84,7 +81,7 @@ vm = 0.28
    move right_ hm
    {reed ; move ;"`{\tt reed}'" ljust}
    move right_ hm
-   {reed(,,,fill_(0.9),CR) ; move ;"`{\tt reed(,{,},fill\_(0.9),CR)}'" ljust}
+   {reed(,,,fill_(0.9),CR) ; move ; "`{\tt reed(,{,},fill\_(0.9),CR)}'" ljust}
 }
 
 .PE
diff --git a/graphics/circuit_macros/doc/Circuit_macros.bib b/graphics/circuit_macros/doc/Circuit_macros.bib
index a918b18bb9..977060a26f 100644
--- a/graphics/circuit_macros/doc/Circuit_macros.bib
+++ b/graphics/circuit_macros/doc/Circuit_macros.bib
@@ -56,6 +56,13 @@ institution={Royal Holloway, University of London},
 note={Email:{\tt adrean@cs.rhbnc.ac.uk}},
 year={1992}}
 
+@book{Mas2019,
+author={Mas, O.},
+title={Pycirkuit 0.5.0},
+publisher={Python Software Foundation},
+note={\url{https://pypi.org/project/pycirkuit/}},
+year={2019}}
+
 @misc{KDEApps2009,
 author={KDE-Apps.org},
 title={Cirkuit},
diff --git a/graphics/circuit_macros/doc/Circuit_macros.pdf b/graphics/circuit_macros/doc/Circuit_macros.pdf
index 95830643bd..e0a03e9510 100644
Binary files a/graphics/circuit_macros/doc/Circuit_macros.pdf and b/graphics/circuit_macros/doc/Circuit_macros.pdf differ
diff --git a/graphics/circuit_macros/doc/Circuit_macros.tex b/graphics/circuit_macros/doc/Circuit_macros.tex
index d1be7bc1e7..36f9bdf694 100644
--- a/graphics/circuit_macros/doc/Circuit_macros.tex
+++ b/graphics/circuit_macros/doc/Circuit_macros.tex
@@ -82,7 +82,9 @@
 \bibliographystyle{plain}
 \makeatletter
 \addcontentsline{toc}{section}{References\ \unhbox \voidb@x
- \cleaders \hbox to.44em{\hss .\hss }\hfill \kern \z@ }
+%\cleaders \hbox to0.44em{\hss .\hss }\hfill \kern \z@ }
+%\cleaders \hbox{\hss \hss }\hfill \kern \z@ }
+ \cleaders \hbox{\hss .$\;$\hss }\hfill \kern \z@ }
 \makeatother
 \bibliography{Circuit_macros}
    \end{document}
diff --git a/graphics/circuit_macros/doc/Version.tex b/graphics/circuit_macros/doc/Version.tex
index aee229c54b..f10e710006 100644
--- a/graphics/circuit_macros/doc/Version.tex
+++ b/graphics/circuit_macros/doc/Version.tex
@@ -1 +1 @@
-Version 9.0
+Version 9.1
diff --git a/graphics/circuit_macros/doc/body.tex b/graphics/circuit_macros/doc/body.tex
index d1fb66d626..91c8fbe3ec 100644
--- a/graphics/circuit_macros/doc/body.tex
+++ b/graphics/circuit_macros/doc/body.tex
@@ -257,7 +257,9 @@ There are several ways to control the process, as follows:
 \begin{enumerate}
 \item
 The macros can be processed by \latex-specific
-project software and by graphic applications such as Cirkuit~\cite{KDEApps2009}.
+project software and by graphic applications such as
+Pycirkuit~\cite{Mas2019}.
+% Cirkuit~\cite{KDEApps2009}.
 Alternatively when many files are to be processed, a facility such as
 Unix ``make,'' which is also available in PC and Mac versions, can be employed
 to automate the required commands.  On systems without such
diff --git a/graphics/circuit_macros/doc/defines.tex b/graphics/circuit_macros/doc/defines.tex
index 84634c5862..6b8f615fe2 100644
--- a/graphics/circuit_macros/doc/defines.tex
+++ b/graphics/circuit_macros/doc/defines.tex
@@ -1411,6 +1411,12 @@ nw,nn,ne,ns,pin lgth,style, other commands})}
 \macrodef{rot3Dz}{rot3Dz}{({\sl radians,x,y,z})}
   {3D}
   {rotates x,y,z about z axis}
+\macrodef{Rot\_}{Rot_}{({\sl position, degrees})}
+  {gen}
+  {rotate position by degrees}
+\macrodef{rot\_}{rot_}{({\sl x, y, angle})}
+  {gen}
+  {rotate {\sl x,y} by theta radians}
 \macrodef{rotbox}{rotbox}{({\sl wid,ht,type},[r|t={\sl val}])}
   {gen}
   {box oriented in current direction in {\tt [ ]} block;
@@ -1834,6 +1840,13 @@ nw,nn,ne,ns,pin lgth,style, other commands})}
     {\tt A}=arrow, {\tt P}=preset,
     {\tt L}=linear, {\tt N}=nonlinear, {\tt C}=continuous, {\tt S}=setpwise
    \seesect{Twoterminal:}}
+\macrodef{Vcoords\_}{Vcoords_}{({\sl position})}
+  {gen}
+  {The $x, y$ coordinate pair of the position}
+\macrodef{Vdiff\_}{Vdiff_}{({\sl position},{\sl position})}
+  {gen}
+  {{\tt Vdiff\_(A,B)} evaluates to {\tt A-(B)} with dpic, {\tt A-(B.x,B.y)}
+   with gpic}
 \macrodef{vec\_}{vec_}{({\sl x},{\sl y})}
   {gen}
   {position rotated with respect to current direction}
@@ -1860,6 +1873,10 @@ nw,nn,ne,ns,pin lgth,style, other commands})}
 \macrodef{Vsprod\_}{Vsprod_}{({\sl position}, {\sl expression})}
   {gen}
   {The vector in arg 1 multiplied by the scalar in arg 2}
+\macrodef{Vsum\_}{Vsum_}{({\sl position},{\sl position})}
+  {gen}
+  {{\tt Vsum\_(A,B)} evaluates to {\tt A+B} with dpic, {\tt A+(B.x,B.y)}
+   with gpic}
 \macrodef{w\_}{w_}{}
   {gen}
   {.w with respect to current direction}
-- 
cgit v1.2.3