summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-angles.tex
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-angles.tex')
-rw-r--r--macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-angles.tex130
1 files changed, 65 insertions, 65 deletions
diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-angles.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-angles.tex
index 2347745e0b..75b8bf6c92 100644
--- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-angles.tex
+++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-angles.tex
@@ -13,9 +13,9 @@
% The Current Maintainer of this work is Alain Matthes.
% utf8 encoding
-\def\fileversion{3.05c}
-\def\filedate{2020/03/03}
-\typeout{2020/03/03 3.05c tkz-tool-eu-angles.tex}
+\def\fileversion{3.06c}
+\def\filedate{2020/03/18}
+\typeout{2020/03/18 3.06c tkz-tool-eu-angles.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
\newdimen\tkz@arcsize% from julian julian@d-and-j.net
@@ -69,18 +69,18 @@
%\tikzset{lbstyle/.style = {color=\tkz@mainlinecolor}}
\pgfkeys{/tkzmkangle/.cd,
- arc/.estore in = \tkz@arc,
- size/.store in = \tkz@size,
- mark/.store in = \tkz@markang,
- mkpos/.estore in = \tkz@mkpos,
- mksize/.store in = \tkz@mksize,
- mkcolor/.store in = \tkz@mkcolor,
- arc = l,
- size = 1 cm,
- mark = |,
- mksize = 4pt,
- mkcolor = black,
- mkpos = 0.5,
+ arc/.estore in = \tkz@arc,
+ size/.store in = \tkz@size,
+ mark/.store in = \tkz@markang,
+ mkpos/.estore in = \tkz@mkpos,
+ mksize/.store in = \tkz@mksize,
+ mkcolor/.store in = \tkz@mkcolor,
+ arc = l,
+ size = 1 cm,
+ mark = |,
+ mksize = 4pt,
+ mkcolor = black,
+ mkpos = 0.5,
/tkzmkangle/.search also={/tikz}
} \def\tkzMarkAngle{\pgfutil@ifnextchar[{\tkz@MarkAngle}{\tkz@MarkAngle[]}}
\def\tkz@MarkAngle[#1](#2,#3,#4){%
@@ -95,22 +95,22 @@
\def\tkz@mymark{\pgfuseplotmark{\tkz@markang}}
% draw the arcs
\begin{scope}[decoration= {markings,
- mark=at position \tkz@mkpos with {\tkz@mymark}}]
+ mark=at position \tkz@mkpos with {\tkz@mymark}}]
\ifx\tkz@arc\tkz@arcsimple
- \tkzDrawArcRAN[#1,fill=none,postaction={decorate}]%
- (#3,\tkz@size)(\tkz@FirstAngle,\tkz@SecondAngle)
+ \tkzDrawArcRAN[#1,fill=none,postaction={decorate}]%
+ (#3,\tkz@size)(\tkz@FirstAngle,\tkz@SecondAngle)
\else
\ifx\tkz@arc\tkz@arcdouble
- \tkzDrawArcRAN[#1,fill=none](#3,\tkz@size-1.5\pgflinewidth)%
- (\tkz@FirstAngle,\tkz@SecondAngle)
+ \tkzDrawArcRAN[#1,fill=none](#3,\tkz@size-1.5\pgflinewidth)%
+ (\tkz@FirstAngle,\tkz@SecondAngle)
\tkzPathArcRAN[#1,fill=none,postaction={decorate}]%
- (#3,\tkz@size)(\tkz@FirstAngle,\tkz@SecondAngle)%
- \tkzDrawArcRAN[#1,fill=none](#3,\tkz@size+1.5\pgflinewidth)%
+ (#3,\tkz@size)(\tkz@FirstAngle,\tkz@SecondAngle)%
+ \tkzDrawArcRAN[#1,fill=none](#3,\tkz@size+1.5\pgflinewidth)%
(\tkz@FirstAngle,\tkz@SecondAngle)%
\else
\ifx\tkz@arc\tkz@arctriple
\tkzDrawArcRAN[#1,fill=none,postaction={decorate}]%
- (#3,\tkz@size)(\tkz@FirstAngle,\tkz@SecondAngle)%
+ (#3,\tkz@size)(\tkz@FirstAngle,\tkz@SecondAngle)%
\tkzDrawArcRAN[#1,fill=none](#3,\tkz@size-2.5\pgflinewidth)%
(\tkz@FirstAngle,\tkz@SecondAngle)%
\tkzDrawArcRAN[#1,fill=none](#3,\tkz@size+2.5\pgflinewidth)%
@@ -146,18 +146,18 @@
% FillAngle
%<--------------------------------------------------------------------------–>
\pgfkeys{/tkzFill/.cd,
- size/.store in = \tkz@size,
- size = 1 cm,
- /tkzFill/.search also={/tikz}
+ size/.store in = \tkz@size,
+ size = 1 cm,
+ /tkzFill/.search also = {/tikz}
}
\def\tkzFillAngle{\pgfutil@ifnextchar[{\tkz@FillAngle}{\tkz@FillAngle[]}}
\def\tkz@FillAngle[#1](#2,#3,#4){%
\begingroup
\pgfqkeys{/tkzFill}{#1}
- \tkzFindSlopeAngle(#3,#2)\tkzGetAngle{tkz@dirOne}
- \tkzFindSlopeAngle(#3,#4)\tkzGetAngle{tkz@dirTwo}
- \tkzNormalizeAngle(\tkz@dirOne,\tkz@dirTwo)
+ \tkzFindSlopeAngle(#3,#2)\tkzGetAngle{tkz@dirOne}
+ \tkzFindSlopeAngle(#3,#4)\tkzGetAngle{tkz@dirTwo}
+ \tkzNormalizeAngle(\tkz@dirOne,\tkz@dirTwo)
\path[shift = {(#3)},/tkzFill/.cd,#1]%
(#3) -- (\tkz@FirstAngle:\tkz@size) arc%
(\tkz@FirstAngle:\tkz@SecondAngle:\tkz@size)--cycle;
@@ -185,10 +185,10 @@
}
%<------------------------- Label on angle -------------------------------–>
\pgfkeys{/tkzlabelangle/.cd,
- dist/.store in = \tkzlabeldist,
- angle/.store in = \tkzlabelangle,
- dist = 1,
- angle = {},
+ dist/.store in = \tkzlabeldist,
+ angle/.store in = \tkzlabelangle,
+ dist = 1,
+ angle = {},
/tkzlabelangle/.search also={/tikz}
}
\def\tkzLabelAngle{\pgfutil@ifnextchar[{\tkz@LabelAngle}{\tkz@LabelAngle[]}}
@@ -196,10 +196,10 @@
\begingroup
\pgfqkeys{/tkzlabelangle}{#1}
\ifx\tkzutil@empty\tkzlabelangle% no value so calc angle of bisector
- \tkzFindSlopeAngle(#3,#2)\tkzGetAngle{tkz@dirOne}
- \tkzFindSlopeAngle(#3,#4)\tkzGetAngle{tkz@dirTwo}
- \tkzNormalizeAngle(\tkz@dirOne,\tkz@dirTwo)
- \edef\tkzlabelAngle{\fpeval{(\tkz@SecondAngle+\tkz@FirstAngle)/2}}
+ \tkzFindSlopeAngle(#3,#2)\tkzGetAngle{tkz@dirOne}
+ \tkzFindSlopeAngle(#3,#4)\tkzGetAngle{tkz@dirTwo}
+ \tkzNormalizeAngle(\tkz@dirOne,\tkz@dirTwo)
+ \edef\tkzlabelAngle{\fpeval{(\tkz@SecondAngle+\tkz@FirstAngle)/2}}
\fi
\path (#3) --+(\tkzlabelAngle:\tkzlabeldist) node[/tkzlabelangle/.cd,#1] {#5};
\endgroup
@@ -231,12 +231,12 @@
% Symbole droites perpendiculaires
%<----------------------------------------------------------------------
\pgfkeys{/tkzrightangle/.cd,
- norm tkz code/.is if = normtkzcode@execute,
- german/.code = \normtkzcode@executefalse,
- size/.store in = \tkz@ra@size,
- dotsize/.store in = \tkz@dotsize,
- size = .25,
- dotsize = 3 pt,
+ norm tkz code/.is if = normtkzcode@execute,
+ german/.code = \normtkzcode@executefalse,
+ size/.store in = \tkz@ra@size,
+ dotsize/.store in = \tkz@dotsize,
+ size = .25,
+ dotsize = 3 pt,
/tkzrightangle/.search also={/tikz},
}
\newcommand*{\tkzMarkRightAngle}[1][]{\tkz@RightAngle[#1]}
@@ -252,32 +252,33 @@
\pgfpointanchor{#4}{center}}}
\tkz@bx=\pgf@x\relax%
\tkz@by=\pgf@y\relax%
- \ifnormtkzcode@execute%
- \draw[/tkzrightangle/.cd,#1]
- (#3) --++( 28.45274*\tkz@ra@size\tkz@ax , 28.45274*\tkz@ra@size\tkz@ay)
- --++( 28.45274*\tkz@ra@size\tkz@bx , 28.45274*\tkz@ra@size\tkz@by)
- --++(-28.45274*\tkz@ra@size\tkz@ax ,-28.45274*\tkz@ra@size\tkz@ay)
- -- (#3);
- \else%
- % find angles
- \tkzFindSlopeAngle(#3,#2)\tkzGetAngle{tkz@dirOne}
- \tkzFindSlopeAngle(#3,#4)\tkzGetAngle{tkz@dirTwo}
- \tkzNormalizeAngle(\tkz@dirOne,\tkz@dirTwo)
- \edef\tkzCircleAngle{\fpeval{(\tkz@SecondAngle+\tkz@FirstAngle)/2}}
- \tkzDrawArcRAN[/tkzrightangle/.cd,#1](#3,\tkz@ra@size)%
- (\tkz@FirstAngle,\tkz@SecondAngle)
- \path (#3) --+ (\tkzCircleAngle:\tkz@ra@size/2)
- node[fill,circle,minimum size=\tkz@dotsize,inner sep=0 pt] {};
+ \ifnormtkzcode@execute%
+ \draw[/tkzrightangle/.cd,#1]
+ (#3) --++( 28.45274*\tkz@ra@size\tkz@ax , 28.45274*\tkz@ra@size\tkz@ay)
+ --++( 28.45274*\tkz@ra@size\tkz@bx , 28.45274*\tkz@ra@size\tkz@by)
+ --++(-28.45274*\tkz@ra@size\tkz@ax ,-28.45274*\tkz@ra@size\tkz@ay)
+ -- (#3);
+ \else%
+ % find angles
+ \tkzFindSlopeAngle(#3,#2)\tkzGetAngle{tkz@dirOne}
+ \tkzFindSlopeAngle(#3,#4)\tkzGetAngle{tkz@dirTwo}
+ \tkzNormalizeAngle(\tkz@dirOne,\tkz@dirTwo)
+ \edef\tkzCircleAngle{\fpeval{(\tkz@SecondAngle+\tkz@FirstAngle)/2}}
+ \tkzDrawArcRAN[/tkzrightangle/.cd,#1](#3,\tkz@ra@size)%
+ (\tkz@FirstAngle,\tkz@SecondAngle)
+ \path (#3) --+ (\tkzCircleAngle:\tkz@ra@size/2)
+ node[fill,circle,minimum size=\tkz@dotsize,
+ inner sep=0 pt,/tkzrightangle/.cd,#1] {};
\fi%
\endgroup
}
%<--------------------------------------------------------------------------–>
\def\tkz@multiRA#1 #2\@nil{%
\protected@edef\tkz@temp{
- \noexpand \tkzMarkRightAngle[\tkz@optRA](#1)}\tkz@temp%
+ \noexpand \tkzMarkRightAngle[\tkz@optRA](#1)}\tkz@temp%
\def\tkz@nextArg{#2}%
\ifx\tkzutil@empty\tkz@nextArg
- \let\next\@gobble
+ \let\next\@gobble
\fi
\next#2\@nil
}
@@ -287,11 +288,10 @@
\def\tkz@RightAngles[#1](#2){%
\xdef\tkz@optRA{#1}
\begingroup
- \let\next\tkz@multiRA
- \next#2 \@nil %
+ \let\next\tkz@multiRA
+ \next#2 \@nil %
\endgroup
}
\makeatother
-\endinput
- \ No newline at end of file
+\endinput \ No newline at end of file