texlive[57308] Master/texmf-dist/doc/latex/circuit-macros:
commits+karl at tug.org
commits+karl at tug.org
Sun Jan 3 23:28:40 CET 2021
Revision: 57308
http://tug.org/svn/texlive?view=revision&revision=57308
Author: karl
Date: 2021-01-03 23:28:40 +0100 (Sun, 03 Jan 2021)
Log Message:
-----------
circuit-macros (3jan21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/circuit-macros/CHANGES
trunk/Master/texmf-dist/doc/latex/circuit-macros/Copying
trunk/Master/texmf-dist/doc/latex/circuit-macros/README
trunk/Master/texmf-dist/doc/latex/circuit-macros/darrow.m4
trunk/Master/texmf-dist/doc/latex/circuit-macros/doc/Circuit_macros.pdf
trunk/Master/texmf-dist/doc/latex/circuit-macros/doc/Circuit_macros.tex
trunk/Master/texmf-dist/doc/latex/circuit-macros/doc/Makefile
trunk/Master/texmf-dist/doc/latex/circuit-macros/doc/Version.tex
trunk/Master/texmf-dist/doc/latex/circuit-macros/doc/body.tex
trunk/Master/texmf-dist/doc/latex/circuit-macros/dpictools.pic
trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/examples.pdf
trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/mf/cct.mf
trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/shapes.m4
trunk/Master/texmf-dist/doc/latex/circuit-macros/gpic.m4
trunk/Master/texmf-dist/doc/latex/circuit-macros/lib3D.m4
trunk/Master/texmf-dist/doc/latex/circuit-macros/libcct.m4
trunk/Master/texmf-dist/doc/latex/circuit-macros/libgen.m4
trunk/Master/texmf-dist/doc/latex/circuit-macros/liblog.m4
trunk/Master/texmf-dist/doc/latex/circuit-macros/mfpic.m4
trunk/Master/texmf-dist/doc/latex/circuit-macros/mpost.m4
trunk/Master/texmf-dist/doc/latex/circuit-macros/pgf.m4
trunk/Master/texmf-dist/doc/latex/circuit-macros/postscript.m4
trunk/Master/texmf-dist/doc/latex/circuit-macros/psfrag.m4
trunk/Master/texmf-dist/doc/latex/circuit-macros/pstricks.m4
trunk/Master/texmf-dist/doc/latex/circuit-macros/svg.m4
trunk/Master/texmf-dist/doc/latex/circuit-macros/xfig.m4
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/Makefile
trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/dev/
trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/examples.pdf
trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/examplesSVG.htmx
trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/oFlow.m4
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/CHANGES
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/CHANGES 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/CHANGES 2021-01-03 22:28:40 UTC (rev 57308)
@@ -1,5 +1,6 @@
CHANGES
+Version 9.5: Distribution cleaned and a non utf-8 character removed.
Version 9.4: Changes to examples and additional SVG examples. New
macros RightAngle, PerpTo, langle, ArcAngle, DCsymbol. Rewritten
arrester macro. Tweaked Equidist3, ground, antenna, NeedDpicTools.
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/Copying
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/Copying 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/Copying 2021-01-03 22:28:40 UTC (rev 57308)
@@ -1,4 +1,4 @@
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under *
* the LaTeX Project Public Licence in file Licence.txt. The files of *
* this distribution may be redistributed or modified provided that this *
* copyright notice is included and provided that modifications are clearly *
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/README 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/README 2021-01-03 22:28:40 UTC (rev 57308)
@@ -1,5 +1,5 @@
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under *
* the LaTeX Project Public Licence in file Licence.txt. The files of *
* this distribution may be redistributed or modified provided that this *
* copyright notice is included and provided that modifications are clearly *
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/darrow.m4
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/darrow.m4 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/darrow.m4 2021-01-03 22:28:40 UTC (rev 57308)
@@ -1,7 +1,7 @@
divert(-1)
darrow.m4 Macros for double lines and arrows
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under *
* the LaTeX Project Public Licence in file Licence.txt. The files of *
* this distribution may be redistributed or modified provided that this *
* copyright notice is included and provided that modifications are clearly *
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/doc/Circuit_macros.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/doc/Circuit_macros.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/doc/Circuit_macros.tex 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/doc/Circuit_macros.tex 2021-01-03 22:28:40 UTC (rev 57308)
@@ -58,6 +58,8 @@
\let\@@tmp\@svsec\def\@svsec{\llap{\@@tmp}}%
}}
+\renewcommand\contentsname{Contents, \Version}
+
\makeatother
\hypersetup{
@@ -70,11 +72,17 @@
\begin{document}
\title{M4 Macros for Electric Circuit Diagrams in \LaTeX\ Documents}
\author{Dwight Aplevich}
+\enlargethispage{\baselineskip}
\date{%
-\input Version
+%\input Version
\vspace*{-\baselineskip}
}
\maketitle
+% \pdfbookmark[section]{\contentsname}{toc}
+ \pdfbookmark[section]{Contents}{toc}
+\begin{multicols}{2}
+ \tableofcontents
+\end{multicols}
\input body
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/doc/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/doc/Makefile 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/doc/Makefile 2021-01-03 22:28:40 UTC (rev 57308)
@@ -67,7 +67,7 @@
$(DOC).pdf:
touch mode.tex
-if grep -q tikz mode.tex ; then true ; else \
- make clean ; printf "\\usepackage{tikz}\n" > mode.tex ; fi
+ rm mode.tex; make MODE=tikz clean mode.tex ; fi
make MODE=pgf PIC="dpic -g" LATEX=pdflatex SFX=pdf \
POST="; printf '\\\\vspace*{-0.5\\\\baselineskip}\\n'" \
$(DOC).pdf
@@ -113,6 +113,8 @@
-if test "$(MODE)" = "pstricks" ; then \
printf "\\usepackage{pstricks}\n" > mode.tex ; else \
printf "\\usepackage{tikz}\n" > mode.tex ; fi
+ printf "\\def\\Version{" >> mode.tex
+ sed -e 's/$$/}/' Version.tex >> mode.tex
heading.tex:
printf '\\documentclass{article}\n' > heading.tex
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/doc/Version.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/doc/Version.tex 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/doc/Version.tex 2021-01-03 22:28:40 UTC (rev 57308)
@@ -1 +1 @@
-Version 9.4
+Version 9.5
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/doc/body.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/doc/body.tex 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/doc/body.tex 2021-01-03 22:28:40 UTC (rev 57308)
@@ -41,10 +41,10 @@
%
\newcommand{\Example}[1]{\vspace{\parsep}\noindent {\bf Example #1:}}
%
- \pdfbookmark[section]{\contentsname}{toc}
-\begin{multicols}{2}
- \tableofcontents
-\end{multicols}
+% \pdfbookmark[section]{\contentsname}{toc}
+%\begin{multicols}{2}
+% \tableofcontents
+%\end{multicols}
%
\xection{Introduction\label{Introduction:}}
\begin{quotation}\noindent
@@ -55,10 +55,8 @@
gratifying to try with a computer~\cite{Landauer95}.
\end{quotation}
-This manual
-%\footnote{%
-%This manual is best viewed with a reader that shows bookmarks
-%for easy navigation and for exploring the list of defined macros.}%
+This manual\footnote{%
+This document is best displayed with a reader that shows bookmarks.}
describes a method for drawing electric circuits and
other diagrams in \latex and web documents.
The diagrams are defined in the simple \pic drawing language~\cite{KRpic}
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/dpictools.pic
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/dpictools.pic 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/dpictools.pic 2021-01-03 22:28:40 UTC (rev 57308)
@@ -3,7 +3,7 @@
# m4 macro NeedDpicTools or the pic statement copy "HOMELIB_/dpictools.pic"
# when HOMELIB_ is defined or, generically, copy "<path>dpictools.pic"
-# Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under #
+# Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under #
# the LaTeX Project Public Licence in file Licence.txt. The files of #
# this distribution may be redistributed or modified provided that this #
# copyright notice is included and provided that modifications are clearly #
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/examples.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/mf/cct.mf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/mf/cct.mf 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/mf/cct.mf 2021-01-03 22:28:40 UTC (rev 57308)
@@ -1,5 +1,5 @@
% cct.mf, generated by Mfpic, v1.10 2012/12/03,
-% from TeX source "font" on 2020/12/20 at 17:40
+% from TeX source "font" on 2021/01/03 at 16:42
numeric mfpicversion; mfpicversion := 110;
if unknown mode: mode := localfont; fi
if unknown mag: mag := 1000/1000; fi
Deleted: trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/Makefile 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/Makefile 2021-01-03 22:28:40 UTC (rev 57308)
@@ -1,92 +0,0 @@
-LIBDIR = $$HOME/lib
-M4LIBS = svg.m4 SVGconfig.m4
-M4LIBS = svg.m4
-
-# To process a single file, copy it to test.m4 and type "make tst"
-# to produce tstSVG.html
-
-DPIC = dpic
-#DPIC = $$HOME/dpic/build/p2c/ftp/dpic
-#DPIC = ../../../dpic/build/p2c/ftp/dpic
-#DPIC = ../../../dpic/bison/dpic
-#DPIC = ../../../dpic/bdev/dpic
-
-# To test the Windows executable. Change these as needed for the operating
-# system. NOTE: AntiqueClockSVG.m4 and Connectors.m4 use awk and sed which
-# do not work at present with the Windows version.
-# M4LIBS = svg.m4 windows.m4
-# DPIC = ../../../dpic/bison/distsrc/Windows/dpic
-
-.SUFFIXES: .pic .svg .m4
-.pic.svg:
- $(DPIC) -v $*.pic > $*.svg
- grep '<\!-- width' $*.svg | sed -e 's%<\!-- *%%' -e 's% *-->%%' > $*.siz
-.m4.svg:
- m4 $(M4LIBS) $*.m4 | sed -e '/^\%/d' > $*.pic
- $(DPIC) -v $*.pic > $*.svg
- grep '<\!-- width' $*.svg | sed -e 's%<\!-- *%%' -e 's% *-->%%' > $*.siz
-
-PAGES = examples_1.svg
-
-examplesSVG.html: examplesSVG.htmx pages
- Version=`sed -e 's/Version //' $(LIBDIR)/doc/Version.tex` ; \
- sed -e 's/Version XXX/Version '$$Version'/' examplesSVG.htmx \
- | m4 > examplesSVG.html
-
-pages:
- (cd .. ; make )
- cp ../examples.pdf .
- pdf2svg examples.pdf
- touch pages
-
-SED = sed -e '/^\%/d'
-TEST = test
-tst:
- if test -f test.pic; then printf "\n\nUsage: make clean tst\n\n"; exit 1; fi
- m4 $(M4LIBS) test.m4 | $(SED) > test.pic
- $(DPIC) -v $(TEST).pic > $(TEST).svg
- m4 $(M4LIBS) $(TEST).m4 | $(SED) > $(TEST).pic
- $(DPIC) -v $(TEST).pic > $(TEST).svg
- grep '<\!-- width' $(TEST).svg | sed -e 's%<\!-- *%%' -e 's% *-->%%' \
- > $(TEST).siz
- make tstSVG.html
-
-test.pic:
- if test -f test.pic ; then echo "Usage: make clean tst" ; fi
- m4 $(M4LIBS) test.m4 | $(SED) > test.pic
- m4 $(M4LIBS) test.m4 | $(SED) > test.pic
-
-tstSVG.html: tstSVG.htmx $(TEST).svg
- Version=`sed -e 's/Version //' $(LIBDIR)/doc/Version.tex` ; \
- sed -e 's/Version XXX/Version '$$Version'/' \
- -e 's/XXXXX/'$(TEST)'/g' \
- tstSVG.htmx | m4 > tstSVG.html
-# cp tstSVG.html $(TEST) $$HOME/public_html/svg
-
-xst: Incleps.png
-
-AntiqueClockSVG.svg ConnectorsSVG.svg:
- m4 $(M4LIBS) $*.m4 | sed -e '/^\%/d' > $*.pic
- $(DPIC) -v $*.pic > $*.svg
- m4 $(M4LIBS) $*.m4 | sed -e '/^\%/d' > $*.pic
- $(DPIC) -v $*.pic > $*.svg
- grep '<\!-- width' $*.svg | sed -e 's%<\!-- *%%' -e 's% *-->%%' > $*.siz
-
-InclepsSVG.svg: InclepsSVG.m4
- m4 $(M4LIBS) $*.m4 | sed -e '/^\%/d' > $*.pic
- $(DPIC) -v $*.pic > $*.svg
- $(DPIC) -v $*.pic > $*.svg
-
-Incleps.png:
- (cd ..; make Incleps.png); cp ../Incleps.png .
-
-clean:
- @printf "\n svg clean:\n"
- rm -f *.svg *.dim *.ps *log *.siz *.pic examplesSVG.html Incleps.png
- rm -f tstSVG.html copy_tmp__
- rm -f pages
- @printf "\n"
-
-clobber: clean
- (cd dev; make clobber)
- rm -f test.m4
Deleted: trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/examples.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/examplesSVG.htmx
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/examplesSVG.htmx 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/nsvg/examplesSVG.htmx 2021-01-03 22:28:40 UTC (rev 57308)
@@ -1,70 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<HTML>
-<HEAD>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<!--meta http-equiv="Content-Script-Type" content="text/javascript"-->
-<TITLE>SVG Examples: Circuit_macros Version XXX</TITLE>
-<style type="text/css">
-.svg{display:none}
-*>.svg{display:inline}
-</style>
-<link rel="shortcut icon" href="../Circuit_macros.ico" type="image/x-icon" />
-</HEAD>
-
-<BODY>
-<H2>SVG Circuit_macros examples, Version XXX</H2>
-<hr>
-
-<p>
- These diagrams are in .svg format.
- <A HREF="examples.pdf">Pdf</A>
- and
- <A HREF="examples.html">png</A>
- versions are also available.
- The PDF equivalent can be found in examples.pdf of the distribution.
-</p>
- <p>
- Click on the link to view the source of each diagram.
-</p>
-<hr>
-
-define(`for_',`ifelse(eval(`$1'!=(`$2'+(`$3'))),1,`pushdef(`m4x',`$1') $4
- popdef(`m4x')for_(eval(`$1'+(`$3')),`$2',`$3',`$4')')')
-
-define(`cfig',`
-<p>
-
-<!--[if lte IE 8]><embed src="$1.svg" sinclude($1.siz)><![endif]-->
-
-<!--[if gte IE 9]>
-<object dx="4" data="$1.svg" width="612" height="792" type="image/svg+xml" class="img">
- </object> <![endif]-->
-
-<!--[if !IE]><!-->
-<object data="$1.svg" width="612" height="792" type="image/svg+xml" class="img">
- </object> <!--<![endif]-->
-
-<br>
-<!--
-<a href="$1.txt" TYPE="text/plain" TARGET="_blank" alt="$1">$1.m4</a>
---
-</p>
-<hr>')
-
-define(`m4tt',`<g style="font-family:monospace">')
-
-<!--
-<embed pluginspage="http://www.adobe.com/svg/viewer/install/" />
--->
-
-<p>
-These diagrams are the result of applying pdf2svg to examples.pdf.
-
-
-for_(1,46,1,
-cfig(examples_```'''m4x)
-)
-
-</BODY>
-</HTML>
Deleted: trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/oFlow.m4
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/oFlow.m4 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/oFlow.m4 2021-01-03 22:28:40 UTC (rev 57308)
@@ -1,108 +0,0 @@
-.PS
-# Flow.m4
-gen_init
-ifdef(`FlowchartDefs_',,`include(FlowchartDefs.m4)')
-
-# Could use xcolor with option dvipsnames but define color here for portability:
-define(`Thistle',`rgbstring(0.85,0.75,0.85)')dnl
-define(`RubineRed',`rgbstring(0.81,0,0.35)')dnl
-define(`YellowGreen',`rgbstring(0.68,1,0.18)')dnl
-define(`SeaGreen',`rgbstring(0.13,0.70,0.67)')dnl
-define(`Goldenrod',`rgbstring(0.85,0.65,0.13)')dnl
-
- linethick_(1.0)
- arrowwid = 0.05
- arrowht = 0.1
- fillval = 0.8
- down
-
-Case: Fcase(,
- "Test 1",[Fbox("Task 1",, shaded Thistle); W:last [].W; N:last [].N
- arrow down linewid/3 from last [].S
- Fbox("Task 1.5",, shaded Thistle) with .N at Here
- E:last [].E; S:last [].S],
- "Test 2",Fbox("Task 2" "is bigger", wid fboxwid*1.2 ht fboxht*3/2, \
- shaded SeaGreen),
- "Test 3",Fbox("Task 3",, shaded RubineRed)dnl
- )
-
- "\sl .N" at Case.N rjust above; "\sl .S" at Case.S rjust below
- "\sl .E" at Case.E ljust; "\sl .W" at Case.W rjust
- "\sl Case statement" below at Case.s+(0,-0.2)
- move to Case.nw+(-12bp__,10bp__)
-
-Whiledo: Fwhiledo("$i < n$",,,Fbox("Task"),"T" above ljust at Test.E) \
- with .nw at Case.ne+(0.25,0)
-
- "\sl .N" at Whiledo.N rjust; "\sl .S" at Whiledo.S rjust below
- "\sl .E" at Whiledo.E ljust; "\sl .W" at Whiledo.W rjust
- "\sl While-do" below at Whiledo.s+(0,-0.2)
-
-Repeatuntil: Frepeatuntil("$n \geq 5$",,,Fbox("Task"),
- "T" at Test.E above ljust) with .nw at Whiledo.sw + (0.25,-1)
-
- "\sl .N" at Repeatuntil.N rjust above; "\sl .S" at Repeatuntil.S rjust below
- "\sl .E" at Repeatuntil.E ljust; "\sl .W" at Repeatuntil.W rjust
- "\sl Repeat-until" below at Repeatuntil.s+(0,-0.2)
-
-Ifthenelse: Fifthenelse("$A<B$",,,
- Fbox("False"),
- Fbox("True",ht fboxht*1.2 wid fboxwid)dnl
- ) with .nw at Repeatuntil.sw +(0.5,-0.5)
-
- "\sl .N" at Ifthenelse.N rjust above; "\sl .S" at Ifthenelse.S below rjust
- "\sl .E" at Ifthenelse.E ljust; "\sl .W" at Ifthenelse.W rjust
- "\sl If-then-else" below at Ifthenelse.s+(0,-0.3) \
- "\sl (the True and False tasks are optional)"
-
-# Compound statement:
-[ right
- ellipse shaded YellowGreen "Start"
- arrow right linewid/2
-
- Fbox("First task") with .W at Here
- arrow down linewid/2 from last [].S
-
- Fifthenelse("Test 1",,,
- Frepeatuntil("$i \geq 5$",,shaded Goldenrod,Fbox("Task")),
- Fifthenelse("$A < B$",,shaded Goldenrod,
- Fbox("Left"),
- Fbox("Right"),
- "T" at Test.E above ljust),
- "T" at Test.E above ljust) with .N at Here
-
- A: arrow down 0.25 from last [].S ] with .nw at Case.sw + (-12bp__,-0.7)
-
- "\sl Compound statement" below at last [].A.end
-
-Example: [ fillvalue = 0.8; awid = linewid/2; right_
- Start: ellipse wid boxwid/2 ht boxwid/3 shaded "green"
- arrow right_ awid
- B1: Fbox("Planejamento")
- B2: Fbox(`"Execu\c{c}\~ao"') with .W at B1.E+(awid*3,0)
- B3: Fbox(`"Sele\c{c}\~ao"') with .W at B2.E+(awid*3,0)
- LT: Ftest(`"Avalia\c{c}\~ao do" "Planejamento"',
- wid fboxwid*1.5 ht fboxht*2.0,
- shaded YellowGreen,
- "Correto" at Box.e above ljust;
- "Incompleto" at Box.w above rjust) with .S at 0.5 between B1.ne and B2.nw
- arrow from B1.E to (LT.S,B1.E) then to LT.S
- arrow from LT.W to (B1.N,LT.W) then to B1.N
- arrow from LT.E to (B2.N,LT.E) then to B2.N
- RT: Ftest(`"Avalia\c{c}\~ao da" "Execu\c{c}\~ao"',
- wid fboxwid*1.5 ht fboxht*2.0,
- shaded YellowGreen,
- "Correto" at Box.e below ljust;
- "Incompleto" at Box.w below rjust) with .N at 0.5 between B2.se and B3.sw
- arrow from B2.E to (RT.N,B2.E) then to RT.N
- arrow from RT.W to (B2.S,RT.W) then to B2.S
- arrow from RT.E to (B3.S,RT.E) then to B3.S
- B4: Fbox(`"Extra\c{c}\~ao"') with .S at B3.N+(0,awid)
- arrow from B3.N to B4.S
- arrow right_ awid from B4.E
- B5: Fbox(`"Conclus\~ao"')
- ellipse wid boxwid/2 ht boxwid/3 shaded "red" at (B5.S,Start)
- arrow down_ awid from B5.S to last ellipse.n
-] with .nw at last [].sw+(0,-fboxht)
-
-.PE
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/shapes.m4
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/shapes.m4 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/examples/shapes.m4 2021-01-03 22:28:40 UTC (rev 57308)
@@ -46,7 +46,7 @@
`internal positions:
Start (centre of base),
End (point),
-\xA0 C (axis centre)'
+ C (axis centre)'
define(`cone3D',`[ Start: (0,0)
xdispl = `$1'; ydispl = `$2'; zdispl = `$3'
define(`M4CL',`xdispl,ydispl,zdispl')dnl
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/gpic.m4
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/gpic.m4 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/gpic.m4 2021-01-03 22:28:40 UTC (rev 57308)
@@ -1,7 +1,7 @@
divert(-1)
gpic.m4 Initialization for gpic.
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under *
* the LaTeX Project Public Licence in file Licence.txt. The files of *
* this distribution may be redistributed or modified provided that this *
* copyright notice is included and provided that modifications are clearly *
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/lib3D.m4
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/lib3D.m4 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/lib3D.m4 2021-01-03 22:28:40 UTC (rev 57308)
@@ -3,7 +3,7 @@
operations on argument triples representing
3D vectors.
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under *
* the LaTeX Project Public Licence in file Licence.txt. The files of *
* this distribution may be redistributed or modified provided that this *
* copyright notice is included and provided that modifications are clearly *
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/libcct.m4
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/libcct.m4 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/libcct.m4 2021-01-03 22:28:40 UTC (rev 57308)
@@ -1,7 +1,7 @@
divert(-1)
libcct.m4
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under *
* the LaTeX Project Public Licence in file Licence.txt. The files of *
* this distribution may be redistributed or modified provided that this *
* copyright notice is included and provided that modifications are clearly *
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/libgen.m4
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/libgen.m4 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/libgen.m4 2021-01-03 22:28:40 UTC (rev 57308)
@@ -2,7 +2,7 @@
libgen.m4 Base macros for dpic and gpic diagrams
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under *
* the LaTeX Project Public Licence in file Licence.txt. The files of *
* this distribution may be redistributed or modified provided that this *
* copyright notice is included and provided that modifications are clearly *
@@ -185,7 +185,7 @@
define(`latexcommand',`command "ifmpost(verbatimtex) `$1' ifmpost(etex)"')
define(`m4announceprocessor',`dnl Do not change the format of the next line:
-`#' `$1' Version 9.4: ifelse(m4picprocessor,gpic,`Gpic',
+`#' `$1' Version 9.5: ifelse(m4picprocessor,gpic,`Gpic',
m4postprocessor,pstricks,`PSTricks',
m4postprocessor,pgf,`TikZ PGF',
m4postprocessor,mfpic,`Mfpic',
@@ -762,13 +762,14 @@
Nonblank arg4 omits the parentheses.'
define(`setkey_',
`pushdef(`m4xt',index(`$1',`$2'=))ifelse(m4xt,-1,
- `pushdef(`m4'$2,`ifelse(`$3',,,ifelse(`$4',,(`$3'),`$3'))')',
+ `pushdef(key_prefix`'$2,`ifelse(`$3',,,ifelse(`$4',,(`$3'),`$3'))')',
`define(`m4sktmp',substr(`$1',eval(m4xt+len(`$2')+1)))dnl m4sktmp used later
ifelse(index(m4sktmp,;),-1,
- `pushdef(`m4'$2,ifelse(`$4',,(m4sktmp),m4sktmp))',
- `pushdef(`m4'$2,ifelse(`$4',,(substr(m4sktmp,0,index(m4sktmp,;))),
+ `pushdef(key_prefix`'$2,ifelse(`$4',,(m4sktmp),m4sktmp))',
+ `pushdef(key_prefix`'$2,ifelse(`$4',,(substr(m4sktmp,0,index(m4sktmp,;))),
substr(m4sktmp,0,index(m4sktmp,;))))')')dnl
popdef(`m4xt')')
+define(`key_prefix',`m4')
`String with exact typeset dimensions:
Requires s_init(name), sinclude(filename.dim),
@@ -1424,14 +1425,13 @@
define(`Along_',`(ifelse(`$2',,1,`(`$2')/lin_leng(`$1')') between \
`$1'.ifelse(`$3',R,end,start) and `$1'.ifelse(`$3',R,start,end))')
- `showbox_(planar object,boxspec)
+ `showbox_(planar object,boxspec,P)
Convenience to draw the bounding box of an obj
(default last []),
e.g. showbox_(B,dotted "Box B")'
-define(`showbox_',
- `{box wid ifelse(`$1',,last [],`$1').wid \
- ht ifelse(`$1',,last [],`$1').ht \
- at ifelse(`$1',,last [],`$1') `$2'}')
+define(`showbox_',`define(`M4obj',`ifelse(`$1',,last [],`$1')')dnl
+ {box wid M4obj.wid ht M4obj.ht at M4obj `$2' ;}
+ ifinstr(`$3',P,`{print (M4obj.wid,M4obj.ht)}')')
`use continue if dpic, otherwise line or other'
define(`contline',`ifdpic(continue,ifelse(`$1',,line,`$1'))')
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/liblog.m4
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/liblog.m4 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/liblog.m4 2021-01-03 22:28:40 UTC (rev 57308)
@@ -1,7 +1,7 @@
divert(-1)
liblog.m4 Logic gates
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under *
* the LaTeX Project Public Licence in file Licence.txt. The files of *
* this distribution may be redistributed or modified provided that this *
* copyright notice is included and provided that modifications are clearly *
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/mfpic.m4
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/mfpic.m4 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/mfpic.m4 2021-01-03 22:28:40 UTC (rev 57308)
@@ -1,7 +1,7 @@
divert(-1)
mfpic.m4 Initialization for mfpic.
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under *
* the LaTeX Project Public Licence in file Licence.txt. The files of *
* this distribution may be redistributed or modified provided that this *
* copyright notice is included and provided that modifications are clearly *
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/mpost.m4
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/mpost.m4 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/mpost.m4 2021-01-03 22:28:40 UTC (rev 57308)
@@ -1,7 +1,7 @@
divert(-1)
mpost.m4 Initialization for metapost.
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under *
* the LaTeX Project Public Licence in file Licence.txt. The files of *
* this distribution may be redistributed or modified provided that this *
* copyright notice is included and provided that modifications are clearly *
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/pgf.m4
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/pgf.m4 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/pgf.m4 2021-01-03 22:28:40 UTC (rev 57308)
@@ -1,7 +1,7 @@
divert(-1)
pgf.m4 Initialization for Tikz-pgf.
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under *
* the LaTeX Project Public Licence in file Licence.txt. The files of *
* this distribution may be redistributed or modified provided that this *
* copyright notice is included and provided that modifications are clearly *
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/postscript.m4
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/postscript.m4 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/postscript.m4 2021-01-03 22:28:40 UTC (rev 57308)
@@ -1,7 +1,7 @@
divert(-1)
postscript.m4 Initialization for Postscript output.
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under *
* the LaTeX Project Public Licence in file Licence.txt. The files of *
* this distribution may be redistributed or modified provided that this *
* copyright notice is included and provided that modifications are clearly *
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/psfrag.m4
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/psfrag.m4 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/psfrag.m4 2021-01-03 22:28:40 UTC (rev 57308)
@@ -2,7 +2,7 @@
psfrag.m4 Initialization for dpic -f processing:
Postscript with psfrag strings
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under *
* the LaTeX Project Public Licence in file Licence.txt. The files of *
* this distribution may be redistributed or modified provided that this *
* copyright notice is included and provided that modifications are clearly *
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/pstricks.m4
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/pstricks.m4 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/pstricks.m4 2021-01-03 22:28:40 UTC (rev 57308)
@@ -1,7 +1,7 @@
divert(-1)
pstricks.m4 Initialization for PSTricks.
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under *
* the LaTeX Project Public Licence in file Licence.txt. The files of *
* this distribution may be redistributed or modified provided that this *
* copyright notice is included and provided that modifications are clearly *
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/svg.m4
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/svg.m4 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/svg.m4 2021-01-03 22:28:40 UTC (rev 57308)
@@ -1,7 +1,7 @@
divert(-1)
svg.m4 Initialization for SVG output.
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under *
* the LaTeX Project Public Licence in file Licence.txt. The files of *
* this distribution may be redistributed or modified provided that this *
* copyright notice is included and provided that modifications are clearly *
Modified: trunk/Master/texmf-dist/doc/latex/circuit-macros/xfig.m4
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuit-macros/xfig.m4 2021-01-03 22:07:04 UTC (rev 57307)
+++ trunk/Master/texmf-dist/doc/latex/circuit-macros/xfig.m4 2021-01-03 22:28:40 UTC (rev 57308)
@@ -1,7 +1,7 @@
divert(-1)
xfig.m4 Initialization for xfig.
-* Circuit_macros Version 9.4, copyright (c) 2020 J. D. Aplevich under *
+* Circuit_macros Version 9.5, copyright (c) 2021 J. D. Aplevich under *
* the LaTeX Project Public Licence in file Licence.txt. The files of *
* this distribution may be redistributed or modified provided that this *
* copyright notice is included and provided that modifications are clearly *
More information about the tex-live-commits
mailing list.