Make newline between label and number optional (pgf-tikz#17)

muzimuzhi · Jun 3, 2023 · a0801e1 · a0801e1
1 parent 219b919
commit a0801e1
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/tex/latex/pgf-pie/tikzlibrarypie.code.tex b/tex/latex/pgf-pie/tikzlibrarypie.code.tex
@@ -85,7 +85,7 @@
   \pgfpie@ifx\pgfpie@text\pgfpie@text@inside{%
     % label and number together
     \path (pgfpie@O) -- ++({\pgfpie@midangle}:{\pgfpie@innerpos}) node[align=center]
-    {\pgfpie@scalefont{#3}\pgfpie@labeltext{#4}\\\pgfpie@numbertext{#3}};
+    {\pgfpie@scalefont{#3}\pgfpie@labeltext{#4}\pgfpie@numbertext{\\}{#3}};
   }{%
     % label
     \pgfpie@ifhidelabel{}{%
@@ -97,7 +97,7 @@
 
     % number
     \path (pgfpie@O) -- ++({\pgfpie@midangle}:{\pgfpie@innerpos}) node
-    {\pgfpie@scalefont{#3}\pgfpie@numbertext{#3}};
+    {\pgfpie@scalefont{#3}\pgfpie@numbertext{}{#3}};
   }%
 }
 
@@ -131,10 +131,10 @@
 \def\pgfpie@square#1#2#3#4#5{%
   \pgfpie@ifx\pgfpie@text\pgfpie@text@inside{%
     \draw[fill={#4},\pgfpie@style] (#1) rectangle node[align=center]
-    {\pgfpie@scalefont{#3}\pgfpie@labeltext{#5}\\\pgfpie@numbertext{#3}} ++(#2);
+    {\pgfpie@scalefont{#3}\pgfpie@labeltext{#5}\pgfpie@numbertext{\\}{#3}} ++(#2);
   }{%
     \draw[fill={#4},\pgfpie@style] (#1) rectangle node
-    {\pgfpie@scalefont{#3}\pgfpie@numbertext{#3}} ++(#2);
+    {\pgfpie@scalefont{#3}\pgfpie@numbertext{}{#3}} ++(#2);
   }%
 }
 
@@ -147,9 +147,9 @@
 \def\pgfpie@cloud#1#2#3#4#5#6{%
   \draw[fill=#4, #5] (#1) circle[radius=#2];
   \pgfpie@ifx\pgfpie@text\pgfpie@text@inside{%
-    \node[align=center] at (#1) {\pgfpie@scalefont{#3}\pgfpie@labeltext{#6}\\\pgfpie@numbertext{#3}};
+    \node[align=center] at (#1) {\pgfpie@scalefont{#3}\pgfpie@labeltext{#6}\pgfpie@numbertext{\\}{#3}};
   }{%
-    \node at (#1) {\pgfpie@scalefont{#3}\pgfpie@numbertext{#3}};
+    \node at (#1) {\pgfpie@scalefont{#3}\pgfpie@numbertext{}{#3}};
   }%
 }
 
@@ -207,9 +207,10 @@
 
 \pgfpie@newif{hidenumber}
 \pgfqkeys{/pgfpie}{hide number/.is if=pgfpie@hidenumber}
-\def\pgfpie@numbertext#1{%
+\def\pgfpie@numbertext#1#2{%
   \pgfpie@ifhidenumber{}{%
-    \pgfpie@beforenumber#1\pgfpie@afternumber
+    #1% empty or \\
+    \pgfpie@beforenumber#2\pgfpie@afternumber
   }%
 }