texlive[46386] Master/texmf-dist/doc/latex/visualtikz: visualtikz
commits+karl at tug.org
commits+karl at tug.org
Fri Jan 19 22:58:01 CET 2018
Revision: 46386
http://tug.org/svn/texlive?view=revision&revision=46386
Author: karl
Date: 2018-01-19 22:58:00 +0100 (Fri, 19 Jan 2018)
Log Message:
-----------
visualtikz (19jan18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.tex
trunk/Master/texmf-dist/doc/latex/visualtikz/Source/bibtkz.tex
trunk/Master/texmf-dist/doc/latex/visualtikz/Source/table.dat
trunk/Master/texmf-dist/doc/latex/visualtikz/Source/table2.dat
trunk/Master/texmf-dist/doc/latex/visualtikz/Source/table3.dat
trunk/Master/texmf-dist/doc/latex/visualtikz/Source/table3X.dat
trunk/Master/texmf-dist/doc/latex/visualtikz/Source/test.tex
trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tikzdebut.tex
trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tkzmerci.tex
trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tkzpeople.tex
trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tkztitre.tex
trunk/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ-fr.pdf
trunk/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ.pdf
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/visualtikz/Source/MAJ.tex
trunk/Master/texmf-dist/doc/latex/visualtikz/Source/matrix.tex
trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tkzducks.tex
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/visualtikz/Source/test.pdf
Added: trunk/Master/texmf-dist/doc/latex/visualtikz/Source/MAJ.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/visualtikz/Source/MAJ.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/visualtikz/Source/MAJ.tex 2018-01-19 21:58:00 UTC (rev 46386)
@@ -0,0 +1,23 @@
+
+\sub section{version 0.64}
+
+\TFRGB{
+\textbf{Quoi de neuf version 0.64! } :
+
+\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 version 0.64} :
+
+\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}
+}
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/latex/visualtikz/Source/MAJ.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.tex 2018-01-19 12:07:30 UTC (rev 46385)
+++ trunk/Master/texmf-dist/doc/latex/visualtikz/Source/VTKZ.tex 2018-01-19 21:58:00 UTC (rev 46386)
@@ -1,5 +1,3 @@
-%
-%
\input{tkztitre}
@@ -40,7 +38,6 @@
\newpage
-%\section{Insertion de petites images}
\SSCT{Insertion de petites images}{Small pictures}
\input{tkzpic}
@@ -52,7 +49,6 @@
\newpage
-%\section{Les coordonnées }
\SSCT{Les coordonnées }{Coordinates}
\input{tkzgrid}
@@ -59,25 +55,30 @@
\newpage
\input{tkzcoord}
-%
-%%%%%==========================================================
+
+%%%%%==================================================
\newpage
-%\section[Les n\oe uds]{Les n\oe uds }
+
\SSCT{Les n\oe uds }{Nodes}
-
\input{tkznoeud1}
\input{tkzfit}
-%
\newpage
+
+\SbSSCT{Matrice de n\oe uds}{Matrices and Alignment}
+
+\input{matrix}
+
+\newpage
+
%%%======================================================
\SSCT{Constructions particulières }{Transformations}
-%
+
\input{tkz4}
\newpage
@@ -95,7 +96,6 @@
\newpage
-
\SSCT{Position absolue sur une page}{Absolute position on a page}
\input{tkzpage}
@@ -124,12 +124,10 @@
\newpage
-%\sectionCreate {Créer ses commandes}
\SSCT{Créer ses commandes}{Create command}
\input{tkzcde}
-
\newpage
\SSCT{Créer ses styles}{Creating styles}
@@ -136,11 +134,10 @@
\input{tkzstyl}
-%%%%%%%======================================================
+%%%%%%%===============================================
\newpage
-%\section{Mettre du texte en valeur}
\SSCT{Mettre du texte en valeur}{Text highlighting}
\input{tkzboit1}
@@ -155,26 +152,22 @@
\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}
@@ -221,10 +214,16 @@
\input{tkzpeople}
+\newpage
+\subsection{Ducks}
+
+\input{tkzducks}
+
\newpage
-%% % % % %======================================================================
-%\section[Créer un graphe]{Créer un graphe }
+
+ %==================================================
+
\SSCT{Créer un graphe }{Creating Graphs}
\input{tkzgraph1}
@@ -234,8 +233,7 @@
\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
@@ -261,14 +259,14 @@
\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}
@@ -317,13 +315,13 @@
%%%==============================================================
\newpage
-%\section[Les diagrammes arborescents ]{Les diagrammes arborescents }
\SSCT{Les diagrammes arborescents }{Tree diagram}
\input{tkztree}
-%%%==============================================================
+%%%==================================================
+
\newpage
\SSCT{Les schemas électriques }{Electrical Engineering Circuits}
@@ -330,7 +328,6 @@
\input{tkzelect}
- j%\newpage
\SSCT{Les circuits logiques }{Logical circuits}
@@ -344,10 +341,8 @@
\newpage
-%\section[Les animations ]{Les animations }
\SSCT{Les animations }{Animate a TikZ picture}
-
\input{tkzanim}
\input{tkztab}
@@ -366,7 +361,7 @@
\newpage
-%%================================================================
+%%===============================================
\SSCT{Les modules étudiés dans ce document}{Packages studied in this document}
@@ -377,6 +372,7 @@
\newpage
%%%XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+
\section{Index}
\begin{enumerate}
@@ -389,4 +385,11 @@
\printindex
+%\newpage
+%
+%\SbSSCT{Mises à jour précédente}{Former updates}
+%
+%\input{MAJ}
+
+
\end{document}
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/latex/visualtikz/Source/bibtkz.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/visualtikz/Source/bibtkz.tex 2018-01-19 12:07:30 UTC (rev 46385)
+++ trunk/Master/texmf-dist/doc/latex/visualtikz/Source/bibtkz.tex 2018-01-19 21:58:00 UTC (rev 46386)
@@ -1,6 +1,4 @@
-
-
\begin{tabular}{|c|c|l c|}\hline
\multicolumn{4}{|c|}{ \textbf{\TFRGB{module de base TikZ}{Basic TikZ package} : } }
\\ \hline
@@ -11,11 +9,8 @@
\hline
\end{tabular}
-%\bigskip
\bigskip
-
-%
\begin{tabular}{|c|c|l c|}\hline
\multicolumn{4}{|c|}{ \textbf{\TFRGB{Autres modules}{Other packages}} }
\\ \hline
@@ -24,6 +19,8 @@
tikz-optics & \pageref{optics} & tikz-optics.pdf & \DFR \\
pgfplots & \pageref{pgfplots} & pgfplots.pdf & \DGB \\
tikzpeople & \pageref{people} & tikzpeople.pdf & \DGB \\
+tikzducks & \pageref{ducks} & tikzducks-doc.pdf & \DGB \\
+
tkz-tab & \pageref{tabl} & tkz-tab-screen.pdf & \DFR \\
\hline
\end{tabular}
@@ -72,6 +69,8 @@
\\
intersections & \pageref{lib-intersections} & \BS{usetikzlibrary}\AC{intersections}
\\
+matrix & \pageref{lib-matrix} & \BS{usetikzlibrary}\AC{matrix}
+\\
patterns & \pageref{lib-patterns} & \BS{usetikzlibrary}\AC{patterns}
\\
plotmarks & \pageref{plotmarks} & \BS{usetikzlibrary}\AC{plotmarks}
@@ -84,7 +83,8 @@
\\shapes.callouts & \pageref{lib-call} & \BS{usetikzlibrary}\AC{shapes.callouts}
\\
shapes.geometric & \pageref{lib-geom} & \BS{usetikzlibrary}\AC{shapes.geometric}
-\\
+\\
+
shapes.misc & \pageref{lib-misc} & \BS{usetikzlibrary}\AC{shapes.misc}
\\
shapes.multipart & \pageref{lib-mult} & \BS{usetikzlibrary}\AC{shapes.multipart}
@@ -111,11 +111,11 @@
\begin{tabular}{|l|c|}\hline
\multicolumn{2}{|c|}{ \TFRGB{dans une prochaine mise à jour}{In a a future update } }
\\ \hline
-automata & \RRR{41} \\
-babel & \RRR{42} \\
-calendar & \RRR{45} \\
-chains & \RRR{46} \\
-%circuits.ee & \RRR{47-4} \\
+automata & \RRR{41} \\
+babel & \RRR{42} \\
+calendar & \RRR{45} \\
+chains & \RRR{46} \\
+%circuits.ee & \RRR{47-4} \\
circular graph drawing library & \RRR{32} \\
curvilinear library & \RRR{103-4-7} \\
@@ -134,8 +134,7 @@
graphdrawing library & \RRR{27} \\
graphs library & \RRR{19} \\
layered graph drawing library & \RRR{30} \\
-lindenmayersystems & \RRR{55} \\
-matrix & \RRR{57} \\
+lindenmayersystems & \RRR{55} \\
mindmap & \RRR{58} \\
petri & \RRR{61} \\
phylogenetics graph drawing library & \RRR{33} \\
@@ -156,11 +155,6 @@
\end{tabular}
-%
-
-
-
-%%
%\newpage
%%
%% \tableofcontents
@@ -176,7 +170,11 @@
\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{tikzducks} tikzducks-doc.pdf \hspace{1cm} version 0.5a \hspace{1cm} 24 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
+\end{thebibliography}
+
Added: trunk/Master/texmf-dist/doc/latex/visualtikz/Source/matrix.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/visualtikz/Source/matrix.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/visualtikz/Source/matrix.tex 2018-01-19 21:58:00 UTC (rev 46386)
@@ -0,0 +1,925 @@
+
+
+\label{matrix}
+\begin{center}
+\RRR{20}
+\end{center}
+
+\begin{tabular}{|c|c|} \hline
+\begin{tikzpicture}[baseline=0pt]
+\draw[help lines] (0,0) grid (4,2);
+\node [matrix,fill=red!20,draw=blue,very thick] (my matrix) at (2,1)
+{
+\draw (0,0) circle (4mm); & \node[rotate=45] {Hello}; \\
+\draw (0.2,0) circle (2mm); & \fill[red] (0,0) circle (3mm); \\
+};
+\end{tikzpicture}
+&
+\parbox{10cm}{
+\BS{node} [\RDD{matrix},fill=red!10,draw=blue,very thick] at (2,1) \\
+\{ \\
+\BS{draw} (0,0) circle (4mm); \& \BS{node} [rotate=45] {Hello}; \BS{}\BS{} \\
+\BS{draw} (0.2,0) circle (2mm); \& \BS{fill}[red] (0,0) circle (3mm); \BS{}\BS{} \\
+\}; \\
+}
+\\ \hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|c|} \hline
+\begin{tikzpicture}[baseline=0pt]
+\matrix [fill=red!20,draw=blue,very thick]
+{
+\draw (0,0) circle (4mm); & \node[rotate=45] {Hello}; \\
+\draw (0.2,0) circle (2mm); & \fill[red] (0,0) circle (3mm); \\
+};
+\end{tikzpicture}
+&
+\parbox{10cm}{
+\BSS{matrix} [fill=red!10,draw=blue,very thick] \\
+\{ \\
+\BS{draw} (0,0) circle (4mm); \& \BS{node} [rotate=45] {Hello}; \BS{}\BS{} \\
+\BS{draw} (0.2,0) circle (2mm); \& \BS{fill}[red] (0,0) circle (3mm); \BS{}\BS{} \\
+\}; \\
+}
+\\ \hline
+\end{tabular}
+
+
+\SbSbSSCT{Alignement des cellules}{Cell Pictures}
+
+
+\begin{center}
+\RRR{20-3}
+\end{center}
+
+\begin{tabular}{|c|c|c|} \hline
+\begin{tikzpicture}
+[every node/.style={draw=black,font=\huge}]
+\matrix [draw=red]
+{
+\node {a}; \fill[blue] (0,0) circle (2pt); &
+\node {X}; \fill[blue] (0,0) circle (2pt); &
+\node {g}; \fill[blue] (0,0) circle (2pt); \\
+};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+[every node/.style={draw=black,anchor=base,font=\huge}]
+\matrix [draw=red]
+{
+\node {a}; \fill[blue] (0,0) circle (2pt); &
+\node {X}; \fill[blue] (0,0) circle (2pt); &
+\node {g}; \fill[blue] (0,0) circle (2pt); \\
+};
+\end{tikzpicture}
+&
+\begin{tikzpicture}[every node/.style={draw=black}]
+\matrix [draw=red,anchor=north,font=\huge]
+{
+\node {a}; \fill[blue] (0,0) circle (2pt); &
+\node {X}; \fill[blue] (0,0) circle (2pt); &
+\node {g}; \fill[blue] (0,0) circle (2pt); \\
+};
+\end{tikzpicture}
+\\ \hline
+ & anchor=base & anchor=north \\ \hline
+\end{tabular}
+
+\bigskip
+\begin{tabular}{|c|c|c|} \hline
+\begin{tikzpicture}
+[every node/.style={draw=black,font=\huge}]
+\matrix [draw=red]
+{
+
+\node[left] {X}; \fill[blue] (0,0) circle (2pt); \\
+};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+[every node/.style={draw=black,anchor=base,font=\huge}]
+\matrix [draw=red]
+{
+\node {a}; \fill[blue] (0,0) circle (2pt); ²\\
+\node[right] {X}; \fill[blue] (0,0) circle (2pt); \\
+\node {g}; \fill[blue] (0,0) circle (2pt); \\
+};
+\end{tikzpicture}
+&
+\begin{tikzpicture}[every node/.style={draw=black}]
+\matrix [draw=red,anchor=north,font=\huge]
+{
+\node {a}; \fill[blue] (0,0) circle (2pt); &
+\node[right] {X}; \fill[blue] (0,0) circle (2pt); &
+\node {g}; \fill[blue] (0,0) circle (2pt); \\
+};
+\end{tikzpicture}
+\\ \hline
+ & anchor=base & anchor=north \\ \hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|c|} \hline
+\begin{tikzpicture}[baseline=0pt]
+\matrix [draw=red,nodes=draw]
+{
+\node[left] {A}; \fill[blue] (0,0) circle (2pt); \\
+\node {B}; \fill[blue] (0,0) circle (2pt); \\
+\node[right] {C}; \fill[blue] (0,0) circle (2pt); \\
+};
+\end{tikzpicture}
+&
+\parbox{12cm}{
+\BS{matrix} [draw=red,nodes=draw]
+\AC{\\
+\BS{node}\rouge{[left]} {A}; \BS{fill}[blue] (0,0) circle (2pt); \BS{} \BS{} \\
+\BS{node} {B}; \BS{fill}[blue] (0,0) circle (2pt);\BS{} \BS{} \\
+\BS{node}\rouge{[right]} {C}; \BS{fill}[blue] (0,0) circle (2pt); \BS{} \BS{}\\
+}; \\
+}
+
+\\ \hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|c|} \hline
+\multicolumn{2}{|c|}{\BS{matrix} [draw,\RDD{column sep}=1cm,nodes=draw]}
+\\ \hline
+\begin{tikzpicture}
+\matrix [draw,column sep=1cm,nodes=draw]
+{
+\node(a) {123}; & \node (b) {1}; & \node {1}; \\
+\node {12}; & \node {12}; & \node {1}; \\
+\node(c) {1}; & \node (d) {123}; & \node {1}; \\
+};
+\draw [red,thick] (a.east) -- (a.east |- c)
+(d.west) -- (d.west |- b);
+\draw [<->,red,thick] (a.east) -- (d.west |- b)
+node [above,midway] {1cm};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\matrix [draw,column sep={1cm,between origins},nodes=draw]
+{
+\node(a) {123}; & \node (b) {1}; & \node {1}; \\
+\node {12}; & \node {12}; & \node {1}; \\
+\node {1}; & \node {123}; & \node {1}; \\
+};
+\draw [<->,red,thick] (a.center) -- (b.center) node [above,midway] {1cm};
+\end{tikzpicture}
+\\ \hline \RDD{column sep}=1cm & column sep=\AC{1cm,\RDD{between origins} }
+\\ \hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|c|} \hline
+\multicolumn{2}{|c|}{\BS{matrix} [draw,\RDD{row sep}=1cm,nodes=draw]}
+\\ \hline
+\begin{tikzpicture}
+\matrix [draw,row sep=1cm,nodes=draw]
+{
+\node (a) {123}; & \node {1}; & \node {1}; \\
+\node (b) {12}; & \node {12}; & \node {1}; \\
+\node {1}; & \node {123}; & \node {1}; \\
+};
+\draw [<->,red,thick] (a.south) -- (b.north) node [right,midway] {1cm};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\matrix [draw,row sep={1cm,between origins},nodes=draw]
+{
+\node (a) {123}; & \node {1}; & \node {1}; \\
+\node (b) {12}; & \node {12}; & \node {1}; \\
+\node {1}; & \node {123}; & \node {1}; \\
+};
+\draw [<->,red,thick] (a.center) -- (b.center) node [right,midway] {1cm};
+\end{tikzpicture}
+\\ \hline
+\RDD{row sep}=1cm & row sep=\AC{1cm,\RDD{between origins} }
+\\ \hline
+
+
+\end{tabular}
+
+
+
+
+\bigskip
+
+\begin{tabular}{|c|c|} \hline
+\multicolumn{2}{|c|}{\BS{matrix} [ \rouge{row sep=5mm},draw,nodes=draw]} \\
+\multicolumn{2}{|c|}{ \{ \BS{node} \AC{1}; \& \BS{node} \AC{2}; \& \BS{node} \AC{3}; \BS{}\BS{} } \\
+\multicolumn{2}{|c|}{ \BS{node} \AC{4} ; \& \BS{node} \AC{5}; \& \BS{node} \AC{6}; \BS{}\BS{} \rouge{[1cm]} } \\
+\multicolumn{2}{|c|}{ \BS{node} \AC{7}; \& \BS{node}\AC{8}; \& \BS{node}\AC{9}; \BS{}\BS{} \} }
+\\ \hline
+\begin{tikzpicture}
+\matrix [row sep=5mm,draw,nodes=draw]
+{
+\node {1}; & \node {2};& \node {3}; \\
+\node(a) {4} ; & \node {5}; & \node {6};\\[1cm]
+\node(b) {7}; &\node {8}; & \node {9}; \\
+};
+\draw [<->,red,thick] (a.center) -- (b.center) node [right,midway] {1,5cm};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\matrix [row sep=5mm,draw,nodes=draw]
+{
+\node {1}; & \node {2};& \node {3}; \\
+\node(a) {4} ; & \node {5}; & \node {6};\\[10mm,between origins]
+\node(b) {7}; &\node {8}; & \node {9}; \\
+};
+\draw [<->,red,thick] (a.center) -- (b.center) node [right,midway] {1,5cm};
+\end{tikzpicture}
+\\ \hline
+\rouge{[1cm]} & \rouge{[1cm,between origins]}
+\\ \hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|c|} \hline
+\multicolumn{2}{|c|}{\BS{matrix} [ \rouge{column sep=5mm},draw,nodes=draw]} \\
+\multicolumn{2}{|c|}{ \{ \BS{node} \AC{1}; \& \BS{node} \AC{2}; \& \BS{node} \AC{3}; \BS{}\BS{} } \\
+\multicolumn{2}{|c|}{ \BS{node} \AC{4} ; \& \BS{node} \AC{5}; \& \rouge{[1cm]}\BS{node} \AC{6}; \BS{}\BS{} } \\
+\multicolumn{2}{|c|}{ \BS{node} \AC{7}; \& \BS{node}\AC{8}; \& \BS{node}\AC{9}; \BS{}\BS{} \} }
+\\ \hline
+
+\begin{tikzpicture}
+\matrix [draw,nodes=draw,column sep=5mm]
+{
+\node {1}; & \node(a) {2}; &[1cm] \node(b) {3}; \\
+\node {4}; & \node{5}; & \node {6}; \\
+\node {7}; & \node{8}; & \node {9}; \\
+};
+\draw [<->,red,thick] (a.east) -- (b.west) node [above,midway] {15mm};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\matrix [draw,nodes=draw,column sep=5mm]
+{
+\node {1}; &[2mm] \node(a){2}; &[1cm,between origins] \node(b){3}; \\
+\node {4}; & \node {5}; & \node {6}; \\
+\node {7}; & \node {8}; & \node {9}; \\
+};
+\draw [<->,red,thick] (a.center) -- (b.center) node [above,midway] {15mm};
+\end{tikzpicture}
+\\ \hline
+\rouge{[1cm]}
+&
+\rouge{[1cm,between origins]}
+\\ \hline
+\end{tabular}
+
+
+
+
+\bigskip
+
+\begin{tikzpicture}
+\matrix [draw,nodes=draw,column sep={1cm,between origins}]
+{
+\node (a) {8}; & \node (b) {1}; &[between borders] \node (c) {6}; \\
+\node {3}; & \node {5}; & \node {7}; \\
+\node {4}; & \node {9}; & \node {2}; \\
+};
+\draw [<->,red,thick] (a.center) -- (b.center) node [above,midway] {10mm};
+\draw [<->,red,thick] (b.east) -- (c.west) node [above,midway] {1cm};
+\end{tikzpicture}
+
+
+
+\SbSbSSCT{Format des cellules}{Cell Styles and Options}
+
+\noindent
+
+\begin{tabular}{|c|} \hline
+\BS{matrix} [nodes=draw,nodes=\AC{\rouge{fill}=blue!10\rouge{,minimum size}=1cm}]
+\\ \hline
+\begin{tikzpicture}
+\matrix [nodes=draw,nodes={fill=blue!10,minimum size=1cm}]
+{
+\node {1}; & \node{2}; & \node {3}; \\
+\node {4}; & \node{5}; & \node {6}; \\
+\node {7}; & \node{8}; & \node {9}; \\
+};
+\end{tikzpicture}
+\\ \hline
+\end{tabular}
+
+
+\bigskip
+
+
+\begin{tabular}{|c|c|c|} \hline
+\multicolumn{3}{|c|}{\BS{matrix}[\rouge{row 2/.style}=\AC{red}]}
+ \\ \hline
+\begin{tikzpicture}
+\matrix[row 2/.style={red}]
+{
+\node {8}; & \node{1}; & \node {6}; \\
+\node {3}; & \node{5}; & \node {7}; \\
+\node {4}; & \node{9}; & \node {2}; \\
+};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\matrix[column 2/.style={red}]
+{
+\node {8}; & \node{1}; & \node {6}; \\
+\node {3}; & \node{5}; & \node {7}; \\
+\node {4}; & \node{9}; & \node {2}; \\
+};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\matrix[row 2 column 2/.style={red}]
+{
+\node {8}; & \node{1}; & \node {6}; \\
+\node {3}; & \node{5}; & \node {7}; \\
+\node {4}; & \node{9}; & \node {2}; \\
+};
+\end{tikzpicture}
+\\ \hline
+row 2/.style=\AC{red} & column 2/.style=\AC{red} & row 2 column 2/.style=\AC{red}\\
+\hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|c|c|} \hline
+\multicolumn{3}{|c|}{\BS{matrix}[column 1/.style=\AC{anchor=west}]}
+ \\ \hline
+\begin{tikzpicture}
+\matrix[column 1/.style={anchor=west}]
+{
+\node {12345}; & \node {67890}; \\
+\node {123}; & \node{67}; \\
+\node {1}; & \node{6}; & \\
+};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\matrix[column 1/.style={anchor=east}]
+{
+\node {12345}; & \node {67890}; \\
+\node {123}; & \node{67}; \\
+\node {1}; & \node{6}; & \\
+};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\matrix[column 1/.style={anchor=base}]
+{
+\node {12345}; & \node {67890}; \\
+\node {123}; & \node{67}; \\
+\node {1}; & \node{6}; & \\
+};
+\end{tikzpicture}
+\\ \hline
+[\rouge{column 1/.style}={anchor=west}]& [\rouge{column 1/.style}={anchor=east}] & [\rouge{column 1/.style}={anchor=base}]\\
+\hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|c|c|c|} \hline
+\multicolumn{4}{|c|}{\BS{matrix}[matrix of nodes,\RDD{every odd column}/.style={red}]}
+ \\ \hline
+\begin{tikzpicture}
+\matrix [matrix of nodes,every odd column/.style={red}]
+{
+a & b & c & d \\
+e & f & g & h \\
+i & j & k & l \\
+};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\matrix [matrix of nodes,every even column/.style={red}]
+{
+a & b & c & d \\
+e & f & g & h \\
+i & j & k & l \\
+};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\matrix [matrix of nodes,every odd row/.style={red}]
+{
+a & b & c & d \\
+e & f & g & h \\
+i & j & k & l \\
+};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\matrix [matrix of nodes,every even row/.style={red}]
+{
+a & b & c & d \\
+e & f & g & h \\
+i & j & k & l \\
+};
+\end{tikzpicture}
+\\
+\hline
+\RDD{every odd column} & \RDD{every even column} & \RDD{every odd row} & \RDD{every even row} \\
+\hline
+\end{tabular}
+
+
+\bigskip
+
+
+\begin{tabular}{|c|} \hline
+\BS{matrix} [draw,matrix of nodes,\rouge{execute at begin cell}=\AC{(}]
+\\ \hline
+\begin{tikzpicture}
+\matrix [draw,matrix of nodes,execute at begin cell={(}]
+{
+1 & 2 & \\
+4 & & 6 \\
+ & & 9 \\
+};
+\end{tikzpicture}
+\\ \hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|} \hline
+\BS{tikz}
+[matrix of nodes/.style=\AC{
+execute at begin cell=\BS{node}\BS{bgroup} , \\
+\rouge{execute at end cell}=\$m\wedge 2\$\BS{egroup};
+}] \\
+\BS{matrix} [draw,matrix of nodes
+]
+\\ \hline
+\tikz
+[matrix of nodes/.style={
+execute at begin cell=\node\bgroup ,
+execute at end cell=$m^2$\egroup;
+}]
+\matrix [draw,matrix of nodes
+]
+{1 & 2 & \\
+4 & & 6 \\
+ & 8 & 9 \\
+};
+%\end{tikzpicture}
+\\ \hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|} \hline
+
+ \BS{matrix} [raw,matrix of nodes, \rouge {execute at empty cell}=\BS{node}\AC{- -}; ]
+\\ \hline
+
+\begin{tikzpicture}
+\matrix [draw,matrix of nodes,execute at empty cell=\node{--};]
+{
+1 & 2 & \\
+4 & & 6 \\
+& & 9 \\
+};
+\end{tikzpicture}
+\\ \hline
+\end{tabular}
+
+
+\newpage
+\SbSbSSCT{Points d'ancrage}{Anchoring a Matrix}
+
+\begin{center}
+\RRR{20-4}
+\end{center}
+
+\begin{tabular}{|c|c|c|} \hline
+\multicolumn{3}{|c|}{
+\BS{matrix} [draw=red,nodes=draw,\RDD{matrix anchor}=east](XXX) at (1,1) }
+\\ \hline
+\begin{tikzpicture}
+\draw[help lines] (0,0) grid (3,3);
+\matrix [draw=red,nodes=draw,matrix anchor=west](XXX) at (1,1)
+{
+\node {123}; \\
+\node {12}; \\
+\node {1}; \\
+};
+\fill[red](XXX.west) circle (3pt);
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\draw[help lines] (0,0) grid (3,3);
+\matrix [draw=red,nodes=draw,matrix anchor=east](XXX) at (1,1)
+{
+\node {123}; \\
+\node {12}; \\
+\node {1}; \\
+};
+\fill[red] (XXX.east) circle (3pt);
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\draw[help lines] (0,0) grid (3,3);
+\matrix [draw=red,nodes=draw,matrix anchor=south](XXX) at (1,1)
+{
+\node {123}; \\
+\node {12}; \\
+\node {1}; \\
+};
+\fill[red](XXX.south) circle (3pt);
+\end{tikzpicture}
+
+\\ \hline
+matrix anchor=west & matrix anchor=east & matrix anchor=south
+\\ \hline
+\end{tabular}
+
+\bigskip
+\begin{tabular}{|c|c|c|c|} \hline
+\multicolumn{2}{|c|}{\BS{matrix} [draw=red,nodes=draw,\rouge{anchor=west}] }
+\\ \hline
+\begin{tikzpicture}
+\matrix [draw=red,nodes=draw,anchor=west]
+{
+\node {123}; & \node {abc}; \\
+\node {12}; & \node {ab}; \\
+\node {1}; & \node {a}; \\
+};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\matrix [draw=red,nodes=draw,anchor=east]
+{
+\node {123};& \node {abc}; \\
+\node {12}; &\node {ab};\\
+\node {1}; & \node {a}; \\
+};
+\end{tikzpicture}
+
+\\ \hline
+anchor=west & anchor=east \\
+\hline
+\end{tabular}
+
+\bigskip
+
+
+\begin{tabular}{|c|c|}\hline
+\begin{tikzpicture}[baseline=1cm]
+\draw[help lines] (0,0) grid (4,3);
+\matrix[draw=red,nodes=draw ,matrix anchor=inner node.south,anchor=base, row sep=5mm, column sep=5mm] at (2,1)
+{
+\node {a}; & \node {b}; & \node {c}; & \node {d}; \\
+\node {a}; & \node {b}; & \node(inner node){c}; & \node {d}; \\
+\node {a}; & \node {b}; & \node {c}; & \node {d}; \\
+};
+\fill[red] (inner node.south) circle (3pt);
+\end{tikzpicture}
+&
+\parbox{10.5cm}{
+\BS{matrix}[draw=red,nodes=draw, \\
+\RDD{ matrix anchor}=\blll{inner node}.south, anchor=base, \\
+ row sep=5mm,column sep=5mm] at (2,1) \\
+\{ \\
+\BS{node} \AC{a}; \& \BS{node} \AC{b}; \& \BS{node} \AC{c}; \& \BS{node} \AC{d}; \BS{}\BS{} \\
+\BS{node} \AC{a}; \& \BS{node} \AC{b}; \& \BS{node}(\blll{inner node})\AC{c}; \& \BS{node} \AC{d}; \BS{}\BS{} \\
+\BS{node}\AC{a}; \& \BS{node} \AC{b}; \& \BS{node}\AC{c}; \& \BS{node} \AC{d}; \BS{}\BS{} \\
+\};
+}
+\\ \hline
+\end{tabular}
+
+
+\SbSbSSCT{Changement du séparateur}{Considerations Concerning Active Characters}
+
+\begin{center}
+\RRR{20-5}
+\end{center}
+
+\begin{tabular}{|c|c|} \hline
+\tikz[baseline=0pt]
+\matrix [ampersand replacement=\|]
+{
+\draw (0,0) circle (4mm); \| \node[rotate=10] {Hello}; \\
+\draw (0.2,0) circle (2mm); \| \fill[red] (0,0) circle (3mm); \\
+};
+&
+\parbox{12cm}{
+\BS{tikz}
+\BS{matrix} [\RDD{ampersand replacement}=\blll{\BS{|}} ] \\
+\{ \\
+\BS{draw} (0,0) circle (4mm); \blll{\BS{|} } \BS{node}[rotate=10] \AC{Hello}; \BS{}\BS{} \\
+\BS{draw} (0.2,0) circle (2mm); \blll{\BS{|} } \BS{fill}[red] (0,0) circle (3mm); \BS{}\BS{} \\
+\}; \\
+}
+\\ \hline
+\end{tabular}
+
+
+\SbSSCT{Matrice de n\oe uds comléments}{Matrix Library}
+
+ \maboite{\BS{usetikzlibrary}\AC{matrix}}
+\label{lib-matrix}
+
+
+\begin{center}
+\RRR{57-1}
+\end{center}
+
+\begin{tabular}{|c|c|} \hline
+\begin{tikzpicture}[baseline=0pt]
+\matrix (XXX) [matrix of nodes]
+{
+1 & 2 & 3 \\
+4 & 5 & 6 \\
+7 & 8 & 9 \\
+};
+\end{tikzpicture}
+&
+\parbox{10cm}{
+\BS{begin}\AC{tikzpicture} \\
+\BSS{matrix} [matrix of nodes]\\
+\{ \\
+1 \& 2 \& 3 \BS{}\BS{} \\
+4 \& 5 \& 6 \BS{}\BS{} \\
+7 \& 8 \& 9 \BS{}\BS{} \\
+\}; \\
+\BS{end}\AC{tikzpicture}
+}
+\\ \hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|c|} \hline
+\begin{tikzpicture}[baseline=0pt]
+\matrix (XXX) [matrix of nodes]
+{
+1 & 2 & 3 \\
+4 & 5 & 6 \\
+7 & 8 & 9 \\
+};
+\draw[thick,red,->] (XXX-1-1) -- (XXX-2-3);
+\end{tikzpicture}
+&
+\parbox{10cm}{
+\BS{begin}\AC{tikzpicture} \\
+\BSS{matrix} \blll{(XXX)} [matrix of nodes]\\
+\{ \\
+1 \& 2 \& 3 \BS{}\BS{} \\
+4 \& 5 \& 6 \BS{}\BS{} \\
+7 \& 8 \& 9 \BS{}\BS{} \\
+\}; \\
+\BS{draw}[thick,red,->] \blll{(XXX-1-1)} - - \blll{(XXX-2-3)} ; \\
+\BS{end}\AC{tikzpicture}
+}
+\\ \hline
+\end{tabular}
+
+\bigskip
+
+
+\begin{tabular}{|c|c|} \hline
+\begin{tikzpicture}
+\matrix [matrix of nodes]
+{
+8 & 1 & 6 \\
+3 & 5 & |[red]| 7 \\
+4 & 9 & 2 \\
+};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\matrix [matrix of nodes]
+{
+1 & \& & 2 & \& & 3 & \BS{}\BS{} \\
+4 & \& & 5 & \& & \rouge{ $|[$red$]|$} 6 & \BS{}\BS{} \\
+7 & \& & 8 & \& & 9 & \BS{}\BS{} \\
+};
+\end{tikzpicture}
+\\ \hline
+\end{tabular}
+
+
+\bigskip
+
+
+\begin{tabular}{|c|c|} \hline
+\begin{tikzpicture}
+\matrix [matrix of nodes]
+{
+1 &[1cm] 2 &[5mm] |[red]| 3 \\
+4 & 5 & 6 \\
+7 & 8 & 9 \\
+};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\matrix [matrix of nodes]
+{
+1 & \& & \rouge{\lbrack 1cm \rbrack} 2 & \& &\rouge{\lbrack 5mm \rbrack} |[red]| 3 & \BS{}\BS{} \\
+4 & \& & 5 & \& & 6 & \BS{}\BS{} \\
+7 & \& & 8 & \& & 9 & \BS{}\BS{} \\
+};
+\end{tikzpicture}
+
+\\ \hline
+\end{tabular}
+
+
+
+\bigskip
+
+\begin{tabular}{|c|c|} \hline
+\begin{tikzpicture}[baseline=0pt]
+\matrix [matrix of math nodes]
+{
+A_1 & A_2 & A_3 \\
+a_4 & a_5 & a_6 \\
+a^7 & a^8 & a^9 \\
+};
+\end{tikzpicture}
+&
+\parbox{10cm}{
+\BSS{matrix} [\rouge{ matrix of math nodes}]\\
+\{ \\
+A\_1 \& A\_2 \& A\_3 \BS{}\BS{} \\
+a\_4 \& a\_5 \& a\_6 \BS{}\BS{} \\
+a\land 7 \& a\land 8 \& a\land 9 \BS{}\BS{} \\
+\};
+}
+\\ \hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|c|} \hline
+\begin{tikzpicture}[baseline=0pt]
+\matrix [matrix of math nodes,nodes={circle,draw}]
+{
+a_1 & & a_3 \\
+a_4 & & a_6 \\
+a_7 & a_8 & \\
+};
+\end{tikzpicture}
+&
+\parbox{10cm}{
+\BSS{matrix} [matrix of math nodes,\rouge{nodes={circle,draw}}]\\
+\{ \\
+A\_1 \& \& A\_3 \BS{}\BS{} \\
+a\_4 \& \& a\_6 \BS{}\BS{} \\
+a\_ 7 \& a\_ 8 \& \BS{}\BS{} \\
+\};
+}
+\\ \hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|c|} \hline
+\begin{tikzpicture}[baseline=0pt]
+\matrix [matrix of math nodes,nodes={circle,draw},nodes in empty cells]
+{
+a_1 & & a_3 \\
+a_4 & & a_6 \\
+a_7 & a_8 & \\
+};
+\end{tikzpicture}
+&
+\parbox{10cm}{
+\BSS{matrix} [matrix of math nodes,nodes={circle,draw} ,\rouge{nodes in empty cells}]\\
+\{ \\
+A\_1 \& \& A\_3 \BS{}\BS{} \\
+a\_4 \& \& a\_6 \BS{}\BS{} \\
+a\_ 7 \& a\_ 8 \& \BS{}\BS{} \\
+\};
+}
+\\ \hline
+\end{tabular}
+
+\SbSbSSCT{Texte dans les n\oe uds}{Characters in Matrices of Nodes}
+
+\begin{center}
+\RRR{57-2}
+\end{center}
+
+
+\begin{tabular}{|c|c|} \hline
+\begin{tikzpicture}[baseline=0pt]
+\matrix [matrix of nodes,nodes={text width=2cm,draw}]
+{
+aaa & bbb \\ ccc \\
+eee & fff\\
+};
+\end{tikzpicture}
+&
+\parbox{10cm}{
+\BSS{matrix} [matrix of nodes,\rouge{nodes=\AC{text width=2cm,draw}} ]\\
+\{ \\
+aaa \& bbb \BS{}\BS{} \\
+bbb \BS{}\BS{} \\
+eee \& fff \BS{}\BS{} \\
+\};
+}
+\\ \hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|c|} \hline
+\begin{tikzpicture}[baseline=0pt]
+\matrix [matrix of nodes,nodes={text width=16mm,draw}]
+{
+1 & {aaa \\ bbb \\ ccc } \\
+2 & ddd \\
+};
+\end{tikzpicture}
+&
+\parbox{10cm}{
+\BSS{matrix} [matrix of nodes,\rouge{nodes=\AC{text width=16mm,draw}} ]\\
+\{ \\
+1 \& \& \rouge { \AC{aaa \BS{}\BS{} bbb \BS{}\BS{} ccc } } \BS{}\BS{} \\
+2 \& \& ddd \BS{}\BS{} \\
+\};
+}
+\\ \hline
+\end{tabular}
+
+\bigskip
+
+\SbSbSSCT{Délimiteurs}{Delimiters}
+
+
+\begin{center}
+\RRR{57-3}
+\end{center}
+
+\bigskip
+
+\begin{tabular}{|c|c|c|c|} \hline
+\multicolumn{4}{|c|}{\BS{matrix} [matrix of math nodes,\RDD{left delimiter}=( ]}
+\\ \hline
+\begin{tikzpicture}
+\matrix [matrix of math nodes,left delimiter=( ]
+{
+a_1 & a_2 & a_3 \\
+a_4 & a_5 & a_6 \\
+a_7 & a_8 & a_9 \\
+};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\matrix [matrix of math nodes,right delimiter=\}]
+{
+a_1 & a_2 & a_3 \\
+a_4 & a_5 & a_6 \\
+a_7 & a_8 & a_9 \\
+};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\matrix [matrix of math nodes,above delimiter=\| ]
+{
+a_1 & a_2 & a_3 \\
+a_4 & a_5 & a_6 \\
+a_7 & a_8 & a_9 \\
+};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\matrix [matrix of math nodes,below delimiter=\rmoustache ]
+{
+a_1 & a_2 & a_3 \\
+a_4 & a_5 & a_6 \\
+a_7 & a_8 & a_9 \\
+};
+\end{tikzpicture}
+
+
+\\ \hline
+\RDD{left delimiter}=( & \RDD{right delimiter}=\BS{\}} & \RDD{above delimiter}=\BS{|} & \RDD{below delimiter}=\BS{rmoustache}
+\\ \hline
+\end{tabular}
+
+\bigskip
+\begin{tabular}{|c|} \hline
+\BS{tikz}
+\BS{node} [fill=red!20,text width=2cm,\rouge{left delimiter}=\BS{\{} ] \\
+\AC{Ceci est une démonstration d'un texte sur une largeur de 2cm.};
+\\ \hline
+\tikz
+\node [fill=red!20,text width=2cm,left delimiter=\{]
+{Ceci est une démonstration d'un texte sur une largeur de 2cm.};
+\\ \hline
+\end{tabular}
+
Property changes on: trunk/Master/texmf-dist/doc/latex/visualtikz/Source/matrix.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/visualtikz/Source/table.dat
===================================================================
--- trunk/Master/texmf-dist/doc/latex/visualtikz/Source/table.dat 2018-01-19 12:07:30 UTC (rev 46385)
+++ trunk/Master/texmf-dist/doc/latex/visualtikz/Source/table.dat 2018-01-19 21:58:00 UTC (rev 46386)
@@ -1,9 +1,9 @@
-0 .3
-.3 .6
-.6 .9
-.9 1.5
-1.2 .6
-1.5 1.2
-1.8 1.5
-2.1 2.0
+0 .3
+.3 .6
+.6 .9
+.9 1.5
+1.2 .6
+1.5 1.2
+1.8 1.5
+2.1 2.0
2.4 3.0
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/latex/visualtikz/Source/table2.dat
===================================================================
--- trunk/Master/texmf-dist/doc/latex/visualtikz/Source/table2.dat 2018-01-19 12:07:30 UTC (rev 46385)
+++ trunk/Master/texmf-dist/doc/latex/visualtikz/Source/table2.dat 2018-01-19 21:58:00 UTC (rev 46386)
@@ -1,9 +1,9 @@
-0 0 0
-0 1 0
-0 1 1
-.9 1.5
-1.2 .6
-1.5 1.5
-1.8 0.8
-2.1 2.5
+0 0 0
+0 1 0
+0 1 1
+.9 1.5
+1.2 .6
+1.5 1.5
+1.8 0.8
+2.1 2.5
2.4 3.0
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/latex/visualtikz/Source/table3.dat
===================================================================
--- trunk/Master/texmf-dist/doc/latex/visualtikz/Source/table3.dat 2018-01-19 12:07:30 UTC (rev 46385)
+++ trunk/Master/texmf-dist/doc/latex/visualtikz/Source/table3.dat 2018-01-19 21:58:00 UTC (rev 46386)
@@ -1,6 +1,6 @@
-0 0 0
-0 .5 0
-0 1 1
-1 1 5
-1 .5 0
-1 0 0
+0 0 0
+0 .5 0
+0 1 1
+1 1 5
+1 .5 0
+1 0 0
Modified: trunk/Master/texmf-dist/doc/latex/visualtikz/Source/table3X.dat
===================================================================
--- trunk/Master/texmf-dist/doc/latex/visualtikz/Source/table3X.dat 2018-01-19 12:07:30 UTC (rev 46385)
+++ trunk/Master/texmf-dist/doc/latex/visualtikz/Source/table3X.dat 2018-01-19 21:58:00 UTC (rev 46386)
@@ -1,6 +1,6 @@
-0 0 0
-0 5 0
-0 1 1
-1 1 5
-1 5 0
-1 0 0
+0 0 0
+0 5 0
+0 1 1
+1 1 5
+1 5 0
+1 0 0
Deleted: trunk/Master/texmf-dist/doc/latex/visualtikz/Source/test.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/visualtikz/Source/test.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/visualtikz/Source/test.tex 2018-01-19 12:07:30 UTC (rev 46385)
+++ trunk/Master/texmf-dist/doc/latex/visualtikz/Source/test.tex 2018-01-19 21:58:00 UTC (rev 46386)
@@ -1,4 +1,5 @@
+
%\input{versGB} % for english version
\input{versFR} % pour la version française
@@ -11,178 +12,41 @@
%\selectlanguage{english}
\selectlanguage{french}
-%\input{tkztitre}
%==========================================================
+%\input{tkztitre}
-\setcounter{tocdepth}{4}
- \tableofcontents
- \setcounter{tocdepth}{5}
-\addtolength{\hoffset}{-1.5cm}
-\setlength{\topmargin}{0pt}
-\setlength{\headsep}{0pt}
-%
-%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
-\newpage
-%\input{tkzdepend}
-%\input{tkzoptic}
+\SbSSCT{Matrice de n\oe uds}{Matrices and Alignment}
-\input{tkznoeud1}
+\input{matrix}
+
+
+
+%\input{tkzcoord}
+
+%\newpage
%
-%\SSCT{Créer un graphe avec pgfplot}{Creation of a graph with pgfplots}
-%
-%\input{tkzgraph2} % <<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-%
-%\SSCT{Courbes 3D}{3D graph}
-%
-%\input{tkzgraph3D}
+%\input{tkzpeople}
-%\section{En test}
+%\newpage
%
-%\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}
+%\SbSSCT{Canards}{Ducks}
%
+%\input{tkzducks}
%
-%\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
-
-
-
\newpage
\section{A Voir}
@@ -189,17 +53,11 @@
+%\newpage
+%\input{bibtkz}
-
-%\input{tkzelect}
-
-\newpage
-
-
-\input{bibtkz}
-
\newpage
\printindex
Modified: trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tikzdebut.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tikzdebut.tex 2018-01-19 12:07:30 UTC (rev 46385)
+++ trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tikzdebut.tex 2018-01-19 21:58:00 UTC (rev 46386)
@@ -4,6 +4,7 @@
\usepackage[frenchb,english]{babel}
%\TFRGB{\selectlanguage{french}}{\selectlanguage{english}}
+\usepackage{tikzpeople}
\usepackage{amsmath,amsfonts,amssymb}
@@ -32,7 +33,7 @@
\usetikzlibrary{angles}
\usetikzlibrary{arrows}
-\usetikzlibrary{patterns}
+
\usetikzlibrary{shadings}
\usetikzlibrary{calc}
\usetikzlibrary{backgrounds}
@@ -64,8 +65,10 @@
\usetikzlibrary{circuits.logic.CDH}
%\usetikzlibrary{decorations}
\usetikzlibrary{shapes.gates.logic.IEC}
+\usetikzlibrary{matrix}
-\usepackage{tikzpeople}
+%
+\usepackage{tikzducks}
\usepackage{tikzrput}
\usepackage{pgfornament}
@@ -84,6 +87,8 @@
\usepackage{geometry}
\geometry{a4paper,top={3cm}}
+\usepackage{ifpdf}
+\usepackage{ifluatex}
@@ -111,7 +116,7 @@
%\newcommand{\RDDX}[2]{{\color{red}#1} \index{\textbf{3 Paramètres et options}!#2=#1}}
-\newcommand{\RRR}[1]{\tikz[baseline=-1mm] \draw node[draw,fill=red!20] {{\footnotesize PGFmanual section : #1}} ; }
+\newcommand{\RRR}[1]{\tikz[baseline=-1mm,inner sep=2pt] \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}} ; }
@@ -138,18 +143,14 @@
\TFRGB{
\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)}}
-%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}}
%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
@@ -163,16 +164,12 @@
\newcommand{\RDD}[1]{{\color{red} #1}\index{\textbf{3 Parameters and options}!#1}}
\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}}
-\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}}
Added: trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tkzducks.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tkzducks.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tkzducks.tex 2018-01-19 21:58:00 UTC (rev 46386)
@@ -0,0 +1,483 @@
+\label{ducks}
+
+ \maboite{\BS{usepackage}\AC{tikzducks} \cite {tikzducks}}
+
+
+\begin{center}
+\begin{tabular}{|c|}\hline
+\BS{tikz} \BSS{duck} ;
+\\ \hline
+\tikz \duck ;
+\\ \hline
+\end{tabular}
+\end{center}
+
+
+\subsubsection{Options}
+
+\noindent
+
+\begin{tabular}{|c|c|c|c|c|} \hline
+\multicolumn{4}{|c|}{\BS{tikz} \BS{duck}[\RDD{body}=red] ;}
+\\ \hline
+\tikz \duck[body=red] ;
+&
+\tikz \duck[head=red] ;
+&
+\tikz \duck[bill=red] ;
+ &
+ \tikz \duck[eye=red] ;
+ \\
+\hline
+[\RDD{body}=red] & [\RDD{head}=red] & [\RDD{bill}=red] & [\RDD{eye}=red] \\
+\hline
+\end{tabular}
+\begin{tabular}{|c|} \hline
+\BS{tikz} \BS{duck}[\RDD{grumpy}] ;
+\\ \hline
+\tikz \duck[grumpy] ;
+\\ \hline
+
+\end{tabular}
+
+
+
+\bigskip
+
+\begin{tabular}{|c|c|c|c|c|} \hline
+\tikz \duck[longhair] ;
+&
+\tikz \duck[shorthair] ;
+&
+\tikz \duck[crazyhair] ;
+ &
+ \tikz \duck[recedinghair] ;
+ \\
+\hline
+[\RDD{longhair}] & [\RDD{shorthair}] & [\RDD{crazyhair}] & [\RDD{recedinghair}] \\
+\hline
+\tikz \duck[longhair=red] ;
+&
+\tikz \duck[shorthair=red] ;
+&
+\tikz \duck[crazyhair=red] ;
+ &
+ \tikz \duck[recedinghair=red] ;
+ \\
+\hline
+[longhair=red] & [shorthair=red] & [crazyhair=red] & [recedinghair=red] \\
+\hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|c|c|c|c|} \hline
+\tikz \duck[eyebrow] ;
+&
+\tikz \duck[eyebrow=red] ;
+&
+\tikz \duck[beard] ;
+ &
+ \tikz \duck[beard=red] ;
+ \\
+\hline
+[\RDD{eyebrow}] & [eyebrow=red] & [\RDD{beard}] & [beard=red] \\
+\hline
+
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|c|c|c|c|} \hline
+\tikz \duck[tshirt] ;
+&
+\tikz \duck[tie] ;
+&
+\tikz \duck[jacket] ;
+&
+\tikz \duck[cape] ;
+&
+\tikz \duck[tshirt,tie ,jacket ,cape] ;
+\\ \hline
+[\RDD{tshirt}] & [\RDD{tie}] & [\RDD{jacket}] & [\RDD{cape}]& [tshirt,tie ,jacket ,cape]
+\\ \hline
+\tikz \duck[tshirt=red] ;
+&
+\tikz \duck[tie=red] ;
+&
+\tikz \duck[jacket=red] ;
+&
+\tikz \duck[cape=blue] ;
+&
+
+\\ \hline
+[tshirt=red] & [tie=red] & [jacket=red] & [cape=blue]&
+\\ \hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|c|c|c|c|} \hline
+\tikz \duck[water];
+&
+\tikz \duck[alien];
+&
+\tikz \duck[hat];
+&
+\tikz \duck[tophat];
+&
+\tikz \duck[cap];
+\\ \hline
+[\RDD{water}] & [\RDD{alien}] & [\RDD{hat}]& [\RDD{tophat}] & [\RDD{cap}]
+\\ \hline
+\tikz \duck[santa];
+&
+\tikz \duck[graduate];
+&
+\tikz \duck[graduate,tassel];
+&
+\tikz \duck[beret];
+&
+\tikz \duck[peakedcap];
+\\ \hline
+[\RDD{santa}] & [\RDD{graduate}] & [graduate,\RDD{tassel}] & [\RDD{beret}] & [\RDD{peakedcap}]
+\\ \hline
+\tikz \duck[crown];
+&
+\tikz \duck[unicorn];
+&
+
+\tikz \duck[bunny];
+&
+\tikz \duck[bunny=red,inear=blue];
+&
+\tikz \duck[witch];
+\\ \hline
+[\RDD{crown}] & [\RDD{unicorn}] &[\RDD{bunny}] & [bunny=red,\RDD{inear}=blue] & [\RDD{witch}]
+\\ \hline
+\tikz \duck[magicwand];
+&
+\tikz \duck[magichat];
+&
+\tikz \duck[magichat=teal,
+magicstars=blue!30!cyan,
+magicwand];
+&
+\tikz \duck[glasses];
+&
+\tikz \duck[sunglasses];
+\\ \hline
+[\RDD{magicwand}] & [\RDD{magichat}] & \parbox{3cm}{[magichat,\\ \RDD{magicstars}]} & [\RDD{glasses}] & [\RDD{sunglasses}]
+\\ \hline
+\end{tabular}
+
+
+\begin{tabular}{|c|c|c|c|c|} \hline
+\tikz \duck[mask];
+&
+\tikz \duck[signpost=42];
+&
+\tikz \duck[signpost=XXX,signcolour=green];
+&
+\tikz \duck[signpost=XXX,signback=green];
+&
+\tikz \duck[speech={XXX}];
+\\ \hline
+[\RDD{mask}] & [\RDD{signpost}=42] & \parbox{3cm}{[signpost=XXX,\\ \RDD{signcolour}=green]} & \parbox{3cm}{[signpost=XXX, \\ \RDD{signback}=green]} & [\RDD{speech}=\AC{XXX}]
+\\ \hline
+\end{tabular}
+
+
+\begin{tabular}{|c|c|c|c|c|} \hline
+\tikz \duck[speech={XXX},bubblecolour=green];
+&
+\tikz \duck[think={XXX}];
+&
+\tikz \duck[think=XXX,bubblecolour=green];
+&
+\tikz \duck[book={XXX}];
+\\ \hline
+\parbox{3cm}{[speech={XXX},\\ \RDD{bubblecolour}=green]} & [\RDD{think}=\AC{XXX}] &
+\parbox{3cm}{[think={XXX},\\ \RDD{bubblecolour}=green]}
+&[\RDD{book}=\AC{XXX}]
+\\ \hline
+%\end{tabular}
+%
+%\begin{tabular}{|c|c|c|c|c|} \hline
+\tikz \duck[book=XXX,bookcolour=green];
+&
+\tikz \duck[book=\scalebox{0.5}{XXX}];
+&
+\multicolumn{2}{|c|}{\tikz
+\duck[signpost=\scalebox{0.4}{
+\parbox{2cm}{
+\centering XXX \\ XXXXX}}]
+;}
+\\ \hline
+
+\parbox{3cm}{[book={XXX},\\ \RDD{bookcolour}=green]}
+&
+\parbox{3.5cm}{\BS{tikz} \BS{duck}[book=\\ \BS{scalebox}\AC{0.5}\AC{XXX}]; }
+&
+\multicolumn{2}{|c|}{ \parbox{7cm}{ \BS{tikz}
+\BS{duck}[signpost=\BS{scalebox}\AC{0.4}\AC{ \\
+\BS{parbox}\AC{2cm}{
+\BS{centering} XXX \ XXXXX}}]}
+;}
+\\ \hline
+\end{tabular}
+
+
+\begin{tabular}{|c|c|c|c|c|} \hline
+\tikz \duck[cricket];
+&
+\tikz \duck[hockey];
+&
+\tikz \duck[football];
+&
+\tikz \duck[lightsaber];
+&
+\tikz \duck[torch];
+\\ \hline
+[\RDD{cricket}]& [\RDD{hockey}] & [\RDD{football}] & [\RDD{lightsaber}] & [\RDD{torch}]
+\\ \hline
+\tikz \duck[prison];
+&
+\tikz \duck[necklace];
+&
+\tikz \duck[icecream];
+&
+\tikz \duck[icecream,flavoura=green];
+&
+\tikz \duck[icecream,flavourb=green];
+\\ \hline
+[\RDD{prison}] & [\RDD{necklace}] & [\RDD{icecream}] &
+\parbox{3cm}{[icecream,\\ \RDD{flavoura}=green]} &
+\parbox{3cm}{[icecream,\\ \RDD{flavourb}=green]}
+\\ \hline
+\tikz \duck[icecream,flavourc=green];
+&
+\tikz \duck[chef];
+&
+\tikz \duck[rollingpin];
+&
+\tikz \duck[cake];
+&
+\tikz \duck[pizza];
+\\ \hline
+\parbox{3cm}{[icecream,\\ \RDD{flavourc}=green]} &
+ [\RDD{chef}] & [\RDD{rollingpin}] & [\RDD{cake}] & [\RDD{pizza}]
+\\ \hline
+\tikz \duck[baguette];
+&
+\tikz \duck[milkshake];
+&
+\tikz \duck[wine];
+&
+&
+\\ \hline
+ [\RDD{baguette}] & [\RDD{milkshake}] & [\RDD{wine}] & &
+\\ \hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|c|c|c|} \hline
+\multicolumn{4}{|c|}{\BS{tikz} \BS{duck} \BS{path}[preaction=\AC{fill,green},pattern=dots, pattern color=red] \BSS{duckpathbody} ;}
+\\ \hline
+\tikz \duck
+\path[preaction={fill,green},pattern=dots, pattern color=red] \duckpathbody;
+&
+\tikz \duck
+\path[preaction={fill,green},pattern=dots, pattern color=red] \duckpathgrumpybill;
+&
+\tikz \duck
+\path[preaction={fill,green},pattern=dots, pattern color=red] \duckpathbill;
+&
+\tikz \duck
+\path[preaction={fill,green},pattern=dots, pattern color=red] \duckpathtshirt;
+\\ \hline
+\BSS{duckpathbody } & \BSS{duckpathgrumpybill} & \BSS{duckpathbill} & \BSS{duckpathtshirt}
+\\ \hline
+\tikz \duck
+\path[preaction={fill,green},pattern=dots, pattern color=red] \duckpathjacket;
+&
+\tikz \duck
+\path[preaction={fill,green},pattern=dots, pattern color=red] \duckpathcape ;
+&
+\tikz \duck
+\path[preaction={fill,green},pattern=dots, pattern color=red] \duckpathshorthair ;
+&
+\tikz \duck
+\path[preaction={fill,green},pattern=dots, pattern color=red] \duckpathlonghair;
+\\ \hline
+\BSS{duckpathjacket} & \BSS{duckpathcape} & \BSS{duckpathshorthair} & \BSS{duckpathlonghair}
+\\ \hline
+\tikz \duck
+\path[preaction={fill,green},pattern=dots, pattern color=red] \duckpathcrazyhair;
+&
+\tikz \duck
+\path[preaction={fill,green},pattern=dots, pattern color=red] \duckpathrecedinghair;
+&
+\tikz \duck
+\path[preaction={fill,green},pattern=dots, pattern color=red] \duckpathcrown ;
+&
+\\ \hline
+\BSS{duckpathcrazyhair} & \BSS{duckpathrecedinghair} & \BSS{duckpathcrown} &
+\\ \hline
+\end{tabular}
+
+
+
+\SbSbSSCT{Canards aléatoires}{Random ducks}
+
+\noindent
+
+\begin{tabular}{|c|}\hline
+\BS{tikz} \BSS{randuck} ; \BS{tikz} \BSS{randuck} ; \BS{tikz} \BSS{randuck} ; \BS{tikz} \BSS{randuck} ; \BS{tikz} \BSS{randuck} ;
+\\ \hline
+\tikz \randuck ; \tikz \randuck ; \tikz \randuck ; \tikz \randuck ; \tikz \randuck ;
+\\ \hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|} \hline
+\BS{tikz} \BSS{shuffleducks} \BS{duck}[\BSS{randomhead}] ;
+\\ \hline
+\tikz \shuffleducks \duck[\randomhead] ; \tikz \shuffleducks \duck[\randomhead] ; \tikz \shuffleducks \duck[\randomhead] ; \tikz \shuffleducks \duck[\randomhead] ;
+\tikz \shuffleducks \duck[\randomhead] ;
+\\ \hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|} \hline
+\BS{tikz} \BSS{shuffleducks} \BS{duck}[\BSS{randomaccessories}] ;
+\\ \hline
+\tikz \shuffleducks \duck[\randomaccessories] ; \tikz \shuffleducks \duck[\randomaccessories] ; \tikz \shuffleducks \duck[\randomaccessories] ; \tikz \shuffleducks \duck[\randomaccessories] ; \tikz \shuffleducks \duck[\randomaccessories] ;
+\\ \hline
+\end{tabular}
+
+
+\SbSbSSCT{Coordonnées}{Coordinates}
+
+\noindent
+
+
+\begin{tabular}{|c|c|c|} \hline
+\multicolumn{3}{|c|}{\BS{tikz} \BS{duck} \BS{fill}[red] (wing) circle (3pt);}
+\\ \hline
+\tikz \duck \fill[red] (wing) circle (3pt);
+&
+\tikz \duck \fill[red] (head) circle (3pt);
+&
+\tikz \duck \fill[red] (bill) circle (3pt);
+\\ \hline wing & head & bill \\
+\hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|} \hline
+\BS{tikz} \BS{duck}[\RDD{name}=XXX] \\ \BS{begin}\AC{scope} [xshift=4cm] \BS{duck}[\RDD{name}=YYY]
+\BS{end}\AC{scope} \\ \BS{draw}[red] (XXX-wing) - - (YYY-bill) ;
+\\ \hline
+\tikz \duck[name=XXX] \begin{scope} [xshift=4cm]
+\duck[name=YYY]
+\end{scope} \draw[red] (XXX-wing) -- (YYY-bill);
+\\ \hline
+\end{tabular}
+
+
+\SbSbSSCT{Rayures}{Stripes}
+
+\noindent
+
+\begin{tabular}{|c|c|} \hline
+\tikz \duck \stripes ;
+&
+\tikz \duck[stripes] ;
+\\ \hline
+\BS{tikz} \BS{duck} \BSS{stripes} ;
+&
+\BS{tikz} \BS{}duck[\RDD{stripes}] ;
+\\ \hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|c|} \hline
+\tikz \duck[rollingpin] \stripes ;
+&
+\tikz \duck[rollingpin,stripes] ;
+\\ \hline
+\BS{tikz} \BS{duck}[rollingpin] \BS{stripes} ;
+&
+\BS{tikz} \BS{duck}[rollingpin,stripes] ;
+\\ \hline
+\end{tabular}
+
+
+
+\bigskip
+
+\begin{tabular}{|c|c|c|c|}\hline
+\multicolumn{4}{|c|}{\BS{tikz} \BS[duck] \BS{stripes}[\RDD{color}=red];}
+\\ \hline
+\tikz \duck \stripes[color=red];
+&
+\tikz \duck \stripes[distance=.5];
+&
+\tikz \duck \stripes[width=.05];
+&
+\tikz \duck \stripes[height=1];
+\\ \hline
+[\RDD{color}=red] & [\RDD{distance}=.5] & [\RDD{width}=.05] & [\RDD{height}=1]
+\\ \hline
+\dft{black} & \dft{0.3} & \dft{0.15} & \dft{2.7} \\
+\hline
+
+\tikz \duck \stripes[rotate=45]; & \tikz \duck \stripes[initialx=1]; & \tikz \duck \stripes[initialy=1]; &
+\\ \hline
+[\RDD{rotate=}45] & [\RDD{initialx}=1] & [\RDD{initialy}=1] &
+\\ \hline
+\dft{-10} & \dft{0.1} & \dft{-0.3} &
+\\ \hline
+\end{tabular}
+
+
+\bigskip
+
+\begin{tabular}{|c|c|c|} \hline
+\multicolumn{3}{|c|}{\BS{tikz} \BS[duck] \BS{stripes}[\RDD{emblem}=XXX];}
+\\ \hline
+\tikz \duck \stripes[emblem={XXX}];
+&
+\tikz \duck \stripes[emblem={\includegraphics[width=6mm]{LogoIUT}}];
+&
+\tikz \duck \stripes[emblem={\DFR}];
+\\ \hline
+[emblem=XXX]
+& \parbox{5cm}{ [emblem=\{\BS{includegraphics} [width=6mm]\AC{LogoIUT} \} ] }
+& [emblem=\AC{\BS{DFR}} ]
+\\ \hline
+& & \BS{DFR} : \TFRGB{voir}{see} page \pageref{DFR}
+\\ \hline
+\end{tabular}
+
+\bigskip
+
+\begin{tabular}{|c|c|c|} \hline
+\tikz \duck[stripes={ \stripes \stripes[rotate=45]}] ;
+\\ \hline
+\BS{tikz}
+\BS{duck}[stripes=\AC{
+\BS{stripes}
+\BS{stripes}[rotate=45] } ]
+;
+
+\\ \hline
+\end{tabular}
+
+
Property changes on: trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tkzducks.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tkzmerci.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tkzmerci.tex 2018-01-19 12:07:30 UTC (rev 46385)
+++ trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tkzmerci.tex 2018-01-19 21:58:00 UTC (rev 46386)
@@ -1,15 +1,9 @@
\textbf{\TFRGB{Merci à }{Thanks to}}:
-Till Tantau
-
-Alain Matthes
-
-Jim Diamond
-
-Falk Rühl
-
-Axel Kielhorn
-
-Nils Fleischhacker
-
+Till Tantau ,
+Alain Matthes ,
+Jim Diamond ,
+Falk Rühl ,
+Axel Kielhorn ,
+Nils Fleischhacker ,
Michel Fruchart
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tkzpeople.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tkzpeople.tex 2018-01-19 12:07:30 UTC (rev 46385)
+++ trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tkzpeople.tex 2018-01-19 21:58:00 UTC (rev 46386)
@@ -2,7 +2,7 @@
\label{people}
- \maboite{\BS{usepackage}\AC{tikzpeople} \cite {tikzpeople}}
+ \maboite{\BS{usepackage}\AC{tikzpeople} \cite {tikzpeople} \footnote{ conflit \BS{usetikzlibrary}\AC{patterns} page \pageref{lib-patterns} : placer cette commande en premier} }
\bigskip
\begin{tabular}{|c|c|}\hline
@@ -332,11 +332,11 @@
\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,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
+\RDD{hair}=red & \RDD{skin}=red & \RDD{shirt}=yellow & \RDD{hat}=red & \RDD{pattern}=yellow \footnote{voir confit} & \RDD{details}=blue
\\ \hline
\end{tabular}
Modified: trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tkztitre.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tkztitre.tex 2018-01-19 12:07:30 UTC (rev 46385)
+++ trunk/Master/texmf-dist/doc/latex/visualtikz/Source/tkztitre.tex 2018-01-19 21:58:00 UTC (rev 46386)
@@ -5,7 +5,7 @@
\DeclareFixedFont{\RMM}{T1}{ptm}{b}{n}{1cm}
-\title{ {\RM Visual TikZ} \\ \vspace{1cm} {\RMM Version 0.64} }
+\title{ {\RM Visual TikZ} \\ \vspace{1cm} {\RMM Version 0.65} }
@@ -49,17 +49,6 @@
\newpage
-
-
-%\textbf{Objectif }:
-%
-%\begin{itemize}
-%\item Une image par commande ou par paramètre.
-%\item Le texte réduit au strict minimum.
-%\item Le plus complet possible au fil de mises à jour régulières.
-%\item Garder la même structure que visuel pstricks
-%\end{itemize}
-
\TFRGB{
\textbf{Objectifs }:
@@ -87,18 +76,10 @@
}
{\textbf{Remarks }:
Minimal code is given to show the effect of a command or a parameter. The effects are sometime exaggerated for clarity .To consult the documentation, I have given the number of the \tikz[baseline=-1mm] \draw node[draw,fill=red!20] {Section in pgfmanual} ;
-
-
-% Le code donné est minimal et ne sert qu'à montrer les commandes concernées. Les effets sont parfois exagérés pour bien les mettre en évidence. Pour en savoir plus, vous pouvez voir la documentation. Pour se faire j'ai indiqué le numéro de \tikz[baseline=-1mm] \draw node[draw,fill=red!20] {Section de pgfmanual} ;
}
-
-%\vspace{1cm}
-%\textbf{Source documentaire} : pgfmanual.pdf principalement . La liste complète des sources se trouve page \pageref{sources}.
-%
\vspace{1cm}
-
\TFRGB{
\textbf{Vous pouvez me contacter à}
\href{mailto:jpcdk at yahoo.fr}{mon e-mail personnel} pour
@@ -121,24 +102,26 @@
\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
+\item Résolution partielle du conflit entre \BS{usetikzlibrary}\AC{patterns} (\pageref{lib-patterns}) et \BS{usepackage}\AC{tikzpeople} (\pageref{people})
+\item Ajout matrices de n\oe uds \pageref{matrix}
+\item Ajout \og library matrix \fg \pageref{lib-matrix}
+\item Ajout du module tikzducks \pageref{ducks}
\end{itemize}
-}{
-\textbf{What's new} :
+}
+{
+\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
+\item Partial resolution of the conflict between \BS{usetikzlibrary}\AC{patterns} (\pageref{lib-patterns}) and \BS{usepackage}\AC{tikzpeople} (\pageref{people})
+
+\item Matrices of nodes \pageref{matrix}
+\item Library matrix added \pageref{lib-matrix}
+\item Tikzducks package added \pageref{ducks}
\end{itemize}
}
+
\vspace{1cm}
\textbf{Licence } :
Modified: trunk/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ-fr.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/visualtikz/VisualTikZ.pdf
===================================================================
(Binary files differ)
More information about the tex-live-commits
mailing list