From ea838963e49708420a009904cf4f204756ccf2cd Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Wed, 15 May 2013 21:50:33 -0400
Subject: [PATCH] pyafm/stack.tex: Use a little thermometer in the caption :)

Rename the old '\thermometer' -> '\thermometerx' to make room for the
new user-facing '\thermometer' command.
---
 src/local_cmmds.tex | 16 +++++++++++++---
 src/pyafm/stack.tex |  3 ++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/local_cmmds.tex b/src/local_cmmds.tex
index b1cbac3..ad01d3d 100644
--- a/src/local_cmmds.tex
+++ b/src/local_cmmds.tex
@@ -209,14 +209,24 @@
 }
 
 % draw a thermometer in TikZ
-% usage: \thermometer{bulb-location}
-\newcommand{\thermometer}[1]{
+% usage: \thermometerx{bulb-location}
+\newcommand{\thermometerx}[1]{
   \draw[blue!20, line width=4pt, cap=round] #1 -- +(0, 12pt);
   \fill[blue!20] #1 circle (5pt);
   \draw[red, line width=2pt, cap=butt] #1 -- +(0, 8pt);
   \fill[red] #1 circle (4pt);
 }
 
+\DeclareRobustCommand{\thermometer}{%
+  \raisebox{-2pt}{%
+    \resizebox{!}{10pt}{%
+      \begin{tikzpicture}%
+        \thermometerx{(0,2.5pt)};%
+      \end{tikzpicture}%
+    }%
+  }%
+}
+
 % shared figure between pyafm and calibcant
 % usage: \tikzstack{unfold-protein-color}{calibcant-color}
 \newcommand{\tikzstack}[2]{%
@@ -242,7 +252,7 @@
     \node[shape=rectangle,draw=black, semithick]
       (motor) at ($(image.south) + (0, -1)$) {motor};
     \coordinate (thermocouple) at ($(image.west) + (1.4, -4pt)$);
-    \thermometer{(thermocouple)}
+    \thermometerx{(thermocouple)}
     \coordinate (photodiode) at ($(image.west) + (1, 26pt)$);
     \coordinate (piezo) at ($(image.south) + (-6pt, 0)$);
     \draw[black!20,dashed] ($(daq.south west) + (-10pt, 0)$) -- +(0, 4);
diff --git a/src/pyafm/stack.tex b/src/pyafm/stack.tex
index 68eea4b..c7a6ffb 100644
--- a/src/pyafm/stack.tex
+++ b/src/pyafm/stack.tex
@@ -28,7 +28,8 @@ spectroscopy (\cref{fig:pyafm:stack}).
     \pypid\ package measures the buffer temperature using a
     thermocouple inserted in the fluid cell (\tikzline{purple,<-},
     \cref{sec:pyafm:pypid}).  I represent the thermocouple with a
-    thermometer icon, because I expect it is more recognizable than
+    thermometer icon (\thermometer), because I expect it is more
+    recognizable than a more realistic
     \thermocouple.\label{fig:pyafm:stack}}
 \end{figure}
 
-- 
2.26.2