summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/tkz/tkz-base/latex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-07-16 03:00:55 +0000
committerNorbert Preining <norbert@preining.info>2022-07-16 03:00:55 +0000
commit24ae0c3844b308d81bc4684e57817d43c0b29a13 (patch)
tree91058aa850845b445f48d52794ce128c9b0d419f /macros/latex/contrib/tkz/tkz-base/latex
parent672664411215c14fc71db763da169731d3c6a361 (diff)
CTAN sync 202207160300
Diffstat (limited to 'macros/latex/contrib/tkz/tkz-base/latex')
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-base.cfg217
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-base.sty11
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-marks.tex6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-shape.tex6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-axes.tex16
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-grids.tex6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-marks.tex6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-points.tex158
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-rep.tex6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-BB.tex6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-arith.tex6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-base.tex6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-colors.tex10
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-misc.tex6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-modules.tex6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-print.tex6
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-text.tex8
-rw-r--r--macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-utilities.tex76
18 files changed, 360 insertions, 202 deletions
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.cfg b/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.cfg
index eebdad9e19..4d05fb564a 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.cfg
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.cfg
@@ -1,5 +1,5 @@
% tkz-base.cfg
-% Copyright 2022 Alain Matthes
+% Copyright 2022 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.
@@ -16,10 +16,9 @@
% and save the file in a directory part of your TEXINPUTS environment
% variable.
-\def\fileversion{4.05b}
-\def\filedate{2022/01/28 }
-\typeout{2022/01/28 4.05b tkz-base.cfg}
-%<------ colors ---------------------------------------–>
+\def\fileversion{4.2c}
+\def\filedate{2022/07/14}
+\typeout{2022/07/14 4.2c tkz-base.cfg}
%<------ colors ---------------------------------------–>
\def\tkz@backgroundcolor{white}
\def\tkz@textcolor{black}
@@ -27,35 +26,75 @@
\def\tkz@fillcolor{\tkz@backgroundcolor}
\def\tkz@mainlinecolor{\tkz@textcolor}
\def\tkz@otherlinecolor{\tkz@mainlinecolor!50}
-%<------------------------- Cartesian system -----------------------------–>
-% Default unity cm
-% Geometry Euclidean with unity for x and y = 1cm ---> step = 1
-% 0 ≤ x ≤ 10
-% 0 ≤ y ≤ 10
-\def\tkz@init@xorigine{0}
-\def\tkz@init@yorigine{0}
-\def\tkz@init@xstep{1}
-\def\tkz@init@ystep{1}
-\def\tkz@init@xmin{0}
-\def\tkz@init@ymin{0}
-\def\tkz@init@xmax{10}
-\def\tkz@init@ymax{10}
-\def\tkz@init@xdec{1}
-\def\tkz@init@ydec{1}
%<-------------------------- points -----------------------------------–>
\def\tkz@euc@pointshape{circle}
\def\tkz@euc@pointcolor{\tkz@mainlinecolor}
\def\tkz@euc@labelcolor{\tkz@mainlinecolor}
-\def\tkz@euc@pointsize{3}
+\def\tkz@euc@pointsize{2}
\def\tkz@euc@pointpos{below right}
\def\tkz@euc@segmentcolor{\tkz@mainlinecolor}
\def\tkz@euc@circlecolor{\tkz@mainlinecolor}
+\tikzset{point style/.style = {draw = \tkz@euc@pointcolor,
+ inner sep = 0pt,
+ shape = \tkz@euc@pointshape,
+ minimum size = \tkz@euc@pointsize,
+ fill = \tkz@euc@pointcolor
+ }
+ }
+% label for the point
+\tikzset{label style/.style={ below, \tkz@euc@labelcolor,
+ font = \normalsize}
+ }
+\tikzset{label angle style/.style={ \tkz@euc@labelcolor,
+ font = \normalsize}
+ }
%<-------------------------- line ---------------------------------------–>
\def\tkz@euc@linecolor{\tkz@mainlinecolor}
-\def\tkz@euc@linewidth{0.6pt}
+\def\tkz@euc@linewidth{0.2pt}
\def\tkz@euc@linestyle{solid}
\def\tkz@euc@lineleft{.2}
\def\tkz@euc@lineright{.2}
+\tikzset{%
+line style/.style = {%
+ line width = \tkz@euc@linewidth,
+ color = \tkz@euc@linecolor,
+ style = \tkz@euc@linestyle,
+ add = {\tkz@euc@lineleft} and {\tkz@euc@lineright},
+ line cap = round
+ }
+}
+%<------------------------- circle -----------------------------------–>
+\def\tkz@euc@circlelw{\tkz@euc@linewidth}
+\def\tkz@euc@circlecolor{\tkz@otherlinecolor}
+\def\tkz@euc@circlestyle{solid}
+\tikzset{%
+circle style/.style = {%
+ color = \tkz@euc@circlecolor,
+ line width = \tkz@euc@circlelw,
+ style = \tkz@euc@circlestyle}
+}
+\tikzset{label circle style/.style = {%
+ color = \tkz@mainlinecolor}
+}
+%<------------------------- compass -----------------------------------–>
+\def\tkz@euc@compasscolor{\tkz@otherlinecolor}
+\def\tkz@euc@compasswidth{\tkz@euc@linewidth}
+\def\tkz@euc@compassstyle{solid}
+\tikzset{%
+compass style/.style = {%
+ color = \tkz@euc@compasscolor,
+ line width = \tkz@euc@compasswidth,
+ style = \tkz@euc@compassstyle}
+}
+%<------------------------- arc -----------------------------------–>
+\def\tkz@euc@arclw{\tkz@euc@linewidth}
+\def\tkz@euc@arccolor{\tkz@mainlinecolor}
+\def\tkz@euc@arcstyle{solid}
+\tikzset{%
+arc style/.style={%
+ color = \tkz@euc@arccolor,
+ line width = \tkz@euc@linewidth}
+}
%<------ axes cartesian system ---------------------------------------–>
\def\tkz@init@color{\tkz@textcolor}
\def\tkz@init@lw{0.4 pt}
@@ -87,14 +126,7 @@
\def\tkz@init@gradsize{\textstyle}
\def\tkzRatioLineGrid{0.75}
\def\tkz@gd@sublw{0.4 pt}% size line sub grid
-%<------------------------- compass -----------------------------------–>
-\def\tkz@euc@compasscolor{\tkz@otherlinecolor}
-\def\tkz@euc@compasswidth{0.4pt}
-\def\tkz@euc@compassstyle{solid}
-%<------------------------- arc -----------------------------------–>
-\def\tkz@arc@lw{0.4pt}
-\def\tkz@arc@color{\tkz@mainlinecolor}
-\def\tkz@arc@style{solid}
+
%<---------------------------- mark -----------------------------------–>
\def\tkz@mk@color{\tkz@mainlinecolor}
\def\tkz@mk@mark{*}
@@ -115,40 +147,11 @@
}
\tikzset{yaxe style/.style = {> = latex, ->}
}
-
-\tikzset{point style/.style = {draw = \tkz@euc@pointcolor,
- inner sep = 0pt,
- shape = \tkz@euc@pointshape,
- minimum size = \tkz@euc@pointsize,
- fill = \tkz@euc@pointcolor
- }
- }
-% label for the point
-\tikzset{label style/.style={ \tkz@euc@pointpos,
- \tkz@euc@labelcolor,
- font = \normalsize}
- }
-\tikzset{label angle style/.style={ \tkz@euc@labelcolor,
- font = \normalsize}
- }
-\tikzset{line style/.style = {line width = \tkz@euc@linewidth,
- color = \tkz@euc@linecolor,
- style = \tkz@euc@linestyle,
- add = {\tkz@euc@lineleft} and {\tkz@euc@lineright}%
- }
- }
-\tikzset{label seg style/.style = {color = \tkz@mainlinecolor,
- auto
- }
- }
\tikzset{rep style/.style = { ->,
>=latex}
}
-\tikzset{compass style/.style = {color = \tkz@euc@compasscolor,
- line width = \tkz@euc@compasswidth,
- style = \tkz@euc@compassstyle}
- }
+
\tikzset{mark style/.style = {mark = \tkz@mk@mark,
mark size = \tkz@mk@size,
mark options = {color= \tkz@mk@color,
@@ -156,7 +159,22 @@
}
}
}
-\tikzset{arc style/.style={gray,thin}}
+
+%<------------------------- Cartesian system -----------------------------–>
+% Default unity cm
+% Geometry Euclidean with unity for x and y = 1cm ---> step = 1
+% 0 ≤ x ≤ 10
+% 0 ≤ y ≤ 10
+\def\tkz@init@xorigine{0}
+\def\tkz@init@yorigine{0}
+\def\tkz@init@xstep{1}
+\def\tkz@init@ystep{1}
+\def\tkz@init@xmin{0}
+\def\tkz@init@ymin{0}
+\def\tkz@init@xmax{10}
+\def\tkz@init@ymax{10}
+\def\tkz@init@xdec{1}
+\def\tkz@init@ydec{1}
%<---------------------- show coord -----------------------------------–>
\tikzset{arrow coord style/.style = {dashed,
\tkz@euc@linecolor,
@@ -179,9 +197,80 @@
fill = \tkz@fillcolor,
left = 3pt}
}
-%<--------------------------- vector --------------------------------------–>
-\tikzset{vector style/.style={>=latex,->}
+%
+\tikzset{help lines/.style=teal!30,ultra thin}
+%<--------------------------- arrow --------------------------------------–>
+% Syntax:
+%
+% - tkz arrow=<arrow end tip>`
+% - tkz arrow=<arrow end tip> at <pos> (<pos> = .5 by default)
+% - tkz arrow={<arrow end tip>[<arrow options>] at <pos>}
+%
+%
+% Example usages:
+%
+% \draw[tkz arrow=Stealth] (A) -- (B);
+% \draw[tkz arrow={To[scale=3] at .3}] (A)-- (B);
+% \draw[tkz arrow={Latex[scale=5,blue] at .8}] (A)-- (B);
+
+\tikzset{
+tkz arrow/.default=Latex,
+ tkz arrow/.code=%
+ {%
+ \pgfutil@in@{ at }{#1}%
+ \ifpgfutil@in@
+ \mytikz@parsearrow#1\mytikz@stop
+ \else
+ \mytikz@parsearrow#1 at .5\mytikz@stop
+ \fi
+ }
+}
+\def\mytikz@parsearrow#1 at #2\mytikz@stop{%
+ \pgfutil@in@{[}{#1}%
+ \ifpgfutil@in@
+ \mytikz@parsearrow@opt{#2}#1\mytikz@stop
+ \else
+ \mytikz@parsearrow@opt{#2}#1[]\mytikz@stop
+ \fi
}
+
+% #1 = pos, #2 = arrow end tip, #3 = arrow options
+\def\mytikz@parsearrow@opt#1#2[#3]\mytikz@stop{%
+ \pgfkeysalso{decoration={
+ markings,
+ mark=at position #1 with {\arrow[#3]{#2}}
+ },
+ postaction={decorate}
+ }%
+}
+%<------------------------------------------------------------------------->
+\tikzset{
+ on each path/.style={
+ decorate,
+ decoration={
+ show path construction,
+ moveto code={},
+ lineto code={
+ \path [#1]
+ (\tikzinputsegmentfirst) -- (\tikzinputsegmentlast);
+ },
+ curveto code={
+ \path [#1] (\tikzinputsegmentfirst)
+ .. controls
+ (\tikzinputsegmentsupporta) and (\tikzinputsegmentsupportb)
+ ..
+ (\tikzinputsegmentlast);
+ },
+ closepath code={
+ \path [#1]
+ (\tikzinputsegmentfirst) -- (\tikzinputsegmentlast);
+ }}}}
+ %<--------------------------- arrows --------------------------------------–>
+\tikzset{tkz arrows/.style=%
+{postaction={on each path={tkz arrow={Latex[scale=2,color=black]}}}}}
+%<--------------------------- vector --------------------------------------–>
+\tikzset{vector style/.style={>=Latex,->}}
+%<--------------------------- tkzdotted --------------------------------------–>
\tikzset{tkzdotted/.style={%
dash pattern=on 0.4\pgflinewidth off #1\pgflinewidth,line cap=round, shorten >=#1\pgflinewidth/2,shorten <=#1\pgflinewidth/2,
tkzdotted/.default=8}}
@@ -194,6 +283,7 @@
--(current bounding box.north east) -- (current bounding box.south east)
-- cycle} }}
+
\def\tkzPhi{1.618034}
\def\tkzInvPhi{0.618034}
\def\tkzSqrtPhi{1.27202}
@@ -203,4 +293,5 @@
\def\tkzSqrTwobyTwo{0.7071065}
\def\tkzPi{3.1415926}
\def\tkzEuler{2.71828182}
+
\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.sty b/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.sty
index 0d18c9bc83..0cea394871 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.sty
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.sty
@@ -10,10 +10,10 @@
% This work has the LPPL maintenance status “maintained”.
% The Current Maintainer of this work is Alain Matthes.
-\def\fileversion{4.05 b}
-\typeout{2022/01/28 4.05b tkz-base.sty}
+\def\fileversion{4.2c}
+\typeout{2022/07/14 4.2c tkz-base.sty}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tkz-base}[2022/01/28 4.05b tkz-base]
+\ProvidesPackage{tkz-base}[2022/07/14 4.2c tkz-base]
\@ifpackageloaded{tkz-euclide}{\typeout{tkz-base and tkz-fct must be loaded before tkz-euclide}
\PackageError{tkz-base}{tkz-base must be loaded before tkz-euclide}{tkz-base must be loaded before tkz-euclide}%
\endinput}{}
@@ -22,6 +22,7 @@
angles,
arrows,
arrows.meta,
+ backgrounds,
calc,
decorations,
decorations.markings,
@@ -30,12 +31,12 @@
decorations.text,
decorations.pathmorphing,
intersections,
+ patterns,
plotmarks,
+ positioning,
quotes,
shapes.misc,
- positioning,
shadows,
- patterns,
through
}% remove snake library
% Pour les les labels sur les axes
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-marks.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-marks.tex
index 51f61ecafa..8cb6a366a6 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-marks.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-marks.tex
@@ -10,9 +10,9 @@
% This work has the LPPL maintenance status “maintained”.
% The Current Maintainer of this work is Alain Matthes.
-\def\fileversion{4.05b}
-\def\filedate{2022/01/28 }
-\typeout{2022/01/28 4.05b tkz-lib-marks.tex}
+\def\fileversion{4.2c}
+\def\filedate{2022/07/14}
+\typeout{2022/07/14 4.2c tkz-lib-marks.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% Création des symboles
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-shape.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-shape.tex
index 119457a009..8f45042a1b 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-shape.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-shape.tex
@@ -10,9 +10,9 @@
% This work has the LPPL maintenance status “maintained”.
% The Current Maintainer of this work is Alain Matthes.
-\def\fileversion{4.05b}
-\def\filedate{2022/01/28 }
-\typeout{2022/01/28 4.05b tkz-lib-shape.tex}
+\def\fileversion{4.2c}
+\def\filedate{2022/07/14}
+\typeout{2022/07/14 4.2c tkz-lib-shape.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% Création des symboles
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-axes.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-axes.tex
index 050d8a766f..1baf269bf9 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-axes.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-axes.tex
@@ -10,9 +10,9 @@
% This work has the LPPL maintenance status “maintained”.
% The Current Maintainer of this work is Alain Matthes.
-\def\fileversion{4.05b}
-\def\filedate{2022/01/28 }
-\typeout{2022/01/28 4.05b tkz-obj-axes}
+\def\fileversion{4.2c}
+\def\filedate{2022/07/14}
+\typeout{2022/07/14 4.2c tkz-obj-axes}
\makeatletter
\def\removedot#1.{#1}
@@ -116,11 +116,11 @@ $\numprint{\tkz@result}$
tickwd/.code = \xdef\tkz@sua@tickwd{#1},
ticka/.code = \xdef\tkz@sua@ticka{#1},
tickb/.code = \xdef\tkz@sua@tickb{#1},
- line width = \tkz@init@lw,
- color = \tkz@init@color,
- tickwd = \tkz@init@tickwd,
- ticka = \tkz@init@ticka,
- tickb = \tkz@init@tickb
+ line width = \tkz@init@lw,
+ color = \tkz@init@color,
+ tickwd = \tkz@init@tickwd,
+ ticka = \tkz@init@ticka,
+ tickb = \tkz@init@tickb
}
\def\tkzSetUpAxis{\pgfutil@ifnextchar[{\tkz@SetUpAxis}{\tkz@SetUpAxis[]}}
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-grids.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-grids.tex
index c4b5f381b4..654a29c49c 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-grids.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-grids.tex
@@ -10,9 +10,9 @@
% This work has the LPPL maintenance status “maintained”.
% The Current Maintainer of this work is Alain Matthes.
-\def\fileversion{4.05b}
-\def\filedate{2022/01/28 }
-\typeout{2022/01/28 4.05b tkz-obj-grids.tex}
+\def\fileversion{4.2c}
+\def\filedate{2022/07/14}
+\typeout{2022/07/14 4.2c tkz-obj-grids.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% Setup Grid
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-marks.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-marks.tex
index abe6f77459..6b39328d0d 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-marks.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-marks.tex
@@ -10,9 +10,9 @@
% This work has the LPPL maintenance status “maintained”.
% The Current Maintainer of this work is Alain Matthes.
-\def\fileversion{4.05b}
-\def\filedate{2022/01/28 }
-\typeout{2022/01/28 4.05b tkz-obj-marks.tex}
+\def\fileversion{4.2c}
+\def\filedate{2022/07/14}
+\typeout{2022/07/14 4.2c tkz-obj-marks.tex}
\makeatletter
%<-------------------------------------------------------------------------–>
% Setup Marks
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-points.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-points.tex
index 7645cf523a..21f2987bb9 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-points.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-points.tex
@@ -10,9 +10,9 @@
% This work has the LPPL maintenance status “maintained”.
% The Current Maintainer of this work is Alain Matthes.
-\def\fileversion{4.05b}
-\def\filedate{2022/01/28 }
-\typeout{2022/01/28 4.05b tkz-obj-eu-points.tex}
+\def\fileversion{4.2c}
+\def\filedate{2022/07/14 }
+\typeout{2022/07/14 4.2c tkz-obj-points.tex}
\makeatletter
%<--------------------------------------------------------------------------->
% init def point
@@ -116,56 +116,6 @@
% \tkz@DrawPt{#1}
% }
%<--------------------------------------------------------------------------->
-% tkzSetUpPoint définit la forme d'un point
-%<--------------------------------------------------------------------------->
-\pgfkeys{/tkzsetuppt/.cd,
- size/.store in = \tkz@pt@size,
- color/.store in = \tkz@pt@color,
- fill/.store in = \tkz@pt@fill,
- shape/.store in = \tkz@pt@shape,
- size = \tkz@euc@pointsize,
- color = \tkz@euc@pointcolor,
- fill = \tkz@euc@pointcolor,
- shape = \tkz@euc@pointshape,
- /tkzsetuppt/.search also = {/tikz},
- }
-\def\tkzSetUpPoint{\pgfutil@ifnextchar[{\tkz@SetUpPoint}{%
- \tkz@SetUpPoint[]}}
-\def\tkz@SetUpPoint[#1]{%
-\pgfqkeys{/tkzsetuppt}{#1}
-% redefine point style with new values
-\tikzset{point style/.style={draw = \tkz@pt@color,
- inner sep = 0pt,
- shape = \tkz@pt@shape,
- minimum size = \tkz@pt@size,
- fill = \tkz@pt@fill}}
-}% end setup
-%<--------------------------------------------------------------------------->
-% Draw Point
-%<--------------------------------------------------------------------------->
-\pgfkeys{/tkzdrawpt/.cd,
- size/.code = {\tikzset{point style/.append style={minimum size = #1}}},
- size = \tkz@euc@pointsize,
- /tkzdrawpt/.search also = {/tikz},
-}
-%<--------------------------------------------------------------------------
-\def\tkzDrawPoint{\pgfutil@ifnextchar[{\tkz@DrawPoint}{\tkz@DrawPoint[]}}
-\def\tkz@DrawPoint[#1](#2){%
-\begingroup
- \pgfqkeys{/tkzdrawpt}{#1}
- \node[point style,/tkzdrawpt/.cd,#1] at (#2) {};%2016
-\endgroup
-}
-%<--------------------------------------------------------------------------->
-\def\tkzDrawPoints{\pgfutil@ifnextchar[{\tkz@drawpts}{\tkz@drawpts[]}}
-%<--------------------------------------------------------------------------->
-\def\tkz@drawpts[#1](#2){%
-\begingroup
- \pgfqkeys{/tkzdrawpt}{#1}
- \foreach \point in {#2}{\node[point style,/tkzdrawpt/.cd,#1] at (\point) {};} %2016
-\endgroup
-}
-%<--------------------------------------------------------------------------->
%
%<--------------------------------------------------------------------------->
\def\tkzRenamePoint(#1)#2{\coordinate (#2) at (#1);}
@@ -191,6 +141,32 @@
\coordinate (#3) at (#2);
\end{scope}
}
+%<--------------------------------------------------------------------------->
+% Coordonnées d'un point
+% result in #2x et #2y #1 est le point et on récupère ses coordonnées
+% usage soit A un point \tkzGetPointCoord(A){V} alors \Vx = xA et \Vy = yA
+% en cm
+% tkzGetPointCoord avec [#1] cm ou bien pt ?? todo
+%<--------------------------------------------------------------------------->
+\def\tkzGetPointCoord(#1)#2{%
+\begingroup
+ \pgfextractx{\pgf@x}{\pgfpointanchor{#1}{center}}
+ \pgfmathparse{\pgf@sys@tonumber{\pgf@x}/28.45274}
+ \global\let\tkzresultx\pgfmathresult
+ \global\expandafter\edef\csname #2x\endcsname{\tkzresultx}%
+ \pgfextracty{\pgf@y}{\pgfpointanchor{#1}{center}}
+ \pgfmathparse{\pgf@sys@tonumber{\pgf@y}/28.45274}
+ \global\let\tkzresulty\pgfmathresult
+ \global\expandafter\edef\csname #2y\endcsname{\tkzresulty}
+\endgroup
+}
+\def\tkz@@extractxy#1{%
+\pgfextractx{\pgf@x}{\pgfpointanchor{#1}{center}}
+\pgfextracty{\pgf@y}{\pgfpointanchor{#1}{center}}
+}
+\let\tkzGetPointxy\tkzGetPointCoord
+%<--------------------------------------------------------------------------->
+%%%%%%%%%. Label,draw
%<-------------------------------------------------------------------------->
% tkzLabelPoint Affichage des LABELS pour un point
%<-------------------------------------------------------------------------->
@@ -248,10 +224,60 @@
\begingroup
\pgfqkeys{/tkzautolab}{#1}
\foreach \point in {#2}{
- \path (\tkz@center) -- ($ (\point) + \tkz@dist*($(\point)-(\tkz@center)$) $) node[/tkzautolab/.cd,#1]{$\point$};}
+ \path (\tkz@center) -- ($ (\point) + \tkz@dist*($(\point)-(\tkz@center)$) $) node[/tkzautolab/.cd,label style,#1]{$\point$};}
\endgroup
}%
%<--------------------------------------------------------------------------->
+% tkzSetUpPoint définit la forme d'un point
+%<--------------------------------------------------------------------------->
+\pgfkeys{/tkzsetuppt/.cd,
+ size/.store in = \tkz@pt@size,
+ color/.store in = \tkz@pt@color,
+ fill/.store in = \tkz@pt@fill,
+ shape/.store in = \tkz@pt@shape,
+ size = \tkz@euc@pointsize,
+ color = \tkz@euc@pointcolor,
+ fill = \tkz@euc@pointcolor,
+ shape = \tkz@euc@pointshape,
+ /tkzsetuppt/.search also = {/tikz},
+ }
+\def\tkzSetUpPoint{\pgfutil@ifnextchar[{\tkz@SetUpPoint}{%
+ \tkz@SetUpPoint[]}}
+\def\tkz@SetUpPoint[#1]{%
+\pgfqkeys{/tkzsetuppt}{#1}
+% redefine point style with new values
+\tikzset{point style/.style={draw = \tkz@pt@color,
+ inner sep = 0pt,
+ shape = \tkz@pt@shape,
+ minimum size = \tkz@pt@size,
+ fill = \tkz@pt@fill}}
+}% end setup
+%<--------------------------------------------------------------------------->
+% Draw Point
+%<--------------------------------------------------------------------------->
+\pgfkeys{/tkzdrawpt/.cd,
+ size/.code = {\tikzset{point style/.append style={minimum size = #1}}},
+ size = \tkz@euc@pointsize,
+ /tkzdrawpt/.search also = {/tikz},
+}
+%<--------------------------------------------------------------------------
+\def\tkzDrawPoint{\pgfutil@ifnextchar[{\tkz@DrawPoint}{\tkz@DrawPoint[]}}
+\def\tkz@DrawPoint[#1](#2){%
+\begingroup
+ \pgfqkeys{/tkzdrawpt}{#1}
+ \node[point style,/tkzdrawpt/.cd,#1] at (#2) {};%2016
+\endgroup
+}
+%<--------------------------------------------------------------------------->
+\def\tkzDrawPoints{\pgfutil@ifnextchar[{\tkz@drawpts}{\tkz@drawpts[]}}
+%<--------------------------------------------------------------------------->
+\def\tkz@drawpts[#1](#2){%
+\begingroup
+ \pgfqkeys{/tkzdrawpt}{#1}
+ \foreach \point in {#2}{\node[point style,/tkzdrawpt/.cd,#1] at (\point) {};} %2016
+\endgroup
+}
+%<--------------------------------------------------------------------------->
% PointShowCoord
%<--------------------------------------------------------------------------->
\pgfkeys{/tkzprcoord/.cd,
@@ -295,29 +321,5 @@
\endgroup
}
\let\tkzShowPointCoord\tkzPointShowCoord
-%<--------------------------------------------------------------------------->
-% Coordonnées d'un point
-% result in #2x et #2y #1 est le point et on récupère ses coordonnées
-% usage soit A un point \tkzGetPointCoord(A){V} alors \Vx = xA et \Vy = yA
-% en cm
-% tkzGetPointCoord avec [#1] cm ou bien pt ?? todo
-%<--------------------------------------------------------------------------->
-\def\tkzGetPointCoord(#1)#2{%
-\begingroup
- \pgfextractx{\pgf@x}{\pgfpointanchor{#1}{center}}
- \pgfmathparse{\pgf@sys@tonumber{\pgf@x}/28.45274}
- \global\let\tkzresultx\pgfmathresult
- \global\expandafter\edef\csname #2x\endcsname{\tkzresultx}%
- \pgfextracty{\pgf@y}{\pgfpointanchor{#1}{center}}
- \pgfmathparse{\pgf@sys@tonumber{\pgf@y}/28.45274}
- \global\let\tkzresulty\pgfmathresult
- \global\expandafter\edef\csname #2y\endcsname{\tkzresulty}
-\endgroup
-}
-\def\tkz@@extractxy#1{%
-\pgfextractx{\pgf@x}{\pgfpointanchor{#1}{center}}
-\pgfextracty{\pgf@y}{\pgfpointanchor{#1}{center}}
-}
-\let\tkzGetPointxy\tkzGetPointCoord
\makeatother
\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-rep.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-rep.tex
index fe984ffb62..7ec1e86626 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-rep.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-rep.tex
@@ -10,9 +10,9 @@
% This work has the LPPL maintenance status “maintained”.
% The Current Maintainer of this work is Alain Matthes.
-\def\fileversion{4.05b}
-\def\filedate{2022/01/28}
-\typeout{2022/01/28 4.05b tkz-obj-rep.tex}
+\def\fileversion{4.2c}
+\def\filedate{2022/07/14}
+\typeout{2022/07/14 4.2c tkz-obj-rep.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% repère
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-BB.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-BB.tex
index b09c8b5608..8d2f196f30 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-BB.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-BB.tex
@@ -10,9 +10,9 @@
% This work has the LPPL maintenance status “maintained”.
% The Current Maintainer of this work is Alain Matthes.
-\def\fileversion{4.05b}
-\def\filedate{2022/01/28 }
-\typeout{2022/01/28 4.05b tkz-obj-BB.tex}
+\def\fileversion{4.2c}
+\def\filedate{2022/07/14}
+\typeout{2022/07/14 4.2c tkz-obj-BB.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
\def\tkzShowBB{\pgfutil@ifnextchar[{\tkz@ShowBB}{\tkz@ShowBB[]}}
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-arith.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-arith.tex
index 84d2336613..2a163531a7 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-arith.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-arith.tex
@@ -10,9 +10,9 @@
% This work has the LPPL maintenance status “maintained”.
% The Current Maintainer of this work is Alain Matthes.
-\def\fileversion{4.05b}
-\def\filedate{2022/01/28 }
-\typeout{2022/01/28 4.05b tkz-tools-arith.tex}
+\def\fileversion{4.2c}
+\def\filedate{2022/07/14}
+\typeout{2022/07/14 4.2c tkz-tools-arith.tex}
% 1.161 test if "isfactor" is already defined
% now with pgf 3.0 gcd isprime isodd iseven are defined
%<--------------------------------------------------------------------------–>
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-base.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-base.tex
index 207df8e92e..85955e1461 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-base.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-base.tex
@@ -10,9 +10,9 @@
% This work has the LPPL maintenance status “maintained”.
% The Current Maintainer of this work is Alain Matthes.
-\def\fileversion{4.05b}
-\def\filedate{2022/01/28 }
-\typeout{2022/01/28 4.05b tkz-tools-base.tex}
+\def\fileversion{4.2c}
+\def\filedate{2022/07/14}
+\typeout{2022/07/14 4.2c tkz-tools-base.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
\global\let\tkz@tmp@xa\tkz@init@xmin% modif 2016
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-colors.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-colors.tex
index d24a49add8..9beab795b0 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-colors.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-colors.tex
@@ -10,9 +10,9 @@
% This work has the LPPL maintenance status “maintained”.
% The Current Maintainer of this work is Alain Matthes.
-\def\fileversion{4.05b}
-\def\filedate{2022/01/28 }
-\typeout{2022/01/28 4.05b tkz-tools-colors}
+\def\fileversion{4.2c}
+\def\filedate{2022/07/14}
+\typeout{2022/07/14 4.2c tkz-tools-colors}
\makeatletter
%<------ Initialisation of the colors with tkzSetUpColors ----------------->
@@ -36,8 +36,8 @@
\pgfkeys{/tkzsupallcol/.cd,
background/.store in = \tkz@suac@bkc,
text/.store in = \tkz@suac@txt,
- background = \tkz@backgroundcolor,% see tkz-base.cfg
- text = \tkz@textcolor% idem
+ background = \tkz@backgroundcolor,% see tkz-base.cfg
+ text = \tkz@textcolor% idem
}
\def\tkzSetUpAllColors{\pgfutil@ifnextchar[{\tkz@SetUpAllColors}{%
\tkz@SetUpAllColors[]}}
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-misc.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-misc.tex
index 580dabf51f..83ae7c231c 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-misc.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-misc.tex
@@ -10,9 +10,9 @@
% This work has the LPPL maintenance status “maintained”.
% The Current Maintainer of this work is Alain Matthes.
-\def\fileversion{4.05b}
-\def\filedate{2022/01/28 }
-\typeout{2022/01/28 4.05b tkz-tools-misc.tex}
+\def\fileversion{4.2c}
+\def\filedate{2022/07/14}
+\typeout{2022/07/14 4.2c tkz-tools-misc.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% hline pb avec line
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-modules.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-modules.tex
index a6467a428d..f662f8bfbe 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-modules.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-modules.tex
@@ -10,9 +10,9 @@
% This work has the LPPL maintenance status “maintained”.
% The Current Maintainer of this work is Alain Matthes.
-\def\fileversion{4.05b}
-\def\filedate{2022/01/28 }
-\typeout{2022/01/28 4.05b tkz-tools-modules.tex}
+\def\fileversion{4.2c}
+\def\filedate{2022/07/14}
+\typeout{2022/07/14 4.2c tkz-tools-modules.tex}
\makeatletter
%<------------- % chargement des modules ---------------------------------->
\def\tkz@obj@all{angles,arcs,compass,defcircles,deflines,defpoints,defpointsby,defpointsrnd,defpointswith,polygons,protractor,sectors,show,triangles}%
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-print.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-print.tex
index a727e2fb39..9776e57679 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-print.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-print.tex
@@ -10,9 +10,9 @@
% This work has the LPPL maintenance status “maintained”.
% The Current Maintainer of this work is Alain Matthes.
-\def\fileversion{4.05b}
-\def\filedate{2022/01/28 }
-\typeout{2022/01/28 4.05b tkz-tools-print}
+\def\fileversion{4.2c}
+\def\filedate{2022/07/14}
+\typeout{2022/07/14 4.2c tkz-tools-print}
\makeatletter
%<------------- tkzPrintFrac ---------------------------------->
\def\tkzPrintFrac#1#2{%
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-text.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-text.tex
index 819505a99c..5c1f7fb8af 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-text.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-text.tex
@@ -10,9 +10,9 @@
% This work has the LPPL maintenance status “maintained”.
% The Current Maintainer of this work is Alain Matthes.
-\def\fileversion{4.05b}
-\def\filedate{2022/01/28 }
-\typeout{2022/01/28 4.05b tkz-tools-text.tex}
+\def\fileversion{4.2c}
+\def\filedate{2022/07/14}
+\typeout{2022/07/14 4.2c tkz-tools-text.tex}
\makeatletter
%<--------------------------------------------------------------------------–>
% tkzText
@@ -50,7 +50,7 @@
\pgfkeys{/tkzlegend/.cd,
line/.is if = tkz@legend@line,
line/.default = true,
- line = false,
+ line = false,
/tkzlegend/.search also = {/tikz},
}
\def\tkzLegend{\pgfutil@ifnextchar[{\tkz@Legend}{\tkz@Legend[]}}
diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-utilities.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-utilities.tex
index c304cee394..f132d6053a 100644
--- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-utilities.tex
+++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-utilities.tex
@@ -1,5 +1,5 @@
-% tkz-tools-utilities
-% Copyright 2022 Alain Matthes
+% tkz-tools-eu-utilities
+% Copyright 2022 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.
@@ -10,9 +10,9 @@
% This work has the LPPL maintenance status “maintained”.
% The Current Maintainer of this work is Alain Matthes.
-\def\fileversion{4.05b}
-\def\filedate{2022/01/28 }
-\typeout{2022/01/28 4.05b tkz-tools-utilities.tex}
+\def\fileversion{4.2c}
+\def\filedate{2022/07/14}
+\typeout{2022/07/14 4.2c tkz-tools-utilities.tex}
\makeatletter
\pgfkeys{/tkzClip/.cd,
space/.store in = {\tkz@CLI@space},
@@ -29,7 +29,7 @@ space = {}}
\edef\tkz@yya{\fpeval{\tkz@ya-\tkz@CLI@space}}
\edef\tkz@xxb{\fpeval{\tkz@xb+\tkz@CLI@space}} % correction bug 2020
\edef\tkz@yyb{\fpeval{\tkz@yb+\tkz@CLI@space}}
- \clip (\tkz@xxa,\tkz@yya) rectangle (\tkz@xxb,\tkz@yyb);
+ \clip (\tkz@xxa,\tkz@yya) rectangle (\tkz@xxb,\tkz@yyb);
\fi
}
@@ -168,5 +168,69 @@ space = {}}
}
\def\EnabledNumprint{\let\numprint\tkz@numprint}
%<---------------------------------------------------------–>
+\def\tkzSwapPoints(#1,#2){
+ \pgfnodealias{tkzPointTmp}{#2}
+ \pgfnodealias{#2}{#1}
+ \pgfnodealias{#1}{tkzPointTmp}}
+%<---------------------------------------------------------–>
+\def\tkzPermute(#1,#2,#3){
+\tkzURotateWithNodes(#1,#3,#2)(#3) \tkzGetPoint{tkzpt}
+\tkzURotateWithNodes(#1,#2,#3)(#2) \tkzGetPoint{#2}
+\tkzSwapPoints(tkzpt,#3)}
+%<---------------------------------------------------------–>
+\def\tkzDotProduct(#1,#2,#3){%
+\begingroup
+\pgfextractx{\pgf@x}{\pgfpointanchor{#1}{center}}%
+\pgfextracty{\pgf@y}{\pgfpointanchor{#1}{center}}%
+\tkz@ax\pgf@x%
+\tkz@ay\pgf@y%
+\pgfextractx{\pgf@x}{\pgfpointanchor{#2}{center}}%
+\pgfextracty{\pgf@y}{\pgfpointanchor{#2}{center}}
+\tkz@bx\pgf@x%
+\tkz@by\pgf@y%
+\pgfextractx{\pgf@x}{\pgfpointanchor{#3}{center}}%
+\pgfextracty{\pgf@y}{\pgfpointanchor{#3}{center}}%
+\tkz@cx\pgf@x%
+\tkz@cy\pgf@y%
+\edef\tkz@dotprod{\fpeval{round(((\tkz@bx-\tkz@ax)*(\tkz@cx-\tkz@ax)+(\tkz@by-\tkz@ay)*(\tkz@cy-\tkz@ay))/(809.55841),5)}}
+\global\let\tkzMathResult\tkz@dotprod
+\endgroup}
+%<---------------------------------------------------------–>
+ \def\tkzGetResult#1{%
+ \global\expandafter\edef\csname #1\endcsname{\tkzMathResult}}
+%<---------------------------------------------------------–>
+% #1,#2 and #3 aligned
+\def\tkzIsLinear(#1,#2,#3){%
+\begingroup
+\tkz@@CalcLengthcm(#1,#2){tkz@la}
+\tkz@@CalcLengthcm(#1,#3){tkz@lb}
+\tkzDotProduct(#1,#2,#3)
+\edef\tkzMathResult{\fpeval{abs(abs(\tkzMathResult)-(\tkz@la)*(\tkz@lb))}}
+\ifdim \tkzMathResult pt < 0.0001 pt\relax%
+\global\tkzLineartrue
+\else
+\global\tkzLinearfalse
+\fi
+\endgroup
+}
+%<---------------------------------------------------------–>
+% syntax : vec(#2,#1) ortho vec(#3,#1)
+\def\tkzIsOrtho(#1,#2,#3){%
+\begingroup
+\tkzDotProduct(#1,#2,#3)
+\edef\tkzMathResult{\fpeval{abs(\tkzMathResult)}}
+\ifdim \tkzMathResult pt < 0.0001 pt\relax%
+\global\tkzOrthotrue
+\else
+\global\tkzOrthofalse
+\fi
+\endgroup
+}
+%<---------------------------------------------------------–>
+ \def\tkzHelpGrid{%
+ \draw[help lines] (current bounding box.south west) grid
+ (current bounding box.north east);
+ }
+
\makeatother
\endinput \ No newline at end of file