Fixed siunitx options, adding tikz exports

diff --git a/figures/interactingloops.tex b/figures/interactingloops.tex
index e7d9cb53cf4de0ded972ef87ab442e29c267f776..29d39f9257b0b8156e6acb8ddc1a8148a689f089 100644 (file)
--- a/figures/interactingloops.tex
+++ b/figures/interactingloops.tex
@@ -6,7 +6,7 @@
   \definecolor{cellblue}{rgb}    {0.17,0.60,0.99}
   
   \newcommand{\labelcell}[2]{
-  \node[minimum width=3.0cm, minimum height=.85cm,text width=1.7cm, align=center, outer sep=0](#1) {#2};
+  \node[minimum width=2.5cm, minimum height=.85cm,text width=2.0cm, align=center, outer sep=0](#1) {#2};
   }
   \newcommand{\bluecell}[2]{
     \node[minimum width=2.1cm, minimum height=.85cm,fill=cellblue, text=white,text width=2cm, align=center, rounded corners=2ex, outer sep=0](#1) {#2};
@@ -14,21 +14,28 @@
   \newcommand{\redcell}[2]{
     \node[minimum width=2.1cm, minimum height=.85cm,fill=cellred, text=white,text width=2cm, align=center, rounded corners=2ex, outer sep=0](#1) {#2};
   }
+  \tikzexternalenable
   \begin{tikzpicture}
     \small
-    \matrix[row sep=3mm, column sep=0,inner sep=0, node distance=0, outer sep=5mm] (cells) {
+    \matrix[row sep=4mm, column sep=0,inner sep=0, node distance=0, outer sep=5mm] (cells) {
      & \labelcell{perception}{Perception} & \labelcell{output}{Output} & \\
      \redcell{user}{User} & \labelcell{sensorimotor}{Sensorimotor loop} & \labelcell{execution}{Execution loop} & \bluecell{system}{System}\\
      & \labelcell{action}{Action} & \labelcell{input}{Input} & \\
     };
-    \draw [->, -stealth',  thick]
-      (sensorimotor.north east) edge[bend right] (user.north)
-      (user.south) edge[bend right] (sensorimotor.south east)
-      (execution.south west) edge[bend right] (system.south)
-      (system.north) to[bend right] (execution.north west);
-    \draw [ultra thick, draw=black!20, fill=black!50]
+    \draw [line width=2mm, draw=black!20, fill=black!50]
       (perception.north east) edge (action.south east);
-  \end{tikzpicture}
+      % \draw [->, -stealth', line width=1mm, draw=black!60,shorten >= -1.5mm, shorten <= -1.5mm]
+      % (sensorimotor.north east) edge[bend right] (user.north east)
+      % (user.south east) edge[bend right] (sensorimotor.south east)
+      % (execution.south west) edge[bend right] (system.south west)
+      % (system.north west) to[bend right] (execution.north west);
+      \draw [->, -stealth', line width=1mm, draw=cellred!50!black, shorten >= -1.5mm, shorten <= 0.0mm] (sensorimotor.east) to[out=90,in=45] (user.north east);
+      \draw [->, -stealth', line width=1mm, draw=cellblue!50!black, shorten >= -1.5mm, shorten <= 0.0mm] (execution.west) to[out=-90,in=225] (system.south west);
+
+      \draw [->, -stealth', line width=1mm, draw=cellred!50!black, shorten <= -1.5mm] (user.south east) to[out=-45,in=270] (sensorimotor.east);
+      \draw [->, -stealth', line width=1mm, draw=cellblue!50!black, shorten <= -1.5mm] (system.north west) to[out=135,in=90] (execution.west);
+      \end{tikzpicture}
+  \tikzexternaldisable
   \caption{The similarity of a user and a system interacting with each other.}
   \label{fig:loops}
 \end{figure}

diff --git a/figures/sevenstages.tex b/figures/sevenstages.tex
index 21db7618a1a04181a94c2e01cabb72f4519b4be0..c7caa297177bcfcccf76b6092ccdf73f9a18f12e 100644 (file)
--- a/figures/sevenstages.tex
+++ b/figures/sevenstages.tex
@@ -4,8 +4,9 @@
   \centering
   \definecolor{cellred}{rgb}    {0.98,0.17,0.15}
   \newcommand{\stage}[2]{
-    \node[minimum width=2.5cm, minimum height=.85cm,fill=cellred, text=white,text width=2cm, align=center, rounded corners=2ex, outer sep=0, execute at begin node=\setlength{\baselineskip}{0em}](#1) {#2};
+    \node[minimum width=2.5cm, minimum height=.85cm,fill=cellred, text=white,text width=2.2cm, align=center, rounded corners=2ex, outer sep=0, execute at begin node=\setlength{\baselineskip}{0em}](#1) {#2};
   }
+  \tikzexternalenable
   \begin{tikzpicture}
     \small
     \matrix[row sep=3mm, column sep=2mm,inner sep=0, node distance=0, outer sep=5mm] (cells) {
@@ -34,6 +35,7 @@
   %  \node[anchor=south, minimum width=2.6cm, rotate=90, thick,draw=black!20,fill=black!20] at (n.north west) {Implementation};
   %  \node[anchor=south, minimum height=0.6cm, minimum width=6cm, thick, draw=black!20,fill=black!20] at (nd.north east) {Computing affordance};
   \end{tikzpicture}
+  \tikzexternaldisable
   \caption{Norman's seven stages of action~\protect\cite{norman02}. It describes how people interact with their environment.}
     \label{fig:sevenstages}
   \end{figure}

diff --git a/figures/sevenstages2.tex b/figures/sevenstages2.tex
index 2cd1c624d5373edcc24dea7bec4793f2e8ae080f..404a511c3366470326a769cc387208334d8e3afa 100644 (file)
--- a/figures/sevenstages2.tex
+++ b/figures/sevenstages2.tex
@@ -7,6 +7,7 @@
   \newcommand{\stage}[2]{
     \node[minimum width=2.5cm, minimum height=.85cm,fill=cellblue, text=white,text width=2cm, align=center, rounded corners=2ex, outer sep=0, execute at begin node=\setlength{\baselineskip}{0em}](#1) {#2};
   }
+  \tikzexternalenable
   \begin{tikzpicture}
     \small
     \matrix[row sep=3mm, column sep=2mm,inner sep=0, node distance=0, outer sep=5mm] (cells) {
@@ -35,6 +36,7 @@
   %  \node[anchor=south, minimum width=2.6cm, rotate=90, thick,draw=black!20,fill=black!20] at (n.north west) {Implementation};
   %  \node[anchor=south, minimum height=0.6cm, minimum width=6cm, thick, draw=black!20,fill=black!20] at (nd.north east) {Computing affordance};
   \end{tikzpicture}
+  \tikzexternaldisable
   \caption[Seven stages of interactive computation]{The seven stages of interactive computation, adapted from Norman's seven stages of action. It describes how interactive systems interact with their environment.}
   \label{fig:mysevenstages}
 \end{figure}

diff --git a/figures/wholeschema.tex b/figures/wholeschema.tex
index f63ef9d644e6392fa9aef9ab5295ab66ff58b5e2..035b84fabe36856b9ef43d1c607bdfc70af20e03 100644 (file)
--- a/figures/wholeschema.tex
+++ b/figures/wholeschema.tex
@@ -45,7 +45,7 @@
     \draw[{Triangle Cap[bend]}-{Triangle Cap[bend]}, color=black!60, line width=\thickness] (270:\levelthree)  arc[start angle=270, end angle=90, radius=\levelthree];
     \path[decorate, decoration={text along path, text={|\color{white}|Haptic rendering pipeline},text align=center, raise=-0.5ex}] (270:\levelthree) arc[start angle=270, end angle=90, radius=\levelthree];
   \end{tikzpicture}
-  %\tikzexternaldisable
+  \tikzexternaldisable
   \caption[Full pipeline.]{Full pipeline.}
   \label{fig:all}
 \end{figure}

diff --git a/mystyle.sty b/mystyle.sty
index daed85c4db63bedf9c7151d2443f75c05ffda48f..f7c2d3aa357fa768f41d664240e84c5113a469e0 100644 (file)
--- a/mystyle.sty
+++ b/mystyle.sty
@@ -15,8 +15,7 @@
 \usepackage{lipsum}
 
 \usepackage{siunitx}
-%\sisetup{per=slash, load=abbr}
-\sisetup{per=slash, load=abbr, range-phrase={--}, range-units = single, output-decimal-marker = {.}}
+\sisetup{per-mode=fraction, range-phrase={--}, range-units = single, output-decimal-marker = {.}}
 % Patch until the new version of siunitx is out
 \newcommand{\qtyrange}[3]{\SIrange{#1}{#2}{#3}}