diff options
author | Karl Berry <karl@freefriends.org> | 2022-01-04 22:30:53 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-01-04 22:30:53 +0000 |
commit | 2826ceba9c796e6ec935ff71098328b0042b3ff3 (patch) | |
tree | 254ae6dcd883e55308b733164f8e0445590e3ea6 /Master/texmf-dist/tex/latex/tkz-base | |
parent | 3886457c768d0a6fd86ca3aa7139026e39ef5724 (diff) |
tkz-base (4jan22)
git-svn-id: svn://tug.org/texlive/trunk@61495 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tkz-base')
19 files changed, 545 insertions, 365 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 fbab54e1371..d28fc66d97a 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 2020 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,10 @@ % and save the file in a directory part of your TEXINPUTS environment % variable. -%utf8 encoding -\def\fileversion{3.06c} -\def\filedate{2020/03/18} -\typeout{2020/03/18 3.06c tkz-base.cfg} +\def\fileversion{4.00} +\def\filedate{2022/01/04} +\typeout{2022/01/04 4.00 tkz-base.cfg} +%<------ colors ---------------------------------------–> %<------ colors ---------------------------------------–> \def\tkz@backgroundcolor{white} \def\tkz@textcolor{black} @@ -46,7 +46,7 @@ \def\tkz@euc@pointshape{circle} \def\tkz@euc@pointcolor{\tkz@mainlinecolor} \def\tkz@euc@labelcolor{\tkz@mainlinecolor} -\def\tkz@euc@pointsize{3 pt} +\def\tkz@euc@pointsize{3} \def\tkz@euc@pointpos{below right} \def\tkz@euc@segmentcolor{\tkz@mainlinecolor} \def\tkz@euc@circlecolor{\tkz@mainlinecolor} @@ -90,7 +90,11 @@ %<------------------------- compass -----------------------------------–> \def\tkz@euc@compasscolor{\tkz@otherlinecolor} \def\tkz@euc@compasswidth{0.4pt} -\def\tkz@euc@compassstyle{solid} +\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{*} @@ -98,6 +102,8 @@ \def\tkz@mk@fill{\tkz@otherlinecolor} %<--------------------------------------------------------------------------–> %<------------------------------ styles ---------------------------------–> +\def\tkzSetUpStyle[#1]#2{\tikzset{#2/.style={#1}}}% add 2022 + \tikzset{xlabel style/.style = {below = 3 pt, inner sep = 1pt, outer sep = 0pt} @@ -122,11 +128,13 @@ \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}% + add = {\tkz@euc@lineleft} and {\tkz@euc@lineright}% } } \tikzset{label seg style/.style = {color = \tkz@mainlinecolor, @@ -148,6 +156,7 @@ } } } +\tikzset{arc style/.style={gray,thin}} %<---------------------- show coord -----------------------------------–> \tikzset{arrow coord style/.style = {dashed, \tkz@euc@linecolor, @@ -173,7 +182,25 @@ %<--------------------------- vector --------------------------------------–> \tikzset{vector style/.style={>=latex,->} } -\tikzset{ tkzdotted/.style={% +\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}} + tkzdotted/.default=8}} + +% \tikzset{tkzreverseclip/.style={insert path={% +% (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb)}}} + +\tikzset{tkzreverseclip/.style={insert path={ + (current bounding box.south west) --(current bounding box.north west) + --(current bounding box.north east) -- (current bounding box.south east) + -- cycle} }} + +\def\tkzPhi{1.618034} +\def\tkzInvPhi{0.618034} +\def\tkzSqrtPhi{1.27202} +\def\tkzSqrTwo{1.414213} +\def\tkzSqrThree{1.7320508} +\def\tkzSqrFive{2.2360679} +\def\tkzSqrTwobyTwo{0.7071065} +\def\tkzPi{3.1415926} +\def\tkzEuler{2.71828182} \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 d3acfceed92..58892e8e938 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 % -% Copyright 2020 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. @@ -7,44 +7,19 @@ % 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. -% This work consists of the files: -% tkz-base.sty -% tkz-base.cfg -% tkz-lib-marks.tex -% tkz-obj-axes.tex -% tkz-obj-grids.tex -% tkz-obj-marks.tex -% tkz-obj-points.tex -% tkz-obj-rep.tex -% tkz-tools-arith.tex -% tkz-tools-base.tex -% tkz-tools-BB.tex -% tkz-tools-misc.tex -% tkz-tools-modules.tex -% tkz-tools-print.tex -% tkz-tools-text.tex -% tkz-tools-utilities.tex -% utf8 encoding -%<--------------------------------------------------------------------------–> -% Objet : Outils pour la création de graphiques géométriques -%<--------------------------------------------------------------------------–> -\typeout{2020/03/18 3.06c tkz-base.sty} +\def\fileversion{4.00} +\typeout{2022/01/04 4.00 tkz-base.sty} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tkz-base}[2020/03/18 3.06c tkz-base] -\ifx\e@alloc\@undefined - \RequirePackage{etex} -\fi +\ProvidesPackage{tkz-base}[2022/01/04 4.00 tkz-base] + \RequirePackage{tikz} \usetikzlibrary{% angles, arrows, arrows.meta, - babel, calc, decorations, decorations.markings, @@ -53,12 +28,12 @@ decorations.text, decorations.pathmorphing, intersections, - patterns, plotmarks, - positioning, quotes, - shadows, shapes.misc, + positioning, + shadows, + patterns, through }% remove snake library % Pour les les labels sur les axes @@ -67,9 +42,7 @@ \RequirePackage{xfp,fp} %\FPmessagesfalse % pas de messages de la part de fp ! %--------------------- -\newdimen\tkzRadius -\newdimen\tkzLength -\newdimen\tkz@radi + %--------------------- tkz registres \newdimen\tkz@ax \newdimen\tkz@ay @@ -79,7 +52,7 @@ \newdimen\tkz@cy \newdimen\tkz@dx \newdimen\tkz@dy -% 2017 +% 2017 ???? inutile ! \newdimen\tkz@tax \newdimen\tkz@tay \newdimen\tkz@tbx @@ -96,8 +69,6 @@ \newif\iftkz@coord@noxdraw \newif\iftkz@coord@noydraw \newif\iftkz@vec@normed -%--------------------- lines -\newif\iftkz@line@normed %--------------------- tkz axis \newif\iftkz@X@noticks \newif\iftkz@Y@noticks @@ -118,8 +89,6 @@ \newif\iftkz@node\tkz@nodefalse \newif\iftkz@legend@line%--------------------- legend \newif\iftkz@TestSubString -\newif\ifnormtkzcode@execute% german ? right angle -\newif\iftkz@sawp@sc%---------------------- semi circle \newif\ifpgf@unknown % math arith \newif\ifpgf@isaprime \newcount\tkz@cntmk @@ -139,6 +108,7 @@ \typeout{tkz-base.cfg not found} } \input{tkz-tools-modules} \input{tkz-lib-marks} -\usetkztool{base,utilities,math,text,BB,arith,print,misc} +\input{tkz-lib-shape} +\usetkztool{base,utilities,colors,text,BB,arith,print,misc}% BB out \usetkzobj{axes,grids,marks,points,rep} \endinput
\ No newline at end of file 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 4d90cd1e786..07917707b77 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,5 +1,5 @@ % tkz-lib-marks.tex -% Copyright 2020 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. @@ -7,14 +7,12 @@ % 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. -\def\fileversion{3.06c} -\def\filedate{2020/03/18} -\typeout{2020/03/18 3.06c tkz-lib-symbols.tex} +\def\fileversion{4.00} +\def\filedate{2022/01/04} +\typeout{2022/01/04 4.00 tkz-lib-marks.tex} \makeatletter %<--------------------------------------------------------------------------–> % Création des symboles diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-shape.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-shape.tex new file mode 100644 index 00000000000..29b19f087be --- /dev/null +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-lib-shape.tex @@ -0,0 +1,51 @@ +% tkz-lib-shape.tex +% 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. +% 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. + +\def\fileversion{4.00} +\def\filedate{2022/01/04} +\typeout{2022/01/04 4.00 tkz-lib-shape.tex} +\makeatletter +%<--------------------------------------------------------------------------–> +% Création des symboles +%<--------------------------------------------------------------------------–> +% define a new shape for the points +\pgfdeclareshape{cross} +{% + \inheritsavedanchors[from=rectangle] % this is nearly a rectangle + \inheritanchorborder[from=rectangle] + \inheritanchor[from=rectangle]{north} + \inheritanchor[from=rectangle]{north west} + \inheritanchor[from=rectangle]{north east} + \inheritanchor[from=rectangle]{center} + \inheritanchor[from=rectangle]{west} + \inheritanchor[from=rectangle]{east} + \inheritanchor[from=rectangle]{mid} + \inheritanchor[from=rectangle]{mid west} + \inheritanchor[from=rectangle]{mid east} + \inheritanchor[from=rectangle]{base} + \inheritanchor[from=rectangle]{base west} + \inheritanchor[from=rectangle]{base east} + \inheritanchor[from=rectangle]{south} + \inheritanchor[from=rectangle]{south west} + \inheritanchor[from=rectangle]{south east} + \foregroundpath{ +% store lower right in xa/ya and upper right in xb/yb + \southwest \pgf@xa=\pgf@x \pgf@ya=\pgf@y + \northeast \pgf@xb=\pgf@x \pgf@yb=\pgf@y + \pgfpathmoveto{\pgfqpoint{0 pt}{\pgf@ya}} + \pgfpathlineto{\pgfqpoint{0 pt}{\pgf@yb}} + \pgfpathmoveto{\pgfqpoint{\pgf@xa}{0 pt}} + \pgfpathlineto{\pgfqpoint{\pgf@xb}{0 pt}} + } +} +\makeatother +\endinput
\ No newline at end of file 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 0382917149c..4cd032adfd3 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,5 +1,5 @@ % tkz-obj-axes.tex -% Copyright 2020 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. @@ -7,28 +7,26 @@ % 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.06c} -\def\filedate{2020/03/18} -\typeout{2020/03/18 3.06c tkz-obj-axes.tex} - \newif\ifinteger - \makeatletter +\def\fileversion{4.00} +\def\filedate{2022/01/04} +\typeout{2022/01/04 4.00 tkz-obj-axes} + +\newif\ifinteger +\makeatletter \def\removedot#1.{#1} \newcommand\tkzgetinteger[1]{\expandafter\tkz@getinteger#1.\@nil} \def\tkz@getinteger#1.#2\@nil{% \ifx\empty#2\empty \integertrue - \else - \ifnum\removedot#2=0 - \integertrue - \else - \integerfalse - \fi + \else + \ifnum\removedot#2=0 + \integertrue + \else + \integerfalse + \fi \fi } %<--------------------------------------------------------------------------–> @@ -228,7 +226,7 @@ $\numprint{\tkz@result}$ down space = \tkz@init@downspace, noticks/.is if = tkz@Y@noticks, noticks/.default = true, - noticks = false, + noticks = true, tickwd/.store in = \tkz@Y@tickwd, ticklt/.store in = \tkz@Y@ticklt, tickrt/.store in = \tkz@Y@tickrt, @@ -448,8 +446,8 @@ $\numprint{\tkz@result}$ \pgfkeys{/tkzAxeXY/.cd, swap/.is if = tkz@swap, swap/.default = true, - swap = false, - /tkzAxeXY/.search also={/tikz}, + swap = false, + /tkzAxeXY/.search also = {/tikz}, /tkzAxeXY/.unknown/.code = {\let\searchname=\pgfkeyscurrentname \pgfkeysalso{\searchname/.try=#1}} } diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axesmin.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axesmin.tex new file mode 100644 index 00000000000..332304e2983 --- /dev/null +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-axesmin.tex @@ -0,0 +1,171 @@ +% tkz-obj-axesmin +% 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. +% 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. + +\def\fileversion{4.00} +\def\filedate{2022/01/04} +\typeout{2022/01/04 4.00 tkz-obj-axesmin} + +\makeatletter +\newif\ifinteger +\def\removedot#1.{#1} +\newcommand\tkzgetinteger[1]{\expandafter\tkz@getinteger#1.\@nil} +\def\tkz@getinteger#1.#2\@nil{% + \ifx\empty#2\empty + \integertrue + \else + \ifnum\removedot#2=0 + \integertrue + \else + \integerfalse + \fi + \fi +} + +%<--------------------------------------------------------------------------–> +% Setup axe +%<--------------------------------------------------------------------------–> +\pgfkeys{tkzaxis/.cd, + line width/.code = \xdef\tkz@sua@lw{#1}, + color/.code = \xdef\tkz@sua@color{#1}, + 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 +} + +\def\tkzSetUpAxis{\pgfutil@ifnextchar[{\tkz@SetUpAxis}{\tkz@SetUpAxis[]}} +\def\tkz@SetUpAxis[#1]{% +\begingroup +\pgfqkeys{/tkzaxis}{#1} +\global\let\tkz@init@lw\tkz@sua@lw +\global\let\tkz@init@gradsize\tkz@sua@gradsize +\global\let\tkz@init@color\tkz@sua@color +\global\let\tkz@init@tickwd\tkz@sua@tickwd +\global\let\tkz@init@ticka\tkz@sua@ticka +\global\let\tkz@init@tickb\tkz@sua@tickb +\endgroup +} +%<--------------------------------------------------------------------------–> +% tkzDrawX todo améliorer les unités +% sans doute à revoir loop from 0 to i then calcul dans la boucle de la position +% et de l'affichage +%<--------------------------------------------------------------------------–> +\pgfkeys{% + /tkzdrawX/.cd, + color/.store in = \tkz@X@color, + label/.store in = \tkz@X@label, + right space/.store in = \tkz@axe@rxspace, + left space/.store in = \tkz@axe@lxspace, + step/.code = {\edef\tkz@posnext{\fpeval{#1}}}, + color = \tkz@init@color, + label = \tkz@init@xlabel, + step = \tkz@init@xstep, + right space = \tkz@init@rightspace, %??? + left space = \tkz@init@leftspace, + noticks/.is if = tkz@X@noticks, + noticks/.default = true, + noticks = true, + tickwd/.store in = \tkz@X@tickwd, + tickup/.store in = \tkz@X@tickup, + tickdn/.store in = \tkz@X@tickdn, + tickwd = \tkz@init@tickwd, + tickup = \tkz@init@ticka, + tickdn = \tkz@init@tickb, + /tkzdrawX/.search also={/tikz}, + } + +\def\tkzDrawX{\pgfutil@ifnextchar[{\tkz@DrawX}{\tkz@DrawX[]}} +\def\tkz@DrawX[#1]{ +\begingroup% +\pgfqkeys{/tkzdrawX}{#1} +\edef\tkz@posmax{\fpeval{trunc(\tkz@xb,\tkz@init@xdec)}} +\edef\tkz@posmin{\fpeval{trunc(\tkz@xa,\tkz@init@xdec)}} +\edef\tkz@xbsup{\fpeval{\tkz@xb+\tkz@axe@rxspace}} +\edef\tkz@xainf{\fpeval{\tkz@xa-\tkz@axe@lxspace}} +\path (\tkz@xainf,0)--(\tkz@xbsup,0) node(tkz@xline){}; +\draw[xaxe style, + color = \tkz@X@color, + /tkzdrawX/.cd, #1] (\tkz@xainf,0)--(\tkz@xbsup,0) + node[ xlabel style, + /tkzdrawX/.cd, + #1]{\tkz@X@label}; + \iftkz@X@noticks + \else + \edef\tkz@posmax{\fpeval{trunc(\tkz@posmax,\tkz@init@xdec)}} + \edef\tkz@posnext{\fpeval{\tkz@posnext/\tkz@init@xstep+\tkz@posmin}} + \foreach \pos in {\tkz@posmin,...,\tkz@posmax}{% + \edef\tkz@pos{\fpeval{\pos*1}}% ??? + \draw[ color = \tkz@X@color, line width = \tkz@X@tickwd, + shift = {(\tkz@pos,0)}]% + (0pt,\tkz@X@tickup)--(0pt,-\tkz@X@tickdn); + } + \fi +\endgroup +} +%<--------------------------------------------------------------------------–> +% tkzDrawY todo améliorer les unités +%<--------------------------------------------------------------------------–> +\pgfkeys{% + /tkzdrawY/.cd, + color/.store in = \tkz@Y@color, + label/.store in = \tkz@Y@label, + up space/.store in = \tkz@axe@uyspace, + down space/.store in = \tkz@axe@dyspace, + step/.code = {\edef\tkz@posnext{\fpeval{#1}}}, + color = \tkz@init@color, + label = \tkz@init@ylabel, + step = \tkz@init@ystep, + up space = \tkz@init@upspace, + down space = \tkz@init@downspace, + noticks/.is if = tkz@Y@noticks, + noticks/.default = true, + noticks = true, + tickwd/.store in = \tkz@Y@tickwd, + ticklt/.store in = \tkz@Y@ticklt, + tickrt/.store in = \tkz@Y@tickrt, + tickwd = \tkz@init@tickwd, + ticklt = \tkz@init@tickb, + tickrt = \tkz@init@ticka, + /tkzdrawY/.search also={/tikz}, + } + +\def\tkzDrawY{\pgfutil@ifnextchar[{\tkz@DrawY}{\tkz@DrawY[]}} +\def\tkz@DrawY[#1]{% +\begingroup +\pgfkeys{/tkzdrawY/.cd,step = \tkz@init@ystep} +\pgfqkeys{/tkzdrawY}{#1} +\edef\tkz@posmax{\fpeval{trunc(\tkz@yb,\tkz@init@ydec)}} +\edef\tkz@posmin{\fpeval{trunc(\tkz@ya,\tkz@init@ydec)}} +\edef\tkz@ybsup{\fpeval{\tkz@yb+\tkz@axe@uyspace}} +\edef\tkz@yainf{\fpeval{\tkz@ya-\tkz@axe@dyspace}} +\path (0,\tkz@yainf)--(0,\tkz@ybsup) node(tkz@yline){}; +\draw[color = \tkz@Y@color, + yaxe style,/tkzdrawY/.cd,#1] (0,\tkz@yainf)--(0,\tkz@ybsup) + node[ylabel style,/tkzdrawY/.cd,#1]{\tkz@Y@label}; + \iftkz@Y@noticks + \else + \edef\tkz@posmax{\fpeval{trunc(\tkz@posmax,\tkz@init@ydec)}} + \edef\tkz@posnext{\fpeval{\tkz@posnext/\tkz@init@ystep+\tkz@posmin}} + \foreach \tkz@pos in {\tkz@posmin,\tkz@posnext,...,\tkz@posmax}{% + \draw[color = \tkz@Y@color, + line width = \tkz@Y@tickwd, + shift = {(0,\tkz@pos)}]% + (\tkz@Y@tickrt,0pt)--(-\tkz@Y@ticklt,0pt);} + + \fi +\endgroup} +\makeatother +\endinput
\ No newline at end of file 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 9330d547233..1aad063addf 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,5 +1,5 @@ % tkz-obj-grids.tex -% Copyright 2020 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. @@ -7,24 +7,21 @@ % 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.06c} -\def\filedate{2020/03/18} -\typeout{2020/03/18 3.06c tkz-obj-grids.tex} +\def\fileversion{4.00} +\def\filedate{2022/01/04} +\typeout{2022/01/04 4.00 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 + 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[]}} @@ -39,22 +36,22 @@ % tkzGrid %<--------------------------------------------------------------------------–> \pgfkeys{/tkzGrid/.cd, - color/.code = {\def\tkz@gd@color{#1}% - \edef\tkz@gd@subcolor{% - \tkz@gd@color!\tkzCoeffSubColor}}, - subxstep/.store in = {\tkz@gd@subxstep}, - subystep/.store in = {\tkz@gd@subystep}, - ratio/.store in = {\tkz@gd@ratio}, - line width/.code = {\edef\tkz@gd@lw{#1} - \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, + color/.code = {\def\tkz@gd@color{#1}% + \edef\tkz@gd@subcolor{% + \tkz@gd@color!\tkzCoeffSubColor}}, + subxstep/.store in = {\tkz@gd@subxstep}, + subystep/.store in = {\tkz@gd@subystep}, + ratio/.store in = {\tkz@gd@ratio}, + line width/.code = {\edef\tkz@gd@lw{#1} + \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}, } %<--------------------------------------------------------------------------–> @@ -64,10 +61,10 @@ \def\tkz@@Grid[#1](#2,#3)(#4,#5){% \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}} - \edef\tkz@gya{\fpeval{(#3-\tkz@init@yorigine)/\tkz@init@ystep}} - \edef\tkz@gyb{\fpeval{(#5-\tkz@init@yorigine)/\tkz@init@ystep}} + \edef\tkz@gxa{\fpeval{(#2-\tkz@init@xorigine)/\tkz@init@xstep}} + \edef\tkz@gxb{\fpeval{(#4-\tkz@init@xorigine)/\tkz@init@xstep}} + \edef\tkz@gya{\fpeval{(#3-\tkz@init@yorigine)/\tkz@init@ystep}} + \edef\tkz@gyb{\fpeval{(#5-\tkz@init@yorigine)/\tkz@init@ystep}} \iftkz@gd@sub% \edef\@subxstep{\fpeval{\tkz@gd@subxstep/\tkz@init@xstep}}% \edef\@subystep{\fpeval{\tkz@gd@subystep/\tkz@init@ystep}}% @@ -82,6 +79,5 @@ (\tkz@gxa,\tkz@gya) grid (\tkz@gxb,\tkz@gyb);% \endgroup }% - %<--------------------------------------------------------------------------–> \makeatother \endinput
\ No newline at end of file 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 be03c2be341..98f6fd2808e 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,5 +1,5 @@ %tkz-obj-marks.tex -% Copyright 2020 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. @@ -7,16 +7,12 @@ % 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.07c} -\def\filedate{2020/03/18} -\typeout{2020/03/18 3.07c tkz-obj-marks.tex} +\def\fileversion{4.00} +\def\filedate{2022/01/04} +\typeout{2022/01/04 4.00 tkz-obj-marks.tex} \makeatletter %<-------------------------------------------------------------------------–> % Setup Marks 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 97cd3ccd1b8..8ccb998caa4 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,5 +1,5 @@ - % tkz-obj-points.tex -% Copyright 2020 Alain Matthes + % tkz-obj-eu-points.tex +% 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. @@ -7,57 +7,20 @@ % 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”. -% +% This work has the LPPL maintenance status “maintained”. % The Current Maintainer of this work is Alain Matthes. - -\def\fileversion{3.06c} -\def\filedate{2020/03/18} -\typeout{2020/03/18 3.06c tkz-obj-points.tex} -%<--------------------------------------------------------------------------–> -% init def point -%<--------------------------------------------------------------------------–> +\def\fileversion{4.00} +\def\filedate{2022/01/04} +\typeout{2022/01/04 4.00 tkz-obj-eu-points.tex} \makeatletter -%<--------------------------------------------------------------------------–> -% define a new shape for the points -\pgfdeclareshape{cross} -{% - \inheritsavedanchors[from=rectangle] % this is nearly a rectangle - \inheritanchorborder[from=rectangle] - \inheritanchor[from=rectangle]{north} - \inheritanchor[from=rectangle]{north west} - \inheritanchor[from=rectangle]{north east} - \inheritanchor[from=rectangle]{center} - \inheritanchor[from=rectangle]{west} - \inheritanchor[from=rectangle]{east} - \inheritanchor[from=rectangle]{mid} - \inheritanchor[from=rectangle]{mid west} - \inheritanchor[from=rectangle]{mid east} - \inheritanchor[from=rectangle]{base} - \inheritanchor[from=rectangle]{base west} - \inheritanchor[from=rectangle]{base east} - \inheritanchor[from=rectangle]{south} - \inheritanchor[from=rectangle]{south west} - \inheritanchor[from=rectangle]{south east} - \foregroundpath{ -% store lower right in xa/ya and upper right in xb/yb - \southwest \pgf@xa=\pgf@x \pgf@ya=\pgf@y - \northeast \pgf@xb=\pgf@x \pgf@yb=\pgf@y - \pgfpathmoveto{\pgfqpoint{0 pt}{\pgf@ya}} - \pgfpathlineto{\pgfqpoint{0 pt}{\pgf@yb}} - \pgfpathmoveto{\pgfqpoint{\pgf@xa}{0 pt}} - \pgfpathlineto{\pgfqpoint{\pgf@xb}{0 pt}} - } -} -%<--------------------------------------------------------------------------–> +%<---------------------------------------------------------------------------> +% init def point +%<---------------------------------------------------------------------------> % tkzDefPoint -%<--------------------------------------------------------------------------–> - -%<--------------------------------------------------------------------------–> +%<---------------------------------------------------------------------------> % macros complémentaires pour def point -%<--------------------------------------------------------------------------–> +%<---------------------------------------------------------------------------> \def\tkz@parsecoordinate#1{% \tkz@getseparator#1,\@nil \iftkz@polar @@ -85,17 +48,17 @@ \xdef\tkz@absc{\tkz@x} \xdef\tkz@ord{\tkz@y} } -%<--------------------------------------------------------------------------–> +%<---------------------------------------------------------------------------> % options pour point definition -%<--------------------------------------------------------------------------–> +%<---------------------------------------------------------------------------> \pgfkeys{/tkzPt/.cd, polar/.is if = tkz@pt@polar, polar/.default = true, polar = false } -%<--------------------------------------------------------------------------–> +%<---------------------------------------------------------------------------> % tkz@ptStar -%<--------------------------------------------------------------------------–> +%<---------------------------------------------------------------------------> \def\tkz@ptStar[#1](#2,#3)#{% \pgfkeys{/tkzPt/.cd, polar = false} \pgfqkeys{/tkzPt}{#1} @@ -110,10 +73,10 @@ \edef\tkzpt@ya{\fpeval{(\tkz@y-\tkz@init@yorigine)/\tkz@init@ystep}} \tkz@node } -%<--------------------------------------------------------------------------–> +%<---------------------------------------------------------------------------> % la macro defpoint les coordonnées cartésiennes ou polaires sont traitées % afin de pouvoir être adaptées avec les unités choisies -%<--------------------------------------------------------------------------–> +%<---------------------------------------------------------------------------> \def\tkzDefPoint{\pgfutil@ifnextchar[{\tkz@DefPoint}{\tkz@DefPoint[]}} \def\tkz@DefPoint[#1](#2)#{% @@ -126,9 +89,9 @@ \tkz@DefPointEnd[#1] }% \def\tkz@DefPointEnd[#1]#2{\coordinate[#1] (#2) at (tkz@coord@temp);} -%<--------------------------------------------------------------------------–> +%<---------------------------------------------------------------------------> % tkzDefPoints -%<--------------------------------------------------------------------------–> +%<---------------------------------------------------------------------------> \def\tkzDefPoints{\pgfutil@ifnextchar[{\tkz@DefPoints}{\tkz@DefPoints[]}} \def\tkz@DefPoints[#1]#2{% \begingroup @@ -145,14 +108,16 @@ \endgroup}% } \def\tkz@absorb@bad@arg#1){\endgroup} -%<--------------------------------------------------------------------------–> -\def\tkz@node#1{\path[coordinate](\tkzpt@xa,\tkzpt@ya) coordinate(#1);} +%<---------------------------------------------------------------------------> +\def\tkz@node#1{ \pgfinterruptboundingbox +\path[coordinate](\tkzpt@xa,\tkzpt@ya) coordinate(#1); + \endpgfinterruptboundingbox} % \def\tkz@drawnode#1{\path[coordinate](\tkzpt@xa,\tkzpt@ya) coordinate(#1); % \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, @@ -173,13 +138,11 @@ inner sep = 0pt, shape = \tkz@pt@shape, minimum size = \tkz@pt@size, - fill = \tkz@pt@fill - } - } - }% end setup -%<--------------------------------------------------------------------------–> + 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, @@ -193,18 +156,18 @@ \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);} \def\tkz@RenamePointEnd[#1]#2{\coordinate[#1] (#2) at (\tkz@ax,\tkz@ay);} \def\tkzGetPoint#1{\coordinate (#1) at (tkzPointResult);} @@ -217,9 +180,9 @@ \coordinate (#3) at (#2); \end{scope} }% -%<--------------------------------------------------------------------------–> +%<---------------------------------------------------------------------------> % tkzDefShiftPoint -%<--------------------------------------------------------------------------–> +%<---------------------------------------------------------------------------> \def\tkzDefShiftPoint[#1](#2)#3{% \tkz@@extractxy{#1} \tkz@ax\pgf@x % @@ -228,23 +191,51 @@ \coordinate (#3) at (#2); \end{scope} } -%<-------------------------------------------------------------------------–> +%<--------------------------------------------------------------------------> % tkzLabelPoint Affichage des LABELS pour un point -%<-------------------------------------------------------------------------–> -\tikzset{label style/.style={\tkz@euc@pointpos,\tkz@euc@labelcolor, - font=\normalsize}} +%<--------------------------------------------------------------------------> \def\tkzLabelPoint{\pgfutil@ifnextchar[{\tkz@LabelPoint}{\tkz@LabelPoint[]}} \def\tkz@LabelPoint[#1](#2)#3{% \node[label style,#1] at (#2) {#3};}% -%<--------------------------------------------------------------------------–> +%<---------------------------------------------------------------------------> \def\tkzLabelPoints{\pgfutil@ifnextchar[{\tkz@LabelPoints}{\tkz@LabelPoints[]}}% \def\tkz@LabelPoints[#1](#2){% \foreach \point in {#2}{ \node[label style,#1] at (\point) {$\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 +%<---------------------------------------------------------------------------> +% +%<---------------------------------------------------------------------------> +\def\tkzSetUpLabel{\pgfutil@ifnextchar[{\tkz@SetUpLabel}{% + \tkz@SetUpLabel[]}} +\def\tkz@SetUpLabel[#1]{% +\tikzset{label style/.style={#1}} +}% end setup +%<---------------------------------------------------------------------------> \pgfkeys{/tkzautolab/.cd, center/.store in = \tkz@center, @@ -260,9 +251,9 @@ \path (\tkz@center) -- ($ (\point) + \tkz@dist*($(\point)-(\tkz@center)$) $) node[/tkzautolab/.cd,#1]{$\point$};} \endgroup }% -%<--------------------------------------------------------------------------–> +%<---------------------------------------------------------------------------> % PointShowCoord -%<--------------------------------------------------------------------------–> +%<---------------------------------------------------------------------------> \pgfkeys{/tkzprcoord/.cd, xlabel/.store in = \tkz@xlabel, ylabel/.store in = \tkz@ylabel, @@ -304,13 +295,13 @@ \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}} 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 0698c963fd1..630c47b3309 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,5 +1,5 @@ % tkz-obj-rep.tex -% Copyright 2020 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. @@ -7,14 +7,12 @@ % 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.06c} -\def\filedate{2020/03/18} -\typeout{2020/03/18 3.06c tkz-obj-rep.tex} + +\def\fileversion{4.00} +\def\filedate{2022/01/04} +\typeout{2022/01/04 4.00 tkz-obj-rep.tex} \makeatletter %<--------------------------------------------------------------------------–> % repère 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 6fd5422bbba..a68e47bf555 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,5 +1,5 @@ % tkz-tools-BB.tex -% Copyright 2020 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. @@ -7,66 +7,24 @@ % 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.06c} -\def\filedate{2020/03/18} -\typeout{2020/03/18 3.06c tkz-obj-BB.tex} -\makeatletter -%<--------------------------------------------------------------------------–> -\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} -\ifx\tkzutil@empty\tkz@CLI@space - \clip (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb); - \else - \edef\tkz@xxa{\fpeval{\tkz@xa-\tkz@CLI@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); -\fi -} -%<--------------------------------------------------------------------------–> -\def\tkzSetBB(#1)(#2){% - \pgfresetboundingbox - \path coordinate (tkz@SW) at (#1) - coordinate (tkz@NE) at (#2); - \path[use as bounding box](#1) rectangle (#2); - } -%<--------------------------------------------------------------------------–> -\def\tkzSaveBB{% -\path coordinate (tkz@SW) at (current bounding box.north east) - coordinate (tkz@NE) at (current bounding box.south west); -} -%<--------------------------------------------------------------------------–> -\def\tkzRestoreBB{% - \pgfresetboundingbox - \path[use as bounding box] (tkz@SW) rectangle (tkz@NE) ; -} +\def\fileversion{4.00} +\def\filedate{2022/01/04} +\typeout{2022/01/04 4.00 tkz-obj-BB.tex} +\makeatletter %<--------------------------------------------------------------------------–> \def\tkzShowBB{\pgfutil@ifnextchar[{\tkz@ShowBB}{\tkz@ShowBB[]}} \def\tkz@ShowBB[#1]{% \draw[#1] (current bounding box.south west) rectangle - (current bounding box.north east); + (current bounding box.north east); } %<--------------------------------------------------------------------------–> \def\tkzClipBB{% \clip (current bounding box.south west) rectangle - (current bounding box.north east); + (current bounding box.north east); } %<--------------------------------------------------------------------------–> -\tikzset{tkzreverseclip/.style={insert path={% - (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb)}}} -%todo add options -%<--------------------------------------------------------------------------–> \makeatother \endinput
\ No newline at end of file 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 c8990a76a22..cf3048f3246 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,5 +1,5 @@ % tkz-tools-arith.tex -% Copyright 2020 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. @@ -7,14 +7,12 @@ % 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.06c} -\def\filedate{2020/03/18} -\typeout{2020/03/18 3.06c tkz-tools-arith.tex} + +\def\fileversion{4.00} +\def\filedate{2022/01/04} +\typeout{2022/01/04 4.00 tkz-tools-arith.tex} % 1.161 test if "isfactor" is already defined % now with pgf 3.0 gcd isprime isodd iseven are defined %<--------------------------------------------------------------------------–> @@ -60,7 +58,7 @@ %<---------------------------------------------------------------------------> \tkzutil@ifundefined{pgfmath@function@isprime}{% \pgfmathdeclarefunction{isprime}{1}{% - \begingroup% + \begingroup% \pgf@unknowntrue \c@pgfmath@counta#1\relax% \ifcase#1\relax 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 9f66cdac0a3..8f457a22b6b 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,5 +1,5 @@ % tkz-tools-base.tex -% Copyright 2020 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. @@ -7,14 +7,12 @@ % 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.06c} -\def\filedate{2020/03/18} -\typeout{2020/03/18 3.06c tkz-tools-base.tex} + +\def\fileversion{4.00} +\def\filedate{2022/01/04} +\typeout{2022/01/04 4.00 tkz-tools-base.tex} \makeatletter %<--------------------------------------------------------------------------–> \global\let\tkz@tmp@xa\tkz@init@xmin% modif 2016 @@ -30,23 +28,23 @@ ymin/.store in = \tkz@init@ymin, ymax/.store in = \tkz@init@ymax, ystep/.store in = \tkz@init@ystep, - NO/.is if = tkz@init@NO, - NO/.default = true, - xmin = 0, - xmax = 10, - xstep = 1, - ymin = 0, - ymax = 10, - ystep = 1, - NO = false + NO/.is if = tkz@init@NO, + NO/.default = true, + xmin = 0, + xmax = 10, + xstep = 1, + ymin = 0, + ymax = 10, + ystep = 1, + NO = false } \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 + \tkz@tkzf@fct=0 % only if tkz-fct loaded \fi \xdef\tkz@init@xorigine{0} \xdef\tkz@init@yorigine{0} @@ -54,23 +52,23 @@ \edef\@xsgmax{\fpeval{sign(\tkz@init@xmax)}} \edef\@ysgmin{\fpeval{sign(\tkz@init@ymin)}} \edef\@ysgmax{\fpeval{sign(\tkz@init@ymax)}} - \let\tkz@tmp@xa\tkz@init@xmin %modif 2016 - \let\tkz@tmp@xb\tkz@init@xmax %modif 2016 - \let\tkz@tmp@ya\tkz@init@ymin %modif 2016 - \let\tkz@tmp@yb\tkz@init@ymax %modif 2016 - \tkz@init@NOfalse + \let\tkz@tmp@xa\tkz@init@xmin %modif 2016 + \let\tkz@tmp@xb\tkz@init@xmax %modif 2016 + \let\tkz@tmp@ya\tkz@init@ymin %modif 2016 + \let\tkz@tmp@yb\tkz@init@ymax %modif 2016 + \tkz@init@NOfalse \ifx\@xsgmin\@xsgmax \tkz@init@NOtrue \fi \ifx\@ysgmin\@ysgmax \tkz@init@NOtrue \fi \iftkz@init@NO% \ifx\@xsgmin\@xsgmax \edef\tkz@init@xmax{\fpeval{\tkz@init@xmax-\tkz@init@xmin}} - \edef\tkz@init@xorigine{\tkz@init@xmin} - \edef\tkz@init@xmin{0} + \edef\tkz@init@xorigine{\tkz@init@xmin} + \edef\tkz@init@xmin{0} \fi \ifx\@ysgmin\@ysgmax \edef\tkz@init@ymax{\fpeval{\tkz@init@ymax-\tkz@init@ymin}} - \edef\tkz@init@yorigine{\tkz@init@ymin} - \edef\tkz@init@ymin{0} + \edef\tkz@init@yorigine{\tkz@init@ymin} + \edef\tkz@init@ymin{0} \fi \fi \edef\tkz@xa{\fpeval{\tkz@init@xmin/\tkz@init@xstep}} diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-colors.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-colors.tex new file mode 100644 index 00000000000..7f8a0d7a643 --- /dev/null +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-colors.tex @@ -0,0 +1,57 @@ +% tkz-tools-colors +% 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. +% 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. + +\def\fileversion{4.00} +\def\filedate{2022/01/04} +\typeout{2022/01/04 4.00 tkz-tools-colors} +\makeatletter + +%<------ Initialisation of the colors with tkzSetUpColors -----------------> +% Première macro SetUpColors %%%%%%%%%%%%%%%%%%%%% +%Possible +\pgfkeys{/tkzsucolor/.is family} +\def\setupcolorkeys#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}% + \color{\setupcolor@text}% + }, +} +\def\tkzSetUpColors{\pgfutil@ifnextchar[{\tkz@SetUpColors}{\tkz@SetUpColors[]}} +\def\tkz@SetUpColors[#1]{\setupcolorkeys{@initial,#1,@apply}} + +%<------ Initialisation of all colors -----------------> +\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 + } +\def\tkzSetUpAllColors{\pgfutil@ifnextchar[{\tkz@SetUpAllColors}{% + \tkz@SetUpAllColors[]}} +\def\tkz@SetUpAllColors[#1]{% + \pgfqkeys{/tkzsupallcol}{#1} % now we redine the based colors + \def\tkz@fillcolor{\tkz@suac@bkc} + \def\tkz@mainlinecolor{\tkz@suac@txt} + \def\tkz@textcolor{\tkz@suac@txt} + \def\tkz@otherlinecolor{\tkz@suac@txt!50} + \def\tkz@sua@color{\tkz@suac@txt} + \tkzSetUpAxis[color=\tkz@suac@txt] + \tkzSetUpGrid[color=\tkz@suac@txt] + \pagecolor{\tkz@suac@bkc} + \color{\tkz@suac@txt} +} +\makeatother +\endinput
\ No newline at end of file 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 31e8981e63a..8677afc8034 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,5 +1,5 @@ % tkz-tools-misc.tex -% Copyright 2020 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. @@ -7,14 +7,12 @@ % 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.06c} -\def\filedate{2020/03/18} -\typeout{2020/03/18 3.06c tkz-tools-misc.tex} + +\def\fileversion{4.00} +\def\filedate{2022/01/04} +\typeout{2022/01/04 4.00 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 151a8ce0419..c27b8050309 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,5 +1,5 @@ % tkz-tools-modules -% Copyright 2020 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. @@ -7,14 +7,12 @@ % 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.06c} -\def\filedate{2020/03/18} -\typeout{2020/03/18 3.06c tkz-tools-utilities.tex} + +\def\fileversion{4.00} +\def\filedate{2022/01/04} +\typeout{2022/01/04 4.00 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/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-print.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-tools-print.tex index be4d362cae8..9fa988454dc 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,5 +1,5 @@ % tkz-tool-print.tex -% Copyright 2020 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. @@ -7,14 +7,12 @@ % 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.06c} -\def\filedate{2020/03/18} -\typeout{2020/03/18 3.06c tkz-tools-print.tex} + +\def\fileversion{4.00} +\def\filedate{2022/01/04} +\typeout{2022/01/04 4.00 tkz-tools-print} \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 8fb49d5fbb4..881c81e10e0 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,5 +1,5 @@ % tkz-tools-text.tex -% Copyright 2020 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. @@ -7,14 +7,12 @@ % 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.06c} -\def\filedate{2020/03/18} -\typeout{2020/03/18 3.06c tkz-tools-text.tex} + +\def\fileversion{4.00} +\def\filedate{2022/01/04} +\typeout{2022/01/04 4.00 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 e3ed8cb5a72..601b9a291be 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,5 +1,5 @@ % tkz-tools-utilities -% Copyright 2020 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. @@ -7,22 +7,38 @@ % 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.06c} -\def\filedate{2020/03/18} -\typeout{2020/03/18 3.06c tkz-tools-utilities.tex} + +\def\fileversion{4.00} +\def\filedate{2022/01/04} +\typeout{2022/01/04 4.00 tkz-tools-utilities.tex} \makeatletter +\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} +\ifx\tkzutil@empty\tkz@CLI@space + \clip (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb); + \else + \edef\tkz@xxa{\fpeval{\tkz@xa-\tkz@CLI@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); +\fi +} + % for testing results \def\extractxy#1{% \pgfextractx{\pgf@x}{\pgfpointanchor{#1}{center}} \pgfextracty{\pgf@y}{\pgfpointanchor{#1}{center}} \typeout{#1 \the\pgf@x,\the\pgf@y} } - %<-------------- some tools -------------------------------------------------> \def\tkzutil@empty{} \def\tkzutil@firstofone#1{#1} @@ -51,44 +67,6 @@ \catcode`\!=\tkzPtExCode\relax \catcode`\;=\tkzPtVirCode\relax }% -%<------ Initialisation of the colors with tkzSetUpColors -----------------> -% Première macro SetUpColors %%%%%%%%%%%%%%%%%%%%% -%Possible -\pgfkeys{/tkzsucolor/.is family} -\def\setupcolorkeys#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}% - \color{\setupcolor@text}% - }, -} -\def\tkzSetUpColors{\pgfutil@ifnextchar[{\tkz@SetUpColors}{\tkz@SetUpColors[]}} -\def\tkz@SetUpColors[#1]{\setupcolorkeys{@initial,#1,@apply}} - -%<------ Initialisation of all colors -----------------> -\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 - } -\def\tkzSetUpAllColors{\pgfutil@ifnextchar[{\tkz@SetUpAllColors}{% - \tkz@SetUpAllColors[]}} -\def\tkz@SetUpAllColors[#1]{% - \pgfqkeys{/tkzsupallcol}{#1} % now we redine the based colors - \def\tkz@fillcolor{\tkz@suac@bkc} - \def\tkz@mainlinecolor{\tkz@suac@txt} - \def\tkz@textcolor{\tkz@suac@txt} - \def\tkz@otherlinecolor{\tkz@suac@txt!50} - \def\tkz@sua@color{\tkz@suac@txt} - \tkzSetUpAxis[color=\tkz@suac@txt] - \tkzSetUpGrid[color=\tkz@suac@txt] - \pagecolor{\tkz@suac@bkc} - \color{\tkz@suac@txt} -} %<--------------------------------------------------------------------------–> % Pour savoir le nombre de décimales d'un nombre % le nombre dans #1 et le résultat dans \c@pgfmath@countb @@ -125,6 +103,9 @@ \expandafter\C@untToken \fi } +%<---------------------------------------------------------–> +\def\tkz@recuplast(#1,#2){\def\tkz@last{#1}} +\def\tkz@stop{\tkz@stop} % end code from JCC %<---------------------------------------------------------–> % Tools |