From dec495c25120bdd95ed719784bf1afa8a63145fa Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 6 Feb 2020 20:50:18 +0000 Subject: tkz-euclide (6feb20) git-svn-id: svn://tug.org/texlive/trunk@53697 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tkz-euclide/tkz-euclide.sty | 17 +++++--- .../tex/latex/tkz-euclide/tkz-obj-eu-angles.tex | 16 +++---- .../tex/latex/tkz-euclide/tkz-obj-eu-arcs.tex | 16 +++---- .../tex/latex/tkz-euclide/tkz-obj-eu-circles.tex | 41 +++++++++--------- .../tex/latex/tkz-euclide/tkz-obj-eu-compass.tex | 28 ++++++------- .../latex/tkz-euclide/tkz-obj-eu-draw-circles.tex | 36 ++++++++-------- .../latex/tkz-euclide/tkz-obj-eu-draw-lines.tex | 38 ++++++++--------- .../latex/tkz-euclide/tkz-obj-eu-draw-polygons.tex | 8 ++-- .../tex/latex/tkz-euclide/tkz-obj-eu-lines.tex | 8 ++-- .../tex/latex/tkz-euclide/tkz-obj-eu-points-by.tex | 8 ++-- .../latex/tkz-euclide/tkz-obj-eu-points-rnd.tex | 8 ++-- .../latex/tkz-euclide/tkz-obj-eu-points-with.tex | 8 ++-- .../tex/latex/tkz-euclide/tkz-obj-eu-points.tex | 49 ++++++++++++++++------ .../tex/latex/tkz-euclide/tkz-obj-eu-polygons.tex | 8 ++-- .../latex/tkz-euclide/tkz-obj-eu-protractor.tex | 8 ++-- .../tex/latex/tkz-euclide/tkz-obj-eu-sectors.tex | 8 ++-- .../tex/latex/tkz-euclide/tkz-obj-eu-show.tex | 24 ++++++----- .../tex/latex/tkz-euclide/tkz-obj-eu-triangles.tex | 37 ++++++---------- .../tex/latex/tkz-euclide/tkz-tools-angles.tex | 8 ++-- .../latex/tkz-euclide/tkz-tools-intersections.tex | 11 ++--- 20 files changed, 204 insertions(+), 181 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tkz-euclide') diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-euclide.sty b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-euclide.sty index 9a611c9943f..5c86e5c0af9 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-euclide.sty +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-euclide.sty @@ -1,17 +1,24 @@ % tkz-euclide.sty -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % % This file may be distributed and/or modified % % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. %<------------------------------------------------------------–> -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-euclide.sty} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-euclide.sty} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tkz-euclide}[2020/01/23 3.01c for euclidan geometry ] +\ProvidesPackage{tkz-euclide}[2020/01/24 3.02c for euclidan geometry ] \RequirePackage{tkz-base} +\makeatletter +\@ifpackagelater{tkz-base}{2020/01/24}{% + % Package is new enough +}{% + \PackageError{tkz-euclide}{Package tkz-base is too old , you need a recent version}% +} +\makeatother \DeclareOption*{}%% Ne rien faire quand une option est inconnue \ProcessOptions %<----------------------------------------------------------–> diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-angles.tex b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-angles.tex index caa19116be5..bce07ea8a97 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-angles.tex +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-angles.tex @@ -1,11 +1,11 @@ % tkz-tool-eu-angles.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-tool-eu-angles.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tool-eu-angles.tex} \makeatletter %<--------------------------------------------------------------------------–> \newdimen\tkz@arcsize% from julian julian@d-and-j.net @@ -17,13 +17,13 @@ %<--------------------------------------------------------------------------–> \def\tkzDrawArcRAN[#1](#2,#3)(#4,#5){% \begingroup - \draw[shift = {(#2)},/drawarc/.cd,#1] (#4:#3) arc (#4:#5:#3); + \draw[shift = {(#2)},/tkzdrawarc/.cd,#1] (#4:#3) arc (#4:#5:#3); \endgroup } %<--------------- tkzPathArcRAN ---------------------------------- \def\tkzPathArcRAN[#1](#2,#3)(#4,#5){% \begingroup - \path[shift = {(#2)},/drawarc/.cd,#1] (#4:#3) arc (#4:#5:#3); + \path[shift = {(#2)},/tkzdrawarc/.cd,#1] (#4:#3) arc (#4:#5:#3); \endgroup } %<--------------------------------------------------------------------------–> @@ -179,8 +179,8 @@ \pgfkeys{/tkzlabelangle/.cd, dist/.store in = \tkzlabeldist, angle/.store in = \tkzlabelangle, - dist = 1, - angle = {}, + dist = 1, + angle = {}, /tkzlabelangle/.search also={/tikz} } \def\tkzLabelAngle{\pgfutil@ifnextchar[{\tkz@LabelAngle}{\tkz@LabelAngle[]}} diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-arcs.tex b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-arcs.tex index 7c0584c8f05..c8ef72c3e6f 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-arcs.tex +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-arcs.tex @@ -1,11 +1,11 @@ % tkz-obj-eu-arcs.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-arcs.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-arcs.tex} \makeatletter %<------------------------------ Arcs -------------------------------------– % options : delta @@ -14,7 +14,7 @@ % \pgfkeys{/tikz/.cd,delta/.code={\def\tkz@delta{#1}}} \gdef\tkz@numa{0} -\pgfkeys{/drawarc/.cd, +\pgfkeys{/tkzdrawarc/.cd, type/.is choice, type/towards/.code = \def\tkz@numa{0}, type/rotate/.code = \def\tkz@numa{1}, @@ -36,12 +36,12 @@ type/.default = towards, delta/.store in = \tkz@delta, delta = 0, - /drawarc/.search also = {/tikz} + /tkzdrawarc/.search also = {/tikz} } \def\tkzDrawArc{\pgfutil@ifnextchar[{\tkz@DrawArc}{\tkz@DrawArc[]}} \def\tkz@DrawArc[#1](#2,#3)(#4){% \begingroup -\pgfqkeys{/drawarc}{#1} +\pgfqkeys{/tkzdrawarc}{#1} \ifcase\tkz@numa% \tkzDrawArcTowards[#1](#2,#3)(#4) \or% 1 @@ -131,7 +131,7 @@ \edef\tkz@FirstAngle{\pgfmathresult}% \pgfmathadd{\tkz@SecondAngle}{\tkz@delta} \edef\tkz@SecondAngle{\pgfmathresult} - \draw[shift = {(#2)},compass style,/drawarc/.cd,#1]% + \draw[shift = {(#2)},compass style,/tkzdrawarc/.cd,#1]% (\tkz@FirstAngle:#3) arc (\tkz@FirstAngle:\tkz@SecondAngle:#3); \endgroup } diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-circles.tex b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-circles.tex index aa1b259d8a8..9a3a726658b 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-circles.tex +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-circles.tex @@ -1,12 +1,12 @@ % tkz-obj-eu-circles.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-circles.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-circles.tex} \makeatletter %<--------------------------------------------------------------------------–> % tkzCircle center and one point @@ -16,30 +16,30 @@ % no need to define a circle with R tikz uses this method. % through instead of radius \def\tkz@numc{0} -\pgfkeys{/tkzDefCircle/.cd, +\pgfkeys{/tkzcircle/.cd, through/.code = \def\tkz@numc{0}, radius/.code = \def\tkz@numc{0}, diameter/.code = \def\tkz@numc{1}, circum/.code = \def\tkz@numc{2}, in/.code = \def\tkz@numc{3}, - ex/.code = \def\tkz@numc{4},% new + ex/.code = \def\tkz@numc{4}, euler/.code = \def\tkz@numc{5}, nine/.code = \def\tkz@numc{5}, apollonius/.code = \def\tkz@numc{6}, - orthogonal from/.code args = {#1}{\def\tkz@ptfrom{#1}, + orthogonal from/.code args = {#1}{\def\tkz@ptfrom{#1} \def\tkz@numc{7}}, orthogonal through/.code args = {#1 and #2}{\def\tkz@ptone{#1} \def\tkz@pttwo{#2} \def\tkz@numc{8}}, spieker/.code = \def\tkz@numc{9}, - K/.code = \def\tkz@koeff{#1},% apollonius + K/.code = \def\tkz@koeff{#1}, K = 1, through } \def\tkzDefCircle{\pgfutil@ifnextchar[{\tkz@DefCircle}{\tkz@DefCircle[]}} \def\tkz@DefCircle[#1](#2){% \begingroup -\pgfqkeys{/tkzDefCircle}{#1} +\pgfqkeys{/tkzcircle}{#1} \ifcase\tkz@numc% \tkzDefCircleThrough(#2)% \or% 1 @@ -63,7 +63,6 @@ \fi \endgroup } - %<--------------------------------------------------------------------------–> % Circum Circle %<--------------------------------------------------------------------------–> @@ -150,7 +149,7 @@ %<--------------------------------------------------------------------------–> % Apollonius radius %<--------------------------------------------------------------------------–> -\pgfkeys{/tkzApolloniusR/.cd, +\pgfkeys{/tkzapor/.cd, K/.code = \def\tkz@koeff{#1},% apollonius K = 1 } @@ -158,7 +157,7 @@ \tkz@DefApolloniusRadius}{\tkz@DefApolloniusRadius[]}} \def\tkz@DefApolloniusRadius[#1](#2,#3){% \begingroup - \pgfqkeys{/tkzApolloniusR}{#1} + \pgfqkeys{/tkzapor}{#1} \tkz@VecK[\tkz@koeff/(1+\tkz@koeff)](#2,#3) \pgfnodealias{apo@pta}{tkzPointResult} \tkz@VecK[\tkz@koeff/(\tkz@koeff-1)](#2,#3) @@ -171,28 +170,28 @@ % Apollonius point %<--------------------------------------------------------------------------–> -\pgfkeys{/tkzApolloniusP/.cd, - K/.code = \def\tkz@koeff{#1},% apollonius - K = 1 +\pgfkeys{/tkzapop/.cd, + K/.code = \def\tkz@koeff{#1},% apollonius + K = 1 } \def\tkzDefApolloniusPoint{\pgfutil@ifnextchar[{\tkz@DefApolloniusPoint}{\tkz@DefApolloniusPoint[]}} \def\tkz@DefApolloniusPoint[#1](#2,#3){% \begingroup - \pgfqkeys{/tkzApolloniusP}{#1} + \pgfqkeys{/tkzapop}{#1} \tkzDefBarycentricPoint(#2=1,#3=\tkz@koeff) \endgroup } %<--------------------------------------------------------------------------–> % Apollonius center %<--------------------------------------------------------------------------–> -\pgfkeys{/tkzApolloniusC/.cd, - K/.code = \def\tkz@koeff{#1},% apollonius - K = 1 +\pgfkeys{/tkzapoc/.cd, + K/.code = \def\tkz@koeff{#1},% apollonius + K = 1 } \def\tkzApolloniusCenter{\pgfutil@ifnextchar[{\tkz@ApolloniusCenter}{\tkz@ApolloniusCenter[]}} \def\tkz@ApolloniusCenter[#1](#2,#3){% \begingroup - \pgfqkeys{/tkzApolloniusC}{#1} + \pgfqkeys{/tkzapoc}{#1} \tkz@VecK[\tkz@koeff/(1+\tkz@koeff)](#2,#3) \pgfnodealias{tkzFirstPointResult}{tkzPointResult} \tkz@VecK[\tkz@koeff/(\tkz@koeff-1)](#2,#3) @@ -227,7 +226,7 @@ \pgfnodealias{tkz@spka}{tkzPointResult} \tkzDefMidPoint(#1,#2) \tkzUProjection(#1,#2)(tkzPointResult) - \tkzCalcLength(tkz@spka,tkzPointResult) + \tkzCalcLength(tkz@spka,tkzPointResult) \endgroup } %<--------------------------------------------------------------------------–> diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-compass.tex b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-compass.tex index e0f00f678da..dd1c46863a0 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-compass.tex +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-compass.tex @@ -1,11 +1,11 @@ % tkz-obj-eu-compass.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-compass.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-compass.tex} \makeatletter %<--------------------------------------------------------------------------–> % Author Alain Matthes @@ -17,7 +17,7 @@ % Setup Compass %<--------------------------------------------------------------------------–> \pgfkeys{% - setupcompass/.cd, + tkzsucompass/.cd, line width/.code = {\global\edef\tkz@compass@lw{#1}}, color/.code = {\global\edef\tkz@compass@color{#1}}, style/.code = {\global\edef\tkz@compass@style{#1}}, @@ -29,12 +29,12 @@ %<--------------------------------------------------------------------------–> \def\tkz@SetUpCompass[#1]{% \pgfkeys{% - setupcompass/.cd, + tkzsucompass/.cd, line width = \tkz@euc@compasswidth, color = \tkz@euc@compasscolor, style = \tkz@euc@compassstyle } -\pgfqkeys{/setupcompass}{#1} +\pgfqkeys{/tkzsucompass}{#1} \tikzset{compass style/.style={color = \tkz@compass@color, line width = \tkz@compass@lw, style = \tkz@compass@style @@ -52,10 +52,10 @@ %<--------------------------------------------------------------------------–> \pgfkeys{ - /compass/delta/.code = {\def\tkz@delta{#1}}, - /compass/length/.code = {\def\tkz@length{#1}}, - /compass/ratio/.code = {\def\tkz@ratio{#1}}, - /compass/.unknown/.code = {\let\searchname=\pgfkeyscurrentname + /tkzcompass/delta/.code = {\def\tkz@delta{#1}}, + /tkzcompass/length/.code = {\def\tkz@length{#1}}, + /tkzcompass/ratio/.code = {\def\tkz@ratio{#1}}, + /tkzcompass/.unknown/.code = {\let\searchname=\pgfkeyscurrentname \pgfkeysalso{\searchname/.try=#1, /tikz/\searchname/.retry=#1}} } @@ -64,18 +64,18 @@ \def\tkz@Compass[#1](#2,#3){% \begingroup \pgfkeys{% - compass/.cd, + tkzcompass/.cd, length = 1, delta = 0, ratio = .5 } -\pgfkeys{compass/.cd,#1} +\pgfkeys{tkzcompass/.cd,#1} \tkzCalcLength(#2,#3)\tkzGetLength{tkz@tempLen} \ifnum\tkz@delta=0 % \pgfmathsetmacro{\tkz@delta}{min(deg(\tkz@length cm/ \tkz@tempLen pt),180)/2} \fi \tkzFindSlopeAngle(#2,#3)\tkzGetAngle{tkz@angle}% - \draw[shift ={(#2)},/compass/.cd,compass style,#1]% + \draw[shift ={(#2)},/tkzcompass/.cd,compass style,#1]% (\tkz@angle-\tkz@delta:\tkz@tempLen pt)% arc (\tkz@angle-\tkz@delta:\tkz@angle+\tkz@delta:\tkz@tempLen pt); %}; diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-draw-circles.tex b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-draw-circles.tex index 20a07f6fa64..f8a0a055582 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-draw-circles.tex +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-draw-circles.tex @@ -1,12 +1,12 @@ % tkz-obj-eu-draw-circles.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-draw-circles.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-draw-circles.tex} \makeatletter %for compatibility %<--------------------------------------------------------------------------–> @@ -37,7 +37,7 @@ } \def\tkz@numdc{0} -\pgfkeys{/DrawCircle/.cd, +\pgfkeys{/tkzdrawc/.cd, through/.code = \def\tkz@numdc{0}, R/.code = \def\tkz@numdc{1}, diameter/.code = \def\tkz@numdc{2}, @@ -55,7 +55,7 @@ K/.store in = \tkz@koeff,% apollonius through, K = 1, - /DrawCircle/.search also={/tikz} + /tkzdrawc/.search also={/tikz} } %<--------------------------------------------------------------------------–> %<--------------------------------------------------------------------------–> @@ -64,7 +64,7 @@ \def\tkzDrawCircle{\pgfutil@ifnextchar[{\tkz@DrawCircle}{\tkz@DrawCircle[]}} \def\tkz@DrawCircle[#1](#2){% \begingroup -\pgfqkeys{/DrawCircle}{#1} +\pgfqkeys{/tkzdrawc}{#1} \ifcase\tkz@numdc% \tkzDefCircleThrough(#2) \or% 1 @@ -86,7 +86,7 @@ \or% 8 \tkzDefOrthoThroughCircle(#2,\tkz@ptone,\tkz@pttwo) \fi - \draw[line style,/DrawCircle/.cd,#1] + \draw[line style,/tkzdrawc/.cd,#1] (tkzPointResult) circle (\tkzLengthResult pt); \endgroup } @@ -114,20 +114,20 @@ %<--------------------------------------------------------------------------–> % #2 #3 rayon \def\tkz@numdsc{0} -\pgfkeys{/@SemiCircle/.cd, +\pgfkeys{/tkzdrawsc/.cd, through/.code = \def\tkz@numdsc{0}, diameter/.code = \def\tkz@numdsc{1}, swap/.is if = tkz@sawp@sc, swap/.default = true, swap = false, through, - /@SemiCircle/.search also={/tikz} + /tkzdrawsc/.search also={/tikz} } \def\tkzDrawSemiCircle{\pgfutil@ifnextchar[{\tkz@DrawSemiCircle}{% \tkz@DrawSemiCircle[]}} \def\tkz@DrawSemiCircle[#1](#2){% \begingroup -\pgfqkeys{/@SemiCircle}{#1} +\pgfqkeys{/tkzdrawsc}{#1} \ifcase\tkz@numdsc% \tkzDrawSemiCircleThrough(#2) \or% @@ -202,7 +202,7 @@ } %<--------------------------- Clip Circle ---------------------------------–> \def\tkz@numcc{0} -\pgfkeys{/clipcircle/.cd, +\pgfkeys{/tkzclipc/.cd, through/.code = \def\tkz@numcc{0}, R/.code = \def\tkz@numcc{1}, through} @@ -210,7 +210,7 @@ \def\tkzClipCircle{\pgfutil@ifnextchar[{\tkz@ClipCircle}{\tkz@ClipCircle[]}} \def\tkz@ClipCircle[#1](#2,#3){% -\pgfqkeys{/clipcircle}{#1} +\pgfqkeys{/tkzclipc}{#1} \ifcase\tkz@numcc \tkzCalcLength(#2,#3) \clip (#2) circle (\tkzLengthResult pt); @@ -222,11 +222,11 @@ % attention radius circle is defined by center and a point on the circle % R defined by center and the value of the radius \def\tkz@numlc{0} -\pgfkeys{/labelcircle/.cd, +\pgfkeys{/tkzlabelc/.cd, through/.code = \def\tkz@numlc{0}, R/.code = \def\tkz@numlc{1}, through, - /labelcircle/.search also={/tikz} + /tkzlabelc/.search also={/tikz} } \def\tkzLabelCircle{\pgfutil@ifnextchar[{\tkz@LabelCircle}{% @@ -235,14 +235,14 @@ % #4 angle #5 the label \def\tkz@LabelCircle[#1](#2,#3)(#4)#5{% \begingroup -\pgfqkeys{/labelcircle}{#1} +\pgfqkeys{/tkzlabelc}{#1} \ifcase\tkz@numlc \tkzURotateAngle(#2,#4)(#3) - \node[/labelcircle/.cd,#1] at (tkzPointResult) {#5}; + \node[/tkzlabelc/.cd,#1] at (tkzPointResult) {#5}; \or% 1 \path (#2)--++(#3,0) coordinate (tkzPointResult); \tkzURotateAngle(#2,#4)(tkzPointResult) - \node[/labelcircle/.cd,#1] at (tkzPointResult) {#5}; + \node[/tkzlabelc/.cd,#1] at (tkzPointResult) {#5}; \fi \endgroup } diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-draw-lines.tex b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-draw-lines.tex index 76923e844b7..d837c35a1d7 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-draw-lines.tex +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-draw-lines.tex @@ -1,20 +1,20 @@ % tkz-obj-eu-draw-lines.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-draw-lines.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-draw-lines.tex} \makeatletter \def\tkz@numdl{0} -\pgfkeys{/DrawLine/.cd, +\pgfkeys{/tkzdrawl/.cd, median/.code = \def\tkz@numdl{0}, altitude/.code = \def\tkz@numdl{1}, bisector/.code = \def\tkz@numdl{2}, none/.code = \def\tkz@numdl{3}, none, - /DrawLine/.search also={/tikz} + /tkzdrawl/.search also={/tikz} } %<--------------------------------------------------------------------------–> % Drawing a line > @@ -22,7 +22,7 @@ \def\tkzDrawLine{\pgfutil@ifnextchar[{\tkz@DrawLine}{\tkz@DrawLine[]}} \def\tkz@DrawLine[#1](#2){% \begingroup -\pgfqkeys{/DrawLine}{#1} +\pgfqkeys{/tkzdrawl}{#1} \ifcase\tkz@numdl% \tkzDrawMedian[#1](#2) \or% 1 @@ -42,7 +42,7 @@ \def\tkzDrawSLine{\pgfutil@ifnextchar[{\tkz@DrawSLine}{\tkz@DrawSLine[]}} \def\tkz@DrawSLine[#1](#2,#3){% \begingroup -\draw[#1] (#2) to (#3); +\draw[line style,#1] (#2) to (#3); \endgroup }% %<--------------------------------------------------------------------------–> @@ -52,7 +52,7 @@ \def\tkz@Median[#1](#2,#3,#4){% \begingroup \tkzDefMidPoint(#2,#4) - \tkzDrawSLine[add= 0 and 0,/DrawLine/.cd,#1](#3,tkzPointResult) + \tkzDrawSLine[add= 0 and 0,/tkzdrawl/.cd,#1](#3,tkzPointResult) \endgroup } %<--------------------------------------------------------------------------–> @@ -62,7 +62,7 @@ \def\tkz@Altitude[#1](#2,#3,#4){% \begingroup \tkzUProjection(#2,#4)(#3) - \tkzDrawSLine[add= 0 and 0,/DrawLine/.cd,#1](#3,tkzPointResult) + \tkzDrawSLine[add= 0 and 0,/tkzdrawl/.cd,#1](#3,tkzPointResult) \endgroup } %<--------------------------------------------------------------------------–> @@ -73,7 +73,7 @@ \begingroup \tkzDefBisectorLine(#2,#3,#4) \tkzInterLL(#2,#4)(#3,tkzPointResult) - \tkzDrawSLine[add= 0 and 0,/DrawLine/.cd,#1](#3,tkzPointResult) + \tkzDrawSLine[add= 0 and 0,/tkzdrawl/.cd,#1](#3,tkzPointResult) \endgroup } %<--------------------------------------------------------------------------–> @@ -169,7 +169,7 @@ median, name/.store in = \tkz@newpoint@name, name/.initial = {}, - name = {}, + name = {}, /DrawTLines/.search also={/tikz} } %<--------------------------------------------------------------------------–> @@ -220,12 +220,12 @@ % Setup Line %<--------------------------------------------------------------------------–> \pgfkeys{% - setupline/.cd, + tkzsuline/.cd, line width/.code = {\xdef\tkz@line@lw{#1}}, color/.code = {\xdef\tkz@line@color{#1}}, style/.code = {\xdef\tkz@line@style{#1}}, add/.code args = {#1 and #2} {\xdef\tkz@line@left{#1}% - \xdef\tkz@line@right{#2}% + \xdef\tkz@line@right{#2}% } } %<--------------------------------------------------------------------------–> @@ -233,12 +233,12 @@ \tkzActivOff\tkz@SetUpLine[]}} \def\tkz@SetUpLine[#1]{% \pgfkeys{% - setupline/.cd, + tkzsuline/.cd, line width = \tkz@euc@linewidth, color = \tkz@euc@linecolor, style = \tkz@euc@linestyle, add = {\tkz@euc@lineleft} and {\tkz@euc@lineright}} -\pgfqkeys{/setupline}{#1} +\pgfqkeys{/tkzsuline}{#1} %<--------------------------------------------------------------------------–> % Line style %<--------------------------------------------------------------------------–> @@ -252,14 +252,14 @@ %<--------------------------------------------------------------------------–> % draw segment (s) %<--------------------------------------------------------------------------–> -\pgfkeys{/@tkzsegoptions/.cd, - /@tkzsegoptions/.search also={/tikz}, +\pgfkeys{/tkzdraws/.cd, + /tkzdraws/.search also={/tikz}, } \def\tkzDrawSegment{\pgfutil@ifnextchar[{\tkz@DrawSegment}{% \tkz@DrawSegment[]}} \def\tkz@DrawSegment[#1](#2,#3){% \begingroup - \pgfqkeys{/@tkzsegoptions}{#1} + \pgfqkeys{/tkzdraws}{#1} \draw[line style,add=0 and 0,#1] (#2) to (#3); \endgroup }% diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-draw-polygons.tex b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-draw-polygons.tex index 49ce0c7021a..6b3764ccc35 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-draw-polygons.tex +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-draw-polygons.tex @@ -1,11 +1,11 @@ % tkz-obj-eu-polygons.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-polygons.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-polygons.tex} \makeatletter %<--------------------------------------------------------------------------–> % Polygon diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-lines.tex b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-lines.tex index ee12e06d8aa..5246f68455a 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-lines.tex +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-lines.tex @@ -1,11 +1,11 @@ % tkz-obj-eu-lines.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-lines.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-lines.tex} \makeatletter %<--------------------------------------------------------------------------–> % les lignes diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-points-by.tex b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-points-by.tex index bf8793ad093..2ab31570ac9 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-points-by.tex +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-points-by.tex @@ -1,11 +1,11 @@ % tkz-tools-eu-points-by.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-tools-eu-points-by.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-eu-points-by.tex} \makeatletter %<--------------------------------------------------------------------------–> % Transformations Géométriques diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-points-rnd.tex b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-points-rnd.tex index ca072cd66dd..d11902126dd 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-points-rnd.tex +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-points-rnd.tex @@ -1,13 +1,13 @@ % tkz-obj-eu-points-rnd.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % % This file may be distributed and/or modified % % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-points-rnd.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-points-rnd.tex} %<--------------------------------------------------------------------------–> \makeatletter %<-------------------------------------------------------------------------–> diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-points-with.tex b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-points-with.tex index d73a1ce8cb4..6e235de7b3d 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-points-with.tex +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-points-with.tex @@ -1,11 +1,11 @@ % tkz-obj-eu-points-with.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-points-with.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-points-with.tex} \makeatletter %<--------------------------------------------------------------------------–> % Vectors diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-points.tex b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-points.tex index 62600426e73..774faae9219 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-points.tex +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-points.tex @@ -1,11 +1,11 @@ % tkz-obj-eu-points.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-points.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-points.tex} \makeatletter %add ExCenter %<--------------------------------------------------------------------------–> @@ -354,15 +354,16 @@ %<--------------------------------------------------------------------------–> % Nagel center Na %<--------------------------------------------------------------------------–> -% INa = 3 IG. Nagel point +% INa = 3 IG. Nagel point % correction 02/02/20 \def\tkzNagelCenter(#1,#2,#3){% \begingroup \pgfinterruptboundingbox - \tkzInCenter(#1,#2,#3) - \pgfnodealias{tkz@ptin}{tkzPointResult} - \tkzCentroid(#1,#2,#3) - \pgfnodealias{tkz@cen}{tkzPointResult} - \tkz@VecCoLinear(tkz@ptin,tkz@cen,tkz@ptin) + \tkzDefExcentralTriangle(#1,#2,#3){tkz@a,tkz@b,tkz@c} + \tkzUProjection(#2,#3)(tkz@a) + \pgfnodealias{tkz@tgta}{tkzPointResult} + \tkzUProjection(#1,#2)(tkz@c) + \pgfnodealias{tkz@tgtc}{tkzPointResult} + \tkzInterLL(#1,tkz@tgta)(#3,tkz@tgtc) \endpgfinterruptboundingbox \endgroup } @@ -459,7 +460,31 @@ \pgfnodealias{\csname tkz@ppt3\endcsname\csname tkz@pt3\endcsname}{tkzPointResult} \endgroup } - - +%<--------------------------------------------------------------------------–> +% Point on circle +%<--------------------------------------------------------------------------–> +\pgfkeys{/tkzptcircle/.cd, + angle/.store in = \tkz@angle, + angle = 0 , + center/.store in = \tkz@center, + radius/.store in = \tkz@radius +} +\def\tkzDefPointOnCircle{\pgfutil@ifnextchar[{\tkz@DefPointOnCircle}{\tkz@DefPointOnCircle[]}} +\def\tkz@DefPointOnCircle[#1]{% +\begingroup +\pgfqkeys{/tkzptcircle}{#1} +\path (\tkz@center) --++(\tkz@angle:\tkz@radius) coordinate(tkzPointResult); +\endgroup +} +%<--------------------------------------------------------------------------–> +% Point on line +%<--------------------------------------------------------------------------–> +\def\tkzDefPointOnLine{\pgfutil@ifnextchar[{\tkz@DefPointOnLine}{\tkz@DefPointOnLine[]}} +\def\tkz@DefPointOnLine[#1](#2,#3){% +\begingroup +\path (#2) to [#1] coordinate (tkzPointResult) (#3); +\endgroup +} + \makeatother \endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-polygons.tex b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-polygons.tex index 56d0b86fdf2..b9b29a666e3 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-polygons.tex +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-polygons.tex @@ -1,11 +1,11 @@ % tkz-obj-eu-polygons.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-polygons.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-polygons.tex} \makeatletter %<--------------------------------------------------------------------------–> % Polygon diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-protractor.tex b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-protractor.tex index eaeca969fc1..b1426b206c3 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-protractor.tex +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-protractor.tex @@ -1,11 +1,11 @@ % tkz-obj-eu-protractor.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} - \typeout{2020/01/23 3.01c tkz-obj-eu-protractor.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} + \typeout{2020/01/24 3.02c tkz-obj-eu-protractor.tex} \makeatletter %<--------------------------------------------------------------------------–> % !!! idea from Y. Combe !!! diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-sectors.tex b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-sectors.tex index 538a8f34f9b..24fc8456736 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-sectors.tex +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-sectors.tex @@ -1,11 +1,11 @@ % tkz-obj-eu-sectors.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-sectors.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-sectors.tex} \makeatletter %<----------------------- Sectors ------------------------------–> \tikzset{sstyle/.style={#1}} diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-show.tex b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-show.tex index 457fbed257a..d1eb78b30e5 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-show.tex +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-show.tex @@ -1,11 +1,11 @@ %tkz-obj-eu-show.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-show.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-show.tex} \makeatletter %<--------------------------------------------------------------------------–> % finding specific points in a triangle @@ -59,7 +59,7 @@ size/.code = \def\tkz@show@size{#1}, /show/.unknown/.code = {\let\searchname=\pgfkeyscurrentname \pgfkeysalso{\searchname/.try=#1, - /compass/\searchname/.retry=#1, + /tkzcompass/\searchname/.retry=#1, /tikz/\searchname/.retry=#1}% } } @@ -134,10 +134,12 @@ \def\tkzShowOrthLine{\pgfutil@ifnextchar[{\tkz@ShowOrthLine}{\tkz@ShowOrthLine[]}} \def\tkz@ShowOrthLine[#1](#2,#3)(#4){% \begingroup -\pgfkeys{show/.cd, ratio = .75, +\pgfkeys{show/.cd, + ratio = .75, length = 1, - gap = -1} % ???? -\pgfkeys{show/.cd,#1} %???? + gap = -1, + size = 1} +\pgfkeys{show/.cd,#1} \tkzVecKOrth(#2,#3) \pgfnodealias{tkz@OLtmp}{tkzPointResult} \tkz@VecKCoLinear[1](#2,tkz@OLtmp,#4) @@ -152,9 +154,9 @@ \pgfnodealias{PO@tmp2}{tkzPointResult} \tkz@VecKCoLinear[-1](#2,PO@tmp,tkzPOpoint) \pgfnodealias{PO@tmp1}{tkzPointResult} - \tkz@VecKCoLinear[2](tkzPOpoint,PO@tmp1,tkzPOpoint) + \tkz@VecKCoLinear[\tkz@show@size](tkzPOpoint,PO@tmp1,tkzPOpoint) \pgfnodealias{PO@1}{tkzPointResult} - \tkz@VecKCoLinear[2](tkzPOpoint,PO@tmp2,tkzPOpoint) + \tkz@VecKCoLinear[\tkz@show@size](tkzPOpoint,PO@tmp2,tkzPOpoint) \pgfnodealias{PO@2}{tkzPointResult} \ifdim\tkz@mathLen pt>10 pt\relax \tkz@VecKNorm[1](#4,tkzPOpoint) @@ -237,7 +239,7 @@ translation/.code args={from #1 to #2}{% size/.code = \def\tkz@show@size{#1}, /showtsf/.unknown/.code = {\let\searchname=\pgfkeyscurrentname \pgfkeysalso{\searchname/.try=#1, - /compass/\searchname/.retry=#1, + /tkzcompass/\searchname/.retry=#1, /tikz/\searchname/.retry=#1}} } %<--------------------------------------------------------------------------–> diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-triangles.tex b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-triangles.tex index 0abc2e8166d..5fe6b5d069f 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-triangles.tex +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-triangles.tex @@ -3,9 +3,9 @@ % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-triangles.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-triangles.tex} \makeatletter %<--------------------------------------------------------------------------–> % Triangle Equilateral @@ -95,13 +95,14 @@ pythagore/.code = \def\tkz@numtr{2}, school/.code = \def\tkz@numtr{3}, golden/.code = \def\tkz@numtr{4}, - sublime/.code = \def\tkz@numtr{4}, + sublime/.code = \def\tkz@numtr{4}, euclide/.code = \def\tkz@numtr{5}, gold/.code = \def\tkz@numtr{6}, cheops/.code = \def\tkz@numtr{7}, two angles/.code args = {#1 and #2} { \def\tkz@numtr{8}% - \def\tkz@alpha{#1}% - \def\tkz@beta{#2}} + \def\tkz@alpha{#1}% + \def\tkz@beta{#2}}, + equilateral } \def\tkzDefTriangle{\pgfutil@ifnextchar[{\tkz@DefTriangle}{\tkz@DefTriangle[]}} @@ -247,9 +248,6 @@ %<--------------------------------------------------------------------------– % InCentral %<--------------------------------------------------------------------------– -% The Incentral triangle is the triangle whose vertices are determined by -% theintersections of the reference triangle’s angle bisectors with the -% respective opposite sides. %<--------------------------------------------------------------------------–> \def\@DefIncentralTriangle(#1,#2,#3)(#4,#5){% \def\tkz@tmp{#5}% @@ -302,7 +300,6 @@ \let\tkzExcentralTriangle\tkzDefExcentralTriangle %<--------------------------------------------------------------------------–> % Intouch Triangle -% The contact triangle of a triangle ABC, also called the intouch triangle, is the triangle formed by the points of tangency of the incircle of ABC with ABC. %<--------------------------------------------------------------------------–> \def\@DefIntouchTriangle(#1,#2,#3)(#4,#5){% \def\tkz@tmp{#5}% @@ -328,7 +325,6 @@ \let\tkzDefContactTriangle\tkzDefIntouchTriangle %<--------------------------------------------------------------------------–> % Extouch Triangle -% The extouch triangle T_1T_2T_3 is the triangle formed by the points of tangency of a triangle A_1A_2A_3 with its excircles J_1, J_2, and J_3. %<--------------------------------------------------------------------------–> \def\tkzDefExtouchTriangle{\pgfutil@ifnextchar[{% \tkz@DefExtouchTriangle}{% @@ -349,10 +345,9 @@ \pgfnodealias{\tkz@pttr@name\csname tkz@point2\endcsname}{tkzPointResult} \endgroup } - %<--------------------------------------------------------------------------–> -% Feuerbach triangle The Feuerbach triangle is the triangle formed by the three points of tangency of the nine-point circle with the excircles - +% Feuerbach triangle +%<--------------------------------------------------------------------------–> \def\tkzDefFeuerbachTriangle{\pgfutil@ifnextchar[{% \tkz@DefFeuerbachTriangle}{\tkz@DefFeuerbachTriangle[]}} @@ -402,9 +397,7 @@ \let\tkzDefMedialTriangle\tkzDefCentroidTriangle \let\tkzDefMidpointTriangle\tkzDefCentroidTriangle %<--------------------------------------------------------------------------–> -% OrthicTriangle H Ha Hb Hc -%<--------------------------------------------------------------------------–> -% Orthic Triangle +% Orthic Triangle H Ha Hb Hc %<--------------------------------------------------------------------------–> \def\@DefOrthicTriangle(#1,#2,#3)(#4,#5){% \def\tkz@tmp{#5}% @@ -426,8 +419,8 @@ \let\tkzDefAltitudeTriangle\tkzDefOrthicTriangle %<--------------------------------------------------------------------------–> -% The Euler triangle of a triangle ABC is the triangle E_AE_BE_C whose vertices are the midpoints of the segments joining the orthocenter H with the respective vertices. The vertices of the triangle are known as the Euler points, and lie on the nine-point circle. - +% The Euler triangle +%<--------------------------------------------------------------------------–> \def\tkzDefEulerTriangle{\pgfutil@ifnextchar[{% \tkz@DefEulerTriangle}{\tkz@DefEulerTriangle[]}} \def\tkz@DefEulerTriangle[#1](#2,#3,#4)#5{% @@ -449,7 +442,7 @@ \endgroup } %<--------------------------------------------------------------------------–> -% +% TangentialTriangle %<--------------------------------------------------------------------------–> \def\tkzDefTangentialTriangle{\pgfutil@ifnextchar[{% \tkz@DefTangentialTriangle}{\tkz@DefTangentialTriangle[]}} @@ -478,10 +471,6 @@ %<--------------------------------------------------------------------------– % tkzDefSymmedianLine %<--------------------------------------------------------------------------– -% The Incentral triangle is the triangle whose vertices are determined by -% theintersections of the reference triangle’s angle bisectors with the -% respective opposite sides. -%<--------------------------------------------------------------------------–> \def\@DefSymmedianTriangle(#1,#2,#3)(#4,#5){% \def\tkz@tmp{#5}% \tkz@recuplast(#3) diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-tools-angles.tex b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-tools-angles.tex index 7385417e27a..85595fe4ca8 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-tools-angles.tex +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-tools-angles.tex @@ -1,11 +1,11 @@ % tkz-tools-angles.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-tools-angles.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-angles.tex} \makeatletter %<--------------------------------------------------------------------------–> %<--------------------------------------------------------------------------–> diff --git a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-tools-intersections.tex b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-tools-intersections.tex index 8937f914fa7..7bb8810796e 100644 --- a/Master/texmf-dist/tex/latex/tkz-euclide/tkz-tools-intersections.tex +++ b/Master/texmf-dist/tex/latex/tkz-euclide/tkz-tools-intersections.tex @@ -1,11 +1,11 @@ % tkz-tools-intersections.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-tools-intersections.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-intersections.tex} \makeatletter %<--------------------------------------------------------------------------–> % intersection de deux lignes @@ -234,7 +234,8 @@ \pgfkeys{ /circlecircle/.cd, node/.code = {\global\def\tkz@numcc{0}}, - R/.code = {\global\def\tkz@numcc{1}} + R/.code = {\global\def\tkz@numcc{1}}, +with nodes/.code = {\global\def\tkz@numcc{2}} } %<--------------------------------------------------------------------------–> \def\tkzInterCC{\pgfutil@ifnextchar[{\tkz@InterCC}{\tkz@InterCC[]}} -- cgit v1.2.3