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 | 103 |
1 files changed, 32 insertions, 71 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 5fe6b5d069f..48fa5b973f1 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 @@ -1,11 +1,21 @@ % tkz-obj-eu-triangles.tex -% Copyright 2019 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.02c} -\def\filedate{2020/01/24} -\typeout{2020/01/24 3.02c tkz-obj-eu-triangles.tex} +% Copyright 2020 Alain Matthes +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status “maintained”. +% +% 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-obj-eu-triangles.tex} \makeatletter %<--------------------------------------------------------------------------–> % Triangle Equilateral @@ -36,17 +46,17 @@ \def\tkzDefTwoOne(#1,#2){ \begingroup - \tkzVecKOrth[-.5](#2,#1) + \tkzDefPointWith[K=-.5](#2,#1) \endgroup } \def\tkzDefPythagore(#1,#2){ \begingroup - \tkzVecKOrth[-0.75](#2,#1) + \tkzDefPointWith[K=-.75](#2,#1) \endgroup } \def\tkzDefSchoolTriangle(#1,#2){ \begingroup - \tkzVecKOrth[-1](#2,#1) + \tkzDefPointWith[K=-1](#2,#1) \pgfnodealias{tkz@a}{tkzPointResult} \tkzURotateAngle(#1,30)(#2) \tkzInterLL(#1,tkzPointResult)(#2,tkz@a) @@ -65,13 +75,13 @@ } \def\tkzDefGoldenTriangle(#1,#2){ \begingroup - \tkzVecKOrth[-\tkzInvPhi](#2,#1) + \tkzDefPointWith[K=-\tkzInvPhi](#2,#1) \endgroup } \def\tkzDefCheopsTriangle(#1,#2){ \begingroup -\tkzDefMidPoint(#1,#2) - \tkzVecKOrth[-\tkzSqrtPhi](tkzPointResult,#1) + \tkzDefMidPoint(#1,#2) + \tkzDefPointWith[K=-\tkzSqrtPhi](tkzPointResult,#1) \endgroup } \def\tkzDefTwoAnglesTriangle(#1,#2){ @@ -127,61 +137,11 @@ \or% 7 \tkzDefCheopsTriangle(#2,#3) \or% 8 - \tkzDefTwoAnglesTriangle(#2,#3) \fi + \tkzDefTwoAnglesTriangle(#2,#3) + \fi \endgroup } %<--------------------------------------------------------------------------–> -% Draw Triangles -%<--------------------------------------------------------------------------–> - -\def\tkz@numdtr{0} -\pgfkeys{/drawtriangle/.cd, - equilateral/.code = {\def\tkz@numdtr{0}}, - half/.code = {\def\tkz@numdtr{1}}, - pythagore/.code = {\def\tkz@numdtr{2}}, - school/.code = {\def\tkz@numdtr{3}}, - golden/.code = {\def\tkz@numdtr{4}}, - sublime/.code = {\def\tkz@numdtr{4}}, - euclide/.code = {\def\tkz@numdtr{5}}, - gold/.code = {\def\tkz@numdtr{6}}, - cheops/.code = {\def\tkz@numdtr{7}}, - two angles/.code args = {#1 and #2}{\def\tkz@numdtr{8}% - \def\tkz@alpha{#1}% - \def\tkz@beta{#2}}, - equilateral, - /drawtriangle/.search also={/tikz} -} - -\def\tkzDrawTriangle{\pgfutil@ifnextchar[{\tkz@DrawTriangle}{% - \tkz@DrawTriangle[]}} -\def\tkz@DrawTriangle[#1](#2,#3){% -\begingroup -\pgfkeys{/drawtriangle/.cd,equilateral} -\pgfqkeys{/drawtriangle}{#1} -\ifcase\tkz@numdtr% - \tkzDefEquilateral(#2,#3) -\or% 1 - \tkzDefTwoOne(#2,#3) -\or% 2 - \tkzDefPythagore(#2,#3) -\or% 3 - \tkzDefSchoolTriangle(#2,#3) -\or% 4 - \tkzDefGoldenTriangle(#2,#3) -\or% 5 - \tkzDefEuclideTriangle(#2,#3) -\or% 6 - \tkzDefGoldTriangle(#2,#3) -\or% 7 - \tkzDefCheopsTriangle(#2,#3) -\or% 8 - \tkzDefTwoAnglesTriangle(#2,#3) -\fi - \draw[/drawtriangle/.cd,line style,#1] (#2)--(#3)--(tkzPointResult)--cycle; -\endgroup -} - -%<--------------------------------------------------------------------------–> % les triangles sspécifiques %<--------------------------------------------------------------------------–> @@ -250,16 +210,15 @@ %<--------------------------------------------------------------------------– %<--------------------------------------------------------------------------–> \def\@DefIncentralTriangle(#1,#2,#3)(#4,#5){% - \def\tkz@tmp{#5}% +\def\tkz@tmp{#5}% \tkz@recuplast(#3) \tkzDefBisectorLine(#2,#1,\tkz@last) - \tkzInterLL(#2,\tkz@last)(#1,tkzPointResult) - \pgfnodealias{#4}{tkzPointResult} + \tkzInterLL(#2,\tkz@last)(#1,tkzPointResult) + \pgfnodealias{#4}{tkzPointResult} \ifx\tkz@tmp\tkz@stop\else\@DefIncentralTriangle(#2,#3)(#5)\fi \pgfnodealias{\tkz@pttr@name#4}{#4} } - \def\tkzDefIncentralTriangle{\pgfutil@ifnextchar[{% \tkz@DefIncentralTriangle}{% \tkz@DefIncentralTriangle[]}} @@ -397,12 +356,14 @@ \let\tkzDefMedialTriangle\tkzDefCentroidTriangle \let\tkzDefMidpointTriangle\tkzDefCentroidTriangle %<--------------------------------------------------------------------------–> -% Orthic Triangle H Ha Hb Hc +% Orthic Triangle H Ha Hb Hc modif 3.03 %<--------------------------------------------------------------------------–> \def\@DefOrthicTriangle(#1,#2,#3)(#4,#5){% \def\tkz@tmp{#5}% \tkz@recuplast(#3) - \tkzUProjection(#2,\tkz@last)(#1) + \pgfinterruptboundingbox + \tkzUProjection(#2,\tkz@last)(#1) + \endpgfinterruptboundingbox \pgfnodealias{#4}{tkzPointResult} \ifx\tkz@tmp\tkz@stop\else\@DefOrthicTriangle(#2,#3)(#5)\fi \pgfnodealias{\tkz@pttr@name#4}{#4} |