summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex/visualtikz/Source/matrix.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/doc/latex/visualtikz/Source/matrix.tex')
-rw-r--r--Master/texmf-dist/doc/latex/visualtikz/Source/matrix.tex116
1 files changed, 87 insertions, 29 deletions
diff --git a/Master/texmf-dist/doc/latex/visualtikz/Source/matrix.tex b/Master/texmf-dist/doc/latex/visualtikz/Source/matrix.tex
index 928c98eab18..2d6df074b80 100644
--- a/Master/texmf-dist/doc/latex/visualtikz/Source/matrix.tex
+++ b/Master/texmf-dist/doc/latex/visualtikz/Source/matrix.tex
@@ -1,12 +1,11 @@
-
\label{matrix}
\begin{center}
\RRR{20}
\end{center}
\begin{tabular}{|c|c|} \hline
-\begin{tikzpicture}[baseline=0pt]
+\begin{tikzpicture}[baseline=1cm]
\draw[help lines] (0,0) grid (4,2);
\node [matrix,fill=red!20,draw=blue,very thick] (my matrix) at (2,1)
{
@@ -472,7 +471,6 @@ execute at end cell=$m^2$\egroup;
4 & & 6 \\
& 8 & 9 \\
};
-%\end{tikzpicture}
\\ \hline
\end{tabular}
@@ -626,7 +624,7 @@ anchor=west & anchor=east \\
\end{tabular}
-\SbSSCT{Matrice de n\oe uds comléments}{Matrix Library}
+\SbSSCT{Matrice de n\oe uds (compléments) }{Matrix Library}
\maboite{\BS{usetikzlibrary}\AC{matrix}}
\label{lib-matrix}
@@ -650,9 +648,9 @@ anchor=west & anchor=east \\
\BS{begin}\AC{tikzpicture} \\
\BSS{matrix} [matrix of nodes]\\
\{ \\
-1 \& 2 \& 3 \BS{}\BS{} \\
-4 \& 5 \& 6 \BS{}\BS{} \\
-7 \& 8 \& 9 \BS{}\BS{} \\
+1 \hspace{3mm} \& \hspace{3mm} 2 \hspace{3mm} \& \hspace{3mm} 3 \hspace{3mm} \BS{}\BS{} \\
+4 \hspace{3mm} \& \hspace{3mm} 5 \hspace{3mm} \& \hspace{3mm} 6 \hspace{3mm} \BS{}\BS{} \\
+7 \hspace{3mm} \& \hspace{3mm} 8 \hspace{3mm} \& \hspace{3mm} 9 \hspace{3mm} \BS{}\BS{} \\
\}; \\
\BS{end}\AC{tikzpicture}
}
@@ -663,7 +661,7 @@ anchor=west & anchor=east \\
\begin{tabular}{|c|c|} \hline
\begin{tikzpicture}[baseline=0pt]
-\matrix (XXX) [matrix of nodes]
+\matrix (XXX) [matrix of nodes,column sep=.5cm,row sep=.5cm,every node/.style=draw]
{
1 & 2 & 3 \\
4 & 5 & 6 \\
@@ -674,11 +672,11 @@ anchor=west & anchor=east \\
&
\parbox{10cm}{
\BS{begin}\AC{tikzpicture} \\
-\BSS{matrix} \blll{(XXX)} [matrix of nodes]\\
+\BSS{matrix} \blll{(XXX)} [matrix of nodes,column sep=.5cm,row sep=.5cm,every node/.style=draw]\\
\{ \\
-1 \& 2 \& 3 \BS{}\BS{} \\
-4 \& 5 \& 6 \BS{}\BS{} \\
-7 \& 8 \& 9 \BS{}\BS{} \\
+1 \hspace{3mm} \& \hspace{3mm} 2 \hspace{3mm} \& \hspace{3mm} 3 \hspace{3mm} \BS{}\BS{} \\
+4 \hspace{3mm} \& \hspace{3mm} 5 \hspace{3mm} \& \hspace{3mm} 6 \hspace{3mm} \BS{}\BS{} \\
+7 \hspace{3mm} \& \hspace{3mm} 8 \hspace{3mm} \& \hspace{3mm} 9 \hspace{3mm} \BS{}\BS{} \\
\}; \\
\BS{draw}[thick,red,->] \blll{(XXX-1-1)} - - \blll{(XXX-2-3)} ; \\
\BS{end}\AC{tikzpicture}
@@ -691,7 +689,7 @@ anchor=west & anchor=east \\
\begin{tabular}{|c|c|} \hline
\begin{tikzpicture}
-\matrix [matrix of nodes]
+\matrix [matrix of nodes,column sep=.5cm,row sep=.5cm,every node/.style=draw]
{
8 & 1 & 6 \\
3 & 5 & |[red]| 7 \\
@@ -713,6 +711,64 @@ anchor=west & anchor=east \\
\bigskip
+\begin{tabular}{|c|c|} \hline
+\begin{tikzpicture}[baseline=-1cm]
+\matrix [matrix of nodes,column sep=.5cm,row sep=.5cm,every node/.style=draw]
+{
+AAA & |[circle]| BBB \\
+CCC & |(d) [isosceles triangle]| DDD \\
+| [ellipse]| EEE & FFF \\
+};
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\matrix [matrix of nodes]
+{
+AAA & \& & \rouge{ $|[$circle$]|$} BBB & \BS{}\BS{} \\
+CCC & \& &\rouge{ $|[$isosceles triangle$]|$} DDD & \BS{}\BS{} \\
+\rouge{ $|[$ellipse$]|$} EEE & \& & FFF & \BS{}\BS{} \\
+};
+\end{tikzpicture}
+\\ \hline
+\end{tabular}
+
+
+\bigskip
+
+\begin{tabular}{|c|c|} \hline
+\begin{tikzpicture}[baseline=-2cm]
+\matrix [matrix of nodes,column sep=.5cm,row sep=.5cm,every node/.style=draw]
+{
+|(a)| AAA & |(b)| BBB \\
+|(c)| CCC & |(d)| DDD \\
+|(e)| EEE & |(f)| FFF \\
+};
+\draw (a) -- (d);
+\draw (d) -- (f);
+\end{tikzpicture}
+&
+\begin{tikzpicture}
+\node at (0,1.5) [text width=10cm]
+{\BS{matrix} [matrix of nodes,column sep=.5cm,row sep=.5cm,every node/.style=draw] \\
+\{
+};
+\matrix [matrix of nodes]
+{
+\rouge{ $|$(a)$|$} AAA & \& & \rouge{ $|$(b)$|$} BBB & \BS{}\BS{} \\
+\rouge{ $|$(c)$|$} CCC & \& & \rouge{ $|$(d)$|$} DDD & \BS{}\BS{} \\
+\rouge{ $|$(e)$|$} EEE & \& & \rouge{ $|$(f)$|$} FFF & \BS{}\BS{} \\
+};
+
+\node at (0,-1.2) [text width=10cm]
+{ \}; \\
+\BS{draw} (a) - - (d); \\ \BS{draw} (d) - - (f);
+};
+\end{tikzpicture}
+\\ \hline
+\end{tabular}
+
+\bigskip
+
\begin{tabular}{|c|c|} \hline
\begin{tikzpicture}
@@ -750,12 +806,12 @@ a^7 & a^8 & a^9 \\
};
\end{tikzpicture}
&
-\parbox{10cm}{
+\parbox{8cm}{
\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{} \\
+A\_1 \hspace{2mm} \& \hspace{2mm} A\_2 \hspace{2mm} \& \hspace{2mm} A\_3 \hspace{2mm} \BS{}\BS{} \\
+a\_4 \hspace{2mm} \& \hspace{2mm} a\_5 \hspace{2mm} \& \hspace{2mm} a\_6 \hspace{2mm} \BS{}\BS{} \\
+a\land 7 \hspace{2mm} \& \hspace{2mm} a\land 8 \hspace{2mm} \& \hspace{2mm} a\land 9 \hspace{2mm} \BS{}\BS{} \\
\};
}
\\ \hline
@@ -776,9 +832,9 @@ a_7 & a_8 & \\
\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{} \\
+A\_1 \hspace{2mm} \& \hspace{12mm} \& \hspace{2mm} A\_3 \hspace{2mm} \BS{}\BS{} \\
+a\_4 \hspace{2mm} \& \hspace{12mm} \& \hspace{2mm} a\_6 \hspace{2mm} \BS{}\BS{} \\
+a\_ 7 \hspace{2mm} \& \hspace{2mm} a\_ 8 \hspace{2mm} \& \hspace{12mm} \BS{}\BS{} \\
\};
}
\\ \hline
@@ -799,9 +855,9 @@ a_7 & a_8 & \\
\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{} \\
+A\_1 \hspace{2mm} \& \hspace{12mm} \& \hspace{2mm} A\_3 \hspace{2mm} \BS{}\BS{} \\
+a\_4 \hspace{2mm} \& \hspace{12mm} \& \hspace{2mm} a\_6 \hspace{2mm} \BS{}\BS{} \\
+a\_ 7 \hspace{2mm} \& \hspace{2mm} a\_ 8 \hspace{2mm} \& \hspace{12mm} \BS{}\BS{} \\
\};
}
\\ \hline
@@ -818,7 +874,8 @@ a\_ 7 \& a\_ 8 \& \BS{}\BS{} \\
\begin{tikzpicture}[baseline=0pt]
\matrix [matrix of nodes,nodes={text width=2cm,draw}]
{
-aaa & bbb \\ ccc \\
+aaa & bbb \\
+ccc \\
eee & fff\\
};
\end{tikzpicture}
@@ -826,8 +883,8 @@ eee & fff\\
\parbox{10cm}{
\BSS{matrix} [matrix of nodes,\rouge{nodes=\AC{text width=2cm,draw}} ]\\
\{ \\
-aaa \& bbb \BS{}\BS{} \\
-bbb \BS{}\BS{} \\
+aaa \& bbb \BS{}\BS{} \\
+ccc \BS{}\BS{} \\
eee \& fff \BS{}\BS{} \\
\};
}
@@ -837,8 +894,8 @@ eee \& fff \BS{}\BS{} \\
\bigskip
\begin{tabular}{|c|c|} \hline
-\begin{tikzpicture}[baseline=0pt]
-\matrix [matrix of nodes,nodes={text width=16mm,draw}]
+\begin{tikzpicture}[baseline=0cm]
+\matrix [matrix of nodes,nodes={text width=2cm,draw}]
{
1 & {aaa \\ bbb \\ ccc } \\
2 & ddd \\
@@ -846,7 +903,7 @@ eee \& fff \BS{}\BS{} \\
\end{tikzpicture}
&
\parbox{10cm}{
-\BSS{matrix} [matrix of nodes,\rouge{nodes=\AC{text width=16mm,draw}} ]\\
+\BSS{matrix} [matrix of nodes,nodes=\AC{text width=2cm,draw} ]\\
\{ \\
1 \& \& \rouge { \AC{aaa \BS{}\BS{} bbb \BS{}\BS{} ccc } } \BS{}\BS{} \\
2 \& \& ddd \BS{}\BS{} \\
@@ -923,3 +980,4 @@ a_7 & a_8 & a_9 \\
\\ \hline
\end{tabular}
+