From df9414db777046cce78cd97a995a21ffb3175ce3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 27 Oct 2016 21:23:14 +0000 Subject: visualtikz (27oct16) git-svn-id: svn://tug.org/texlive/trunk@42367 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/visualtikz/README.txt | 4 +- .../doc/latex/visualtikz/Source/VTKZ.synctex.gz | Bin 0 -> 65568 bytes .../doc/latex/visualtikz/Source/VTKZ.tex | 15 +- .../visualtikz/Source/VisualTikZ-fr.synctex.gz | Bin 1083477 -> 1227494 bytes .../latex/visualtikz/Source/VisualTikZ.synctex.gz | Bin 1082248 -> 1225701 bytes .../doc/latex/visualtikz/Source/bibtkz.tex | 7 +- .../doc/latex/visualtikz/Source/test.pdf | Bin 48387 -> 127725 bytes .../doc/latex/visualtikz/Source/test.synctex.gz | Bin 21920 -> 98963 bytes .../doc/latex/visualtikz/Source/test.tex | 34 +- .../doc/latex/visualtikz/Source/tikzdebut.tex | 26 +- .../doc/latex/visualtikz/Source/tkz1.tex | 88 +- .../doc/latex/visualtikz/Source/tkz2.tex | 2 +- .../doc/latex/visualtikz/Source/tkz4.tex | 24 +- .../doc/latex/visualtikz/Source/tkzcoord.tex | 6 +- .../doc/latex/visualtikz/Source/tkzcoul.tex | 9 +- .../doc/latex/visualtikz/Source/tkzdeco.tex | 70 +- .../doc/latex/visualtikz/Source/tkzelect.tex | 1025 ++++++++++++++++++++ .../doc/latex/visualtikz/Source/tkzfig.tex | 121 ++- .../doc/latex/visualtikz/Source/tkzgraph2.tex | 2 +- .../doc/latex/visualtikz/Source/tkzmerci.tex | 2 + .../doc/latex/visualtikz/Source/tkznoeud1.tex | 91 +- .../doc/latex/visualtikz/Source/tkztitre.tex | 2 +- .../doc/latex/visualtikz/Source/versFR.tex | 5 +- .../doc/latex/visualtikz/Source/versGB.tex | 4 + .../doc/latex/visualtikz/VisualTikZ-fr.pdf | Bin 2364816 -> 2438817 bytes .../texmf-dist/doc/latex/visualtikz/VisualTikZ.pdf | Bin 2359108 -> 2432602 bytes 26 files changed, 1419 insertions(+), 118 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.synctex.gz create mode 100644 Master/texmf-dist/doc/latex/visualtikz/Source/tkzelect.tex diff --git a/Master/texmf-dist/doc/latex/visualtikz/README.txt b/Master/texmf-dist/doc/latex/visualtikz/README.txt index 4cae32aa1f0..3e76cdce5b7 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/README.txt +++ b/Master/texmf-dist/doc/latex/visualtikz/README.txt @@ -4,13 +4,13 @@ The principle for this documentation : An image per fonction or per parameter. T The basic document for the french vesion is : " VisualTikZ-fr.tex''(This documentation has been developped in french) -The basic document for the english vesion is :"VisualTikZ.tex" [The translationin english) +The basic document for the english vesion is :"VisualTikZ.tex" [The translation in english) Complilation method : LuaLaTeX. This documentation is not complete : Update will be reguraly proposed ! Please let me know any error encountered. -My personnal email address isjpcdk@yahoo.fr +My personnal email address is jpcdk@yahoo.fr New version will be available first hand : http://gte.univ-littoral.fr/sections/stage-latex/visual-tikz diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.synctex.gz b/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.synctex.gz new file mode 100644 index 00000000000..5798496cdaa Binary files /dev/null and b/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.synctex.gz differ diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.tex index 3d3af43055e..95ddf4b1e20 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.tex @@ -13,7 +13,7 @@ \tableofcontents \setcounter{tocdepth}{5} \addtolength{\hoffset}{-1.5cm} - +\setlength{\parindent}{0pt} \setlength{\topmargin}{0pt} \setlength{\headsep}{0pt} @@ -320,6 +320,13 @@ %%%============================================================== \newpage +\SSCT{Les schemas électriques }{Electrical Engineering Circuits} + +\input{tkzelect} + + +\newpage + %\section[Les animations ]{Les animations } \SSCT{Les animations }{Animate a TikZ picture} @@ -690,9 +697,9 @@ % % % \newpage -% \section{Index} -% -% \printindex + \section{Index} + + \printindex % \end{document} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/VisualTikZ-fr.synctex.gz b/Master/texmf-dist/doc/latex/visualtikz/Source/VisualTikZ-fr.synctex.gz index 0b44bd62633..00ef9e08cb6 100644 Binary files a/Master/texmf-dist/doc/latex/visualtikz/Source/VisualTikZ-fr.synctex.gz and b/Master/texmf-dist/doc/latex/visualtikz/Source/VisualTikZ-fr.synctex.gz differ diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/VisualTikZ.synctex.gz b/Master/texmf-dist/doc/latex/visualtikz/Source/VisualTikZ.synctex.gz index a958e24a947..e0393c8a719 100644 Binary files a/Master/texmf-dist/doc/latex/visualtikz/Source/VisualTikZ.synctex.gz and b/Master/texmf-dist/doc/latex/visualtikz/Source/VisualTikZ.synctex.gz differ diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/bibtkz.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/bibtkz.tex index 387c43ffae3..a139d96cd26 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/bibtkz.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/bibtkz.tex @@ -30,7 +30,10 @@ bending & \pageref{lib-bending} & \BS{usetikzlibrary}\AC{bending} backgrounds & \pageref{lib-bkgd} & \BS{usetikzlibrary}\AC{backgrounds} \\ calc & \pageref{lib-calc} & \BS{usetikzlibrary}\AC{calc} -\\ +\\ +circuits.ee.IEC & \pageref{lib-ee} & \BS{usetikzlibrary}\AC{circuits.ee.IEC} +\\ + fit & \pageref{lib-fit} & \BS{usetikzlibrary}\AC{fit} \\ decorations.footprints & \pageref{lib-footprints} & \BS{usetikzlibrary}\AC{decorations.footprints} @@ -89,7 +92,7 @@ automata & \RRR{41} \\ babel & \RRR{42} \\ calendar & \RRR{45} \\ chains & \RRR{46} \\ -circuits.ee & \RRR{47-4} \\ +%circuits.ee & \RRR{47-4} \\ circuits.logic & \RRR{47-3} \\ circular graph drawing library & \RRR{32} \\ curvilinear library & \RRR{103-4-7} \\ diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/test.pdf b/Master/texmf-dist/doc/latex/visualtikz/Source/test.pdf index 3387687d522..ed904f6798f 100644 Binary files a/Master/texmf-dist/doc/latex/visualtikz/Source/test.pdf and b/Master/texmf-dist/doc/latex/visualtikz/Source/test.pdf differ diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/test.synctex.gz b/Master/texmf-dist/doc/latex/visualtikz/Source/test.synctex.gz index 8273a3d5230..e7f9a737232 100644 Binary files a/Master/texmf-dist/doc/latex/visualtikz/Source/test.synctex.gz and b/Master/texmf-dist/doc/latex/visualtikz/Source/test.synctex.gz differ diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/test.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/test.tex index a8a52433d45..761c348bb49 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/test.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/test.tex @@ -1,6 +1,6 @@ -%\input{versGB} -\input{versFR} +\input{versGB} % for english version +%\input{versFR} % pour la version française \input{tikzdebut} @@ -8,7 +8,8 @@ \begin{document} % \newrgbcolor{Vert}{0 .8 0} -\selectlanguage{french} +\selectlanguage{english} +%\selectlanguage{french} %\input{tkztitre} @@ -22,7 +23,30 @@ \setlength{\topmargin}{0pt} \setlength{\headsep}{0pt} - \input{tkzbackground} -\end{document} \ No newline at end of file + + + + + +\SSCT{Les figures de base}{Basic figures} + +\input{tkz1} +% +%\newpage +% +%\input{tkznoeud1} +% +%\newpage + +\input{tkzelect} + +\newpage + + + + + + \printindex +\end{document}: \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tikzdebut.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tikzdebut.tex index 13d3764d5bb..5a4711ec6bf 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tikzdebut.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tikzdebut.tex @@ -5,7 +5,7 @@ %\TFRGB{\selectlanguage{french}}{\selectlanguage{english}} -\usepackage{amsmath,amsfonts} +\usepackage{amsmath,amsfonts,amssymb} \usepackage{pdfpages} @@ -25,7 +25,7 @@ %\usepgflibrary{shapes.callouts} \usepackage{tikz-qtree} \usepackage{tkz-tab} - +\usepackage{csquotes} \usetikzlibrary{angles} @@ -55,6 +55,9 @@ \usetikzlibrary{arrows.meta} \usetikzlibrary{bending} \usetikzlibrary{fit} +%\usetikzlibrary{circuits} +\usetikzlibrary{circuits.ee.IEC} +%\usetikzlibrary{circuits.logic} %\usetikzlibrary{decorations} @@ -102,7 +105,9 @@ %\newcommand{\RDDX}[2]{{\color{red}#1} \index{\textbf{3 Paramètres et options}!#2=#1}} -\newcommand{\RRR}[1]{\tikz[baseline=-1mm] \draw node[draw,fill=red!20] {{\footnotesize PGFmanual section : #1}} ;\index{\textbf{5 PGFmanual }!#1} } +\newcommand{\RRR}[1]{\tikz[baseline=-1mm] \draw node[draw,fill=red!20] {{\footnotesize PGFmanual section : #1}} ; } + +%\newcommand{\RRR}[1]{\tikz[baseline=-1mm] \draw node[draw,fill=red!20] {{\footnotesize PGFmanual section : #1}} ;\index{\textbf{5 PGFmanual }!#1} } \newcommand{\DFR}{ \tikzpicture[scale=.25] \draw [fill=blue](0,0) rectangle (3,1.5); @@ -121,15 +126,7 @@ \draw [red,line width=.05cm](0,0.75) -- (3,0.75); \endtikzpicture } -%%pour traduction -%\newcommand{\TFRGB}[2]{#1} % #1 en francais #2 in english -%\newcommand{\dft}{Par défaut} -%\newcommand{\SSCT}[2]{\section{#1}} -%\newcommand{\SbSSCT}[2]{\subsection{#1}} -%\newcommand{\SbSbSSCT}[2]{\subsubsection{#1}} -%\newcommand{\SSCTTC}[4]{\section[#1]{#2}} -%\newcommand{\SbSSCTTC}[4]{\subsection[#1]{#2}} -%\newcommand{\SbSbSSCTTC}[4]{\subsubsection[#1]{#2}} + \TFRGB{ \newcommand{\ESS}[1]{\textbf{\textbackslash{#1}}\index{\textbf{1 Environnements}!#1 @\textbackslash{}#1}} @@ -150,4 +147,7 @@ \newcommand{\RDD}[1]{{\color{red} #1}\index{\textbf{3 Parameters and options}!#1}} \newcommand{\RDDD}[2]{{\color{red}#1} \index{\textbf{Parameters and options}!#2!#1}} \newcommand{\RDDX}[2]{{\color{red}#1} \index{\textbf{4 Options}!#1 (#2)}} -} \ No newline at end of file +} + +\newcommand{\rouge}[1] {{\color{red} #1}} +\newcommand{\blll}[1] {{\color{blue} #1}} diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz1.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz1.tex index 2be8ffb7dc2..e8843ebce33 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz1.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz1.tex @@ -28,7 +28,7 @@ \end{center} \bigskip - \begin{tabular}{|c|c|c|}\hline +\noindent \begin{tabular}{|c|c|c|}\hline \multicolumn{3}{|c|}{\BS{draw} (0,2) . . \DDD{controls} (3,0) .. (2,2); \RRR{ 14-3 }} \\ \hline \begin{tikzpicture}[,blue,line width=2pt,fill=green] @@ -56,7 +56,8 @@ \bigskip - + +\noindent \begin{tabular}{|c|c|c|}\hline \multicolumn{3}{|c|}{\BS{draw} (0,2) . . \DDD{controls} (3,0) \DDD{and} (-1,0) .. (2,2); \RRR{14-3}} \\ \hline @@ -87,7 +88,7 @@ %-------------------------------------------------- \bigskip -\begin{tabular}{|c|c|c|} \hline +\noindent \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{\BS{draw} (0,0) \DDD{rectangle} (3,2); \RRR{14-4} }\\ \hline \begin{tikzpicture}[scale=.8,blue,line width=2pt] @@ -117,7 +118,7 @@ \bigskip -\begin{tabular}{|c|c|c|}\hline +\noindent \begin{tabular}{|c|c|c|}\hline \multicolumn{3}{|c|}{\BS{draw} (1,1) \DDD{circle} (1); \RRR{14-6}}\\ \hline \begin{tikzpicture}[blue,line width=2pt,fill=green] @@ -147,7 +148,7 @@ %----------------------------------------------------- \bigskip -\begin{tabular}{|c|c|c|}\hline +\noindent \begin{tabular}{|c|c|c|}\hline \multicolumn{2}{|c|}{\BS{draw} (1,1) \DDD{circle} [\RDD{radius}=1cm]; } & \BS{draw} (1,1)\DDD{ellipse} [\RDD{x radius}=2cm,\RDD{y radius}=1cm] \\ \hline @@ -172,7 +173,7 @@ %----------------------------------------------------- \bigskip -\begin{tabular}{|c|c|}\hline +\noindent \begin{tabular}{|c|c|}\hline \BS{draw} (1,1) circle {\color{red}(2 and 1)}; & \BS{draw} (1,1) ellipse {\color{red}(2 and 1)}; \\ \hline \begin{tikzpicture}[scale=.8,blue,line width=2pt,fill=green] @@ -189,7 +190,7 @@ \bigskip -\begin{tabular}{|c|c|c|}\hline +\noindent \begin{tabular}{|c|c|c|}\hline \multicolumn{3}{|c|}{\BS{draw} (-2,0) \DDD{arc} (180:-45:2); \RRR{14-7} }\\ \hline \begin{tikzpicture}[scale=.8,blue,line width=2pt,fill=green] @@ -216,8 +217,8 @@ \end{tabular} \bigskip - \begin{tabular}{|c|c||c|} \hline -\multicolumn{2}{|c||}{\BS{draw} (-2,0) arc [\RDD{start angle}=-20, \RDD{end angle}=135,\RDD{radius}=1] } +\noindent \begin{tabular}{|c|c||c|} \hline +\multicolumn{2}{|c||}{\BS{draw} (-2,0) arc [\RDD{start angle}=180, \RDD{end angle}=-45,\RDD{radius}=1] } & \BS{draw} (-2,0) \RDD{ arc (180:-45:2 and 1)} \\ \hline @@ -243,7 +244,7 @@ \bigskip - \begin{tabular}{|c|c|c|}\hline +\noindent \begin{tabular}{|c|c|c|}\hline \multicolumn{3}{|c|}{\BS{draw} (0,0) \DDD{parabola} (3,2); \RRR{14-9} } \\ \hline \begin{tikzpicture}[blue,line width=2pt,fill=green] @@ -269,7 +270,7 @@ \\ \hline \end{tabular} ------ - \begin{tabular}{|c|c|} \hline +\noindent \begin{tabular}{|c|c|} \hline \begin{tikzpicture}[blue,line width=2pt,fill=green] \draw[help lines] (0,0) grid (4,4); \draw(0,1) parabola bend (1,0) (4,4); @@ -286,7 +287,7 @@ \end{tabular} \bigskip -\begin{tabular}{|c|c|c|} \hline +\noindent \begin{tabular}{|c|c|c|} \hline \BS{draw}(0,1) parabola [\RDD{parabola height}=2cm] (3,0); & \multicolumn{2}{|c|}{\BS{draw}(0,0) parabola[\RDD{bend at start}] (3,2);}\\ \hline \begin{tikzpicture}[blue,line width=2pt,fill=green] @@ -308,7 +309,7 @@ \bigskip - \begin{tabular}{|c|c|c|}\hline +\noindent \begin{tabular}{|c|c|c|}\hline \multicolumn{3}{|c|}{\BS{draw} (0,0) \DDD{sin} (1.57,2); \RRR{14-10} }\\ \hline \begin{tikzpicture}[scale=.8,blue,line width=2pt,fill=green] @@ -359,7 +360,7 @@ \RRR{14-13} \end{center} -\begin{tabular}{|c|c|c|} \hline +\noindent \begin{tabular}{|c|c|c|} \hline \begin{tikzpicture}[blue,line width=2pt,fill=green] \draw[help lines] (0,0) grid (3,2); \draw (0,0) to (3,2); @@ -387,12 +388,12 @@ -\begin{tabular}{|c|c|c|} \hline -\multicolumn{2}{|c|}{ \bf{Dessin avec plot} } +\noindent \begin{tabular}{|c|c|c|} \hline +\multicolumn{2}{|c|}{ \bf{\TFRGB{Dessin avec plot}{Drawing with plot} }} \RRR{14-12} \RRR{22} \\ \hline -une liste de coordonnées & un fichier de coordonnées & une équation mathématique +\TFRGB{une liste de coordonnées}{list of coordinates} & \TFRGB{un fichier de coordonnées}{file of coordinates} & \TFRGB{une équation mathématique}{mathematical equation} \\ \hline \begin{tikzpicture}[blue,line width=2pt,fill=green] \draw[help lines] (0,0) grid (5,3); @@ -419,13 +420,14 @@ une liste de coordonnées & un fichier de coordonnées & une équation mathémat %--------------------------------------------------------- \newpage -\SSCT{Notion de Chemin}{Path} +\SSCT{Chemin}{Path and edge} +\SbSSCT{Notion de Chemin}{Path} \begin{center} \RRR{14} \end{center} -\begin{tabular}{|c|c|} \hline +\noindent \begin{tabular}{|c|c|} \hline \begin{tikzpicture}[scale=.8,blue,line width=2pt] \draw[help lines] (0,0) grid (3,2); \draw (0,0) -- (2,1) -- (3,0) ; @@ -444,7 +446,7 @@ une liste de coordonnées & un fichier de coordonnées & une équation mathémat \end{tabular} \bigskip -\begin{tabular}{|c|c|} \hline +\noindent \begin{tabular}{|c|c|} \hline \multicolumn{2}{|c|}{ \BS{draw} (0,0) - - (2,1) - - (3,3) arc (135:-20:1) .. controls (6,0) and (4,0) }\\ \multicolumn{2}{|c|}{ .. (5,2) sin (6.57,0) cos (7.57,2) ;} \\ \hline @@ -473,7 +475,7 @@ une liste de coordonnées & un fichier de coordonnées & une équation mathémat \end{center} -\begin{tabular}{|c|c|} \hline +\noindent \begin{tabular}{|c|c|} \hline \begin{tikzpicture}[scale=.8,blue,line width=4mm] \draw[help lines] (0,0) grid (3,2); \draw [rounded corners] (0,0) -- (2,1) -- (3,0) ; @@ -493,7 +495,7 @@ une liste de coordonnées & un fichier de coordonnées & une équation mathémat \end{tabular} \bigskip -\begin{tabular}{|c|c|} \hline +\noindent \begin{tabular}{|c|c|} \hline \begin{tikzpicture}[scale=.8,blue,baseline=0pt,line width=2pt] \draw[help lines] (0,0) grid (2,2); \draw (0,0) -- (1,1.732) -- (2,0) -- cycle ; @@ -531,7 +533,7 @@ une liste de coordonnées & un fichier de coordonnées & une équation mathémat \end{center} -\begin{tabular}{|c|c|} \hline +\noindent \begin{tabular}{|c|c|} \hline \begin{tikzpicture}[scale=.8,blue,line width=2pt] \draw[help lines] (0,0) grid (3,2); \draw (0,0) -- (2,1) -| cycle ; @@ -551,7 +553,7 @@ une liste de coordonnées & un fichier de coordonnées & une équation mathémat \bigskip -\begin{tabular}{|c|} \hline +\noindent \begin{tabular}{|c|} \hline \BS{tikz} [{\color{red} c/.style}=\AC{\RDD{insert path}=\AC{circle[radius=3pt]}}] \\ \BS{draw}(0,0){\color{red}[c]} -- (1,2){\color{red}[c]} -- (3,1) {\color{red}[c]}; \\ \hline @@ -574,11 +576,11 @@ une liste de coordonnées & un fichier de coordonnées & une équation mathémat %\tikz \fill [prefix after command={[blue](0,0) rectangle (2,2)},draw] [red](1,1) rectangle (3,3); \bigskip -\bf{Coupure de chemin} \RRR{14-1} +\bf{\TFRGB{Coupure de chemin}{Path interrupted}} \RRR{14-1} \bigskip -\begin{tabular}{|c|} \hline +\noindent \begin{tabular}{|c|} \hline \BS{draw} (0.5,0.5) - -(2.5,0.5) (0.5,1.5) - -(2.5,1.5); \\ \hline \begin{tikzpicture}[blue,line width=2pt] @@ -590,7 +592,7 @@ une liste de coordonnées & un fichier de coordonnées & une équation mathémat \bigskip -\begin{tabular}{|c|} \hline +\noindent \begin{tabular}{|c|} \hline \BS{draw} (0,0) - - (0,1) - - (1,1) (2,0) - - (2,1) - - (3,1) - - (\BDD{current subpath start}); \\ \BS{fill}[red] (\BDD{current subpath start}) circle (3pt); @@ -604,3 +606,35 @@ une liste de coordonnées & un fichier de coordonnées & une équation mathémat \\ \hline \end{tabular} +\SbSSCT{Chemins dans un chemin}{Pathes in a path : edge} + +\begin{center} + \RRR{17-12} +\end{center} + + \bigskip + +\begin{tabular}{|c|} \hline +\BS{draw} (0,0) - - (2,1) \RDD{edge}[dotted] (3,0) \RDD{edge}[red] (3,2) - -(1,2) - - (0,1) ; + +\\ \hline +\begin{tikzpicture}[blue,baseline=0pt,line width=2pt] +\draw[help lines] (0,0) grid (3,2); +\draw (0,0) - - (2,1) edge[dotted] (3,0) edge[red] (3,2) --(1,2) -- (0,1) ; +\end{tikzpicture} +\\ \hline +\end{tabular} + + \bigskip + +\begin{tabular}{|c|} \hline +\BS{draw} (0,0) - - (2,1) \RDD{edge}([red,\BDD{to path=\AC{parabola (3,0)} }] () \\ +\RDD{edge}[red,\BDD{to path=\AC{arc(-90 : 90 : 0.5)}}] () - -(1,2) - - (0,1) ; + +\\ \hline +\begin{tikzpicture}[blue,baseline=0pt,line width=2pt] +\draw[help lines] (0,0) grid (3,2); +\draw (0,0) - - (2,1) edge[red,to path={parabola (3,0)}] () edge[red,to path={arc(-90 :90 :.5)}] () --(1,2) -- (0,1) ; +\end{tikzpicture} +\\ \hline +\end{tabular} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz2.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz2.tex index 84ca604bad3..7972e707f41 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz2.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz2.tex @@ -118,7 +118,7 @@ \end{tabular} -\SbSSCT{Terminaisons de lignes}{Extremities} +\SbSSCT{Terminaisons de lignes}{Terminators} \begin{tabular}{|c|c|c|} \hline \begin{tikzpicture}[blue,line width=.5cm] diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz4.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz4.tex index dca6cbb90d4..b5bb2fde067 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz4.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz4.tex @@ -11,51 +11,45 @@ \hline \begin{tikzpicture} \draw[dashed,red] (0,0) rectangle (2,2) ; -\draw[rotate=40,blue] (0,0) rectangle (2,2) ; % rotation 40° +\draw[rotate=40,blue] (0,0) rectangle (2,2) ; \end{tikzpicture} & \begin{tikzpicture} \draw[dashed,red] (0,0) rectangle (2,2) ; -\draw[x=1cm,y=.5cm,blue] (0,0) rectangle (2,2); % rotation 40° +\draw[x=1cm,y=.5cm,blue] (0,0) rectangle (2,2); \end{tikzpicture} & \begin{tikzpicture} \draw[dashed,red] (0,0) rectangle (2,2) ; -\draw[xslant=.75,blue] (0,0) rectangle (2,2); % rotation 40° +\draw[xslant=.75,blue] (0,0) rectangle (2,2); \end{tikzpicture} & \begin{tikzpicture} \draw[dashed,red] (0,0) rectangle (2,2) ; -\draw[yslant=.75,blue] (0,0) rectangle (2,2); % rotation 40° +\draw[yslant=.75,blue] (0,0) rectangle (2,2); \end{tikzpicture} \\ \hline \RDD{rotate}=40 & \RDD{x}=1cm,\RDD{y}=0.5cm & \RDD{xslant}=0.75 & \RDD{yslant}=0.75\\ \hline -%\end{tabular} -% -%\bigskip -% -%\begin{tabular}{|c|c|c|c|} \hline -%\multicolumn{4}{|c|}{ \BS{draw}[\RDD{rotate}=40,blue] (0,0) rectangle (2,2) ; }\\ -%\hline + \begin{tikzpicture} \draw[dashed,red] (0,0) rectangle (2,2) ; -\draw[scale=1.5,blue] (0,0) rectangle (2,2) ; % rotation 40° +\draw[scale=1.5,blue] (0,0) rectangle (2,2) ; \end{tikzpicture} & \begin{tikzpicture} \draw[dashed,red] (0,0) rectangle (2,2) ; -\draw[scale=-1,y=.5cm,blue] (0,0) rectangle (2,2); % rotation 40° +\draw[scale=-1,y=.5cm,blue] (0,0) rectangle (2,2); \end{tikzpicture} & \begin{tikzpicture} \draw[dashed,red] (0,0) rectangle (2,2) ; -\draw[xshift=.5cm,blue] (0,0) rectangle (2,2); % rotation 40° +\draw[xshift=.5cm,blue] (0,0) rectangle (2,2); \end{tikzpicture} & \begin{tikzpicture} \draw[dashed,red] (0,0) rectangle (2,2) ; -\draw[yshift=.5cm,blue] (0,0) rectangle (2,2); % rotation 40° +\draw[yshift=.5cm,blue] (0,0) rectangle (2,2); \end{tikzpicture} \\ \hline \RDD{scale}=1.5 & \RDD{scale}=-1 & \RDD{xshift}=0.5cm & \RDD{yshift}=0.5cm diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoord.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoord.tex index 28113cd73fb..7a9121f907c 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoord.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoord.tex @@ -11,7 +11,7 @@ \tikzset{every picture/.style=blue,very thick,inner sep=0pt} \begin{tabular}{|c|c|} \hline -Explicite & Implicite +\TFRGB{Explicite}{explicit} & \TFRGB{Implicite}{implicit} \\ \hline \begin{tikzpicture} \draw[help lines] (0,0) grid (3,2); @@ -57,7 +57,7 @@ Explicite & Implicite \SbSbSSCT{Système de coordonnées polaire \og canvas \fg}{Polar coordinates} \begin{tabular}{|c|c|c|} \hline -Explicite & Implicite +\TFRGB{Explicite}{explicit} & \TFRGB{Implicite}{implicit} \\ \hline \begin{tikzpicture} \draw[help lines] (0,0) grid (3,2); @@ -99,7 +99,7 @@ Explicite & Implicite \SbSbSSCT{Coordinate system xyz polar}{Coordinate system xyz polar} \begin{tabular}{|c|c|c|} \hline -Explicite & Implicite +\TFRGB{Explicite}{explicit} & \TFRGB{Implicite}{implicit} \\ \hline \begin{tikzpicture} \draw[help lines] (0,0) grid (3,2); diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoul.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoul.tex index cbf8a727a27..1a4baa19722 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoul.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoul.tex @@ -55,8 +55,10 @@ olive & orange & pink & purple & red teal & violet & white & yellow & \\ \hline \end{tabular} + \bigskip +\noindent \begin{tabular}{|c|c|c|c|c|} \hline \fbox{\begin{tikzpicture}[baseline=-.5] \fill [blue!10](0,0)rectangle (2,1); @@ -515,7 +517,8 @@ path fading=circle with fuzzy edge 20 percent & path fading=fuzzy ring 15 percen \begin{center} \RRR{23-4-1} \end{center} - + +\noindent \begin{tabular}{|c|c|} \hline \emph{\TFRGB{Création}{Creation}} & \emph{\TFRGB{Visualisation}{Visualization}} \\ \hline @@ -558,7 +561,7 @@ path fading=circle with fuzzy edge 20 percent & path fading=fuzzy ring 15 percen \bigskip \begin{tabular}{|c|c|} \hline -\multicolumn{2}{|c|}{ \TFRGB{Utilisation dans un rectangle}{Utilization in a frame}} +\multicolumn{2}{|c|}{ \TFRGB{Utilisation dans un rectangle}{Use in a frame}} \\ \hline \multicolumn{2}{|c|}{\BS{fill}[\RDD{path fading}=filtre] (-2,-1) rectangle (2,1); } @@ -622,7 +625,7 @@ path fading=circle with fuzzy edge 20 percent & path fading=fuzzy ring 15 percen \begin{tabular}{|c|c|} \hline -\multicolumn{2}{|c|}{\TFRGB{Utilisation dans un ellipse}{Utilization in an ellipse}} +\multicolumn{2}{|c|}{\TFRGB{Utilisation dans un ellipse}{Use in an ellipse}} \\ \hline \multicolumn{2}{|c|}{\BS{fill}[\RDD{path fading}=filtre] (-2,-1) ellipse (2 and 1); } \\ \hline diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzdeco.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzdeco.tex index 2ed2248a1f6..49044f6f3b2 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzdeco.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzdeco.tex @@ -1,6 +1,6 @@ -\subsection{Library `` decorations.pathmorphing ``} +\subsection{Library \og decorations.pathmorphing \fg} %Insérer dans le préambule : \maboite{\BS{usetikzlibrary}\AC{decorations.pathmorphing}} \label{lib-morph} @@ -10,7 +10,7 @@ %\subsection{Decorations Producing Straight Line Paths} -\subsubsection{''lineto ``} +\subsubsection{\og lineto \fg} \begin{tabular}{|c|c|c|} \hline \begin{tikzpicture} @@ -36,7 +36,7 @@ \end{tabular} %---------------- -\subsubsection{ `` straight zigzag ``} +\subsubsection{ \og straight zigzag \fg} \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration=straight zigzag}] (0,0) - - (2,2) ;} @@ -126,7 +126,7 @@ %---------------------- -\subsubsection{'' random steps ``} +\subsubsection{\og random steps \fg } \label{alea} \begin{tabular}{|c|c|c|} \hline @@ -226,7 +226,7 @@ %----------------- -\subsubsection{'' saw `` } +\subsubsection{\og saw \fg } \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration=saw}] (0,0) - - (2,2) ;} @@ -309,7 +309,7 @@ \end{tabular} %-------------------- -\subsubsection{'' zigzag ``} +\subsubsection{\og zigzag \fg } \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration=zigzag}] (0,0) - - (2,2) ;} @@ -399,7 +399,7 @@ %------------------------------------ -\subsubsection{'' bent ``} +\subsubsection{\og bent \fg } \begin{tabular}{|c|c|c|} \hline \begin{tikzpicture} @@ -487,7 +487,7 @@ amplitude=1cm & amplitude=0.5cm & aspect=0.25 %----------------- -\subsubsection{'' bumps `` } +\subsubsection{\og bumps \fg } \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration=bumps}] (0,0) - - (2,2) ;} @@ -568,7 +568,7 @@ amplitude=1cm & amplitude=0.5cm & aspect=0.25 %----------------- -\subsubsection{'' coil `` } +\subsubsection{\og coil \fg } \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration=coil}] (0,0) - - (2,2) ;} @@ -680,7 +680,7 @@ amplitude=1cm & amplitude=0.5cm & aspect=0.25 \end{tabular} %------------------------ -\subsubsection{'' curveto `` } +\subsubsection{\og curveto \fg } \begin{tabular}{|c|c|c|} \hline \begin{tikzpicture} @@ -735,7 +735,7 @@ amplitude=1cm & amplitude=0.5cm & aspect=0.25 %\end{tabular} %------------------------ -\subsubsection{'' snake ``} +\subsubsection{\og snake \fg } \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration=snake}] (0,0) - - (2,2) ;} @@ -818,7 +818,7 @@ snake, %--------------------------------------------- \newpage -\subsection{Library `` decorations.pathreplacing ``} +\subsection{Library \og decorations.pathreplacing \fg} %Insérer dans le préambule : @@ -830,7 +830,7 @@ snake, \RRR{48-3} \end{center} -\subsubsection{'' border ``} +\subsubsection{\og border \fg } \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration=border}] (0,0) - - (2,2) ;} @@ -923,7 +923,7 @@ amplitude=0.5cm \end{tabular} -\subsubsection{'' brace ''} +\subsubsection{\og brace \fg } \begin{tabular}{|c|c|} \hline \begin{tikzpicture}[baseline=0pt] @@ -972,7 +972,7 @@ amplitude=0.5cm \hline \end{tabular} -\subsubsection{'' expanding waves ''} +\subsubsection{\fg expanding waves \fg } \begin{tabular}{|c|c|} \hline \begin{tikzpicture}[baseline=0pt] @@ -1014,11 +1014,11 @@ amplitude=0.5cm \hline \end{tabular} -\subsubsection{'' moveto ``} +\subsubsection{\og moveto \fg } \TFRGB{voir}{see} page \pageref{moveto} -\subsubsection{'' ticks ``} +\subsubsection{\og ticks \fg } \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration=ticks}] (0,0) - - (2,2) ;} @@ -1095,7 +1095,7 @@ amplitude=0.5cm \\ \hline \end{tabular} -\subsubsection{'' waves ``} +\subsubsection{\fg waves \fg } \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration=waves}] (0,0) - - (2,2) ;} @@ -1185,7 +1185,7 @@ amplitude=0.5cm \end{tabular} %\newpage -\subsubsection{'' show path construction ``} +\subsubsection{\fg show path construction \fg } \emph{\TFRGB{Chemin à décorer}{path to decorate}} @@ -1201,7 +1201,7 @@ amplitude=0.5cm \newpage -\Par{composants linéaires `` lineto `` }{ Linear components : '' lineto `` } : +\Par{composants linéaires \og lineto \fg }{ Linear components : \og lineto \fg } : \begin{tabular}{|l|} \hline decoration=\{ \RDD{show path construction},\\ @@ -1218,7 +1218,7 @@ decoration=\{ \RDD{show path construction},\\ \end{tabular} \bigskip -\Par{Fermetures de chemin `` closepath `` }{ Path terminations : '' closepath `` } : +\Par{Fermetures de chemin \og closepath \fg }{ Path terminations : \og closepath \fg } : \begin{tabular}{|l|} \hline decoration=\{ \RDD{show path construction},\\ @@ -1236,7 +1236,7 @@ decoration=\{ \RDD{show path construction},\\ \bigskip -\Par{coupure de chemin `` moveto code `` }{Broken paths : '' moveto code `` } : +\Par{coupure de chemin \og moveto code \fg }{Broken paths : \og moveto code \fg } : \begin{tabular}{|l|} \hline decoration=\{ \RDD{show path construction},\\ @@ -1254,7 +1254,7 @@ decoration=\{ \RDD{show path construction},\\ \newpage -\Par{composants courbes `` curveto `` }{ Curved segments : `` curveto `` }: +\Par{composants courbes \og curveto \fg }{ Curved segments : \og curveto \fg }: \begin{tabular}{|l|} \hline decoration=\{ \RDD{show path construction},\\ @@ -1326,7 +1326,7 @@ and (\BSS{tikzinputsegmentsupportb}) .. (\BSS{tikzinputsegmentlast}) %----------------------------------------- -\subsection{Library `` decorations.markings''} +\subsection{Library \og decorations.markings \fg } %Insérer dans le préambule : @@ -1687,7 +1687,7 @@ mark=at position 0.4 with \newpage -\subsection{Library `` decorations.footprints ``} +\subsection{Library \og decorations.footprints \fg } %Insérer dans le préambule : @@ -1834,7 +1834,7 @@ foot of = gnome & foot of = human & foot of = bird & foot of = felis silvestris ------------------------------ \newpage -\subsection{Library `` decorations.shapes `` } +\subsection{Library \og decorations.shapes \fg } \subsubsection{Introduction} %Insérer dans le préambule : @@ -1891,7 +1891,7 @@ foot of = gnome & foot of = human & foot of = bird & foot of = felis silvestris -\subsubsection{'' shape backgrounds `` } +\subsubsection{\og shape backgrounds \fg } @@ -2134,7 +2134,7 @@ shape border rotate=180 %\subparagraph{'' shape sloped ``}: \begin{tabular}{|c|c|} \hline -\multicolumn{2}{|c|}{ '' shape sloped `` } +\multicolumn{2}{|c|}{ \og shape sloped \fg } \\ \hline \multicolumn{2}{|c|}{\BSS{draw}[decorate with=dart,decoration=\{shape width=.5cm,shape sep=1cm, }\\ \multicolumn{2}{|c|}{ \RDD{shape sloped=true}\}] (0,0) - - (3,3);} @@ -2211,7 +2211,7 @@ shape sloped=false \begin{tabular}{|c|c|}\hline -\multicolumn{2}{|c|}{ '' shift only `` } +\multicolumn{2}{|c|}{ \og shift only \fg } \\ \hline \multicolumn{2}{|c|}{ decoration={ {\color{red}transform=\AC{shift only}},shape width=5mm,segment length=.5cm,shape sep=1cm}} @@ -2304,7 +2304,7 @@ avec & sans\\ %-------------------------------- \newpage -\subsection{Library `` decorations.text ``} +\subsection{Library \og decorations.text \fg } %Insérer dans le préambule : @@ -2559,7 +2559,7 @@ text align=\AC{\RDD{fit to path stretching spaces}}}, decorate] \newpage -\subsection{Library `` decorations.fractals ``} +\subsection{Library \og decorations.fractals \fg } %Insérer dans le préambule : @@ -2896,7 +2896,7 @@ decoration=\AC{zigzag,\RDD{pre=}footprints,\RDD{pre length=}3cm, \begin{tabular}{|c|} \hline -'' lineto `` +\og lineto \fg \textbf{} \BS{draw} [decorate, decoration=\AC{zigzag,\RDD{pre=}lineto,\RDD{pre length=}5cm}](0,0) -- (10,0); @@ -2934,7 +2934,7 @@ decoration=\AC{zigzag,\RDD{pre=}lineto,\RDD{pre length=}3cm, \begin{tabular}{|c|} \hline -`` curveto `` +\og curveto \fg \\ \hline \BS{draw} [decorate, decoration=\AC{zigzag,\RDD{pre=}curveto,\RDD{pre length=}5cm}](0,0) -- (10,0); @@ -2972,7 +2972,7 @@ decoration=\AC{zigzag,\RDD{pre=}curveto,\RDD{pre length=}3cm, \label{moveto} \begin{tabular}{|c|} \hline -'' moveto `` +\og moveto \fg \\ \hline \BS{draw} [decorate, decoration=\AC{zigzag,\RDD{pre=}moveto,\RDD{pre length=}5cm}](0,0) -- (10,0); @@ -3030,7 +3030,7 @@ decoration=\AC{zigzag,\RDD{pre=}moveto,\RDD{pre length=}3cm, \end{tabular} %\subsubsection{Tracer le chemin et sa décoration avec \og Postaction \fg} -\SbSbSSCT{Tracer le chemin et sa décoration avec Postaction ``}{Path and its decoration `` Postaction ``} +\SbSbSSCT{Tracer le chemin et sa décoration avec \og Postaction \fg }{Path and its decoration \og Postaction \fg } \begin{tabular}{|c|c|}\hline \begin{tikzpicture}[baseline=0pt] diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzelect.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzelect.tex new file mode 100644 index 00000000000..cdee18256d5 --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzelect.tex @@ -0,0 +1,1025 @@ +%\section{Circuit électrique} +\label{lib-ee} +%Insérer dans le préambule : + + \maboite{\BS{usepackage}\AC{circuits.ee.IEC}} + + +%\subsection{Symboles} +\SbSSCT{Symboles}{Symbols} + +\begin{center} +\RRR{47-4} +\end{center} + +\begin{tabular}{|c|c|c|c|} \hline +\TFRGB{sur un noeud}{On a node} & \TFRGB{sur un chemin}{On a path} +\\ \hline +\begin{tikzpicture}[blue,line width=2pt] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\draw [help lines] (0,0) grid (2,1); +\node[circuit ee IEC] at (1,.5) [resistor] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue,line width=2pt] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\draw [help lines] (0,0) grid (2,1); +\draw [circuit ee IEC] (0,.5) to [resistor] (2,.5) ; +\end{tikzpicture} +\\ \hline +\BS{node} \rouge{[circuit ee IEC]} at (1,0.5) \rouge{ to [resistor] } \AC{} ; +& +\BS{draw} \rouge{[circuit ee IEC]}(0,0.5) \rouge{ to [resistor] } (2,.5) ; +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|} \hline +\multicolumn{4}{|c|}{\textbf{\TFRGB{Composants de base}{Basic Elements}} }\\ +\hline +\multicolumn{4}{|c|}{\BS{draw} [circuit ee IEC] (0,.5) to [\RDD{resistor}] (2,.5) ; }\\ +\hline +\multicolumn{4}{|c|}{\RRR{47-4-3} } +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,0.5) to [resistor] (2,0.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [inductor] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [capacitor] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [battery] (2,.5) ; +\end{tikzpicture} +\\ \hline +[\RDD{resistor}] &[\RDD{inductor}] & [\RDD{capacitor}] &[\RDD{battery}] +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [bulb] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [current source] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox(-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [voltage source] (2,.5) ; +\end{tikzpicture}; +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [ground] (2,.5) ; +\end{tikzpicture} +\\ \hline +[\RDD{bulb}] &[\RDD{current source}] & [\RDD{voltage source}] &[\RDD{ground}] +\\ \hline +\multicolumn{4}{|c|}{\RRR{47-4-4} } +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [diode] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [Zener diode] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [Schottky diode] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox(-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [tunnel diode] (2,.5) ; +\end{tikzpicture} +\\ \hline +[\RDD{diode}] &[\RDD{Zener diode}] & [\RDD{Schottky diode}] &[\RDD{tunnel diode}] +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [backward diode] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [breakdown diode] (2,.5) ; +\end{tikzpicture} +& +& +\\ \hline +[\RDD{backward diode}] &[\RDD{breakdown diode}] & & +\\ \hline +\multicolumn{4}{|c|}{\RRR{47-4-5} } +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [contact] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [make contact] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [break contact] (2,.5) ; +\end{tikzpicture} +& + +\\ \hline +[\RDD{contact}] &[\RDD{make contact}] & [\RDD{break contact}] & +\\ \hline +\end{tabular} + +\bigskip + + +%\subsection{Alternate appearance} + +\begin{tabular}{|c|c|c|} \hline +\multicolumn{3}{|c|}{\textbf{\TFRGB{Autre apparence}{Alternate appearance }} } +\\ \hline +\multicolumn{3}{|l|}{\BS{draw} [circuit ee IEC,\rouge{set resistor graphic=var resistor IEC graphic} ] }\\ +\multicolumn{3}{|l|}{(0,0.5) to [resistor] (2,0.5) ; }\\ +\hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC,set resistor graphic=var resistor IEC graphic ] (0,.5) to [resistor] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC,set inductor graphic=var inductor IEC graphic ] (0,.5) to [inductor] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC,set diode graphic=var diode IEC graphic ] (0,.5) to [diode] (2,.5) ; +\end{tikzpicture} +\\ \hline +resistor & inductor & diode +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC,set Zener diode graphic=var Zener diode IEC graphic ] (0,.5) to [Zener diode] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC,set Schottky diode graphic=var Schottky diode IEC graphic ] (0,.5) to [Schottky diode] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC,set tunnel diode graphic=var tunnel diode IEC graphic ] (0,.5) to [tunnel diode] (2,.5) ; +\end{tikzpicture} + +\\ \hline +Zener diode & Schottky diode & tunnel diode +\\ \hline + +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC,set backward diode graphic=var backward diode IEC graphic ] (0,.5) to [backward diode] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC,set breakdown diode graphic=var breakdown diode IEC graphic ] (0,.5) to [breakdown diode] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC,set make contact graphic=var make contact IEC graphic ] (0,.5) to [make contact] (2,.5) ; +\end{tikzpicture} +\\ \hline +backward diode & breakdown diode & make contact +\\ \hline +\end{tabular} + + +\bigskip + +%\subsection{Symbol Size} +%\begin{center} +%\RRR{47-2-1} +%\end{center} + + +\begin{tabular}{|c|c|c|c|c|} \hline +\multicolumn{5}{|c|}{ \textbf{\TFRGB{Taille des symboles}{Symbol Size}}}\\ +\multicolumn{5}{|c|}{\RRR{47-2-1}} +\\ \hline +\multicolumn{5}{|c|}{\BS{draw} [circuit ee IEC] (0,0.5) to [diode,\RDD{large circuit symbols}] (2,0.5) ; }\\ +\hline +\begin{tikzpicture}[blue] +\useasboundingbox (0,0) rectangle (2,1); +\draw [circuit ee IEC] (0,.5) to [diode,huge circuit symbols] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (0,0) rectangle (2,1); +\draw [circuit ee IEC](0,.5) to [diode,large circuit symbols] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (0,0) rectangle (2,1); +\draw [circuit ee IEC](0,.5) to [diode,medium circuit symbols] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (0,0) rectangle (2,1); +\draw [circuit ee IEC] (0,.5) to [diode,small circuit symbols] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (0,0) rectangle (2,1); +\draw [circuit ee IEC] (0,.5) to [diode,tiny circuit symbols] (2,.5) ; +\end{tikzpicture} +\\ \hline +\RDD{huge circuit symbols} & \RDD{large circuit symbols} & \RDD{medium circuit symbols} & \RDD{small circuit symbols} & \RDD{tiny circuit symbols} +\\ \hline +(10pt) & (8pt) & (7pt)& (6pt)& (5pt) +\\ \hline +\end{tabular} + + +\bigskip\begin{tabular}{|c|c|c|} \hline +\multicolumn{3}{|c|}{\BS{draw} [circuit ee IEC,\RDD{circuit symbol unit}=14pt] (0,0.5) to [diode] (2,0.5) ; }\\ +\hline +\begin{tikzpicture}[blue] +\useasboundingbox (0,0) rectangle (2,1); +\draw [circuit ee IEC,circuit symbol unit=14pt] (0,.5) to [diode] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (0,0) rectangle (2,1); +\draw [circuit ee IEC,{circuit symbol size=width 3 height 1}] (0,.5) to [diode] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (0,0) rectangle (2,1); +\node[circuit ee IEC,circuit symbol size=width 1 height 5]at (1,.5) [diode] {} ; +\end{tikzpicture} +\\ \hline +\RDD{circuit symbol unit}=14pt & \RDD{circuit symbol size}=width 3 height 1 & \RDD{circuit symbol size}=width 1 height 5 \\ +& +\multicolumn{2}{|c|}{ \DW{} } +\\ \hline +\end{tabular} + +%\subsection{Declaring New Symbols} +\bigskip + +\begin{tabular}{|c|c|c|c|} \hline +\multicolumn{4}{|c|}{\textbf{\TFRGB{Création de nouveaux symboles}{Declaring New Symbols }} } +\\ % \hline +\multicolumn{4}{|c|}{\RRR{47-2-2} } +\\ \hline +\begin{tikzpicture} +[baseline=0pt,circuit declare symbol=xxx, +set xxx graphic={draw,shape=rectangle,minimum size=5mm}] +\useasboundingbox (0,0) rectangle (3.2,1); +\node [xxx] at (0.5,0.5) {}; +\draw[circuit ee IEC] (1,0.5) to [xxx] (3,0.5) ; +\end{tikzpicture} +& +\multicolumn{3}{|c|}{ +\parbox[B]{10cm}{ +\BS{begin}\AC{tikzpicture} +[\RDD{circuit declare symbol}={\color{blue} xxx}, \\ +\rouge{set xxx graphic}=\AC{draw,\rouge{shape}=rectangle,minimum size=5mm}] \\ +\BS{node} [{\color{blue} xxx}] at (.5,.5) {}; \\ +\BS{draw}[circuit ee IEC] (1,.5) to [{\color{blue} xxx}] (3,.5) ; \\ +\BS{end}\AC{tikzpicture}} } +\\ \hline + +\begin{tikzpicture} +[circuit declare symbol=xxx, +set xxx graphic={draw,shape=circle,minimum size=5mm}] +\useasboundingbox (0,0) rectangle (3.2,1); +\node [xxx] at (.5,.5) {}; +\draw[circuit ee IEC] (1,.5) to [xxx] (3,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture} +[circuit declare symbol=xxx, +set xxx graphic={draw,shape=dart,minimum size=5mm}] +\useasboundingbox (0,0) rectangle (3.2,1); +\node [xxx] at (.5,.5) {}; +\draw[circuit ee IEC] (1,.5) to [xxx] (3,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture} +[circuit declare symbol=xxx, +set xxx graphic={draw,shape=star,minimum size=5mm}] +\useasboundingbox (0,0) rectangle (3.2,1); +\node [xxx] at (.5,.5) {}; +\draw[circuit ee IEC] (1,.5) to [xxx] (3,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture} +[circuit declare symbol=xxx, +set xxx graphic={draw,shape=forbidden sign,minimum size=5mm}] +\useasboundingbox (0,0) rectangle (3.2,1); +\node [xxx] at (.5,.5) {}; +\draw[circuit ee IEC] (1,.5) to [xxx] (3,.5) ; +\end{tikzpicture} +\\ \hline +\RDD{shape}=circle & \RDD{shape}=dart & \RDD{shape}=star & \RDD{shape}=forbidden sign \\ +\hline +\multicolumn{4}{|c|}{ \textbf{voir les \og different shape libraries \fg }{see the different shape libraries } } +\\ \hline +\end{tabular} + +\bigskip +%\subsection{placement} + + +\begin{tabular}{|c|} \hline +\textbf{\TFRGB{Placement des symboles sur un chemin}{Placement of symbol on a path }} +\\ \hline +\BS{draw} [circuit ee IEC] (0,0.5) to [contact=\AC{\RDD{at start}},make contact=\AC{\RDD{very near start}},voltage source=\AC{\RDD{near start}},\\ resistor, +bulb=\AC{\RDD{near end}}, +bulb=\AC{\RDD{very near end}},contact=\AC{\RDD{at end}}] (12,0.5) ; +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (12.5,1); +\draw [circuit ee IEC] (0,.5) to [contact={at start},make contact={very near start},voltage source={near start},resistor, +bulb={near end},bulb={very near end},contact={at end}] (12,.5) ; +\end{tikzpicture} +\\ \hline +%\end{tabular} +% +%\bigskip +%\begin{tabular}{|c|} \hline +\BS{draw} [circuit ee IEC] (0,0.5) to [contact=\{ \RDDD{pos=0}{} \},make contact=\{\rouge{pos=0.2}{}\},voltage source=\{\RDDD{pos=0.3}{} \}, \\ +resistor=\{ \RDDD{pos=0.5}{} \}, +bulb=\{\RDDD{pos=0.75} {} \},contact=\{\RDD{pos} \rouge{=1}{} \}] (12,0.5) ; +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (12.5,1); +\draw [circuit ee IEC] (0,.5) to [contact={pos=0},make contact={pos=0.2},voltage source={pos=0.3},resistor={pos=0.5}, +bulb={pos=0.75},contact={pos=1}] (12,.5) ; +\end{tikzpicture} +\\ \hline +\end{tabular} + +%=================== +%\subsection{Orientation} + +\bigskip + +\begin{tabular}{|c|c|c|c|} \hline +\multicolumn{4}{|c|}{\textbf{\TFRGB{Orientation des symboles}{Symbol orientation }} } \\ +\multicolumn{4}{|c|}{ \RRR{47-2-3} } +\\ \hline +\multicolumn{4}{|c|}{\BS{node} [circuit ee IEC] at (1,.5) [diode,\RDD{point up}] \AC{} ; }\\ +\hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\node[circuit ee IEC] at (1,.5) [diode,point up] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\node[circuit ee IEC] at (1,.5) [diode,point down] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\node[circuit ee IEC] at (1,.5) [diode,point left] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\node[circuit ee IEC] at (1,.5) [diode,point right] {} ; +\end{tikzpicture} +\\ \hline +[diode,\RDD{point up}] & +[diode,\RDD{point down}] & [diode,\RDD{point left}] & [diode,\RDD{point right}] +\\ \hline +\end{tabular} + +\bigskip +\begin{tabular}{|c|c|} \hline +\multicolumn{2}{|c|}{\textbf{\TFRGB{Orientation automatique}{Automatic orientation }} } + +\\ \hline +\begin{tikzpicture}[baseline=0pt,blue] +\useasboundingbox (-.5,-1.5) rectangle (2.5,1.5); +\draw [circuit ee IEC] (0,0) to [voltage source] (1,1) to [resistor] (2,0) to +[bulb] (1,-1) to [diode] (0,0) ; +\end{tikzpicture} + & +\parbox[c]{10cm}{\BS{draw} [circuit ee IEC] (0,0) \\ to [voltage source] (1,1) \\ to [resistor] (2,0) \\to +[bulb] (1,-1) \\to [diode] (0,0) ;} + \\ \hline +\end{tabular} + +\bigskip + +%=================== +%\subsection{Current Directions} +\subsection{Annotations} +%\begin{center} +%\RRR{47-4-2} +%\end{center} + +\noindent + +\begin{tabular}{|c|c|} \hline +\multicolumn{2}{|c|}{ \textbf{\TFRGB{Sens du courant}{Indicating Current Directions}} } \\ +\multicolumn{2}{|c|}{\RRR{47-4-2} } +\\ \hline +\multicolumn{2}{|c|}{\BS{draw} [circuit ee IEC] (0,0.5) to [\RDD{current direction}] (2,0.5) ; } +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-1,0) rectangle (3,1); +\draw [circuit ee IEC] (0,.5) to[current direction] (2,.5); +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-1,0) rectangle (3,1); +\draw [circuit ee IEC] (0,.5) to[current direction'] (2,.5); +\end{tikzpicture} +\\ \hline +[\RDD{current direction}] & [\RDD{current direction' } ] + +\\ \hline + +\end{tabular} + +\bigskip + +%\subsection{units} +%\begin{center} +%\RRR{47-4-6} +%\end{center} + + +\begin{tabular}{|c|c|c|c|c|} \hline +\multicolumn{5}{|c|}{\textbf{ \TFRGB{Unités disponibles}{Units available}} } \\ +\multicolumn{5}{|c|}{\RRR{47-4-6} } +\\ \hline +\multicolumn{5}{|c|}{\BS{node} [draw,circuit ee IEC] at(1,.5) [\RDD{ampere}=5] \AC{} }\\ +\hline +\begin{tikzpicture}[blue] +\draw[help lines,white] (-.5,0) rectangle (2.5,1); +\node [draw,circuit ee IEC] at(1,0.5) [ampere=5] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\draw[help lines,white] (-.5,0) rectangle (2.5,1); +\node [draw,circuit ee IEC] at(1,0.5) [volt=5] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\draw[help lines,white] (-.5,0) rectangle (2.5,1); +\node [draw,circuit ee IEC] at(1,0.5) [ohm=5] {} ; +\end{tikzpicture} + +& +\begin{tikzpicture}[blue] +\draw[help lines,white] (-.5,0) rectangle (2.5,1); +\node [draw,circuit ee IEC] at(1,.5) [siemens=5] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\draw[help lines,white] (-.5,0) rectangle (2.5,1); +\node [draw,circuit ee IEC] at(1,.5) [henry=5] {} ; +\end{tikzpicture} +\\ \hline +[\RDD{ampere}=5] & [\RDD{volt}=5] & [\RDD{ohm}=5] \DW{} & [\RDD{siemens}=5] & [\RDD{henry}=5] +\\ \hline +\begin{tikzpicture}[blue] +\draw[help lines,white] (-.5,0) rectangle (2.5,1); +\node [draw,circuit ee IEC] at(1,.5) [farad=5] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\draw[help lines,white] (-.5,0) rectangle (2.5,1); +\node [draw,circuit ee IEC] at(1,.5) [coulomb=5] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\draw[help lines,white] (-.5,0) rectangle (2.5,1); +\node [draw,circuit ee IEC] at(1,.5) [voltampere=5] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\draw[help lines,white] (-.5,0) rectangle (2.5,1); +\node [draw,circuit ee IEC] at(1,.5) [watt=5] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\draw[help lines,white] (-.5,0) rectangle (2.5,1); +\node [draw,circuit ee IEC] at(1,.5) [hertz=5] {} ; +\end{tikzpicture} +\\ \hline +[\RDD{farad}=5] & [\RDD{coulomb}=5] & [\RDD{voltampere}=5] & [\RDD{watt}=5] & [\RDD{hertz}=5] +\\ \hline +\begin{tikzpicture}[blue] +\draw[help lines,white] (-.5,0) rectangle (2.5,1); +\node [draw,circuit ee IEC] at(1,.5)[ampere=5k]{} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\draw[help lines,white] (-.5,0) rectangle (2.5,1); +\node [draw,circuit ee IEC] at(1,.5) [ampere=5m] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\draw[help lines,white] (-.5,0) rectangle (2.5,1); +\node [draw,circuit ee IEC] at(1,.5) [ampere=5\mu] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\draw[help lines,white] (-.5,0) rectangle (2.5,1); +\node [draw,circuit ee IEC] at(1,.5) [watt=5k] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\draw[help lines,white] (-.5,0) rectangle (2.5,1); +\node [draw,circuit ee IEC] at(1,.5) [watt=5M] {} ; +\end{tikzpicture} +\\ \hline +[ampere=\rouge{5k}] & [ampere=\rouge{5m}] & [ampere=\rouge{5\BS{mu}}] & [watt=\rouge{5k}] & [watt=\rouge{5M}] +\\ \hline +\end{tabular} + +\bigskip + +%\subsection{créer sa propre unité } + +\begin{tabular}{|c|} \hline +\textbf{ \TFRGB{créer sa propre unité}{Declare unit}} \\ +\RRR{47-2-4} +\\ \hline +\BS{tikz}[circuit ee IEC,\RDD{circuit declare unit}=\AC{{\color{blue} xxx}}\AC{ Unit}] \\ +\BS{draw} (0,0) to[resistor=\AC{{\color{blue} xxx}' sloped=3}] (3,2) to [resistor=\AC{{\color{blue} xxx}= 10\BS{mu}}] (5,2) to [resistor=\AC{{\color{blue} xxx}= 10M}] (7,0); +\\ \hline +%\begin{tikzpicture}[circuit ee IEC,circuit declare unit={XXX}{ Unit}] +\tikz[circuit ee IEC,circuit declare unit={XXX}{ Unit}] +\draw (0,0) to[resistor={XXX' sloped=3}] (3,2) to [resistor={XXX= 10\mu}] (5,2) to [resistor={XXX= 10M}] (7,0); +%\end{tikzpicture} +\\ \hline +\end{tabular} + +\bigskip +%\subsection{Annotations} + +%\begin{center} +%\RRR{47-4-7} +%\end{center} + +\begin{tabular}{|c|c|c|c|} \hline +\multicolumn{4}{|c|}{ \textbf{\TFRGB{Annotations}{Annotations}} } \\ +\multicolumn{4}{|c|}{\RRR{47-4-7}} +\\ \hline +\multicolumn{4}{|c|}{\BS{draw} [circuit ee IEC] (0,0.5) to [resistor=\RDD{light emitting}] (2,0.5) ; }\\ +\hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [resistor=light emitting] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [resistor=light dependent] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [resistor=direction info] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [resistor=adjustable] (2,.5) ; +\end{tikzpicture} +\\ \hline +[resistor=\RDD{light emitting}] & [resistor=\RDD{light dependent}] & [resistor=\RDD{direction info}] & [resistor=\RDD{adjustable}] +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [diode=light emitting] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [diode=light dependent] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [diode=direction info] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [diode=adjustable] (2,.5) ; +\end{tikzpicture} +\\ \hline +[diode=\RDD{light emitting}] & [diode=\RDD{light dependent}] & [diode=\RDD{direction info}] & [diode=\RDD{adjustable}] +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [diode=light emitting'] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [diode=light dependent'] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [diode=direction info'] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\draw[help lines,white] (-.5,0) rectangle (2.5,1); +\draw [circuit ee IEC] (0,.5) to [diode=adjustable'] (2,.5) ; +\end{tikzpicture} +\\ \hline +[diode=\RDD{light emitting'}] & [diode=\RDD{light dependent'}] & [diode=\RDD{direction info'}] & [diode=\RDD{adjustable'}] +\\ \hline +\end{tabular} + + + +\bigskip + +%\subsection{Position} +% +%\begin{center} +%\RRR{47-2-4} +%\end{center} + +\begin{tabular}{|c|c|} \hline +\multicolumn{2}{|c|}{ \textbf{\TFRGB{Position des unités}{Units position}} } \\ +\multicolumn{2}{|c|}{ \RRR{47-2-4}} +\\ \hline +\multicolumn{2}{|c|}{\BS{draw} [circuit ee IEC] (0,0) to [capacitor=\AC{farad=5\BS{mu}}] (2,2) ; }\\ +\hline +\begin{tikzpicture}[blue] +\useasboundingbox (0,-.5) rectangle (2,2.5); +\draw [circuit ee IEC] (0,0) to [capacitor={farad=5\mu}] (2,2) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (0,-.5) rectangle (2,2.5); +\draw [circuit ee IEC] (0,0) to [capacitor={farad'=5\mu}] (2,2) ; +\end{tikzpicture} +\\ \hline +[capacitor=\rouge{\AC{farad=5\BS{mu}}}] & [capacitor=\rouge{\AC{farad'=5\BS{mu}}}] +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (0,-.5) rectangle (2,2.5); +\draw [circuit ee IEC] (0,0) to [capacitor={farad sloped=5\mu}] (2,2) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (0,-.5) rectangle (2,2.5); +\draw [circuit ee IEC] (0,0) to [capacitor={farad' sloped=5\mu}] (2,2) ; +\end{tikzpicture} +\\ \hline +[capacitor=\rouge{\AC{farad sloped=5\BS{mu}}}] & [capacitor=\rouge{\AC{farad' sloped=5\BS{mu}}}] +\\ \hline +\end{tabular} + +\bigskip +%\subsection{Info Labels} + +\begin{tabular}{|c|c|c|} \hline +\multicolumn{3}{|c|}{ \textbf{ \TFRGB{Informations}{Info Labels}} }\\ +\multicolumn{3}{|c|}{ \RRR{47-2-4} }\\ +\hline + +\multicolumn{3}{|c|}{\BS{draw} [circuit ee IEC] (0,0.5) to [diode=\AC{light emitting=\AC{\RDD{info}=D1}}] (2,0.5) ; }\\ +\hline + +\begin{tikzpicture}[blue] +\useasboundingbox (0,-1) rectangle (2,2); +\draw [circuit ee IEC] (0,.5) to [diode={light emitting={info=D1}} ] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (0,-1) rectangle (2,2); +\draw [circuit ee IEC] (0,.5) to [diode={light emitting={info'=D2}}] (2,.5) ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (0,-1) rectangle (2,2); +\draw [circuit ee IEC] (0,.5) to [diode={light emitting,info'=D3}] (2,.5) ; +\end{tikzpicture} +\\ \hline +[diode=\AC{light emitting=\AC{\RDD{info}=D1}} ] & +[diode=\AC{light emitting=\AC{\RDD{info'}=D2}} ] & +[diode=\AC{light emitting,\RDD{info'}=D3}] +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\TFRGB{sur un noeud}{On a node} & \TFRGB{sur un chemin}{On a path} + +\\ \hline +\begin{tikzpicture}[blue] +\node[circuit ee IEC] at (1,.5) [resistor,info=$3\Omega$,info'=R1] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\draw [circuit ee IEC] (0,.5) to [resistor={info=$3\Omega$,info'=R1}] (2,.5) ; +\end{tikzpicture} +\\ \hline +[resistor,\RDD{info}=\$3\BS{Omega}\$,\RDD{info'}=R1] &[resistor=\AC{\RDD{info}=\$3\BS{Omega}\$,\RDD{info'}=R1}] +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture}[blue,circuit ee IEC] +\node [resistor,info=center:$3\Omega$] {}; +\end{tikzpicture} +& +\begin{tikzpicture}[blue,circuit ee IEC] +\node [resistor,point up,info=center:$3\Omega$] {}; +%\node [resistor,point up,info=center:$R_1$] ; +\end{tikzpicture} +\\ \hline [resistor,point up,info=\RDD{center}:\$3\BS{Omega}\$] & +[resistor,point up,info=\RDD{center}:\$3\BS{Omega}\$] \\ +\hline +\end{tabular} + + +\bigskip + + + +\begin{tabular}{|c|c||c|c|} \hline +\multicolumn{2}{|c||}{ \BS{node} [voltage source,\RDD{direction info}=\AC{volt=10}] \AC{} } & \multicolumn{2}{|c|}{ \BS{node} [voltage source,\RDD{direction info'}=\AC{volt=10}] \AC{}} +\\ \hline +\begin{tikzpicture}[blue,circuit ee IEC] +\useasboundingbox (-2,-1.2) grid (2,1.2); +\node [voltage source,direction info={volt=10}] {}; +\end{tikzpicture} +& +\begin{tikzpicture}[blue,circuit ee IEC] +\useasboundingbox (-2,-1.2) grid (2,1.2); +\node [voltage source,direction info={->,volt'=10}] {}; +\end{tikzpicture} +& +\begin{tikzpicture}[blue,circuit ee IEC] +\useasboundingbox (-2,-1.2) grid (2,1.2); +\node [voltage source,direction info'={volt=10}] {}; +\end{tikzpicture} +& +\begin{tikzpicture}[blue,circuit ee IEC] +\useasboundingbox (-2,-1.2) grid (2,1.2); +\node [voltage source,direction info'={volt'=10}] {}; +\end{tikzpicture} +\\ \hline +\AC{volt=10} & \AC{volt'=10} & \AC{volt=10}& \AC{volt'=10} \\ +\TFRGB{ou}{or} \AC{->,volt=10} & \TFRGB{ou}{or} \AC{->,volt'=10} &\TFRGB{ou}{or} \AC{->,volt=10} & \TFRGB{ou}{or} \AC{->,volt'=10} +\\ \hline +\begin{tikzpicture}[blue,circuit ee IEC] +\useasboundingbox (-2,-1.2) grid (2,1.2); +\node [voltage source,direction info={<-,volt=10}] {}; +\end{tikzpicture} +& +\begin{tikzpicture}[blue,circuit ee IEC] +\useasboundingbox (-2,-1.2) grid (2,1.2); +\node [voltage source,direction info'={<-,volt=10}] {}; +\end{tikzpicture} +& +\begin{tikzpicture}[blue,circuit ee IEC] +\useasboundingbox (-2,-1.2) grid (2,1.2); +\node [voltage source,direction info'={<-,volt=10}] {}; +\end{tikzpicture} +& +\begin{tikzpicture}[blue,circuit ee IEC] +\useasboundingbox (-2,-1.2) grid (2,1.2); +\node [voltage source,direction info'={<-,volt'=10}] {}; +\end{tikzpicture} +\\ \hline +\AC{<-,volt=10} & \AC{<-,volt=10} & \AC{<-,volt=10} & \AC{<-,volt'=10}\\ +\hline +\end{tabular} + + +%=================== +\bigskip + +\begin{tabular}{|c|c|}\hline +\multicolumn{2}{|c|}{ \textbf{\TFRGB{Créer sa propre annotation}{Declare annotation}} } \\ +\multicolumn{2}{|c|}{ \RRR{47-2-5} } +\\ \hline +\tikzset{circuit declare annotation={XXX}{9pt} +{ (-0.5cm,0.5cm) edge[to path={- -(0pt,2pt) - - (8pt,8pt)}] ()} } + +\tikz[blue,circuit ee IEC] +\draw (0,0) to [resistor={XXX}] (3,0); +& +\parbox[b]{12cm}{ +\BS{tikzset}\AC{circuit \RDD{declare annotation}=\AC{\blll{XXX}}\AC{9pt} \\ +\hspace{1cm} \AC{ (-0.5cm,0.5cm) edge[to path=\AC{- -(0pt,2pt) - - (8pt,8pt)}] ()} } \\ +\BS{tikz}[blue,circuit ee IEC] +\BS{draw} (0,0) to [resistor={\blll{XXX}}] (3,0); +} +\\ \hline +\tikzset{circuit declare annotation={xxx}{9pt} +{ (-.5cm,.5cm) edge[to path={--(0pt,2pt) -- (8pt,8pt)}] ()} } + +\tikz[circuit ee IEC] +\draw (0,0) to [resistor={xxx={info=abc}}] (3,0); +& +\parbox[b]{12cm}{ +\BS{tikzset}\AC{circuit declare annotation=\AC{xxx}\{ \rouge{9pt} \} \}\\ +\hspace{1cm} \AC{ (-0.5cm,0.5cm) edge[to path=\AC{- -(0pt,2pt) - - (8pt,8pt)}] ()} } \\ +\BS{tikz}[blue,circuit ee IEC] +\BS{draw} (0,0) to [resistor=\AC{xxx\blll{=\AC{info=abc}}}] (3,0); +} +\\ \hline +\tikzset{circuit declare annotation={xxx}{1cm} +{ (-.5,.5) edge[to path={--(0pt,2pt) -- (8pt,8pt)}] ()} } + + +\tikz[circuit ee IEC] +\draw (0,0) to [resistor={xxx={info=abc}}] (3,0); +& +\parbox[b]{12cm}{ +\BS{tikzset}\{circuit declare annotation=\AC{xxx}\{\rouge{1cm} \} \} \\ +\hspace{1cm} \AC{ (-0.5,0.5) edge[to path=\AC{- -(0pt,2pt) - - (8pt,8pt)}] ()} \} \\ +\BS{tikz}[blue,circuit ee IEC] +\BS{draw} (0,0) to [resistor=\AC{xxx\blll{=\AC{info=abc}}}] (3,0); +} +\\ \hline +\end{tabular} + + +\bigskip +%47.2.6 Theming Symbols + +\begin{tabular}{|c|}\hline +\textbf{ \TFRGB{Style des symboles}{Theming Symbols +}}\\ + \RRR{47-2-6} + +\\ \hline +\BS{draw}[\RDD{circuit symbol lines/.style}=\AC{draw,red,very thick}] (0,0) \\to [capacitor=\AC{near start},resistor, +make contact=\AC{near end}] (5,0); +\\ \hline +\begin{tikzpicture}[blue,circuit ee IEC] +\useasboundingbox (-1,-1) rectangle (6,1); +\draw[circuit symbol lines/.style={draw,red,very thick}] (0,0) to [capacitor={near start},resistor, +make contact={near end}] (5,0); +\end{tikzpicture} + \\ \hline + +\hline +\BS{draw}[\RDD{circuit symbol wires/.style}=\AC{draw,red,very thick}] (0,0) \\to [capacitor=\AC{near start},resistor, +make contact=\AC{near end}] (5,0); +\\ \hline +\begin{tikzpicture}[blue,circuit ee IEC] +\useasboundingbox (-1,-1) rectangle (6,1); +\draw[circuit symbol wires/.style={draw,red,very thick}] (0,0) to [capacitor={near start},resistor, +make contact={near end}] (5,0); +\end{tikzpicture} + \\ \hline + +\hline +\BS{draw}[\RDD{circuit symbol open/.style}=\AC{thick,draw,red,fill=yellow}] (0,0) \\to [capacitor=\AC{near start},resistor, +make contact=\AC{near end}] (5,0); +\\ \hline +\begin{tikzpicture}[blue,circuit ee IEC] +\useasboundingbox (-1,-1) rectangle (6,1); +\draw[circuit symbol open/.style={thick,draw,red,fill=yellow}] (0,0) to [capacitor={near start},resistor, +make contact={near end}] (5,0); +\end{tikzpicture} + \\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\multicolumn{2}{|l|}{\BS{tikz}[blue,circuit ee IEC,\RDD{every info/.style}=red] }\\ +\multicolumn{2}{|l|}{\BS{draw} (0,0) to[resistor=\AC{info=\AC{\$3\BS{Omega}\$},info'=\AC{\$R\_1\$}}] (3,0) }\\ +\multicolumn{2}{|l|}{to[resistor=\AC{info=\{\$4\BS{Omega}\$\},info'=\AC{\$R\_2\$}}] (3,2); }\\ +\hline + +\tikz[blue,circuit ee IEC,every info/.style=red] +\draw (0,0) to[resistor={info={$3\Omega$},info'={$R_1$}}] (3,0) +to[resistor={info={$4\Omega$},info'={$R_2$}}] (3,2); + +& +\tikz[blue,circuit ee IEC,every info/.style={font=\tiny}] +\draw (0,0) to[resistor={info={$3\Omega$},info'={$R_1$}}] (3,0) +to[resistor={info={$4\Omega$},info'={$R_2$}}] (3,2); +\\ \hline +\RDD{every info/.style}=red +& +\RDD{every info/.style}=\AC{font=\BS{tiny}} +\\ \hline +\end{tabular} + + + + + +\bigskip +%\subsection{Example} + +\SbSSCT{Exemple}{Example} + +\begin{tabular}{|c|c|} \hline +\multicolumn{2}{|c|}{ \textbf{\TFRGB{3 méthodes pour le même schéma}{3 methods for the same circuit}} } +\\ \hline +\begin{tikzpicture}[blue,circuit ee IEC,baseline=0pt] +\useasboundingbox (-1,-1) rectangle (3,3); +\draw (0,0) to [voltage source={direction info={->,volt=10}}] (0,2) to [resistor={info=center:$3 k\Omega$}] (2,2) to [diode=light emitting] ( 2,0) to [make contact] (0,0); +\end{tikzpicture} +& +\parbox[b]{10cm}{ +\BS{begin}\AC{tikzpicture}[blue,circuit ee IEC] \\ +\BS{draw} (0,0) \\ +to [voltage source=\AC{direction info=\AC{->,volt=10}}] (0,2) \\ +to [resistor=\AC{info=center:\$3 k\BS{Omega}\$}] (2,2) \\ +to [diode=light emitting] ( 2,0) \\ +to [make contact] (0,0); \\ +\BS{end}\AC{tikzpicture} + +} +\\ \hline +\begin{tikzpicture}[blue,circuit ee IEC,baseline=0pt] +\useasboundingbox (-1,-1) rectangle (3,3); +\draw (0,0) to [voltage source={direction info={->,volt=10}}] ++(up:2) +to [resistor={info=center:$ 3 k\Omega$}] ++(right:2) + to [diode=light emitting] ++(down:2) + to [make contact] ++(left:2) ; +%\node at (0,1) [volt=10,point up] {}; +%\node at (1,2) [ohm=10k] {}; +\end{tikzpicture} +& +\parbox[b]{10cm}{ +\BS{begin}\AC{tikzpicture}[blue,circuit ee IEC] \\ +\BS{draw} (0,0) to [voltage source=\AC{direction info=\AC{->,volt=10}}] ++(up:2) \\ +to [resistor=\AC{info=center:\$ 3 k\BS{Omega}\$}] ++(right:2) \\ +to [diode=light emitting] ++(down:2) \\ +to [make contact] ++(left:2) ; \\ +%\BS{node} at (0,1) [volt=10,point up] \AC{}; \\ +%\BS{node} at (1,2) [ohm=10k] \AC{}; \\ +\BS{end}\AC{tikzpicture} + +} +\\ \hline +\begin{tikzpicture}[blue,circuit ee IEC] +\useasboundingbox (-1,-1) rectangle (3,3); +\node (A) at (0,1) [voltage source,point up,volt=10]{} ; +\node (B) at (1,2) [resistor,ohm=10k] {}; +\node(C) at (2,1) [diode=light emitting,point down] {} ; +\node (D) at ( 1,0) [make contact] {}; +\draw (A) |- (B) -| (C) |- (D) -| (A); +\end{tikzpicture} +& +\parbox[b]{10cm}{ +\BS{begin}\AC{tikzpicture}[blue,circuit ee IEC] \\ +\BS{node} (A) at (0,1) [voltage source,point up,volt=10]\AC{}; \\ +\BS{node} (B) at (1,2) [resistor,ohm=10k] \AC{}; \\ +\BS{node} (C) at (2,1) [diode=light emitting,point down] \AC{} ; \\ +\BS{node} (D) at ( 1,0) [make contact] \AC{}; \\ +\BS{draw} (A) |- (B) -| (C) |- (D) -| (A); \\ +\BS{end}\AC{tikzpicture} +} +\\ \hline +\end{tabular} + + + + + + + + + + diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzfig.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzfig.tex index 5517cec4ebf..2d0a19cf11b 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzfig.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzfig.tex @@ -18,6 +18,8 @@ \bigskip +\bigskip + %\subsubsection{Avec décalage } \SbSbSSCT{Avec décalage}{With an offset} @@ -75,6 +77,7 @@ \end{tabular} \bigskip +\noindent \begin{tabular}{|l|l|} \hline \TFRGB{texte avant}{text before} @@ -95,14 +98,19 @@ \\ \hline \end{tabular} + + + %\subsection{Dans un environnement fbox} \SbSSCT{Dans un environnement fbox}{In a fbox environment} +\noindent \begin{tabular}{|l|l|} \hline \TFRGB{texte avant}{text before} \fbox{ \begin{tikzpicture}[blue,baseline=0pt] + \draw (0,0) rectangle(2,2); \draw (0,0) circle (1); \end{tikzpicture}} @@ -124,6 +132,12 @@ %\subsection{Modification du cadrage} \SbSSCT{Modification du cadrage}{Bounding box} +\begin{center} +\RRR{15-8} +\end{center} + +\bigskip + \begin{tabular}{|c|c|} \hline \multicolumn{2}{|l|}{\BS{draw} [\RDD{use as bounding box}] (1,0) rectangle (2,1);}\\ \multicolumn{2}{|l|}{\BS{draw}[blue] (-1,0) - - (3,1);} \\\hline @@ -173,8 +187,105 @@ texte après \\ \hline \end{tabular} +%\SbSSCT{Tracer les limites du dessin}{Drawing the bounding box} -\SbSSCT{Coupure de l'image}{Clipping the picture} + + +\bigskip + +\begin{tabular}{|l|l|} \hline +\TFRGB{texte avant}{text before} +\begin{tikzpicture}[blue] +\draw [red,use as bounding box] (-1.5,-1.5) rectangle (2.5,2.5); +\draw (0,0) rectangle(2,2); + \draw (0,0) circle (1); +\end{tikzpicture} +\TFRGB{texte après}{text after} +& +\parbox[b]{10cm}{ +\TFRGB{texte avant}{text before} \\ +\ESS{begin\AC{tikzpicture}}[blue] \\ +\BS{draw} [red,\RDD{use as bounding box}] (-1.5,-1.5) rectangle (2.5,2.5); \\ +\BS{draw} (0,0) rectangle(2,2); \\ +\BS{draw} (0,0) circle (1); \\ +\ESS{end\AC{tikzpicture}}\\ +\TFRGB{texte après}{text after} \\ +} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|l|l|} \hline +\TFRGB{texte avant}{text before} +\begin{tikzpicture}[blue,baseline=0pt] +\draw [red,use as bounding box] (-1.5,-1.5) rectangle (2.5,2.5); +\draw (0,0) rectangle(2,2); + \draw (0,0) circle (1); +\end{tikzpicture} +\TFRGB{texte après}{text after} +& +\parbox[c]{10cm}{ +\TFRGB{texte avant}{text before} \\ +\BS{begin}\AC{tikzpicture}[blue,\RDD{baseline}=0pt] \\ +\BS{draw} [red,\RDD{use as bounding box}] (-1.5,-1.5) rectangle (2.5,2.5);\\ +\BS{draw} (0,0) rectangle(2,2); \\ +\BS{draw} (0,0) circle (1); \\ +\BS{end}\AC{tikzpicture} \\ +\TFRGB{texte après}{text after} \\ +} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|l|l|} \hline +\TFRGB{texte avant}{text before} +\begin{tikzpicture}[blue,baseline=0pt] +\useasboundingbox (-1.5,-1.5) rectangle (2.5,2.5); +\draw (0,0) rectangle(2,2); + \draw (0,0) circle (1); +\end{tikzpicture} +\TFRGB{texte après}{text after} +& +\parbox[c]{10cm}{ +\TFRGB{texte avant}{text before} \\ +\BS{begin}\AC{tikzpicture}[blue,baseline=0pt] \\ +\BSS{useasboundingbox} (-1.5,-1.5) rectangle (2.5,2.5);\\ +\BS{draw} (0,0) rectangle(2,2); \\ +\BS{draw} (0,0) circle (1); \\ +\BS{end}\AC{tikzpicture} \\ +\TFRGB{texte après}{text after} \\ +} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture}[blue,baseline=0pt] +\fill (0,0) circle (5pt); +\fill (2,1) circle (5pt); +\draw[red] (current bounding box.south west) rectangle +(current bounding box.north east); +\end{tikzpicture} +& +\parbox[c]{14cm}{ +\BS{begin}\AC{tikzpicture}[blue] \\ +\BS{fill} (0,0) circle (5pt); \\ +\BS{fill} (2,1) circle (5pt);\\ +\BS{draw}[red] (\RDD{current bounding box.south west}) rectangle +(\RDD{current bounding box.north east});\\ +\BS{end}\AC{tikzpicture} +} +\\ \hline +\end{tabular} +\newpage +\SbSSCT{Coupure de l'image}{Clipping the picture} + +\begin{center} +\RRR{15-9} +\end{center} \begin{tabular}{|c|c|} \hline \tikzpicture[red] @@ -201,10 +312,12 @@ texte après \end{tabular} + \SbSSCT{Rognage partiel}{ Partial clipping} -\begin{tabular}{|c|c|} \hline - +\noindent + +\begin{tabular}{|c|c|} \hline \tikzpicture[red,scale=.7,baseline=0pt] \draw[help lines] (-2,-2) grid (2,2); \draw[blue] (-1.1,-0.2) rectangle (2,1.5); @@ -229,6 +342,8 @@ texte après %\subsubsection{Changement d'échelle} \SbSbSSCT{Changement d'échelle}{Scaling} +\noindent + \begin{tabular}{|c|c|} \hline \tikzpicture[blue] \draw[help lines] (-2,-2) grid (2,2); diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph2.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph2.tex index cc3a5d657fb..326e001e66b 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph2.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph2.tex @@ -79,7 +79,7 @@ & \begin{tikzpicture}[scale=.5] \begin{semilogxaxis} -\addplot {x^2 - x +4}; +\addplot[domain=1:3] {x^2 - x +4}; \end{semilogxaxis} \end{tikzpicture} & diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzmerci.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzmerci.tex index 8efa898ee25..11731facd1b 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzmerci.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzmerci.tex @@ -7,3 +7,5 @@ Alain Matthes Jim Diamond Falk Rühl + +Axel Kielhorn diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkznoeud1.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkznoeud1.tex index c36ed420692..e2b727919e5 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkznoeud1.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkznoeud1.tex @@ -241,8 +241,11 @@ controls +(D) \end{tabular} \bigskip -\begin{tabular}{|c|c|c|} \hline -\multicolumn{3}{|c|}{ \BS{node}[draw] (B) at (2,2) \AC{B} \RDD{edge} [->] (A); }\\ +\begin{tabular}{|c|c|c|} \hline +\multicolumn{3}{|l|}{ \BS{node}[draw] (A) at (0,0) \AC{A} }\\ + +\multicolumn{3}{|l|}{ \BS{node}[draw] (B) at (2,2) \AC{B} \RDD{edge} [->] (A); }\\ +\multicolumn{3}{|c|}{\RRR{17-12-1}} \\ \hline \begin{tikzpicture} \node[draw] (A) at (0,0) {A}; @@ -525,3 +528,87 @@ controls +(D) \\ \hline \end{tabular} +\SbSSCT{ N\oe uds sur un \og edge\fg}{Nodes on an edge} + +\begin{tabular}{|c|c|c|}\hline +\multicolumn{3}{|c|}{ \BS{draw}(0,0) edge \BDD{["abc", ->]} (4,0); }\\ +\multicolumn{3}{|c|}{ \RRR{17-12-2} }\\ +\hline +\begin{tikzpicture}[blue] +\useasboundingbox (0,-.5) rectangle (4,.5); +\draw (0,0) edge ["abc", ->] (4,0); +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (0,-.5) rectangle (4,.5); +\draw (0,0) edge ["abc", near start] (4,0); +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (0,-.5) rectangle (4,.5); +\draw (0,0) edge ["abc", style={auto=right}] (4,0); +\end{tikzpicture} +\\ \hline +["abc", ->] +& +["abc", near start] & ["abc", style=\AC{auto=right}] +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (0,-.5) rectangle (4,.5); +\draw (0,0) edge [font=\Large,"abc" ] (4,0); +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (0,-.5) rectangle (4,.5); +\draw (0,0) edge ["abc" color=red ] (4,0); +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (0,-.5) rectangle (4,.5); + \draw (0,0) edge ["abc" '] (4,0); +\end{tikzpicture} +\\ \hline +[font=\BS{Large},"abc" ] & ["abc" color=red ] +&["abc" ' ] +\\ \hline + +\begin{tikzpicture}[blue] +\useasboundingbox (0,-.5) rectangle (4,.75); +\draw (0,0) edge ["abc" draw ] (4,0); +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (0,-.5) rectangle (4,.5); +\draw (0,0) edge ["abc" inner sep=0pt ] (4,0); +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (0,-.5) rectangle (4,.5); +\draw (0,0) edge ["abc" fill ,fill=yellow ] (4,0); +\end{tikzpicture} +\\ \hline +["abc" draw ] +& +["abc" inner sep=0pt ] +& +["abc" fill ,fill=yellow ] +\\ \hline +\end{tabular} + + + +\bigskip + +\begin{tabular}{|c|} \hline +\BS{draw}[every edge quotes/.style=\AC{fill=yellow}] (0,0) edge ["abc"] (4,0); +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (0,-.5) rectangle (4,.5); + \draw[every edge quotes/.style={fill=yellow}] (0,0) edge ["abc"] (4,0); +\end{tikzpicture} +\\ \hline +\end{tabular} + + + + diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkztitre.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkztitre.tex index 327dddf1272..f3b7a84d9bd 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkztitre.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkztitre.tex @@ -5,7 +5,7 @@ \DeclareFixedFont{\RMM}{T1}{ptm}{b}{n}{1cm} -\title{ {\RM Visual TikZ} \\ \vspace{1cm} {\RMM Version 0.62} } +\title{ {\RM Visual TikZ} \\ \vspace{1cm} {\RMM Version 0.63} } diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/versFR.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/versFR.tex index cc11a9a0da7..c39c291e119 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/versFR.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/versFR.tex @@ -12,4 +12,7 @@ -\newcommand{\maboite}[1]{\begin{center} \tikz \draw node[draw,fill=yellow!20,inner sep=0.2cm,text centered,text width=.75\linewidth] {Charger l'extension: #1} ; \end{center} } \ No newline at end of file +\newcommand{\maboite}[1]{\begin{center} \tikz \draw node[draw,fill=yellow!20,inner sep=0.2cm,text centered,text width=.75\linewidth] {Charger l'extension: #1} ; \end{center} } + + +\newcommand{\DW}[1]{\tikz[baseline=-1mm] \draw node[draw,fill=red!50] {{\tiny ne fonctionne pas !}}; \index{\textbf{6 liste des non fonctionnels }}} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/versGB.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/versGB.tex index 2cb44061384..dd3afddee73 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/versGB.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/versGB.tex @@ -11,3 +11,7 @@ \newcommand{\SbSbSSCTTC}[4]{ \subsubsection[#3]{#4}} \newcommand{\maboite}[1]{\begin{center} \tikz \draw node[draw,fill=yellow!20,inner sep=0.2cm,text centered,text width=.75\linewidth] {Load package : #1} ; \end{center} } + +%\newcommand{\DW}[1]{\begin{center} \tikz \draw node[draw,fill=red!50,inner sep=0.1cm,text centered] {\tiny don't work !} ; \end{center} } + +\newcommand{\DW}[1]{\tikz[baseline=-1mm] \draw node[draw,fill=red!50] {{\tiny don't work !}}; \index{\textbf{6 list of don't work }}} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ-fr.pdf b/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ-fr.pdf index 5cd6c3f6d86..9fa13c45a33 100644 Binary files a/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ-fr.pdf and b/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ-fr.pdf differ diff --git a/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ.pdf b/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ.pdf index e46d1286e67..9db8aadde78 100644 Binary files a/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ.pdf and b/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ.pdf differ -- cgit v1.2.3