diff options
author | Karl Berry <karl@freefriends.org> | 2020-02-06 20:45:02 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-02-06 20:45:02 +0000 |
commit | af1d24be8bad221544f5bec7af3deafd1cbfe494 (patch) | |
tree | 2b268bf4825cafeb7432ac8d383e37ebbe5f6409 /Master/texmf-dist/tex/latex | |
parent | 61692d2325979f9ab8c544ab5ad1d42fd755df70 (diff) |
tkz-base (6feb20)
git-svn-id: svn://tug.org/texlive/trunk@53695 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
17 files changed, 156 insertions, 139 deletions
diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-base.cfg b/Master/texmf-dist/tex/latex/tkz-base/tkz-base.cfg index 743c14da90b..b3a5fd95472 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-base.cfg +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-base.cfg @@ -1,5 +1,5 @@ % tkz-base.cfg -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % % This file may be distributed and/or modified % @@ -10,9 +10,9 @@ % and save the file in a directory part of your TEXINPUTS environment % variable. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-base.cfg} +\def\fileversion{3.02c} +\def\filedate{2020/02/04} +\typeout{2020/02/04 3.02c tkz-base.cfg} %<------ colors ---------------------------------------–> \def\tkz@backgroundcolor{white} \def\tkz@textcolor{black} @@ -166,4 +166,7 @@ %<--------------------------- vector --------------------------------------–> \tikzset{vector style/.style={>=latex,->} } +\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=2}} \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-base.sty b/Master/texmf-dist/tex/latex/tkz-base/tkz-base.sty index 8c39f0dcd7f..e52f3076ee1 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-base.sty +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-base.sty @@ -1,5 +1,5 @@ % tkz-base.sty % this file -% Copyright 2011 by Alain Matthes +% Copyright 2020\"\" by Alain Matthes % % This file may be distributed and/or modified % @@ -11,9 +11,9 @@ %<--------------------------------------------------------------------------–> % Objet : Outils pour la création de graphiques géométriques %<--------------------------------------------------------------------------–> -\typeout{2020/01/23 3.01c tkz-base.sty} +\typeout{2020/01/24 3.02c tkz-base.sty} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tkz-base}[2020/01/23 3.01c tkz-base] +\ProvidesPackage{tkz-base}[2020/01/24 3.02c tkz-base] \ifx\e@alloc\@undefined \RequirePackage{etex} \fi @@ -26,13 +26,18 @@ calc, decorations, decorations.markings, - decorations.pathreplacing, + decorations.pathreplacing, + decorations.shapes, + decorations.text, + decorations.pathmorphing, intersections, patterns, plotmarks, positioning, quotes, + shadows, shapes.misc, + snakes, through } % Pour les les labels sur les axes diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-marks.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-marks.tex index 0579d1ad254..0c62abe0cf2 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-marks.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-marks.tex @@ -1,13 +1,13 @@ % tkz-lib-marks.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-lib-symbols.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-lib-symbols.tex} \makeatletter %<--------------------------------------------------------------------------–> % Création des symboles @@ -54,7 +54,16 @@ \pgfpathlineto{\pgfqpoint{1\pgfplotmarksize}{\pgfplotmarksize}} \pgfusepathqstroke } - +\pgfdeclareplotmark{s|||} +{% + \pgfpathmoveto{\pgfqpoint{-0.75\pgfplotmarksize}{-\pgfplotmarksize}} + \pgfpathlineto{\pgfqpoint{0.25\pgfplotmarksize}{\pgfplotmarksize}} + \pgfpathmoveto{\pgfqpoint{0\pgfplotmarksize}{-\pgfplotmarksize}} + \pgfpathlineto{\pgfqpoint{1\pgfplotmarksize}{\pgfplotmarksize}} + \pgfpathmoveto{\pgfqpoint{0.75\pgfplotmarksize}{-\pgfplotmarksize}} + \pgfpathlineto{\pgfqpoint{1.75\pgfplotmarksize}{\pgfplotmarksize}} + \pgfusepathqstroke +} % z \pgfdeclareplotmark{z} {% diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axes.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axes.tex index ce1ce98fdcb..ebfd985c1f8 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axes.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axes.tex @@ -1,12 +1,12 @@ % tkz-obj-axes.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. % utf8 encoding -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-axes.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-axes.tex} \newif\ifinteger \makeatletter \def\removedot#1.{#1} diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-grids.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-grids.tex index f2bd6a5ffcd..46892db8e2d 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-grids.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-grids.tex @@ -1,27 +1,27 @@ % tkz-obj-grids.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. % utf8 encoding -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-grids.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-grids.tex} \makeatletter %<--------------------------------------------------------------------------–> % Setup Grid %<--------------------------------------------------------------------------–> -\pgfkeys{/@tkzsugrid/.cd, - line width/.store in = \tkz@sug@lw, - color/.store in = \tkz@sug@color, - line width = \tkz@grid@lw, - color = \tkz@grid@color +\pgfkeys{/tkzsugrid/.cd, + line width/.store in = \tkz@sug@lw, + color/.store in = \tkz@sug@color, + line width = \tkz@grid@lw, + color = \tkz@grid@color } \def\tkzSetUpGrid{\pgfutil@ifnextchar[{\tkz@SetUpGrid}{\tkz@SetUpGrid[]}} \def\tkz@SetUpGrid[#1]{% \begingroup -\pgfqkeys{/@tkzsugrid}{#1} +\pgfqkeys{/tkzsugrid}{#1} \global\let\tkz@grid@lw\tkz@sug@lw \global\let\tkz@grid@color\tkz@sug@color \endgroup @@ -29,10 +29,10 @@ %<--------------------------------------------------------------------------–> % tkzGrid %<--------------------------------------------------------------------------–> -\pgfkeys{/@tkzGrid/.cd, +\pgfkeys{/tkzGrid/.cd, color/.code = {\def\tkz@gd@color{#1}% \edef\tkz@gd@subcolor{% - \tkz@gd@color!\tkzCoeffSubColor}}, + \tkz@gd@color!\tkzCoeffSubColor}}, subxstep/.store in = {\tkz@gd@subxstep}, subystep/.store in = {\tkz@gd@subystep}, ratio/.store in = {\tkz@gd@ratio}, @@ -40,20 +40,20 @@ \edef\tkz@gd@sublw{\tkz@gd@ratio\tkz@gd@lw}}, sub/.is if = tkz@gd@sub, sub/.default = true , - sub = false, - color = \tkz@grid@color, - ratio = 0.75, - subxstep = \tkz@grid@xstep, - subystep = \tkz@grid@ystep, - line width = \tkz@grid@lw, - /@tkzGrid/.search also = {/tikz}, + sub = false, + color = \tkz@grid@color, + ratio = 0.75, + subxstep = \tkz@grid@xstep, + subystep = \tkz@grid@ystep, + line width = \tkz@grid@lw, + /tkzGrid/.search also= {/tikz}, } %<--------------------------------------------------------------------------–> \def\tkzGrid{\pgfutil@ifnextchar[{\tkz@Grid}{\tkz@Grid[]}} \def\tkz@Grid[#1]{\@ifnextchar({\tkz@@Grid[#1]}% {\tkz@@Grid[#1](\tkz@tmp@xa,\tkz@tmp@ya)(\tkz@tmp@xb,\tkz@tmp@yb)}} \def\tkz@@Grid[#1](#2,#3)(#4,#5){% - \pgfqkeys{/@tkzGrid}{#1} + \pgfqkeys{/tkzGrid}{#1} \begingroup \edef\tkz@gxa{\fpeval{(#2-\tkz@init@xorigine)/\tkz@init@xstep}} \edef\tkz@gxb{\fpeval{(#4-\tkz@init@xorigine)/\tkz@init@xstep}} diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-marks.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-marks.tex index 3eec108b22c..44d97388c0d 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-marks.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-marks.tex @@ -1,13 +1,13 @@ %tkz-obj-marks.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-marks.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-marks.tex} \makeatletter %<-------------------------------------------------------------------------–> % Setup Marks @@ -39,9 +39,9 @@ }% %<-------------------------------------------------------------------------–> \pgfkeys{/tkzjoinmk/.cd, - prefix/.store in = \tkz@pref, - prefix=tkzPt, - /tkzjoinmk/.search also={/tikz} + prefix/.store in = \tkz@pref, + prefix=tkzPt, + /tkzjoinmk/.search also={/tikz} } \def\tkzJoinSetOfPoints{\pgfutil@ifnextchar[{\tkz@JoinSetOfPoints}{% \tkz@JoinSetOfPoints[]}} @@ -94,10 +94,10 @@ color/.store in = \tkz@sum@mk@color, fill/.store in = \tkz@sum@mk@fill, mark/.store in = \tkz@sum@mk@mark, - mark = \tkz@mk@mark, - color = \tkz@mk@color, - fill = \tkz@mk@color!50, - size = \tkz@mk@size + mark = \tkz@mk@mark, + color = \tkz@mk@color, + fill = \tkz@mk@color!50, + size = \tkz@mk@size } \def\tkzSetUpMark{\pgfutil@ifnextchar[{\tkzActivOff\tkz@SetUpMark}{% \tkzActivOff\tkz@SetUpMark[]}} diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-points.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-points.tex index 39f2c391cc6..5676d60a6b4 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-points.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-points.tex @@ -1,13 +1,13 @@ % tkz-obj-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-points.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-points.tex} %<--------------------------------------------------------------------------–> % init def point %<--------------------------------------------------------------------------–> @@ -80,7 +80,7 @@ %<--------------------------------------------------------------------------–> % options pour point definition %<--------------------------------------------------------------------------–> -\pgfkeys{/@tkzpt/.cd, +\pgfkeys{/tkzPt/.cd, polar/.is if = tkz@pt@polar, polar/.default = true, polar = false @@ -89,8 +89,8 @@ % tkz@ptStar %<--------------------------------------------------------------------------–> \def\tkz@ptStar[#1](#2,#3)#{% -\pgfkeys{/@tkzpt/.cd, polar = false} -\pgfqkeys{/@tkzpt}{#1} +\pgfkeys{/tkzPt/.cd, polar = false} +\pgfqkeys{/tkzPt}{#1} \iftkz@pt@polar% \edef\tkz@x{\fpeval{#3*cosd(#2)}} \edef\tkz@y{\fpeval{#3*sind(#2)}} @@ -146,21 +146,21 @@ %<--------------------------------------------------------------------------–> % tkzSetUpPoint définit la forme d'un point %<--------------------------------------------------------------------------–> -\pgfkeys{/@setuppt/.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, - /@setuppt/.search also = {/tikz}, - } -\def\tkzSetUpPoint{\pgfutil@ifnextchar[{\tkzActivOff\tkz@SetUpPoint}{% - \tkzActivOff\tkz@SetUpPoint[]}} +\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{/@setuppt}{#1} +\pgfqkeys{/tkzsetuppt}{#1} % redefine point style with new values \tikzset{point style/.style={draw = \tkz@pt@color, inner sep = 0pt, @@ -173,17 +173,17 @@ %<--------------------------------------------------------------------------–> % Draw Point %<--------------------------------------------------------------------------–> -\pgfkeys{/@drawpoint/.cd, +\pgfkeys{/tkzdrawpt/.cd, size/.code = {\tikzset{point style/.append style={minimum size = #1}}}, size = \tkz@euc@pointsize, - /@drawpoint/.search also = {/tikz}, + /tkzdrawpt/.search also = {/tikz}, } %<-------------------------------------------------------------------------- \def\tkzDrawPoint{\pgfutil@ifnextchar[{\tkz@DrawPoint}{\tkz@DrawPoint[]}} \def\tkz@DrawPoint[#1](#2){% \begingroup - \pgfqkeys{/@drawpoint}{#1} - \node[point style,/@drawpoint/.cd,#1] at (#2) {};%2016 + \pgfqkeys{/tkzdrawpt}{#1} + \node[point style,/tkzdrawpt/.cd,#1] at (#2) {};%2016 \endgroup } %<--------------------------------------------------------------------------–> @@ -191,8 +191,8 @@ %<--------------------------------------------------------------------------–> \def\tkz@drawpts[#1](#2){% \begingroup - \pgfqkeys{/@drawpoint}{#1} - \foreach \point in {#2}{\node[point style,/@drawpoint/.cd,#1] at (\point) {};} %2016 + \pgfqkeys{/tkzdrawpt}{#1} + \foreach \point in {#2}{\node[point style,/tkzdrawpt/.cd,#1] at (\point) {};} %2016 \endgroup } %<--------------------------------------------------------------------------–> @@ -240,25 +240,25 @@ %<--------------------------------------------------------------------------–> %<--------------------------------------------------------------------------–> -\pgfkeys{/@tkzautolab/.cd, +\pgfkeys{/tkzautolab/.cd, center/.store in = \tkz@center, dist/.store in = \tkz@dist, dist = 0.15, - /@tkzautolab/.search also = {/tikz}, + /tkzautolab/.search also = {/tikz}, } \def\tkzAutoLabelPoints{\pgfutil@ifnextchar[{\tkz@AutoLabelPoints}{% \tkz@AutoLabelPoints[]}}% \def\tkz@AutoLabelPoints[#1](#2){% \begingroup -\pgfqkeys{/@tkzautolab}{#1} +\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,#1]{$\point$};} \endgroup }% %<--------------------------------------------------------------------------–> % PointShowCoord %<--------------------------------------------------------------------------–> -\pgfkeys{/@tkzprcoord/.cd, +\pgfkeys{/tkzprcoord/.cd, xlabel/.store in = \tkz@xlabel, ylabel/.store in = \tkz@ylabel, xstyle/.code = {\tikzset{xcoord style/.append style={#1}}}, @@ -273,19 +273,19 @@ ystyle = {}, noxdraw = false, noydraw = false, - /@tkzprcoord/.search also = {/tikz}, + /tkzprcoord/.search also = {/tikz}, } \def\tkzPointShowCoord{\pgfutil@ifnextchar[{\tkz@PointShowCoord}{\tkz@PointShowCoord[]}} \def\tkz@PointShowCoord[#1](#2){% \begingroup -\pgfqkeys{/@tkzprcoord}{#1} +\pgfqkeys{/tkzprcoord}{#1} % 2019 for showcoord \iftkznodedefined{tkz@xline}{}{% \path (0,0) --(1,0) node(tkz@xline){}; \path (0,0) --(0,1) node(tkz@yline){}; } -\iftkz@coord@noxdraw\else\draw[arrow coord style,/@tkzprcoord/.cd,#1] (#2)--(#2 |- tkz@xline);\fi -\iftkz@coord@noydraw\else\draw[arrow coord style,/@tkzprcoord/.cd,#1] (#2)--(#2 -| tkz@yline);\fi +\iftkz@coord@noxdraw\else\draw[arrow coord style,/tkzprcoord/.cd,#1] (#2)--(#2 |- tkz@xline);\fi +\iftkz@coord@noydraw\else\draw[arrow coord style,/tkzprcoord/.cd,#1] (#2)--(#2 -| tkz@yline);\fi \ifx\tkzutil@empty\tkz@xlabel \else \path (#2)--(#2 |- tkz@xline) @@ -298,6 +298,7 @@ \fi \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 @@ -322,6 +323,5 @@ \pgfextracty{\pgf@y}{\pgfpointanchor{#1}{center}} } \let\tkzGetPointxy\tkzGetPointCoord -%<--------------------------------------------------------------------------–> \makeatother \endinput diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-rep.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-rep.tex index d66e9fc8954..2406dc791f4 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-rep.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-rep.tex @@ -1,18 +1,18 @@ % tkz-obj-rep.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-rep.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-rep.tex} \makeatletter %<--------------------------------------------------------------------------–> % repère %<--------------------------------------------------------------------------–> -\pgfkeys{/@tkzRep/.cd, +\pgfkeys{/tkzRep/.cd, line width/.store in = \tkz@Rep@lw, xlabel/.store in = \tkz@Rep@xlabel, ylabel/.store in = \tkz@Rep@ylabel, @@ -31,13 +31,13 @@ ynorm = 1, color = \tkz@sur@color,% remove ? colorlabel = \tkz@sur@colorlabel, - /@tkzRep/.search also={/tikz}, + /tkzRep/.search also={/tikz}, } %<--------------------------------------------------------------------------–> \def\tkzRep{\pgfutil@ifnextchar[{\tkz@Rep}{% \tkz@Rep[]}} \def\tkz@Rep[#1]{% -\pgfqkeys{/@tkzRep}{#1} +\pgfqkeys{/tkzRep}{#1} \begingroup \protected@edef\tkz@temp{% \noexpand\draw [ line width=\tkz@Rep@lw, diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-BB.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-BB.tex index 81b1bd4ed5f..f9e58d75f0c 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-BB.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-BB.tex @@ -1,21 +1,21 @@ % tkz-tools-BB.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-BB.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-BB.tex} \makeatletter %<--------------------------------------------------------------------------–> -\pgfkeys{/@tkzClip/.cd, +\pgfkeys{/tkzClip/.cd, space/.store in = {\tkz@CLI@space}, space = {}} \def\tkzClip{\pgfutil@ifnextchar[{\tkz@Clip}{\tkz@Clip[]}} \def\tkz@Clip[#1]{% -\pgfqkeys{/@tkzClip}{#1} +\pgfqkeys{/tkzClip}{#1} \ifx\tkzutil@empty\tkz@CLI@space \clip (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb); \else diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-arith.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-arith.tex index 296c53fe348..4232b3a6354 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-arith.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-arith.tex @@ -1,11 +1,11 @@ % tkz-tools-arith.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-arith.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-arith.tex} % 1.161 test if "isfactor" is already defined % now with pgf 3.0 gcd isprime isodd iseven are defined %<--------------------------------------------------------------------------–> @@ -13,7 +13,7 @@ %<--------------------------------------------------------------------------–> % [About integers numbers] %<--------------------------------------------------------------------------–> -\ProvidesFile{tkz-tool-arith.tex}[tkz-tool-arith 3.00 c] +\ProvidesFile{tkz-tool-arith.tex}[tkz-tool-arith 3.02 c] % \edef\tkzAtCode{\the\catcode`\@} % \catcode`\@=11\relax \makeatletter diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-base.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-base.tex index 926ed2347e4..fbd631d2eef 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-base.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-base.tex @@ -1,12 +1,12 @@ % tkz-tools-base.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. % utf8 encoding -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-tools-base.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-base.tex} \makeatletter %<--------------------------------------------------------------------------–> \global\let\tkz@tmp@xa\tkz@init@xmin% modif 2016 @@ -15,7 +15,7 @@ \global\let\tkz@tmp@yb\tkz@init@ymax% modif 2016 %<--------------------------------------------------------------------------–> \pgfkeys{ - /@tkzInit/.cd, + /tkzInit/.cd, xmin/.store in = \tkz@init@xmin, xmax/.store in = \tkz@init@xmax, xstep/.store in = \tkz@init@xstep, @@ -35,7 +35,7 @@ \def\tkzInit{\pgfutil@ifnextchar[{\tkz@Init}{\tkz@Init[]}} \def\tkz@Init[#1]{% - \pgfqkeys{/@tkzInit}{#1} + \pgfqkeys{/tkzInit}{#1} \ifx\tkzfctloaded\undefined \else \tkz@tkzf@fct=0 % only if tkz-fct loaded diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-math.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-math.tex index c6579e09029..f42d57397bc 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-math.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-math.tex @@ -1,11 +1,11 @@ % tkz-tools-math.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-math.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-math.tex} \makeatletter %<--------------------------------------------------------------------------> % \tkzpointnormalised normalise un point A-->A' tq ||v(OA')=1|| @@ -41,14 +41,14 @@ % \veclen mais avec fp % option cm le résultat est en cm sinon en pt %<--------------------------------------------------------------------------> -\pgfkeys{@CalcLength/.cd, +\pgfkeys{tkzcalclen/.cd, cm/.is if = tkzLengthIncm, cm/.default = true} \def\tkzCalcLength{\pgfutil@ifnextchar[{\tkz@CalcLength}{\tkz@CalcLength[]}} \def\tkz@CalcLength[#1](#2,#3){% -\pgfkeys{@CalcLength/.cd, cm = false} -\pgfqkeys{/@CalcLength}{#1}% +\pgfkeys{tkzcalclen/.cd, cm = false} +\pgfqkeys{/tkzcalclen}{#1}% \begingroup \tkz@@CalcLength(#2,#3){tkzLengthResult} \iftkzLengthIncm diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-misc.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-misc.tex index e47c7d8a5c2..2bd39efc4b6 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-misc.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-misc.tex @@ -1,11 +1,11 @@ % tkz-tools-misc.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-misc.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-misc.tex} \makeatletter %<--------------------------------------------------------------------------–> % hline pb avec line diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-modules.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-modules.tex index e0e69f639f0..81525e824a7 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-modules.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-modules.tex @@ -1,11 +1,11 @@ % tkz-tools-modules -% 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-utilities.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-utilities.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/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-print.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-print.tex index 72aa8e8f7c2..20e53a8b487 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-print.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-print.tex @@ -1,11 +1,11 @@ % tkz-tool-print.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-print.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-print.tex} \makeatletter %<------------- tkzPrintFrac ----------------------------------> \def\tkzPrintFrac#1#2{% diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-text.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-text.tex index c676da2402a..b9397961cd4 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-text.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-text.tex @@ -1,11 +1,11 @@ % tkz-tools-text.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-text.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-text.tex} \makeatletter %<--------------------------------------------------------------------------–> % tkzText diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-utilities.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-utilities.tex index cba0a88f804..70739d9a4ba 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-utilities.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-utilities.tex @@ -1,11 +1,11 @@ % tkz-tools-utilities -% 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-utilities.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-utilities.tex} \makeatletter % for testing results \def\extractxy#1{% @@ -45,14 +45,14 @@ %<------ Initialisation of the colors with tkzSetUpColors -----------------> % Première macro SetUpColors %%%%%%%%%%%%%%%%%%%%% %Possible -\pgfkeys{/setupcolor/.is family} +\pgfkeys{/tkzsucolor/.is family} \def\setupcolorkeys#1{% - \pgfkeys{/setupcolor,#1}} + \pgfkeys{/tkzsucolor,#1}} \setupcolorkeys{ background/.estore in = \setupcolor@background, text/.estore in = \setupcolor@text, @initial/.style = {background=white,text=black}, - @apply/.code = {\pagecolor{\setupcolor@background}% + @apply/.code = {\pagecolor{\setupcolor@background}% \color{\setupcolor@text}% }, } |