From 62ce40f4ecfe95d2385f09e2914c41091196b80d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 14 Feb 2017 22:29:54 +0000 Subject: visualtikz (14feb17) git-svn-id: svn://tug.org/texlive/trunk@43227 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/visualtikz/README.txt | 2 +- .../doc/latex/visualtikz/Source/VTKZ.synctex.gz | Bin 65568 -> 66185 bytes .../doc/latex/visualtikz/Source/VTKZ.tex | 425 +----- .../visualtikz/Source/VisualTikZ-fr.synctex.gz | Bin 1227494 -> 1469632 bytes .../doc/latex/visualtikz/Source/VisualTikZ-fr.tex | 330 +---- .../latex/visualtikz/Source/VisualTikZ.synctex.gz | Bin 1225701 -> 1464612 bytes .../doc/latex/visualtikz/Source/VisualTikZ.tex | 10 +- .../doc/latex/visualtikz/Source/bibtkz.tex | 101 +- .../doc/latex/visualtikz/Source/table3X.dat | 6 + .../doc/latex/visualtikz/Source/test.pdf | Bin 127725 -> 74023 bytes .../doc/latex/visualtikz/Source/test.synctex.gz | Bin 98963 -> 69443 bytes .../doc/latex/visualtikz/Source/test.tex | 179 ++- .../doc/latex/visualtikz/Source/tikzdebut.tex | 62 +- .../doc/latex/visualtikz/Source/tkz1.tex | 10 +- .../doc/latex/visualtikz/Source/tkz3a.tex | 58 +- .../doc/latex/visualtikz/Source/tkzanim.tex | 6 +- .../doc/latex/visualtikz/Source/tkzcoord.tex | 11 +- .../doc/latex/visualtikz/Source/tkzcoul.tex | 8 +- .../doc/latex/visualtikz/Source/tkzdeco.tex | 224 ++-- .../doc/latex/visualtikz/Source/tkzdepend.tex | 64 + .../doc/latex/visualtikz/Source/tkzelect.tex | 6 +- .../doc/latex/visualtikz/Source/tkzfig.tex | 8 +- .../doc/latex/visualtikz/Source/tkzgate.tex | 404 ++++++ .../doc/latex/visualtikz/Source/tkzgraph1.tex | 22 +- .../doc/latex/visualtikz/Source/tkzgraph2.tex | 22 +- .../doc/latex/visualtikz/Source/tkzgraph3D.tex | 30 +- .../doc/latex/visualtikz/Source/tkzmerci.tex | 4 + .../doc/latex/visualtikz/Source/tkznoeud1.tex | 6 +- .../doc/latex/visualtikz/Source/tkzoptic.tex | 1361 ++++++++++++++++++++ .../doc/latex/visualtikz/Source/tkzpeople.tex | 530 ++++++++ .../doc/latex/visualtikz/Source/tkzscope.tex | 8 +- .../doc/latex/visualtikz/Source/tkzstyl.tex | 8 +- .../doc/latex/visualtikz/Source/tkztab.tex | 4 +- .../doc/latex/visualtikz/Source/tkztitre.tex | 26 +- .../doc/latex/visualtikz/Source/tkztree.tex | 26 +- .../doc/latex/visualtikz/Source/versFR.tex | 4 +- .../doc/latex/visualtikz/VisualTikZ-fr.pdf | Bin 2438817 -> 2768262 bytes .../texmf-dist/doc/latex/visualtikz/VisualTikZ.pdf | Bin 2432602 -> 2760078 bytes 38 files changed, 2965 insertions(+), 1000 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/visualtikz/Source/table3X.dat create mode 100644 Master/texmf-dist/doc/latex/visualtikz/Source/tkzdepend.tex create mode 100644 Master/texmf-dist/doc/latex/visualtikz/Source/tkzgate.tex create mode 100644 Master/texmf-dist/doc/latex/visualtikz/Source/tkzoptic.tex create mode 100644 Master/texmf-dist/doc/latex/visualtikz/Source/tkzpeople.tex (limited to 'Master/texmf-dist/doc/latex/visualtikz') diff --git a/Master/texmf-dist/doc/latex/visualtikz/README.txt b/Master/texmf-dist/doc/latex/visualtikz/README.txt index 3e76cdce5b7..94883515589 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/README.txt +++ b/Master/texmf-dist/doc/latex/visualtikz/README.txt @@ -4,7 +4,7 @@ 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 translation in english) +The basic document for the english version is :"VisualTikZ.tex" [The translation in english) Complilation method : LuaLaTeX. diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.synctex.gz b/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.synctex.gz index 5798496cdaa..739b37e14fc 100644 Binary files a/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.synctex.gz 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 95ddf4b1e20..0f2270896d5 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.tex @@ -1,8 +1,6 @@ -% \input{tikzdebut} +% % -% -% \begin{document} -%% \newrgbcolor{Vert}{0 .8 0} + \input{tkztitre} @@ -20,6 +18,11 @@ \newpage %\section{Les figures de base} + +\SSCT{Chargement de TikZ}{Tikz loading} + +\maboite{\BS{usepackage}\AC{tikz} } + \SSCT{Les figures de base}{Basic figures} \input{tkz1} @@ -72,14 +75,14 @@ \newpage %%%====================================================== -%\section[Constructions particulières]{Constructions particulières } + \SSCT{Constructions particulières }{Transformations} % \input{tkz4} \newpage -%\section{Placer son dessin} + \SSCT{Placer son dessin}{Placing the picture} % \input{tkzfig} @@ -92,15 +95,13 @@ \newpage - -%\section{Position absolue sur une page} + \SSCT{Position absolue sur une page}{Absolute position on a page} - \input{tkzpage} +\input{tkzpage} \newpage -%\section{Arrière plan du dessin} \SSCT{Arrière plan du dessin}{Background} \input{tkzbackground} @@ -115,7 +116,7 @@ %%\newpage %% %%%=================================================== -%\section{Créer ses couleurs} + \SSCT{Créer ses couleurs}{Defining your own colors} \input{tkzcoul} @@ -131,12 +132,11 @@ \newpage -%\section[Créer ses styles]{Créer ses styles} \SSCT{Créer ses styles}{Creating styles} \input{tkzstyl} -%%%%%%%====================================================================== +%%%%%%%====================================================== \newpage @@ -149,9 +149,10 @@ \section{Decorations} - \input{tkzdeco} -% -% ====================================================================== +\input{tkzdeco} + +%========================================================= + \newpage %\section{Insertion images dans un environnement TikZ} @@ -213,11 +214,16 @@ %%\newpage %% %%% ======================================================================== -%%\section[Effets spéciaux avec du texte ]{Effets spéciaux avec du texte \cite{pst-user} \cite{pst-text}} -% -% -%\newpage -%%% % % % %====================================================================== +%\section[Effets spéciaux avec du texte ]{Effets spéciaux avec du texte \cite{pst-user} \cite{pst-text}} + +\SSCT{Effets spéciaux}{Special effect} + + +\input{tkzpeople} + + +\newpage +%% % % % %====================================================================== %\section[Créer un graphe]{Créer un graphe } \SSCT{Créer un graphe }{Creating Graphs} @@ -324,6 +330,17 @@ \input{tkzelect} + j%\newpage + +\SSCT{Les circuits logiques }{Logical circuits} + +\input{tkzgate} + +\newpage + +\SSCT{Optique }{Optics} + +\input{tkzoptic} \newpage @@ -332,6 +349,8 @@ \input{tkzanim} + +\input{tkztab} %% %%\newpage %% @@ -346,360 +365,28 @@ %% \newpage -%%======================================================================= -%\section{Les modules étudiés dans ce document} + +%%================================================================ + + \SSCT{Les modules étudiés dans ce document}{Packages studied in this document} \input{bibtkz} - \newpage + +%%%XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX \section{Index} -% \printindex -% \setcounter{tocdepth}{4} -% \tableofcontents -% \setcounter{tocdepth}{5} -% \addtolength{\hoffset}{-1.5cm} -% -% \setlength{\topmargin}{0pt} -% \setlength{\headsep}{0pt} -% -% \newpage -% -% %\section{Les figures de base} -% \SSCT{Les figures de base}{Basic figures} -% \input{tkz1} -% -% \newpage -% -% \input{tkz2} -% -% \newpage -% % -% \input{tkz3} -% % -% -% -% \input{tkz3a} -% -% \newpage -% -% %\section{Insertion de petites images} -% \SSCT{Insertion de petites images}{Small pictures} -% \input{tkzpic} -% -% \newpage -% -% \input{tkzangles} -% -% %%%%% % % %=================================== -% -% \newpage -% -% %\section{Les coordonnées } -% \SSCT{Les coordonnées }{Coordinates} -% -% \input{tkzgrid} -% \newpage -% -% \input{tkzcoord} -% % -% %%%%%========================================================== -% -% \newpage -% %\section[Les n\oe uds]{Les n\oe uds } -% \SSCT{Les n\oe uds }{Nodes} -% -% -% \input{tkznoeud1} -% -% \input{tkzfit} -% -% % -% \newpage -% -% %%%====================================================== -% %\section[Constructions particulières]{Constructions particulières } -% \SSCT{Constructions particulières }{Transformations} -% % -% \input{tkz4} -% -% \newpage -% -% %\section{Placer son dessin} -% \SSCT{Placer son dessin}{Placing the picture} -% % -% \input{tkzfig} -% -% \newpage -% -% \section{Scope} -% % -% \input{tkzscope} -% -% \newpage -% -% -% %\section{Position absolue sur une page} -% \SSCT{Position absolue sur une page}{Absolute position on a page} -% -% \input{tkzpage} -% -% \newpage -% -% %\section{Arrière plan du dessin} -% \SSCT{Arrière plan du dessin}{Background} -% -% \input{tkzbackground} -% -% \newpage -% -% %%\section{Placer des objets} -% %% -% %%%\input{plac} -% %% -% % -% %%\newpage -% %% -% %%%=================================================== -% %\section{Créer ses couleurs} -% \SSCT{Créer ses couleurs}{Defining your own colors} -% -% \input{tkzcoul} -% -% -% \newpage -% -% %\sectionCreate {Créer ses commandes} -% \SSCT{Créer ses commandes}{Create command} -% -% \input{tkzcde} -% -% -% \newpage -% -% %\section[Créer ses styles]{Créer ses styles} -% \SSCT{Créer ses styles}{Creating styles} -% -% \input{tkzstyl} -% -% %%%%%%%====================================================================== -% -% \newpage -% -% %\section{Mettre du texte en valeur} -% \SSCT{Mettre du texte en valeur}{Text highlighting} -% -% \input{tkzboit1} -% -% %============\newpage -% -% \section{Decorations} -% -% \input{tkzdeco} -% % -% % ====================================================================== -% \newpage -% -% %\section{Insertion images dans un environnement TikZ} -% \SSCT{Insertion images dans un environnement TikZ}{Pictures in a TikZ picture} -% -% \input{tkzimage} -% -% -% %% -% %%>>>> \section[Mettre des objets en cadre]{Mettre des objets en cadre } -% %% -% % -% %% -% %%\newpage -% %%>>>>> \section[Mettre des objets en bouton]{Mettre des objets en bouton } -% % -% % -% %%%%%%============================================================= -% % -% -% %\section{Des lignes et liaisons spéciales} -% %\subsection[Trait à main levé]{Trait à main levée } -% \SSCT{Trait à main levée }{Freehand drawing} -% -% \input{tkzalea} -% -% %% >>>> \subsection{Tracer avec des symboles} -% % -% %% -% %%\newpage -% -% %%>>>>> \subsection[Les bobines]{Les bobines \cite{pst-user} \cite{pst-coil}} -% %% -% -% %%\newpage -% %% -% %%>>>> \subsection[Les accolades]{Les accolades } -% %% -% % -% %%%%%====================================================================== -% %%\section{Des remplissages spéciaux} -% %%\subsection{Des gradients de couleurs} -% %% -% %%\subsubsection[Module pst-grad]{Module pst-grad \cite{pst-user} \cite{pst-grad}} -% % -% %%% -% %%\newpage -% %%\subsubsection[Module pst-slpe]{Module pst-slpe \cite{pst-slpe}} -% %% -% % -% %% -% %%\newpage -% %%\subsection[Remplissage par des motifs]{Remplissage par des motifs \cite{pst-fill}} -% %% -% % -% %% -% %%\subsection[Remplissage par des points aléatoires]{Remplissage par des points aléatoires \cite{pst-add}} -% % -% %%\newpage -% %% -% %%% ======================================================================== -% %%\section[Effets spéciaux avec du texte ]{Effets spéciaux avec du texte \cite{pst-user} \cite{pst-text}} -% % -% % -% %\newpage -% %%% % % % %====================================================================== -% %\section[Créer un graphe]{Créer un graphe } -% \SSCT{Créer un graphe }{Creating Graphs} -% -% \input{tkzgraph1} -% -% \newpage -% -% \SSCT{Créer un graphe avec pgfplot}{Creation of a graph with pgfplots} -% -% \input{tkzgraph2} % <<<<<<<<<<<<<<<<<<<<<<<<<<<<< -% % -% %\subsection{Ccùourbes 3D} -% \SSCT{Courbes 3D}{3D graph} -% -% \input{tkzgraph3D} % très lourd à compiler -% -% % -% %%% -% %%%\essais{pstgraph2ess.tex} -% %%\newpage -% %%\section[Créer un graphe d'après une équation]{Créer un graphe d'après une équation \cite{pst-user} \cite{pst-plot}} -% %% -% % -% %%% -% %%%\essais{pstgraph3ess.tex} -% %%\newpage -% %% \section[Des outils pour les graphes]{Des outils pour les graphes \cite{pst-add} } -% %% -% % -% %% -% %%\newpage -% %% \section[Créer un graphe en camembert]{Créer un graphe en camembert \cite{pst-add} } -% %% -% %%\input{chart} % camembert -% -% \newpage -% -% %\section{Les Tableaux de variation} -% \SSCT{Les Tableaux de variation}{Table of a function variation } -% -% \input{tkztab} -% -% \newpage -% %%%============================================= -% %\section{Les répétitions} -% \SSCT{Les répétitions}{Repetitions} -% -% -% \input{tkzrep1} % OK -% -% %%\subsection[Commande multido]{Commande multido \cite{pst-user} \cite{multido} } -% %% -% % -% %% -% %%\essais{pstrep2ess.tex} -% %% -% %%\subsection[Commande psforeach]{Commande psforeach \cite{pst-news10} } -% % -% % -% %% -% %%\newpage -% %%% % % %====================================================================== -% %%\section[La géométrie]{La géométrie \cite{pst-eucl} } -% %% -% %%Utilisation du module \textbf{pst-eucl} \label{pst-eucl}(consultez le fichier\textbf{ pst-eucl-doc.pdf} ) -% %% -% %% -% %%\psset{fillcolor=yellow,linecolor=blue,dotscale=2} -% %%\subsection{\'Elements de base} -% %% -% % -% %% -% %%\subsection[Transformations géométriques]{Transformations géométriques \cite{pst-eucl} } -% %% -% %% -% % -% %% -% %% -% %%\subsection[Constructions particulières en géométrie ]{Constructions particulières en géométrie } -% %% -% % -% %% -% %%\subsection[Intersections]{Intersections } -% %% -% % -% %% -% %%%-------------------------------------------------------------- -% %%\section[Les vecteurs]{Les vecteurs } -% %% -% % -% %%%============================================================== -% \newpage -% -% %\section[Les diagrammes arborescents ]{Les diagrammes arborescents } -% \SSCT{Les diagrammes arborescents }{Tree diagram} -% -% -% \input{tkztree} -% -% %%%============================================================== -% \newpage -% -% %\section[Les animations ]{Les animations } -% \SSCT{Les animations }{Animate a TikZ picture} -% -% -% \input{tkzanim} -% %% -% %%\newpage -% %% -% %%\section[Créer un dessin en 3D]{Créer un dessin en 3D } -% % -% -% %%\subsection{Les objets en 3D} -% %% -% -% %%\newpage -% %%\subsection[Créer un graphe en 3D]{Créer un graphe en 3D } -% %% -% -% \newpage -% %%======================================================================= -% %\section{Les modules étudiés dans ce document} -% \SSCT{Les modules étudiés dans ce document}{Packages studied in this document} -% -% \input{bibtkz} -% -% -% -% \newpage - \section{Index} - - \printindex -% - +\begin{enumerate} +\item environnements +\item Commandes +\item paramètres et options +\item Valeurs TikZ +\item Extrémités +\end{enumerate} + +\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 00ef9e08cb6..a3bd46c1dfe 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-fr.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/VisualTikZ-fr.tex index 2bad0b7230c..69d43a8d197 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/VisualTikZ-fr.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/VisualTikZ-fr.tex @@ -1,338 +1,12 @@ \input{versFR} +\input{tikzdebut} +\begin{document} - \input{tikzdebut} - - - \begin{document} -% \newrgbcolor{Vert}{0 .8 0} \selectlanguage{french} \input{VTKZ} -%\input{tkztitre} -% -%%========================================================== -% -%\setcounter{tocdepth}{4} -% \tableofcontents -% \setcounter{tocdepth}{5} -%\addtolength{\hoffset}{-1.5cm} -% -%\setlength{\topmargin}{0pt} -%\setlength{\headsep}{0pt} -% -% \newpage -% -%\section{Les figures de base} -% -%\input{tkz1} -% -%\newpage -% -%\input{tkz2} -% -%\newpage -%% -%\input{tkz3} -%% -% -% -%\input{tkz3a} -% -%\newpage -% -%\section{Insertion de petites images} -% -%\input{tkzpic} -% -%\newpage -% -%\input{tkzangles} -% -%%%%%% % % %=================================== -% -%\newpage -% -%\section{Les coordonnées } -% -%\input{tkzgrid} -%\newpage -% -%\input{tkzcoord} -%% -%%%%%%========================================================== -% -%\newpage -%\section[Les n\oe uds]{Les n\oe uds } -% -%\input{tkznoeud1} -%% -%\newpage -% -%%%%====================================================== -%\section[Constructions particulières]{Constructions particulières } -%% -%\input{tkz4} -% -%\newpage -% -%\section{Placer son dessin} -%% -%\input{tkzfig} -% -%\newpage -% -%\section{Scope} -%% -%\input{tkzscope} -%à -%\newpage -% -%\section{Position absolue sur une page} -% -% \input{tkzpage} -% -%\newpage -% -%\section{Arrière plan du dessin} -% -% \input{tkzbackground} -% -%\newpage -% -%%%\section{Placer des objets} -%%% -%%%%\input{plac} -%%% -%% -%%%\newpage -%%% -%%%%=================================================== -%\section{Créer ses couleurs} -% -% -% \input{tkzcoul} -% -% -%\newpage -% -%\section{Créer ses commandes} -% -%\input{tkzcde} -% -% -%\newpage -% -%\section[Créer ses styles]{Créer ses styles} -% -%\input{tkzstyl} -% -%%%%%%%%====================================================================== -% -%\newpage -% -%\section{Mettre du texte en valeur} -% -% -%\input{tkzboit1} -% -%%============\newpage -% -%\section{Décorations} -% -% \input{tkzdeco} -%% -%% ====================================================================== -%\newpage -% -%\section{Insertion images dans un environnement TikZ} -% -%\input{tkzimage} -% -% -%%% -%%%>>>> \section[Mettre des objets en cadre]{Mettre des objets en cadre } -%%% -%% -%%% -%%%\newpage -%%%>>>>> \section[Mettre des objets en bouton]{Mettre des objets en bouton } -%% -%% -%%%%%%%============================================================= -%% -% -%\section{Des lignes et liaisons spéciales} -%\subsection[Trait à main levé]{Trait à main levée } -% -%\input{tkzalea} -% -%%% >>>> \subsection{Tracer avec des symboles} -%% -%%% -%%%\newpage -% -%%%>>>>> \subsection[Les bobines]{Les bobines \cite{pst-user} \cite{pst-coil}} -%%% -% -%%%\newpage -%%% -%%%>>>> \subsection[Les accolades]{Les accolades } -%%% -%% -%%%%%%====================================================================== -%%%\section{Des remplissages spéciaux} -%%%\subsection{Des gradients de couleurs} -%%% -%%%\subsubsection[Module pst-grad]{Module pst-grad \cite{pst-user} \cite{pst-grad}} -%% -%%%% -%%%\newpage -%%%\subsubsection[Module pst-slpe]{Module pst-slpe \cite{pst-slpe}} -%%% -%% -%%% -%%%\newpage -%%%\subsection[Remplissage par des motifs]{Remplissage par des motifs \cite{pst-fill}} -%%% -%% -%%% -%%%\subsection[Remplissage par des points aléatoires]{Remplissage par des points aléatoires \cite{pst-add}} -%% -%%%\newpage -%%% -%%%% ======================================================================== -%%%\section[Effets spéciaux avec du texte ]{Effets spéciaux avec du texte \cite{pst-user} \cite{pst-text}} -%% -%% -%%\newpage -%%%% % % % %====================================================================== -%\section[Créer un graphe]{Créer un graphe } -% -% -%\input{tkzgraph1} -% -%\newpage -% -%\section[Créer un graphe avec pgfplot]{Créer un graphe avec pgfplot \cite{pgfplots}} -% -%\input{tkzgraph2} % <<<<<<<<<<<<<<<<<<<<<<<<<<<<< -%% -%\subsection{Courbes 3D} -% -%\input{tkzgraph3D} % très lourd à compiler -% -%% -%%%% -%%%%\essais{pstgraph2ess.tex} -%%%\newpage -%%%\section[Créer un graphe d'après une équation]{Créer un graphe d'après une équation \cite{pst-user} \cite{pst-plot}} -%%% -%% -%%%% -%%%%\essais{pstgraph3ess.tex} -%%%\newpage -%%% \section[Des outils pour les graphes]{Des outils pour les graphes \cite{pst-add} } -%%% -%% -%%% -%%%\newpage -%%% \section[Créer un graphe en camembert]{Créer un graphe en camembert \cite{pst-add} } -%%% -%%%\input{chart} % camembert -% -%\newpage -% -%%%%============================================= -%\section{Les Tableaux de variation} -% -%\input{tkztab} -% -%\newpage -%%%%============================================= -%\section{Les répétitions} -% -%\input{tkzrep1} % OK -% -%%%\subsection[Commande multido]{Commande multido \cite{pst-user} \cite{multido} } -%%% -%% -%%% -%%%\essais{pstrep2ess.tex} -%%% -%%%\subsection[Commande psforeach]{Commande psforeach \cite{pst-news10} } -%% -%% -%%% -%%%\newpage -%%%% % % %====================================================================== -%%%\section[La géométrie]{La géométrie \cite{pst-eucl} } -%%% -%%%Utilisation du module \textbf{pst-eucl} \label{pst-eucl}(consultez le fichier\textbf{ pst-eucl-doc.pdf} ) -%%% -%%% -%%%\psset{fillcolor=yellow,linecolor=blue,dotscale=2} -%%%\subsection{\'Elements de base} -%%% -%% -%%% -%%%\subsection[Transformations géométriques]{Transformations géométriques \cite{pst-eucl} } -%%% -%%% -%% -%%% -%%% -%%%\subsection[Constructions particulières en géométrie ]{Constructions particulières en géométrie } -%%% -%% -%%% -%%%\subsection[Intersections]{Intersections } -%%% -%% -%%% -%%%%-------------------------------------------------------------- -%%%\section[Les vecteurs]{Les vecteurs } -%%% -%% -%%%%============================================================== -%\newpage -% -%\section[Les diagrammes arborescents ]{Les diagrammes arborescents } -% -%\input{tkztree} -% -%%%%============================================================== -%\newpage -% -%\section[Les animations ]{Les animations } -% -%\input{tkzanim} -%%% -%%%\newpage -%%% -%%%\section[Créer un dessin en 3D]{Créer un dessin en 3D } -%% -% -%%%\subsection{Les objets en 3D} -%%% -% -%%%\newpage -%%%\subsection[Créer un graphe en 3D]{Créer un graphe en 3D } -%%% -% -%\newpage -%%%======================================================================= -%\section{Les modules étudiés dans ce document} -% -%\input{bibtkz} -% -% -% -%\newpage -%\section{Index} -% -% \printindex \end{document} \ No newline at end of file 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 e0393c8a719..6415a05877a 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/VisualTikZ.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/VisualTikZ.tex index c63abbf5976..3f65ab756fa 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/VisualTikZ.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/VisualTikZ.tex @@ -1,18 +1,12 @@ \input{versGB} - - - \input{tikzdebut} +\input{tikzdebut} \begin{document} -% \newrgbcolor{Vert}{0 .8 0} \selectlanguage{english} - -%\input{tkztitre} - -%========================================================== + \input{VTKZ} diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/bibtkz.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/bibtkz.tex index a139d96cd26..62916eb6cc6 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/bibtkz.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/bibtkz.tex @@ -1,30 +1,42 @@ -\TFRGB{module de base TikZ}{Basic TikZ package} : -\maboite{\BS{usepackage}\AC{tikz} } + +\begin{tabular}{|c|c|l c|}\hline +\multicolumn{4}{|c|}{ \textbf{\TFRGB{module de base TikZ}{Basic TikZ package} : } } +\\ \hline + +\TFRGB{nom}{name} & \TFRGB{A insérer dans le préambule}{Load package}& documentation \footnotemark[1] & \\ \hline +tikz & \BS{usepackage}\AC{tikz} & pgfmanual.pdf & \DGB \\ + +\hline +\end{tabular} %\bigskip \bigskip -\textbf{\TFRGB{Autres modules}{Other packages}} + % \begin{tabular}{|c|c|l c|}\hline -\TFRGB{nom}{name} & \TFRGB{voir page} & documentation\footnotemark[1] & \\ \hline - -animate & \pageref{anim} & animate.pdf & \DGB\\ -tkz-tab & \pageref{tab} & tkz-tab-screen.pdf & \DFR \\ +\multicolumn{4}{|c|}{ \textbf{\TFRGB{Autres modules}{Other packages}} } +\\ \hline +\TFRGB{nom}{name} & \TFRGB{voir page}{see page} & documentation \footnotemark[2] & \\ \hline +animate & \pageref{anim} & animate.pdf & \DGB \\ +tikz-optics & \pageref{optics} & tikz-optics.pdf & \DFR \\ +pgfplots & \pageref{pgfplots} & pgfplots.pdf & \DGB \\ +tikzpeople & \pageref{people} & tikzpeople.pdf & \DGB \\ +tkz-tab & \pageref{tabl} & tkz-tab-screen.pdf & \DFR \\ \hline \end{tabular} \bigskip -\textbf{\TFRGB{Compléments optionnels}{Optional library} :} + \begin{tabular}{|l|c|l|}\hline +\multicolumn{3}{|c|}{ \textbf{\TFRGB{Compléments optionnels}{Optional library} (documentation : pgfmanual.pdf)} } +\\ \hline \TFRGB{nom}{name} & \TFRGB{voir page}{see page} & \TFRGB{A insérer dans le préambule}{Load package}\\ \hline -angles & \pageref{lib-angles} & \BS{usetikzlibrary}\AC{angles} -\\ -arrows.meta & \pageref{lib-arrows.meta} & \BS{usetikzlibrary}\AC{arrows.meta} -\\ +angles & \pageref{lib-angles} & \BS{usetikzlibrary}\AC{angles}\\ +arrows.meta & \pageref{lib-arrows.meta} & \BS{usetikzlibrary}\AC{arrows.meta}\\ bending & \pageref{lib-bending} & \BS{usetikzlibrary}\AC{bending} \\ backgrounds & \pageref{lib-bkgd} & \BS{usetikzlibrary}\AC{backgrounds} @@ -33,7 +45,12 @@ calc & \pageref{lib-calc} & \BS{usetikzlibrary}\AC{calc} \\ circuits.ee.IEC & \pageref{lib-ee} & \BS{usetikzlibrary}\AC{circuits.ee.IEC} \\ - +circuits.logic.IEC & \pageref{lib-gate} & \BS{usetikzlibrary}\AC{circuits.logic.IEC} +\\ +circuits.logic.US & \pageref{lib-gate} & \BS{usetikzlibrary}\AC{circuits.logic.US} +\\ +circuits.logic.CDH & \pageref{lib-gate} & \BS{usetikzlibrary}\AC{circuits.logic.CDH} +\\ fit & \pageref{lib-fit} & \BS{usetikzlibrary}\AC{fit} \\ decorations.footprints & \pageref{lib-footprints} & \BS{usetikzlibrary}\AC{decorations.footprints} @@ -80,6 +97,12 @@ trees & \pageref{lib-trees} & \BS{usetikzlibrary}\AC{trees} \hline \end{tabular} +\TFRGB{ +\footnotetext[1]{voir dans le répertoire : \BS{texlive}\BS{2016}\BS{tesmf-dist}\BS{doc}\BS{generic}\BS{pgf}} +\footnotetext[2]{chercher dans le répertoire : \BS{texlive}\BS{2016}\BS{tesmf-dist}\BS{doc}\BS{latex}} } +{ +\footnotetext[1]{look in repertory : \BS{texlive}\BS{2016}\BS{tesmf-dist}\BS{doc}\BS{generic}\BS{pgf}} +\footnotetext[2]{search in repertory : \BS{texlive}\BS{2016}\BS{tesmf-dist}\BS{doc}\BS{latex}} } \bigskip @@ -93,7 +116,7 @@ babel & \RRR{42} \\ calendar & \RRR{45} \\ chains & \RRR{46} \\ %circuits.ee & \RRR{47-4} \\ -circuits.logic & \RRR{47-3} \\ + circular graph drawing library & \RRR{32} \\ curvilinear library & \RRR{103-4-7} \\ datavisualization library & \RRR{75} \\ @@ -122,11 +145,7 @@ profiler & \RRR{64} \\ quotes library & \RRR{17-10-4} \\ routing graph drawing library & \RRR{34} \\ shadows & \RRR{66} \\ -shapes.gates.ee & \\ -shapes.gates.ee.IEC & \\ -shapes.gates.logic & \\ -shapes.gates.logic.IEC & \\ -shapes.gates.logic.US & \\ + spy & \RRR{68} \\ svg.path & \RRR{69} \\ through & \RRR{71} \\ @@ -135,46 +154,13 @@ trees graph drawing library & \\ turtle & \RRR{73} \\ \hline \end{tabular} -%circuit.ee.IEC, 309 -%circuits, 292 -%circuits.ee, 308 -%, 300 -%circuits.logic.CDH, 301 -%circuits.logic.IEC, 300 -%circuits.logic.US, 301 + % -%\bigskip -%\textbf{Autres modules} -% -%% -%\begin{tabular}{|c|c|l|}\hline -%nom & voir page & documentation\footnotemark[1] \\ \hline -%pst-fr3d & \pageref{pst-fr3d} & pst-fr3d.pdf \\ -%pst-slpe & \pageref{pst-slpe} & pst-slpe.pdf \\ -%infix-RPN & \pageref{infix-RPN} & pst-infixplot.pdf \\ -%pst-infixplot & \pageref{pst-infixplot} & pst-infixplot.pdf \\ -%pst-eucl & \pageref{pst-eucl} & pst-eucl-doc.pdf \\ -%animate & \pageref{anim} & animate.pdf \\ -%pst-3dplot & \pageref{3dplot} & pst-3dplot-doc \\ -%\hline -%\end{tabular} -% -%\bigskip -%\textbf{Additifs } -% + + + %% -%\begin{tabular}{|c|l|}\hline -%année & documentation\footnotemark[1] \\ \hline -%2005 & pst-news5.pdf \\ -%2008 & pst-news08.pdf \\ -%2010 & pst-news10.pdf \\ -%\hline -%\end{tabular} -% -% -%\footnotetext[1]{Vous pouvez les trouver pour la distribution Texlive dans le répertoire : \BS{}texlive\BS{}2011\BS{}tesmf-dist\BS{}doc\BS{}generic} -% %\newpage %% %% \tableofcontents @@ -189,5 +175,8 @@ turtle & \RRR{73} \\ \bibitem{pgfmanual} pgfmanual.pdf \hspace{1cm} version 3.0.1a \hspace{1cm} 1161 pages \hspace{1cm} \DGB \bibitem{pgfplots} pgfplots.pdf \hspace{1cm} version 1.80 \hspace{1cm} 439 pages \hspace{1cm} \DGB \bibitem{tikstab} tkz-tab-screen.pdf \hspace{1cm} version 1.1c \hspace{1cm} 83 pages \hspace{1cm} \DFR +\bibitem{tikzpeople} tikzpeople.pdf \hspace{1cm} \hspace{1cm} 19 pages \hspace{1cm} \DGB +\bibitem{animate} animate.pdf \hspace{1cm} \hspace{1cm} 26 pages \hspace{1cm} \DGB +\bibitem{optics} tikz-optics.pdf \hspace{1cm} version 0.2.2 \hspace{1cm} 39 pages \hspace{1cm} \DFR \end{thebibliography} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/table3X.dat b/Master/texmf-dist/doc/latex/visualtikz/Source/table3X.dat new file mode 100644 index 00000000000..d4242e47002 --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/table3X.dat @@ -0,0 +1,6 @@ +0 0 0 +0 5 0 +0 1 1 +1 1 5 +1 5 0 +1 0 0 diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/test.pdf b/Master/texmf-dist/doc/latex/visualtikz/Source/test.pdf index ed904f6798f..179a8ea0335 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 e7f9a737232..f084cb0b6b9 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 761c348bb49..6f207253407 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/test.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/test.tex @@ -1,15 +1,15 @@ -\input{versGB} % for english version -%\input{versFR} % pour la version française +%\input{versGB} % for english version +\input{versFR} % pour la version française \input{tikzdebut} \begin{document} -% \newrgbcolor{Vert}{0 .8 0} -\selectlanguage{english} -%\selectlanguage{french} + +%\selectlanguage{english} +\selectlanguage{french} %\input{tkztitre} @@ -25,28 +25,183 @@ +% +%baseline->\rput(5,1){% Second example +%\begin{tikzpicture} +%\node[draw]{First Example}; +%\end{tikzpicture}} +%\rput(5,0){\fbox{% +%Second example}} +% +%\hspace{1cm}% +%\rput[r](-3pt,3pt){\pgfornament[scale=.2]{72}} +%{Ornaments patterns}% +%\rput[l](3pt,3pt){\large\pgfornament[scale=.2]{73}} +% +%\newpage +%\begin{tabular}{|c|c|c|c|c|c|c|c|c|c|} \hline +%\pgfornament[scale=.15]{1} & \pgfornament[scale=.2]{2} & \pgfornament[scale=.15]{3} & \pgfornament[scale=.2]{4} & \pgfornament[scale=.15]{5} & \pgfornament[scale=.2]{6} & \pgfornament[scale=.15]{7} & \pgfornament[scale=.2]{8} & \pgfornament[scale=.15]{9} & \pgfornament[scale=.2]{10} +%\\ \hline +%1 & 2 & 3 & 4 & 5 & 6 & 7 & 8 & 9 & 10 +%\\ \hline +%\pgfornament[scale=.15]{11} & \pgfornament[scale=.15]{12} & \pgfornament[scale=.15]{13} & \pgfornament[scale=.15]{14} & \pgfornament[scale=.15]{15} & \pgfornament[scale=.15]{16} & \pgfornament[scale=.15]{17} & \pgfornament[scale=.15]{18} & \pgfornament[scale=.15]{19} & \pgfornament[scale=.15]{20} +%\\ \hline +%11 & 12 & 13 & 14 & 15 & 16 & 17 & 18 & 19 & 20 +%\\ \hline +%\pgfornament[scale=.15]{21} & \pgfornament[scale=.15]{22} & \pgfornament[scale=.15]{23} & \pgfornament[scale=.15]{24} & \pgfornament[scale=.15]{25} & \pgfornament[scale=.15]{26} & \pgfornament[scale=.15]{27} & \pgfornament[scale=.15]{28} & \pgfornament[scale=.15]{29} & \pgfornament[scale=.15]{30} +%\\ \hline +%21 & 22 & 23 & 24 & 25 & 26 & 27 & 28 & 29 & 30 +%\\ \hline +%\pgfornament[scale=.15]{31} & \pgfornament[scale=.15]{32} & \pgfornament[scale=.15]{33} & \pgfornament[scale=.15]{34} & \pgfornament[scale=.15]{35} & \pgfornament[scale=.15]{36} & \pgfornament[scale=.15]{37} & \pgfornament[scale=.15]{38} & \pgfornament[scale=.15]{39} & \pgfornament[scale=.15]{40} +%\\ \hline +%31 & 32 & 33 & 34 & 35 & 36 & 37 & 38 & 39 & 40 +%\\ \hline +%\pgfornament[scale=.15]{41} & \pgfornament[scale=.15]{42} & \pgfornament[scale=.15]{43} & \pgfornament[scale=.15]{44} & \pgfornament[scale=.15]{45} & \pgfornament[scale=.15]{46} & \pgfornament[scale=.15]{47} & \pgfornament[scale=.15]{48} & \pgfornament[scale=.15]{49} & \pgfornament[scale=.15]{50} +%\\ \hline +%41 & 42 & 43 & 44 & 45 & 46 & 47 & 48 & 49 & 50 +%\\ \hline +%\pgfornament[scale=.15]{51} & \pgfornament[scale=.15]{52} & \pgfornament[scale=.15]{53} & \pgfornament[scale=.15]{54} & \pgfornament[scale=.15]{55} & \pgfornament[scale=.15]{56} & \pgfornament[scale=.15]{57} & \pgfornament[scale=.15]{58} & \pgfornament[scale=.15]{59} & \pgfornament[scale=.15]{60} +%\\ \hline +%51 & 52 & 53 & 54 & 55 & 56 & 57 & 58 & 59 & 60 +%\\ \hline +%\pgfornament[scale=.15]{61} & \pgfornament[scale=.2]{62} & \pgfornament[scale=.15]{63} & \pgfornament[scale=.2]{64} & \pgfornament[scale=.15]{65} & \pgfornament[scale=.2]{66} & \pgfornament[scale=.15]{67} & \pgfornament[scale=.2]{68} & \pgfornament[scale=.15]{69} & \pgfornament[scale=.2]{70} +%\\ \hline +%61 & 62 & 63 & 64 & 65 & 66 & 67 & 68 & 69 & 70 +%\\ \hline +%\pgfornament[scale=.15]{71} & \pgfornament[scale=.2]{72} & \pgfornament[scale=.15]{73} & \pgfornament[scale=.2]{74} & \pgfornament[scale=.15]{75} & \pgfornament[scale=.2]{76} & \pgfornament[scale=.15]{77} & \pgfornament[scale=.2]{78} & \pgfornament[scale=.15]{79} & \pgfornament[scale=.2]{80} +%\\ \hline +%71 & 72 & 73 & 74 & 75 & 76 & 77 & 78 & 79 & 80 +%\\ \hline +%\pgfornament[scale=.15]{81} & \pgfornament[scale=.2]{82} & \pgfornament[scale=.15]{83} & \pgfornament[scale=.2]{84} & \pgfornament[scale=.15]{85} & \pgfornament[scale=.2]{86} & \pgfornament[scale=.15]{87} & \pgfornament[scale=.2]{88} & \pgfornament[scale=.15]{89} & \pgfornament[scale=.2]{90} +%\\ \hline +%81 & 82 & 83 & 84 & 85 & 86 & 87 & 88 & 89 & 90 +%\\ \hline +%\end{tabular} +% +% +% +% +% +% +% +%%\input{tkzpeople} +% +%%\tikzset{pgfornamentstyle/.style={% +%%draw = Periwinkle, +%%fill = SpringGreen}} +%\unitlength=1cm +%\begin{picture}(10,10)% +%\color{blue}% +%%\put(0,0){\framebox(10,10){% +%\rput[tl](-3,5){\pgfornament[width=6cm]{71}}% +%\rput[bl](-3,-5){\pgfornament[width=6cm, +%symmetry=h]{71}}% +%\rput[tl](-5,5){\pgfornament[width=2cm]{63}}% +%\rput[tr](5,5){\pgfornament[width=2cm, +%symmetry=v]{63}}% +%\rput[bl](-5,-5){\pgfornament[width=2cm, +%symmetry=h]{63}}% +%\rput[br](5,-5){\pgfornament[width=2cm, +%symmetry=c]{63}}% +%\rput[bl]{-90}(-5,3){\pgfornament[width=6cm]{46}}% +%\rput[bl]{90}(5,-3){\pgfornament[width=6cm]{46}}% +%%\rput(0,0){\Huge \color{MidnightBlue} Ornaments}% +%\rput[t](0,-0.5){\pgfornament[width=5cm]{75}}% +%\rput[b](0,0.5){\pgfornament[width=5cm]{69}}% +%\rput[tr]{-30}(-1,2.5){\pgfornament[width=2cm]{57}}% +%%\rput[tl]{30}(1,2.5){\pgfornament[width=2cm,symmetry=v]{57}}}}% +%\end{picture} +\newpage +%\input{tkzdepend} -\SSCT{Les figures de base}{Basic figures} +%\input{tkzoptic} -\input{tkz1} +\input{tkznoeud1} % -%\newpage +%\SSCT{Créer un graphe avec pgfplot}{Creation of a graph with pgfplots} % -%\input{tkznoeud1} +%\input{tkzgraph2} % <<<<<<<<<<<<<<<<<<<<<<<<<<<<< % -%\newpage +%\SSCT{Courbes 3D}{3D graph} +% +%\input{tkzgraph3D} -\input{tkzelect} +%\section{En test} +% +%\begin{tabular}{|c|c|c|} \hline +%\begin{tikzpicture}[blue] +%\useasboundingbox (-.2,-.2) grid (2.2,1.2); +%\node[circuit logic IEC,logic gate IEC symbol color=red] at (1,.5) [and gate] {} ; +%\end{tikzpicture} +%& +%\begin{tikzpicture}[blue] +%\useasboundingbox (-.2,-.2) grid (2.2,1.2); +%\node[circuit logic IEC,line width = 2pt] at (1,.5) [and gate] {} ; +%\end{tikzpicture} +%& +%\begin{tikzpicture}[blue] +%\useasboundingbox (-.2,-.2) grid (2.2,1.2); +%\node[circuit logic IEC,logic gate IEC symbol color=black, +%fill=blue!20] at (1,.5) [and gate] {} ; +%\end{tikzpicture} +%\\ \hline +%logic gate IEC symbol color=red & line width = 2pt & fill=blue!20 \\ +% & & logic gate IEC symbol color=black +%\\ \hline +%\end{tabular} +% +% +%\begin{tabular}{|c|c|} \hline +%\begin{tikzpicture}[circuit logic IEC] +%\matrix[column sep=7mm] +%{ +%\node (i0) {0}; & & \\ +% & \node [and gate] (a1) {}; & \\ +%\node (i1) {0}; & & \node [or gate] (o) {};\\ +% & \node [nand gate] (a2) {}; & \\ +%\node (i2) {1}; & & \\ +%}; +%\draw (i0.east) -- ++(right:3mm) |- (a1.input 1); +%\draw (i1.east) -- ++(right:3mm) |- (a1.input 2); +%\draw (i1.east) -- ++(right:3mm) |- (a2.input 1); +%\draw (i2.east) -- ++(right:3mm) |- (a2.input 2); +%\draw (a1.output) -- ++(right:3mm) |- (o.input 1); +%\draw (a2.output) -- ++(right:3mm) |- (o.input 2); +%\draw (o.output) -- ++(right:3mm); +%\end{tikzpicture} +%& \\ +%\hline & \\ +%\hline +%\end{tabular} \newpage +\newpage + +\section{A Voir} + + + + + + + +%\input{tkzelect} + +\newpage + + +\input{bibtkz} + +\newpage - \printindex +\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 5a4711ec6bf..73adf5fa4ab 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tikzdebut.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tikzdebut.tex @@ -18,10 +18,12 @@ \usepackage{animate} \usepackage{makeidx} %\usepackage{wrapfig} - +%\usepackage{tikz-dependency} \usepackage{pgfplots} %<<<<<<<<<<<<<<<<<<<<<<<<<<<<< \usepackage{tikz} -\usepackage{tkz-tab} +\usepackage{tkz-tab} + + %\usepgflibrary{shapes.callouts} \usepackage{tikz-qtree} \usepackage{tkz-tab} @@ -57,16 +59,20 @@ \usetikzlibrary{fit} %\usetikzlibrary{circuits} \usetikzlibrary{circuits.ee.IEC} -%\usetikzlibrary{circuits.logic} - +\usetikzlibrary{circuits.logic.IEC} +\usetikzlibrary[circuits.logic.US] +\usetikzlibrary{circuits.logic.CDH} %\usetikzlibrary{decorations} +\usetikzlibrary{shapes.gates.logic.IEC} +\usepackage{tikzpeople} - - +\usepackage{tikzrput} +\usepackage{pgfornament} %\usetikzlibrary{babel} \usetikzlibrary{math} +\usetikzlibrary{optics} \usetikzlibrary{quotes} @@ -90,7 +96,7 @@ \newcommand{\AC}[1]{\{#1\}} -\newcommand{\BDD}[1]{{\color{blue} #1}\index{\textbf{4 Variables Tikz}!#1}} + \newcommand{\BS}[1]{$\backslash$#1} @@ -107,6 +113,8 @@ \newcommand{\RRR}[1]{\tikz[baseline=-1mm] \draw node[draw,fill=red!20] {{\footnotesize PGFmanual section : #1}} ; } +\newcommand{\RRP}[1]{\tikz[baseline=-1mm] \draw node[draw,fill=red!20] {{\footnotesize pgfplots 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] @@ -129,24 +137,42 @@ \TFRGB{ -\newcommand{\ESS}[1]{\textbf{\textbackslash{#1}}\index{\textbf{1 Environnements}!#1 @\textbackslash{}#1}} +\newcommand{\ESS}[1]{\textbf{\textbackslash begin\AC{#1}}\index{\textbf{1 Environnements}!#1}} +%2 \newcommand{\BSS}[1]{\textbf{\textbackslash{#1}}\index{\textbf{2 Commandes}!#1 @\textbackslash{}#1}} -\newcommand{\BSI}[2]{ \index{\textbf{4) Par modules }!\textbf{#2}!#1@\textbackslash{}#1 (M)}} -\newcommand{\DDD}[1]{{\color{red} #1}\index{\textbf{3 Paramètres et options!Elements}!#1}} -\newcommand{\FDD}[1]{{\color{red} #1}\index{\textbf{5 Extrémit\'es}!#1}} + +%\newcommand{\BSI}[2]{ \index{\textbf{4) Par modules }!\textbf{#2}!#1@\textbackslash{}#1 (M)}} +%3 +%\newcommand{\DDD}[1]{{\color{red} #1}\index{\textbf{3 Paramètres et options!Elements}!#1}} + +\newcommand{\DDD}[1]{{\color{red} #1}\index{\textbf{3 Paramètres et options}!#1}} \newcommand{\RDD}[1]{{\color{red} #1}\index{\textbf{3 Paramètres et options}!#1}} -\newcommand{\RDDD}[2]{{\color{red}#1} \index{\textbf{Paramètres et options}!#2!#1}} -\newcommand{\RDDX}[2]{{\color{red}#1} \index{\textbf{4 Options}!#1 (#2)}} +%4 +\newcommand{\BDD}[1]{{\color{blue} #1}\index{\textbf{4 Valeurs Tikz}!#1}} +%\newcommand{\RDDD}[2]{{\color{red}#1} \index{\textbf{Paramètres et options}!#2!#1}} + +\newcommand{\RDDX}[2]{{\color{red}#1} \index{\textbf{4 Valeurs Tikz}!#1 (#2)}} +%5 +\newcommand{\FDD}[1]{{\color{red} #1}\index{\textbf{5 Extrémit\'es}!#1}} } { \newcommand{\ESS}[1]{\textbf{\textbackslash{#1}}\index{\textbf{1 Environments}!#1 @\textbackslash{}#1}} +%2 \newcommand{\BSS}[1]{\textbf{\textbackslash{#1}}\index{\textbf{2 Commands}!#1 @\textbackslash{}#1}} -\newcommand{\BSI}[2]{ \index{\textbf{4) Par modules }!\textbf{#2}!#1@\textbackslash{}#1 (M)}} -\newcommand{\DDD}[1]{{\color{red} #1}\index{\textbf{3 Parameters and options!Elements}!#1}} -\newcommand{\FDD}[1]{{\color{red} #1}\index{\textbf{5 Extrémities}!#1}} +%3 \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)}} + +\newcommand{\DDD}[1]{{\color{red} #1}\index{\textbf{3 Parameters and options}!#1}} +%4 +%\newcommand{\BSI}[2]{ \index{\textbf{4) Par modules }!\textbf{#2}!#1@\textbackslash{}#1 (M)}} + +\newcommand{\RDDX}[2]{{\color{red}#1} \index{\textbf{4 Values Tikz}!#1 (#2)}} + +\newcommand{\BDD}[1]{{\color{blue} #1}\index{\textbf{4 Values Tikz}!#1}} +%5 +\newcommand{\FDD}[1]{{\color{red} #1}\index{\textbf{5 Extremities}!#1}} + +%\newcommand{\RDDD}[2]{{\color{red}#1} \index{\textbf{Parameters and options}!#2!#1}} } \newcommand{\rouge}[1] {{\color{red} #1}} diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz1.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz1.tex index e8843ebce33..1a420b7ba7d 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz1.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz1.tex @@ -219,7 +219,7 @@ \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)} +& \BS{draw} (-2,0) \RDD{arc} (180:-45:2 and 1) \\ \hline \begin{tikzpicture}[scale=.8,blue,line width=2pt,fill=green] @@ -594,8 +594,8 @@ \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); +- - (3,1) - - (\RDD{current subpath start}); \\ +\BS{fill}[red] (\RDD{current subpath start}) circle (3pt); \\ \hline \begin{tikzpicture}[blue,baseline=0pt,line width=2pt] \draw[help lines] (0,0) grid (4,2); @@ -628,8 +628,8 @@ \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) ; +\BS{draw} (0,0) - - (2,1) \RDD{edge}([red,\RDD{to path}=\AC{parabola (3,0)} ] () \\ +\RDD{edge}[red,\RDD{to path}=\AC{arc(-90 : 90 : 0.5)}] () - -(1,2) - - (0,1) ; \\ \hline \begin{tikzpicture}[blue,baseline=0pt,line width=2pt] diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz3a.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz3a.tex index 1853a02ecbf..c3db9e56513 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkz3a.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkz3a.tex @@ -140,7 +140,7 @@ Rays & \AC{Rays[n=2]} & \AC{Rays[n=3]} & \AC{Rays[n=4]} & \AC{Rays[n=5]} \RRR{16-4-2} \begin{tabular}{|c|c|c|c|c|c|} \hline - \multicolumn{6}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\FDD{sep}=.25cm] Arc Barb[ ]},line width=.1cm,blue] (0,0) - - (1.5,1);} + \multicolumn{6}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\RDD{sep}=.25cm] Arc Barb[ ]},line width=.1cm,blue] (0,0) - - (1.5,1);} \\ \hline \tikz \draw [-{Arc Barb[sep=.25cm] Arc Barb[]},line width=.1cm,blue] (0,0) - - (1.5,1) ; & @@ -254,7 +254,7 @@ Latex & Kite & Rectangle & Square & Stealth & Turned Square \RRR{16-3-1} \begin{tabular}{|c|c|c|c|c|c|} \hline - \multicolumn{6}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\FDD{length}=1cm]},line width=.2cm,blue] (0,0) - - (1,1);} + \multicolumn{6}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\RDD{length}=1cm]},line width=.2cm,blue] (0,0) - - (1,1);} \\ \hline \begin{tikzpicture}[blue,line width=2pt,baseline=.5cm] \draw[help lines] (0.5,-2) grid (2,2); @@ -379,7 +379,7 @@ Straight Barb & Diamond & Ellipse & Kite & Circle & Computer Modern Rightarrow \begin{tabular}{|c|c|c|c|c|} \hline - \multicolumn{5}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\FDD{width}=2cm]},line width=.2cm,blue] (0,0) - - (1,1);} + \multicolumn{5}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\RDD{width}=2cm]},line width=.2cm,blue] (0,0) - - (1,1);} \\ \hline \begin{tikzpicture}[blue,line width=2pt,baseline=.5cm] \draw[help lines] (0,-2) grid (2,2); @@ -558,7 +558,7 @@ Straight Barb & Diamond & Ellipse & Kite & Computer Modern Rightarrow \RRR{16-3-1} \begin{tabular}{|c|c|c|} \hline - \multicolumn{3}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Tee Barb[\FDD{inset}=0pt]},line width=.2cm,blue] (0,0) - - (1,1);} + \multicolumn{3}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Tee Barb[\RDD{inset}=0pt]},line width=.2cm,blue] (0,0) - - (1,1);} \\ \hline \begin{tikzpicture}[blue,line width=2pt,baseline=.5cm] \draw[help lines] (0,-1) grid (2,1); @@ -748,7 +748,7 @@ Straight Barb & Diamond & Ellipse & Kite & Computer Modern Rightarrow \begin{tabular}{|c|c|c|c|c|} \hline - \multicolumn{5}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Straight Barb[\FDD{angle}=60:.5cm 1]},line width=.2cm,blue] (0,0) - - (1,1);} + \multicolumn{5}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Straight Barb[\RDD{angle}=60:.5cm 1]},line width=.2cm,blue] (0,0) - - (1,1);} \\ \hline \tikz \draw[-{Straight Barb[angle=60:.5cm 1]},line width=1pt,blue] (0,0) - - (1,1) ; @@ -822,7 +822,7 @@ Straight Barb & Diamond & Ellipse & Kite & Computer Modern Rightarrow \RRR{16-3-3} \begin{tabular}{|c|c|c|c|} \hline - \multicolumn{4}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\FDD{arc}=270]},line width=.2cm,blue] (0,0) - - (3,1);} + \multicolumn{4}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\RDD{arc}=270]},line width=.2cm,blue] (0,0) - - (3,1);} \\ \hline \tikz \draw [-{Arc Barb[arc=270]},line width=.2cm,blue] (0,0) - - (3,1) ; & @@ -844,7 +844,7 @@ Arc Barb[arc=270] & Arc Barb[arc=360] & Hooks[arc=270] & Hooks[arc=360] \RRR{16-3-4} \begin{tabular}{|c|c|c|c|c|} \hline - \multicolumn{5}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\FDD{slant}=.3]},line width=.2cm,blue] (0,0) - - (1,1);} + \multicolumn{5}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\RDD{slant}=.3]},line width=.2cm,blue] (0,0) - - (1,1);} \\ \hline \tikz \draw [-{Arc Barb[slant=0]},line width=.2cm,blue] (0,0) - - (1,1) ; & @@ -926,7 +926,7 @@ Turned Square & Fast Round & Fast Triangle & Round Cap & Triangle Cap \RRR{16-3-5} \begin{tabular}{|c|c|c|c|} \hline - \multicolumn{4}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\FDD{reversed}},line width=.2cm,blue] (0,0) - - (2,1) ;} + \multicolumn{4}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\RDD{reversed}},line width=.2cm,blue] (0,0) - - (2,1) ;} \\ \hline \tikz \draw [-{Arc Barb[reversed]},line width=.2cm,blue] (0,0) - - (2,1) ; @@ -981,7 +981,7 @@ Straight Barb & Tee Barb & Parenthesis & Computer Modern Rightarrow \RRR{16-3-5} \begin{tabular}{|c|c|c|c|c|c|} \hline - \multicolumn{6}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\FDD{left}]},line width=.2cm,blue] (0,0) - - (1.5,1);} + \multicolumn{6}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\RDD{left}]},line width=.2cm,blue] (0,0) - - (1.5,1);} \\ \hline \tikz \draw [-{Arc Barb[left]},line width=.2cm,blue] (0,0) - - (1.5,1) ; & @@ -1038,7 +1038,7 @@ Kite & Latex & Rectangle & Square & Stealth & Rays \begin{tabular}{|c|c|c|c|c|c|} \hline - \multicolumn{6}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\FDD{right}]},line width=.2cm,blue] (0,0) - - (1.5,1);} + \multicolumn{6}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\RDD{right}]},line width=.2cm,blue] (0,0) - - (1.5,1);} \\ \hline \tikz \draw [-{Arc Barb[right]},line width=.2cm,blue] (0,0) - - (1.5,1) ; & @@ -1095,7 +1095,7 @@ Kite & Latex & Rectangle & Square & Stealth & Rays \RRR{16-3-5} \begin{tabular}{|c|c|c|c|c|c|c|} \hline - \multicolumn{7}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\FDD{harpoon}]},line width=.2cm,blue] (0,0) - - (1,1);} + \multicolumn{7}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\RDD{harpoon}]},line width=.2cm,blue] (0,0) - - (1,1);} \\ \hline \tikz \draw [-{Arc Barb[harpoon]},line width=.2cm,blue] (0,0) - - (1,1) ; & @@ -1117,7 +1117,7 @@ Arc Barb & Bracket& Hooks & Parenthesis & Classical TikZ Rightarrow & Straight B \bigskip \begin{tabular}{|c|c|c|c|c|c|c|} \hline - \multicolumn{7}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[harpoon,\FDD{swap}]},line width=.2cm,blue] (0,0) - - (1,1);} + \multicolumn{7}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[harpoon,\RDD{swap}]},line width=.2cm,blue] (0,0) - - (1,1);} \\ \hline \tikz \draw [-{Arc Barb[harpoon,swap]},line width=.2cm,blue] (0,0) - - (1,1) ; & @@ -1144,7 +1144,7 @@ Arc Barb & Bracket& Hooks & Parenthesis & Classical TikZ Rightarrow & Straight B \RRR{16-3-6} \begin{tabular}{|c|c|c|} \hline - \multicolumn{3}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\FDD{color=red}},line width=.2cm,blue] (0,0) - - (1,1);} + \multicolumn{3}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\RDD{color}=red},line width=.2cm,blue] (0,0) - - (1,1);} \\ \hline \tikz \draw[-{Bracket[color=red]},line width=.2cm,blue] (0,0) - - (1,1) ; & @@ -1162,7 +1162,7 @@ Bracket[color=red] & Bracket[color=green] &Bracket[red] \\ \begin{tabular}{|c|c|c|c|c|} \hline - \multicolumn{5}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\FDD{red}},line width=.2cm,blue] (0,0) - - (1,1);} + \multicolumn{5}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\RDD{red}},line width=.2cm,blue] (0,0) - - (1,1);} \\ \hline \tikz \draw [-{Arc Barb[red]},line width=.2cm,blue] (0,0) - - (1,1) ; & @@ -1221,7 +1221,7 @@ Triangle & Turned Square & Rays & & \RRR{16-3-6} \begin{tabular}{|c|c|c|c|c|} \hline - \multicolumn{5}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Circle[\FDD{fill}=red]},line width=.2cm,blue] (0,0) - - (1,1);} + \multicolumn{5}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Circle[\RDD{fill}=red]},line width=.2cm,blue] (0,0) - - (1,1);} \\ \hline \tikz \draw [-{Circle[fill=red]},line width=.2cm,blue] (0,0) - - (1,1) ; & @@ -1255,7 +1255,7 @@ Latex & Rectangle & Square & Stealth & Turned Square \bigskip \begin{tabular}{|c|c|c|c|c|} \hline - \multicolumn{5}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Circle[\FDD{fill}=none]},line width=.2cm,blue] (0,0) - - (1,1);} + \multicolumn{5}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Circle[\RDD{fill}=none]},line width=.2cm,blue] (0,0) - - (1,1);} \\ \hline \tikz \draw [-{Circle[fill=none]},line width=.2cm,blue] (0,0) - - (1,1) ; & @@ -1291,7 +1291,7 @@ Latex & Rectangle & Square & Stealth & Turned Square \RRR{16-3-6} \begin{tabular}{|c|c|c|c|c|} \hline - \multicolumn{5}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Circle\FDD{[open]}},line width=.2cm,blue] (0,0) - - (1.5,1) ;} + \multicolumn{5}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Circle[\RDD{open}]},line width=.2cm,blue] (0,0) - - (1.5,1) ;} \\ \hline \tikz \draw [-{Circle[open]},line width=.2cm,blue] (0,0) - - (1.5,1) ; & @@ -1329,7 +1329,7 @@ Latex & Rectangle & Square & Stealth & Turned Square \begin{tabular}{|c|c|c|c|c|c|c|c|} \hline - \multicolumn{8}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\FDD{line cap=butt}]},line width=.2cm,blue] (0,0) - - (1,1);} + \multicolumn{8}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\RDD{line cap}=\RDDX{butt}{line cap}]},line width=.2cm,blue] (0,0) - - (1,1);} \\ \hline \tikz \draw [-{Arc Barb[line cap=butt]},line width=.2cm,blue] (0,0) - - (1,1) ; & @@ -1377,7 +1377,7 @@ Straight Barb & Tee Barb & Diamond & Kite & Latex \bigskip \begin{tabular}{|c|c|c|c|c|c|c|c|} \hline - \multicolumn{8}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\FDD{line cap=round}]},line width=.2cm,blue] (0,0) - - (1,1);} + \multicolumn{8}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\RDD{line cap}=\RDDX{round}{line cap}]},line width=.2cm,blue] (0,0) - - (1,1);} \\ \hline \tikz \draw [-{Arc Barb[line cap=round]},line width=.2cm,blue] (0,0) - - (1,1) ; & @@ -1432,7 +1432,7 @@ Straight Barb & Tee Barb & Diamond & Kite & Latex \begin{tabular}{|c|c|c|c|c|c|c|c|} \hline - \multicolumn{8}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\FDD{line join=miter}]},line width=.2cm,blue] (0,0) - - (1,1);} + \multicolumn{8}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\RDD{line join}=\RDDX{miter}{line join}]},line width=.2cm,blue] (0,0) - - (1,1);} \\ \hline \tikz \draw [-{Arc Barb[line join=miter]},line width=.2cm,blue] (0,0) - - (1,1) ; & @@ -1480,7 +1480,7 @@ Straight Barb & Tee Barb & Diamond & Kite & Latex \bigskip \begin{tabular}{|c|c|c|c|c|c|c|c|} \hline - \multicolumn{8}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\FDD{line cap=round}]},line width=.2cm,blue] (0,0) - - (1,1);} + \multicolumn{8}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\RDD{line cap}=\RDDX{round}{line cap}]},line width=.2cm,blue] (0,0) - - (1,1);} \\ \hline \tikz \draw [-{Arc Barb[line join=round]},line width=.2cm,blue] (0,0) - - (1,1) ; & @@ -1530,7 +1530,7 @@ Straight Barb & Tee Barb & Diamond & Kite & Latex \RRR{16-3-7} \begin{tabular}{|c|c|c|c|c|c|c|c|} \hline - \multicolumn{8}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\FDD{round}]},line width=.2cm,blue] (0,0) - - (1,1);} + \multicolumn{8}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\RDD{round}]},line width=.2cm,blue] (0,0) - - (1,1);} \\ \hline \tikz \draw [-{Arc Barb[round]},line width=.2cm,blue] (0,0) - - (1,1) ; & @@ -1582,10 +1582,10 @@ Straight Barb & Tee Barb & Diamond & Kite & Latex \RRR{16-3-7} \begin{tabular}{|c|c||c|c|} \hline - \multicolumn{4}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Classical TikZ Rightarrow[\FDD{sharp}]},line width=.2cm,blue] (0,0) - - (2,0)) ;} + \multicolumn{4}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Classical TikZ Rightarrow[\RDD{sharp}]},line width=.2cm,blue] (0,0) - - (2,0)) ;} \\ \hline - \multicolumn{2}{|c||}{ -\AC{Classical TikZ Rightarrow[\FDD{sharp}]}} & - \multicolumn{2}{|c|}{ -\AC{Computer Modern Rightarrow[\FDD{sharp}]}} + \multicolumn{2}{|c||}{ -\AC{Classical TikZ Rightarrow[\RDD{sharp}]}} & + \multicolumn{2}{|c|}{ -\AC{Computer Modern Rightarrow[\RDD{sharp}]}} \\ \hline \tikz \draw[-{Classical TikZ Rightarrow[sharp]},line width=.5cm,blue] (0,0) - - (2,0) ; & @@ -1595,7 +1595,7 @@ Straight Barb & Tee Barb & Diamond & Kite & Latex & \tikz \draw[-{Computer Modern Rightarrow[]},line width=.5cm,blue] (0,0) - - (2,0) ; \\ -\hline \FDD{sharp} & \color{red}{[ ]} & \FDD{sharp} & \color{red}{[ ]} \\ +\hline \RDD{sharp} & \color{red}{[ ]} & \RDD{sharp} & \color{red}{[ ]} \\ \hline \end{tabular} @@ -1606,7 +1606,7 @@ Straight Barb & Tee Barb & Diamond & Kite & Latex \RRR{16-3-7} \begin{tabular}{|c|c|c|c|} \hline - \multicolumn{4}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\FDD{line width}=.2cm]},line width=.4cm,blue] (0,0) - - (2,0);} + \multicolumn{4}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\RDD{line width}=.2cm]},line width=.4cm,blue] (0,0) - - (2,0);} \\ \hline \begin{tikzpicture}[blue,line width=2pt,baseline=.5cm] \draw[help lines] (0,-1.5) grid (2,1.5); @@ -1735,7 +1735,7 @@ Straight Barb & Tee Bar & Computer Modern Rightarrow & \RRR{16-3-7} \begin{tabular}{|c|c|c|c|} \hline - \multicolumn{4}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\FDD{line width'}=.2cm]},line width=.4cm,blue] (0,0) - - (1,1);} + \multicolumn{4}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Arc Barb[\RDD{line width'}=.2cm]},line width=.4cm,blue] (0,0) - - (1,1);} \\ \hline \begin{tikzpicture}[blue,line width=2pt,baseline=.5cm] \draw[help lines] (0,-2) grid (2,2); @@ -1928,7 +1928,7 @@ flex'=0 & flex'=0.5 & flex'=1 \RRR{16-5-4} \begin{tabular}{|c|c|c|} \hline - \multicolumn{3}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Fast Round[\FDD{cap angle}=60]},line width=.2cm,blue] (0,0) - - (3,1);} + \multicolumn{3}{|c|}{ \BS{tikz} \BS{draw}[-\AC{Fast Round[\RDD{cap angle}=60]},line width=.2cm,blue] (0,0) - - (3,1);} \\ \hline \tikz \draw[-{Fast Round[cap angle=20]},line width=.5cm,blue] (0,0) - - (3,1) ; & diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzanim.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzanim.tex index bb10768128f..f4642218929 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzanim.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzanim.tex @@ -2,7 +2,7 @@ %Insérer dans le préambule : - \maboite{\BS{usepackage}\AC{animate}} + \maboite{\BS{usepackage}\AC{animate} \cite {animate} } \SbSSCT{Animation à partir de fichiers d'image }{Animation from picture files} @@ -61,7 +61,7 @@ \end{center} \end{minipage}\hfill \begin{minipage}{12cm} -\ESS{begin\AC{animateinline}}[controls,loop,autoplay]\AC{5} \\ +\ESS{animateinline}[controls,loop,autoplay]\AC{5} \\ \emph{\% \TFRGB{première image}{first frame }}\\ \BS{begin\AC{tikzpicture} } @@ -76,7 +76,7 @@ \BS{fill}[blue] (0:.5) - - (90:2)- - (180:.5)- -(270:2) - - cycle; \\ \BS{end\AC{tikzpicture}} \\ \\ -\ESS{end\AC{animateinline}} \\ +\BS{end\AC{animateinline}} \\ \end{minipage} diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoord.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoord.tex index 7a9121f907c..3e1aa71ca22 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoord.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoord.tex @@ -551,10 +551,11 @@ at (1,1 {\color{red}-|} 3,3) \fill [blue] (2cm,1.5cm) circle (3pt); \draw[dashed] (2,1.5) -| (3.5,.5); \end{tikzpicture} -\\ \hline -\emph{Explicite} : \BS{fill} [red] (\RDD{canvas cs}:x=2cm+1.5cm,y=1.5cm-1cm) circle (3pt); +\\ \hline +\emph{\TFRGB{Explicite}{explicit}} + : \BS{fill} [red] (\RDD{canvas cs}:x=2cm+1.5cm,y=1.5cm-1cm) circle (3pt); \\ \hline -\emph{Implicite} : \BS{fill} [red] {\color{red}(2cm+1.5cm,1.5cm-1cm)} circle (3pt); +\emph{\TFRGB{Implicite}{implicit}} : \BS{fill} [red] {\color{red}(2cm+1.5cm,1.5cm-1cm)} circle (3pt); \\ \hline \end{tabular} @@ -578,7 +579,7 @@ at (1,1 {\color{red}-|} 3,3) \end{tabular} % %\subsubsection{Position calculée avec \og librairy calc \fg} -\SbSSCT{Position calculée avec \og librairy calc \fg}{Calculated positions with \og calc librairy calc \fg} +\SbSSCT{Position calculée avec \og library calc \fg}{Calculated positions with \og calc library calc \fg} \begin{center} \RRR{13-5} @@ -607,7 +608,7 @@ at (1,1 {\color{red}-|} 3,3) %\subsubsection{Tangentes avec \og librairy calc \fg} -\SbSSCT{Tangentes avec \og librairy calc \fg}{Tangents with \og calc librairy \fg} +\SbSSCT{Tangentes avec \og library calc \fg}{Tangents with \og calc library \fg} \begin{center} \RRR{13-2-4} diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoul.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoul.tex index 1a4baa19722..bed85578523 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoul.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzcoul.tex @@ -523,10 +523,10 @@ path fading=circle with fuzzy edge 20 percent & path fading=fuzzy ring 15 percen \emph{\TFRGB{Création}{Creation}} & \emph{\TFRGB{Visualisation}{Visualization}} \\ \hline \parbox[c]{11cm}{ -\ESS{begin\AC{tikzfadingfrompicture}}[\RDD{name}=filtre] \\ +\ESS{tikzfadingfrompicture}[\RDD{name}=filtre] \\ \BS{shade}[left color=yellow,right color=blue!100] (0,0) rectangle (2,2); \\ \BS{fill}[blue!50] (1,1) circle (0.7);\\ -\ESS{end\AC{tikzfadingfrompicture}} } +\BS{end\AC{tikzfadingfrompicture}} } & \begin{tikzpicture}[baseline=1cm] \shade[left color=yellow,right color=blue!100] (0,0) rectangle (2,2); @@ -534,10 +534,10 @@ path fading=circle with fuzzy edge 20 percent & path fading=fuzzy ring 15 percen \end{tikzpicture} \\ \hline \parbox[c]{11cm}{ -\ESS{begin\AC{tikzfadingfrompicture}}[\RDD{name}=tikz] \\ +\ESS{tikzfadingfrompicture}[\RDD{name}=tikz] \\ \BS{node} [draw,text=transparent!20] \\ \AC{\BS{fontfamily}\AC{ptm}\BS{fontsize}\AC{25}\AC{25}\BS{bfseries}\BS{selectfont} TikZ};\\ -\ESS{end\AC{tikzfadingfrompicture}} } +\BS{end\AC{tikzfadingfrompicture}} } & \begin{tikzpicture}[baseline=-.3cm] \node [draw,text=transparent!20] diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzdeco.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzdeco.tex index 49044f6f3b2..dc21b6ef913 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzdeco.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzdeco.tex @@ -39,7 +39,7 @@ \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) ;} +\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration}=\RDDX{straight zigzag}{decoration}] (0,0) - - (2,2) ;} \\ \hline \begin{tikzpicture} \draw [dotted,red](0,0) -- (2,2) ; @@ -100,7 +100,7 @@ \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{ \BSS{draw}[decorate,decoration=}\\ -\multicolumn{3}{|c|}{\AC{straight zigzag,\RDD{meta-segment length=0.5cm}}] (1,1) circle (1); } +\multicolumn{3}{|c|}{\AC{straight zigzag,\RDD{meta-segment length}=0.5cm}] (1,1) circle (1); } \\ \hline \begin{tikzpicture}[baseline=0pt] \draw [dotted,red](1,1) circle (1); @@ -130,7 +130,7 @@ \label{alea} \begin{tabular}{|c|c|c|} \hline -\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration=random steps}] (0,0) - - (2,2) ;} +\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration}=\RDDX{random steps}{decoration}] (0,0) - - (2,2) ;} \\ \hline \begin{tikzpicture} \draw [dotted,red](0,0) -- (2,2) ; @@ -201,7 +201,7 @@ \multicolumn{3}{|c|}{ \BSS{draw}[decorate,decoration= % %decorate,decoration= }\\ %\multicolumn{3}{|c|}{ -\AC{random steps,\RDD{segment length=2cm}}] (1,1) circle (1); } +\AC{random steps,\RDD{segment length}=2cm}] (1,1) circle (1); } \\ \hline \begin{tikzpicture} \draw [dotted,red](1,1) circle (1); @@ -229,7 +229,7 @@ \subsubsection{\og saw \fg } \begin{tabular}{|c|c|c|} \hline -\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration=saw}] (0,0) - - (2,2) ;} +\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration}=\RDDX{saw}{decoration}] (0,0) - - (2,2) ;} \\ \hline \begin{tikzpicture} \draw [dotted,red](0,0) -- (2,2) ; @@ -285,7 +285,7 @@ \bigskip \begin{tabular}{|c|c|c|} \hline -\multicolumn{3}{|c|}{ \BSS{draw}[decorate,decoration=\AC{saw,\RDD{segment length=20pt}}] (1,1) circle (1); } +\multicolumn{3}{|c|}{ \BSS{draw}[decorate,decoration=\AC{saw,\RDD{segment length}=20pt}] (1,1) circle (1); } \\ \hline \begin{tikzpicture} \draw [dotted,red](1,1) circle (1); @@ -312,7 +312,7 @@ \subsubsection{\og zigzag \fg } \begin{tabular}{|c|c|c|} \hline -\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration=zigzag}] (0,0) - - (2,2) ;} +\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration}=\RDDX{zigzag}{decoration}] (0,0) - - (2,2) ;} \\ \hline \begin{tikzpicture} \draw [dotted,red](0,0) -- (2,2) ; @@ -373,7 +373,7 @@ \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{ \BSS{draw}[decorate,decoration= - \AC{saw,\RDD{segment length=20pt}}] (1,1) circle (1);} + \AC{saw,\RDD{segment length}=20pt }] (1,1) circle (1);} \\ \hline \begin{tikzpicture} \draw [dotted,red](1,1) circle (1); @@ -490,7 +490,7 @@ amplitude=1cm & amplitude=0.5cm & aspect=0.25 \subsubsection{\og bumps \fg } \begin{tabular}{|c|c|c|} \hline -\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration=bumps}] (0,0) - - (2,2) ;} +\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration}=\RDDX{bumps}{decoration}] (0,0) - - (2,2) ;} \\ \hline \begin{tikzpicture} \draw [dotted,red](0,0) -- (2,2) ; @@ -543,7 +543,7 @@ amplitude=1cm & amplitude=0.5cm & aspect=0.25 \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{ \BSS{draw}[decorate,decoration= %\{decorate,decoration= }\\ %\multicolumn{3}{|c|}{ -\AC{bumps,\RDD{amplitude=10pt}}] (1,1) circle (1);} +\AC{bumps,\RDD{amplitude}=10pt}] (1,1) circle (1);} \\ \hline \begin{tikzpicture} \draw [dotted,red](1,1) circle (1); @@ -571,7 +571,7 @@ amplitude=1cm & amplitude=0.5cm & aspect=0.25 \subsubsection{\og coil \fg } \begin{tabular}{|c|c|c|} \hline -\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration=coil}] (0,0) - - (2,2) ;} +\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration}=\RDDX{coil}{decoration}] (0,0) - - (2,2) ;} \\ \hline \begin{tikzpicture} \draw [dotted,red](0,0) -- (2,2) ; @@ -654,7 +654,7 @@ amplitude=1cm & amplitude=0.5cm & aspect=0.25 \bigskip \begin{tabular}{|c|c|c|} \hline -\multicolumn{3}{|c|}{ \BSS{draw}[decorate,decoration= \AC{coil,\RDD{amplitude=0.5cm}}] (1,1) circle (1);} +\multicolumn{3}{|c|}{ \BSS{draw}[decorate,decoration= \AC{coil,\RDD{amplitude}=0.5cm}] (1,1) circle (1);} \\ \hline \begin{tikzpicture} \draw [dotted,red](1,1) circle (1); @@ -674,7 +674,7 @@ amplitude=1cm & amplitude=0.5cm & aspect=0.25 (1,1) circle (1); \end{tikzpicture} \\ \hline -\RDD{amplitude}=0.5 cm & \RDD{segment lenght}=1cm & \RDD{aspect}=0.25 \\ +\RDD{amplitude}=0.5 cm & \RDD{segment length}=1cm & \RDD{aspect}=0.25 \\ & amplitude=0.5cm & amplitude=0.5cm \\ \hline \end{tabular} @@ -738,7 +738,7 @@ amplitude=1cm & amplitude=0.5cm & aspect=0.25 \subsubsection{\og snake \fg } \begin{tabular}{|c|c|c|} \hline -\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration=snake}] (0,0) - - (2,2) ;} +\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration}=\RDDX{snake}{decoration}] (0,0) - - (2,2) ;} \\ \hline \begin{tikzpicture} \draw [dotted,red](0,0) -- (2,2) ; @@ -792,7 +792,7 @@ amplitude=1cm & amplitude=0.5cm & aspect=0.25 \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{ \BSS{draw}[decorate,decoration= snake, -\RDD{amplitude=5pt}] (1,1) circle (1);} +\RDD{amplitude}=5pt] (1,1) circle (1);} \\ \hline \begin{tikzpicture} \draw [dotted,red](1,1) circle (1); @@ -833,7 +833,7 @@ snake, \subsubsection{\og border \fg } \begin{tabular}{|c|c|c|} \hline -\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration=border}] (0,0) - - (2,2) ;} +\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration}=\RDDX{border}{decoration}] (0,0) - - (2,2) ;} \\ \hline \begin{tikzpicture} \draw [dotted,red](0,0) -- (2,2) ; @@ -898,7 +898,7 @@ amplitude=0.5cm \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{ \BSS{draw}[decorate,decoration= -\AC{border,\RDD{amplitude=0.5cm}}] (1,1) circle (1);} +\AC{border,\RDD{amplitude}=0.5cm}] (1,1) circle (1);} \\ \hline \begin{tikzpicture} \draw [decorate,decoration={border,amplitude=0.5cm}] @@ -931,7 +931,7 @@ amplitude=0.5cm \draw [decorate,decoration=brace] (0,0) -- (3,0); \end{tikzpicture} & - \BS{draw} [decorate,\RDD{decoration=brace}] (0,0) - - (3,1); + \BS{draw} [decorate,\RDD{decoration}=\RDDX{brace}{decoration}] (0,0) - - (3,1); \\ \hline \end{tabular} @@ -939,7 +939,7 @@ amplitude=0.5cm \begin{tabular}{|c|c|c|c|} \hline \multicolumn{3}{|c|}{ \BSS{draw}[decorate,decoration= -\AC{brace,\RDD{amplitude=0.5cm}}] (1,1) circle (1); ;} +\AC{brace,\RDD{amplitude}=0.5cm}] (1,1) circle (1); ;} \\ \hline \begin{tikzpicture} \draw [dotted,red](0,0) -- (2,2) ; @@ -994,7 +994,7 @@ amplitude=0.5cm \begin{tabular}{|c|c|} \hline \multicolumn{2}{|c|}{ \BSS{draw}[decorate,decoration= -\AC{expanding waves,\RDD{segment length=0.5cm}}] (1,1) circle (1);} +\AC{expanding waves,\RDD{segment length}=0.5cm}] (1,1) circle (1);} \\ \hline \begin{tikzpicture} \draw [dotted,red](0,0) -- (2,2) ; @@ -1021,7 +1021,7 @@ amplitude=0.5cm \subsubsection{\og ticks \fg } \begin{tabular}{|c|c|c|} \hline -\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration=ticks}] (0,0) - - (2,2) ;} +\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration}=\RDDX{ticks}{decoration}] (0,0) - - (2,2) ;} \\ \hline \begin{tikzpicture} \draw [dotted,red](0,0) -- (2,2) ; @@ -1072,7 +1072,7 @@ amplitude=0.5cm \begin{tabular}{|c|c|c|} \hline \multicolumn{3}{|c|}{ \BSS{draw}[decorate,decoration= -\AC{ticks,\RDD{segment length=1cm}}] (1,1) circle (1); } +\AC{ticks,\RDD{segment length}=1cm}] (1,1) circle (1); } \\ \hline \begin{tikzpicture} \draw [dotted,red] (1,1) circle (1); @@ -1098,7 +1098,7 @@ amplitude=0.5cm \subsubsection{\fg waves \fg } \begin{tabular}{|c|c|c|} \hline -\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration=waves}] (0,0) - - (2,2) ;} +\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration}=\RDDX{waves}{decoration}] (0,0) - - (2,2) ;} \\ \hline \begin{tikzpicture} \draw [dotted,red](0,0) -- (2,2) ; @@ -1185,126 +1185,139 @@ amplitude=0.5cm \end{tabular} %\newpage -\subsubsection{\fg show path construction \fg } +\subsubsection{\og show path construction \fg } -\emph{\TFRGB{Chemin à décorer}{path to decorate}} +%\emph{\TFRGB{Chemin à décorer}{path to decorate}} -\begin{tabular}{|l|} \hline +\begin{tabular}{|l|} \hline +\multicolumn{1}{|c|}{ \emph{\TFRGB{Chemin à décorer}{path to decorate}} } +\\ \hline \BS{draw} [blue,dashed] (0,0) - - (2,1) arc (-20:135:1) - - cycle \\ -(3,2) .. controls (7,0) and (2,0) .. (5,2) - - (6,2) sin (7.57,0) - - (8,3) - - cycle; +(3,2) .. controls (7,0) and (2,0) .. (5,2) - - (6,2) sin (7.57,0) - - (8,3) ; \\ \hline \begin{tikzpicture} -\draw [blue,dashed] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) -- cycle; +\draw [blue,dashed] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) ; \end{tikzpicture} \\ \hline \end{tabular} -\newpage +\bigskip -\Par{composants linéaires \og lineto \fg }{ Linear components : \og lineto \fg } : -\begin{tabular}{|l|} \hline +\begin{tabular}{|l|} \hline +\multicolumn{1}{|c|}{ \textbf{\TFRGB{composantes linéaires }{ Linear components} : \og lineto \fg } } +\\ \hline + decoration=\{ \RDD{show path construction},\\ \RDD{lineto code}=\AC{ \BS{draw} [red,ultra thick,->] \\ (\BSS{tikzinputsegmentfirst}) - - (\BSS{tikzinputsegmentlast}); },\} \\ \hline \begin{tikzpicture} -\draw [blue,dashed] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) -- cycle; +\draw [blue,dashed] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) ; \path [decorate,decoration={show path construction,lineto code={ \draw [red,ultra thick,->] (\tikzinputsegmentfirst) -- (\tikzinputsegmentlast); -},} ] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) -- cycle; +},} ] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) ;; \end{tikzpicture} \\ \hline \end{tabular} \bigskip -\Par{Fermetures de chemin \og closepath \fg }{ Path terminations : \og closepath \fg } : +%\Par{Fermetures de chemin \og closepath \fg }{ Path terminations : \og closepath \fg } : -\begin{tabular}{|l|} \hline +\begin{tabular}{|l|} \hline +\multicolumn{1}{|c|}{ \textbf{\TFRGB{Fermetures de chemin }{ Path terminations} : \og closepath \fg } } +\\ \hline decoration=\{ \RDD{show path construction},\\ \RDD{closepath code}=\AC{ \BS{draw} [red,ultra thick,->] \\ (\BSS{tikzinputsegmentfirst}) - - (\BSS{tikzinputsegmentlast}); },\} \\ \hline \begin{tikzpicture} -\draw [blue,dashed] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) -- cycle; +\draw [blue,dashed] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) ; \path [decorate,decoration={show path construction,closepath code={ \draw [red,ultra thick,->] (\tikzinputsegmentfirst) -- (\tikzinputsegmentlast); -},} ] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) -- cycle; +},} ] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) ; \end{tikzpicture} \\ \hline \end{tabular} \bigskip -\Par{coupure de chemin \og moveto code \fg }{Broken paths : \og moveto code \fg } : +%\Par{coupure de chemin \og moveto code \fg }{Broken paths : \og moveto code \fg } : -\begin{tabular}{|l|} \hline +\begin{tabular}{|l|} \hline +\multicolumn{1}{|c|}{ \textbf{\TFRGB{coupure de chemin }{ Broken paths} : \og moveto \fg } } +\\ \hline decoration=\{ \RDD{show path construction},\\ \RDD{moveto code}=\AC{ \BS{draw} [red,ultra thick,->] \\ (\BSS{tikzinputsegmentfirst}) - - (\BSS{tikzinputsegmentlast}); },\} \\ \hline \begin{tikzpicture} -\draw [blue,dashed] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) -- cycle; +\draw [blue,dashed] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) ; \path [decorate,decoration={show path construction,moveto code={ \draw [red,ultra thick,->] (\tikzinputsegmentfirst) -- (\tikzinputsegmentlast); -},} ] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) -- cycle; +},} ] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) ; \end{tikzpicture} \\ \hline \end{tabular} \newpage -\Par{composants courbes \og curveto \fg }{ Curved segments : \og curveto \fg }: +%\Par{composants courbes \og curveto \fg }{ Curved segments : \og curveto \fg }: -\begin{tabular}{|l|} \hline +\begin{tabular}{|l|} \hline +\multicolumn{1}{|c|}{ \textbf{\TFRGB{composants courbes }{ Curved segments} : \og curveto \fg } } +\\ \hline decoration=\{ \RDD{show path construction},\\ \RDD{curveto code}=\AC{ \BS{draw} [red,ultra thick,->] \\ (\BSS{tikzinputsegmentfirst}) - - (\BSS{tikzinputsegmentlast}); },\} \\ \hline \begin{tikzpicture} -\draw [blue,dashed] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) -- cycle; +\draw [blue,dashed] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) ; \path [decorate,decoration={show path construction,curveto code={ \draw [red,ultra thick,->] (\tikzinputsegmentfirst) -- (\tikzinputsegmentlast); -},} ] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) -- cycle; +},} ] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) ; \end{tikzpicture} \\ \hline -\end{tabular} - -\bigskip - -\begin{tabular}{|l|} \hline +%\end{tabular} +% +%\bigskip +% +%\begin{tabular}{|l|} +\hline decoration=\{ \RDD{show path construction},\\ \RDD{curveto code}=\AC{ \BS{draw} [red,ultra thick,->] \\ (\BSS{tikzinputsegmentfirst}) - - (\BSS{tikzinputsegmentsupporta}); },\} \\ \hline \begin{tikzpicture} -\draw [blue,dashed] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) -- cycle; +\draw [blue,dashed] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) ; \path [decorate,decoration={show path construction,curveto code={ \draw [red,ultra thick,->] (\tikzinputsegmentfirst) -- (\tikzinputsegmentsupporta); -},} ] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) -- cycle; +},} ] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) ; \end{tikzpicture} \\ \hline -\end{tabular} - -\bigskip - -\begin{tabular}{|l|} \hline +%\end{tabular} +% +%\bigskip +% +%\begin{tabular}{|l|} +\hline decoration=\{ \RDD{show path construction},\\ \RDD{curveto code}=\AC{ \BS{draw} [red,ultra thick,->] \\ (\BSS{tikzinputsegmentlast}) - - (\BSS{tikzinputsegmentsupportb}); },\} \\ \hline \begin{tikzpicture} -\draw [blue,dashed] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) -- cycle; +\draw [blue,dashed] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) ; \path [decorate,decoration={show path construction,curveto code={ \draw [red,ultra thick,->] (\tikzinputsegmentlast) -- (\tikzinputsegmentsupportb); -},} ] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) -- cycle; +},} ] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) ; \end{tikzpicture} \\ \hline -\end{tabular} - -\bigskip - -\begin{tabular}{|l|} \hline +%\end{tabular} +% +%\bigskip +% +%\begin{tabular}{|l|} +\hline decoration=\{ \RDD{show path construction},\\ \RDD{curveto code}=\AC{ \BS{draw} [red,ultra thick,->] \\ (\BSS{tikzinputsegmentfirst}) .. controls (\BSS{tikzinputsegmentsupporta}) \\ and (\BSS{tikzinputsegmentsupportb}) .. (\BSS{tikzinputsegmentlast}) @@ -1312,12 +1325,15 @@ and (\BSS{tikzinputsegmentsupportb}) .. (\BSS{tikzinputsegmentlast}) },\} \\ \hline \begin{tikzpicture} -\draw [blue,dashed] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) -- cycle; +\draw [blue,dashed] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) ; \path [decorate,decoration={show path construction,curveto code={ -\draw [red,ultra thick,->] (\tikzinputsegmentfirst) .. controls (\tikzinputsegmentsupporta) and (\tikzinputsegmentsupportb) .. (\tikzinputsegmentlast); -},} ] (0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) -- cycle; +\draw [red,ultra thick,->] (\tikzinputsegmentfirst) .. controls (\tikzinputsegmentsupporta) and (\tikzinputsegmentsupportb) .. (\tikzinputsegmentlast);} } ] +(0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) -- (6,2) sin (7.57,0) -- (8,3) ; +%(0,0) -- (2,1) arc (-20:135:1) -- cycle (3,2) .. controls (7,0) and (2,0) .. (5,2) -- (6,2) sin (7.57,0) -- (8,3) ; \end{tikzpicture} \\ \hline +.. controls (7,0) and (2,0) .. (5,2) \DW{} +\\ \hline \end{tabular} %- (\tikzinputsegmentlast) @@ -1341,7 +1357,7 @@ and (\BSS{tikzinputsegmentsupportb}) .. (\BSS{tikzinputsegmentlast}) \SbSbSSCT{Sa marque à une position}{Personal mark at one position} \begin{tabular}{|c|} \hline -\BS{draw} [decorate,decoration=\{markings,\RDD{mark=at position} 1cm \\ \RDD{ with} \{ +\BS{draw} [decorate,decoration=\{markings,\RDD{mark}=\RDDX{at position}{mark} 1cm \\ \RDD{ with} \{ \textbf{\BS{draw}[red] (-2pt,-2pt) - - (2pt,2pt);} \textbf{\BS{draw}[red](2pt,-2pt) - - (-2pt,2pt);}\\ \textbf{\BS{draw}[red] (-2pt,-2pt) rectangle (2pt,2pt); } @@ -1700,7 +1716,7 @@ mark=at position 0.4 with \bigskip \begin{tabular}{|c|} \hline -\BS{tikz} \BS{draw}[decorate,\RDD{decoration=footprints}] (0,0) -- (10,0); +\BS{tikz} \BS{draw}[decorate,\RDD{decoration}=\RDDX{footprints}{decoration}] (0,0) -- (10,0); \\ \hline \tikz \draw[decorate,decoration=footprints] (0,0) -- (10,0); @@ -1711,7 +1727,7 @@ mark=at position 0.4 with \bigskip \begin{tabular}{|c|c|c|c|} \hline -\multicolumn{4}{|c|}{\BSS{draw}[decorate,decoration=\AC{footprints,\RDD{foot of = gnome}}] (0,2.5) - - (3,2.5);} +\multicolumn{4}{|c|}{\BSS{draw}[decorate,decoration=\AC{footprints,\RDD{foot of} = \RDDX{gnome}{foot of}}] (0,2.5) - - (3,2.5);} \\ \hline \tikz \draw[decorate,decoration={footprints,foot of = gnome}] (0,2.5) -- (3,2.5); & @@ -1722,7 +1738,7 @@ mark=at position 0.4 with \tikz \draw[decorate,decoration={footprints,foot of = felis silvestris}] (0,2.5) -- (3,2.5); \\ \hline -foot of = \RDD{gnome} & foot of = \RDD{human} & foot of = \RDD{bird} & foot of = \RDD{felis silvestris} \\ +foot of = \RDDX{gnome}{foot of} & foot of = \RDDX{human}{foot of} & foot of = \RDDX{bird}{foot of} & foot of = \RDDX{felis silvestris}{foot of} \\ & (\dft) & & \\ \hline \end{tabular} @@ -1849,7 +1865,7 @@ foot of = gnome & foot of = human & foot of = bird & foot of = felis silvestris \begin{center} \begin{tabular}{|c|c|c|c|} \hline -\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration=crosses}] (0,0) - - (3,0);} +\multicolumn{3}{|c|}{\BSS{draw}[decorate,\RDD{decoration}=\RDDX{crosses}{decoration}] (0,0) - - (3,0);} \\ \hline \tikz \draw[decorate,decoration=crosses] (0,0) -- (3,0); & @@ -1900,7 +1916,7 @@ decorate with/.style= {decorate,decoration={shape backgrounds,shape=#1,shape size=2mm}}} \begin{tabular}{|c|c|c|c|} \hline - \multicolumn{4}{|c|}{\BS{draw}[\RDD{decorate with=dart}] (0,2.5) - - (3,2.5); } + \multicolumn{4}{|c|}{\BS{draw}[\RDD{decorate with}=dart] (0,2.5) - - (3,2.5); } \\ \hline \tikz \draw[decorate with=dart] (0,2.5) -- (3,2.5); & @@ -1934,7 +1950,7 @@ star & regular polygon & signal & kite \begin{tabular}{|l|c|}\hline \multicolumn{2}{|c|}{ \TFRGB{Formes disponibles}{Shapes available} } \\ \hline -\emph{\TFRGB{Syntaxe}{Syntax}} &\BSS{draw}[decorate,decoration=\{ \RDD{shape backgrounds},\RDD{shape=dart},\\ +\emph{\TFRGB{Syntaxe}{Syntax}} &\BSS{draw}[decorate,decoration=\{ \RDD{shape backgrounds},\RDD{shape}=dart,\\ & shape size=.5cm,shape sep=1cm\}] (0,0) - - (10,0); \\ \hline \emph{\TFRGB{Autre syntaxe}{Other syntax}} @@ -2137,7 +2153,7 @@ shape border rotate=180 \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);} + \multicolumn{2}{|c|}{ \RDD{shape sloped}=true \}] (0,0) - - (3,3);} \\ \hline \begin{tikzpicture} \draw[dotted,red] (0,0) -- (3,3); @@ -2160,7 +2176,7 @@ shape sloped=false \begin{tabular}{|c|c|} \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) arc (0:180:3 and 2);} + \multicolumn{2}{|c|}{ \RDD{shape sloped}=true\}] (0,0) arc (0:180:3 and 2);} \\ \hline \begin{tikzpicture} \draw[dotted,red] (0,0) arc (0:180:3 and 2); @@ -2493,7 +2509,7 @@ text color=blue, \RDD{reverse path} }] (1,1) circle (1); \end{tikzpicture} \\ \hline -align=\AC{\RDD{align=left}} & align=\AC{\RDD{align=center}} & align=\AC{\RDD{align=right}} \\ +align=\AC{\RDD{align}=\RDDX{left}{align}} & align=\AC{\RDD{align}=\RDDX{center}{align}} & align=\AC{\RDD{align}=\RDDX{right}{align}} \\ \hline \end{tabular} @@ -2501,7 +2517,7 @@ align=\AC{\RDD{align=left}} & align=\AC{\RDD{align=center}} & align=\AC{\RDD{ali \begin{tabular}{|c|c|} \hline \multicolumn{2}{|c|}{ \BS{draw}[ decorate,decoration=\{text along path,text=\AC{texte},} \\ - \multicolumn{2}{|c|}{ text align=\AC{align=left,\RDD{left indent=1cm}} \} ] (1,1) circle (1);} + \multicolumn{2}{|c|}{ text align=\AC{align=left,\RDD{left indent}=1cm} \} ] (1,1) circle (1);} \\ \hline \begin{tikzpicture} \draw[dotted] (1,1) circle (1); @@ -2787,14 +2803,14 @@ decoration=coil & decoration=zigzag & decoration=ticks \\ \SbSbSSCT{Décoration d'un graphe}{Graph decoration} \begin{tabular}{|c|c|}\hline -\multicolumn{2}{|c|}{\BSS{draw}[decorate, -\RDD{ecorate,decoration=footprints}] plot coordinates {(0,0) (2,1) (4,-2) (6,2) };} +\multicolumn{2}{|c|}{\BSS{draw}[ +\RDD{decorate},decoration=footprints] plot coordinates {(0,0) (2,1) (4,-2) (6,1) };} \\ \hline \begin{tikzpicture}[baseline=0pt] \draw[->,blue] (-.1,0) -- (6,0); \draw[->,blue] (0,-2.5) -- (0,2.5); - \draw[red,dashed] plot coordinates {(0,0) (2,1) (4,-2) (6,2) }; - \draw[decorate,decoration=footprints] plot coordinates {(0,0) (2,1) (4,-2) (6,2) }; + \draw[red,dashed] plot coordinates {(0,0) (2,1) (4,-2) (6,1) }; + \draw[decorate,decoration=footprints] plot coordinates {(0,0) (2,1) (4,-2) (6,1) }; \end{tikzpicture} & \begin{tikzpicture}[domain=0:6.28,x=0.7cm,baseline=0pt] @@ -2804,7 +2820,7 @@ decoration=coil & decoration=zigzag & decoration=ticks \\ \draw[decorate,decoration=footprints] plot (\x,{sin(\x r)}); \end{tikzpicture} \\ \hline -plot coordinates {(0,0) (2,1) (4,-2) (6,2) } +plot coordinates {(0,0) (2,1) (4,-2) (6,1) } & plot (\BS{x},\AC{sin(\BS{x} r)}) \\ \hline @@ -2819,7 +2835,7 @@ plot coordinates {(0,0) (2,1) (4,-2) (6,2) } \begin{tabular}{|c|} \hline \BS{draw} [decorate, -decoration=\AC{zigzag,\RDD{pre=}footprints,\RDD{pre length=}5cm}](0,0) -- (10,0); +decoration=\AC{zigzag,\RDD{pre}=footprints,\RDD{pre length}=5cm}](0,0) -- (10,0); \\ \hline \begin{tikzpicture}[baseline=0pt] \draw[red!20] (0,-0.5) grid (10,0.5); @@ -2827,7 +2843,7 @@ decoration=\AC{zigzag,\RDD{pre=}footprints,\RDD{pre length=}5cm}](0,0) -- (10,0) \draw [decorate,decoration={zigzag,pre=footprints,pre length=5cm}] (0,0) -- (10,0); \end{tikzpicture} \\ \hline -decoration=\AC{zigzag,\RDD{pre=}footprints,\RDD{pre length=}5cm} +decoration=\AC{zigzag,\RDD{pre}=footprints,\RDD{pre length}=5cm} \\ \hline \begin{tikzpicture}[baseline=0pt] \draw[red!20] (0,-0.5) grid (10,0.5); @@ -2835,7 +2851,7 @@ decoration=\AC{zigzag,\RDD{pre=}footprints,\RDD{pre length=}5cm} \draw [decorate,decoration={zigzag,post=footprints,post length=5cm}] (0,0) -- (10,0); \end{tikzpicture} \\ \hline -decoration=\AC{zigzag,\RDD{post=}footprints,\RDD{post length=}5cm} +decoration=\AC{zigzag,\RDD{post}=footprints,\RDD{post length}=5cm} \\ \hline \begin{tikzpicture}[baseline=0pt] \draw[red!20] (0,-0.5) grid (10,0.5); @@ -2843,8 +2859,8 @@ decoration=\AC{zigzag,\RDD{post=}footprints,\RDD{post length=}5cm} \draw [decorate,decoration={zigzag,pre=footprints,pre length=3cm,post=expanding waves,post length=3cm}] (0,0) -- (10,0); \end{tikzpicture} \\ \hline -decoration=\AC{zigzag,\RDD{pre=}footprints,\RDD{pre length=}3cm, -,\RDD{post=}expanding waves,\RDD{post length=}3cm} +decoration=\AC{zigzag,\RDD{pre}=footprints,\RDD{pre length}=3cm, +,\RDD{post}=expanding waves,\RDD{post length}=3cm} \\ \hline \end{tabular} @@ -2899,15 +2915,15 @@ decoration=\AC{zigzag,\RDD{pre=}footprints,\RDD{pre length=}3cm, \og lineto \fg \textbf{} \BS{draw} [decorate, -decoration=\AC{zigzag,\RDD{pre=}lineto,\RDD{pre length=}5cm}](0,0) -- (10,0); +decoration=\AC{zigzag,lineto,\RDD{pre length}=5cm}](0,0) -- (10,0); \\ \hline \begin{tikzpicture}[baseline=0pt] \draw[red!20] (0,-0.5) grid (10,0.5); \draw[dotted,red] (0,0) -- (10,0);] -\draw [decorate,decoration={zigzag,pre=lineto,pre length=5cm}] (0,0) -- (10,0); +\draw [decorate,decoration={zigzag,pre=lineto,pre length}=5cm] (0,0) -- (10,0); \end{tikzpicture} \\ \hline -decoration=\AC{zigzag,\RDD{pre=}lineto,\RDD{pre length=}5cm} +decoration=\AC{ zigzag,\RDD{pre}=lineto,\RDD{pre length}=5cm } \\ \hline \begin{tikzpicture}[baseline=0pt] \draw[red!20] (0,-0.5) grid (10,0.5); @@ -2915,7 +2931,7 @@ decoration=\AC{zigzag,\RDD{pre=}lineto,\RDD{pre length=}5cm} \draw [decorate,decoration={zigzag,post=lineto,post length=5cm}] (0,0) -- (10,0); \end{tikzpicture} \\ \hline -decoration=\AC{zigzag,\RDD{post=}lineto,\RDD{post length=}5cm} +decoration=\AC{zigzag,\RDD{post}=lineto,\RDD{post length}=5cm} \\ \hline \begin{tikzpicture}[baseline=0pt] \draw[red!20] (0,-0.5) grid (10,0.5); @@ -2923,8 +2939,8 @@ decoration=\AC{zigzag,\RDD{post=}lineto,\RDD{post length=}5cm} \draw [decorate,decoration={zigzag,pre=lineto,pre length=3cm,post=lineto,post length=3cm}] (0,0) -- (10,0); \end{tikzpicture} \\ \hline -decoration=\AC{zigzag,\RDD{pre=}lineto,\RDD{pre length=}3cm, -,\RDD{post=}curveto,\RDD{post length=}3cm} +decoration=\AC{zigzag,\RDD{pre}=lineto,\RDD{pre length}=3cm, +,\RDD{post}=curveto,\RDD{post length}=3cm} \\ \hline \end{tabular} @@ -2937,7 +2953,7 @@ decoration=\AC{zigzag,\RDD{pre=}lineto,\RDD{pre length=}3cm, \og curveto \fg \\ \hline \BS{draw} [decorate, -decoration=\AC{zigzag,\RDD{pre=}curveto,\RDD{pre length=}5cm}](0,0) -- (10,0); +decoration=\AC{zigzag,\RDD{pre}=curveto,\RDD{pre length}=5cm}](0,0) -- (10,0); \\ \hline \begin{tikzpicture}[baseline=0pt] \draw[red!20] (0,-0.5) grid (10,0.5); @@ -2945,7 +2961,7 @@ decoration=\AC{zigzag,\RDD{pre=}curveto,\RDD{pre length=}5cm}](0,0) -- (10,0); \draw [decorate,decoration={zigzag,pre=curveto,pre length=5cm}] (0,0) -- (10,0); \end{tikzpicture} \\ \hline -decoration=\AC{zigzag,\RDD{pre=}curveto,\RDD{pre length=}5cm} +decoration=\AC{zigzag,\RDD{pre}=curveto,\RDD{pre length}=5cm} \\ \hline \begin{tikzpicture}[baseline=0pt] \draw[red!20] (0,-0.5) grid (10,0.5); @@ -2953,7 +2969,7 @@ decoration=\AC{zigzag,\RDD{pre=}curveto,\RDD{pre length=}5cm} \draw [decorate,decoration={zigzag,post=curveto,post length=5cm}] (0,0) -- (10,0); \end{tikzpicture} \\ \hline -decoration=\AC{zigzag,\RDD{post=}curveto,\RDD{post length=}5cm} +decoration=\AC{zigzag,\RDD{post}=curveto,\RDD{post length}=5cm} \\ \hline \begin{tikzpicture}[baseline=0pt] \draw[red!20] (0,-0.5) grid (10,0.5); @@ -2961,8 +2977,8 @@ decoration=\AC{zigzag,\RDD{post=}curveto,\RDD{post length=}5cm} \draw [decorate,decoration={zigzag,pre=curveto,pre length=3cm,post=curveto,post length=3cm}] (0,0) -- (10,0); \end{tikzpicture} \\ \hline -decoration=\AC{zigzag,\RDD{pre=}curveto,\RDD{pre length=}3cm, -,\RDD{post=}curveto,\RDD{post length=}3cm} +decoration=\AC{zigzag,\RDD{pre}=curveto,\RDD{pre length}=3cm, +,\RDD{post}=curveto,\RDD{post length}=3cm} \\ \hline \end{tabular} @@ -2975,7 +2991,7 @@ decoration=\AC{zigzag,\RDD{pre=}curveto,\RDD{pre length=}3cm, \og moveto \fg \\ \hline \BS{draw} [decorate, -decoration=\AC{zigzag,\RDD{pre=}moveto,\RDD{pre length=}5cm}](0,0) -- (10,0); +decoration=\AC{zigzag,\RDD{pre}=moveto,\RDD{pre length}=5cm}](0,0) -- (10,0); \\ \hline \begin{tikzpicture}[baseline=0pt] \draw[red!20] (0,-0.5) grid (10,0.5); @@ -2983,7 +2999,7 @@ decoration=\AC{zigzag,\RDD{pre=}moveto,\RDD{pre length=}5cm}](0,0) -- (10,0); \draw [decorate,decoration={zigzag,pre=moveto,pre length=5cm}] (0,0) -- (10,0); \end{tikzpicture} \\ \hline -decoration=\AC{zigzag,\RDD{pre=}moveto,\RDD{pre length=}5cm} +decoration=\AC{zigzag,\RDD{pre}=moveto,\RDD{pre length}=5cm} \\ \hline \begin{tikzpicture}[baseline=0pt] \draw[red!20] (0,-0.5) grid (10,0.5); @@ -2991,7 +3007,7 @@ decoration=\AC{zigzag,\RDD{pre=}moveto,\RDD{pre length=}5cm} \draw [decorate,decoration={zigzag,post=moveto,post length=5cm}] (0,0) -- (10,0); \end{tikzpicture} \\ \hline -decoration=\AC{zigzag,\RDD{post=}moveto,\RDD{post length=}5cm} +decoration=\AC{zigzag,\RDD{post}=moveto,\RDD{post length}=5cm} \\ \hline \begin{tikzpicture}[baseline=0pt] \draw[red!20] (0,-0.5) grid (10,0.5); @@ -2999,8 +3015,8 @@ decoration=\AC{zigzag,\RDD{post=}moveto,\RDD{post length=}5cm} \draw [decorate,decoration={zigzag,pre=moveto,pre length=3cm,post=moveto,post length=3cm}] (0,0) -- (10,0); \end{tikzpicture} \\ \hline -decoration=\AC{zigzag,\RDD{pre=}moveto,\RDD{pre length=}3cm, -,\RDD{post=}moveto,\RDD{post length=}3cm} +decoration=\AC{zigzag,\RDD{pre}=moveto,\RDD{pre length}=3cm, +,\RDD{post}=moveto,\RDD{post length}=3cm} \\ \hline \end{tabular} diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzdepend.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzdepend.tex new file mode 100644 index 00000000000..b6c0268d266 --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzdepend.tex @@ -0,0 +1,64 @@ +\begin{dependency} +\begin{deptext} +CH$_4$ \& + \& 2O$_2$ \& ---> \& CO$_2$ \& + \& 2H$_2$0 \\ +\end{deptext} +\depedge{1}{5}{ +1C} +\depedge{1}{7}{ +4H} +%\depedge{4}{3}{advmod} +%\depedge{4}{5}{xcomp} +%\depedge{5}{6}{dobj} +\end{dependency} + + +\begin{dependency} +\begin{deptext} +CH$_4$ \& + \& 2O$_2$ \& ---> \& CO$_2$ \& + \& 2H$_2$0 \\ + (16g) \& + \& (64g) \& ---> \& (44g) \& + \& (36g) \\ +\end{deptext} +\end{dependency} + +\begin{dependency} +\begin{deptext} +CH$_4$ \& + \& 2O$_2$ \& ---> \& CO$_2$ \& + \& 2H$_2$0 \\ \\ + (16g) \& + \& (64g) \& ---> \& (44g) \& + \& (36g) \\ +\end{deptext} +\wordgroup{1}{1}{7}{a} +\wordgroup{3}{1}{3}{a0} +\wordgroup{3}{5}{7}{a1} +\groupedge[edge below]{a0}{a1}{80g}{4ex} +\end{dependency} + +\begin{dependency}[theme=brazil] +\begin{deptext} +CH$_4$ \& + \& 2O$_2$ \& ---> \& CO$_2$ \& + \& 2H$_2$0 \\ \\ + (16g) \& + \& (64g) \& ---> \& (44g) \& + \& (36g) \\ +\end{deptext} +\wordgroup{1}{1}{7}{a} +\wordgroup{3}{1}{3}{a0} +\wordgroup{3}{5}{7}{a1} +\groupedge[edge below]{a0}{a1}{80g}{4ex} +\end{dependency} + +\begin{dependency}[theme=iron, label theme=copper] +\begin{deptext} +CH$_4$ \& + \& 2O$_2$ \& ---> \& CO$_2$ \& + \& 2H$_2$0 \\ \\ + (16g) \& + \& (64g) \& ---> \& (44g) \& + \& (36g) \\ +\end{deptext} +\wordgroup{1}{1}{7}{a} +\wordgroup{3}{1}{3}{a0} +\wordgroup{3}{5}{7}{a1} +\groupedge[edge below]{a0}{a1}{80g}{4ex} +\end{dependency} + +\begin{dependency}[label style = {circle}] +\begin{deptext} +CH$_4$ \& + \& 2O$_2$ \& ---> \& CO$_2$ \& + \& 2H$_2$0 \\ \\ + (16g) \& + \& (64g) \& ---> \& (44g) \& + \& (36g) \\ +\end{deptext} +\wordgroup{1}{1}{7}{a} +\wordgroup{3}{1}{3}{a0} +\wordgroup{3}{5}{7}{a1} +\groupedge[edge below]{a0}{a1}{80g}{4ex} +\end{dependency} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzelect.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzelect.tex index cdee18256d5..a24f6039918 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzelect.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzelect.tex @@ -369,9 +369,9 @@ bulb={near end},bulb={very near end},contact={at end}] (12,.5) ; % %\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) ; +\BS{draw} [circuit ee IEC] (0,0.5) to [contact=\{ \rouge{pos=0}{} \},make contact=\{\rouge{pos=0.2}{}\},voltage source=\{\rouge{pos=0.3}{} \}, \\ +resistor=\{ \rouge{pos=0.5}{} \}, +bulb=\{\rouge{pos=0.75} {} \},contact=\{\RDD{pos} \rouge{=1}{} \}] (12,0.5) ; \\ \hline \begin{tikzpicture}[blue] \useasboundingbox (-.5,0) rectangle (12.5,1); diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzfig.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzfig.tex index 2d0a19cf11b..ee97b52a148 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzfig.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzfig.tex @@ -45,10 +45,10 @@ & \parbox[b]{8cm}{ \TFRGB{texte avant}{text before} \\ -\ESS{begin\AC{tikzpicture}}[blue] \\ +\ESS{tikzpicture}[blue] \\ \BS{draw} (0,0) rectangle(2,2); \\ \BS{draw} (0,0) circle (1); \\ -\ESS{end\AC{tikzpicture}}\\ +\BS{end\AC{tikzpicture}}\\ \TFRGB{texte après}{text after} \\ } \\ \hline @@ -204,11 +204,11 @@ texte après & \parbox[b]{10cm}{ \TFRGB{texte avant}{text before} \\ -\ESS{begin\AC{tikzpicture}}[blue] \\ +\ESS{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}}\\ +\BS{end\AC{tikzpicture}}\\ \TFRGB{texte après}{text after} \\ } \\ \hline diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgate.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgate.tex new file mode 100644 index 00000000000..0ec4708ffb6 --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgate.tex @@ -0,0 +1,404 @@ +\label{lib-gate} +International Electrotechnical Commission : +\maboite{\BS{usepackage}\AC{circuits.logic.IEC}} + +American logic gates : +\maboite{\BS{usepackage}\AC{circuits.logic.US}} + +logic symbols used in A. Croft, R. Davidson, and M. +Hargreaves (1992), Engineering Mathematics, Addison-Wesley, 82–95 : + +\maboite{\BS{usepackage}\AC{circuits.logic.CDH}} + +%\usetikzlibrary{circuits.logic.IEC} +%\usetikzlibrary[circuits.logic.US] +%\usetikzlibrary{circuits.logic.CDH} + +\begin{tabular}{|c|c|c|} \hline +\multicolumn{3}{|c|}{\textbf{\TFRGB{Composants de base}{Basic Elements}} }\\ +\hline +\multicolumn{3}{|c|}{\BS{node} [\blll{circuit logic IEC}] at (1,.5) [\RDD{and gate} ] \AC{A} ; }\\ +%\hline +\multicolumn{3}{|c|}{\RRR{47-3-2} } +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic IEC] at (1,.5) [and gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic US] at (1,.5) [and gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic CDH] at (1,.5) [and gate] {} ; +\end{tikzpicture} +\\ \hline +[\blll{circuit logic IEC}] & [\blll{circuit logic US}] & [\blll{circuit logic CDH}] \\ + +\RDD{and gate}& \RDD{and gate} & \RDD{and gate} +\\ \hline + +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic IEC] at (1,.5) [nand gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic US] at (1,.5) [nand gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic CDH] at (1,.5) [nand gate] {} ; +\end{tikzpicture} +\\ \hline +[\blll{circuit logic IEC}] & [\blll{circuit logic US}] & [\blll{circuit logic CDH}] \\ +\RDD{nand gate}& \RDD{nand gate} & \RDD{nand gate} + +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic IEC] at (1,.5) [or gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic US] at (1,.5) [or gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic CDH] at (1,.5) [or gate] {} ; +\end{tikzpicture} +\\ \hline +[\blll{circuit logic IEC}] & [\blll{circuit logic US}] & [\blll{circuit logic CDH}] \\ +\RDD{or gate}& \RDD{or gate} & \RDD{or gate} + +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic IEC] at (1,.5) [nor gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic US] at (1,.5) [nor gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic CDH] at (1,.5) [nor gate] {} ; +\end{tikzpicture} +\\ \hline +[\blll{circuit logic IEC}] & [\blll{circuit logic US}] & [\blll{circuit logic CDH}] \\ +\RDD{nor gate}& \RDD{nor gate} & \RDD{nor gate} + +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic IEC] at (1,.5) [xor gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic US] at (1,.5) [xor gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic CDH] at (1,.5) [xor gate] {} ; +\end{tikzpicture} +\\ \hline +[\blll{circuit logic IEC}] & [\blll{circuit logic US}] & [\blll{circuit logic CDH}] \\ +\RDD{xor gate}& \RDD{xor gate} & \RDD{xor gate} + +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic IEC] at (1,.5) [xnor gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic US] at (1,.5) [xnor gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic CDH] at (1,.5) [xnor gate] {} ; +\end{tikzpicture} +\\ \hline +[\blll{circuit logic IEC}] & [\blll{circuit logic US}] & [\blll{circuit logic CDH}] \\ +\RDD{xnor gate}& \RDD{xnor gate} & \RDD{xnor gate} + +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic IEC] at (1,.5) [not gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic US] at (1,.5) [not gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic CDH] at (1,.5) [not gate] {} ; +\end{tikzpicture} +\\ \hline +[\blll{circuit logic IEC}] & [\blll{circuit logic US}] & [\blll{circuit logic CDH}] \\ +\RDD{not gate}& \RDD{not gate} & \RDD{not gate} + +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic IEC] at (1,.5) [buffer gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2);; +\node[circuit logic US] at (1,.5) [buffer gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic CDH] at (1,.5) [buffer gate] {} ; +\end{tikzpicture} +\\ \hline +[\blll{circuit logic IEC}] & [\blll{circuit logic US}] & [\blll{circuit logic CDH}] \\ +\RDD{buffer gate}& \RDD{buffer gate} & \RDD{buffer gate} + +\\ \hline +\end{tabular} +\bigskip + +\begin{tabular}{|c|c|c|} \hline +\multicolumn{3}{|c|}{\textbf{\TFRGB{Avec etiquette}{Labelled}} }\\ +\hline +\multicolumn{3}{|c|}{\BS{node} [\blll{circuit logic IEC}] at (1,.5) [and gate] \rouge{\AC{A}} ; }\\ +%\hline +\multicolumn{3}{|c|}{\RRR{47-3-1} } +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic IEC] at (1,.5) [and gate] {$A$} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic US] at (1,.5) [and gate] {$A$} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic CDH] at (1,.5) [and gate] {$A$} ; +\end{tikzpicture} +\\ \hline +[\blll{circuit logic IEC}] & [\blll{circuit logic US}] & [\blll{circuit logic CDH}] +\\ \hline +\end{tabular} +\bigskip + +\begin{tabular}{|c|c|c|} \hline +\multicolumn{3}{|c|}{\textbf{\TFRGB{Orientation}{Orientation} }} +\\ \hline +\multicolumn{3}{|c|}{\RRR{47-3-1} } +\\ \hline +\multicolumn{3}{|c|}{\BS{node} [\blll{circuit logic IEC}] at (1,.5) [and gate,\RDD{point down}] \AC{A} ; } +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic IEC] at (1,.5) [and gate,point down] {$A$} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic US] at (1,.5) [and gate,point down] {$A$} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic CDH] at (1,.5) [and gate,point down] {$A$} ; +\end{tikzpicture} +\\ \hline +[\blll{circuit logic IEC}] & [\blll{circuit logic US}] & [\blll{circuit logic CDH}] +\\ \hline \hline + +\multicolumn{3}{|c|}{\BS{node} [\blll{circuit logic IEC}] at (1,.5) [and gate,\RDD{point up}] \AC{A} ; } +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic IEC] at (1,.5) [and gate,point up] {$A$} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic US] at (1,.5) [and gate,point up] {$A$} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic CDH] at (1,.5) [and gate,point up] {$A$} ; +\end{tikzpicture} +\\ \hline +[\blll{circuit logic IEC}] & [\blll{circuit logic US}] & [\blll{circuit logic CDH}] +\\ \hline +\multicolumn{3}{|c|}{\BS{node} [\blll{circuit logic IEC}] at (1,.5) [and gate,\RDD{point left}] \AC{A} ; } +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic IEC] at (1,.5) [and gate,point left] {$A$} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic US] at (1,.5) [and gate,point left] {$A$} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic CDH] at (1,.5) [and gate,point left] {$A$} ; +\end{tikzpicture} +\\ \hline +[\blll{circuit logic IEC}] & [\blll{circuit logic US}] & [\blll{circuit logic CDH}] +\\ \hline +\end{tabular} +\bigskip + +\begin{tabular}{|c|c|}\hline +\multicolumn{2}{|c|}{\textbf{\TFRGB{Entrées sortie}{inputs exit}}} \\ \hline +\multicolumn{2}{|c|}{ \RRR{47-3-3} } +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[and gate IEC, draw, logic gate inputs={inverted, normal, inverted}] at (1,.5) (A) {}; +\draw [red] (A.input 1) -| (0,0.5); +\draw[green] (A.input 2) -| (0,0.5); +\draw[cyan] (A.input 3) -| (0,0.5); +\draw (A.output) -| (2,0.5); +\end{tikzpicture} +& +\parbox[c]{10cm}{ +\BS{node} [and gate IEC, draw, \\ +\RDD{logic gate inputs}=\{\RDDX{inverted}{gate},\RDDX{normal}{gate} , \RDDX{inverted}{gate}\}] at (1,.5) (A) \AC{}; \\ +\BS{draw} [red] (A.\DDD{input} 1) -| (0,0.5); \\ +\BS{draw}[green] (A.\DDD{input} 2) -| (0,0.5); \\ +\BS{draw}[cyan] (A.\DDD{input} 3) -| (0,0.5); \\ +\BS{draw} (A.\DDD{output}) -| (2,0.5);} +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[and gate IEC, draw, logic gate inputs={ini}] at (1,.5) (A) {}; +\draw[red] (A.input 1) -| (0,0.5); +\draw[green] (A.input 2) -| (0,0.5); +\draw[cyan] (A.input 3) -| (0,0.5); +\draw (A.output) -| (2,0.5); +\end{tikzpicture} +& +\parbox[c]{10cm}{ +\BS{node} [and gate IEC, draw, \\ +\RDD{logic gate inputs}=\AC{\rouge{ini}}] at (1,.5) (A) \AC{}; \\ +\BS{draw} [red] (A.\DDD{input} 1) -| (0,0.5); \\ +\BS{draw}[green] (A.\DDD{input} 2) -| (0,0.5); \\ +\BS{draw}[cyan] (A.\DDD{input} 3) -| (0,0.5); \\ +\BS{draw} (A.\DDD{output}) -| (2,0.5);} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|}\hline +\multicolumn{2}{|c|}{\textbf{\TFRGB{Paramètres des entrées}{input parameter}}} \\ \hline +\multicolumn{2}{|c|}{\BS{node} [and gate IEC, draw, +logic gate inputs={ini},\RDD{logic gate inverted radius}=4pt ]} \\ +\multicolumn{2}{|c|}{ at (1,.5) (A) \AC{}; }\\ +\multicolumn{2}{|c|}{ \RRR{47-3-3} } + +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-1.2) grid (2.2,2.2); +\node[and gate IEC, draw, logic gate inputs={ini},logic gate inverted radius=4pt] at (1,.5) (A) {}; +\draw (A.input 1) -| (0,0.5); +\draw (A.input 2) -| (0,0.5); +\draw (A.input 3) -| (0,0.5); +\draw (A.output) -| (2,0.5); +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-1.2) grid (2.2,2.2); +\node[and gate IEC, draw, logic gate inputs={ini},logic gate input sep=0.5cm] at (1,.5) (A) {}; +\draw (A.input 1) -| (0,0.5); +\draw (A.input 2) -| (0,0.5); +\draw (A.input 3) -| (0,0.5); +\draw (A.output) -| (2,0.5); +\end{tikzpicture} +\\ \hline +\RDD{logic gate inverted radius}=4pt & \RDD{logic gate input sep}=0.5cm\\ +\hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|}\hline +\multicolumn{3}{|c|}{\textbf{\TFRGB{Paramètres des symboles}{symbol parameter}}} \\ \hline +\multicolumn{3}{|c|}{\BS{node} [circuit logic IEC,\RDD{and gate IEC symbol}=AND ] at (1,.5) [and gate] \AC{} } \\ +\multicolumn{3}{|c|}{ \RRR{47-3-5} } +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic IEC,and gate IEC symbol=AND ] at (1,.5) [and gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic IEC,logic gate IEC symbol color=red ] at (1,.5) [and gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic IEC,logic gate IEC symbol align={bottom, right}] at (1,.5) [and gate] {} ; +\end{tikzpicture} +\\ \hline +\RDD{and gate IEC symbol}& \RDD{logic gate IEC symbol color}& \RDD{logic gate IEC symbol align}\\ +=AND & =red & =\AC{bottom, right} +\\ +\hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|}\hline +\multicolumn{3}{|c|}{\textbf{\TFRGB{Paramètres des composants}{Composant parameter}}} \\ \hline +\multicolumn{3}{|c|}{\BS{node} [circuit logic IEC,\rouge{very thick} ] at (1,.5) [and gate] \AC{} } \\ +\multicolumn{3}{|c|}{ \RRR{47-3-5} } +\\ \hline +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic IEC,very thick] at (1,.5) [and gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic IEC, +fill=blue!10] at (1,.5) [and gate] {} ; +\end{tikzpicture} +& +\begin{tikzpicture}[blue] +\useasboundingbox (-.2,-.2) grid (2.2,1.2); +\node[circuit logic IEC,logic gate IEC symbol color=black, +fill=blue!10] at (1,.5) [and gate] {} ; +\end{tikzpicture} +\\ \hline +\rouge{very thick} & \rouge{fill}=blue!10 & \rouge{fill}=blue!10, \\ +& & logic gate IEC symbol color=black +\\ \hline +\end{tabular} + + + + diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph1.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph1.tex index eff17345684..45c5bf5a215 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph1.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph1.tex @@ -1,10 +1,10 @@ -%\subsection{Graphe avec Tikz} \SbSSCT{Graphe avec TikZ}{Graph with TikZ} -%\subsubsection{Graphe à partir d'une liste de points} + \SbSbSSCT{Graphe à partir d'une liste de points}{From a list of points} \label{plot} +\RRR{22-2} \begin{tabular}{|c | } \hline \BS{tikz} \BS{draw} plot \RDD{coordinates} \AC{(0,0) (1,1) (2,0) (3,1) (4,1) (5,2)}; \\ \hline @@ -12,7 +12,7 @@ \\ \hline \end{tabular} -%\subsubsection{Graphe à partir partir d'un fichier de données} + \SbSbSSCT{Graphe à partir partir d'un fichier de données}{From a data file} \begin{tabular}{|c | c | c | c |} \hline @@ -310,7 +310,7 @@ mark=+ & mark=x & mark=* & mark=ball \SbSbSSCT{Marques personnalisées avec text mark}{Marks with text mark} \begin{tabular}{|c | c | c |} \hline -\multicolumn{3}{|l|}{ \BS{draw}[\RDD{mark=text},\RDD{text mark}=A,mark size=5pt] coordinates \AC{(0,0) (1,1) (2,0)};} +\multicolumn{3}{|l|}{ \BS{draw}[\RDD{mark}=\RDDX{text}{mark},\RDD{text mark}=A,mark size=5pt] coordinates \AC{(0,0) (1,1) (2,0)};} \\ \hline \tikz \draw plot[mark=text,text mark=A,mark size=5pt] coordinates {(0,0) (1,1) (2,0)}; & @@ -357,7 +357,7 @@ mark=+ & mark=x & mark=* & mark=ball & \tikz \draw plot[mark=asterisk,mark size=5pt] coordinates {(0,0) (1,1) (2,0)}; \\ \hline -mark=- & mark=| & mark=o &mark=asterisk +mark=\rouge{-} & mark=\rouge{|} & mark=\RDDX{o}{mark} & mark=\RDDX{asterisk}{mark} \\ \hline \tikz \draw plot[mark=star,mark size=5pt] coordinates {(0,0) (1,1) (2,0)}; & @@ -367,7 +367,7 @@ mark=- & mark=| & mark=o &mark=asterisk & \tikz \draw plot[mark=oplus*,mark size=5pt] coordinates {(0,0) (1,1) (2,0)}; \\ \hline -mark=star & mark=10-pointed star & mark=oplus & mark=oplus* +mark==\RDDX{star}{mark} & mark==\RDDX{10-pointed star}{mark} & mark=\RDDX{oplus}{mark} & mark=\RDDX{oplus*}{mark} \\ \hline \tikz \draw plot[mark=otimes,mark size=5pt] coordinates {(0,0) (1,1) (2,0)}; @@ -378,7 +378,7 @@ mark=star & mark=10-pointed star & mark=oplus & mark=oplus* & \tikz \draw plot[mark=square*,mark size=5pt] coordinates {(0,0) (1,1) (2,0)}; \\ \hline - mark=otimes & mark=otimes* & mark=square & mark=square* + mark=\RDDX{otimes}{mark} & mark=\RDDX{otimes*}{mark} & mark=\RDDX{square}{mark} & mark=\RDDX{square*}{mark} \\ \hline \tikz \draw plot[mark=triangle,mark size=5pt] coordinates {(0,0) (1,1) (2,0)}; @@ -389,7 +389,7 @@ mark=star & mark=10-pointed star & mark=oplus & mark=oplus* & \tikz \draw plot[mark=diamond*,mark size=5pt] coordinates {(0,0) (1,1) (2,0)}; \\ \hline -mark=triangle & mark=triangle* & mark=diamond & mark=diamond* +mark=\RDDX{triangle}{mark} & mark=\RDDX{triangle*}{mark} & mark=\RDDX{diamond}{mark} & mark=\RDDX{diamond*}{mark} \\ \hline \tikz \draw plot[mark=halfdiamond*,mark size=5pt] coordinates {(0,0) (1,1) (2,0)}; @@ -400,7 +400,7 @@ mark=triangle & mark=triangle* & mark=diamond & mark=diamond* & \tikz \draw plot[mark=halfsquare left*,mark size=5pt] coordinates {(0,0) (1,1) (2,0)}; \\ \hline -mark=halfdiamond* & mark=halfsquare* & mark=halfsquare right* & mark=halfsquare left* +mark=\RDDX{halfdiamond*}{mark} & mark=\RDDX{halfsquare*}{mark} & mark=\RDDX{halfsquare right*}{mark} & mark=\RDDX{halfsquare left*}{mark} \\ \hline \tikz \draw plot[mark=pentagon,mark size=5pt] coordinates {(0,0) (1,1) (2,0)}; @@ -411,7 +411,7 @@ mark=halfdiamond* & mark=halfsquare* & mark=halfsquare right* & mark=halfsquare & \tikz \draw plot[mark=Mercedes star flipped,mark size=5pt] coordinates {(0,0) (1,1) (2,0)}; \\ \hline - mark=pentagon & mark=pentagon* & mark=Mercedes star & mark=Mercedes star flipped + mark=\RDDX{pentagon}{mark} & mark=\RDDX{pentagon*}{mark} & mark=\RDDX{Mercedes star}{mark} & mark=\RDDX{Mercedes star flipped}{mark} \\ \hline \tikz \draw plot[mark=halfcircle,mark size=5pt] coordinates {(0,0) (1,1) (2,0)}; @@ -422,7 +422,7 @@ mark=halfdiamond* & mark=halfsquare* & mark=halfsquare right* & mark=halfsquare & \tikz \draw plot[mark=text,mark size=5pt] coordinates {(0,0) (1,1) (2,0)}; \\ \hline - mark=halfcircle & mark=halfcircle* & mark=heart & mark=text + mark=\RDDX{halfcircle}{mark} & mark=\RDDX{halfcircle*}{mark} & mark=\RDDX{heart}{mark} & mark=\RDDX{text}{mark} \\ \hline \end{tabular} diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph2.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph2.tex index 326e001e66b..10e86b3394b 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph2.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph2.tex @@ -1,15 +1,19 @@ %\subsubsection{Graphes avec pgfplot} - +%\SbSSCT{Graphe avec pgfplot}{Graph with pgfplot\label{pgfplot}} %Insérer dans le préambule - \maboite{\BS{usepackage}\AC{pgfplots}} + \maboite{\BS{usepackage}\AC{pgfplots} \cite {pgfplots} } +\label{pgfplots} + -%\subsection{Courbes 2 D} \SbSSCT{Courbes 2 D}{2D Graph} \subsubsection{Axes} + \begin{tabular}{|c|c|c|c|} \hline - +% \multicolumn{4}{|c|}{ \textbf{Axes}} \\ + \multicolumn{4}{|c|}{ \RRP{4-1}} + \\ \hline \begin{tikzpicture}[scale=.5,blue] \begin{axis} ... @@ -34,7 +38,7 @@ \end{loglogaxis} \end{tikzpicture} \\ \hline -\BSS{begin\AC{axis}} & \BSS{begin\AC{semilogxaxis}} & \BSS{begin\AC{semilogyaxis}} & \BSS{begin\AC{loglogaxis}} \\ +\ESS{axis} & \ESS{semilogxaxis} & \ESS{semilogyaxis} & \ESS{loglogaxis} \\ & & &\\ \BS{end}\AC{axis} & \BS{end}\AC{semilogxaxis} & \BS{end}\AC{semilogyaxis} & \BS{end}\AC{loglogaxis} @@ -43,9 +47,12 @@ %\subsubsection{Tracé de la courbe} -\SbSbSSCT{Tracé de la courbe}{Drawing of the graph} +\SbSSCT{Tracé de la courbe}{Drawing of the graph} -\begin{tabular}{|c|c|c|c|} \hline + +\begin{tabular}{|c|c|c|} \hline + \multicolumn{3}{|c|}{ \RRP{4-2}} + \\ \hline \begin{tikzpicture}[scale=.5] \begin{axis} \addplot coordinates {(0,0) (1,1) (2,0) (3,1) (4,1) (5,2)}; @@ -182,6 +189,7 @@ axes : \RDD{semilogxaxis} & axes : \RDD{semilogxaxis} & axes : \RDD{semilogyaxis \end{tabular} + %-------------------------------------------------------- %\subsubsection{Dimension unitaire en X et Y} \SbSbSSCT{Dimension unitaire en X et Y}{Xunit and Yunit} diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph3D.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph3D.tex index b13f5698477..7013ea7494f 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph3D.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzgraph3D.tex @@ -72,6 +72,30 @@ axis lines=center,axis on top & axis lines*=left & axis lines*=right \\ \hline \end{tabular} + + \begin{tikzpicture} + \begin{axis}[width=5cm,axis lines*=right,blue,domain y=-5:(8)] +\addplot3[surf] {-x*y}; +\end{axis} +\end{tikzpicture} + \begin{tikzpicture} + \begin{axis}[width=5cm,axis lines*=right,blue,domain y=-5:(8)] +\addplot3[surf] {y}; +\end{axis} +\end{tikzpicture} + + \begin{tikzpicture} + \begin{axis}[width=5cm,axis lines*=right,blue,domain=-5:(8)] +\addplot3[surf] {-x*y}; +\end{axis} +\end{tikzpicture} + \begin{tikzpicture} + \begin{axis}[width=5cm,axis lines*=right,blue,domain=-5:(8)] +\addplot3[surf] {y}; +\end{axis} +\end{tikzpicture} + + %\subsubsection{Tracé de la courbe} \SbSbSSCT{Tracé de la courbe}{Graph drawing} @@ -109,9 +133,9 @@ axis lines=center,axis on top & axis lines*=left & axis lines*=right \end{axis} \end{tikzpicture} & -\begin{tikzpicture}[scale=.5] -\begin{axis}[blue] -\addplot3 [red,ultra thick] file {table3.dat}; +\begin{tikzpicture} +\begin{axis}[width=5cm,blue] +\addplot3[red,ultra thick] file {table3.dat}; \end{axis} \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 11731facd1b..935437a6739 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzmerci.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzmerci.tex @@ -9,3 +9,7 @@ Jim Diamond Falk Rühl Axel Kielhorn + +Nils Fleischhacker + +Michel Fruchart \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkznoeud1.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkznoeud1.tex index e2b727919e5..6966cadfc6d 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkznoeud1.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkznoeud1.tex @@ -302,7 +302,7 @@ controls +(D) & \begin{tikzpicture} \draw[help lines] (-1,-1) grid (1,1); \fill (0,0) circle (2pt) node[anchor=east] {texte};\end{tikzpicture} \\ \hline - [\RDD{anchor=south}] & [\RDD{anchor=west}] & [\RDD{anchor=north}] & [\RDD{anchor=east }] + [\RDD{anchor}=south] & [\RDD{anchor}=west] & [\RDD{anchor}=north] & [\RDD{anchor}=east] ] \\ \hline \begin{tikzpicture} \draw[help lines] (-1,-1) grid (1,1) ;\fill (0,0) circle (2pt) node[anchor=south east] {texte};\end{tikzpicture} & @@ -312,7 +312,7 @@ controls +(D) & \begin{tikzpicture} \draw[help lines] (-1,-1) grid (1,1); \fill (0,0) circle (2pt) node[anchor=east] {texte};\end{tikzpicture} \\ \hline -[\RDD{anchor=south east}] & [\RDD{anchor=south west}] & [\RDD{anchor=north west}] & [\RDD{anchor=north east }] +[\RDD{anchor}=south east] & [\RDD{anchor}=south west] & [\RDD{anchor}=north west] & [\RDD{anchor==north east }] \\ \hline \end{tabular} @@ -531,7 +531,7 @@ controls +(D) \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|}{ \BS{draw}(0,0) edge \rouge{["abc", ->]} (4,0); }\\ \multicolumn{3}{|c|}{ \RRR{17-12-2} }\\ \hline \begin{tikzpicture}[blue] diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzoptic.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzoptic.tex new file mode 100644 index 00000000000..e64fde2611a --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzoptic.tex @@ -0,0 +1,1361 @@ +\label{optics} + + + \maboite{\BS{usepackage}\AC{optics} \cite {optics}} + +\begin{tabular}{|c|c|}\hline +\begin{tikzpicture}[blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.5,-1.2) rectangle (1.5,1.2); +\draw[help lines] (-1,-1) grid (1,1); +\node[use optics,lens] (L) at (0,0) {}; +\end{tikzpicture} +& +\parbox{10cm}{ +\BS{begin}\AC{tikzpicture}[blue,line width=2pt] \\ +\BS{draw}[help lines] (-1,-1) grid (1,1); \\ +\BS{node}[\RDD{use optics},lens] (L) at (0,0) {}; \\ +\BS{end}\AC{tikzpicture} +} +\\ \hline +\end{tabular} + +%\subsection{Eléments optiques} +\SbSSCT{Éléments optiques}{Optic components } + +\SbSbSSCT{Éléments optiques disponibles}{Components available} + +\noindent + +\begin{tabular}{|c|c|c|c|c|} \hline +\multicolumn{5}{|c|}{Éléments optiques} +\\ \hline +\multicolumn{5}{|c|}{ \BS{tikz}[use optics,blue] \BS{node}[\RDD{lens}] (L) at (0,0) \AC{}; } +\\ \hline +\multicolumn{2}{|c|}{ +\tikz[use optics,blue] \node[lens] (L) at (0,0) {}; +} +& +\tikz[use optics,blue] \node[slit] (S) at (0,0) {}; +& +\tikz[use optics,blue] \node[double slit] (S) at (0,0) {}; +& +\tikz[use optics,blue] \node[mirror] (S) at (0,0) {}; +\\ \hline +\multicolumn{2}{|c|}{ \RDD{lens} } & \RDD{slit} & \RDD{double slit} & \RDD{mirror} +\\ \hline + +\tikz[use optics,blue] \node[convex mirror] at (0cm,0) {}; +& +\tikz[use optics,blue] \node[concave mirror] at (4cm,0) {}; +& +\tikz[use optics,blue] \node[polarizer] (S) at (0,0) {}; +& +\tikz[use optics,blue] \node[beam splitter] at (0,0) {}; +& +\tikz[use optics,blue] \node[double amici prism] (PVD) at (0,0) {}; +\\ \hline +\RDD{convex mirror} & \RDD{concave mirror} & \RDD{polarizer} & \RDD{beam splitter} & \RDD{double amici prism} +\\ \hline +\multicolumn{2}{|c|}{ \tikz[use optics,scale=.5,blue] +\node[thin optics element] (S) at (0,0) {}; +} +& +\tikz[use optics,blue] \node[thick optics element] at (0,0) {}; +& +\tikz[use optics,blue] \node[heat filter] (S) at (0,0) {}; +& +\tikz[use optics,blue] \node[screen] (S) at (0,0) {}; +\\ \hline +\multicolumn{2}{|c|}{ \RDD{thin optics element} } & \RDD{thick optics element} & \RDD{heat filter} & \RDD{screen} +\\ \hline +\multicolumn{2}{|c|}{ \tikz[use optics,scale=.5,blue] +\node[diffraction grating] (S) at (0,0) {}; +} +& +\tikz[use optics,blue] \node[grid] (S) at (0,0) {}; +& +\tikz[use optics,blue] \node[semi-transparent mirror] (S) at (0,0) {}; +& +\tikz[use optics,blue] \node[diaphragm] (S) at (0,0) {}; +\\ \hline +\multicolumn{2}{|c|}{ \RDD{diffraction grating} } & \RDD{grid} & \RDD{semi-transparent mirror} & \RDD{diaphragm} +\\ \hline +\end{tabular} + +\SbSbSSCT{Paramètres}{Parameters} + +\noindent + +\begin{tabular}{|c|c|c|c|} \hline +%\multicolumn{4}{|c|}{ \textbf{Lens parameters} } +%\\ \hline +\multicolumn{4}{|c|}{ \BS{node}[lens,\RDD{object height}=1cm] (L) at (0,0) \AC{}; } +\\ \hline +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines] (-1,-1) grid (1,1); +\node[lens,object height=1cm] (L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines] (-2,-1) grid (2,1); +\node[lens,draw focal points] (L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines] (-2,-1) grid (2,1); +\node[lens,draw focal points, focal length=1.5cm] (L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines] (-1,-1) grid (1,1); +\node[lens,lens height=.5] (L) at (0,0) {}; +\draw (L.lens north) to[thin,short dim arrow={label=$50\%$,label near middle}] (L.lens south); +% \draw[line width =5pt,red] (L.lens north) -- (L.lens south) ; +\end{tikzpicture} +\\ \hline +\RDD{object height}=1cm & \RDD{draw focal points} & \RDD{focal length}=1.5cm & \RDD{focal height}=0.5 +\\ +\dft{ 2cm} & \dft{ empty} & \dft{ 1cm} & \dft{ 0.8} (80\%) +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|}\hline +\multicolumn{2}{|c|}{ \textbf{Lens type} } +\\ \hline +\multicolumn{2}{|c|}{ \BS{node}[lens,\RDD{lens type}=converging] (L) at (0,0) \AC{}; } +\\ \hline +\begin{tikzpicture}[use optics,scale=.5,blue,line width=2pt] +\useasboundingbox (-.5,-2.5) rectangle (.5,2.5); +\node[lens,lens type=converging] (L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,scale=.5,blue,line width=2pt] +\useasboundingbox (-.5,-2.5) rectangle (.5,2.5); +\node[lens,lens type=diverging] (L) at (0,0) {}; +\end{tikzpicture} +\\ +\hline \RDD{lens type}=converging & \RDD{lens type}=diverging \\ +\hline +\end{tabular} +\hspace{1cm} +\begin{tabular}{|c|c|} \hline +\multicolumn{2}{|c|}{ \textbf{slit parameters}} +\\ \hline +\multicolumn{2}{|c|}{ \BS{node}[slit,\RDD{slit height}=0.5] (L) at (0,0) \AC{}; } +\\ \hline +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines,ystep=5mm] (-1,-1) grid (1,1); +\node[slit, slit height=0.5 ](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines,ystep=2.5mm] (-1,-1) grid (1,1); +\node[slit, slit height=0.5cm](L) at (0,0) {}; +\end{tikzpicture} +\\ \hline + \RDD{slit height}=0.5 & \RDD{slit height}=0.5cm +\\ \hline +\multicolumn{2}{|c|}{ \dft{ 0.075} (7.5\% )} +\\ \hline +\end{tabular} + +\bigskip +\begin{tabular}{|c|c|c|c|} \hline +\multicolumn{4}{|c|}{ \textbf{Double slit parameters}} +\\ \hline +\multicolumn{4}{|c|}{ \BS{node}[double slit,\RDD{slit height}=0.15] (L) at (0,0) \AC{}; } +\\ \hline +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines,ystep=1.25mm] (-1,-1) grid (1,1); +%\node[double slit,red,line width=1pt ](L) at (0,0) {}; +\node[double slit, slit height=0.15 ](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines,ystep=1.25mm] (-1,-1) grid (1,1); +%\node[double slit,red,line width=1pt ](L) at (0,0) {}; +\node[double slit, slit height=0.25cm](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines,ystep=5mm] (-1,-1) grid (1,1); +\node[double slit, slit separation=0.5 ](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines,ystep=5mm] (-1,-1) grid (1,1); +\node[double slit, slit separation=1cm](L) at (0,0) {}; +\end{tikzpicture} +\\ \hline +\RDD{slit height}=0.15 & \RDD{slit height}=0.25cm & \RDD{slit separation}=0.5 & double slit, \RDD{slit separation}=1cm +\\ \hline +\multicolumn{2}{|c|}{ \dft{ 0.075} (7.5\% x 2cm = 1.5 mm)} & \multicolumn{2}{|c|}{ \dft{ 0.2} (20\% x 2cm = 4mm)} +\\ \hline +\end{tabular} + +\bigskip +\begin{tabular}{|c|c|} \hline +\multicolumn{2}{|c|}{ \textbf{mirror parameters}} +\\ \hline +\multicolumn{2}{|c|}{ \BS{node}[mirror,\RDD{mirror decoration separation}=0.25] (L) at (0,0) \AC{}; } +\\ \hline +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines,ystep=5mm] (-1,-1) grid (1,1); +\node[mirror,mirror decoration separation=0.25 ](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines,ystep=5mm] (-1,-1) grid (1,1); +\node[mirror,mirror decoration separation=0.5cm](L) at (0,0) {}; +\end{tikzpicture} +\\ \hline +\RDD{mirror decoration separation}=0.25 & \RDD{mirror decoration separation}=0.5cm +\\ \hline +\multicolumn{2}{|c|}{ \dft{ 0.15cm} } +\\ \hline +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.5) rectangle (1.2,1.2); +\draw[help lines] (-1,-1) grid (1,1); +\node[mirror,mirror decoration amplitude=0.25 ](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines] (-1,-1) grid (1,1); +\node[mirror,mirror decoration amplitude=.5cm](L) at (0,0) {}; +\end{tikzpicture} +\\ \hline \hline + \RDD{mirror decoration amplitude}=0.25 & \RDD{mirror decoration amplitude}=1cm +\\ \hline + \multicolumn{2}{|c|}{ \dft{ 0.125cm} } +\\ \hline +\end{tabular} + +\bigskip + + +\bigskip\begin{tabular}{|c|c|} \hline + \multicolumn{2}{|c|}{ \textbf{spherical mirror type} } +\\ \hline + \multicolumn{2}{|c|}{\BS{node}[\RDD{convex mirror}](L) at (0,0) \AC{}; } +\\ \hline +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines] (-1,-1) grid (1,1); +\node[convex mirror](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines] (-1,-1) grid (1,1); +\node[concave mirror](L) at (0,0) {}; +\end{tikzpicture} +\\ \hline \RDD{convex mirror} & \RDD{concave mirror} +\\ \hline +spherical mirror, \RDD{spherical mirror type}=\BDD{convex} & +spherical mirror, \RDD{spherical mirror type}=\BDD{concave} +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|} \hline + \multicolumn{2}{|c|}{ \textbf{spherical mirror orientation } } +\\ \hline + \multicolumn{2}{|c|}{ \BS{node}[convex mirror, \RDD{spherical mirror orientation}=\BDD{ltr}](L) at (0,0) \AC{}; } +\\ \hline +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines] (-1,-1) grid (1,1); +\node[convex mirror, spherical mirror orientation=ltr](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines] (-1,-1) grid (1,1); +\node[convex mirror, spherical mirror orientation=rtl](L) at (0,0) {}; +\end{tikzpicture} +\\ \hline +convex mirror, & convex mirror, \\ +\RDD{spherical mirror orientation}=\BDD{ltr} & \RDD{spherical mirror orientation}=\BDD{rtl} +\\ \hline + +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines] (-1,-1) grid (1,1); +\node[concave mirror, spherical mirror orientation=ltr](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines] (-1,-1) grid (1,1); +\node[concave mirror, spherical mirror orientation=rtl](L) at (0,0) {}; +\end{tikzpicture} +\\ \hline +concave mirror & concave mirror, \\ + \RDD{spherical mirror orientation}=\BDD{ltr} & \RDD{spherical mirror orientation}=\BDD{rtl} +\\ \hline +\end{tabular} +\bigskip + +\begin{tabular}{|c|c|c|} \hline + \multicolumn{3}{|c|}{ \BS{node}[spherical mirror, \RDD{spherical mirror angle}=240](L) at (0,0) \AC{}; } +\\ \hline + +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.5) rectangle (1.2,1.5); +\draw[help lines] (-1,-1) grid (1,1); +\node[spherical mirror, spherical mirror angle=240](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.5) rectangle (1.2,1.5); +\draw[help lines,ystep=5mm] (-1,-1) grid (1,1); +\node[spherical mirror, mirror decoration separation=0.25](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.5) rectangle (1.2,1.5); +\draw[help lines,ystep=5mm] (-1,-1) grid (1,1); +\node[spherical mirror,mirror decoration amplitude=.5cm](L) at (0,0) {}; +\end{tikzpicture} + +\\ \hline +\RDD{spherical mirror angle}=240 & \RDD{mirror decoration separation}=0.25 & \RDD{mirror decoration amplitude}=0.5cm +\\ \hline +\dft{ 150} & \dft{ 0.15cm} & \dft{ 0.125cm} +\\ \hline +\end{tabular} + +\bigskip + + +\begin{tabular}{|c|} \hline +\BS{node}[spherical mirror, +spherical mirror angle=from\_radius(2cm)](L) at (0,0) \AC{}; +\\ \hline +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines,ystep=5mm] (-2,-1) grid (1,1); +\node[spherical mirror, +spherical mirror angle=from_radius(2cm)] (M) {M}; +\draw[red,fill] (M.mirror center) circle (2pt) ; +\end{tikzpicture} +\\ \hline +\end{tabular} + + + +\bigskip + +\begin{tabular}{|c|c|c|} \hline + \multicolumn{3}{|c|}{ \BS{node}[polarizer, \RDD{object height}=1.5cm](L) at (0,0) \AC{}; } +\\ \hline +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines,ystep=5mm] (-1,-1) grid (1,1); +\node[polarizer, object height=1.5cm](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines,ystep=5mm] (-1,-1) grid (1,1); +\node[polarizer, object aspect ratio=.5](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines,ystep=5mm] (-2,-1) grid (2,1); +\node[polarizer, object aspect ratio=2](L) at (0,0) {}; +\end{tikzpicture} +\\ \hline +\RDD{object height}=1.5cm +& +\RDD{object aspect ratio}=0.5 +& +\RDD{object aspect ratio}=2 +\\ \hline +\dft{ 2cm} & \dft{ 0.2} & +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|} \hline + \multicolumn{3}{|c|}{ \BS{node}[beam splitter,\RDD{object height}=1.5cm](L) at (0,0) \AC{}; } +\\ \hline +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines,ystep=5mm] (-1,-1) grid (1,1); +\node[beam splitter,object height=1.5cm](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines,ystep=5mm] (-1,-1) grid (1,1); +\node[beam splitter, object aspect ratio=.5](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines,ystep=5mm] (-1,-1) grid (1,1); +\node[beam splitter, object aspect ratio=2](L) at (0,0) {}; +\end{tikzpicture} +\\ \hline +\RDD{object height}=1.5cm +& +\RDD{object aspect ratio}=.5 +& +\RDD{object aspect ratio}=2 +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|}\hline + \multicolumn{2}{|c|}{ \BS{node}[double amici prism,\RDD{prism height}=1cm](L) at (0,0) \AC{}; } +\\ \hline +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines,ystep=5mm] (-2,-1) grid (2,1); +\node[double amici prism,prism height=1cm](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines,ystep=5mm] (-2,-1) grid (2,1); +\node[double amici prism, prism apex angle=90](L) at (0,0) {}; +\end{tikzpicture} +\\ \hline +\RDD{prism height}=1cm & \RDD{prism apex angle}=90 +\\ \hline +\dft{ 1.5cm } & \dft{ 60 } +\\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|c|c|} \hline + \multicolumn{3}{|c|}{ \BS{node}[thick optics element,\RDD{object height}=1.5cm](L) at (0,0) \AC{}; } +\\ \hline + +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines,ystep=5mm] (-1,-1) grid (1,1); +\node[thick optics element,object height=1.5cm] (L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-1.2,-1.2) rectangle (1.2,1.2); +\draw[help lines,ystep=5mm] (-1,-1) grid (1,1); +\node[thick optics element, object aspect ratio=.5](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines,ystep=5mm](-2,-1) grid (2,1); +\node[thick optics element, object aspect ratio=1.5](L) at (0,0) {}; +\end{tikzpicture} +\\ \hline +\RDD{object height}=1.5cm +& +\RDD{object aspect ratio}=0.5 +& +\RDD{object aspect ratio}=1.5 +\\ \hline +\end{tabular} + + + + +\SbSbSSCT{Ancres}{Anchors} + +\noindent + +\begin{tabular}{|c|c|c|c|c|} \hline +\multicolumn{5}{|c|}{\BS{node}[lens] (\blll{L}) at (0,0) \AC{} ;} \\ +\multicolumn{5}{|c|}{\BS{node}[red,fill] (\blll{L}.\RDD{lens north}) circle (2pt) ;} +\\ \hline +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[lens] (L) at (0,0) {} ; +\draw[red,fill] (L.lens north) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[lens] (L) at (0,0) {} ; +\draw[red,fill] (L.lens south) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[lens] (L) at (0,0) {} ; +\draw[red,fill] (L.east focus) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[lens] (L) at (0,0) {} ; +\draw[red,fill] (L.west focus) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[lens] (L) at (0,0) {} ; +\draw[red,fill] (L.center) circle (2pt) ; +\end{tikzpicture} +\\ \hline +(\blll{L}.\RDD{lens north}) & (\blll{L}.\RDD{lens south}) & (\blll{L}.\RDD{east focus}) & (\blll{L}.\RDD{west focus}) & (\blll{L}.\RDD{center}) \\ +\hline +\end{tabular} + +\bigskip +\begin{tabular}{|c|c|c|} \hline +\multicolumn{3}{|c|}{\BS{node}[slit, slit height=0.5] (\blll{L}) at (0,0) \AC{} ;} \\ +\multicolumn{3}{|c|}{\BS{node}[red,fill] (\blll{L}.\RDD{slit north}) circle (2pt) ;} +\\ \hline +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[slit, slit height=0.5] (L) at (0,0) {} ; +\draw[red,fill] (L.slit north) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[slit, slit height=0.5] (L) at (0,0) {} ; +\draw[red,fill] (L.slit south) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[slit, slit height=0.5] (L) at (0,0) {} ; +\draw[red,fill] (L.slit center) circle (2pt) ; +\end{tikzpicture} +\\ \hline +(\blll{L}.\RDD{slit north}) & (\blll{L}.\RDD{slit south}) & (\blll{L}.\RDD{slit center}) \\ +\hline +\end{tabular} + + +\bigskip +\begin{tabular}{|c|c|c||c|c|c|} \hline +\multicolumn{6}{|c|}{\BS{node}[double slit,slit height=0.2,slit separation=0.5] (\blll{L}) at (0,0) \AC{} ;} \\ +\multicolumn{6}{|c|}{\BS{node}[red,fill] (\blll{L}.\RDD{slit 1 north}) circle (2pt) ;} +\\ \hline +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[double slit,slit height=0.2,slit separation=0.5] (L) at (0,0) {} ; +\draw[red,fill] (L.slit 1 north) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[double slit,slit height=0.2,slit separation=0.5] (L) at (0,0) {} ; +\draw[red,fill] (L.slit 1 south) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[double slit,slit height=0.2,slit separation=0.5] (L) at (0,0) {} ; +\draw[red,fill] (L.slit 1 center) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[double slit,slit height=0.2,slit separation=0.5] (L) at (0,0) {} ; +\draw[red,fill] (L.slit 2 north) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[double slit,slit height=0.2,slit separation=0.5] (L) at (0,0) {} ; +\draw[red,fill] (L.slit 2 south) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[double slit,slit height=0.2,slit separation=0.5] (L) at (0,0) {} ; +\draw[red,fill] (L.slit 2 center) circle (2pt) ; +\end{tikzpicture} +\\ \hline +(\blll{L}.\RDD{slit 1 north}) & (\blll{L}.\RDD{slit 1 south}) & (\blll{L}.\RDD{slit 1 center})& (\blll{L}.\RDD{slit 2 north}) & (\blll{L}.\RDD{slit 2 south}) & (\blll{L}.\RDD{slit 2 center}) \\ +\hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|c|c|c|} \hline +\multicolumn{7}{|c|}{\BS{node}[spherical mirror] (\blll{L}) at (0,0) \AC{} ;} \\ +\multicolumn{7}{|c|}{\BS{node}[red,fill] (\blll{L}.\RDD{mirror center}) circle (2pt) ;} +\\ \hline +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[spherical mirror] (L) at (0,0) {} ; +\draw[red,fill] (L.mirror center) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[spherical mirror] (L) at (0,0) {} ; +\draw[red,fill] (L.focus) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[spherical mirror] (L) at (0,0) {} ; +\draw[red,fill] (L.arc start) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[spherical mirror] (L) at (0,0) {} ; +\draw[red,fill] (L.arc center) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[spherical mirror] (L) at (0,0) {} ; +\draw[red,fill] (L.arc end) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[spherical mirror] (L) at (0,0) {} ; +\draw[red,fill] (L.45) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[spherical mirror] (L) at (0,0) {} ; +\draw[red,fill] (L.-45) circle (2pt) ; +\end{tikzpicture} +\\ \hline +\blll{L}.\RDD{mirror center} & \blll{L}.\RDD{focus} & \blll{L}.\RDD{arc start} & \blll{L}.\RDD{arc center} +& \blll{L}.\RDD{arc end} & \blll{L}.\rouge{45} & \blll{L}.\rouge{-45} +\\ \hline +%\begin{tikzpicture}[use optics,blue] +%\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +%\node[spherical mirror] (L) at (0,0) {} ; +%\draw[red,fill] (L.arc end) circle (2pt) ; +%\end{tikzpicture} +%& +%\begin{tikzpicture}[use optics,blue] +%\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +%\node[spherical mirror] (L) at (0,0) {} ; +%\draw[red,fill] (L.45) circle (2pt) ; +%\end{tikzpicture} +%& +%\begin{tikzpicture}[use optics,blue] +%\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +%\node[spherical mirror] (L) at (0,0) {} ; +%\draw[red,fill] (L.-45) circle (2pt) ; +%\end{tikzpicture} +%& +% +%\\ \hline +%\blll{L}.\RDD{arc end} & \blll{L}.\rouge{45} & \blll{L}.\rouge{-45} & +%\\ \hline +\end{tabular} + + + +\SbSSCT{Lampes et capteurs}{Lights and sensors} + + + +\SbSbSSCT{Disponibles}{Available} + +\noindent + +\begin{tabular}{|c|c|c|c|}\hline +%\multicolumn{4}{|c|}{ Lampes et capteurs } +%\\ \hline +\multicolumn{4}{|c|}{ \BS{tikz}[use optics,scale=.5,blue] \BS{node}[\RDD{generic optics io}] (L) at (0,0) \AC{}; } +\\ \hline +\tikz[use optics,scale=.5,blue] \node[generic optics io] (S) at (0,0) {}; +& +\tikz[use optics,scale=.5,blue] \node[sensor line] (S) at (0,0) {}; +& +\tikz[use optics,scale=.5,blue] \node[generic sensor] (S) at (0,0) {}; +& +\tikz[use optics,scale=.5,blue] \node[generic lamp] (S) at (0,0) {}; +\\ +\hline +\RDD{generic optics io} & \RDD{sensor line} & \RDD{generic sensor} & \RDD{generic lamp} +\\ \hline +\tikz[use optics,scale=.5,blue] \node[halogen lamp] (S) at (0,0) {}; +%\node[halogen lamp] (S) at (5cm,0) {QI}; +& +\tikz[use optics,scale=.5,blue] \node[spectral lamp] (S) at (0,0) {}; +%\node[spectral lamp] (S) at (5cm,0) {{Hg} \\ BP}; +& +\tikz[use optics,scale=.5,blue] \node[laser] (S) at (0,0) {}; +%\node[laser] (S) at (5cm,0) {{HeNe}} +; +& +\tikz[use optics,scale=.5,blue] \node[laser'] (S) at (0,0) {}; +\\ \hline +\RDD{halogen lamp} & \RDD{spectral lamp } & \RDD{laser} & \RDD{laser'} +\\ \hline +\end{tabular} + +\SbSbSSCT{Paramètres}{Parameters} + +\noindent + +\begin{tabular}{|c|c|c|}\hline +\multicolumn{3}{|c|}{\BS{node}[\blll{generic optics io}, \RDD{io body height}=1.5cm](L) at (0,0) \AC{};} +\\ \hline +\multicolumn{3}{|c|}{ \TFRGB{Paramètres applicables pour}{Same parameters for } \blll{generic sensor} , \blll{generic lamp} , \blll{halogen lamp} , \blll{spectral lamp},\blll{laser} } +\\ \hline +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines] (-2,-1) grid (2,1); +\node[generic optics io, io body height=1.5cm](L) at (0,0) {}; +\node[generic optics io,dotted,thick](A) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines] (-2,-1) grid (2,1); +\node[generic optics io, io body aspect ratio=4](L) at (0,0) {}; +\node[generic optics io,dotted,thick](A) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines] (-2,-1) grid (2,1); +\node[generic optics io,io body width=4](L) at (0,0) {}; +\node[generic optics io,dotted,thick](A) at (0,0) {}; +\end{tikzpicture} +\\ \hline +\RDD{io body height}=1.5cm & \RDD{io body aspect ratio}=4 & \RDD{io body width}=4 \\ +\hline +\dft{ 0.75cm} & \dft{ 2} & +\\ \hline \hline +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines] (-2,-1) grid (2,1); +\node[generic optics io,io body width=3cm](L) at (0,0) {}; +\node[generic optics io,dotted,thick](A) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines] (-2,-1) grid (2,1); +\node[generic optics io,io aperture width=1](L) at (0,0) {}; +\node[generic optics io,dotted,thick](A) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines] (-2,-1) grid (2,1); +\node[generic optics io,io aperture width=1cm](L) at (0,0) {}; +\node[generic optics io,dotted,thick](A) at (0,0) {}; +\end{tikzpicture} +\\ \hline +\RDD{io body width}=3cm & \RDD{io aperture width}=1 & \RDD{io aperture width}=1cm +\\ \hline + & \multicolumn{2}{|c|}{\dft{ 0.33} } +\\ \hline \hline +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines] (-2,-1) grid (2,1); +\node[generic optics io,io aperture height=2](L) at (0,0) {}; +\node[generic optics io,dotted,thick](A) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines] (-2,-1) grid (2,1); +\node[generic optics io,io aperture height=1cm](L) at (0,0) {}; +\node[generic optics io,dotted,thick](A) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines] (-2,-1) grid (2,1); +\node[generic optics io,io aperture shift=0.25](L) at (0,0) {}; +\node[generic optics io,dotted,thick](A) at (0,0) {}; +\end{tikzpicture} +\\ \hline +\RDD{io aperture height}=2 & \RDD{io aperture height}=1cm & \RDD{io aperture shift}=0.25 +\\ \hline +\multicolumn{2}{|c|}{\dft{ 0.66} } & \dft{ 0} +\\ \hline +%\end{tabular} +% +%\bigskip +% +%\begin{tabular}{|c|c|}\hline +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines] (-2,-1) grid (2,1); +\node[generic optics io,io orientation=ltr](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines] (-2,-1) grid (2,1); +\node[generic optics io,io orientation=rtl](L) at (0,0) {}; +\end{tikzpicture} +& +\\ \hline \RDD{io orientation}=ltr & \RDD{io orientation}=rtl & +\\ \hline +\multicolumn{2}{|c|}{\dft{ ltr} } & +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|} \hline +\multicolumn{3}{|c|}{\BS{node}[sensor line, \RDD{sensor line height}=1.5cm](L) at (0,0) \AC{};} +\\ \hline +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines] (-2,-1) grid (2,1); +\node[sensor line, sensor line height=1.5cm](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines] (-2,-1) grid (2,1); +\node[sensor line, sensor line aspect ratio=0.5](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines] (-2,-1) grid (2,1); +\node[sensor line, sensor line pixel number=10](L) at (0,0) {}; +\end{tikzpicture} +\\ \hline +\RDD{sensor line height}=1.5cm & \RDD{sensor line aspect ratio}=0.5 & \RDD{sensor line pixel number}=10 +\\ \hline +\dft{ 2cm} & \dft{ 0.2} & \dft{ 5} +\\ \hline + +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines] (-2,-1) grid (2,1); +\node[sensor line,sensor line pixel width=0.8](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines] (-2,-1) grid (2,1); +\node[sensor line,sensor line pixel width=0.2cm](L) at (0,0) {}; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=2pt,baseline=0pt] +\useasboundingbox (-2.2,-1.2) rectangle (2.2,1.2); +\draw[help lines] (-2,-1) grid (2,1); +\node[sensor line,sensor line inner ysep=0.2](L) at (0,0) {}; +\end{tikzpicture} + +\\ \hline +\RDD{sensor line pixel width}=0.8 & \RDD{sensor line pixel width}=0.2cm & \RDD{sensor line inner ysep}=0.2 +\\ \hline +\multicolumn{2}{|c|}{\dft{0.4} } & \dft{ 0.05 } +\\ \hline +\end{tabular} + + +\SbSbSSCT{Points d'ancrages}{Anchors} + +\noindent + +\begin{tabular}{|c|c|c|c|c|} \hline +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[generic optics io,name=s] {}; +\draw[red,fill] (s.body north) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[generic optics io,name=s] {}; +\draw[red,fill] (s.body south) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[generic optics io,name=s] {}; +\draw[red,fill] (s.body east) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[generic optics io,name=s] {}; +\draw[red,fill] (s.body west) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[generic optics io,name=s] {}; +\draw[red,fill] (s.body center) circle (2pt) ; +\end{tikzpicture} +\\ \hline +s.body north & s.body south & s.body east & s.body west & s.body center +\\ \hline +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[generic optics io,name=s] {}; +\draw[red,fill] (s.body north east) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[generic optics io,name=s] {}; +\draw[red,fill] (s.body north west) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[generic optics io,name=s] {}; +\draw[red,fill] (s.body south east) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[generic optics io,name=s] {}; +\draw[red,fill] (s.body south west) circle (2pt) ; +\end{tikzpicture} +& + +\\ \hline +s.body north east & s.body north west & s.body south east & s.body south west & +\\ \hline +%\end{tabular} +% +%\begin{tabular}{|c|c|c|c|c|} \hline +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[generic optics io,name=s] {}; +\draw[red,fill] (s.aperture north) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[generic optics io,name=s] {}; +\draw[red,fill] (s.aperture south) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[generic optics io,name=s] {}; +\draw[red,fill] (s.aperture east) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[generic optics io,name=s] {}; +\draw[red,fill] (s.aperture west) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[generic optics io,name=s] {}; +\draw[red,fill] (s.aperture center) circle (2pt) ; +\end{tikzpicture} +\\ \hline +s.aperture north & s.aperture south & s.aperture east & s.aperture west & s.aperture center +\\ \hline +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[generic optics io,name=s] {}; +\draw[red,fill] (s.aperture north east) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[generic optics io,name=s] {}; +\draw[red,fill] (s.aperture north west) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[generic optics io,name=s] {}; +\draw[red,fill] (s.aperture south east) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[generic optics io,name=s] {}; +\draw[red,fill] (s.aperture south west) circle (2pt) ; +\end{tikzpicture} +& + +\\ \hline +s.aperture north east & s.aperture north west & s.aperture south east & s.aperture south west & +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|c|} \hline +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[sensor line,name=s,sensor line aspect ratio= .5] {}; +\draw[red,fill] (s.pixel 1 center) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[sensor line,name=s,sensor line aspect ratio= .5] {}; +\draw[red,fill] (s.pixel 2 center) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[sensor line,name=s,sensor line aspect ratio= .5] {}; +\draw[red,fill] (s.pixel 3 center) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[sensor line,name=s,sensor line aspect ratio= .5] {}; +\draw[red,fill] (s.pixel 4 center) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[sensor line,name=s,sensor line aspect ratio= .5] {}; +\draw[red,fill] (s.pixel 5 center) circle (2pt) ; +\end{tikzpicture} +\\ \hline +s.pixel 1 center & s.pixel 2 center & s.pixel 3 center & s.pixel 4 center & s.pixel 5 center +\\ \hline +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[sensor line,name=s,sensor line aspect ratio= .5] {}; +\draw[red,fill] (s.pixel 3 east) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[sensor line,name=s,sensor line aspect ratio= .5] {}; +\draw[red,fill] (s.pixel 3 west) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[sensor line,name=s,sensor line aspect ratio= .5] {}; +\draw[red,fill] (s.pixel 3 south) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[sensor line,name=s,sensor line aspect ratio= .5] {}; +\draw[red,fill] (s.pixel 3 north) circle (2pt) ; +\end{tikzpicture} +& + +\\ \hline +s.pixel 3 east & s.pixel 3 west & s.pixel 3 south & s.pixel 3 north & +\\ \hline +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[sensor line,name=s,sensor line aspect ratio= .5] {}; +\draw[red,fill] (s.pixel 3 north east) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[sensor line,name=s,sensor line aspect ratio= .5] {}; +\draw[red,fill] (s.pixel 3 north west) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[sensor line,name=s,sensor line aspect ratio= .5] {}; +\draw[red,fill] (s.pixel 3 south east) circle (2pt) ; +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-.5,-1.5) rectangle (.5,1.5); +\node[sensor line,name=s,sensor line aspect ratio= .5] {}; +\draw[red,fill] (s.pixel 3 south west) circle (2pt) ; +\end{tikzpicture} +& + +\\ \hline +s.pixel 3 north east & s.pixel 3 north west & s.pixel 3 south east & s.pixel 3 south west & +\\ \hline +\end{tabular} + +\SbSSCT{Outils}{Tools} + + +\SbSbSSCT{Marquer des rayons}{Marks on the ray} + +\noindent + +\begin{tabular}{|c|c|c|c|c|c|}\hline +\multicolumn{6}{|c|}{\BS{draw} [\rouge{->-}] (0,0) -- (1.5,1;} +\\ \hline +\begin{tikzpicture}[use optics,blue,line width=1pt,baseline=0pt] +\draw[->-] (0,0) -- (1.5cm,1cm); +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=1pt,baseline=0pt] +\draw[-<-] (0,0) -- (1.5cm,1cm); +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=1pt,baseline=0pt] +\draw[->>-] (0,0) -- (1.5cm,1cm); +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=1pt,baseline=0pt] +\draw[->n-={n=4}] (0,0) -- (1.5cm,1cm); +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=1pt,baseline=0pt] +\draw[->n-={n=5,at=0.25}] (0,0) -- (1.5cm,1cm); +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue,line width=1pt,baseline=0pt] +\draw[->>-={at=0.25}, ->-={at=0.75}] (0,0) -- (1.5cm,1.1cm); +\end{tikzpicture} +\\ \hline +[\rouge{->-}] & [\rouge{-<-}] & [\rouge{-> >-}] & [->\rouge{n}-=\AC{\RDD{n}=4}] & [->n=\AC{n=5,\RDD{at}=0.25}] & [-> >-={\RDD{at}=0.25}, ->-=\AC{\RDD{at}=0.75}] +\\ +\hline +\end{tabular} + + +\bigskip + +\noindent +\begin{tabular}{|c|c|c|c|} \hline +\multicolumn{4}{|c|}{\BS{draw} [\RDD{put arrow}] (0,0) to[bend left=120] (2,0);} +\\ \hline +\begin{tikzpicture}[use optics,blue] +\draw[put arrow] (0,0) to[bend left=120] (1.5,1); +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\draw[put arrow={arrow'}] (0,0) to[bend left=120](1.5cm,1cm); +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\draw[put arrow={at=0.2}] (0,0) to[bend left=120] (1.5cm,1cm); +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\draw[put arrow={style=red}] (0,0) to[bend left=120] (1.5cm,1cm); +\end{tikzpicture} +\\ \hline +[\RDD{put arrow}] & [put arrow=\AC{\RDD{arrow'}}] & [put arrow=\AC{\RDD{at}=0.2}]& [put arrow=\AC{\RDD{style}=red}] \\ +\hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|c|c|} \hline +\begin{tikzpicture}[use optics,blue] +\draw[red,put arrow={arrow=latex}](0,0) to[bend left=120] (1.5cm,1cm); +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\draw[put arrow={arrow'=Kite}](0,0) to[bend left=120] (1.5cm,1cm); +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\draw[put arrow={pos=.25}](0,0) to[bend left=120] (1.5cm,1cm); +\end{tikzpicture} +\\ \hline +[red,put arrow=\AC{\RDD{arrow}=latex}] & [put arrow=\AC{\RDD{arrow'}=Kite}] & [put arrow=\AC{\RDD{pos}=.25}] +\\ \hline +& & \dft{ pos=0.5} +\\ \hline +\end{tabular} + + +\bigskip + +\begin{tabular}{|c|} \hline +\BS{draw}[red, put arrow/\RDD{every arrow}/.style=\AC{blue}, +put arrow=\AC{at=0.2},\\ put arrow=\AC{at=0.5}, put arrow=\AC{at=0.8}] +(0,0) -- (5,0); +\\ \hline +\begin{tikzpicture}[use optics] +\useasboundingbox (-0.5,-1.2) rectangle (5.5,1.2); +\draw[help lines] (0,-1) grid (5,1); +\draw[red, put arrow/every arrow/.style={blue}, +put arrow={at=0.2}, put arrow={at=0.5}, put arrow={at=0.8}] +(0,0) -- (5,0); +\end{tikzpicture} +\\ \hline +\end{tabular} + + + +\bigskip + +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture}[use optics,baseline=0pt,blue] +\draw[put coordinate=A at 0.1,put coordinate=B at 0.9] (0,0) -- (1.5cm,1cm) -- (3cm, 0) -- (4.5cm,1cm); +\draw[red] (A) -- (B); +\fill(A) circle (2pt) node[above] {A} ; +\fill(B) circle (2pt) node[above] {B} ; +\end{tikzpicture} +& +\parbox{10cm}{ +\BS{begin}\AC{tikzpicture}[use optics,blue] \\ +\BS{draw}[\RDD{put coordinate}=\blll{A} at 0.1,\RDD{put coordinate}=\blll{B} at 0.9] \\ (0,0) - - (1.5,1) - - (3, 0) - - (4.5,1); \\ +\BS{draw}[red] (\blll{A}) - - (\blll{B});\\ +\BS{fill}(A) circle (2pt) node[above] \AC{\blll{A}} ;\\ +\BS{fill}(B) circle (2pt) node[above] \AC{\blll{B}} ;\\ +\BS{end}\AC{tikzpicture} +} +\\ \hline +& Point A à 10\% , point B à 90\% +\\ \hline +\end{tabular} + +\bigskip + + +\begin{tabular}{|c|c|}\hline +\begin{tikzpicture}[use optics,baseline=0pt] +\node[halogen lamp] (quartz iode) at (0,0) {Q.I.}; +\node[heat filter,right=0.5cm of quartz iode.aperture east] (AC) {}; +\node[slit,right=0.75cm of AC] (fente) {}; +\node[lens,right=2cm of fente] (L) {}; +\node[screen,right=3cm of fente] (screen) {}; +\end{tikzpicture} +& +\parbox{10.5cm}{ +\BS{begin}\AC{tikzpicture}[use optics] \\ +\BS{node}[halogen lamp] (\blll{quartz iode}) at (0,0) \AC{Q.I.};\\ +\BS{node}[heat filter,\RDD{right}=0.5cm \rouge{of} \blll{quartz iode}.aperture east] (\blll{AC}) \AC{};\\ +\BS{node}[slit,\RDD{right}=0.75cm \rouge{of} \blll{AC}] (\blll{fente}) \AC{};\\ +\BS{node}[lens,\RDD{right}=2cm \rouge{of} \blll{fente}] (L) \AC{};\\ +\BS{node}[screen,\RDD{right}=3cm \rouge{of} \blll{fente}] (screen) \AC{};\\ +\BS{end}\AC{tikzpicture} +} +\\ \hline +\end{tabular} + + + + +\SbSbSSCT{Cotation}{Dimensions indicating} + +\noindent + +\begin{tabular}{|c|c|c|}\hline +\multicolumn{3}{|c|}{\BS{draw} (0,0) to[\RDD{short dim arrow}=\AC{\RDD{label}=2cm}] (2,0);} +\\ \hline +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-1.5,-1.2) rectangle (3.5,1.2); +\draw[help lines] (-1,-1) grid (3,1); +\draw[line width=2pt,dashed] (0,0) -- (2,0); +\draw (0,0) to[dim arrow={label=2cm}] (2,0); +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-1.5,-1.2) rectangle (3.5,1.2); +\draw[help lines] (-1,-1) grid (3,1); +\draw[line width=2pt,dashed] (0,0) -- (2,0); +\draw (0,0) to[dim arrow={label'=2cm}] (2,0); +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-1.5,-1.2) rectangle (3.5,1.2); +\draw[help lines] (-1,-1) grid (3,1); +\draw[line width=2pt,dashed] (0,0) -- (2,0); +\draw (0,0) to[dim arrow={label=2cm,label style/.append style=red}] (2,0); +\end{tikzpicture} + +\\ \hline +[\RDD{dim arrow}=\AC{\RDD{label}=2cm}] & to[dim arrow=\AC{\RDD{label'}=2cm}] & [dim arrow=\{label=2cm, \\ + & & \RDD{label style}/.append style=red\}] +\\ \hline +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-1.5,-1.2) rectangle (3.5,2.2); +\draw[help lines] (-1,-1) grid (3,2); +\draw[line width=2pt,dashed] (0,0) -- (2,0); +\draw (0,0) to[dim arrow={label=2cm,raise=1cm}] (2,0); +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-1.5,-1.2) rectangle (3.5,2.2); +\draw[help lines] (-1,-1) grid (3,2); +\draw[line width=2pt,dashed] (0,0) -- (2,0); +\draw (0,0) to[dim arrow={label=2cm,no raise},red] (2,0); +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-1.5,-1.2) rectangle (3.5,2.2); +\draw[help lines] (-1,-1) grid (3,2); +\draw[line width=2pt,dashed] (0,0) -- (2,0); +\draw (0,0) to[dim arrow'={label=2cm}] (2,0); +\end{tikzpicture} +\\ \hline +[dim arrow=\AC{label=2cm,\RDD{raise}=1cm}] & [dim arrow=\AC{label=2cm,\RDD{no raise}},red] & [\RDD{dim arrow'}=\AC{label=2cm}] +\\ \hline +\dft{ raise = 0.5cm} & & +\\ \hline +\end{tabular} + +\bigskip + +\begin{tabular}{|c|c|}\hline +\multicolumn{2}{|c|}{\BS{draw} (0,0) to[\RDD{short dim arrow}=\AC{label=2cm}] (2,0);} +\\ \hline +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-1.5,-1.2) rectangle (3.5,1.2); +\draw[help lines] (-1,-1) grid (3,1); +\draw[line width=2pt,dashed] (0,0) -- (2,0); +\draw (0,0) to[short dim arrow={label=2cm}] (2,0); +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-1.5,-1.2) rectangle (3.5,1.2); +\draw[help lines] (-1,-1) grid (3,1); +\draw[line width=2pt,dashed] (0,0) -- (2,0); +\draw (0,0) to[short dim arrow={label=2cm,arrow length=1cm}] (2,0); +\end{tikzpicture} +\\ \hline +[\RDD{short dim arrow}=\AC{label=2cm}] & +[short dim arrow=\AC{label=2cm,\RDD{arrow length}=1cm}] +\\ \hline +& \dft{ arrow length= 5mm} +\\ \hline +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-1.5,-1.2) rectangle (3.5,1.2); +\draw[help lines] (-1,-1) grid (3,1); +\draw[line width=2pt,dashed] (0,0) -- (2,0); +\draw (0,0) to[short dim arrow={label=2cm,label near end}] (2,0); +\end{tikzpicture} +& +\begin{tikzpicture}[use optics,blue] +\useasboundingbox (-1.5,-1.2) rectangle (3.5,1.2); +\draw[help lines] (-1,-1) grid (3,1); +\draw[line width=2pt,dashed] (0,0) -- (2,0); +\draw (0,0) to[short dim arrow={label=2cm,label near middle}] (2,0); +\end{tikzpicture} + +\\ \hline +[short dim arrow=\AC{label=2cm,\RDD{label near end}}] & [short dim arrow=\AC{label=2cm,\RDD{label near middle}}] +\\ \hline +\multicolumn{2}{|c|}{\dft{ label near start}} +\\ \hline +\end{tabular} diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzpeople.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzpeople.tex new file mode 100644 index 00000000000..230c95cee74 --- /dev/null +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzpeople.tex @@ -0,0 +1,530 @@ +\SbSSCT{Le peuple TikZ}{Tikzpeople} + +\label{people} + + \maboite{\BS{usepackage}\AC{tikzpeople} \cite {tikzpeople}} + +\bigskip +\begin{tabular}{|c|c|}\hline +\BS{tikz} \BS{node}[\RDD{alice}] at (0,0) {}; & \tikz \node[alice] at (0,0) {};\\ +\hline +\end{tabular} + +\SbSbSSCT{Personages disponibles}{available characters} + +\noindent + + + +\begin{tabular}{|c|c|c|c|c|c|c|}\hline +\multicolumn{7}{|c|}{ \BS{tikz} \BS{node}[\RDD{alice},minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[alice,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[bob,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[bride,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[builder,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[businessman,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[charlie,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[chef,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{alice} & \RDD{bob} & \RDD{bride} & \RDD{builder} & \RDD{businessman} & \RDD{charlie} & \RDD{chef} +\\ \hline +\tikz \node[conductor,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[cowboy,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[criminal,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[dave,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[graduate,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[groom,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[guard,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{conductor} & \RDD{cowboy} & \RDD{criminal} & \RDD{dave} & \RDD{graduate} & \RDD{groom} & \RDD{guard} +\\ \hline +\tikz \node[jester,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[judge,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[mexican,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[nun,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[nurse,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[physician,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[pilot,minimum size=1.5cm] at (0,0) {};\\ \hline +\RDD{jester} & \RDD{judge} & \RDD{mexican} & \RDD{nun} & \RDD{nurse} & \RDD{physician} +& \RDD{pilot} +\\ \hline + +\tikz \node[police,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[priest,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[sailor,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[santa,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[surgeon,minimum size=1.5cm] at (0,0) {};& & \\ +\hline \RDD{police} & \RDD{priest} & \RDD{sailor} & \RDD{santa} & \RDD{surgeon} & & \\ +\hline +\end{tabular} + +\subsubsection{Options} + +\noindent + +\begin{tabular}{|c|c|c|c|c|}\hline +\multicolumn{5}{|c|}{ \BS{tikz} \BS{node}[businessman,\RDD{evil},minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[businessman,evil,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[businessman,female,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[businessman,good,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[businessman,mirrored,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[businessman,monitor,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{evil} & \RDD{female} & \RDD{good} & \RDD{mirrored} & \RDD{monitor} + +\\ \hline +\end{tabular} + +\SbSbSSCT{Point d'ancrage spécifique}{Anchor specific} + +\noindent + +\begin{tabular}{|c|c|} \hline +\begin{tikzpicture}[baseline=0pt,blue] + \node[name=a,shape=bob,minimum +size=1.5cm] {}; + \node at (1.25,.5) [ellipse callout, draw, +callout absolute pointer={(a.mouth)}, +font=\tiny] {Hey!}; +\end{tikzpicture} +& +\parbox{12cm}{ +\BS{begin}\AC{tikzpicture}[blue] \\ +\BS{node}[name=a,shape=bob,minimum size=1.5cm] \AC{};\\ +\BS{node} at (1.25,.5) [ellipse callout, draw, +callout absolute pointer\AC{(a.\RDD{mouth})}, +font=\BS{tiny}] {Hey!};\\ +\BS{end}\AC{tikzpicture} \\ +} +\\ \hline +\end{tabular} + + +\SbSbSSCT{Couleurs }{Colors} + +\noindent + + +\begin{tabular}{|c|c|c|c|}\hline +\multicolumn{4}{|c|}{ \BS{tikz} \BS{node}[\blll{alice},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[alice,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[alice,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[alice,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[alice,undershirt=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{details}=red + +\\ \hline +\end{tabular} + +\bigskip +\begin{tabular}{|c|c|c|c|}\hline +\multicolumn{4}{|c|}{ \BS{tikz} \BS{node}[\blll{bob},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[bob,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[bob,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[bob,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[bob,details=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{details}=red +\\ \hline +\end{tabular} + +\bigskip +\begin{tabular}{|c|c|c|c|c|}\hline +\multicolumn{5}{|c|}{ \BS{tikz} \BS{node}[\blll{bride},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[bride,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[bride,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[bride,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[bride,pearls=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[bride,veil=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{pearls}=red & \RDD{veil}=red + +\\ \hline +\end{tabular} + +\bigskip +\begin{tabular}{|c|c|c|c|c|}\hline +\multicolumn{5}{|c|}{ \BS{tikz} \BS{node}[\blll{builder},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[builder,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[builder,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[builder,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[builder,trousers=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[builder,hat=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{trousers}=red & \RDD{hat}=red +\\ \hline +\end{tabular} + +\bigskip +\begin{tabular}{|c|c|c|c|c|c|}\hline +\multicolumn{6}{|c|}{ \BS{tikz} \BS{node}[\blll{businessman},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[businessman,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[businessman,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[businessman,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[businessman,tie=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[businessman,undershirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[businessman,monogram=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{tie}=red & \RDD{undershirt}=red & \RDD{monogram}=red +\\ \hline +\end{tabular} + + +\bigskip +\begin{tabular}{|c|c|c|c|}\hline +\multicolumn{4}{|c|}{ \BS{tikz} \BS{node}[\blll{charlie},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[charlie,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[charlie,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[charlie,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[charlie,buttons=red,minimum size=1.5cm] at (0,0) {}; + +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{buttons}=red +\\ \hline +\end{tabular} + + +\bigskip +\begin{tabular}{|c|c|c|c|c|}\hline +\multicolumn{5}{|c|}{ \BS{tikz} \BS{node}[\blll{chef},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[chef,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[chef,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[chef,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[chef,hat=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[chef,details=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{hat}=red & \RDD{details}=red +\\ \hline +\end{tabular} + + +\bigskip +\begin{tabular}{|c|c|c|c|c|}\hline +\multicolumn{5}{|c|}{ \BS{tikz} \BS{node}[\blll{conductor},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[conductor,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[conductor,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[conductor,shirt=red,minimum size=1.5cm] at (0,0) {}; & \tikz \node[conductor,hat=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[conductor,hatshield=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{hat}=red & \RDD{hatshield}=red +\\ \hline +\tikz \node[conductor,undershirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[conductor,tie=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[conductor,hatbadge=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[conductor,badge=red,minimum size=1.5cm] at (0,0) {}; & +\\ \hline +\RDD{undershirt}=red & \RDD{shirt}=red & \RDD{hatbadge}=red & \RDD{badge}=red & +\\ \hline +\end{tabular} + +\bigskip +\begin{tabular}{|c|c|c|c|}\hline +\multicolumn{4}{|c|}{ \BS{tikz} \BS{node}[\blll{cowboy},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[cowboy,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[cowboy,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[cowboy,shirt=green,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[cowboy,hat=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=green & \RDD{hat}=red +\\ \hline +\tikz \node[cowboy,patches=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[cowboy,tie=green ,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[cowboy,stitching=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[cowboy,vest=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{patches}=red & \RDD{tie}=green & \RDD{stitching}=red & \RDD{vest}=red +\\ \hline +\end{tabular} + + +\bigskip +\begin{tabular}{|c|c|c|c|}\hline +\multicolumn{4}{|c|}{ \BS{tikz} \BS{node}[\blll{criminal},\RDD{hat}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[criminal,hat=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[criminal,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[criminal,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[criminal,details=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hat}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{details}=red +\\ \hline +\end{tabular} + +\bigskip +\begin{tabular}{|c|c|c|c|c|}\hline +\multicolumn{5}{|c|}{ \BS{tikz} \BS{node}[\blll{dave},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[dave,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[dave,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[dave,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[dave,undershirt=green,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[dave,tie=green,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{undershirt}=green & \RDD{tie}=green +\\ \hline +\end{tabular} + +\bigskip +\begin{tabular}{|c|c|c|c|c|c|}\hline +\multicolumn{6}{|c|}{ \BS{tikz} \BS{node}[\blll{graduate},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[graduate,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[graduate,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[graduate,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[graduate,undershirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[graduate,stripes=red,minimum size=1.5cm] at (0,0) {}; +& +\tikz \node[graduate,hat=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{undershirt}=red & \RDD{stripes}=red & \RDD{hat}=red +\\ \hline +\end{tabular} + +\bigskip +\begin{tabular}{|c|c|c|c|c|c|}\hline +\multicolumn{6}{|c|}{ \BS{tikz} \BS{node}[\blll{groom},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[groom,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[groom,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[groom,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[groom,undershirt=green,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[groom,tie=green,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[groom,hat=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{undershirt}=green & \RDD{tie}=green & \RDD{hat}=red +\\ \hline +\end{tabular} + + +\bigskip +\begin{tabular}{|c|c|c|c|c|c|}\hline +\multicolumn{6}{|c|}{ \BS{tikz} \BS{node}[\blll{guard},\RDD{hat}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz\node[guard,hat=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[guard,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[guard,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[guard,collar=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[guard,lining=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[guard,details=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hat}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{collar}=red & \RDD{lining}=red & \RDD{details}=red +\\ \hline +\end{tabular} + + +\bigskip +\begin{tabular}{|c|c|c|c|c|c|}\hline +\multicolumn{6}{|c|}{ \BS{tikz} \BS{node}[\blll{jester},\RDD{hat}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[jester,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[jester,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[jester,shirt=yellow,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[jester,hat=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[jester,pattern=yellow,minimum size=1.5cm] at (0,0) {}; +& +\tikz \node[jester,details=blue,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=yellow & \RDD{hat}=red & \RDD{pattern}=yellow & \RDD{details}=blue +\\ \hline +\end{tabular} + +\bigskip +\begin{tabular}{|c|c|c|c|c|}\hline +\multicolumn{5}{|c|}{ \BS{tikz} \BS{node}[\blll{judge},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[judge,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[judge,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[judge,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[judge,undershirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[judge,hairshadow=red,minimum size=1.5cm] at (0,0) {}; + +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{undershirt}=red & \RDD{hairshadow}=red +\\ \hline +\end{tabular} + +\bigskip +\begin{tabular}{|c|c|c|c|c|c|c|}\hline +\multicolumn{7}{|c|}{ \BS{tikz} \BS{node}[\blll{mexican},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[mexican,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[mexican,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[mexican,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[mexican,hat=green,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[mexican,ringtop=red,minimum size=1.5cm] at (0,0) {}; +& +\tikz \node[mexican,ringmid=red,minimum size=1.5cm] at (0,0) {}; +& +\tikz \node[mexican,ringbot=yellow,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{hat}=green & \RDD{ringtop}=red &\RDD{ringmid}=red & \RDD{ringbot}=yellow +\\ \hline +\end{tabular} + + +\bigskip +\begin{tabular}{|c|c|c|}\hline +\multicolumn{3}{|c|}{ \BS{tikz} \BS{node}[\blll{nun},\RDD{plaid}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[nun,plaid=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[nun,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[nun,shirt=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{plaid}=red & \RDD{skin}=red & \RDD{shirt}=red +\\ \hline +\end{tabular} + + +\bigskip +\begin{tabular}{|c|c|c|c|c|c|c|}\hline +\multicolumn{7}{|c|}{ \BS{tikz} \BS{node}[\blll{nurse},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[nurse,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[nurse,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[nurse,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[nurse,badgeclip=green,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[nurse,redcross=green,minimum size=1.5cm] at (0,0) {}; +& +\tikz \node[nurse,badge=red,minimum size=1.5cm] at (0,0) {}; +& +\tikz \node[nurse,badgename=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{badgeclip}=green & \RDD{redcross}=green & \RDD{badge}=red & \RDD{badgename}=red +\\ \hline +\end{tabular} + + +\bigskip +\begin{tabular}{|c|c|c|c|c|c|}\hline +\multicolumn{6}{|c|}{ \BS{tikz} \BS{node}[\blll{physician},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[physician,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[physician,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[physician,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[physician,hat=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[physician,stethoscope=red,minimum size=1.5cm] at (0,0) {}; +& +\tikz \node[physician,tube=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{hat}=red & \RDD{stethoscope}=red & \RDD{tube}=red +\\ \hline +\end{tabular} + + +\bigskip +\begin{tabular}{|c|c|c|c|c|c|c|}\hline +\multicolumn{7}{|c|}{ \BS{tikz} \BS{node}[\blll{pilot},\RDD{hat}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[pilot,hat=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[pilot,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[pilot,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[pilot,undershirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[pilot,visor=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[pilot,straps=red,minimum size=1.5cm] at (0,0) {}; & +%\tikz \node[pilot,decoration=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hat}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{undershirt}=red & \RDD{visor}=red & \RDD{straps}=red & \RDD{decoration}=red +\\ \hline +\end{tabular} + + +\bigskip +\begin{tabular}{|c|c|c|c|}\hline +\multicolumn{4}{|c|}{ \BS{tikz} \BS{node}[\blll{police},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[police,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[police,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[police,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[police,hat=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{hat}=red +\\ \hline +\tikz \node[police,badge=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[police,hatbadge=red ,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[police,hatshield=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[police,undershirt=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{badge}=red & \RDD{hatbadge}=red & \RDD{hatshield}=red & \RDD{undershirt}=red +\\ \hline +\end{tabular} + + + +\bigskip +\begin{tabular}{|c|c|c|c|c|c|}\hline +\multicolumn{6}{|c|}{ \BS{tikz} \BS{node}[\blll{priest},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[priest,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[priest,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[priest,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[priest,hat=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[priest,collar=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[priest,cross=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{hat}=red & \RDD{collar}=red & \RDD{cross}=red +\\ \hline +\end{tabular} + + +\bigskip +\begin{tabular}{|c|c|c|c|c|c|c|}\hline +\multicolumn{7}{|c|}{ \BS{tikz} \BS{node}[\blll{sailor},\RDD{hair}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[sailor,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[sailor,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[sailor,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[sailor,hat=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[sailor,undershirt=red,minimum size=1.5cm] at (0,0) {}; +& +\tikz \node[sailor,stripes=red,minimum size=1.5cm] at (0,0) {}; +& +\tikz \node[sailor,details=red,minimum size=1.5cm] at (0,0) {}; +\\ \hline +\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{hat}=red & \RDD{undershirt}=red & \RDD{stripes}=red & \RDD{details}=red +\\ \hline +\end{tabular} + + +\bigskip +\begin{tabular}{|c|c|c|c|c|}\hline +\multicolumn{5}{|c|}{ \BS{tikz} \BS{node}[\blll{santa},\RDD{hat}=green,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[santa,hat=green,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[santa,skin=green,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[santa,shirt=green,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[santa,beard=green,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[santa,details=green,minimum size=1.5cm] at (0,0) {}; + +\\ \hline +\RDD{hat}=green & \RDD{skin}=green& \RDD{shirt}=green & \RDD{beard}=green & \RDD{details}=green +\\ \hline +\end{tabular} + + +\bigskip +\begin{tabular}{|c|c|c|c|c|}\hline +\multicolumn{5}{|c|}{ \BS{tikz} \BS{node}[\blll{surgeon},\RDD{hat}=red,minimum size=1.5cm] at (0,0) {}; } +\\ \hline +\tikz \node[surgeon,hat=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[surgeon,skin=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[surgeon,shirt=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[surgeon,hair=red,minimum size=1.5cm] at (0,0) {}; & +\tikz \node[surgeon,mask=red,minimum size=1.5cm] at (0,0) {}; + +\\ \hline +\RDD{hat}=red & \RDD{skin}=red & \RDD{shirt}=red & \RDD{hair}=red & \RDD{mask}=red +\\ \hline +\end{tabular} + diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzscope.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzscope.tex index c6ebdb602d4..4af5f630860 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzscope.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzscope.tex @@ -10,16 +10,16 @@ \BS{begin}\AC{tikzpicture}[line width = 3mm] \\ \\ \BS{draw} (0.5,6) - - (2.5,6);\\ -\ESS{begin\AC{scope}}[{\color{red}red}] \\ +\ESS{scope}[{\color{red}red}] \\ \BS{draw} (0.5,5) - - (2.5,5); \\ \BS{draw} (0.5,4) - - (2.5,4);\\ -\ESS{end\AC{scope}} \\ \\ +\BS{end\AC{scope}} \\ \\ \BS{draw} (0.5,3) - - (2.5,3);\\ \\ -\ESS{begin\AC{scope}}[{\color{red}green}] \\ +\ESS{scope}[{\color{red}green}] \\ \BS{draw} (0.5,2) - - (2.5,2);\\ \BS{draw} [{\color{red}red}] (0.5,1) - - (2.5,1);\\ \BS{draw} (0.5,0) - - (2.5,0);\\ -\ESS{end\AC{scope}} \\ \\ +\BS{end\AC{scope}} \\ \\ \BS{end}\AC{tikzpicture} } & diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzstyl.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzstyl.tex index cb9a9b37617..73efb94cd3c 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkzstyl.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkzstyl.tex @@ -8,7 +8,7 @@ \end{tikzpicture} & \parbox{10cm}{ -\BS{begin}\AC{tikzpicture} [mon style\RDD{/.style}=\AC{draw=blue, fill=red!20, very thick}]\\ +\BS{begin}\AC{tikzpicture} [mon style/.\RDD{style}=\AC{draw=blue, fill=red!20, very thick}]\\ \BS{draw} (0,0) circle (2cm); \\ \BS{draw}[mon style] (0,0) circle (1cm); \\ \BS{end}\AC{tikzpicture} \\ } @@ -27,7 +27,7 @@ \end{tikzpicture} & \parbox{12cm}{ -\BS{begin}\AC{tikzpicture} [mon style/\RDD{.style}=\AC{draw={\color{red} \#1}, thick, fill={\color{red} \#1}!50, scale=.5}]\\ +\BS{begin}\AC{tikzpicture} [mon style/.\RDD{style}=\AC{draw={\color{red} \#1}, thick, fill={\color{red} \#1}!50, scale=.5}]\\ \BS{filldraw} [mon style=red] (0,0) rectangle (2,1);\\ \BS{filldraw} [mon style=blue] (3,0) rectangle (5,1);\\ \BS{end}\AC{tikzpicture} \\ @@ -49,8 +49,8 @@ mon style/.default=black] \end{tikzpicture} & \parbox{12cm}{ -\BS{begin}\AC{tikzpicture} [mon style/\RDD{.style}=\AC{draw={\color{red} \#1},fill={\color{red} \#1}!20,very thick},\\ -mon style/\RDD{.default}=black] \\ +\BS{begin}\AC{tikzpicture} [mon style/.\RDD{style}=\AC{draw={\color{red} \#1},fill={\color{red} \#1}!20,very thick},\\ +mon style/\RDD{default}=black] \\ \BS{filldraw} [mon style] (0,0) rectangle (2,1);\\ \BS{filldraw} [mon style=blue] (3,0) rectangle (5,1);\\ \BS{end}\AC{tikzpicture} } diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkztab.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkztab.tex index bd91f98cf2f..bfc9dd20097 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkztab.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkztab.tex @@ -1,7 +1,7 @@ -\label{tab} +\label{tabl} %Insérer dans le préambule : - \maboite{\BS{usepackage}\AC{tkz-tab}} + \maboite{\BS{usepackage}\AC{tkz-tab} \cite {tikstab}} %\subsection{Déclaration du tableau} diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkztitre.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkztitre.tex index f3b7a84d9bd..29fe67de8f5 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.63} } +\title{ {\RM Visual TikZ} \\ \vspace{1cm} {\RMM Version 0.64} } @@ -66,7 +66,7 @@ \begin{itemize} \item Avoir une image par commande ou par paramètre. \item Avoir un texte réduit au strict minimum. -\item Le plus complet possible au fil de mises à jour régulières. +\item Etre le plus complet possible au fil de mises à jour régulières. \item Garder la même structure que visuel pstricks \end{itemize} } @@ -117,7 +117,29 @@ Minimal code is given to show the effect of a command or a parameter. The effect \end{itemize}} \vspace{1cm} +\TFRGB{ +\textbf{Quoi de neuf ! } : + +\begin{itemize} +\item ajout du module tikzpeople \pageref{people} +\item ajout du module circuits.logic \pageref{lib-gate} +\item ajout du module tikz-optics \pageref{optics} +\item restructuration de l'index +\end{itemize} +}{ +\textbf{What's new} : + +\begin{itemize} +\item tikzpeople package added \pageref{people} +\item circuits.logic package added \pageref{lib-gate} +\item tikz-optics package added \pageref{optics} +\item 3 minors bugs signaled by Jim Diamond corrected +\item reorganization of the index +\end{itemize} +} + +\vspace{1cm} \textbf{Licence } : diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/tkztree.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/tkztree.tex index 647f7a33775..9baea5e1e4b 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/tkztree.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/tkztree.tex @@ -101,9 +101,9 @@ child {node{soeur}}; \end{tikzpicture} \\ \hline -\BS{node} \AC{père}[\RDD{grow=-30}] +\BS{node} \AC{père}[\RDD{grow}=-30] & -\BS{node} \AC{père}[\RDD{grow=30}] +\BS{node} \AC{père}[\RDD{grow}=30] & \BS{node} \AC{père}[\RDD{grow'}=30] \\ \hline @@ -139,11 +139,11 @@ child {node{soeur}}; \end{tikzpicture} \\ \hline -\BS{node} \AC{père}[\RDD{grow=up}] +\BS{node} \AC{père}[\RDD{grow}=up] & -\BS{node} \AC{père}[\RDD{grow=left}] +\BS{node} \AC{père}[\RDD{grow}=left] & -\BS{node} \AC{père}[\RDD{grow=right}] +\BS{node} \AC{père}[\RDD{grow}=right] \\ \hline \begin{tikzpicture} \node {père}[grow=north] @@ -172,11 +172,11 @@ child {node{soeur}}; \end{tikzpicture} \\ \hline -\BS{node} \AC{père}[\RDD{grow=north}] +\BS{node} \AC{père}[\RDD{grow}=north] & -\BS{node} \AC{père}[\RDD{grow=east}] +\BS{node} \AC{père}[\RDD{grow}=east] & -\BS{node} \AC{père}[\RDD{grow=north east}] +\BS{node} \AC{père}[\RDD{grow}=north east ] \\ \hline \end{tabular} @@ -194,11 +194,11 @@ & \parbox[c]{8cm}{ \BS{node} \AC{père}\\ - child[\RDD{grow=right},red] \AC{node \AC{frère}}\\ + child[\RDD{grow}=right,red] \AC{node \AC{frère}}\\ child \AC{node \AC{moi}\\ child \AC{node \AC{fils}}\\ child \AC{node \AC{fille}}}\\ - child[\RDD{grow=north west},red] \AC{node\AC{soeur}};\\ + child[\RDD{grow}=north west,red] \AC{node\AC{soeur}};\\ } \\ \hline \end{tabular} @@ -542,7 +542,7 @@ child \AC{node {\color{red}(f)} \AC{soeur}};\\ \\ child \AC{node \AC{frère}} & child \AC{node \AC{frère}} \\ child \{ node \AC{moi} & child \{ node \AC{moi}\\ - child \AC{node \AC{fils}} & child [\RDD{child anchor=west},red] \AC{node \AC{fils}} \\ + child \AC{node \AC{fils}} & child [\RDD{child anchor}=west,red] \AC{node \AC{fils}} \\ child \AC{node \AC{fils}} \}; & child \AC{node \AC{fils}} \}; \\ \hline \end{tabular} @@ -567,13 +567,13 @@ child \AC{node {\color{red}(f)} \AC{soeur}};\\ }; \end{tikzpicture} \\ \hline - \BS{node} \AC{pére} [\RDD{parent anchor=east},red] + \BS{node} \AC{pére} [\RDD{parent anchor}=east,red] & \BS{node} \AC{pére} \\ child \AC{node \AC{frère}} & child \AC{node \AC{frère}} \\ child \{ node \AC{moi} & child \{ node \AC{moi}\\ - child \AC{node \AC{fils}} & child [\RDD{parent anchor=west},red] \AC{node \AC{fils}} \\ + child \AC{node \AC{fils}} & child [\RDD{parent anchor}=west,red] \AC{node \AC{fils}} \\ child \AC{node \AC{fils}} \}; & child \AC{node \AC{fils}} \}; \\ \hline \end{tabular} diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/versFR.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/versFR.tex index c39c291e119..9d2c7ade677 100644 --- a/Master/texmf-dist/doc/latex/visualtikz/Source/versFR.tex +++ b/Master/texmf-dist/doc/latex/visualtikz/Source/versFR.tex @@ -1,7 +1,7 @@ % Version française \newcommand{\TFRGB}[2]{#1} % #1 en francais #2 in english -\newcommand{\dft}{Par défaut} +\newcommand{\dft}{Par défaut : } \newcommand{\SSCT}[2]{\section{#1}} \newcommand{\SbSSCT}[2]{\subsection{#1}} \newcommand{\Par}[2]{ \paragraph{#1}} @@ -15,4 +15,4 @@ \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 +\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/VisualTikZ-fr.pdf b/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ-fr.pdf index 9fa13c45a33..aef125b9260 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 9db8aadde78..c5730dae352 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