summaryrefslogtreecommitdiff
path: root/tex/sample
diff options
context:
space:
mode:
Diffstat (limited to 'tex/sample')
-rw-r--r--tex/sample/figures/fig.tikz12
-rw-r--r--tex/sample/sample.tex23
-rw-r--r--tex/sample/sample.tikzdefs5
-rw-r--r--tex/sample/sample.tikzstyles6
-rw-r--r--tex/sample/tikzit.sty24
5 files changed, 53 insertions, 17 deletions
diff --git a/tex/sample/figures/fig.tikz b/tex/sample/figures/fig.tikz
index e485d9f..f454de2 100644
--- a/tex/sample/figures/fig.tikz
+++ b/tex/sample/figures/fig.tikz
@@ -1,14 +1,14 @@
-\begin{tikzpicture}
+\begin{tikzpicture}[tikzfig]
\begin{pgfonlayer}{nodelayer}
\node [style=red node] (0) at (0, 1) {};
\node [style=blue node 2] (1) at (1, 0) {};
\node [style=blue node] (2) at (-1, 0) {};
- \node [style=yellow square] (3) at (0, -1) {foo};
+ \node [style=yellow square] (3) at (0, -1) {\anglevec{\alpha}};
\end{pgfonlayer}
\begin{pgfonlayer}{edgelayer}
- \draw [in=-90, out=0] (3.center) to (1.center);
- \draw [bend right=45, looseness=1.25] (3.center) to (2.center);
- \draw (2.center) to (0.center);
- \draw (0.center) to (1.center);
+ \draw [in=-90, out=0] (3) to (1);
+ \draw [bend right] (3) to (2);
+ \draw (2) to (0);
+ \draw (0) to (1);
\end{pgfonlayer}
\end{tikzpicture}
diff --git a/tex/sample/sample.tex b/tex/sample/sample.tex
index 57ba88c..c6fb3ca 100644
--- a/tex/sample/sample.tex
+++ b/tex/sample/sample.tex
@@ -1,10 +1,12 @@
\documentclass{article}
\usepackage{tikzit}
\input{sample.tikzstyles}
-
+\input{sample.tikzdefs}
\begin{document}
+This is a demonstration of \texttt{tikzit.sty}, which provides some convenience macros for including \texttt{.tikz} files generated by TikZiT. Note this file is optional, however if you choose to omit it from your \LaTeX{} source, you should at least declare the layers, dummy properties, and \texttt{none} style from \texttt{tikzit.sty} for TikZiT figures to build correctly.
+
A centered tikz picture:
\ctikzfig{fig}
@@ -14,5 +16,24 @@ A tikz picture as part of mathematics:
\tikzfig{fig}
\end{equation}
+It is also possible to paste a \texttt{tikzpicture} directly from TikZiT, without using the \texttt{$\backslash$tikzfig} macro. In that case, the \texttt{tikzfig} option should be given to the \texttt{tikzpicture} environment to get the same baseline and scaling as the other figures:
+\[
+\begin{tikzpicture}[tikzfig]
+ \begin{pgfonlayer}{nodelayer}
+ \node [style=red node] (0) at (0, 1) {};
+ \node [style=blue node 2] (1) at (1, 0) {};
+ \node [style=blue node] (2) at (-1, 0) {};
+ \node [style=yellow square] (3) at (0, -1) {foo};
+ \end{pgfonlayer}
+ \begin{pgfonlayer}{edgelayer}
+ \draw [in=-90, out=0] (3) to (1);
+ \draw [bend right] (3) to (2);
+ \draw (2) to (0);
+ \draw (0) to (1);
+ \end{pgfonlayer}
+\end{tikzpicture}
+\]
+
+
\end{document}
diff --git a/tex/sample/sample.tikzdefs b/tex/sample/sample.tikzdefs
new file mode 100644
index 0000000..4fd5bc9
--- /dev/null
+++ b/tex/sample/sample.tikzdefs
@@ -0,0 +1,5 @@
+% Optional: use this file for definitions that should be used by TikZiT to generate
+% LaTeX preview. It can also be included in the paper.
+
+\usepackage{bm}
+\newcommand{\param}[1]{\ensuremath{\vec{\bm{#1}}}}
diff --git a/tex/sample/sample.tikzstyles b/tex/sample/sample.tikzstyles
index df70248..f32728c 100644
--- a/tex/sample/sample.tikzstyles
+++ b/tex/sample/sample.tikzstyles
@@ -4,9 +4,9 @@
% \tikzstyle{NAME}=[PROPERTY LIST]
% Node styles
-\tikzstyle{red node}=[fill=red, tikzit category=nodes]
-\tikzstyle{blue node}=[fill=blue]
-\tikzstyle{blue node 2}=[tikzit fill=green, fill=blue]
+\tikzstyle{red node}=[fill=red, tikzit category=nodes, shape=circle, draw=black]
+\tikzstyle{blue node}=[fill=blue, shape=circle, draw=black, tikzit category=nodes]
+\tikzstyle{green node}=[tikzit fill=green, fill=green, shape=circle, draw=black, tikzit category=nodes]
\tikzstyle{yellow square}=[draw=black, fill=yellow, shape=rectangle]
% Edge styles
diff --git a/tex/sample/tikzit.sty b/tex/sample/tikzit.sty
index b893a4a..5ca1b46 100644
--- a/tex/sample/tikzit.sty
+++ b/tex/sample/tikzit.sty
@@ -3,30 +3,40 @@
\usetikzlibrary{arrows}
\usetikzlibrary{shapes,shapes.geometric,shapes.misc}
-\tikzstyle{every picture}=[baseline=-0.25em,scale=0.5]
+% this style is applied by default to any tikzpicture included via \tikzfig
+\tikzstyle{tikzfig}=[baseline=-0.25em,scale=0.5]
+% these are dummy properties used by TikZiT, but ignored by LaTex
\pgfkeys{/tikz/tikzit fill/.initial=0}
\pgfkeys{/tikz/tikzit draw/.initial=0}
\pgfkeys{/tikz/tikzit shape/.initial=0}
\pgfkeys{/tikz/tikzit category/.initial=0}
+% standard layers used in .tikz files
+\pgfdeclarelayer{edgelayer}
+\pgfdeclarelayer{nodelayer}
+\pgfsetlayers{background,edgelayer,nodelayer,main}
+
+% style for blank nodes
+\tikzstyle{none}=[inner sep=0mm]
+
+% include a .tikz file
\newcommand{\tikzfig}[1]{%
+{\tikzstyle{every picture}=[tikzfig]
\IfFileExists{#1.tikz}
{\input{#1.tikz}}
{%
\IfFileExists{./figures/#1.tikz}
{\input{./figures/#1.tikz}}
{\tikz[baseline=-0.5em]{\node[draw=red,font=\color{red},fill=red!10!white] {\textit{#1}};}}%
- }%
+ }}%
}
+
+% the same as \tikzfig, but in a {center} environment
\newcommand{\ctikzfig}[1]{%
\begin{center}\rm
\tikzfig{#1}
\end{center}}
-\pgfdeclarelayer{edgelayer}
-\pgfdeclarelayer{nodelayer}
-\pgfsetlayers{background,edgelayer,nodelayer,main}
-\tikzstyle{none}=[inner sep=0mm]
+% fix strange self-loops, which are PGF/TikZ default
\tikzstyle{every loop}=[]
-\tikzstyle{mark coordinate}=[inner sep=0pt,outer sep=0pt,minimum size=3pt,fill=black,circle] \ No newline at end of file