diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-triangles.tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/tkz-euclide/tkz-obj-eu-triangles.tex | 59 |
1 files changed, 39 insertions, 20 deletions
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 f60491ac38a..4ab0ae915ed 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 @@ -10,10 +10,11 @@ % This work has the LPPL maintenance status “maintained”. % The Current Maintainer of this work is Alain Matthes. -\def\fileversion{4.00} -\def\filedate{2022/01/04} -\typeout{2022/01/04 4.00 tkz-obj-eu-triangles.tex} +\def\fileversion{4.03} +\def\filedate{2022/01/19} +\typeout{2022/01/19 4.03 tkz-obj-eu-triangles.tex} \makeatletter +\newif\iftkz@swap@tr %<--------------------------------------------------------------------------–> % Triangle Equilateral %<--------------------------------------------------------------------------–> @@ -35,18 +36,6 @@ } %<--------------------------------------------------------------------------–> -\def\tkzDrawEquilateral{\pgfutil@ifnextchar[{\tkz@Equilateral}{% - \tkz@Equilateral[]}} - -\def\tkz@Equilateral[#1](#2,#3){% -\begingroup - \tkzURotateAngle(#2,60)(#3) - \tkzDrawPolygon[#1](#2,#3,tkzPointResult) -\endgroup -} - -%<--------------------------------------------------------------------------–> - \def\tkzDefIsoscelesRightTriangle{\pgfutil@ifnextchar[{\tkz@DefIsoscelesRightTriangle}{% \tkz@DefIsoscelesRightTriangle[]}} @@ -65,25 +54,45 @@ \def\tkzDefTwoOne(#1,#2){ \begingroup - \tkzDefPointWith[K=-.5](#2,#1) + \iftkz@swap@tr + \tkzDefPointWith[K=-.5](#2,#1) + \else + \tkzDefPointWith[K=.5](#2,#1) + \fi \endgroup } \def\tkzDefPythagore(#1,#2){ \begingroup +\iftkz@swap@tr \tkzDefPointWith[K=-.75](#2,#1) + \else + \tkzDefPointWith[K=.75](#2,#1) + \fi \endgroup } \def\tkzDefSchoolTriangle(#1,#2){ \begingroup - \tkzDefPointWith[K=-1](#2,#1) +\iftkz@swap@tr + \tkzDefPointWith(#2,#1) + \pgfnodealias{tkz@a}{tkzPointResult} + \tkzURotateAngle(#1,-30)(#2) + \tkzInterLL(#1,tkzPointResult)(#2,tkz@a) +\else + \tkzDefPointWith(#2,#1) \pgfnodealias{tkz@a}{tkzPointResult} \tkzURotateAngle(#1,30)(#2) \tkzInterLL(#1,tkzPointResult)(#2,tkz@a) + \fi \endgroup } \def\tkzDefGoldTriangle(#1,#2){ \begingroup + + \iftkz@swap@tr \tkzURotateAngle(#1,36)(#2) + \else + \tkzURotateAngle(#1,-36)(#2) + \fi \endgroup } \def\tkzDefEuclideTriangle(#1,#2){ @@ -94,7 +103,11 @@ } \def\tkzDefGoldenTriangle(#1,#2){ \begingroup + \iftkz@swap@tr \tkzDefPointWith[K=-\tkzInvPhi](#2,#1) + \else + \tkzDefPointWith[K=\tkzInvPhi](#2,#1) + \fi \endgroup } \def\tkzDefCheopsTriangle(#1,#2){ @@ -121,17 +134,24 @@ /deftriangle/.cd, equilateral/.code = \def\tkz@numtr{0}, half/.code = \def\tkz@numtr{1}, + two one/.code = \def\tkz@numtr{1}, pythagore/.code = \def\tkz@numtr{2}, + pythagoras/.code = \def\tkz@numtr{2}, + egyptian/.code = \def\tkz@numtr{2}, school/.code = \def\tkz@numtr{3}, golden/.code = \def\tkz@numtr{4}, sublime/.code = \def\tkz@numtr{4}, euclid/.code = \def\tkz@numtr{5}, + 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}}, isosceles right/.code = \def\tkz@numtr{9}, + swap/.is if = tkz@swap@tr, + swap/.default = true, + swap = false, equilateral } @@ -217,7 +237,6 @@ \fi \endgroup } - \pgfkeys{/setuppttr/.is family} \def\SetUpPTTR#1{\pgfqkeys{/setuppttr}{#1}} @@ -343,9 +362,9 @@ \tkzDefExCircle(#4,#2,#3) \pgfnodealias{tkz@a}{tkzPointResult} \tkzGetLength{tkz@ra} \tkzInterLC[R](#3,tkz@b)(tkz@b,\tkz@rb) - \tkzGetFirstPoint{\tkz@pttr@name\csname tkz@point2\endcsname} + \tkzGetSecondPoint{\tkz@pttr@name\csname tkz@point2\endcsname} \tkzInterLC[R](#4,tkz@c)(tkz@c,\tkz@rc) - \tkzGetFirstPoint{\tkz@pttr@name\csname tkz@point3\endcsname} + \tkzGetSecondPoint{\tkz@pttr@name\csname tkz@point3\endcsname} \tkzInterLC[R](#2,tkz@a)(tkz@a,\tkz@ra) \tkzGetFirstPoint{\tkz@pttr@name\csname tkz@point1\endcsname} \endgroup |