summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXu Yuan <xu@informatik.hu-berlin.de>2011-10-02 15:54:01 +0200
committerXu Yuan <xu@informatik.hu-berlin.de>2011-10-02 15:54:01 +0200
commit5f0de34b5de3bee2435ec6c1b4716711ff1f8ba0 (patch)
tree6bb77cf0905741acb98b9f84d81c29fe70a74877
parentb11841772e5594915c1ca4d6c257b4b5b1ddab4a (diff)
downloadpgf-pie-5f0de34b5de3bee2435ec6c1b4716711ff1f8ba0.tar.gz
pgf-pie-5f0de34b5de3bee2435ec6c1b4716711ff1f8ba0.tar.bz2
pgf-pie-5f0de34b5de3bee2435ec6c1b4716711ff1f8ba0.zip
label text inside pie
-rw-r--r--dev/demo/text-inside.tex3
-rw-r--r--dev/pgf-pie-manual.tex4
-rw-r--r--dev/pgf-pie.sty26
3 files changed, 23 insertions, 10 deletions
diff --git a/dev/demo/text-inside.tex b/dev/demo/text-inside.tex
new file mode 100644
index 0000000..07cf42e
--- /dev/null
+++ b/dev/demo/text-inside.tex
@@ -0,0 +1,3 @@
+\begin{tikzpicture}
+ \pie[text=inside]{10/A, 20/B, 30/C, 40/D}
+\end{tikzpicture} \ No newline at end of file
diff --git a/dev/pgf-pie-manual.tex b/dev/pgf-pie-manual.tex
index 6ca492a..77a87f1 100644
--- a/dev/pgf-pie-manual.tex
+++ b/dev/pgf-pie-manual.tex
@@ -121,10 +121,12 @@ is 3.
\subsubsection{Label text}
The value of \texttt{text} can be \texttt{label}(default),
-\texttt{pin} or \texttt{legend}.
+\texttt{pin}, \texttt{inside} or \texttt{legend}.
\demo[0.6]{text}
+\demo[0.5]{text-inside}
+
\demo[0.6]{legend}
\subsection{Sum}
diff --git a/dev/pgf-pie.sty b/dev/pgf-pie.sty
index fe11dd2..1651e6f 100644
--- a/dev/pgf-pie.sty
+++ b/dev/pgf-pie.sty
@@ -35,19 +35,27 @@ chart by using PGF/Tikz package.]
% slice
\draw[line join=round, fill=#6, #9] (O) -- ++(#1:#7) arc (#1:#2:#7) -- cycle;
- % label
- \iflegend
- \else
- \path (O) -- ++ (\midangle:\radius)
- node[inner sep=0, \text=\midangle:#4]{};
- \fi
-
- % number
\pgfmathparse{min(((#2)-(#1)-10)/110*(-0.3),0)}
\let\temp\pgfmathresult
\pgfmathparse{(max(\temp,-0.5) + 0.8)*#7}
\let\innerpos\pgfmathresult
- \path (O) -- ++(\midangle:\innerpos) node {#3};
+
+ \ifthenelse{\equal{\text}{inside}}
+ {
+ % label and number together
+ \path (O) -- ++(\midangle:\innerpos) node {\shortstack{#4 \\ #3}};
+ }
+ {
+ % label
+ \iflegend
+ \else
+ \path (O) -- ++ (\midangle:\radius)
+ node[inner sep=0, \text=\midangle:#4]{};
+ \fi
+
+ % number
+ \path (O) -- ++(\midangle:\innerpos) node {#3};
+ }
}
\newcommand{\pgfpie@findColor}[1]